From 33436a66e9e6745aa843af0ae85e986b52e6393d Mon Sep 17 00:00:00 2001 From: hectorAguero Date: Thu, 2 May 2024 03:16:25 -0400 Subject: [PATCH] safearea and color fixes --- .../home/widgets/settings_modal_sheet.dart | 9 ++-- lib/features/parades/parades_tab_page.dart | 44 ++++++++++--------- 2 files changed, 28 insertions(+), 25 deletions(-) diff --git a/lib/features/home/widgets/settings_modal_sheet.dart b/lib/features/home/widgets/settings_modal_sheet.dart index 2365ec0..6f0f433 100644 --- a/lib/features/home/widgets/settings_modal_sheet.dart +++ b/lib/features/home/widgets/settings_modal_sheet.dart @@ -54,15 +54,14 @@ class SettingsModalSheet extends StatelessWidget { padding: const EdgeInsets.only(right: 16), child: AppCupertinoButton( onPressed: () => Navigator.of(context).pop(), - color: CupertinoDynamicColor.resolve( - CupertinoColors.lightBackgroundGray, - context, - ), padding: const EdgeInsets.all(4), + color: const CupertinoDynamicColor.withBrightness( + color: CupertinoColors.darkBackgroundGray, + darkColor: CupertinoColors.lightBackgroundGray, + ).resolveFrom(context), child: const Icon( CupertinoIcons.xmark, size: 16, - color: CupertinoColors.label, ), ), ), diff --git a/lib/features/parades/parades_tab_page.dart b/lib/features/parades/parades_tab_page.dart index 759db41..745dc7b 100644 --- a/lib/features/parades/parades_tab_page.dart +++ b/lib/features/parades/parades_tab_page.dart @@ -80,27 +80,31 @@ class _ParadesTabPageState extends ConsumerState { overrides: [ currentParadeProvider.overrideWithValue(value[index]), ], - child: Padding( - padding: index != 0 - ? EdgeInsets.zero - : const EdgeInsets.only(top: 24), - child: SizedBox( - height: ParadeItem.height, - child: Row( - children: [ - ParadeItemYearLine( - year: parade.champion && - parade.divisionNumber == - SchoolDivision.especial - ? parade.paradeYear.toString() - : null, - ), - const Expanded( - child: AppAnimationWrapper( - child: ParadeItem(), + child: SafeArea( + top: false, + bottom: false, + child: Padding( + padding: index != 0 + ? EdgeInsets.zero + : const EdgeInsets.only(top: 24), + child: SizedBox( + height: ParadeItem.height, + child: Row( + children: [ + ParadeItemYearLine( + year: parade.champion && + parade.divisionNumber == + SchoolDivision.especial + ? parade.paradeYear.toString() + : null, ), - ), - ], + const Expanded( + child: AppAnimationWrapper( + child: ParadeItem(), + ), + ), + ], + ), ), ), ),