switched the safe area to be in the scaffold

lib/features/app_layout/view/app_layout.dart

@@ -7,6 +7,7 @@ import 'package:syncrow_app/features/app_layout/view/widgets/app_body.dart';
 import 'package:syncrow_app/features/app_layout/view/widgets/default_app_bar.dart';
 import 'package:syncrow_app/features/app_layout/view/widgets/default_nav_bar.dart';
 import 'package:syncrow_app/features/devices/view/widgets/smart_door/smart_linkage_view.dart';
+import 'package:syncrow_app/features/shared_widgets/default_scaffold.dart';
 import 'package:syncrow_app/utils/helpers/custom_page_route.dart';
 import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
 
@@ -19,23 +20,12 @@ class AppLayout extends StatelessWidget {
       create: (context) => HomeCubit.getInstance(),
       child: BlocBuilder<HomeCubit, HomeState>(
         builder: (context, state) {
-          return AnnotatedRegion(
+          return DefaultScaffold(
-            value: SystemUiOverlayStyle(
-              statusBarColor: ColorsManager.primaryColor.withOpacity(0.5),
-              statusBarIconBrightness: Brightness.light,
-            ),
-            child: SafeArea(
-              child: Scaffold(
-                backgroundColor: ColorsManager.backgroundColor,
-                extendBodyBehindAppBar: true,
-                extendBody: true,
             appBar: HomeCubit.getInstance().spaces != null
                 ? const DefaultAppBar()
                 : null,
-                body: const AppBody(),
+            bottomNavBar: const DefaultNavBar(),
-                bottomNavigationBar: const DefaultNavBar(),
+            child: const AppBody(),
-              ),
-            ),
           );
         },
       ),

lib/features/app_layout/view/widgets/app_body.dart

@@ -15,32 +15,20 @@ class AppBody extends StatelessWidget {
     return BlocConsumer<HomeCubit, HomeState>(
       listener: (context, state) {
         if (state is GetSpacesError) {
-          // ScaffoldMessenger.of(context).showSnackBar(
+          ScaffoldMessenger.of(context).removeCurrentSnackBar();
-          //   SnackBar(
+          ScaffoldMessenger.of(context).showSnackBar(
-          //     content: Text(state.errMessage),
+            SnackBar(
-          //   ),
+              content: Text(state.errMessage),
-          // );
+            ),
+          );
         }
       },
       builder: (context, state) {
-        return Container(
+        return state is! GetSpacesLoading
-          width: MediaQuery.sizeOf(context).width,
-          height: MediaQuery.sizeOf(context).height,
-          decoration: const BoxDecoration(
-            image: DecorationImage(
-              image: AssetImage(
-                Assets.imagesBackground,
-              ),
-              fit: BoxFit.cover,
-              opacity: 0.4,
-            ),
-          ),
-          child: state is! GetSpacesLoading
             ? state is! GetSpaceRoomsLoading
                 ? HomeCubit.getInstance().pages[HomeCubit.pageIndex]
                 : const Center(child: CircularProgressIndicator())
-              : const Center(child: CircularProgressIndicator()),
+            : const Center(child: CircularProgressIndicator());
-        );
       },
     );
   }

lib/features/app_layout/view/widgets/default_nav_bar.dart

@@ -3,7 +3,6 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 
 import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
 import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
-import 'package:syncrow_app/utils/resource_manager/constants.dart';
 
 class DefaultNavBar extends StatelessWidget {
   const DefaultNavBar({
@@ -15,20 +14,10 @@ class DefaultNavBar extends StatelessWidget {
     return BlocBuilder<HomeCubit, HomeState>(
       builder: (context, state) {
         var cubit = HomeCubit.getInstance();
-        return SizedBox(
+        return BottomNavigationBar(
-          height: Constants.bottomNavBarHeight,
-          child: BottomNavigationBar(
           backgroundColor: Colors.transparent,
           onTap: (int index) {
             cubit.updatePageIndex(index);
-              // if (DevicesCubit.getInstance().chosenCategoryView != null) {
-              //   DevicesCubit.getInstance()
-              //       .clearCategoriesSelection(context);
-              // }
-              // if (HomeCubit.getInstance().selectedRoom != null) {
-              //   HomeCubit.getInstance().unselectRoom();
-              // }
-
             HomeCubit.getInstance().updatePageIndex(index);
           },
           currentIndex: HomeCubit.pageIndex,
@@ -42,7 +31,6 @@ class DefaultNavBar extends StatelessWidget {
           type: BottomNavigationBarType.fixed,
           elevation: 0,
           items: HomeCubit.bottomNavItems,
-          ),
         );
       },
     );

lib/features/dashboard/view/dashboard_view.dart

@@ -15,16 +15,8 @@ class DashboardView extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Padding(
+    return SingleChildScrollView(
-      padding: EdgeInsets.only(
-        top: Constants.appBarHeight,
-        left: Constants.defaultPadding,
-        right: Constants.defaultPadding,
-        bottom: Constants.bottomNavBarHeight,
-      ),
-      child: SingleChildScrollView(
       child: Column(
-          mainAxisAlignment: MainAxisAlignment.start,
         crossAxisAlignment: CrossAxisAlignment.stretch,
         children: [
           const TitleMedium(
@@ -54,7 +46,6 @@ class DashboardView extends StatelessWidget {
           ),
         ],
       ),
-      ),
     );
   }
 }

lib/features/shared_widgets/default_scaffold.dart

@@ -1,4 +1,3 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:syncrow_app/features/shared_widgets/text_widgets/body_large.dart';
@@ -9,11 +8,18 @@ import 'package:syncrow_app/utils/resource_manager/font_manager.dart';
 
 class DefaultScaffold extends StatelessWidget {
   const DefaultScaffold(
-      {super.key, required this.child, this.title, this.actions});
+      {super.key,
+      required this.child,
+      this.title,
+      this.actions,
+      this.appBar,
+      this.bottomNavBar});
 
   final Widget child;
   final String? title;
   final List<Widget>? actions;
+  final PreferredSizeWidget? appBar;
+  final Widget? bottomNavBar;
   @override
   Widget build(BuildContext context) {
     return AnnotatedRegion(
@@ -26,7 +32,8 @@ class DefaultScaffold extends StatelessWidget {
         backgroundColor: ColorsManager.backgroundColor,
         extendBodyBehindAppBar: true,
         extendBody: true,
-        appBar: AppBar(
+        appBar: appBar ??
+            AppBar(
               backgroundColor: Colors.transparent,
               centerTitle: true,
               title: BodyLarge(
@@ -39,7 +46,8 @@ class DefaultScaffold extends StatelessWidget {
         body: Container(
           width: MediaQuery.sizeOf(context).width,
           height: MediaQuery.sizeOf(context).height,
-          padding: const EdgeInsets.all(Constants.defaultPadding),
+          padding:
+              const EdgeInsets.symmetric(horizontal: Constants.defaultPadding),
           decoration: const BoxDecoration(
             image: DecorationImage(
               image: AssetImage(
@@ -51,6 +59,7 @@ class DefaultScaffold extends StatelessWidget {
           ),
           child: SafeArea(child: child),
         ),
+        bottomNavigationBar: bottomNavBar,
       ),
     );
   }

lib/utils/resource_manager/constants.dart

@@ -9,8 +9,8 @@ abstract class Constants {
 
   static const String countryCode = "US";
 
-  static const double appBarHeightPercentage = 0.12;
+  static const double appBarHeightPercentage = 0.1;
-  static const double bottomNavBarHeightPercentage = 0.1175;
+  static const double bottomNavBarHeightPercentage = 0.1;
   static late double appBarHeight;
   static late double bottomNavBarHeight;