bug_fixing 2

lib/features/app_layout/bloc/home_cubit.dart

@@ -16,7 +16,7 @@ import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
 
 part 'home_state.dart';
 
-class HomeCubit extends Cubit<SpacesState> {
+class HomeCubit extends Cubit<HomeState> {
   HomeCubit() : super(SpacesInitial()) {
     if (HomeCubit.spaces != null) {
       if (selectedSpace == null) {

lib/features/app_layout/bloc/home_state.dart

@@ -1,48 +1,48 @@
 part of 'home_cubit.dart';
 
-abstract class SpacesState {}
+abstract class HomeState {}
 
-class SpacesInitial extends SpacesState {}
+class SpacesInitial extends HomeState {}
 
-class GetSpacesLoading extends SpacesState {}
+class GetSpacesLoading extends HomeState {}
 
-class GetSpacesLoaded extends SpacesState {
+class GetSpacesLoaded extends HomeState {
   final List<SpaceModel> spaces;
 
   GetSpacesLoaded(this.spaces);
 }
 
-class GetSpacesError extends SpacesState {
+class GetSpacesError extends HomeState {
   final String errMessage;
 
   GetSpacesError(this.errMessage);
 }
 
-class GetSpaceRoomsLoading extends SpacesState {}
+class GetSpaceRoomsLoading extends HomeState {}
 
-class GetSpaceRoomsLoaded extends SpacesState {
+class GetSpaceRoomsLoaded extends HomeState {
   final List<RoomModel> rooms;
 
   GetSpaceRoomsLoaded(this.rooms);
 }
 
-class GetSpaceRoomsError extends SpacesState {
+class GetSpaceRoomsError extends HomeState {
   final String errMessage;
   GetSpaceRoomsError(this.errMessage);
 }
 
-class SpaceSelected extends SpacesState {
+class SpaceSelected extends HomeState {
   final SpaceModel space;
 
   SpaceSelected(this.space);
 }
 
-class RoomSelected extends SpacesState {
+class RoomSelected extends HomeState {
   final RoomModel room;
 
   RoomSelected(this.room);
 }
 
-class RoomUnSelected extends SpacesState {}
+class RoomUnSelected extends HomeState {}
 
-class NavChangePage extends SpacesState {}
+class NavChangePage extends HomeState {}

lib/features/app_layout/view/app_layout.dart

@@ -24,7 +24,7 @@ class AppLayout extends StatelessWidget {
           create: (context) => DevicesCubit(),
         ),
       ],
-      child: BlocListener<HomeCubit, SpacesState>(
+      child: BlocListener<HomeCubit, HomeState>(
         listener: (context, state) {
           if (state is GetSpacesError) {
             ScaffoldMessenger.of(context).showSnackBar(
@@ -36,7 +36,7 @@ class AppLayout extends StatelessWidget {
                 .popUntil((route) => route.settings.name == Routes.authLogin);
           }
         },
-        child: BlocBuilder<HomeCubit, SpacesState>(
+        child: BlocBuilder<HomeCubit, HomeState>(
           builder: (context, state) {
             return AnnotatedRegion(
               value: SystemUiOverlayStyle(
@@ -44,21 +44,15 @@ class AppLayout extends StatelessWidget {
                 statusBarIconBrightness: Brightness.light,
               ),
               child: SafeArea(
-                child: BlocBuilder<HomeCubit, SpacesState>(
+                child: BlocBuilder<HomeCubit, HomeState>(
                   builder: (context, state) {
-                    return Scaffold(
+                    return const Scaffold(
                       backgroundColor: ColorsManager.backgroundColor,
                       extendBodyBehindAppBar: true,
                       extendBody: true,
-                      appBar: state is! GetSpacesLoading ||
+                      appBar: DefaultAppBar(),
-                              state is! GetSpaceRoomsLoading
+                      body: AppBody(),
-                          ? const DefaultAppBar()
+                      bottomNavigationBar: DefaultNavBar(),
-                          : null,
-                      body: const AppBody(),
-                      bottomNavigationBar: state is! GetSpacesLoading ||
-                              state is! GetSpaceRoomsLoading
-                          ? const DefaultNavBar()
-                          : null,
                     );
                   },
                 ),

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

@@ -15,7 +15,7 @@ class AppBarHomeDropdown extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return BlocBuilder<HomeCubit, SpacesState>(
+    return BlocBuilder<HomeCubit, HomeState>(
       builder: (context, state) {
         return HomeCubit.selectedSpace == null
             ? const Center(child: BodyMedium(text: 'No Home Selected'))

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

@@ -12,7 +12,7 @@ class AppBody extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return BlocBuilder<HomeCubit, SpacesState>(
+    return BlocBuilder<HomeCubit, HomeState>(
       builder: (context, state) {
         return Container(
           width: MediaQuery.sizeOf(context).width,
@@ -26,7 +26,7 @@ class AppBody extends StatelessWidget {
               opacity: 0.4,
             ),
           ),
-          child: BlocConsumer<HomeCubit, SpacesState>(
+          child: BlocConsumer<HomeCubit, HomeState>(
             listener: (context, state) {
               if (state is GetSpacesError) {
                 ScaffoldMessenger.of(context).showSnackBar(

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

@@ -13,7 +13,7 @@ class DefaultNavBar extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return BlocBuilder<HomeCubit, SpacesState>(
+    return BlocBuilder<HomeCubit, HomeState>(
       builder: (context, state) {
         var cubit = HomeCubit.get(context);
         return SizedBox(

lib/features/devices/view/widgets/devices_view_body.dart

@@ -18,7 +18,7 @@ class DevicesViewBody extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return BlocBuilder<HomeCubit, SpacesState>(
+    return BlocBuilder<HomeCubit, HomeState>(
       builder: (context, state) {
         return BlocBuilder<DevicesCubit, DevicesState>(
           builder: (context, state) {

lib/features/devices/view/widgets/lights_switches/light_switches.dart

@@ -27,7 +27,7 @@ class LightSwitchesView extends StatelessWidget {
             extendBodyBehindAppBar: true,
             extendBody: true,
             appBar: const CategoryViewAppBar(),
-            body: BlocBuilder<HomeCubit, SpacesState>(
+            body: BlocBuilder<HomeCubit, HomeState>(
               builder: (context, state) {
                 return Container(
                   width: MediaQuery.sizeOf(context).width,

lib/features/devices/view/widgets/rooms_slider.dart

@@ -13,7 +13,7 @@ class RoomsSlider extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return BlocBuilder<HomeCubit, SpacesState>(
+    return BlocBuilder<HomeCubit, HomeState>(
       builder: (context, state) {
         return SizedBox(
           height: 40,