Refactor device-related views and add error handling

Refactor device-related views to improve code structure and readability.
Add error handling for authentication token in the splash view.
Remove unnecessary NavCubit from the app initialization.

lib/features/app_layout/bloc/nav_cubit.dart

@@ -1,167 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_svg/flutter_svg.dart';
-import 'package:syncrow_app/features/app_layout/view/widgets/app_bar_home_dropdown.dart';
-import 'package:syncrow_app/features/dashboard/view/dashboard_view.dart';
-import 'package:syncrow_app/features/devices/view/widgets/devices_view_body.dart';
-import 'package:syncrow_app/features/menu/view/menu_view.dart';
-import 'package:syncrow_app/features/scene/view/scene_view.dart';
-import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
-
-import '../../../generated/assets.dart';
-
-part 'nav_state.dart';
-
-class NavCubit extends Cubit<NavState> {
-  NavCubit() : super(NavInitial());
-
-  static NavCubit of(context) => BlocProvider.of<NavCubit>(context);
-
-  static clear() {
-    pageIndex = 0;
-  }
-
-  static int pageIndex = 0;
-
-  static Map<String, List<Widget>> appBarActions = {
-    'Dashboard': [
-      IconButton(
-        icon: const Icon(
-          Icons.add,
-          size: 25,
-        ),
-        style: ButtonStyle(
-          foregroundColor:
-              MaterialStateProperty.all(ColorsManager.textPrimaryColor),
-        ),
-        onPressed: () {},
-      ),
-    ],
-    'Devices': [
-      // IconButton(
-      //   icon: Image.asset(
-      //     Assets.iconsFilter,
-      //     height: 20,
-      //     width: 20,
-      //   ),
-      //   onPressed: () {},
-      // ),
-      IconButton(
-        icon: const Icon(
-          Icons.add,
-          size: 25,
-        ),
-        style: ButtonStyle(
-          foregroundColor:
-              MaterialStateProperty.all(ColorsManager.textPrimaryColor),
-        ),
-        onPressed: () {},
-      ),
-      IconButton(
-        icon: const Icon(
-          Icons.more_vert,
-          size: 25,
-        ),
-        style: ButtonStyle(
-          foregroundColor:
-              MaterialStateProperty.all(ColorsManager.textPrimaryColor),
-        ),
-        onPressed: () {},
-      ),
-    ],
-    'Routine': [
-      // IconButton(
-      //   icon: Image.asset(
-      //     Assets.iconsFilter,
-      //     height: 20,
-      //     width: 20,
-      //   ),
-      //   onPressed: () {},
-      // ),
-      IconButton(
-        icon: const Icon(
-          Icons.add,
-          size: 25,
-        ),
-        style: ButtonStyle(
-          foregroundColor:
-              MaterialStateProperty.all(ColorsManager.textPrimaryColor),
-        ),
-        onPressed: () {},
-      ),
-      IconButton(
-        icon: const Icon(
-          Icons.more_vert,
-          size: 25,
-        ),
-        style: ButtonStyle(
-          foregroundColor:
-              MaterialStateProperty.all(ColorsManager.textPrimaryColor),
-        ),
-        onPressed: () {},
-      ),
-    ],
-    'Menu': [
-      IconButton(
-        icon: SvgPicture.asset(
-          Assets.iconsScan,
-          height: 20,
-          width: 20,
-        ),
-        onPressed: () {},
-      ),
-    ],
-  };
-
-  static Map<String, Widget?> appBarLeading = {
-    'Dashboard': const AppBarHomeDropdown(),
-    'Devices': const AppBarHomeDropdown(),
-    'Routine': const AppBarHomeDropdown(),
-    'Menu': Padding(
-      padding: const EdgeInsets.only(left: 15),
-      child: Image.asset(
-        Assets.imagesLogoHorizontal,
-        height: 15,
-        width: 100,
-        fit: BoxFit.scaleDown,
-      ),
-    ),
-  };
-
-  var bottomNavItems = [
-    defaultBottomNavBarItem(icon: Assets.iconsDashboard, label: 'Dashboard'),
-    // defaultBottomNavBarItem(icon: Assets.iconslayout, label: 'Layout'),
-    defaultBottomNavBarItem(icon: Assets.iconsDevices, label: 'Devices'),
-    defaultBottomNavBarItem(icon: Assets.iconsRoutines, label: 'Routine'),
-    defaultBottomNavBarItem(icon: Assets.iconsMenu, label: 'Menu'),
-  ];
-
-  final List<Widget> pages = [
-    const DashboardView(),
-    // const LayoutPage(),
-    const DevicesViewBody(),
-    const SceneView(),
-    const MenuView(),
-  ];
-
-  void updatePageIndex(int index) {
-    pageIndex = index;
-
-    emit(NavChangePage());
-  }
-}
-
-BottomNavigationBarItem defaultBottomNavBarItem(
-    {required String icon, required String label}) {
-  return BottomNavigationBarItem(
-    icon: SvgPicture.asset(icon),
-    activeIcon: SvgPicture.asset(
-      icon.replaceAll('.svg', '-fill.svg'),
-      colorFilter: const ColorFilter.mode(
-        ColorsManager.primaryColor,
-        BlendMode.srcIn,
-      ),
-    ),
-    label: label,
-  );
-}

