safearea and color fixes

hectorAguero · May 2, 2024 · 33436a6 · 33436a6
1 parent de60fab
commit 33436a6
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 25 deletions.
diff --git 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
@@ -80,27 +80,31 @@ class _ParadesTabPageState extends ConsumerState<ParadesTabPage> {
                     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(),
+                                ),
+                              ),
+                            ],
+                          ),
                         ),
                       ),
                     ),