From 24e3215cc3e684cab435112db9a2dadde68e420f Mon Sep 17 00:00:00 2001 From: Lukas Klingsbo Date: Fri, 6 Sep 2024 13:38:12 +0200 Subject: [PATCH] fix: Add spacing between primary button and the rest in SnapPage --- packages/app_center/lib/layout.dart | 5 ++++- packages/app_center/lib/snapd/snap_page.dart | 17 +++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/packages/app_center/lib/layout.dart b/packages/app_center/lib/layout.dart index 29cc1be9b..e4480bd0c 100644 --- a/packages/app_center/lib/layout.dart +++ b/packages/app_center/lib/layout.dart @@ -2,11 +2,14 @@ import 'package:flutter/material.dart'; const kMargin = 4.0; const kCardMargin = 4.0; +const kCardSpacing = 16.0; const kPaneWidth = 204.0; const kPagePadding = 24.0; -const kCardSpacing = 16.0; +const kSpacingSmall = 8.0; +const kSpacing = 16.0; const kSearchBarWidth = 424.0 - 2 * kCardMargin; const kIconSize = 56.0; +const kSectionSpacing = 48.0; const kCardSizeNormal = Size(416.0, 170.0); const kCardSizeWide = Size(548.0, 170.0); diff --git a/packages/app_center/lib/snapd/snap_page.dart b/packages/app_center/lib/snapd/snap_page.dart index d1fb9c550..4f7146aab 100644 --- a/packages/app_center/lib/snapd/snap_page.dart +++ b/packages/app_center/lib/snapd/snap_page.dart @@ -1,5 +1,6 @@ import 'package:app_center/constants.dart'; import 'package:app_center/error/error.dart'; +import 'package:app_center/extensions/iterable_extensions.dart'; import 'package:app_center/extensions/string_extensions.dart'; import 'package:app_center/l10n.dart'; import 'package:app_center/layout.dart'; @@ -173,7 +174,7 @@ class _SnapView extends StatelessWidget { if (snapData.availableChannels != null && snapData.selectedChannel != null) ...[ _ChannelDropdown(snapData: snapData), - const SizedBox(width: 16), + const SizedBox(width: kSpacing), ], Flexible( child: _SnapActionButtons(snapData: snapData), @@ -191,7 +192,7 @@ class _SnapView extends StatelessWidget { ), ), const Divider(), - const SizedBox(height: 48), + const SizedBox(height: kSectionSpacing), if (snapData.hasGallery) ...[ AppPageSection( header: Text( @@ -202,7 +203,9 @@ class _SnapView extends StatelessWidget { ?.copyWith(fontWeight: FontWeight.w500), ), child: Padding( - padding: const EdgeInsets.only(bottom: 48), + padding: const EdgeInsets.only( + bottom: kSectionSpacing, + ), child: ScreenshotGallery( title: snapData.storeSnap!.titleOrName, urls: snapData.storeSnap!.screenshotUrls, @@ -211,7 +214,7 @@ class _SnapView extends StatelessWidget { ), ), const Divider(), - const SizedBox(height: 48), + const SizedBox(height: kSectionSpacing), ], AppPageSection( header: Text( @@ -392,12 +395,14 @@ class _SnapActionButtons extends ConsumerWidget { else if (snapData.isInstalled) secondaryActionsButton, if (snapData.isInstalled) ...[ - const SizedBox(width: 8), _RatingsActionButtons( snap: snapData.snap, ), ], - ].whereNotNull().toList(), + ] + .whereNotNull() + .toList() + .separatedBy(const SizedBox(width: kSpacingSmall)), ); } }