refactor: extract device fetching logic into a separate method for improved readability

added client token login

.env.dev

@@ -1,3 +1,5 @@
 ENV_NAME=development
 BASE_URL=https://syncrow-dev.azurewebsites.net
 PROJECT_ID=0e62577c-06fa-41b9-8a92-99a21fbaf51c
+CLIENT_ID=c024573d191a327ce74db7d4502fdc29
+CLIENT_SECRET=fec6ccbc33664f94a3b84a45c7cceef3f3ebd1613ef4307db8946ede530cd1ed

.gitignore

@@ -42,3 +42,4 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+/android/app/.cxx/

lib/features/auth/bloc/auth_cubit.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:syncrow_app/features/auth/model/login_with_email_model.dart';
 import 'package:syncrow_app/features/auth/model/signup_model.dart';
@@ -217,9 +218,22 @@ class AuthCubit extends Cubit<AuthState> {
   signUp() async {
     emit(AuthLoginLoading());
     final response;
+
+    final clientId = dotenv.env['CLIENT_ID'] ?? '';
+    final clientSecret = dotenv.env['CLIENT_SECRET'] ?? '';
+
     try {
       List<String> userFullName = fullName.split(' ');
+
+      final clientToken = await AuthenticationAPI.fetchClientToken(
+        clientId: clientId,
+        clientSecret: clientSecret,
+      );
+
+      final accessToken = clientToken['accessToken'];
+
       response = await AuthenticationAPI.signUp(
+        accessToken: accessToken,
         model: SignUpModel(
             hasAcceptedAppAgreement: true,
             email: email.toLowerCase(),

lib/features/devices/bloc/curtain_bloc/curtain_bloc.dart

@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'package:firebase_database/firebase_database.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
 import 'package:syncrow_app/features/devices/bloc/curtain_bloc/curtain_event.dart';
@@ -31,6 +32,7 @@ class CurtainBloc extends Bloc<CurtainEvent, CurtainState> {
     on<InitialWizardEvent>(_fetchWizardStatus);
     on<GroupAllOffEvent>(_groupAllOff);
     on<GroupAllOnEvent>(_groupAllOn);
+    on<UpdateCurtainEvent>(_updateCurtain);
   }
 
   Future<void> _onOpenCurtain(
@@ -162,7 +164,10 @@ class CurtainBloc extends Bloc<CurtainEvent, CurtainState> {
   void _fetchStatus(InitCurtain event, Emitter<CurtainState> emit) async {
     try {
       emit(CurtainLoadingState());
+      _listenToChanges(curtainId);
+
       var response = await DevicesAPI.getDeviceStatus(curtainId);
+
       List<StatusModel> statusModelList = [];
       for (var status in response['status']) {
         statusModelList.add(StatusModel.fromJson(status));
@@ -170,7 +175,6 @@ class CurtainBloc extends Bloc<CurtainEvent, CurtainState> {
       openPercentage = double.tryParse(statusModelList[1].value.toString())!;
       curtainWidth = 270 - (openPercentage / 100) * curtainOpeningSpace;
       blindHeight = 310 - (openPercentage / 100) * blindOpeningSpace;
-      // _listenToChanges();
       emit(CurtainsOpening(
         curtainWidth: curtainWidth,
         blindHeight: blindHeight,
@@ -181,38 +185,76 @@ class CurtainBloc extends Bloc<CurtainEvent, CurtainState> {
       return;
     }
   }
-  // Real-time Database
-  // StreamSubscription<DatabaseEvent>? _streamSubscription;
-  // Timer? _timer;
-  // void _listenToChanges() {
+
+  StreamSubscription<DatabaseEvent>? _streamSubscription;
+
+  void _listenToChanges(curtainId) {
+    try {
+      _streamSubscription?.cancel();
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$curtainId');
+      Stream<DatabaseEvent> stream = ref.onValue;
+
+      _streamSubscription = stream.listen((DatabaseEvent event) {
+        Map<dynamic, dynamic> usersMap =
+            event.snapshot.value as Map<dynamic, dynamic>;
+        List<StatusModel> statusList = [];
+
+        usersMap['status'].forEach((element) {
+          statusList
+              .add(StatusModel(code: element['code'], value: element['value']));
+        });
+        openPercentage = double.tryParse(statusList[1].value.toString())!;
+        curtainWidth = 270 - (openPercentage / 100) * curtainOpeningSpace;
+        blindHeight = 310 - (openPercentage / 100) * blindOpeningSpace;
+        add(UpdateCurtainEvent());
+      });
+    } catch (_) {}
+  }
+
+  @override
+  Future<void> close() async {
+    _streamSubscription?.cancel();
+    _streamSubscription = null;
+    return super.close();
+  }
+
+  // _listenToChanges(curtainId) {
   //   try {
-  //     _streamSubscription?.cancel();
+  //     print('curtainId=$curtainId');
   //     DatabaseReference ref =
   //         FirebaseDatabase.instance.ref('device-status/$curtainId');
   //     Stream<DatabaseEvent> stream = ref.onValue;
 
-  //     _streamSubscription = stream.listen((DatabaseEvent event) async {
+  //     stream.listen((DatabaseEvent event) async {
   //       if (_timer != null) {
   //         await Future.delayed(const Duration(seconds: 2));
   //       }
   //       Map<dynamic, dynamic> usersMap =
   //           event.snapshot.value as Map<dynamic, dynamic>;
-  //       List<StatusModel> statusList = [];
-  //       usersMap['status'].forEach((element) {
-  //         statusList
-  //             .add(StatusModel(code: element['code'], value: element['value']));
-  //       });
-  //       deviceStatus = CurtainModel.fromJson(statusList);
-  //       if (!isClosed) {}
+  //       List<StatusModel> statusModelList = [];
+  //       for (var status in usersMap['status']) {
+  //         statusModelList.add(StatusModel.fromJson(status));
+  //         print('statusModelList==${statusModelList}');
+  //       }
+
+  //       openPercentage = double.tryParse(statusModelList[1].value.toString())!;
+  //       curtainWidth = 270 - (openPercentage / 100) * curtainOpeningSpace;
+  //       blindHeight = 310 - (openPercentage / 100) * blindOpeningSpace;
+  //       add(UpdateCurtainEvent());
   //     });
   //   } catch (_) {}
   // }
-  // @override
-  // Future<void> close() async {
-  //   _streamSubscription?.cancel();
-  //   _streamSubscription = null;
-  //   return super.close();
-  // }
+
+  _updateCurtain(UpdateCurtainEvent event, Emitter<CurtainState> emit) {
+    curtainWidth = 270 - (openPercentage / 100) * curtainOpeningSpace;
+    blindHeight = 310 - (openPercentage / 100) * blindOpeningSpace;
+    emit(CurtainsOpening(
+      curtainWidth: curtainWidth,
+      blindHeight: blindHeight,
+      openPercentage: openPercentage,
+    ));
+  }
 
   List<GroupCurtainModel> groupList = [];
   bool allSwitchesOn = true;

lib/features/devices/bloc/curtain_bloc/curtain_event.dart

@@ -33,6 +33,7 @@ class InitCurtain extends CurtainEvent {}
 class PauseCurtain extends CurtainEvent {}
 class useCurtainEvent extends CurtainEvent {}
 class InitialWizardEvent extends CurtainEvent {}
+class UpdateCurtainEvent extends CurtainEvent {}
 
 
 class ChangeFirstWizardSwitchStatusEvent extends CurtainEvent {

lib/features/devices/bloc/devices_cubit.dart

@@ -86,7 +86,7 @@ class DevicesCubit extends Cubit<DevicesState> {
         }
         Map<dynamic, dynamic> usersMap =
             event.snapshot.value as Map<dynamic, dynamic>;
-        //print('object-----${usersMap['status']}');
+        // print('object-----${usersMap['status']}');
         List<StatusModel> statusList = [];
         usersMap['status'].forEach((element) {
           statusList
@@ -463,7 +463,15 @@ class DevicesCubit extends Cubit<DevicesState> {
           projectId: project?.uuid ?? TempConst.projectIdDev);
       allDevices = devices;
       for (var deviceId in allDevices) {
-        if (deviceId.type == "3G" || deviceId.type == "AC") {
+        if (deviceId.type == "3G" ||
+            deviceId.type == "2G" ||
+            deviceId.type == "1G" ||
+            deviceId.type == "3GT" ||
+            deviceId.type == "2GT" ||
+            deviceId.type == "1GT" ||
+            deviceId.type == "WH" ||
+            deviceId.type == "CUR" ||
+            deviceId.type == "AC") {
           _listenToChanges(deviceId.uuid);
         }
       }
@@ -561,7 +569,6 @@ class DevicesCubit extends Cubit<DevicesState> {
     }
   }
 
-
   Future<void> towGangToggle(
       DeviceControlModel control, String deviceUuid) async {
     emit(SwitchControlLoading(code: control.code));
@@ -653,7 +660,6 @@ class DevicesCubit extends Cubit<DevicesState> {
             code: 'switch_1', value: toggledValue, deviceId: deviceUuid);
         final response =
             await DevicesAPI.controlDevice(controlRequest, deviceUuid);
-        print(response);
         if (response['result'] != true) {
           throw Exception('Failed to toggle switch_1');
         }

lib/features/devices/bloc/door_sensor_bloc/door_sensor_bloc.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'package:dio/dio.dart';
+import 'package:firebase_database/firebase_database.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/devices/bloc/door_sensor_bloc/door_sensor_event.dart';
 import 'package:syncrow_app/features/devices/bloc/door_sensor_bloc/door_sensor_state.dart';
@@ -40,7 +41,7 @@ class DoorSensorBloc extends Bloc<DoorSensorEvent, DoorSensorState> {
       );
       emit(UpdateState(doorSensor: deviceStatus));
       Future.delayed(const Duration(milliseconds: 500));
-      // _listenToChanges();
+      _listenToChanges();
     } catch (e) {
       emit(DoorSensorFailedState(errorMessage: e.toString()));
       return;
@@ -136,41 +137,42 @@ class DoorSensorBloc extends Bloc<DoorSensorEvent, DoorSensorState> {
       String errorMessage = errorData['message'];
     }
   }
+
   // real-time database
-  // Timer? _timer;
-  // StreamSubscription<DatabaseEvent>? _streamSubscription;
-  // void _listenToChanges() {
-  //   try {
-  //     _streamSubscription?.cancel();
-  //     DatabaseReference ref =
-  //         FirebaseDatabase.instance.ref('device-status/$DSId');
-  //     Stream<DatabaseEvent> stream = ref.onValue;
+  Timer? _timer;
+  StreamSubscription<DatabaseEvent>? _streamSubscription;
+  void _listenToChanges() {
+    try {
+      _streamSubscription?.cancel();
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$DSId');
+      Stream<DatabaseEvent> stream = ref.onValue;
 
-  //     _streamSubscription = stream.listen((DatabaseEvent event) async {
-  //       if (_timer != null) {
-  //         await Future.delayed(const Duration(seconds: 2));
-  //       }
-  //       Map<dynamic, dynamic> usersMap =
-  //           event.snapshot.value as Map<dynamic, dynamic>;
-  //       List<StatusModel> statusList = [];
-  //       usersMap['status'].forEach((element) {
-  //         statusList
-  //             .add(StatusModel(code: element['code'], value: element['value']));
-  //       });
-  //       deviceStatus = DoorSensorModel.fromJson(statusList);
-  //       if (!isClosed) {
-  //         add(
-  //           DoorSensorSwitch(switchD: deviceStatus.doorContactState),
-  //         );
-  //       }
-  //     });
-  //   } catch (_) {}
-  // }
+      _streamSubscription = stream.listen((DatabaseEvent event) async {
+        if (_timer != null) {
+          await Future.delayed(const Duration(seconds: 2));
+        }
+        Map<dynamic, dynamic> usersMap =
+            event.snapshot.value as Map<dynamic, dynamic>;
+        List<StatusModel> statusList = [];
+        usersMap['status'].forEach((element) {
+          statusList
+              .add(StatusModel(code: element['code'], value: element['value']));
+        });
+        deviceStatus = DoorSensorModel.fromJson(statusList);
+        if (!isClosed) {
+          add(
+            DoorSensorSwitch(switchD: deviceStatus.doorContactState),
+          );
+        }
+      });
+    } catch (_) {}
+  }
 
-  // @override
-  // Future<void> close() async {
-  //   _streamSubscription?.cancel();
-  //   _streamSubscription = null;
-  //   return super.close();
-  // }
+  @override
+  Future<void> close() async {
+    _streamSubscription?.cancel();
+    _streamSubscription = null;
+    return super.close();
+  }
 }

lib/features/devices/bloc/garage_door_bloc/garage_door_bloc.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'package:dio/dio.dart';
+import 'package:firebase_database/firebase_database.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
 import 'package:syncrow_app/features/devices/bloc/garage_door_bloc/garage_door_event.dart';
@@ -41,6 +42,8 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
     on<ChangeFirstWizardSwitchStatusEvent>(_changeFirstWizardSwitch);
     on<ToggleAlarmEvent>(_toggleAlarmEvent);
     on<DeleteScheduleEvent>(deleteSchedule);
+
+    on<UpdateStateEvent>(_updateState);
   }
   void _onClose(OnClose event, Emitter<GarageDoorSensorState> emit) {
     _timer?.cancel();
@@ -79,7 +82,7 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
       toggleDoor = deviceStatus.switch1;
       emit(UpdateState(garageSensor: deviceStatus));
       Future.delayed(const Duration(milliseconds: 500));
-      // _listenToChanges();
+      _listenToChanges();
     } catch (e) {
       emit(GarageDoorFailedState(errorMessage: e.toString()));
       return;
@@ -179,39 +182,57 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
   }
 
   // Real-time db
-  // StreamSubscription<DatabaseEvent>? _streamSubscription;
-  // void _listenToChanges() {
-  //   try {
-  //     _streamSubscription?.cancel();
-  //     DatabaseReference ref =
-  //         FirebaseDatabase.instance.ref('device-status/$GDId');
-  //     Stream<DatabaseEvent> stream = ref.onValue;
+  StreamSubscription<DatabaseEvent>? _streamSubscription;
+  void _listenToChanges() {
+    try {
+      _streamSubscription?.cancel();
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$GDId');
+      Stream<DatabaseEvent> stream = ref.onValue;
 
-  //     _streamSubscription = stream.listen((DatabaseEvent event) async {
-  //       if (_timer != null) {
-  //         await Future.delayed(const Duration(seconds: 2));
-  //       }
-  //       Map<dynamic, dynamic> usersMap =
-  //           event.snapshot.value as Map<dynamic, dynamic>;
-  //       List<StatusModel> statusList = [];
-  //       usersMap['status'].forEach((element) {
-  //         statusList
-  //             .add(StatusModel(code: element['code'], value: element['value']));
-  //       });
-  //       deviceStatus = GarageDoorModel.fromJson(statusList);
-  //       // if (!isClosed) {
-  //       //   add(ToggleSelectedEvent());
-  //       // }
-  //     });
-  //   } catch (_) {}
-  // }
+      _streamSubscription = stream.listen((DatabaseEvent event) async {
+        if (_timer != null) {
+          await Future.delayed(const Duration(seconds: 1));
+        }
 
-  // @override
-  // Future<void> close() async {
-  //   _streamSubscription?.cancel();
-  //   _streamSubscription = null;
-  //   return super.close();
-  // }
+        if (event.snapshot.value != null) {
+          Map<dynamic, dynamic> usersMap =
+              event.snapshot.value as Map<dynamic, dynamic>;
+          List<StatusModel> statusList = [];
+
+          usersMap['status'].forEach((element) {
+            statusList.add(
+                StatusModel(code: element['code'], value: element['value']));
+          });
+          deviceStatus.tr_timecon = statusList
+              .firstWhere((status) => status.code == "tr_timecon",
+                  orElse: () => StatusModel(code: "tr_timecon", value: 0))
+              .value as int;
+
+          deviceStatus.switch1 = statusList
+              .firstWhere((status) => status.code == "switch_1",
+                  orElse: () => StatusModel(code: "switch_1", value: false))
+              .value as bool;
+          secondSelected = deviceStatus.tr_timecon;
+          toggleDoor = deviceStatus.switch1;
+          add(UpdateStateEvent());
+        }
+      });
+    } catch (_) {}
+  }
+
+  Future<void> _updateState(
+      UpdateStateEvent event, Emitter<GarageDoorSensorState> emit) async {
+    emit(GarageDoorLoadingState());
+    emit(UpdateState(garageSensor: deviceStatus));
+  }
+
+  @override
+  Future<void> close() async {
+    _streamSubscription?.cancel();
+    _streamSubscription = null;
+    return super.close();
+  }
 
   List<Map<String, String>> days = [
     {"day": "Sun", "key": "Sun"},

lib/features/devices/bloc/garage_door_bloc/garage_door_event.dart

@@ -109,6 +109,8 @@ class GetScheduleEvent extends GarageDoorEvent {}
 
 class ScheduleSaveapp extends GarageDoorEvent {}
 
+class UpdateStateEvent extends GarageDoorEvent {}
+
 class ToggleScheduleEvent extends GarageDoorEvent {
   final String id;
   final bool toggle;

lib/features/devices/bloc/one_gang_bloc/one_gang_bloc.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'package:dio/dio.dart';
+import 'package:firebase_database/firebase_database.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
 import 'package:syncrow_app/features/devices/bloc/one_gang_bloc/one_gang_state.dart';
@@ -60,48 +61,46 @@ class OneGangBloc extends Bloc<OneGangEvent, OneGangState> {
       }
       deviceStatus = OneGangModel.fromJson(statusModelList);
       emit(UpdateState(oneGangModel: deviceStatus));
-      // _listenToChanges();
+      _listenToChanges(oneGangId);
     } catch (e) {
       emit(FailedState(error: e.toString()));
       return;
     }
   }
+
   // Real-time db
-  // StreamSubscription<DatabaseEvent>? _streamSubscription;
-  // void _listenToChanges() {
-  //   try {
-  //     _streamSubscription?.cancel();
-  //     DatabaseReference ref =
-  //         FirebaseDatabase.instance.ref('device-status/$oneGangId');
-  //     Stream<DatabaseEvent> stream = ref.onValue;
+  StreamSubscription<DatabaseEvent>? _streamSubscription;
+  void _listenToChanges(String id) {
+    try {
+      _streamSubscription?.cancel();
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$id'); 
+      Stream<DatabaseEvent> stream = ref.onValue;
 
-  //     _streamSubscription = stream.listen((DatabaseEvent event) async {
-  //       if (_timer != null) {
-  //         await Future.delayed(const Duration(seconds: 2));
-  //       }
-  //       Map<dynamic, dynamic> usersMap =
-  //           event.snapshot.value as Map<dynamic, dynamic>;
-  //       List<StatusModel> statusList = [];
-  //       usersMap['status'].forEach((element) {
-  //         statusList
-  //             .add(StatusModel(code: element['code'], value: element['value']));
-  //       });
-  //       deviceStatus = OneGangModel.fromJson(statusList);
-  //       if (!isClosed) {
-  //         add(OneGangUpdated());
-  //       }
-  //     });
-  //   } catch (_) {}
-  // }
+      _streamSubscription = stream.listen((DatabaseEvent event) {
+        Map<dynamic, dynamic> usersMap =
+            event.snapshot.value as Map<dynamic, dynamic>;
+        List<StatusModel> statusList = [];
 
-  // @override
-  // Future<void> close() async {
-  //   _streamSubscription?.cancel();
-  //   _streamSubscription = null;
-  //   return super.close();
-  // }
+        usersMap['status'].forEach((element) {
+          statusList
+              .add(StatusModel(code: element['code'], value: element['value']));
+        });
+        deviceStatus = OneGangModel.fromJson(statusList);
+        add(OneGangUpdated());
+      });
+    } catch (_) {}
+  }
+
+  @override
+  Future<void> close() async {
+    _streamSubscription?.cancel();
+    _streamSubscription = null;
+    return super.close();
+  }
 
   _oneGangUpdated(OneGangUpdated event, Emitter<OneGangState> emit) {
+    emit(LoadingInitialState());
     emit(UpdateState(oneGangModel: deviceStatus));
   }
 

lib/features/devices/bloc/one_touch_bloc/one_touch_bloc.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'package:dio/dio.dart';
+import 'package:firebase_database/firebase_database.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
@@ -63,39 +64,54 @@ class OneTouchBloc extends Bloc<OneTouchEvent, OneTouchState> {
         statusModelList.add(StatusModel.fromJson(status));
       }
       deviceStatus = OneTouchModel.fromJson(statusModelList);
+      _listenToChanges(oneTouchId);
+
       emit(UpdateState(oneTouchModel: deviceStatus));
-      //  _listenToChanges();
     } catch (e) {
       emit(FailedState(error: e.toString()));
       return;
     }
   }
-  // Real-time db
-  // _listenToChanges() {
-  //   try {
-  //     DatabaseReference ref = FirebaseDatabase.instance.ref('device-status/$oneTouchId');
-  //     Stream<DatabaseEvent> stream = ref.onValue;
 
-  //     stream.listen((DatabaseEvent event) async {
-  //       if (_timer != null) {
-  //         await Future.delayed(const Duration(seconds: 2));
-  //       }
-  //       Map<dynamic, dynamic> usersMap = event.snapshot.value as Map<dynamic, dynamic>;
-  //       List<StatusModel> statusList = [];
+  StreamSubscription<DatabaseEvent>? _streamSubscription;
+  void _listenToChanges(String id) {
+    try {
+      _streamSubscription?.cancel();
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$id');
+      Stream<DatabaseEvent> stream = ref.onValue;
 
-  //       usersMap['status'].forEach((element) {
-  //         statusList.add(StatusModel(code: element['code'], value: element['value']));
-  //       });
+      _streamSubscription = stream.listen((DatabaseEvent event) {
+        if (event.snapshot.value != null) {
+          Map<dynamic, dynamic> usersMap =
+              event.snapshot.value as Map<dynamic, dynamic>;
+          List<StatusModel> statusList = [];
 
-  //       deviceStatus = OneTouchModel.fromJson(statusList);
-  //       if (!isClosed) {
-  //         add(OneTouchUpdated());
-  //       }
-  //     });
-  //   } catch (_) {}
-  // }
+          usersMap['status'].forEach((element) {
+            statusList.add(
+                StatusModel(code: element['code'], value: element['value']));
+          });
+          var switchStatus = statusList.firstWhere(
+              (status) => status.code == "switch_1",
+              orElse: () => StatusModel(code: "switch_1", value: false));
+
+          deviceStatus.firstSwitch = switchStatus.value as bool;
+          add(OneTouchUpdated());
+        }
+      });
+    } catch (_) {
+    }
+  }
+
+  @override
+  Future<void> close() async {
+    _streamSubscription?.cancel();
+    _streamSubscription = null;
+    return super.close();
+  }
 
   _oneTouchUpdated(OneTouchUpdated event, Emitter<OneTouchState> emit) {
+    emit(LoadingNewSate(oneTouchModel: deviceStatus));
     emit(UpdateState(oneTouchModel: deviceStatus));
   }
 

lib/features/devices/bloc/three_touch_bloc/three_touch_bloc.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'package:dio/dio.dart';
+import 'package:firebase_database/firebase_database.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
 import 'package:syncrow_app/features/devices/bloc/three_touch_bloc/three_touch_event.dart';
@@ -37,7 +38,8 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
   List<GroupThreeTouchModel> groupThreeTouchList = [];
   bool allSwitchesOn = true;
 
-  ThreeTouchBloc({required this.threeTouchId, required this.switchCode}) : super(InitialState()) {
+  ThreeTouchBloc({required this.threeTouchId, required this.switchCode})
+      : super(InitialState()) {
     on<InitialEvent>(_fetchThreeTouchStatus);
     on<ThreeTouchUpdated>(_threeTouchUpdated);
     on<ChangeFirstSwitchStatusEvent>(_changeFirstSwitch);
@@ -62,7 +64,8 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
     on<ChangeStatusEvent>(_changeStatus);
   }
 
-  void _fetchThreeTouchStatus(InitialEvent event, Emitter<ThreeTouchState> emit) async {
+  void _fetchThreeTouchStatus(
+      InitialEvent event, Emitter<ThreeTouchState> emit) async {
     emit(LoadingInitialState());
     try {
       threeTouchGroup = event.groupScreen;
@@ -74,7 +77,8 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
             HomeCubit.getInstance().selectedSpace?.id ?? '', '3GT');
 
         for (int i = 0; i < devicesList.length; i++) {
-          var response = await DevicesAPI.getDeviceStatus(devicesList[i].uuid ?? '');
+          var response =
+              await DevicesAPI.getDeviceStatus(devicesList[i].uuid ?? '');
           List<StatusModel> statusModelList = [];
           for (var status in response['status']) {
             statusModelList.add(StatusModel.fromJson(status));
@@ -91,13 +95,16 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
 
         if (groupThreeTouchList.isNotEmpty) {
           groupThreeTouchList.firstWhere((element) {
-            if (!element.firstSwitch || !element.secondSwitch || !element.thirdSwitch) {
+            if (!element.firstSwitch ||
+                !element.secondSwitch ||
+                !element.thirdSwitch) {
               allSwitchesOn = false;
             }
             return true;
           });
         }
-        emit(UpdateGroupState(threeTouchList: groupThreeTouchList, allSwitches: allSwitchesOn));
+        emit(UpdateGroupState(
+            threeTouchList: groupThreeTouchList, allSwitches: allSwitchesOn));
       } else {
         var response = await DevicesAPI.getDeviceStatus(threeTouchId);
         List<StatusModel> statusModelList = [];
@@ -106,7 +113,7 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
         }
         deviceStatus = ThreeTouchModel.fromJson(statusModelList);
         emit(UpdateState(threeTouchModel: deviceStatus));
-      //  _listenToChanges();
+        _listenToChanges();
       }
     } catch (e) {
       emit(FailedState(error: e.toString()));
@@ -114,35 +121,39 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
     }
   }
 
-  // _listenToChanges() {
-  //   try {
-  //     DatabaseReference ref = FirebaseDatabase.instance.ref('device-status/$threeTouchId');
-  //     Stream<DatabaseEvent> stream = ref.onValue;
+  _listenToChanges() {
+    try {
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$threeTouchId');
+      Stream<DatabaseEvent> stream = ref.onValue;
 
-  //     stream.listen((DatabaseEvent event) async {
-  //       if (_timer != null) {
-  //         await Future.delayed(const Duration(seconds: 2));
-  //       }
-  //       Map<dynamic, dynamic> usersMap = event.snapshot.value as Map<dynamic, dynamic>;
-  //       List<StatusModel> statusList = [];
+      stream.listen((DatabaseEvent event) async {
+        if (_timer != null) {
+          await Future.delayed(const Duration(seconds: 2));
+        }
+        Map<dynamic, dynamic> usersMap =
+            event.snapshot.value as Map<dynamic, dynamic>;
+        List<StatusModel> statusList = [];
 
-  //       usersMap['status'].forEach((element) {
-  //         statusList.add(StatusModel(code: element['code'], value: element['value']));
-  //       });
+        usersMap['status'].forEach((element) {
+          statusList
+              .add(StatusModel(code: element['code'], value: element['value']));
+        });
 
-  //       deviceStatus = ThreeTouchModel.fromJson(statusList);
-  //       if (!isClosed) {
-  //         add(ThreeTouchUpdated());
-  //       }
-  //     });
-  //   } catch (_) {}
-  // }
+        deviceStatus = ThreeTouchModel.fromJson(statusList);
+        if (!isClosed) {
+          add(ThreeTouchUpdated());
+        }
+      });
+    } catch (_) {}
+  }
 
   _threeTouchUpdated(ThreeTouchUpdated event, Emitter<ThreeTouchState> emit) {
     emit(UpdateState(threeTouchModel: deviceStatus));
   }
 
-  void _changeFirstSwitch(ChangeFirstSwitchStatusEvent event, Emitter<ThreeTouchState> emit) async {
+  void _changeFirstSwitch(
+      ChangeFirstSwitchStatusEvent event, Emitter<ThreeTouchState> emit) async {
     emit(LoadingNewSate(threeTouchModel: deviceStatus));
     try {
       if (threeTouchGroup) {
@@ -151,11 +162,15 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
           if (element.deviceId == event.deviceId) {
             element.firstSwitch = !event.value;
           }
-          if (!element.firstSwitch || !element.secondSwitch || !element.thirdSwitch) {
+          if (!element.firstSwitch ||
+              !element.secondSwitch ||
+              !element.thirdSwitch) {
             allSwitchesValue = false;
           }
         });
-        emit(UpdateGroupState(threeTouchList: groupThreeTouchList, allSwitches: allSwitchesValue));
+        emit(UpdateGroupState(
+            threeTouchList: groupThreeTouchList,
+            allSwitches: allSwitchesValue));
       } else {
         deviceStatus.firstSwitch = !event.value;
         emit(UpdateState(threeTouchModel: deviceStatus));
@@ -182,8 +197,8 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
     }
   }
 
-  void _changeSecondSwitch(
-      ChangeSecondSwitchStatusEvent event, Emitter<ThreeTouchState> emit) async {
+  void _changeSecondSwitch(ChangeSecondSwitchStatusEvent event,
+      Emitter<ThreeTouchState> emit) async {
     emit(LoadingNewSate(threeTouchModel: deviceStatus));
     try {
       if (threeTouchGroup) {
@@ -192,11 +207,15 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
           if (element.deviceId == event.deviceId) {
             element.secondSwitch = !event.value;
           }
-          if (!element.firstSwitch || !element.secondSwitch || !element.thirdSwitch) {
+          if (!element.firstSwitch ||
+              !element.secondSwitch ||
+              !element.thirdSwitch) {
             allSwitchesValue = false;
           }
         });
-        emit(UpdateGroupState(threeTouchList: groupThreeTouchList, allSwitches: allSwitchesValue));
+        emit(UpdateGroupState(
+            threeTouchList: groupThreeTouchList,
+            allSwitches: allSwitchesValue));
       } else {
         deviceStatus.secondSwitch = !event.value;
         emit(UpdateState(threeTouchModel: deviceStatus));
@@ -222,7 +241,8 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
     }
   }
 
-  void _changeThirdSwitch(ChangeThirdSwitchStatusEvent event, Emitter<ThreeTouchState> emit) async {
+  void _changeThirdSwitch(
+      ChangeThirdSwitchStatusEvent event, Emitter<ThreeTouchState> emit) async {
     emit(LoadingNewSate(threeTouchModel: deviceStatus));
     try {
       if (threeTouchGroup) {
@@ -231,11 +251,15 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
           if (element.deviceId == event.deviceId) {
             element.thirdSwitch = !event.value;
           }
-          if (!element.firstSwitch || !element.secondSwitch || !element.thirdSwitch) {
+          if (!element.firstSwitch ||
+              !element.secondSwitch ||
+              !element.thirdSwitch) {
             allSwitchesValue = false;
           }
         });
-        emit(UpdateGroupState(threeTouchList: groupThreeTouchList, allSwitches: allSwitchesValue));
+        emit(UpdateGroupState(
+            threeTouchList: groupThreeTouchList,
+            allSwitches: allSwitchesValue));
       } else {
         deviceStatus.thirdSwitch = !event.value;
         emit(UpdateState(threeTouchModel: deviceStatus));
@@ -274,15 +298,21 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
       final response = await Future.wait([
         DevicesAPI.controlDevice(
             DeviceControlModel(
-                deviceId: threeTouchId, code: 'switch_1', value: deviceStatus.firstSwitch),
+                deviceId: threeTouchId,
+                code: 'switch_1',
+                value: deviceStatus.firstSwitch),
             threeTouchId),
         DevicesAPI.controlDevice(
             DeviceControlModel(
-                deviceId: threeTouchId, code: 'switch_2', value: deviceStatus.secondSwitch),
+                deviceId: threeTouchId,
+                code: 'switch_2',
+                value: deviceStatus.secondSwitch),
             threeTouchId),
         DevicesAPI.controlDevice(
             DeviceControlModel(
-                deviceId: threeTouchId, code: 'switch_3', value: deviceStatus.thirdSwitch),
+                deviceId: threeTouchId,
+                code: 'switch_3',
+                value: deviceStatus.thirdSwitch),
             threeTouchId),
       ]);
 
@@ -308,15 +338,21 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
       final response = await Future.wait([
         DevicesAPI.controlDevice(
             DeviceControlModel(
-                deviceId: threeTouchId, code: 'switch_1', value: deviceStatus.firstSwitch),
+                deviceId: threeTouchId,
+                code: 'switch_1',
+                value: deviceStatus.firstSwitch),
             threeTouchId),
         DevicesAPI.controlDevice(
             DeviceControlModel(
-                deviceId: threeTouchId, code: 'switch_2', value: deviceStatus.secondSwitch),
+                deviceId: threeTouchId,
+                code: 'switch_2',
+                value: deviceStatus.secondSwitch),
             threeTouchId),
         DevicesAPI.controlDevice(
             DeviceControlModel(
-                deviceId: threeTouchId, code: 'switch_3', value: deviceStatus.thirdSwitch),
+                deviceId: threeTouchId,
+                code: 'switch_3',
+                value: deviceStatus.thirdSwitch),
             threeTouchId),
       ]);
 
@@ -338,8 +374,10 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
         groupThreeTouchList[i].secondSwitch = true;
         groupThreeTouchList[i].thirdSwitch = true;
       }
-      emit(UpdateGroupState(threeTouchList: groupThreeTouchList, allSwitches: true));
-      List<String> allDeviceIds = groupThreeTouchList.map((device) => device.deviceId).toList();
+      emit(UpdateGroupState(
+          threeTouchList: groupThreeTouchList, allSwitches: true));
+      List<String> allDeviceIds =
+          groupThreeTouchList.map((device) => device.deviceId).toList();
       final response1 = await DevicesAPI.deviceBatchController(
         code: 'switch_1',
         devicesUuid: allDeviceIds,
@@ -368,7 +406,8 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
     }
   }
 
-  void _groupAllOff(GroupAllOffEvent event, Emitter<ThreeTouchState> emit) async {
+  void _groupAllOff(
+      GroupAllOffEvent event, Emitter<ThreeTouchState> emit) async {
     emit(LoadingNewSate(threeTouchModel: deviceStatus));
     try {
       for (int i = 0; i < groupThreeTouchList.length; i++) {
@@ -376,8 +415,10 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
         groupThreeTouchList[i].secondSwitch = false;
         groupThreeTouchList[i].thirdSwitch = false;
       }
-      List<String> allDeviceIds = groupThreeTouchList.map((device) => device.deviceId).toList();
-      emit(UpdateGroupState(threeTouchList: groupThreeTouchList, allSwitches: false));
+      List<String> allDeviceIds =
+          groupThreeTouchList.map((device) => device.deviceId).toList();
+      emit(UpdateGroupState(
+          threeTouchList: groupThreeTouchList, allSwitches: false));
       final response1 = await DevicesAPI.deviceBatchController(
         code: 'switch_1',
         devicesUuid: allDeviceIds,
@@ -406,17 +447,20 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
     }
   }
 
-  void _changeSliding(ChangeSlidingSegment event, Emitter<ThreeTouchState> emit) async {
+  void _changeSliding(
+      ChangeSlidingSegment event, Emitter<ThreeTouchState> emit) async {
     emit(ChangeSlidingSegmentState(value: event.value));
   }
 
-  void _setCounterValue(SetCounterValue event, Emitter<ThreeTouchState> emit) async {
+  void _setCounterValue(
+      SetCounterValue event, Emitter<ThreeTouchState> emit) async {
     emit(LoadingNewSate(threeTouchModel: deviceStatus));
     int seconds = 0;
     try {
       seconds = event.duration.inSeconds;
       final response = await DevicesAPI.controlDevice(
-          DeviceControlModel(deviceId: threeTouchId, code: event.deviceCode, value: seconds),
+          DeviceControlModel(
+              deviceId: threeTouchId, code: event.deviceCode, value: seconds),
           threeTouchId);
 
       if (response['success'] ?? false) {
@@ -443,7 +487,8 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
     }
   }
 
-  void _getCounterValue(GetCounterEvent event, Emitter<ThreeTouchState> emit) async {
+  void _getCounterValue(
+      GetCounterEvent event, Emitter<ThreeTouchState> emit) async {
     emit(LoadingInitialState());
     try {
       var response = await DevicesAPI.getDeviceStatus(threeTouchId);
@@ -553,7 +598,8 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
         deviceId: threeTouchId,
       );
       List<dynamic> jsonData = response;
-      listSchedule = jsonData.map((item) => ScheduleModel.fromJson(item)).toList();
+      listSchedule =
+          jsonData.map((item) => ScheduleModel.fromJson(item)).toList();
       emit(InitialState());
     } on DioException catch (e) {
       final errorData = e.response!.data;
@@ -564,12 +610,13 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
 
   int? getTimeStampWithoutSeconds(DateTime? dateTime) {
     if (dateTime == null) return null;
-    DateTime dateTimeWithoutSeconds =
-        DateTime(dateTime.year, dateTime.month, dateTime.day, dateTime.hour, dateTime.minute);
+    DateTime dateTimeWithoutSeconds = DateTime(dateTime.year, dateTime.month,
+        dateTime.day, dateTime.hour, dateTime.minute);
     return dateTimeWithoutSeconds.millisecondsSinceEpoch ~/ 1000;
   }
 
-  Future toggleChange(ToggleScheduleEvent event, Emitter<ThreeTouchState> emit) async {
+  Future toggleChange(
+      ToggleScheduleEvent event, Emitter<ThreeTouchState> emit) async {
     try {
       emit(LoadingInitialState());
       final response = await DevicesAPI.changeSchedule(
@@ -588,7 +635,8 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
     }
   }
 
-  Future deleteSchedule(DeleteScheduleEvent event, Emitter<ThreeTouchState> emit) async {
+  Future deleteSchedule(
+      DeleteScheduleEvent event, Emitter<ThreeTouchState> emit) async {
     try {
       emit(LoadingInitialState());
       final response = await DevicesAPI.deleteSchedule(
@@ -608,13 +656,15 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
     }
   }
 
-  void toggleSelectedIndex(ToggleSelectedEvent event, Emitter<ThreeTouchState> emit) {
+  void toggleSelectedIndex(
+      ToggleSelectedEvent event, Emitter<ThreeTouchState> emit) {
     emit(LoadingInitialState());
     selectedTabIndex = event.index;
     emit(ChangeSlidingSegmentState(value: selectedTabIndex));
   }
 
-  void toggleCreateSchedule(ToggleCreateScheduleEvent event, Emitter<ThreeTouchState> emit) {
+  void toggleCreateSchedule(
+      ToggleCreateScheduleEvent event, Emitter<ThreeTouchState> emit) {
     emit(LoadingInitialState());
     createSchedule = !createSchedule;
     selectedDays.clear();
@@ -632,7 +682,8 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
   String statusSelected = '';
   String optionSelected = '';
 
-  Future<void> _changeStatus(ChangeStatusEvent event, Emitter<ThreeTouchState> emit) async {
+  Future<void> _changeStatus(
+      ChangeStatusEvent event, Emitter<ThreeTouchState> emit) async {
     try {
       emit(LoadingInitialState());
       final Map<String, Map<String, String>> controlMap = {
@@ -666,11 +717,15 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
       final selectedControl = controlMap[optionSelected]?[statusSelected];
       if (selectedControl != null) {
         await DevicesAPI.controlDevice(
-          DeviceControlModel(deviceId: threeTouchId, code: optionSelected, value: selectedControl),
+          DeviceControlModel(
+              deviceId: threeTouchId,
+              code: optionSelected,
+              value: selectedControl),
           threeTouchId,
         );
       } else {
-        emit(const FailedState(error: 'Invalid statusSelected or optionSelected'));
+        emit(const FailedState(
+            error: 'Invalid statusSelected or optionSelected'));
       }
     } on DioException catch (e) {
       final errorData = e.response!.data;

lib/features/devices/bloc/two_gang_bloc/two_gang_bloc.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'package:dio/dio.dart';
+import 'package:firebase_database/firebase_database.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
 import 'package:syncrow_app/features/devices/bloc/two_gang_bloc/two_gang_event.dart';
@@ -34,7 +35,8 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
   bool createSchedule = false;
   List<ScheduleModel> listSchedule = [];
 
-  TwoGangBloc({required this.twoGangId, required this.switchCode}) : super(InitialState()) {
+  TwoGangBloc({required this.twoGangId, required this.switchCode})
+      : super(InitialState()) {
     on<InitialEvent>(_fetchTwoGangStatus);
     on<TwoGangUpdated>(_twoGangUpdated);
     on<ChangeFirstSwitchStatusEvent>(_changeFirstSwitch);
@@ -64,13 +66,15 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
 
   int selectedTabIndex = 0;
 
-  void toggleSelectedIndex(ToggleSelectedEvent event, Emitter<TwoGangState> emit) {
+  void toggleSelectedIndex(
+      ToggleSelectedEvent event, Emitter<TwoGangState> emit) {
     emit(LoadingInitialState());
     selectedTabIndex = event.index;
     emit(ChangeSlidingSegmentState(value: selectedTabIndex));
   }
 
-  void toggleCreateSchedule(ToggleCreateScheduleEvent event, Emitter<TwoGangState> emit) {
+  void toggleCreateSchedule(
+      ToggleCreateScheduleEvent event, Emitter<TwoGangState> emit) {
     emit(LoadingInitialState());
     createSchedule = !createSchedule;
     selectedDays.clear();
@@ -78,7 +82,8 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
     emit(UpdateCreateScheduleState(createSchedule));
   }
 
-  void _fetchTwoGangStatus(InitialEvent event, Emitter<TwoGangState> emit) async {
+  void _fetchTwoGangStatus(
+      InitialEvent event, Emitter<TwoGangState> emit) async {
     emit(LoadingInitialState());
     try {
       var response = await DevicesAPI.getDeviceStatus(twoGangId);
@@ -88,42 +93,50 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
       }
       deviceStatus = TwoGangModel.fromJson(statusModelList);
       emit(UpdateState(twoGangModel: deviceStatus));
-      // _listenToChanges();
+      _listenToChanges(twoGangId);
     } catch (e) {
       emit(FailedState(error: e.toString()));
       return;
     }
   }
 
-  // _listenToChanges() {
-  //   try {
-  //     DatabaseReference ref = FirebaseDatabase.instance.ref('device-status/$twoGangId');
-  //     Stream<DatabaseEvent> stream = ref.onValue;
+  StreamSubscription<DatabaseEvent>? _streamSubscription;
+  void _listenToChanges(String id) {
+    try {
+      _streamSubscription?.cancel();
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$id');
+      Stream<DatabaseEvent> stream = ref.onValue;
+      _streamSubscription = stream.listen((DatabaseEvent event) {
+        Map<dynamic, dynamic> usersMap =
+            event.snapshot.value as Map<dynamic, dynamic>;
+        List<StatusModel> statusList = [];
 
-  //     stream.listen((DatabaseEvent event) async {
-  //       if (_timer != null) {
-  //         await Future.delayed(const Duration(seconds: 2));
-  //       }
-  //       Map<dynamic, dynamic> usersMap = event.snapshot.value as Map<dynamic, dynamic>;
-  //       List<StatusModel> statusList = [];
+        usersMap['status'].forEach((element) {
+          statusList
+              .add(StatusModel(code: element['code'], value: element['value']));
+        });
+        deviceStatus = TwoGangModel.fromJson(statusList);
+        add(TwoGangUpdated());
+      });
+    } catch (_) {}
+  }
 
-  //       usersMap['status'].forEach((element) {
-  //         statusList.add(StatusModel(code: element['code'], value: element['value']));
-  //       });
-
-  //       deviceStatus = TwoGangModel.fromJson(statusList);
-  //       if (!isClosed) {
-  //         add(TwoGangUpdated());
-  //       }
-  //     });
-  //   } catch (_) {}
-  // }
+  @override
+  Future<void> close() async {
+    _streamSubscription?.cancel();
+    _streamSubscription = null;
+    return super.close();
+  }
 
   _twoGangUpdated(TwoGangUpdated event, Emitter<TwoGangState> emit) {
+    emit(LoadingNewSate(twoGangModel: deviceStatus));
+
     emit(UpdateState(twoGangModel: deviceStatus));
   }
 
-  void _changeFirstSwitch(ChangeFirstSwitchStatusEvent event, Emitter<TwoGangState> emit) async {
+  void _changeFirstSwitch(
+      ChangeFirstSwitchStatusEvent event, Emitter<TwoGangState> emit) async {
     emit(LoadingNewSate(twoGangModel: deviceStatus));
     try {
       deviceStatus.firstSwitch = !event.value;
@@ -134,7 +147,8 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
 
       _timer = Timer(const Duration(milliseconds: 100), () async {
         final response = await DevicesAPI.controlDevice(
-            DeviceControlModel(deviceId: twoGangId, code: 'switch_1', value: !event.value),
+            DeviceControlModel(
+                deviceId: twoGangId, code: 'switch_1', value: !event.value),
             twoGangId);
 
         if (!response['success']) {
@@ -146,7 +160,8 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
     }
   }
 
-  void _changeSecondSwitch(ChangeSecondSwitchStatusEvent event, Emitter<TwoGangState> emit) async {
+  void _changeSecondSwitch(
+      ChangeSecondSwitchStatusEvent event, Emitter<TwoGangState> emit) async {
     emit(LoadingNewSate(twoGangModel: deviceStatus));
     try {
       deviceStatus.secondSwitch = !event.value;
@@ -156,7 +171,8 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
       }
       _timer = Timer(const Duration(milliseconds: 100), () async {
         final response = await DevicesAPI.controlDevice(
-            DeviceControlModel(deviceId: twoGangId, code: 'switch_2', value: !event.value),
+            DeviceControlModel(
+                deviceId: twoGangId, code: 'switch_2', value: !event.value),
             twoGangId);
 
         if (!response['success']) {
@@ -179,11 +195,15 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
       final response = await Future.wait([
         DevicesAPI.controlDevice(
             DeviceControlModel(
-                deviceId: twoGangId, code: 'switch_1', value: deviceStatus.firstSwitch),
+                deviceId: twoGangId,
+                code: 'switch_1',
+                value: deviceStatus.firstSwitch),
             twoGangId),
         DevicesAPI.controlDevice(
             DeviceControlModel(
-                deviceId: twoGangId, code: 'switch_2', value: deviceStatus.secondSwitch),
+                deviceId: twoGangId,
+                code: 'switch_2',
+                value: deviceStatus.secondSwitch),
             twoGangId),
       ]);
 
@@ -206,11 +226,15 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
       final response = await Future.wait([
         DevicesAPI.controlDevice(
             DeviceControlModel(
-                deviceId: twoGangId, code: 'switch_1', value: deviceStatus.firstSwitch),
+                deviceId: twoGangId,
+                code: 'switch_1',
+                value: deviceStatus.firstSwitch),
             twoGangId),
         DevicesAPI.controlDevice(
             DeviceControlModel(
-                deviceId: twoGangId, code: 'switch_2', value: deviceStatus.secondSwitch),
+                deviceId: twoGangId,
+                code: 'switch_2',
+                value: deviceStatus.secondSwitch),
             twoGangId),
       ]);
       if (response.every((element) => !element['success'])) {
@@ -231,7 +255,8 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
         groupTwoGangList[i].secondSwitch = true;
       }
       emit(UpdateGroupState(twoGangList: groupTwoGangList, allSwitches: true));
-      List<String> allDeviceIds = groupTwoGangList.map((device) => device.deviceId).toList();
+      List<String> allDeviceIds =
+          groupTwoGangList.map((device) => device.deviceId).toList();
 
       final response1 = await DevicesAPI.deviceBatchController(
         code: 'switch_1',
@@ -266,7 +291,8 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
 
       emit(UpdateGroupState(twoGangList: groupTwoGangList, allSwitches: false));
 
-      List<String> allDeviceIds = groupTwoGangList.map((device) => device.deviceId).toList();
+      List<String> allDeviceIds =
+          groupTwoGangList.map((device) => device.deviceId).toList();
 
       final response1 = await DevicesAPI.deviceBatchController(
         code: 'switch_1',
@@ -291,17 +317,20 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
     }
   }
 
-  void _changeSliding(ChangeSlidingSegment event, Emitter<TwoGangState> emit) async {
+  void _changeSliding(
+      ChangeSlidingSegment event, Emitter<TwoGangState> emit) async {
     emit(ChangeSlidingSegmentState(value: event.value));
   }
 
-  void _setCounterValue(SetCounterValue event, Emitter<TwoGangState> emit) async {
+  void _setCounterValue(
+      SetCounterValue event, Emitter<TwoGangState> emit) async {
     emit(LoadingNewSate(twoGangModel: deviceStatus));
     int seconds = 0;
     try {
       seconds = event.duration.inSeconds;
       final response = await DevicesAPI.controlDevice(
-          DeviceControlModel(deviceId: twoGangId, code: event.deviceCode, value: seconds),
+          DeviceControlModel(
+              deviceId: twoGangId, code: event.deviceCode, value: seconds),
           twoGangId);
 
       if (response['success'] ?? false) {
@@ -326,7 +355,8 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
     }
   }
 
-  void _getCounterValue(GetCounterEvent event, Emitter<TwoGangState> emit) async {
+  void _getCounterValue(
+      GetCounterEvent event, Emitter<TwoGangState> emit) async {
     emit(LoadingInitialState());
     try {
       add(GetScheduleEvent());
@@ -434,7 +464,8 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
         deviceId: twoGangId,
       );
       List<dynamic> jsonData = response;
-      listSchedule = jsonData.map((item) => ScheduleModel.fromJson(item)).toList();
+      listSchedule =
+          jsonData.map((item) => ScheduleModel.fromJson(item)).toList();
       emit(InitialState());
     } on DioException catch (e) {
       final errorData = e.response!.data;
@@ -445,12 +476,13 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
 
   int? getTimeStampWithoutSeconds(DateTime? dateTime) {
     if (dateTime == null) return null;
-    DateTime dateTimeWithoutSeconds =
-        DateTime(dateTime.year, dateTime.month, dateTime.day, dateTime.hour, dateTime.minute);
+    DateTime dateTimeWithoutSeconds = DateTime(dateTime.year, dateTime.month,
+        dateTime.day, dateTime.hour, dateTime.minute);
     return dateTimeWithoutSeconds.millisecondsSinceEpoch ~/ 1000;
   }
 
-  Future toggleRepeat(ToggleScheduleEvent event, Emitter<TwoGangState> emit) async {
+  Future toggleRepeat(
+      ToggleScheduleEvent event, Emitter<TwoGangState> emit) async {
     try {
       emit(LoadingInitialState());
       final response = await DevicesAPI.changeSchedule(
@@ -469,7 +501,8 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
     }
   }
 
-  Future deleteSchedule(DeleteScheduleEvent event, Emitter<TwoGangState> emit) async {
+  Future deleteSchedule(
+      DeleteScheduleEvent event, Emitter<TwoGangState> emit) async {
     try {
       emit(LoadingInitialState());
       final response = await DevicesAPI.deleteSchedule(
@@ -489,7 +522,8 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
     }
   }
 
-  void _fetchTwoGangWizardStatus(InitialWizardEvent event, Emitter<TwoGangState> emit) async {
+  void _fetchTwoGangWizardStatus(
+      InitialWizardEvent event, Emitter<TwoGangState> emit) async {
     emit(LoadingInitialState());
     try {
       devicesList = [];
@@ -499,7 +533,8 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
           HomeCubit.getInstance().selectedSpace?.id ?? '', '2G');
 
       for (int i = 0; i < devicesList.length; i++) {
-        var response = await DevicesAPI.getDeviceStatus(devicesList[i].uuid ?? '');
+        var response =
+            await DevicesAPI.getDeviceStatus(devicesList[i].uuid ?? '');
         List<StatusModel> statusModelList = [];
         for (var status in response['status']) {
           statusModelList.add(StatusModel.fromJson(status));
@@ -522,15 +557,16 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
           return true;
         });
       }
-      emit(UpdateGroupState(twoGangList: groupTwoGangList, allSwitches: allSwitchesOn));
+      emit(UpdateGroupState(
+          twoGangList: groupTwoGangList, allSwitches: allSwitchesOn));
     } catch (e) {
       emit(FailedState(error: e.toString()));
       return;
     }
   }
 
-  void _changeFirstWizardSwitch(
-      ChangeFirstWizardSwitchStatusEvent event, Emitter<TwoGangState> emit) async {
+  void _changeFirstWizardSwitch(ChangeFirstWizardSwitchStatusEvent event,
+      Emitter<TwoGangState> emit) async {
     emit(LoadingNewSate(twoGangModel: deviceStatus));
     try {
       bool allSwitchesValue = true;
@@ -543,9 +579,11 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
         }
       });
 
-      emit(UpdateGroupState(twoGangList: groupTwoGangList, allSwitches: allSwitchesValue));
+      emit(UpdateGroupState(
+          twoGangList: groupTwoGangList, allSwitches: allSwitchesValue));
 
-      List<String> allDeviceIds = groupTwoGangList.map((device) => device.deviceId).toList();
+      List<String> allDeviceIds =
+          groupTwoGangList.map((device) => device.deviceId).toList();
       final response = await DevicesAPI.deviceBatchController(
         code: 'switch_1',
         devicesUuid: allDeviceIds,
@@ -560,8 +598,8 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
     }
   }
 
-  void _changeSecondWizardSwitch(
-      ChangeSecondWizardSwitchStatusEvent event, Emitter<TwoGangState> emit) async {
+  void _changeSecondWizardSwitch(ChangeSecondWizardSwitchStatusEvent event,
+      Emitter<TwoGangState> emit) async {
     emit(LoadingNewSate(twoGangModel: deviceStatus));
     try {
       bool allSwitchesValue = true;
@@ -573,9 +611,11 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
           allSwitchesValue = false;
         }
       });
-      List<String> allDeviceIds = groupTwoGangList.map((device) => device.deviceId).toList();
+      List<String> allDeviceIds =
+          groupTwoGangList.map((device) => device.deviceId).toList();
 
-      emit(UpdateGroupState(twoGangList: groupTwoGangList, allSwitches: allSwitchesValue));
+      emit(UpdateGroupState(
+          twoGangList: groupTwoGangList, allSwitches: allSwitchesValue));
 
       final response = await DevicesAPI.deviceBatchController(
         code: 'switch_2',

lib/features/devices/bloc/two_touch_bloc/two_touch_bloc.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'package:dio/dio.dart';
+import 'package:firebase_database/firebase_database.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
 import 'package:syncrow_app/features/devices/bloc/two_touch_bloc/two_touch_event.dart';
@@ -98,52 +99,61 @@ class TwoTouchBloc extends Bloc<TwoTouchEvent, TwoTouchState> {
       }
       deviceStatus = TwoTouchModel.fromJson(statusModelList);
       emit(UpdateState(twoTouchModel: deviceStatus));
-      // _listenToChanges();
+      _listenToChanges();
     } catch (e) {
       emit(FailedState(error: e.toString()));
       return;
     }
   }
 
-  // StreamSubscription<DatabaseEvent>? _streamSubscription;
+  StreamSubscription<DatabaseEvent>? _streamSubscription;
 
-  // void _listenToChanges() {
-  //   try {
-  //     _streamSubscription?.cancel();
-  //     DatabaseReference ref =
-  //         FirebaseDatabase.instance.ref('device-status/$twoTouchId');
-  //     Stream<DatabaseEvent> stream = ref.onValue;
+  void _listenToChanges() {
+    try {
+      _streamSubscription?.cancel();
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$twoTouchId');
+      Stream<DatabaseEvent> stream = ref.onValue;
 
-  //     _streamSubscription = stream.listen((DatabaseEvent event) async {
-  //       if (_timer != null) {
-  //         await Future.delayed(const Duration(seconds: 2));
-  //       }
-  //       Map<dynamic, dynamic> usersMap =
-  //           event.snapshot.value as Map<dynamic, dynamic>;
-  //       List<StatusModel> statusList = [];
-  //       usersMap['status'].forEach((element) {
-  //         statusList
-  //             .add(StatusModel(code: element['code'], value: element['value']));
-  //       });
-  //       print('=========${usersMap['status']}');
-  //       deviceStatus = TwoTouchModel.fromJson(statusList);
-  //       if (!isClosed) {
-  //         add(TwoTouchUpdated());
-  //       }
-  //     });
-  //   } catch (_) {}
-  // }
+      _streamSubscription = stream.listen((DatabaseEvent event) async {
+        if (_timer != null) {
+          await Future.delayed(const Duration(seconds: 1));
+        }
+        if (event.snapshot.value != null) {
+          Map<dynamic, dynamic> usersMap =
+              event.snapshot.value as Map<dynamic, dynamic>;
+          List<StatusModel> statusList = [];
 
-  // @override
-  // Future<void> close() async {
-  //   _streamSubscription?.cancel();
-  //   _streamSubscription = null;
-  //   return super.close();
-  // }
+          usersMap['status'].forEach((element) {
+            statusList.add(
+                StatusModel(code: element['code'], value: element['value']));
+          });
+          var switch1Status = statusList.firstWhere(
+              (status) => status.code == "switch_1",
+              orElse: () => StatusModel(code: "switch_1", value: false));
 
+          var switch2Status = statusList.firstWhere(
+              (status) => status.code == "switch_2",
+              orElse: () => StatusModel(code: "switch_2", value: false));
+          deviceStatus.firstSwitch = switch1Status.value as bool;
+          deviceStatus.secondSwitch = switch2Status.value as bool;
 
+          add(TwoTouchUpdated());
+        }
+      });
+    } catch (_) {
+    }
+  }
+
+  @override
+  Future<void> close() async {
+    _streamSubscription?.cancel();
+    _streamSubscription = null;
+    return super.close();
+  }
 
   _twoTouchUpdated(TwoTouchUpdated event, Emitter<TwoTouchState> emit) {
+    emit(LoadingInitialState());
     emit(UpdateState(twoTouchModel: deviceStatus));
   }
 

lib/features/devices/bloc/water_heater_bloc/water_heater_bloc.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'package:dio/dio.dart';
+import 'package:firebase_database/firebase_database.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
@@ -73,7 +74,7 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
         statusModelList,
       );
       emit(UpdateState(whModel: deviceStatus));
-      // _listenToChanges();
+      _listenToChanges();
     } catch (e) {
       emit(WHFailedState(errorMessage: e.toString()));
       return;
@@ -81,41 +82,39 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
   }
 
   //real-time db
-  // StreamSubscription<DatabaseEvent>? _streamSubscription;
-  // void _listenToChanges() {
-  //   try {
-  //     _streamSubscription?.cancel();
-  //     DatabaseReference ref =
-  //         FirebaseDatabase.instance.ref('device-status/$whId');
-  //     Stream<DatabaseEvent> stream = ref.onValue;
-
-  //     _streamSubscription = stream.listen((DatabaseEvent event) async {
-  //       if (_timer != null) {
-  //         await Future.delayed(const Duration(seconds: 2));
-  //       }
-  //       Map<dynamic, dynamic> usersMap =
-  //           event.snapshot.value as Map<dynamic, dynamic>;
-  //       List<StatusModel> statusList = [];
-  //       usersMap['status'].forEach((element) {
-  //         statusList
-  //             .add(StatusModel(code: element['code'], value: element['value']));
-  //       });
-  //       deviceStatus = WHModel.fromJson(statusList);
-  //       if (!isClosed) {
-  //         add(WaterHeaterUpdated());
-  //       }
-  //     });
-  //   } catch (_) {}
-  // }
-
-  // @override
-  // Future<void> close() async {
-  //   _streamSubscription?.cancel();
-  //   _streamSubscription = null;
-  //   return super.close();
-  // }
+  StreamSubscription<DatabaseEvent>? _streamSubscription;
+  void _listenToChanges() {
+    try {
+      _streamSubscription?.cancel();
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$whId');
+      Stream<DatabaseEvent> stream = ref.onValue;
 
+      _streamSubscription = stream.listen((DatabaseEvent event) async {
+        if (_timer != null) {
+          await Future.delayed(const Duration(seconds: 2));
+        }
+        Map<dynamic, dynamic> usersMap =
+            event.snapshot.value as Map<dynamic, dynamic>;
+        List<StatusModel> statusList = [];
+        usersMap['status'].forEach((element) {
+          statusList
+              .add(StatusModel(code: element['code'], value: element['value']));
+        });
+        deviceStatus = WHModel.fromJson(statusList);
+        if (!isClosed) {
+          add(WaterHeaterUpdated());
+        }
+      });
+    } catch (_) {}
+  }
 
+  @override
+  Future<void> close() async {
+    _streamSubscription?.cancel();
+    _streamSubscription = null;
+    return super.close();
+  }
 
   _waterHeaterUpdated(
       WaterHeaterUpdated event, Emitter<WaterHeaterState> emit) async {

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

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:smooth_page_indicator/smooth_page_indicator.dart';
-import 'package:syncrow_app/features/devices/bloc/devices_cubit.dart';
 import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
+import 'package:syncrow_app/features/devices/bloc/devices_cubit.dart';
 import 'package:syncrow_app/features/devices/view/widgets/all_devices.dart';
 import 'package:syncrow_app/features/devices/view/widgets/room_page.dart';
 import 'package:syncrow_app/features/devices/view/widgets/rooms_slider.dart';
@@ -15,7 +15,7 @@ import 'package:syncrow_app/utils/context_extension.dart';
 import 'package:syncrow_app/utils/resource_manager/strings_manager.dart';
 
 class DevicesViewBody extends StatelessWidget {
-  const DevicesViewBody({Key? key}) : super(key: key);
+  const DevicesViewBody({super.key});
   @override
   Widget build(BuildContext context) {
     return BlocBuilder<HomeCubit, HomeState>(
@@ -80,10 +80,7 @@ class DevicesViewBody extends StatelessWidget {
             ),
           ],
         ),
-        SizedBox(
-          height: MediaQuery.of(context).size.height * 0.1,
-          child: const SceneView(pageType: true),
-        ),
+        const SceneView(pageType: true),
         const SizedBox(height: 20),
         const RoomsSlider(),
         const SizedBox(height: 10),

lib/features/devices/view/widgets/garage_door/garage_list.dart

@@ -8,8 +8,7 @@ import 'package:syncrow_app/features/shared_widgets/devices_default_switch.dart'
 import 'package:syncrow_app/features/shared_widgets/text_widgets/body_small.dart';
 
 class GarageList extends StatelessWidget {
-  const GarageList(
-      {super.key, required this.garageList, required this.allSwitches});
+  const GarageList({super.key, required this.garageList, required this.allSwitches});
 
   final List<GroupGarageModel> garageList;
   final bool allSwitches;
@@ -23,43 +22,42 @@ class GarageList extends StatelessWidget {
             crossAxisAlignment: CrossAxisAlignment.stretch,
             children: [
               const SizedBox(height: 10),
-              const BodySmall(text: 'All Lights'),
+              const BodySmall(text: 'All Garages'),
               const SizedBox(height: 5),
               DevicesDefaultSwitch(
-                off: 'OFF',
-                on: 'ON',
+                off: 'Close',
+                on: 'Open',
                 switchValue: allSwitches,
-                action: () {
-                  BlocProvider.of<GarageDoorBloc>(context)
-                      .add(GroupAllOnEvent());
-                },
-                secondAction: () {
-                  BlocProvider.of<GarageDoorBloc>(context)
-                      .add(GroupAllOffEvent());
-                },
+                action: () => BlocProvider.of<GarageDoorBloc>(context).add(
+                  GroupAllOnEvent(),
+                ),
+                secondAction: () => BlocProvider.of<GarageDoorBloc>(context).add(
+                  GroupAllOffEvent(),
+                ),
               ),
               ListView.builder(
                 shrinkWrap: true,
                 physics: const NeverScrollableScrollPhysics(),
-                padding: const EdgeInsets.all(0),
+                padding: EdgeInsetsDirectional.zero,
                 itemCount: garageList.length,
                 itemBuilder: (context, index) {
+                  final garageDoor = garageList[index];
                   return Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
                       const SizedBox(height: 10),
-                      BodySmall(text: garageList[index].deviceName),
+                      BodySmall(text: garageDoor.deviceName),
                       const SizedBox(height: 5),
                       DevicesDefaultSwitch(
-                        off: 'OFF',
-                        on: 'ON',
-                        switchValue: garageList[index].firstSwitch,
-                        action: () {
-                          BlocProvider.of<GarageDoorBloc>(context).add(
-                              ChangeFirstWizardSwitchStatusEvent(
-                                  value: garageList[index].firstSwitch,
-                                  deviceId: garageList[index].deviceId));
-                        },
+                        off: 'Close',
+                        on: 'Open',
+                        switchValue: garageDoor.firstSwitch,
+                        action: () => BlocProvider.of<GarageDoorBloc>(context).add(
+                          ChangeFirstWizardSwitchStatusEvent(
+                            value: garageDoor.firstSwitch,
+                            deviceId: garageDoor.deviceId,
+                          ),
+                        ),
                       ),
                     ],
                   );

lib/features/devices/view/widgets/one_gang/one_gang_screen.dart

@@ -20,8 +20,9 @@ class OneGangScreen extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) => OneGangBloc(switchCode: 'switch_1', oneGangId: device?.uuid ?? '')
-        ..add(const InitialEvent(groupScreen: false)),
+      create: (context) =>
+          OneGangBloc(switchCode: 'switch_1', oneGangId: device?.uuid ?? '')
+            ..add(const InitialEvent(groupScreen: false)),
       child: BlocBuilder<OneGangBloc, OneGangState>(
         builder: (context, state) {
           OneGangModel oneGangModel = OneGangModel(
@@ -36,13 +37,15 @@ class OneGangScreen extends StatelessWidget {
           }
           return state is LoadingInitialState
               ? const Center(
-                  child:
-                      DefaultContainer(width: 50, height: 50, child: CircularProgressIndicator()),
+                  child: DefaultContainer(
+                      width: 50,
+                      height: 50,
+                      child: CircularProgressIndicator()),
                 )
               : RefreshIndicator(
                   onRefresh: () async {
-                    BlocProvider.of<OneGangBloc>(context)
-                        .add(InitialEvent(groupScreen: device != null ? false : true));
+                    BlocProvider.of<OneGangBloc>(context).add(InitialEvent(
+                        groupScreen: device != null ? false : true));
                   },
                   child: ListView(
                     children: [
@@ -55,7 +58,8 @@ class OneGangScreen extends StatelessWidget {
                             const Expanded(child: SizedBox.shrink()),
                             Expanded(
                               child: Row(
-                                mainAxisAlignment: MainAxisAlignment.spaceAround,
+                                mainAxisAlignment:
+                                    MainAxisAlignment.spaceAround,
                                 crossAxisAlignment: CrossAxisAlignment.center,
                                 children: [
                                   Column(
@@ -64,9 +68,10 @@ class OneGangScreen extends StatelessWidget {
                                         threeGangSwitch: device!,
                                         value: oneGangModel.firstSwitch,
                                         action: () {
-                                          BlocProvider.of<OneGangBloc>(context).add(
-                                              ChangeFirstSwitchStatusEvent(
-                                                  value: oneGangModel.firstSwitch));
+                                          BlocProvider.of<OneGangBloc>(context)
+                                              .add(ChangeFirstSwitchStatusEvent(
+                                                  value: oneGangModel
+                                                      .firstSwitch));
                                         },
                                       ),
                                       const SizedBox(height: 20),
@@ -74,7 +79,8 @@ class OneGangScreen extends StatelessWidget {
                                         width: 70,
                                         child: BodySmall(
                                           text: " Entrance Light",
-                                          fontColor: ColorsManager.textPrimaryColor,
+                                          fontColor:
+                                              ColorsManager.textPrimaryColor,
                                           textAlign: TextAlign.center,
                                         ),
                                       ),
@@ -94,20 +100,24 @@ class OneGangScreen extends StatelessWidget {
                                       Card(
                                         elevation: 3,
                                         shape: RoundedRectangleBorder(
-                                          borderRadius: BorderRadius.circular(100),
+                                          borderRadius:
+                                              BorderRadius.circular(100),
                                         ),
                                         child: GestureDetector(
                                           onTap: () {
                                             Navigator.push(
                                                 context,
                                                 PageRouteBuilder(
-                                                    pageBuilder:
-                                                        (context, animation1, animation2) =>
-                                                            TimerScheduleScreen(
-                                                              switchCode: 'switch_1',
-                                                              device: device!,
-                                                              deviceCode: 'countdown_1',
-                                                            )));
+                                                    pageBuilder: (context,
+                                                            animation1,
+                                                            animation2) =>
+                                                        TimerScheduleScreen(
+                                                          switchCode:
+                                                              'switch_1',
+                                                          device: device!,
+                                                          deviceCode:
+                                                              'countdown_1',
+                                                        )));
                                           },
                                           child: Stack(
                                             alignment: Alignment.center,
@@ -117,7 +127,9 @@ class OneGangScreen extends StatelessWidget {
                                                 height: 60,
                                                 decoration: BoxDecoration(
                                                   color: Colors.grey[300],
-                                                  borderRadius: BorderRadius.circular(100),
+                                                  borderRadius:
+                                                      BorderRadius.circular(
+                                                          100),
                                                 ),
                                               ),
                                               Container(
@@ -125,12 +137,15 @@ class OneGangScreen extends StatelessWidget {
                                                 height: 40,
                                                 decoration: BoxDecoration(
                                                   color: Colors.white,
-                                                  borderRadius: BorderRadius.circular(100),
+                                                  borderRadius:
+                                                      BorderRadius.circular(
+                                                          100),
                                                 ),
                                                 child: Center(
                                                   child: Icon(
                                                     Icons.access_time,
-                                                    color: ColorsManager.primaryColorWithOpacity,
+                                                    color: ColorsManager
+                                                        .primaryColorWithOpacity,
                                                     size: 25,
                                                   ),
                                                 ),

lib/features/devices/view/widgets/water_heater/wh_list.dart

@@ -8,7 +8,11 @@ import 'package:syncrow_app/features/shared_widgets/devices_default_switch.dart'
 import 'package:syncrow_app/features/shared_widgets/text_widgets/body_small.dart';
 
 class WHList extends StatelessWidget {
-  const WHList({super.key, required this.whList, required this.allSwitches});
+  const WHList({
+    required this.whList,
+    required this.allSwitches,
+    super.key,
+  });
 
   final List<GroupWHModel> whList;
   final bool allSwitches;
@@ -22,43 +26,42 @@ class WHList extends StatelessWidget {
             crossAxisAlignment: CrossAxisAlignment.stretch,
             children: [
               const SizedBox(height: 10),
-              const BodySmall(text: 'All Lights'),
+              const BodySmall(text: 'All Water Heaters'),
               const SizedBox(height: 5),
               DevicesDefaultSwitch(
                 off: 'OFF',
                 on: 'ON',
                 switchValue: allSwitches,
-                action: () {
-                  BlocProvider.of<WaterHeaterBloc>(context)
-                      .add(GroupAllOnEvent());
-                },
-                secondAction: () {
-                  BlocProvider.of<WaterHeaterBloc>(context)
-                      .add(GroupAllOffEvent());
-                },
+                action: () => context.read<WaterHeaterBloc>().add(
+                      GroupAllOnEvent(),
+                    ),
+                secondAction: () => context.read<WaterHeaterBloc>().add(
+                      GroupAllOffEvent(),
+                    ),
               ),
               ListView.builder(
                 shrinkWrap: true,
                 physics: const NeverScrollableScrollPhysics(),
-                padding: const EdgeInsets.all(0),
+                padding: EdgeInsetsDirectional.zero,
                 itemCount: whList.length,
                 itemBuilder: (context, index) {
+                  final waterHeater = whList[index];
                   return Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
                       const SizedBox(height: 10),
-                      BodySmall(text: whList[index].deviceName),
+                      BodySmall(text: waterHeater.deviceName),
                       const SizedBox(height: 5),
                       DevicesDefaultSwitch(
                         off: 'OFF',
                         on: 'ON',
-                        switchValue: whList[index].firstSwitch,
-                        action: () {
-                          BlocProvider.of<WaterHeaterBloc>(context).add(
+                        switchValue: waterHeater.firstSwitch,
+                        action: () => context.read<WaterHeaterBloc>().add(
                               ChangeFirstWizardSwitchStatusEvent(
-                                  value: whList[index].firstSwitch,
-                                  deviceId: whList[index].deviceId));
-                        },
+                                value: waterHeater.firstSwitch,
+                                deviceId: waterHeater.deviceId,
+                              ),
+                            ),
                       ),
                     ],
                   );

lib/features/scene/bloc/create_scene/create_scene_bloc.dart

@@ -1,6 +1,8 @@
 import 'dart:async';
 import 'package:equatable/equatable.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
+import 'package:syncrow_app/features/auth/model/project_model.dart';
 import 'package:syncrow_app/features/devices/model/device_control_model.dart';
 import 'package:syncrow_app/features/scene/bloc/effective_period/effect_period_bloc.dart';
 import 'package:syncrow_app/features/scene/bloc/effective_period/effect_period_event.dart';
@@ -348,15 +350,18 @@ class CreateSceneBloc extends Bloc<CreateSceneEvent, CreateSceneState>
     emit(CreateSceneLoading());
     try {
       dynamic response;
+      Project? project = HomeCubit.getInstance().project;
+
       if (event.createSceneModel != null) {
         response = event.updateScene
             ? await SceneApi.updateScene(event.createSceneModel!, event.sceneId)
             : await SceneApi.createScene(event.createSceneModel!);
       } else if (event.createAutomationModel != null) {
         response = event.updateScene
-            ? await SceneApi.updateAutomation(
-                event.createAutomationModel!, event.sceneId)
-            : await SceneApi.createAutomation(event.createAutomationModel!);
+            ? await SceneApi.updateAutomation(event.createAutomationModel!,
+                event.sceneId, project?.uuid ?? '')
+            : await SceneApi.createAutomation(
+                event.createAutomationModel!, project?.uuid ?? '');
       }
 
       if (response['success'] == true) {
@@ -421,6 +426,8 @@ class CreateSceneBloc extends Bloc<CreateSceneEvent, CreateSceneState>
     emit(CreateSceneLoading());
 
     try {
+      Project? project = HomeCubit.getInstance().project;
+
       tasksList.clear();
       tempTasksList.clear();
       selectedValues.clear();
@@ -436,7 +443,8 @@ class CreateSceneBloc extends Bloc<CreateSceneEvent, CreateSceneState>
       conditionRule = 'or';
 
       final response = event.isAutomation
-          ? await SceneApi.getAutomationDetails(event.sceneId)
+          ? await SceneApi.getAutomationDetails(
+              event.sceneId, project?.uuid ?? '')
           : await SceneApi.getSceneDetails(event.sceneId);
       if (response.id.isNotEmpty) {
         if (event.isAutomation) {
@@ -605,10 +613,14 @@ class CreateSceneBloc extends Bloc<CreateSceneEvent, CreateSceneState>
     emit(DeleteSceneLoading());
 
     try {
+      Project? project = HomeCubit.getInstance().project;
+
       final response =
           sceneType.name == CreateSceneEnum.deviceStatusChanges.name
               ? await SceneApi.deleteAutomation(
-                  automationId: event.sceneId, unitUuid: event.unitUuid)
+                  automationId: event.sceneId,
+                  unitUuid: event.unitUuid,
+                  projectId: project?.uuid ?? '')
               : await SceneApi.deleteScene(
                   sceneId: event.sceneId,
                 );

lib/features/scene/bloc/scene_bloc/scene_bloc.dart

@@ -46,8 +46,11 @@ class SceneBloc extends Bloc<SceneEvent, SceneState> {
     emit(SceneLoading());
 
     try {
+      Project? project = HomeCubit.getInstance().project;
+
       if (event.unitId.isNotEmpty) {
-        automationList = await SceneApi.getAutomationByUnitId(event.unitId);
+        automationList = await SceneApi.getAutomationByUnitId(
+            event.unitId, event.communityId, project?.uuid ?? '');
         emit(SceneLoaded(scenes, automationList));
       } else {
         emit(const SceneError(message: 'Unit ID is empty'));
@@ -96,11 +99,17 @@ class SceneBloc extends Bloc<SceneEvent, SceneState> {
       ));
 
       try {
+        Project? project = HomeCubit.getInstance().project;
+
         final success = await SceneApi.updateAutomationStatus(
-            event.automationId, event.automationStatusUpdate);
+            event.automationId,
+            event.automationStatusUpdate,
+            project?.uuid ?? '');
         if (success) {
           automationList = await SceneApi.getAutomationByUnitId(
-              event.automationStatusUpdate.spaceUuid);
+              event.automationStatusUpdate.spaceUuid,
+              event.communityId,
+              project?.uuid ?? '');
           newLoadingStates[event.automationId] = false;
           emit(SceneLoaded(
             currentState.scenes,

lib/features/scene/bloc/scene_bloc/scene_event.dart

@@ -22,11 +22,13 @@ class LoadScenes extends SceneEvent {
 
 class LoadAutomation extends SceneEvent {
   final String unitId;
+    final String communityId;
 
-  const LoadAutomation(this.unitId);
+
+  const LoadAutomation(this.unitId, this.communityId);
 
   @override
-  List<Object> get props => [unitId];
+  List<Object> get props => [unitId, communityId];
 }
 
 class SceneTrigger extends SceneEvent {
@@ -43,8 +45,9 @@ class SceneTrigger extends SceneEvent {
 class UpdateAutomationStatus extends SceneEvent {
   final String automationId;
   final AutomationStatusUpdate automationStatusUpdate;
+  final String communityId;
 
-  const UpdateAutomationStatus({required this.automationStatusUpdate, required this.automationId});
+  const UpdateAutomationStatus({required this.automationStatusUpdate, required this.automationId, required this.communityId});
 
   @override
   List<Object> get props => [automationStatusUpdate];

lib/features/scene/bloc/tab_change/tab_change_bloc.dart

@@ -1,5 +1,3 @@
-import 'dart:async';
-
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/devices/bloc/device_manager_bloc/device_manager_bloc.dart';
 import 'package:syncrow_app/features/devices/bloc/device_manager_bloc/device_manager_event.dart';
@@ -7,19 +5,31 @@ import 'package:syncrow_app/features/scene/bloc/tab_change/tab_change_event.dart
 import 'package:syncrow_app/features/scene/bloc/tab_change/tab_change_state.dart';
 
 class TabBarBloc extends Bloc<TabBarEvent, TabBarState> {
-  final DeviceManagerBloc deviceManagerBloc;
-  TabBarBloc(this.deviceManagerBloc) : super(const Initial()) {
-    on<TabChanged>(_handleTabChanged);
+  TabBarBloc(this.deviceManagerBloc) : super(const TabBarInitialState()) {
+    on<TabBarTabChangedEvent>(_onTabBarTabChangedEvent);
   }
 
-  FutureOr<void> _handleTabChanged(
-      TabChanged event, Emitter<TabBarState> emit) {
+  final DeviceManagerBloc deviceManagerBloc;
+
+  void _onTabBarTabChangedEvent(
+    TabBarTabChangedEvent event,
+    Emitter<TabBarState> emit,
+  ) {
+    _getDevices(event);
+
+    emit(
+      TabBarTabSelectedState(
+        roomId: event.roomId,
+        selectedTabIndex: event.selectedIndex,
+      ),
+    );
+  }
+
+  void _getDevices(TabBarTabChangedEvent event) {
     if (event.roomId == "-1") {
       deviceManagerBloc.add(FetchAllDevices());
     } else {
-      deviceManagerBloc.add(FetchDevicesByRoomId(event.roomId,event.unit));
+      deviceManagerBloc.add(FetchDevicesByRoomId(event.roomId, event.unit));
     }
-    emit(TabSelected(
-        roomId: event.roomId, selectedTabIndex: event.selectedIndex));
   }
 }

lib/features/scene/bloc/tab_change/tab_change_event.dart

@@ -4,10 +4,14 @@ abstract class TabBarEvent {
   const TabBarEvent();
 }
 
-class TabChanged extends TabBarEvent {
+class TabBarTabChangedEvent extends TabBarEvent {
+  const TabBarTabChangedEvent({
+    required this.selectedIndex,
+    required this.roomId,
+    required this.unit,
+  });
+
   final int selectedIndex;
   final String roomId;
   final SpaceModel unit;
-  const TabChanged(
-      {required this.selectedIndex, required this.roomId, required this.unit});
 }

lib/features/scene/bloc/tab_change/tab_change_state.dart

@@ -2,12 +2,16 @@ abstract class TabBarState {
   const TabBarState();
 }
 
-class Initial extends TabBarState {
-  const Initial();
+class TabBarInitialState extends TabBarState {
+  const TabBarInitialState();
 }
 
-class TabSelected extends TabBarState {
+class TabBarTabSelectedState extends TabBarState {
+  const TabBarTabSelectedState({
+    required this.roomId,
+    required this.selectedTabIndex,
+  });
+
   final int selectedTabIndex;
   final String roomId;
-  const TabSelected({required this.roomId, required this.selectedTabIndex});
 }

lib/features/scene/helper/scene_bloc_factory.dart

@@ -0,0 +1,48 @@
+import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
+import 'package:syncrow_app/features/app_layout/model/community_model.dart';
+import 'package:syncrow_app/features/app_layout/model/space_model.dart';
+import 'package:syncrow_app/features/scene/bloc/scene_bloc/scene_bloc.dart';
+import 'package:syncrow_app/features/scene/bloc/scene_bloc/scene_event.dart';
+
+abstract final class SceneBlocFactory {
+  static SceneBloc create({
+    required bool pageType,
+    required HomeCubit homeCubit,
+  }) {
+    final selectedSpace = homeCubit.selectedSpace;
+    final defaultSpace = SpaceModel(
+      id: '-1',
+      name: '',
+      community: Community(
+        uuid: '-1',
+        name: '',
+      ),
+    );
+
+    final spaceId = selectedSpace?.id ?? defaultSpace.id;
+    final space = selectedSpace ?? defaultSpace;
+    final communityUuid =
+        selectedSpace?.community.uuid ?? defaultSpace.community.uuid;
+
+    final sceneBloc = SceneBloc();
+
+    sceneBloc.add(
+      LoadScenes(
+        spaceId,
+        space,
+        showInDevice: pageType,
+      ),
+    );
+
+    if (!pageType) {
+      sceneBloc.add(
+        LoadAutomation(
+          spaceId,
+          communityUuid,
+        ),
+      );
+    }
+
+    return sceneBloc;
+  }
+}

lib/features/scene/view/scene_rooms_tabbar.dart

@@ -20,69 +20,69 @@ class SceneRoomsTabBarDevicesView extends StatefulWidget {
       _SceneRoomsTabBarDevicesViewState();
 }
 
-class _SceneRoomsTabBarDevicesViewState
-    extends State<SceneRoomsTabBarDevicesView>
+class _SceneRoomsTabBarDevicesViewState extends State<SceneRoomsTabBarDevicesView>
     with SingleTickerProviderStateMixin {
   late final TabController _tabController;
-  List<SubSpaceModel>? rooms = [];
   late final SpaceModel selectedSpace;
+  var rooms = <SubSpaceModel>[];
 
   @override
   void initState() {
-    selectedSpace = HomeCubit.getInstance().selectedSpace!;
-    rooms = List.from(HomeCubit.getInstance().selectedSpace?.subspaces ?? []);
-    if (rooms != null) {
-      if (rooms![0].id != '-1') {
-        rooms?.insert(
-          0,
-          SubSpaceModel(
-            name: 'All Devices',
-            devices: context.read<DevicesCubit>().allDevices,
-            id: '-1',
-          ),
-        );
-      }
-    }
-
-    _tabController =
-        TabController(length: rooms!.length, vsync: this, initialIndex: 0);
-    _tabController.addListener(_handleTabSwitched);
     super.initState();
-  }
 
-  void _handleTabSwitched() {
-    if (_tabController.indexIsChanging) {
-      final value = _tabController.index;
+    selectedSpace = HomeCubit.getInstance().selectedSpace!;
 
-      /// select tab
-      context.read<TabBarBloc>().add(TabChanged(
-          selectedIndex: value,
-          roomId: rooms?[value].id ?? '',
-          unit: selectedSpace));
-      return;
+    rooms = List.from(selectedSpace.subspaces);
+    final defaultSubSpaceModel = SubSpaceModel(
+      name: 'All Devices',
+      devices: context.read<DevicesCubit>().allDevices,
+      id: '-1',
+    );
+
+    if (rooms.isNotEmpty) {
+      final isFirstRoomIdValid = rooms[0].id != '-1';
+      if (isFirstRoomIdValid) {
+        rooms.insert(0, defaultSubSpaceModel);
+      }
+    } else {
+      rooms = [defaultSubSpaceModel];
     }
+
+    _tabController = TabController(length: rooms.length, vsync: this);
+    _tabController.addListener(_handleTabSwitched);
   }
 
   @override
   void dispose() {
     super.dispose();
-    _tabController.dispose();
     _tabController.removeListener(() {});
+    _tabController.dispose();
+  }
+
+  void _handleTabSwitched() {
+    if (_tabController.indexIsChanging) {
+      final index = _tabController.index;
+
+      context.read<TabBarBloc>().add(
+            TabBarTabChangedEvent(
+              selectedIndex: index,
+              roomId: rooms[index].id ?? '',
+              unit: selectedSpace,
+            ),
+          );
+      return;
+    }
   }
 
   @override
   Widget build(BuildContext context) {
     return DefaultScaffold(
-      title: StringsManager.createScene,
-      padding: EdgeInsets.zero,
+      padding: EdgeInsetsDirectional.zero,
       leading: IconButton(
-        onPressed: () {
-          navigateToRoute(context, Routes.sceneTasksRoute);
-        },
-        icon: const Icon(
-          Icons.arrow_back_ios,
-        ),
+        onPressed: () => navigateToRoute(context, Routes.sceneTasksRoute),
+        icon: const Icon(Icons.arrow_back_ios),
       ),
+      title: StringsManager.createScene,
       child: SceneDevicesBody(tabController: _tabController, rooms: rooms),
     );
   }

lib/features/scene/view/scene_view.dart

@@ -1,75 +1,45 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
-import 'package:syncrow_app/features/app_layout/model/community_model.dart';
 import 'package:syncrow_app/features/app_layout/model/space_model.dart';
 import 'package:syncrow_app/features/devices/view/widgets/scene_listview.dart';
 import 'package:syncrow_app/features/scene/bloc/create_scene/create_scene_bloc.dart';
 import 'package:syncrow_app/features/scene/bloc/scene_bloc/scene_bloc.dart';
 import 'package:syncrow_app/features/scene/bloc/scene_bloc/scene_event.dart';
 import 'package:syncrow_app/features/scene/bloc/smart_scene/smart_scene_select_dart_bloc.dart';
+import 'package:syncrow_app/features/scene/helper/scene_bloc_factory.dart';
+import 'package:syncrow_app/features/scene/widgets/empty_devices_widget.dart';
 import 'package:syncrow_app/features/scene/widgets/scene_view_widget/scene_grid_view.dart';
 import 'package:syncrow_app/features/scene/widgets/scene_view_widget/scene_header.dart';
-import 'package:syncrow_app/features/shared_widgets/create_unit.dart';
+import 'package:syncrow_app/features/shared_widgets/app_loading_indicator.dart';
 import 'package:syncrow_app/features/shared_widgets/text_widgets/body_medium.dart';
 import 'package:syncrow_app/utils/context_extension.dart';
 import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
 
 class SceneView extends StatelessWidget {
+  const SceneView({
+    this.pageType = false,
+    super.key,
+  });
+
   final bool pageType;
-  const SceneView({super.key, this.pageType = false});
 
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (BuildContext context) {
-        if (pageType) {
-          return SceneBloc()
-            ..add(LoadScenes(
-                HomeCubit.getInstance().selectedSpace?.id ?? '',
-                HomeCubit.getInstance().selectedSpace ??
-                    SpaceModel(
-                        id: '-1',
-                        name: '',
-                        community: Community(
-                          uuid: '-1',
-                          name: '',
-                        )),
-                showInDevice: pageType));
-        } else {
-          return SceneBloc()
-            ..add(LoadScenes(
-                HomeCubit.getInstance().selectedSpace?.id ?? '',
-                HomeCubit.getInstance().selectedSpace ??
-                    SpaceModel(
-                        id: '-1',
-                        name: '',
-                        community: Community(
-                          uuid: '-1',
-                          name: '',
-                        )),
-                showInDevice: pageType))
-            ..add(LoadAutomation(HomeCubit.getInstance().selectedSpace?.id ?? ''));
-        }
-      },
+      create: (context) => SceneBlocFactory.create(
+        pageType: pageType,
+        homeCubit: HomeCubit.getInstance(),
+      ),
       child: BlocBuilder<CreateSceneBloc, CreateSceneState>(
         builder: (context, state) {
+          final selectedSpace = HomeCubit.getInstance().selectedSpace;
           if (state is DeleteSceneSuccess) {
-            if (state.success) {
-              BlocProvider.of<SceneBloc>(context).add(LoadScenes(
-                  HomeCubit.getInstance().selectedSpace!.id, HomeCubit.getInstance().selectedSpace!,
-                  showInDevice: pageType));
-              BlocProvider.of<SceneBloc>(context)
-                  .add(LoadAutomation(HomeCubit.getInstance().selectedSpace!.id));
-            }
+            if (state.success) _loadScenesAndAutomations(context, selectedSpace);
           }
           if (state is CreateSceneWithTasks) {
-            if (state.success == true) {
-              BlocProvider.of<SceneBloc>(context).add(LoadScenes(
-                  HomeCubit.getInstance().selectedSpace!.id, HomeCubit.getInstance().selectedSpace!,
-                  showInDevice: pageType));
-              BlocProvider.of<SceneBloc>(context)
-                  .add(LoadAutomation(HomeCubit.getInstance().selectedSpace!.id));
+            if (state.success) {
+              _loadScenesAndAutomations(context, selectedSpace);
               context.read<SmartSceneSelectBloc>().add(const SmartSceneClearEvent());
             }
           }
@@ -77,23 +47,24 @@ class SceneView extends StatelessWidget {
             listener: (context, state) {
               if (state is SceneTriggerSuccess) {
                 context.showCustomSnackbar(
-                    message: 'Scene ${state.sceneName} triggered successfully!');
+                  message: 'Scene ${state.sceneName} triggered successfully!',
+                );
               }
             },
-            child: HomeCubit.getInstance().spaces?.isEmpty ?? true
-                ? const CreateUnitWidget()
+            child: HomeCubit.getInstance().spaces.isEmpty
+                ? const EmptyDevicesWidget()
                 : Column(
                     mainAxisAlignment: MainAxisAlignment.start,
                     crossAxisAlignment: CrossAxisAlignment.stretch,
                     children: [
-                      if (pageType == false) const SceneHeader(),
-                      if (pageType == false) const SizedBox(height: 8),
+                      if (!pageType) ...[
+                        const SceneHeader(),
+                        const SizedBox(height: 8),
+                      ],
                       BlocBuilder<SceneBloc, SceneState>(
                         builder: (context, state) {
                           if (state is SceneLoading) {
-                            return const Center(
-                              child: CircularProgressIndicator(),
-                            );
+                            return const AppLoadingIndicator();
                           }
                           if (state is SceneError) {
                             return Center(
@@ -103,80 +74,83 @@ class SceneView extends StatelessWidget {
                           if (state is SceneLoaded) {
                             final scenes = state.scenes;
                             final automationList = state.automationList;
+                            if (scenes.isEmpty) return const EmptyDevicesWidget();
 
-                            return pageType
-                                ? Expanded(
-                                    child: SceneListview(
-                                    scenes: scenes,
-                                    loadingSceneId: state.loadingSceneId,
-                                  ))
-                                : Expanded(
-                                    child: ListView(
+                            if (pageType) {
+                              return SizedBox(
+                                height: context.height * 0.1,
+                                child: SceneListview(
+                                  scenes: scenes,
+                                  loadingSceneId: state.loadingSceneId,
+                                ),
+                              );
+                            }
+
+                            return Theme(
+                              data: Theme.of(context).copyWith(
+                                dividerColor: Colors.transparent,
+                              ),
+                              child: Expanded(
+                                child: ListView(
+                                  children: [
+                                    ExpansionTile(
+                                      tilePadding: const EdgeInsets.symmetric(
+                                        horizontal: 6,
+                                      ),
+                                      initiallyExpanded: true,
+                                      iconColor: ColorsManager.grayColor,
+                                      title: const BodyMedium(
+                                        text: 'Tap to run routines',
+                                      ),
                                       children: [
-                                        Theme(
-                                          data: ThemeData()
-                                              .copyWith(dividerColor: Colors.transparent),
-                                          child: ExpansionTile(
-                                            tilePadding: const EdgeInsets.symmetric(horizontal: 6),
-                                            initiallyExpanded: true,
-                                            iconColor: ColorsManager.grayColor,
-                                            title: const BodyMedium(text: 'Tap to run routines'),
-                                            children: [
-                                              scenes.isNotEmpty
-                                                  ? SceneGrid(
-                                                      scenes: scenes,
-                                                      loadingSceneId: state.loadingSceneId,
-                                                      disablePlayButton: false,
-                                                      loadingStates:
-                                                          state.loadingStates, // Add this line
-                                                    )
-                                                  : const Center(
-                                                      child: BodyMedium(
-                                                        text: 'No scenes have been added yet',
-                                                      ),
-                                                    ),
-                                              const SizedBox(
-                                                height: 10,
-                                              ),
-                                            ],
+                                        if (scenes.isNotEmpty)
+                                          SceneGrid(
+                                            scenes: scenes,
+                                            loadingSceneId: state.loadingSceneId,
+                                            disablePlayButton: false,
+                                            loadingStates: state.loadingStates,
+                                          )
+                                        else
+                                          const Center(
+                                            child: BodyMedium(
+                                              text: 'No scenes have been added yet',
+                                            ),
                                           ),
-                                        ),
-                                        Theme(
-                                          data: ThemeData()
-                                              .copyWith(dividerColor: Colors.transparent),
-                                          child: ExpansionTile(
-                                            initiallyExpanded: true,
-                                            iconColor: ColorsManager.grayColor,
-                                            tilePadding: const EdgeInsets.symmetric(horizontal: 6),
-                                            title: const BodyMedium(text: 'Automation'),
-                                            children: [
-                                              automationList.isNotEmpty
-                                                  ? SceneGrid(
-                                                      scenes: automationList,
-                                                      loadingSceneId: state.loadingSceneId,
-                                                      disablePlayButton: true,
-                                                      loadingStates:
-                                                          state.loadingStates, // Add this line
-                                                    )
-                                                  : const Center(
-                                                      child: BodyMedium(
-                                                        text: 'No automations have been added yet',
-                                                      ),
-                                                    ),
-                                              const SizedBox(
-                                                height: 10,
-                                              ),
-                                            ],
-                                          ),
-                                        ),
-                                        const SizedBox(
-                                          height: 15,
-                                        ),
+                                        const SizedBox(height: 10),
                                       ],
                                     ),
-                                  );
+                                    ExpansionTile(
+                                      initiallyExpanded: true,
+                                      iconColor: ColorsManager.grayColor,
+                                      tilePadding: const EdgeInsets.symmetric(
+                                        horizontal: 6,
+                                      ),
+                                      title: const BodyMedium(text: 'Automation'),
+                                      children: [
+                                        if (automationList.isNotEmpty)
+                                          SceneGrid(
+                                            scenes: automationList,
+                                            loadingSceneId: state.loadingSceneId,
+                                            disablePlayButton: true,
+                                            loadingStates: state.loadingStates,
+                                          )
+                                        else
+                                          const Center(
+                                            child: BodyMedium(
+                                              text:
+                                                  'No automations have been added yet',
+                                            ),
+                                          ),
+                                        const SizedBox(height: 10),
+                                      ],
+                                    ),
+                                    const SizedBox(height: 15),
+                                  ],
+                                ),
+                              ),
+                            );
                           }
-                          return const SizedBox();
+                          return const SizedBox.shrink();
                         },
                       ),
                     ],
@@ -186,4 +160,21 @@ class SceneView extends StatelessWidget {
       ),
     );
   }
+
+  void _loadScenesAndAutomations(BuildContext context, SpaceModel? selectedSpace) {
+    BlocProvider.of<SceneBloc>(context)
+      ..add(
+        LoadScenes(
+          selectedSpace!.id,
+          selectedSpace,
+          showInDevice: pageType,
+        ),
+      )
+      ..add(
+        LoadAutomation(
+          selectedSpace.id,
+          selectedSpace.community.uuid,
+        ),
+      );
+  }
 }

lib/features/scene/widgets/delete_routine_b.dart

@@ -25,7 +25,7 @@ class DeleteRoutineButton extends StatelessWidget {
             BlocProvider.of<SceneBloc>(context).add(LoadScenes(
                 HomeCubit.getInstance().selectedSpace!.id, HomeCubit.getInstance().selectedSpace!));
             BlocProvider.of<SceneBloc>(context)
-                .add(LoadAutomation(HomeCubit.getInstance().selectedSpace!.id));
+                .add(LoadAutomation(HomeCubit.getInstance().selectedSpace!.id,HomeCubit.getInstance().selectedSpace!.community.uuid));
           }
         }
       },

lib/features/scene/widgets/empty_devices_widget.dart

@@ -0,0 +1,22 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
+
+class EmptyDevicesWidget extends StatelessWidget {
+  const EmptyDevicesWidget({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 48),
+      child: Text(
+        "No routines.\nEnable 'Show on Home Screen' to add routines",
+        textAlign: TextAlign.center,
+        style: TextStyle(
+          color: ColorsManager.grayColor,
+          fontWeight: FontWeight.w400,
+          fontSize: 12,
+        ),
+      ),
+    );
+  }
+}

lib/features/scene/widgets/scene_devices/scene_devices_body.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_svg/flutter_svg.dart';
 import 'package:syncrow_app/features/devices/bloc/device_manager_bloc/device_manager_bloc.dart';
 import 'package:syncrow_app/features/devices/bloc/device_manager_bloc/device_manager_state.dart';
 import 'package:syncrow_app/features/devices/model/subspace_model.dart';
@@ -8,60 +7,44 @@ import 'package:syncrow_app/features/scene/bloc/tab_change/tab_change_bloc.dart'
 import 'package:syncrow_app/features/scene/bloc/tab_change/tab_change_state.dart';
 import 'package:syncrow_app/features/scene/enum/create_scene_enum.dart';
 import 'package:syncrow_app/features/scene/model/scene_settings_route_arguments.dart';
-import 'package:syncrow_app/features/scene/widgets/scene_list_tile.dart';
-import 'package:syncrow_app/features/shared_widgets/default_container.dart';
-import 'package:syncrow_app/features/shared_widgets/text_widgets/body_large.dart';
-import 'package:syncrow_app/features/shared_widgets/text_widgets/body_medium.dart';
-import 'package:syncrow_app/navigation/routing_constants.dart';
-import 'package:syncrow_app/utils/context_extension.dart';
-import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
+import 'package:syncrow_app/features/scene/widgets/scene_devices/scene_devices_body_tab_bar.dart';
+import 'package:syncrow_app/features/scene/widgets/scene_devices/scene_devices_list.dart';
+import 'package:syncrow_app/features/shared_widgets/app_loading_indicator.dart';
 
 class SceneDevicesBody extends StatelessWidget {
   const SceneDevicesBody({
-    super.key,
-    required TabController tabController,
+    required this.tabController,
     required this.rooms,
-  }) : _tabController = tabController;
+    super.key,
+  });
 
-  final TabController _tabController;
-  final List<SubSpaceModel>? rooms;
+  final TabController tabController;
+  final List<SubSpaceModel> rooms;
 
   @override
   Widget build(BuildContext context) {
-    final isAutomationDeviceStatus =
-        ((ModalRoute.of(context)?.settings.arguments as SceneSettingsRouteArguments?)?.sceneType ==
-            CreateSceneEnum.deviceStatusChanges.name);
     return BlocBuilder<TabBarBloc, TabBarState>(
-      builder: (context, tabState) {
+      builder: (context, state) {
         return Column(
           mainAxisSize: MainAxisSize.min,
           children: [
-            TabBar(
-              controller: _tabController,
-              dividerColor: Colors.transparent,
-              indicatorColor: Colors.transparent,
-              tabs: [
-                ...rooms!.map((e) => Tab(
-                      child: BodyLarge(
-                        text: e.name ?? '',
-                        textAlign: TextAlign.start,
-                        style: context.bodyLarge.copyWith(
-                          color: (tabState is TabSelected) && tabState.roomId == e.id
-                              ? ColorsManager.textPrimaryColor
-                              : ColorsManager.textPrimaryColor.withOpacity(0.2),
-                        ),
-                      ),
-                    )),
-              ],
-              isScrollable: true,
-              tabAlignment: TabAlignment.start,
+            SceneDevicesBodyTabBar(
+              tabController: tabController,
+              rooms: rooms,
+              selectedRoomId: state is TabBarTabSelectedState ? state.roomId : '-1',
             ),
             Expanded(
               child: TabBarView(
-                controller: _tabController,
                 physics: const NeverScrollableScrollPhysics(),
-                children:
-                    rooms!.map((e) => _buildRoomTab(e, context, isAutomationDeviceStatus)).toList(),
+                controller: tabController,
+                children: rooms
+                    .map(
+                      (room) => _buildRoomTab(
+                        room,
+                        _isAutomationDeviceStatus(context),
+                      ),
+                    )
+                    .toList(),
               ),
             ),
           ],
@@ -70,52 +53,46 @@ class SceneDevicesBody extends StatelessWidget {
     );
   }
 
-  Widget _buildRoomTab(SubSpaceModel room, BuildContext context, bool isAutomationDeviceStatus) {
+  bool _isAutomationDeviceStatus(BuildContext context) {
+    final routeArguments =
+        ModalRoute.of(context)?.settings.arguments as SceneSettingsRouteArguments?;
+    final deviceStatusChangesScene = CreateSceneEnum.deviceStatusChanges.name;
+    final sceneType = routeArguments?.sceneType;
+
+    return sceneType == deviceStatusChangesScene;
+  }
+
+  Widget _buildRoomTab(
+    SubSpaceModel room,
+    bool isAutomationDeviceStatus,
+  ) {
     return BlocBuilder<DeviceManagerBloc, DeviceManagerState>(
       builder: (context, state) {
-        if (state.loading && state.devices == null) {
-          return const Center(child: CircularProgressIndicator());
-        } else if (state.devices != null && state.devices!.isNotEmpty) {
-          return ListView.builder(
-            itemCount: state.devices!.length,
-            itemBuilder: (context, index) {
-              final device = state.devices![index];
-              return DefaultContainer(
-                child: SceneListTile(
-                  minLeadingWidth: 40,
-                  leadingWidget: SvgPicture.asset(device.icon ?? ''),
-                  titleWidget: BodyMedium(
-                    text: device.name ?? '',
-                    style: context.titleSmall.copyWith(
-                      color: ColorsManager.secondaryTextColor,
-                      fontWeight: FontWeight.w400,
-                      fontSize: 20,
-                    ),
-                  ),
-                  trailingWidget: const Icon(
-                    Icons.arrow_forward_ios_rounded,
-                    color: ColorsManager.greyColor,
-                    size: 16,
-                  ),
-                  onPressed: () {
-                    Navigator.pushNamed(
-                      context,
-                      Routes.deviceFunctionsRoute,
-                      arguments: {
-                        "device": device,
-                        "isAutomationDeviceStatus": isAutomationDeviceStatus
-                      },
-                    );
-                  },
-                ),
-              );
-            },
-          );
-        } else if (state.error != null) {
-          return const Center(child: Text('Something went wrong'));
-        } else {
-          return const SizedBox();
-        }
+        final isLoading = state.loading && state.devices == null;
+        final hasData =
+            state.devices != null && (state.devices?.isNotEmpty ?? false);
+        final hasError = state.error != null;
+
+        final widgets = <bool, Widget>{
+          isLoading: const AppLoadingIndicator(),
+          hasError: Center(child: Text('${state.error}')),
+          hasData: SceneDevicesList(
+            devices: state.devices ?? [],
+            isAutomationDeviceStatus: isAutomationDeviceStatus,
+          ),
+        };
+
+        final invalidWidgetEntry = MapEntry(
+          true,
+          Center(child: Text('This subspace has no devices')),
+        );
+
+        final validWidgetEntry = widgets.entries.firstWhere(
+          (entry) => entry.key == true,
+          orElse: () => invalidWidgetEntry,
+        );
+
+        return validWidgetEntry.value;
       },
     );
   }

lib/features/scene/widgets/scene_devices/scene_devices_body_tab_bar.dart

@@ -0,0 +1,46 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_app/features/devices/model/subspace_model.dart';
+import 'package:syncrow_app/features/shared_widgets/text_widgets/body_large.dart';
+import 'package:syncrow_app/utils/context_extension.dart';
+import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
+
+class SceneDevicesBodyTabBar extends StatelessWidget {
+  const SceneDevicesBodyTabBar({
+    required this.tabController,
+    required this.rooms,
+    required this.selectedRoomId,
+    super.key,
+  });
+
+  final String selectedRoomId;
+
+  final TabController tabController;
+  final List<SubSpaceModel> rooms;
+
+  @override
+  Widget build(BuildContext context) {
+    return TabBar(
+      controller: tabController,
+      dividerColor: Colors.transparent,
+      indicatorColor: Colors.transparent,
+      isScrollable: true,
+      tabAlignment: TabAlignment.start,
+      tabs: rooms.map((e) {
+        final isSelected = selectedRoomId == e.id;
+        return Tab(
+          child: BodyLarge(
+            text: e.name ?? '',
+            textAlign: TextAlign.start,
+            style: context.bodyLarge.copyWith(
+              color: isSelected
+                  ? ColorsManager.textPrimaryColor
+                  : ColorsManager.textPrimaryColor.withValues(
+                      alpha: 0.2,
+                    ),
+            ),
+          ),
+        );
+      }).toList(),
+    );
+  }
+}

lib/features/scene/widgets/scene_devices/scene_devices_list.dart

@@ -0,0 +1,66 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:syncrow_app/features/devices/model/device_model.dart';
+import 'package:syncrow_app/features/scene/widgets/scene_list_tile.dart';
+import 'package:syncrow_app/features/shared_widgets/default_container.dart';
+import 'package:syncrow_app/features/shared_widgets/text_widgets/body_medium.dart';
+import 'package:syncrow_app/navigation/routing_constants.dart';
+import 'package:syncrow_app/utils/context_extension.dart';
+import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
+
+class SceneDevicesList extends StatelessWidget {
+  const SceneDevicesList({
+    required this.isAutomationDeviceStatus,
+    required this.devices,
+    super.key,
+  });
+  final List<DeviceModel> devices;
+  final bool isAutomationDeviceStatus;
+
+  @override
+  Widget build(BuildContext context) {
+    return ListView.builder(
+      itemCount: devices.length,
+      itemBuilder: (context, index) => _buildDeviceTile(context, devices[index]),
+    );
+  }
+
+  Widget _buildDeviceTile(
+    BuildContext context,
+    DeviceModel device,
+  ) {
+    return DefaultContainer(
+      child: SceneListTile(
+        minLeadingWidth: 40,
+        leadingWidget: SvgPicture.asset(device.icon ?? ''),
+        titleWidget: BodyMedium(
+          text: device.name ?? '',
+          style: context.titleSmall.copyWith(
+            color: ColorsManager.secondaryTextColor,
+            fontWeight: FontWeight.w400,
+            fontSize: 20,
+          ),
+        ),
+        trailingWidget: const Icon(
+          Icons.arrow_forward_ios_rounded,
+          color: ColorsManager.greyColor,
+          size: 16,
+        ),
+        onPressed: () => _navigateToDeviceFunctions(context, device),
+      ),
+    );
+  }
+
+  void _navigateToDeviceFunctions(
+    BuildContext context,
+    DeviceModel device,
+  ) {
+    Navigator.of(context).pushNamed(
+      Routes.deviceFunctionsRoute,
+      arguments: {
+        "device": device,
+        "isAutomationDeviceStatus": isAutomationDeviceStatus,
+      },
+    );
+  }
+}

lib/features/scene/widgets/scene_view_widget/scene_item.dart

@@ -132,6 +132,10 @@ class SceneItem extends StatelessWidget {
                                             spaceUuid: HomeCubit.getInstance()
                                                 .selectedSpace!
                                                 .id),
+                                    communityId: HomeCubit.getInstance()
+                                        .selectedSpace!
+                                        .community
+                                        .uuid,
                                     automationId: scene.id));
                           },
                         ),

lib/features/scene/widgets/select_smart_scene/smart_enable_autoamtion.dart

@@ -22,7 +22,7 @@ class SmartEnableAutomation extends StatelessWidget {
       child: BlocBuilder<SceneBloc, SceneState>(
         bloc: context.read<SceneBloc>()
           ..add(
-              LoadAutomation(HomeCubit.getInstance().selectedSpace?.id ?? '')),
+              LoadAutomation(HomeCubit.getInstance().selectedSpace?.id ?? '',HomeCubit.getInstance().selectedSpace?.community.uuid ?? '')),
         builder: (context, state) {
           if (state is SceneLoading) {
             return const Align(

lib/features/shared_widgets/app_loading_indicator.dart

@@ -0,0 +1,12 @@
+import 'package:flutter/material.dart';
+
+class AppLoadingIndicator extends StatelessWidget {
+  const AppLoadingIndicator({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Center(
+      child: CircularProgressIndicator.adaptive(),
+    );
+  }
+}

lib/navigation/router.dart

@@ -3,8 +3,8 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/app_layout/model/community_model.dart';
 import 'package:syncrow_app/features/app_layout/model/space_model.dart';
 import 'package:syncrow_app/features/app_layout/view/app_layout.dart';
-import 'package:syncrow_app/features/auth/view/otp_view.dart';
 import 'package:syncrow_app/features/auth/view/login_view.dart';
+import 'package:syncrow_app/features/auth/view/otp_view.dart';
 import 'package:syncrow_app/features/auth/view/sign_up_view.dart';
 import 'package:syncrow_app/features/dashboard/view/dashboard_view.dart';
 import 'package:syncrow_app/features/devices/bloc/device_manager_bloc/device_manager_bloc.dart';
@@ -17,11 +17,12 @@ import 'package:syncrow_app/features/scene/bloc/tab_change/tab_change_bloc.dart'
 import 'package:syncrow_app/features/scene/bloc/tab_change/tab_change_event.dart';
 import 'package:syncrow_app/features/scene/view/device_functions_view.dart';
 import 'package:syncrow_app/features/scene/view/scene_auto_settings.dart';
-import 'package:syncrow_app/features/scene/view/scene_tasks_view.dart';
 import 'package:syncrow_app/features/scene/view/scene_rooms_tabbar.dart';
+import 'package:syncrow_app/features/scene/view/scene_tasks_view.dart';
 import 'package:syncrow_app/features/scene/view/scene_view.dart';
 import 'package:syncrow_app/features/scene/view/smart_automation_select_route.dart';
 import 'package:syncrow_app/features/splash/view/splash_view.dart';
+
 import 'routing_constants.dart';
 
 class Router {
@@ -88,7 +89,7 @@ class Router {
                     BlocProvider(
                       create: (BuildContext context) =>
                           TabBarBloc(context.read<DeviceManagerBloc>())
-                            ..add(TabChanged(
+                            ..add(TabBarTabChangedEvent(
                                 selectedIndex: 0,
                                 roomId: '-1',
                                 unit: SpaceModel(

lib/services/api/api_links_endpoints.dart

@@ -11,7 +11,7 @@ abstract class ApiEndpoints {
   static const String sendOtp = '/authentication/user/send-otp';
   static const String verifyOtp = '/authentication/user/verify-otp';
   static const String forgetPassword = '/authentication/user/forget-password';
-
+  static const String clientLogin = 'client/token';
 ////////////////////////////////////// Spaces ///////////////////////////////////////
 
   ///Community Module
@@ -111,9 +111,9 @@ abstract class ApiEndpoints {
 //POST
   static const String addDeviceToRoom = '/device/room';
   static const String addDeviceToGroup = '/device/group';
-  static const String controlDevice = '/device/{deviceUuid}/control';
+  static const String controlDevice = '/devices/{deviceUuid}/command';
   static const String firmwareDevice =
-      '/device/{deviceUuid}/firmware/{firmwareVersion}';
+      '/devices/{deviceUuid}/firmware/{firmwareVersion}';
   static const String getDevicesByUserId = '/device/user/{userId}';
   static const String getDevicesByUnitId = '/device/unit/{unitUuid}';
   static const String openDoorLock = '/door-lock/open/{doorLockUuid}';
@@ -121,13 +121,13 @@ abstract class ApiEndpoints {
 //GET
   static const String deviceByRoom =
       '/projects/{projectUuid}/communities/{communityUuid}/spaces/{spaceUuid}/subspaces/{subSpaceUuid}/devices';
-  static const String deviceByUuid = '/device/{deviceUuid}';
-  static const String deviceFunctions = '/device/{deviceUuid}/functions';
-  static const String gatewayApi = '/device/gateway/{gatewayUuid}/devices';
+  static const String deviceByUuid = '/devices/{deviceUuid}';
+  static const String deviceFunctions = '/devices/{deviceUuid}/functions';
+  static const String gatewayApi = '/devices/gateway/{gatewayUuid}/devices';
   static const String deviceFunctionsStatus =
-      '/device/{deviceUuid}/functions/status';
+      '/devices/{deviceUuid}/functions/status';
   static const String powerClamp =
-      '/device/{powerClampUuid}/power-clamp/status';
+      '/devices/{deviceUuid}/functions/status';
 
   ///Device Permission Module
 //POST
@@ -144,7 +144,7 @@ abstract class ApiEndpoints {
   /// POST
   static const String createScene = '/scene/tap-to-run';
   static const String triggerScene = '/scene/tap-to-run/{sceneId}/trigger';
-  static const String createAutomation = '/automation';
+  static const String createAutomation = '/projects/{projectId}/automations';
 
   /// GET
   static const String getUnitScenes =
@@ -153,23 +153,26 @@ abstract class ApiEndpoints {
   static const String getScene = '/scene/tap-to-run/{sceneId}';
   static const String getIconScene = '/scene/icon';
 
-  static const String getUnitAutomation = '/automation/{unitUuid}';
+  static const String getUnitAutomation =
+      '/projects/{projectId}/communities/{communityId}/spaces/{unitUuid}/automations';
 
   static const String getAutomationDetails =
-      '/automation/details/{automationId}';
+      '/projects/{projectId}/automations/{automationId}';
 
   /// PUT
   static const String updateScene = '/scene/tap-to-run/{sceneId}';
 
-  static const String updateAutomation = '/automation/{automationId}';
+  static const String updateAutomation =
+      '/projects/{projectId}/automations/{automationId}';
 
   static const String updateAutomationStatus =
-      '/automation/status/{automationId}';
+      '/projects/{projectId}/automations/{automationId}';
 
   /// DELETE
   static const String deleteScene = '/scene/tap-to-run/{sceneId}';
 
-  static const String deleteAutomation = '/automation/{automationId}';
+  static const String deleteAutomation =
+      '/projects/{projectId}/automations/{automationId}';
 
   //////////////////////Door Lock //////////////////////
   //online
@@ -213,18 +216,18 @@ abstract class ApiEndpoints {
   static const String changeSchedule = '/schedule/enable/{deviceUuid}';
   static const String deleteSchedule = '/schedule/{deviceUuid}/{scheduleId}';
   static const String reportLogs =
-      '/device/report-logs/{deviceUuid}?code={code}&startTime={startTime}&endTime={endTime}';
-  static const String controlBatch = '/device/control/batch';
-  static const String statusBatch = '/device/status/batch';
-  static const String deviceScene = '/device/{deviceUuid}/scenes';
+      '/devices/report-logs/{deviceUuid}?code={code}&startTime={startTime}&endTime={endTime}';
+  static const String controlBatch = '/devices/batch';
+  static const String statusBatch = '/devices/batch';
+  static const String deviceScene = '/devices/{deviceUuid}/scenes';
 
   static const String fourSceneByName =
-      '/device/{deviceUuid}/scenes?switchName={switchName}';
+      '/devices/{deviceUuid}/scenes?switchName={switchName}';
 
   static const String resetDevice = '/factory/reset/{deviceUuid}';
   static const String unAssignScenesDevice =
-      '/device/{deviceUuid}/scenes?switchName={switchName}';
-  static const String getDeviceLogs = '/device/report-logs/{uuid}?code={code}';
+      '/devices/{deviceUuid}/scenes?switchName={switchName}';
+  static const String getDeviceLogs = '/devices/report-logs/{uuid}?code={code}';
   static const String terms = '/terms';
   static const String policy = '/policy';
   static const String getPermission = '/permission/{roleUuid}';

lib/services/api/authentication_api.dart

@@ -25,11 +25,15 @@ class AuthenticationAPI {
     return response;
   }
 
-  static Future<bool> signUp({required SignUpModel model}) async {
+  static Future<bool> signUp({
+    required SignUpModel model,
+    required String accessToken,
+  }) async {
     final response = await HTTPService().post(
         path: ApiEndpoints.signUp,
         body: model.toJson(),
         showServerMessage: false,
+        accessToken: accessToken,
         expectedResponseModel: (json) => json['statusCode'] == 201);
     return response;
   }
@@ -63,4 +67,20 @@ class AuthenticationAPI {
         expectedResponseModel: (json) => json['data']);
     return response;
   }
+
+  static Future<Map<String, dynamic>> fetchClientToken({
+    required String clientId,
+    required String clientSecret,
+  }) async {
+    final response = await HTTPService().post(
+      path: ApiEndpoints.clientLogin,
+      body: {
+        'clientId': clientId,
+        'clientSecret': clientSecret,
+      },
+      showServerMessage: false,
+      expectedResponseModel: (json) => json['data'],
+    );
+    return response;
+  }
 }

lib/services/api/devices_api.dart

@@ -1,6 +1,5 @@
 import 'dart:async';
 import 'dart:convert';
-import 'dart:developer';
 import 'package:syncrow_app/features/devices/model/device_category_model.dart';
 import 'package:syncrow_app/features/devices/model/device_control_model.dart';
 import 'package:syncrow_app/features/devices/model/device_model.dart';
@@ -8,7 +7,6 @@ import 'package:syncrow_app/features/devices/model/device_report_model.dart';
 import 'package:syncrow_app/features/devices/model/function_model.dart';
 import 'package:syncrow_app/services/api/api_links_endpoints.dart';
 import 'package:syncrow_app/services/api/http_service.dart';
-import 'package:syncrow_app/utils/constants/temp_const.dart';
 import '../../features/devices/model/create_temporary_password_model.dart';
 
 class DevicesAPI {
@@ -39,7 +37,7 @@ class DevicesAPI {
         path: ApiEndpoints.deviceByUuid.replaceAll('{deviceUuid}', deviceId),
         body: {"deviceName": deviceName},
         expectedResponseModel: (json) {
-          return json;
+          return json['data'];
         },
       );
       return response;
@@ -92,7 +90,7 @@ class DevicesAPI {
           .replaceAll('{deviceUuid}', deviceId),
       showServerMessage: false,
       expectedResponseModel: (json) {
-        return json;
+        return json['data'];
       },
     );
     return response;
@@ -101,7 +99,7 @@ class DevicesAPI {
   static Future<Map<String, dynamic>> getPowerClampStatus(
       String deviceId) async {
     final response = await _httpService.get(
-      path: ApiEndpoints.powerClamp.replaceAll('{powerClampUuid}', deviceId),
+      path: ApiEndpoints.deviceFunctionsStatus.replaceAll('{powerClampUuid}', deviceId),
       showServerMessage: false,
       expectedResponseModel: (json) {
         return json;
@@ -132,7 +130,7 @@ class DevicesAPI {
         path: ApiEndpoints.deviceFunctions.replaceAll('{deviceUuid}', deviceId),
         showServerMessage: false,
         expectedResponseModel: (json) {
-          final functions = FunctionModel.fromJson(json);
+          final functions = FunctionModel.fromJson(json['data']);
           return functions;
         });
     return response;
@@ -188,7 +186,7 @@ class DevicesAPI {
         path: ApiEndpoints.deviceByUuid.replaceAll('{deviceUuid}', deviceId),
         showServerMessage: false,
         expectedResponseModel: (json) {
-          return json;
+          return json['data'];
         });
     return response;
   }
@@ -264,7 +262,7 @@ class DevicesAPI {
         if (json == null || json.isEmpty || json == []) {
           return devices;
         }
-        for (var device in json['devices']) {
+        for (var device in json['data']['devices']) {
           devices.add(DeviceModel.fromJson(device));
         }
         return devices;
@@ -491,7 +489,12 @@ class DevicesAPI {
   }) async {
     final response = await _httpService.post(
       path: ApiEndpoints.controlBatch,
-      body: {"devicesUuid": devicesUuid, "code": code, "value": value},
+      body: {
+        "devicesUuid": devicesUuid,
+        "code": code,
+        "value": value,
+        "operationType": 'COMMAND',
+      },
       showServerMessage: true,
       expectedResponseModel: (json) {
         return json;

lib/services/api/home_management_api.dart

@@ -34,7 +34,7 @@ class HomeManagementAPI {
         path: ApiEndpoints.devices.replaceAll("{projectUuid}", projectUuid),
         showServerMessage: false,
         expectedResponseModel: (json) {
-          json.forEach((value) {
+          json['data'].forEach((value) {
             list.add(DeviceModel.fromJson(value));
           });
         });

lib/services/api/http_service.dart

@@ -48,13 +48,26 @@ class HTTPService {
       Options? options,
       dynamic body,
       bool showServerMessage = true,
+      String? accessToken,
       required T Function(dynamic) expectedResponseModel}) async {
     try {
+      final authOptions = options ??
+          Options(
+            headers: accessToken != null
+                ? {
+                    'Authorization': 'Bearer $accessToken',
+                    'Content-Type': 'application/json',
+                  }
+                : {
+                    'Content-Type': 'application/json',
+                  },
+          );
+
       final response = await client.post(
         path,
         data: body,
         queryParameters: queryParameters,
-        options: options,
+        options: authOptions,
       );
       return expectedResponseModel(response.data);
     } catch (error) {

lib/services/api/scene_api.dart

@@ -6,7 +6,6 @@ import 'package:syncrow_app/features/scene/model/scenes_model.dart';
 import 'package:syncrow_app/features/scene/model/update_automation.dart';
 import 'package:syncrow_app/services/api/api_links_endpoints.dart';
 import 'package:syncrow_app/services/api/http_service.dart';
-import 'package:syncrow_app/utils/constants/temp_const.dart';
 
 class SceneApi {
   static final HTTPService _httpService = HTTPService();
@@ -31,10 +30,11 @@ class SceneApi {
 
 // create automation
   static Future<Map<String, dynamic>> createAutomation(
-      CreateAutomationModel createAutomationModel) async {
+      CreateAutomationModel createAutomationModel, String projectId) async {
     try {
       final response = await _httpService.post(
-        path: ApiEndpoints.createAutomation,
+        path:
+            ApiEndpoints.createAutomation.replaceAll('{projectId}', projectId),
         body: createAutomationModel.toMap(),
         showServerMessage: false,
         expectedResponseModel: (json) {
@@ -78,10 +78,17 @@ class SceneApi {
 
   //getAutomation
 
-  static Future<List<ScenesModel>> getAutomationByUnitId(String unitId) async {
+  static Future<List<ScenesModel>> getAutomationByUnitId(
+    String unitId,
+    String communityId,
+    String projectId,
+  ) async {
     try {
       final response = await _httpService.get(
-        path: ApiEndpoints.getUnitAutomation.replaceAll('{unitUuid}', unitId),
+        path: ApiEndpoints.getUnitAutomation
+            .replaceAll('{unitUuid}', unitId)
+            .replaceAll('{communityId}', communityId)
+            .replaceAll('{projectId}', projectId),
         showServerMessage: false,
         expectedResponseModel: (json) {
           List<ScenesModel> scenes = [];
@@ -112,11 +119,12 @@ class SceneApi {
 
 //automation details
   static Future<SceneDetailsModel> getAutomationDetails(
-      String automationId) async {
+      String automationId, String projectId) async {
     try {
       final response = await _httpService.get(
         path: ApiEndpoints.getAutomationDetails
-            .replaceAll('{automationId}', automationId),
+            .replaceAll('{automationId}', automationId)
+            .replaceAll('{projectId}', projectId),
         showServerMessage: false,
         expectedResponseModel: (json) => SceneDetailsModel.fromJson(json),
       );
@@ -128,11 +136,12 @@ class SceneApi {
 
   //updateAutomationStatus
   static Future<bool> updateAutomationStatus(String automationId,
-      AutomationStatusUpdate createAutomationEnable) async {
+      AutomationStatusUpdate createAutomationEnable, String projectId) async {
     try {
-      final response = await _httpService.put(
+      final response = await _httpService.patch(
         path: ApiEndpoints.updateAutomationStatus
-            .replaceAll('{automationId}', automationId),
+            .replaceAll('{automationId}', automationId)
+            .replaceAll('{projectId}', projectId),
         body: createAutomationEnable.toMap(),
         expectedResponseModel: (json) => json['success'],
       );
@@ -194,12 +203,13 @@ class SceneApi {
   }
 
   //update automation
-  static updateAutomation(
-      CreateAutomationModel createAutomationModel, String automationId) async {
+  static updateAutomation(CreateAutomationModel createAutomationModel,
+      String automationId, String projectId) async {
     try {
       final response = await _httpService.put(
         path: ApiEndpoints.updateAutomation
-            .replaceAll('{automationId}', automationId),
+            .replaceAll('{automationId}', automationId)
+            .replaceAll('{projectId}', projectId),
         body: createAutomationModel
             .toJson(automationId.isNotEmpty == true ? automationId : null),
         expectedResponseModel: (json) {
@@ -229,11 +239,14 @@ class SceneApi {
 
   // delete automation
   static Future<bool> deleteAutomation(
-      {required String unitUuid, required String automationId}) async {
+      {required String unitUuid,
+      required String automationId,
+      required String projectId}) async {
     try {
       final response = await _httpService.delete(
         path: ApiEndpoints.deleteAutomation
-            .replaceAll('{automationId}', automationId),
+            .replaceAll('{automationId}', automationId)
+            .replaceAll('{projectId}', projectId),
         showServerMessage: false,
         expectedResponseModel: (json) => json['statusCode'] == 200,
       );