lib/features/app_layout/bloc/nav_state.dart

@@ -1,7 +0,0 @@
-part of 'nav_cubit.dart';
-
-abstract class NavState {}
-
-class NavInitial extends NavState {}
-
-class NavChangePage extends NavState {}

lib/features/app_layout/bloc/spaces_cubit.dart

@@ -1,27 +1,42 @@
 import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_svg/flutter_svg.dart';
 import 'package:syncrow_app/features/app_layout/model/space_model.dart';
+import 'package:syncrow_app/features/app_layout/view/widgets/app_bar_home_dropdown.dart';
+import 'package:syncrow_app/features/dashboard/view/dashboard_view.dart';
 import 'package:syncrow_app/features/devices/model/room_model.dart';
+import 'package:syncrow_app/features/devices/view/widgets/devices_view_body.dart';
+import 'package:syncrow_app/features/menu/view/menu_view.dart';
+import 'package:syncrow_app/features/scene/view/scene_view.dart';
+import 'package:syncrow_app/generated/assets.dart';
 import 'package:syncrow_app/services/api/network_exception.dart';
 import 'package:syncrow_app/services/api/spaces_api.dart';
+import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
 
 part 'spaces_state.dart';
 
 class SpacesCubit extends Cubit<SpacesState> {
   SpacesCubit() : super(SpacesInitial()) {
-    fetchSpaces().then((value) {
-      if (selectedSpace != null) {
-        fetchRooms(selectedSpace!);
+    if (SpacesCubit.spaces != null) {
+      if (selectedSpace == null) {
+        fetchSpaces().then((value) {
+          if (selectedSpace != null) {
+            print('selectedSpace: ${selectedSpace!.name}');
+            fetchRooms(selectedSpace!);
+          }
+        });
       }
-    });
+    } else {
+      fetchSpaces(); // this is for the first time
+    }
   }
 
   static SpacesCubit get(context) => BlocProvider.of(context);
 
-  static List<SpaceModel> spaces = [];
+  static List<SpaceModel>? spaces;
 
-  static SpaceModel? selectedSpace = spaces.isNotEmpty ? spaces.first : null;
+  static SpaceModel? selectedSpace;
 
   RoomModel? selectedRoom;
 
@@ -33,7 +48,7 @@ class SpacesCubit extends Cubit<SpacesState> {
 
   selectSpace(SpaceModel space) {
     selectedSpace = space;
-    emit(SpacesSelected(space));
+    emit(SpaceSelected(space));
   }
 
   roomSliderPageChanged(int index) {
@@ -84,27 +99,177 @@ class SpacesCubit extends Cubit<SpacesState> {
   }
 
   fetchSpaces() async {
-    emit(SpacesLoading());
+    emit(GetSpacesLoading());
     try {
       spaces = await SpacesAPI.getSpaces();
-      spaces.isNotEmpty ? selectSpace(spaces.first) : null;
-      emit(SpacesLoaded(spaces));
+      selectedSpace = spaces!.isNotEmpty ? selectSpace(spaces!.first) : null;
+      emit(GetSpacesLoaded(spaces!));
     } on DioException catch (e) {
-      emit(SpacesError(ServerFailure.fromDioError(e).errMessage));
+      emit(GetSpacesError(ServerFailure.fromDioError(e).errMessage));
     }
   }
 
   fetchRooms(SpaceModel space) async {
-    emit(SpaceRoomsLoading());
+    emit(GetSpaceRoomsLoading());
     try {
       space.rooms = await SpacesAPI.getRooms(space.id!);
       if (space.rooms != null) {
-        emit(SpaceRoomsLoaded(space.rooms!));
+        emit(GetSpaceRoomsLoaded(space.rooms!));
       } else {
-        emit(SpaceRoomsError("No rooms found"));
+        emit(GetSpaceRoomsError("No rooms found"));
       }
     } on DioException catch (e) {
-      emit(SpacesError(ServerFailure.fromDioError(e).errMessage));
+      emit(GetSpacesError(ServerFailure.fromDioError(e).errMessage));
     }
   }
+
+  ////////////////////////////////////////Nav////////////////////////////////////////
+
+  static clear() {
+    pageIndex = 0;
+  }
+
+  static int pageIndex = 0;
+
+  static Map<String, List<Widget>> appBarActions = {
+    'Dashboard': [
+      IconButton(
+        icon: const Icon(
+          Icons.add,
+          size: 25,
+        ),
+        style: ButtonStyle(
+          foregroundColor:
+              MaterialStateProperty.all(ColorsManager.textPrimaryColor),
+        ),
+        onPressed: () {},
+      ),
+    ],
+    'Devices': [
+      // IconButton(
+      //   icon: Image.asset(
+      //     Assets.iconsFilter,
+      //     height: 20,
+      //     width: 20,
+      //   ),
+      //   onPressed: () {},
+      // ),
+      IconButton(
+        icon: const Icon(
+          Icons.add,
+          size: 25,
+        ),
+        style: ButtonStyle(
+          foregroundColor:
+              MaterialStateProperty.all(ColorsManager.textPrimaryColor),
+        ),
+        onPressed: () {},
+      ),
+      IconButton(
+        icon: const Icon(
+          Icons.more_vert,
+          size: 25,
+        ),
+        style: ButtonStyle(
+          foregroundColor:
+              MaterialStateProperty.all(ColorsManager.textPrimaryColor),
+        ),
+        onPressed: () {},
+      ),
+    ],
+    'Routine': [
+      // IconButton(
+      //   icon: Image.asset(
+      //     Assets.iconsFilter,
+      //     height: 20,
+      //     width: 20,
+      //   ),
+      //   onPressed: () {},
+      // ),
+      IconButton(
+        icon: const Icon(
+          Icons.add,
+          size: 25,
+        ),
+        style: ButtonStyle(
+          foregroundColor:
+              MaterialStateProperty.all(ColorsManager.textPrimaryColor),
+        ),
+        onPressed: () {},
+      ),
+      IconButton(
+        icon: const Icon(
+          Icons.more_vert,
+          size: 25,
+        ),
+        style: ButtonStyle(
+          foregroundColor:
+              MaterialStateProperty.all(ColorsManager.textPrimaryColor),
+        ),
+        onPressed: () {},
+      ),
+    ],
+    'Menu': [
+      IconButton(
+        icon: SvgPicture.asset(
+          Assets.iconsScan,
+          height: 20,
+          width: 20,
+        ),
+        onPressed: () {},
+      ),
+    ],
+  };
+
+  static Map<String, Widget?> appBarLeading = {
+    'Dashboard': const AppBarHomeDropdown(),
+    'Devices': const AppBarHomeDropdown(),
+    'Routine': const AppBarHomeDropdown(),
+    'Menu': Padding(
+      padding: const EdgeInsets.only(left: 15),
+      child: Image.asset(
+        Assets.imagesLogoHorizontal,
+        height: 15,
+        width: 100,
+        fit: BoxFit.scaleDown,
+      ),
+    ),
+  };
+
+  var bottomNavItems = [
+    defaultBottomNavBarItem(icon: Assets.iconsDashboard, label: 'Dashboard'),
+    // defaultBottomNavBarItem(icon: Assets.iconslayout, label: 'Layout'),
+    defaultBottomNavBarItem(icon: Assets.iconsDevices, label: 'Devices'),
+    defaultBottomNavBarItem(icon: Assets.iconsRoutines, label: 'Routine'),
+    defaultBottomNavBarItem(icon: Assets.iconsMenu, label: 'Menu'),
+  ];
+
+  final List<Widget> pages = [
+    const DashboardView(),
+    // const LayoutPage(),
+    const DevicesViewBody(),
+    const SceneView(),
+    const MenuView(),
+  ];
+
+  void updatePageIndex(int index) {
+    pageIndex = index;
+
+    emit(NavChangePage());
+  }
+}
+
+BottomNavigationBarItem defaultBottomNavBarItem(
+    {required String icon, required String label}) {
+  return BottomNavigationBarItem(
+    icon: SvgPicture.asset(icon),
+    activeIcon: SvgPicture.asset(
+      icon.replaceAll('.svg', '-fill.svg'),
+      colorFilter: const ColorFilter.mode(
+        ColorsManager.primaryColor,
+        BlendMode.srcIn,
+      ),
+    ),
+    label: label,
+  );
 }

lib/features/app_layout/bloc/spaces_state.dart

@@ -4,36 +4,37 @@ abstract class SpacesState {}
 
 class SpacesInitial extends SpacesState {}
 
-class SpacesLoading extends SpacesState {}
+class GetSpacesLoading extends SpacesState {}
 
-class SpacesLoaded extends SpacesState {
+class GetSpacesLoaded extends SpacesState {
   final List<SpaceModel> spaces;
 
-  SpacesLoaded(this.spaces);
+  GetSpacesLoaded(this.spaces);
 }
 
-class SpacesError extends SpacesState {
+class GetSpacesError extends SpacesState {
   final String errMessage;
 
-  SpacesError(this.errMessage);
+  GetSpacesError(this.errMessage);
 }
 
-class SpaceRoomsLoading extends SpacesLoading {}
+class GetSpaceRoomsLoading extends SpacesState {}
 
-class SpaceRoomsLoaded extends SpacesLoading {
+class GetSpaceRoomsLoaded extends SpacesState {
   final List<RoomModel> rooms;
 
-  SpaceRoomsLoaded(this.rooms);
+  GetSpaceRoomsLoaded(this.rooms);
 }
 
-class SpaceRoomsError extends SpacesError {
-  SpaceRoomsError(super.errMessage);
+class GetSpaceRoomsError extends SpacesState {
+  final String errMessage;
+  GetSpaceRoomsError(this.errMessage);
 }
 
-class SpacesSelected extends SpacesState {
+class SpaceSelected extends SpacesState {
   final SpaceModel space;
 
-  SpacesSelected(this.space);
+  SpaceSelected(this.space);
 }
 
 class RoomSelected extends SpacesState {
@@ -43,3 +44,5 @@ class RoomSelected extends SpacesState {
 }
 
 class RoomUnSelected extends SpacesState {}
+
+class NavChangePage extends SpacesState {}

lib/features/app_layout/view/app_layout.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_app/features/app_layout/bloc/nav_cubit.dart';
+
 import 'package:syncrow_app/features/app_layout/bloc/spaces_cubit.dart';
 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';
@@ -26,7 +26,7 @@ class AppLayout extends StatelessWidget {
       ],
       child: BlocListener<SpacesCubit, SpacesState>(
         listener: (context, state) {
-          if (state is SpacesError) {
+          if (state is GetSpacesError) {
             ScaffoldMessenger.of(context).showSnackBar(
               SnackBar(
                 content: Text(state.errMessage),
@@ -36,7 +36,7 @@ class AppLayout extends StatelessWidget {
                 .popUntil((route) => route.settings.name == Routes.authLogin);
           }
         },
-        child: BlocBuilder<NavCubit, NavState>(
+        child: BlocBuilder<SpacesCubit, SpacesState>(
           builder: (context, state) {
             return AnnotatedRegion(
               value: SystemUiOverlayStyle(
@@ -50,15 +50,15 @@ class AppLayout extends StatelessWidget {
                       backgroundColor: ColorsManager.backgroundColor,
                       extendBodyBehindAppBar: true,
                       extendBody: true,
-                      appBar:
-                          state is! SpacesLoading || state is! SpaceRoomsLoading
-                              ? const DefaultAppBar()
-                              : null,
+                      appBar: state is! GetSpacesLoading ||
+                              state is! GetSpaceRoomsLoading
+                          ? const DefaultAppBar()
+                          : null,
                       body: const AppBody(),
-                      bottomNavigationBar:
-                          state is! SpacesLoading || state is! SpaceRoomsLoading
-                              ? const DefaultNavBar()
-                              : null,
+                      bottomNavigationBar: state is! GetSpacesLoading ||
+                              state is! GetSpaceRoomsLoading
+                          ? const DefaultNavBar()
+                          : null,
                     );
                   },
                 ),

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

@@ -17,60 +17,62 @@ class AppBarHomeDropdown extends StatelessWidget {
   Widget build(BuildContext context) {
     return BlocBuilder<SpacesCubit, SpacesState>(
       builder: (context, state) {
-        return Padding(
-          padding: const EdgeInsets.only(left: 10, right: 10),
-          child: DropdownButton(
-            icon: const Icon(
-              Icons.expand_more,
-              color: Colors.black,
-              size: 25,
-            ),
-            underline: const SizedBox.shrink(),
-            padding: const EdgeInsets.all(0),
-            borderRadius: BorderRadius.circular(20),
-            value: SpacesCubit.selectedSpace!.id,
-            items: SpacesCubit.spaces.map((space) {
-              return DropdownMenuItem(
-                value: space.id,
-                child: SizedBox(
-                  width: 100,
-                  child: Row(
-                    mainAxisAlignment: MainAxisAlignment.start,
-                    mainAxisSize: MainAxisSize.min,
-                    children: <Widget>[
-                      SvgPicture.asset(
-                        Assets.iconsHome,
-                        width: 25,
-                        height: 25,
-                        colorFilter: const ColorFilter.mode(
-                          ColorsManager.textPrimaryColor,
-                          BlendMode.srcIn,
-                        ),
-                      ),
-                      const SizedBox(width: 5),
-                      Expanded(
-                        child: BodyMedium(
-                          text: space.name ?? "??",
-                          style: context.bodyMedium.copyWith(
-                            fontSize: 15,
-                            color: ColorsManager.textPrimaryColor,
-                            overflow: TextOverflow.ellipsis,
-                          ),
-                        ),
-                      ),
-                    ],
+        return SpacesCubit.selectedSpace == null
+            ? const Center(child: BodyMedium(text: 'No Home Selected'))
+            : Padding(
+                padding: const EdgeInsets.only(left: 10, right: 10),
+                child: DropdownButton(
+                  icon: const Icon(
+                    Icons.expand_more,
+                    color: Colors.black,
+                    size: 25,
                   ),
+                  underline: const SizedBox.shrink(),
+                  padding: const EdgeInsets.all(0),
+                  borderRadius: BorderRadius.circular(20),
+                  value: SpacesCubit.selectedSpace!.id,
+                  items: SpacesCubit.spaces!.map((space) {
+                    return DropdownMenuItem(
+                      value: space.id,
+                      child: SizedBox(
+                        width: 100,
+                        child: Row(
+                          mainAxisAlignment: MainAxisAlignment.start,
+                          mainAxisSize: MainAxisSize.min,
+                          children: <Widget>[
+                            SvgPicture.asset(
+                              Assets.iconsHome,
+                              width: 25,
+                              height: 25,
+                              colorFilter: const ColorFilter.mode(
+                                ColorsManager.textPrimaryColor,
+                                BlendMode.srcIn,
+                              ),
+                            ),
+                            const SizedBox(width: 5),
+                            Expanded(
+                              child: BodyMedium(
+                                text: space.name ?? "??",
+                                style: context.bodyMedium.copyWith(
+                                  fontSize: 15,
+                                  color: ColorsManager.textPrimaryColor,
+                                  overflow: TextOverflow.ellipsis,
+                                ),
+                              ),
+                            ),
+                          ],
+                        ),
+                      ),
+                    );
+                  }).toList(),
+                  onChanged: (value) {
+                    if (value != null) {
+                      SpacesCubit.get(context).selectSpace(SpacesCubit.spaces!
+                          .firstWhere((element) => element.id == value));
+                    }
+                  },
                 ),
               );
-            }).toList(),
-            onChanged: (value) {
-              if (value != null) {
-                SpacesCubit.get(context).selectSpace(SpacesCubit.spaces
-                    .firstWhere((element) => element.id == value));
-              }
-            },
-          ),
-        );
       },
     );
   }

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

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_app/features/app_layout/bloc/nav_cubit.dart';
+
 import 'package:syncrow_app/features/app_layout/bloc/spaces_cubit.dart';
 
 import '../../../../generated/assets.dart';
@@ -12,7 +12,7 @@ class AppBody extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return BlocBuilder<NavCubit, NavState>(
+    return BlocBuilder<SpacesCubit, SpacesState>(
       builder: (context, state) {
         return Container(
           width: MediaQuery.sizeOf(context).width,
@@ -28,7 +28,7 @@ class AppBody extends StatelessWidget {
           ),
           child: BlocConsumer<SpacesCubit, SpacesState>(
             listener: (context, state) {
-              if (state is SpacesError) {
+              if (state is GetSpacesError) {
                 ScaffoldMessenger.of(context).showSnackBar(
                   SnackBar(
                     content: Text(state.errMessage),
@@ -37,8 +37,9 @@ class AppBody extends StatelessWidget {
               }
             },
             builder: (context, state) {
-              return state is! SpacesLoading || state is! SpaceRoomsLoading
-                  ? NavCubit.of(context).pages[NavCubit.pageIndex]
+              return state is! GetSpacesLoading ||
+                      state is! GetSpaceRoomsLoading
+                  ? SpacesCubit.get(context).pages[SpacesCubit.pageIndex]
                   : const Center(child: CircularProgressIndicator());
             },
           ),

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

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_app/features/app_layout/bloc/nav_cubit.dart';
+
 import 'package:syncrow_app/features/app_layout/bloc/spaces_cubit.dart';
 import 'package:syncrow_app/utils/resource_manager/constants.dart';
 
@@ -9,27 +9,26 @@ class DefaultAppBar extends StatelessWidget implements PreferredSizeWidget {
 
   @override
   Widget build(BuildContext context) {
-    return BlocBuilder<NavCubit, NavState>(
+    return BlocBuilder<SpacesCubit, SpacesState>(
       builder: (context, state) {
-        return BlocBuilder<SpacesCubit, SpacesState>(
-          builder: (context, state) {
-            return Padding(
-              padding: const EdgeInsets.only(
-                top: 20,
-              ),
-              child: AppBar(
-                backgroundColor: Colors.transparent,
-                leadingWidth: 150,
-                toolbarHeight: Constants.appBarHeight,
-                leading: SpacesCubit.spaces.isNotEmpty
-                    ? NavCubit.appBarLeading[
-                        NavCubit().bottomNavItems[NavCubit.pageIndex].label]
-                    : null,
-                actions: NavCubit.appBarActions[
-                    NavCubit().bottomNavItems[NavCubit.pageIndex].label],
-              ),
-            );
-          },
+        return Padding(
+          padding: const EdgeInsets.only(
+            top: 20,
+          ),
+          child: AppBar(
+            backgroundColor: Colors.transparent,
+            leadingWidth: 150,
+            toolbarHeight: Constants.appBarHeight,
+            leading: SpacesCubit.spaces != null
+                ? SpacesCubit.spaces!.isNotEmpty
+                    ? SpacesCubit.appBarLeading[SpacesCubit()
+                        .bottomNavItems[SpacesCubit.pageIndex]
+                        .label]
+                    : null
+                : null,
+            actions: SpacesCubit.appBarActions[
+                SpacesCubit().bottomNavItems[SpacesCubit.pageIndex].label],
+          ),
         );
       },
     );

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

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_app/features/app_layout/bloc/nav_cubit.dart';
+
 import 'package:syncrow_app/features/app_layout/bloc/spaces_cubit.dart';
 import 'package:syncrow_app/features/devices/bloc/devices_cubit.dart';
 import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
@@ -13,9 +13,9 @@ class DefaultNavBar extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return BlocBuilder<NavCubit, NavState>(
+    return BlocBuilder<SpacesCubit, SpacesState>(
       builder: (context, state) {
-        var cubit = NavCubit.of(context);
+        var cubit = SpacesCubit.get(context);
         return SizedBox(
           height: Constants.bottomNavBarHeight,
           child: BottomNavigationBar(
@@ -29,7 +29,7 @@ class DefaultNavBar extends StatelessWidget {
                 SpacesCubit.get(context).unselectRoom();
               }
             },
-            currentIndex: NavCubit.pageIndex,
+            currentIndex: SpacesCubit.pageIndex,
             selectedItemColor: ColorsManager.primaryColor,
             selectedLabelStyle: const TextStyle(
               color: ColorsManager.primaryColor,