From 1a4ac1a07c004195a5b6d9f64505b967dc2d2a30 Mon Sep 17 00:00:00 2001
From: tuxsudo <tuxsudo@tux.pizza>
Date: Fri, 22 Aug 2025 19:33:35 +0000
Subject: [PATCH] Add SafeArea to base page (#2473)

* Add SafeArea to base page

* chore: Move SafeArea to wrap body instead of being at top level

---------

Co-authored-by: Blazebrain <davidadegoke16@gmail.com>
---
 lib/src/screens/base_page.dart | 44 ++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/lib/src/screens/base_page.dart b/lib/src/screens/base_page.dart
index e60905979..63925cb09 100644
--- a/lib/src/screens/base_page.dart
+++ b/lib/src/screens/base_page.dart
@@ -182,27 +182,29 @@ abstract class BasePage extends StatelessWidget {
           final backgroundImage = getIt.get<SettingsStore>().backgroundImage;
 
           return Container(
-            width: double.infinity,
-            height: double.infinity,
-            decoration: BoxDecoration(
-              image: backgroundImage.isNotEmpty
-                  ? DecorationImage(
-                      image: FileImage(File(backgroundImage)),
-                      fit: BoxFit.cover,
-                    )
-                  : null,
-              // color: Colors.grey[200],
-            ),
-            child: Scaffold(
-                key: _scaffoldKey,
-                backgroundColor: pageBackgroundColor(context),
-                resizeToAvoidBottomInset: resizeToAvoidBottomInset,
-                extendBodyBehindAppBar: extendBodyBehindAppBar,
-                endDrawer: endDrawer,
-                appBar: appBar(context),
-                body: body(context),
-                floatingActionButton: floatingActionButton(context)),
-          );
+          width: double.infinity,
+          height: double.infinity,
+          decoration: BoxDecoration(
+            image: backgroundImage.isNotEmpty
+                ? DecorationImage(
+                    image: FileImage(File(backgroundImage)),
+                    fit: BoxFit.cover,
+                  )
+                : null,
+            // color: Colors.grey[200],
+          ),
+          child: Scaffold(
+              key: _scaffoldKey,
+              backgroundColor: pageBackgroundColor(context),
+              resizeToAvoidBottomInset: resizeToAvoidBottomInset,
+              extendBodyBehindAppBar: extendBodyBehindAppBar,
+              endDrawer: endDrawer,
+              appBar: appBar(context),
+              body: SafeArea(
+                top: false,
+                child: body(context)),
+              floatingActionButton: floatingActionButton(context)),
+                    );
         }
       ),
       pushToWidget: (context) => pushToWidget?.call(context),