Add a safearea around all the screens

lib/routes.dart

@@ -50,31 +50,28 @@ final List<RouteBase> routes = [
           ),
       routes: [
         GoRoute(
-          path: 'sales/order/:pk/pay',
-          name: 'sales-order-pay',
-          pageBuilder: (context, state) {
-            return CustomTransitionPage(
-              barrierColor: Colors.black54,
-              opaque: false,
-              transitionDuration: const Duration(milliseconds: 150),
-              transitionsBuilder: (
-                context,
-                animation,
-                secondaryAnimation,
-                child,
-              ) {
-                return FadeTransition(
-                  opacity: CurvedAnimation(
-                    parent: animation,
-                    curve: Curves.easeOut,
-                  ),
-                  child: child,
-                );
-              },
-              child: SalesOrderDialog(pk: state.params['pk']!),
-            );
-          },
-        ),
+            path: 'sales/order/:pk/pay',
+            name: 'sales-order-pay',
+            pageBuilder: (context, state) => CustomTransitionPage(
+                  barrierColor: Colors.black54,
+                  opaque: false,
+                  transitionDuration: const Duration(milliseconds: 150),
+                  transitionsBuilder: (
+                    context,
+                    animation,
+                    secondaryAnimation,
+                    child,
+                  ) {
+                    return FadeTransition(
+                      opacity: CurvedAnimation(
+                        parent: animation,
+                        curve: Curves.easeOut,
+                      ),
+                      child: child,
+                    );
+                  },
+                  child: SalesOrderDialog(pk: state.params['pk']!),
+                )),
       ]),
   GoRoute(
     path: '/events',
@@ -373,15 +370,13 @@ final List<RouteBase> routes = [
   GoRoute(
     path: '/pizzas',
     name: 'food',
-    pageBuilder: (context, state) {
-      return MaterialPage(
-        key: state.pageKey,
-        child: FoodScreen(
-          pk: (state.extra as Event?)?.foodEvent,
-          event: state.extra as Event?,
-        ),
-      );
-    },
+    pageBuilder: (context, state) => MaterialPage(
+      key: state.pageKey,
+      child: FoodScreen(
+        pk: (state.extra as Event?)?.foodEvent,
+        event: state.extra as Event?,
+      ),
+    ),
     routes: [
       GoRoute(
         path: 'admin',

lib/tosti/tosti_shift_screen.dart

@@ -7,6 +7,8 @@ import 'package:reaxit/tosti/models.dart';
 import 'package:reaxit/tosti/tosti_api_repository.dart';
 import 'package:reaxit/ui/widgets.dart';
 
+import '../ui/widgets/safe_custom_scrollview.dart';
+
 class TostiShiftScreen extends StatelessWidget {
   const TostiShiftScreen({required this.id, required this.api});
 
@@ -173,7 +175,7 @@ class TostiShiftScreen extends StatelessWidget {
 
                 return RefreshIndicator(
                   onRefresh: () => cubit.load(id),
-                  child: CustomScrollView(
+                  child: SafeCustomScrollView(
                     slivers: [header, orderList],
                   ),
                 );

lib/ui/screens/albums_screen.dart

@@ -4,6 +4,7 @@ import 'package:google_fonts/google_fonts.dart';
 import 'package:reaxit/blocs.dart';
 import 'package:reaxit/api/api_repository.dart';
 import 'package:reaxit/ui/widgets.dart';
+import 'package:reaxit/ui/widgets/safe_custom_scrollview.dart';
 
 class AlbumsScreen extends StatefulWidget {
   @override
@@ -194,7 +195,7 @@ class AlbumListScrollView extends StatelessWidget {
   Widget build(BuildContext context) {
     return Scrollbar(
         controller: controller,
-        child: CustomScrollView(
+        child: SafeCustomScrollView(
           controller: controller,
           physics: const RangeMaintainingScrollPhysics(
             parent: AlwaysScrollableScrollPhysics(),

lib/ui/screens/calendar_screen.dart

@@ -9,6 +9,7 @@ import 'package:reaxit/blocs.dart';
 import 'package:reaxit/models.dart';
 import 'package:reaxit/ui/theme.dart';
 import 'package:reaxit/ui/widgets.dart';
+import 'package:reaxit/ui/widgets/safe_custom_scrollview.dart';
 import 'package:sticky_headers/sticky_headers/widget.dart';
 import 'package:url_launcher/url_launcher.dart';
 
@@ -234,13 +235,14 @@ class CalendarScrollView extends StatelessWidget {
 
     return Scrollbar(
       controller: controller,
-      child: CustomScrollView(
+      child: SafeCustomScrollView(
         controller: controller,
         physics: const RangeMaintainingScrollPhysics(
           parent: AlwaysScrollableScrollPhysics(),
         ),
         slivers: [
           SliverPadding(
+            // should this padding be here?
             padding: const EdgeInsets.all(12),
             sliver: SliverList(
               delegate: SliverChildBuilderDelegate(

lib/ui/screens/event_screen.dart

@@ -11,6 +11,7 @@ import 'package:reaxit/blocs.dart';
 import 'package:reaxit/models.dart';
 import 'package:reaxit/routes.dart';
 import 'package:reaxit/ui/widgets.dart';
+import 'package:reaxit/ui/widgets/safe_custom_scrollview.dart';
 import 'package:share_plus/share_plus.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:reaxit/config.dart' as config;
@@ -898,24 +899,22 @@ class _EventScreenState extends State<EventScreen> {
               actions: [_makeShareEventButton(widget.pk)],
             ),
             body: RefreshIndicator(
-              onRefresh: () async {
-                // Await only the event info.
-                _registrationsCubit.load();
-                await _eventCubit.load();
-              },
-              child: ErrorScrollView(state.message!),
-            ),
+                onRefresh: () async {
+                  // Await only the event info.
+                  _registrationsCubit.load();
+                  await _eventCubit.load();
+                },
+                child: ErrorScrollView(state.message!)),
           );
         } else if (state.isLoading &&
             widget.event == null &&
             state.result == null) {
           return Scaffold(
-            appBar: ThaliaAppBar(
-              title: const Text('EVENT'),
-              actions: [_makeShareEventButton(widget.pk)],
-            ),
-            body: const Center(child: CircularProgressIndicator()),
-          );
+              appBar: ThaliaAppBar(
+                title: const Text('EVENT'),
+                actions: [_makeShareEventButton(widget.pk)],
+              ),
+              body: const Center(child: CircularProgressIndicator()));
         } else {
           final event = (state.result ?? widget.event)!;
           return Scaffold(
@@ -946,7 +945,7 @@ class _EventScreenState extends State<EventScreen> {
                 builder: (context, listState) {
                   return Scrollbar(
                     controller: _controller,
-                    child: CustomScrollView(
+                    child: SafeCustomScrollView(
                       controller: _controller,
                       key: const PageStorageKey('event'),
                       slivers: [

lib/ui/screens/food_admin_screen.dart

@@ -87,6 +87,7 @@ class _FoodAdminScreenState extends State<FoodAdminScreen> {
   }
 }
 
+//TODO: This does not carry any state?
 class _OrderTile extends StatefulWidget {
   final AdminFoodOrder order;
 

lib/ui/screens/group_screen.dart

@@ -7,6 +7,7 @@ import 'package:reaxit/blocs.dart';
 import 'package:reaxit/models.dart';
 import 'package:reaxit/routes.dart';
 import 'package:reaxit/ui/widgets.dart';
+import 'package:reaxit/ui/widgets/safe_custom_scrollview.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class GroupScreen extends StatelessWidget {
@@ -94,7 +95,7 @@ class _Page extends StatelessWidget {
         body: RefreshIndicator(
           onRefresh: () => cubit.load(),
           child: Scrollbar(
-            child: CustomScrollView(
+            child: SafeCustomScrollView(
               key: const PageStorageKey('group'),
               slivers: [
                 SliverToBoxAdapter(
@@ -121,7 +122,7 @@ class _Page extends StatelessWidget {
         body: RefreshIndicator(
           onRefresh: () => cubit.load(),
           child: Scrollbar(
-            child: CustomScrollView(
+            child: SafeCustomScrollView(
               key: const PageStorageKey('group'),
               slivers: [
                 SliverToBoxAdapter(

lib/ui/screens/groups_screen.dart

@@ -4,6 +4,7 @@ import 'package:reaxit/blocs/groups_cubit.dart';
 import 'package:reaxit/models/group.dart';
 import 'package:reaxit/ui/widgets.dart';
 import 'package:collection/collection.dart';
+import 'package:reaxit/ui/widgets/safe_custom_scrollview.dart';
 
 class GroupsScreen extends StatefulWidget {
   final MemberGroupType? currentScreen;
@@ -138,7 +139,7 @@ class GroupListScrollView extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Scrollbar(
-      child: CustomScrollView(
+      child: SafeCustomScrollView(
         physics: const RangeMaintainingScrollPhysics(
           parent: AlwaysScrollableScrollPhysics(),
         ),

lib/ui/screens/login_screen.dart

@@ -29,59 +29,63 @@ class _LoginScreenState extends State<LoginScreen> {
       builder: (context, authState) {
         if (authState is LoadingAuthState) {
           return Scaffold(
-            backgroundColor: const Color(0xFFE62272),
-            body: Column(
-              mainAxisAlignment: MainAxisAlignment.center,
-              crossAxisAlignment: CrossAxisAlignment.stretch,
-              children: [
-                Center(
-                  child: Image(
-                    image: logo,
-                    width: 260,
-                  ),
-                ),
-                const SizedBox(height: 50),
-                const SizedBox(
-                  height: 50,
-                  child: Center(
-                    child: CircularProgressIndicator(
-                      valueColor: AlwaysStoppedAnimation<Color>(Colors.white),
+              backgroundColor: const Color(0xFFE62272),
+              body: SafeArea(
+                child: Column(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  crossAxisAlignment: CrossAxisAlignment.stretch,
+                  children: [
+                    Center(
+                      child: Image(
+                        image: logo,
+                        width: 260,
+                      ),
                     ),
-                  ),
+                    const SizedBox(height: 50),
+                    const SizedBox(
+                      height: 50,
+                      child: Center(
+                        child: CircularProgressIndicator(
+                          valueColor:
+                              AlwaysStoppedAnimation<Color>(Colors.white),
+                        ),
+                      ),
+                    ),
+                  ],
                 ),
-              ],
-            ),
-          );
+              ));
         } else {
           return Scaffold(
             backgroundColor: magenta,
-            body: Column(
-              mainAxisAlignment: MainAxisAlignment.center,
-              children: [
-                Center(
-                  child: Image(
-                    image: logo,
-                    width: 260,
+            body: SafeArea(
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  Center(
+                    child: Image(
+                      image: logo,
+                      width: 260,
+                    ),
                   ),
-                ),
-                const SizedBox(height: 50),
-                SizedBox(
-                  height: 50,
-                  child: ElevatedButton(
-                    style: ElevatedButton.styleFrom(
-                      backgroundColor: Colors.black87,
-                      foregroundColor: Colors.white,
+                  const SizedBox(height: 50),
+                  SizedBox(
+                    height: 50,
+                    child: ElevatedButton(
+                      style: ElevatedButton.styleFrom(
+                        backgroundColor: Colors.black87,
+                        foregroundColor: Colors.white,
+                      ),
+                      onPressed: () {
+                        BlocProvider.of<AuthCubit>(
+                          context,
+                          listen: false,
+                        ).logIn();
+                      },
+                      child: const Text('LOGIN'),
                     ),
-                    onPressed: () {
-                      BlocProvider.of<AuthCubit>(
-                        context,
-                        listen: false,
-                      ).logIn();
-                    },
-                    child: const Text('LOGIN'),
                   ),
-                ),
-              ],
+                ],
+              ),
             ),
           );
         }