Resend

power_clamp_issue&search_issue

lib/features/auth/bloc/auth_cubit.dart

@@ -237,26 +237,34 @@ class AuthCubit extends Cubit<AuthState> {
     }
   }
 
-  sendOtp() async {
+  sendOtp({bool? isforget}) async {
     try {
       emit(AuthLoading());
-      await AuthenticationAPI.sendOtp(
-          body: {'email': email, 'type': 'VERIFICATION'});
+      await AuthenticationAPI.sendOtp(body: {
+        'email': email,
+        'type': isforget == true ? 'PASSWORD' : 'VERIFICATION'
+      });
       emit(AuthSignUpSuccess());
     } catch (_) {
-      emit(AuthLoginError(message: 'Something went wrong'));
+      emit(AuthErrorStatusWithoutMsg());
+
+      // emit(AuthLoginError(message: 'Something went wrong'));
     }
   }
 
-  Future<bool> reSendOtp() async {
+  Future<bool> reSendOtp({bool? forget}) async {
     try {
       emit(AuthLoading());
-      await AuthenticationAPI.sendOtp(
-          body: {'email': email, 'type': 'VERIFICATION'});
+      await AuthenticationAPI.sendOtp(body: {
+        'email': email,
+        'type': forget == true ? 'PASSWORD' : 'VERIFICATION'
+      });
       emit(ResendOtpSuccess());
       return true;
     } catch (_) {
-      emit(AuthLoginError(message: 'Something went wrong'));
+      emit(AuthErrorStatusWithoutMsg());
+
+      // emit(AuthLoginError(message: 'Something went wrong'));
       return false;
     }
   }
@@ -264,8 +272,11 @@ class AuthCubit extends Cubit<AuthState> {
   verifyOtp(bool isForgotPass) async {
     emit(AuthLoginLoading());
     try {
-      final response = await AuthenticationAPI.verifyPassCode(
-          body: {'email': email, 'type': 'VERIFICATION', 'otpCode': otpCode});
+      final response = await AuthenticationAPI.verifyPassCode(body: {
+        'email': email,
+        'type': isForgotPass == true ? 'PASSWORD' : 'VERIFICATION',
+        'otpCode': otpCode
+      });
       if (response['statusCode'] == 200) {
         if (!isForgotPass) {
           emailController.text = email;
@@ -292,7 +303,9 @@ class AuthCubit extends Cubit<AuthState> {
         (Route route) => false,
       );
     } catch (failure) {
-      emit(AuthLogoutError(message: 'Something went wrong'));
+      emit(AuthErrorStatusWithoutMsg());
+
+      // emit(AuthLogoutError(message: 'Something went wrong'));
       return;
     }
   }
@@ -333,17 +346,22 @@ class AuthCubit extends Cubit<AuthState> {
         emit(AuthTokenError(message: "Something went wrong"));
       }
     } catch (_) {
-      emit(AuthTokenError(message: "Something went wrong"));
+      emit(AuthErrorStatusWithoutMsg());
+
+      // emit(AuthTokenError(message: "Something went wrong"));
     }
   }
 
   sendToForgetPassword({required String password}) async {
     try {
       emit(AuthForgetPassLoading());
-      await AuthenticationAPI.forgetPassword(email: email, password: password);
+
+      await AuthenticationAPI.forgetPassword(
+          email: email, password: password, otpCode: otpCode);
       emit(AuthForgetPassSuccess());
     } catch (_) {
-      emit(AuthForgetPassError(message: 'Something went wrong'));
+      emit(AuthErrorStatusWithoutMsg());
+      // emit(AuthForgetPassError(message: 'Something went wrong'));
     }
   }
 }

lib/features/auth/bloc/auth_state.dart

@@ -52,9 +52,6 @@ class AuthTokenError extends AuthError {
   AuthTokenError({required super.message, super.code});
 }
 
-
-
-
 //ForgetPassword log states
 class AuthForgetPassLoading extends AuthLoading {}
 
@@ -64,3 +61,6 @@ class AuthForgetPassError extends AuthError {
   AuthForgetPassError({required super.message, super.code});
 }
 
+class AuthErrorStatusWithoutMsg extends AuthState {
+  AuthErrorStatusWithoutMsg();
+}

lib/features/auth/view/check_email_page.dart

@@ -15,13 +15,15 @@ import 'package:syncrow_app/utils/resource_manager/font_manager.dart';
 import 'package:syncrow_app/utils/resource_manager/styles_manager.dart';
 
 class checkEmailPage extends StatelessWidget {
-  const checkEmailPage({super.key});
+  bool? forget;
+  checkEmailPage({super.key, this.forget});
   @override
   Widget build(BuildContext context) {
     final formKey = AuthCubit.get(context).checkEmailFormKey;
 
     SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
-        statusBarBrightness: Brightness.light, statusBarIconBrightness: Brightness.light));
+        statusBarBrightness: Brightness.light,
+        statusBarIconBrightness: Brightness.light));
     return BlocConsumer<AuthCubit, AuthState>(
       listener: (context, state) {
         if (state is AuthError) {
@@ -34,8 +36,8 @@ class checkEmailPage extends StatelessWidget {
           Navigator.push(
               context,
               MaterialPageRoute(
-                builder: (context) => const OtpView(
-                  isForgetPage: true,
+                builder: (context) => OtpView(
+                  isForgetPage: forget!,
                 ),
               ));
         }
@@ -91,7 +93,9 @@ class checkEmailPage extends StatelessWidget {
                                   crossAxisAlignment: CrossAxisAlignment.start,
                                   children: [
                                     SizedBox(
-                                      height: MediaQuery.sizeOf(context).height / 5.5,
+                                      height:
+                                          MediaQuery.sizeOf(context).height /
+                                              5.5,
                                     ),
                                     TitleMedium(
                                       text: 'Forgot password?',
@@ -113,32 +117,39 @@ class checkEmailPage extends StatelessWidget {
                                       scrollPadding: EdgeInsets.zero,
                                       autocorrect: false,
                                       enableSuggestions: false,
-                                      autofillHints: const [AutofillHints.email],
-                                      validator: AuthCubit.get(context).emailAddressValidator,
+                                      autofillHints: const [
+                                        AutofillHints.email
+                                      ],
+                                      validator: AuthCubit.get(context)
+                                          .emailAddressValidator,
                                       onTapOutside: (event) {
                                         FocusScope.of(context).unfocus();
                                       },
                                       onChanged: (value) {
                                         AuthCubit.get(context).email = value;
                                       },
-                                      decoration: defaultInputDecoration(context,
+                                      decoration: defaultInputDecoration(
+                                          context,
                                           hint: "Example@email.com"),
                                     ),
                                     const SizedBox(
                                       height: 20,
                                     ),
                                     Row(
-                                      mainAxisAlignment: MainAxisAlignment.center,
+                                      mainAxisAlignment:
+                                          MainAxisAlignment.center,
                                       children: [
                                         Expanded(
                                           child: DefaultButton(
                                             isDone: state is AuthLoginSuccess,
                                             isLoading: state is AuthLoading,
                                             customButtonStyle: ButtonStyle(
-                                              backgroundColor: MaterialStateProperty.all(
+                                              backgroundColor:
+                                                  MaterialStateProperty.all(
                                                 Colors.black.withOpacity(.25),
                                               ),
-                                              foregroundColor: MaterialStateProperty.all(
+                                              foregroundColor:
+                                                  MaterialStateProperty.all(
                                                 Colors.white,
                                               ),
                                             ),
@@ -146,11 +157,16 @@ class checkEmailPage extends StatelessWidget {
                                               'Send Code',
                                             ),
                                             onPressed: () {
-                                              AuthCubit.get(context).showValidationMessage = true;
-                                              if (formKey.currentState!.validate()) {
+                                              AuthCubit.get(context)
+                                                  .showValidationMessage = true;
+                                              if (formKey.currentState!
+                                                  .validate()) {
                                                 if ((state is! AuthLoading)) {
-                                                  AuthCubit.get(context).sendOtp();
-                                                  FocusScope.of(context).unfocus();
+                                                  AuthCubit.get(context)
+                                                      .sendOtp(
+                                                          isforget: forget);
+                                                  FocusScope.of(context)
+                                                      .unfocus();
                                                 }
                                               }
                                             },
@@ -160,14 +176,17 @@ class checkEmailPage extends StatelessWidget {
                                     ),
                                     Padding(
                                       padding: EdgeInsets.only(
-                                          top: MediaQuery.sizeOf(context).height / 5.5),
+                                          top: MediaQuery.sizeOf(context)
+                                                  .height /
+                                              5.5),
                                       child: Row(
-                                        mainAxisAlignment: MainAxisAlignment.center,
+                                        mainAxisAlignment:
+                                            MainAxisAlignment.center,
                                         children: <Widget>[
                                           BodyLarge(
                                             text: "Do you have an account? ",
-                                            style:
-                                                context.displaySmall.copyWith(color: Colors.white),
+                                            style: context.displaySmall
+                                                .copyWith(color: Colors.white),
                                           ),
                                           TextButton(
                                             onPressed: () {
@@ -175,7 +194,8 @@ class checkEmailPage extends StatelessWidget {
                                             },
                                             child: BodyLarge(
                                               text: "Sign in",
-                                              style: context.displaySmall.copyWith(
+                                              style:
+                                                  context.displaySmall.copyWith(
                                                 color: Colors.black,
                                                 fontWeight: FontsManager.bold,
                                               ),

lib/features/auth/view/create_new_password.dart

@@ -12,6 +12,7 @@ import 'package:syncrow_app/utils/resource_manager/constants.dart';
 import 'package:syncrow_app/utils/resource_manager/font_manager.dart';
 import 'package:syncrow_app/utils/resource_manager/styles_manager.dart';
 
+
 class CreateNewPasswordPage extends StatelessWidget {
   const CreateNewPasswordPage({super.key,});
 

lib/features/auth/view/otp_view.dart

@@ -374,20 +374,25 @@ class _OtpViewState extends State<OtpView> {
                                           return;
                                         }
                                         if ((state is! AuthLoading)) {
-                                          bool success = await AuthCubit.get(context)
-                                              .reSendOtp();
+                                          bool success =
+                                              await AuthCubit.get(context)
+                                                  .reSendOtp(
+                                                      forget:
+                                                          widget.isForgetPage);
                                           FocusScope.of(context).unfocus();
-                                          if(success){
-                                          showDialog(
-                                              context: context,
-                                              builder: (_) => SuccessDialog(
-                                                key: ValueKey('SuccessDialog'),
-                                                message: 'New OTP sent!',));
+                                          if (success) {
+                                            showDialog(
+                                                context: context,
+                                                builder: (_) =>const SuccessDialog(
+                                                      key: ValueKey(
+                                                          'SuccessDialog'),
+                                                      message: 'New OTP sent!',
+                                                    ));
                                           }
-                                          Future.delayed(Duration(seconds: 2),
-                                              () {
-                                            Navigator.of(context).pop();
-                                          });
+                                          // Future.delayed(Duration(seconds: 2),
+                                          //     () {
+                                          //   Navigator.of(context).pop();
+                                          // });
                                         }
                                       },
                                     ),

lib/features/auth/view/widgets/forget_password.dart

@@ -10,12 +10,17 @@ class ForgetPassword extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    bool isforget = true;
     return Row(
       children: [
         const Spacer(),
         TextButton(
           onPressed: () {
-            Navigator.push(context, MaterialPageRoute(builder: (context) => const checkEmailPage(),));
+            Navigator.push(
+                context,
+                MaterialPageRoute(
+                  builder: (context) => checkEmailPage(forget: isforget),
+                ));
           },
           child: BodyMedium(
             text: "Forgot Password?",

lib/features/devices/bloc/acs_bloc/acs_bloc.dart

@@ -61,8 +61,7 @@ class ACsBloc extends Bloc<AcsEvent, AcsState> {
         for (var status in response['status']) {
           statusModelList.add(StatusModel.fromJson(status));
         }
-        deviceStatus =
-            AcStatusModel.fromJson(response['productUuid'], statusModelList);
+        deviceStatus = AcStatusModel.fromJson(response['productUuid'], statusModelList);
         emit(GetAcStatusState(acStatusModel: deviceStatus));
         Future.delayed(const Duration(milliseconds: 500));
         // _listenToChanges();
@@ -75,22 +74,18 @@ class ACsBloc extends Bloc<AcsEvent, AcsState> {
 
   _listenToChanges() {
     try {
-      DatabaseReference ref =
-          FirebaseDatabase.instance.ref('device-status/$acId');
+      DatabaseReference ref = FirebaseDatabase.instance.ref('device-status/$acId');
       Stream<DatabaseEvent> stream = ref.onValue;
 
       stream.listen((DatabaseEvent event) {
-        Map<dynamic, dynamic> usersMap =
-            event.snapshot.value as Map<dynamic, dynamic>;
+        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']));
+          statusList.add(StatusModel(code: element['code'], value: element['value']));
         });
 
-        deviceStatus =
-            AcStatusModel.fromJson(usersMap['productUuid'], statusList);
+        deviceStatus = AcStatusModel.fromJson(usersMap['productUuid'], statusList);
         add(AcUpdated());
       });
     } catch (_) {}
@@ -107,14 +102,12 @@ class ACsBloc extends Bloc<AcsEvent, AcsState> {
         HomeCubit.getInstance().selectedSpace?.id ?? '', 'AC');
 
     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));
       }
-      deviceStatusList.add(
-          AcStatusModel.fromJson(response['productUuid'], statusModelList));
+      deviceStatusList.add(AcStatusModel.fromJson(response['productUuid'], statusModelList));
     }
     _setAllAcsTempsAndSwitches();
   }
@@ -136,8 +129,7 @@ class ACsBloc extends Bloc<AcsEvent, AcsState> {
       emit(AcModifyingState(acStatusModel: deviceStatus));
     }
 
-    await _runDeBouncerForOneDevice(
-        deviceId: event.deviceId, code: 'switch', value: acSwitchValue);
+    await _runDeBouncerForOneDevice(deviceId: event.deviceId, code: 'switch', value: acSwitchValue);
   }
 
   void _changeAllAcSwitch(ChangeAllSwitch event, Emitter<AcsState> emit) async {
@@ -198,8 +190,7 @@ class ACsBloc extends Bloc<AcsEvent, AcsState> {
     deviceStatus.childLock = lockValue;
     emit(AcModifyingState(acStatusModel: deviceStatus));
 
-    await _runDeBouncerForOneDevice(
-        deviceId: acId, code: 'child_lock', value: lockValue);
+    await _runDeBouncerForOneDevice(deviceId: acId, code: 'child_lock', value: lockValue);
   }
 
   void _increaseCoolTo(IncreaseCoolToTemp event, Emitter<AcsState> emit) async {
@@ -227,8 +218,7 @@ class ACsBloc extends Bloc<AcsEvent, AcsState> {
       emit(AcModifyingState(acStatusModel: deviceStatus));
     }
 
-    await _runDeBouncerForOneDevice(
-        deviceId: event.deviceId, code: 'temp_set', value: value);
+    await _runDeBouncerForOneDevice(deviceId: event.deviceId, code: 'temp_set', value: value);
   }
 
   void _decreaseCoolTo(DecreaseCoolToTemp event, Emitter<AcsState> emit) async {
@@ -256,8 +246,7 @@ class ACsBloc extends Bloc<AcsEvent, AcsState> {
       emit(AcModifyingState(acStatusModel: deviceStatus));
     }
 
-    await _runDeBouncerForOneDevice(
-        deviceId: event.deviceId, code: 'temp_set', value: value);
+    await _runDeBouncerForOneDevice(deviceId: event.deviceId, code: 'temp_set', value: value);
   }
 
   void _changeAcMode(ChangeAcMode event, Emitter<AcsState> emit) async {
@@ -279,9 +268,7 @@ class ACsBloc extends Bloc<AcsEvent, AcsState> {
     }
 
     await _runDeBouncerForOneDevice(
-        deviceId: event.deviceId,
-        code: 'mode',
-        value: getACModeString(tempMode));
+        deviceId: event.deviceId, code: 'mode', value: getACModeString(tempMode));
   }
 
   void _changeFanSpeed(ChangeFanSpeed event, Emitter<AcsState> emit) async {
@@ -294,23 +281,19 @@ class ACsBloc extends Bloc<AcsEvent, AcsState> {
       for (AcStatusModel ac in deviceStatusList) {
         if (ac.uuid == event.productId) {
           ac.fanSpeedsString = getNextFanSpeedKey(fanSpeed);
-          ac.acFanSpeed =
-              AcStatusModel.getFanSpeed(getNextFanSpeedKey(fanSpeed));
+          ac.acFanSpeed = AcStatusModel.getFanSpeed(getNextFanSpeedKey(fanSpeed));
         }
       }
       _emitAcsStatus(emit);
     } else {
       emit(AcChangeLoading(acStatusModel: deviceStatus));
       deviceStatus.fanSpeedsString = getNextFanSpeedKey(fanSpeed);
-      deviceStatus.acFanSpeed =
-          AcStatusModel.getFanSpeed(getNextFanSpeedKey(fanSpeed));
+      deviceStatus.acFanSpeed = AcStatusModel.getFanSpeed(getNextFanSpeedKey(fanSpeed));
       emit(AcModifyingState(acStatusModel: deviceStatus));
     }
 
     await _runDeBouncerForOneDevice(
-        deviceId: event.deviceId,
-        code: 'level',
-        value: getNextFanSpeedKey(fanSpeed));
+        deviceId: event.deviceId, code: 'level', value: getNextFanSpeedKey(fanSpeed));
   }
 
   String getACModeString(TempModes value) {
@@ -355,8 +338,7 @@ class ACsBloc extends Bloc<AcsEvent, AcsState> {
         for (int i = 0; i < deviceStatusList.length; i++) {
           try {
             await DevicesAPI.controlDevice(
-                DeviceControlModel(
-                    deviceId: devicesList[i].uuid, code: code, value: value),
+                DeviceControlModel(deviceId: devicesList[i].uuid, code: code, value: value),
                 devicesList[i].uuid ?? '');
           } catch (_) {
             await Future.delayed(const Duration(milliseconds: 500));
@@ -378,10 +360,7 @@ class ACsBloc extends Bloc<AcsEvent, AcsState> {
     _timer = Timer(const Duration(seconds: 1), () async {
       try {
         final response = await DevicesAPI.controlDevice(
-            DeviceControlModel(
-                deviceId: allAcsPage ? deviceId : acId,
-                code: code,
-                value: value),
+            DeviceControlModel(deviceId: allAcsPage ? deviceId : acId, code: code, value: value),
             allAcsPage ? deviceId : acId);
 
         if (!response['success']) {
@@ -398,8 +377,7 @@ class ACsBloc extends Bloc<AcsEvent, AcsState> {
     if (value >= 20 && value <= 30) {
       return true;
     } else {
-      emit(const AcsFailedState(
-          errorMessage: 'The temperature must be between 20 and 30'));
+      emit(const AcsFailedState(errorMessage: 'The temperature must be between 20 and 30'));
       emit(GetAllAcsStatusState(
           allAcsStatues: deviceStatusList,
           allAcs: devicesList,

lib/features/devices/bloc/ceiling_bloc/ceiling_sensor_bloc.dart

@@ -19,8 +19,7 @@ class CeilingSensorBloc extends Bloc<CeilingSensorEvent, CeilingSensorState> {
     on<CeilingSensorUpdated>(_onCeilingSensorUpdated);
   }
 
-  void _fetchCeilingSensorStatus(
-      InitialEvent event, Emitter<CeilingSensorState> emit) async {
+  void _fetchCeilingSensorStatus(InitialEvent event, Emitter<CeilingSensorState> emit) async {
     emit(LoadingInitialState());
     try {
       var response = await DevicesAPI.getDeviceStatus(deviceId);
@@ -39,18 +38,15 @@ class CeilingSensorBloc extends Bloc<CeilingSensorEvent, CeilingSensorState> {
 
   _listenToChanges() {
     try {
-      DatabaseReference ref =
-          FirebaseDatabase.instance.ref('device-status/$deviceId');
+      DatabaseReference ref = FirebaseDatabase.instance.ref('device-status/$deviceId');
       Stream<DatabaseEvent> stream = ref.onValue;
 
       stream.listen((DatabaseEvent event) {
-        Map<dynamic, dynamic> usersMap =
-            event.snapshot.value as Map<dynamic, dynamic>;
+        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']));
+          statusList.add(StatusModel(code: element['code'], value: element['value']));
         });
 
         deviceStatus = CeilingSensorModel.fromJson(statusList);
@@ -59,19 +55,15 @@ class CeilingSensorBloc extends Bloc<CeilingSensorEvent, CeilingSensorState> {
     } catch (_) {}
   }
 
-  _onCeilingSensorUpdated(
-      CeilingSensorUpdated event, Emitter<CeilingSensorState> emit) {
+  _onCeilingSensorUpdated(CeilingSensorUpdated event, Emitter<CeilingSensorState> emit) {
     emit(UpdateState(ceilingSensorModel: deviceStatus));
   }
 
-  void _changeValue(
-      ChangeValueEvent event, Emitter<CeilingSensorState> emit) async {
+  void _changeValue(ChangeValueEvent event, Emitter<CeilingSensorState> emit) async {
     emit(LoadingNewSate(ceilingSensorModel: deviceStatus));
     try {
       final response = await DevicesAPI.controlDevice(
-          DeviceControlModel(
-              deviceId: deviceId, code: event.code, value: event.value),
-          deviceId);
+          DeviceControlModel(deviceId: deviceId, code: event.code, value: event.value), deviceId);
 
       if (response['success'] ?? false) {
         deviceStatus.sensitivity = event.value;

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

@@ -25,11 +25,9 @@ class DoorSensorBloc extends Bloc<DoorSensorEvent, DoorSensorState> {
   bool lowBattery = false;
   bool closingReminder = false;
   bool doorAlarm = false;
-  DoorSensorModel deviceStatus =
-      DoorSensorModel(doorContactState: false, batteryPercentage: 0);
+  DoorSensorModel deviceStatus = DoorSensorModel(doorContactState: false, batteryPercentage: 0);
 
-  void _fetchStatus(
-      DoorSensorInitial event, Emitter<DoorSensorState> emit) async {
+  void _fetchStatus(DoorSensorInitial event, Emitter<DoorSensorState> emit) async {
     emit(DoorSensorLoadingState());
     try {
       var response = await DevicesAPI.getDeviceStatus(DSId);
@@ -50,8 +48,7 @@ class DoorSensorBloc extends Bloc<DoorSensorEvent, DoorSensorState> {
   }
 
   // Toggle functions for each switch
-  void _toggleLowBattery(
-      ToggleLowBatteryEvent event, Emitter<DoorSensorState> emit) async {
+  void _toggleLowBattery(ToggleLowBatteryEvent event, Emitter<DoorSensorState> emit) async {
     emit(LoadingNewSate(doorSensor: deviceStatus));
     try {
       lowBattery = event.isLowBatteryEnabled;
@@ -92,8 +89,7 @@ class DoorSensorBloc extends Bloc<DoorSensorEvent, DoorSensorState> {
     }
   }
 
-  void _toggleDoorAlarm(
-      ToggleDoorAlarmEvent event, Emitter<DoorSensorState> emit) async {
+  void _toggleDoorAlarm(ToggleDoorAlarmEvent event, Emitter<DoorSensorState> emit) async {
     emit(LoadingNewSate(doorSensor: deviceStatus));
     try {
       doorAlarm = event.isDoorAlarmEnabled;
@@ -112,11 +108,9 @@ class DoorSensorBloc extends Bloc<DoorSensorEvent, DoorSensorState> {
     }
   }
 
-  DeviceReport recordGroups =
-      DeviceReport(startTime: '0', endTime: '0', data: []);
+  DeviceReport recordGroups = DeviceReport(startTime: '0', endTime: '0', data: []);
 
-  Future<void> fetchLogsForLastMonth(
-      ReportLogsInitial event, Emitter<DoorSensorState> emit) async {
+  Future<void> fetchLogsForLastMonth(ReportLogsInitial event, Emitter<DoorSensorState> emit) async {
     DateTime now = DateTime.now();
 
     DateTime lastMonth = DateTime(now.year, now.month - 1, now.day);
@@ -126,9 +120,8 @@ class DoorSensorBloc extends Bloc<DoorSensorEvent, DoorSensorState> {
     try {
       emit(DoorSensorLoadingState());
       var response = await DevicesAPI.getReportLogs(
-        startTime:
-            startTime.toString(), 
-        endTime: endTime.toString(), 
+        startTime: startTime.toString(),
+        endTime: endTime.toString(),
         deviceUuid: DSId,
         code: 'doorcontact_state',
       );
@@ -142,16 +135,14 @@ class DoorSensorBloc extends Bloc<DoorSensorEvent, DoorSensorState> {
 
   _listenToChanges() {
     try {
-      DatabaseReference ref =
-          FirebaseDatabase.instance.ref('device-status/$DSId');
+      DatabaseReference ref = FirebaseDatabase.instance.ref('device-status/$DSId');
       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>;
+        Map<dynamic, dynamic> usersMap = event.snapshot.value as Map<dynamic, dynamic>;
         List<StatusModel> statusList = [];
 
         usersMap['status'].forEach((element) {

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

@@ -65,8 +65,7 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
     batteryPercentage: 0,
   );
 
-  void _fetchStatus(
-      GarageDoorInitial event, Emitter<GarageDoorSensorState> emit) async {
+  void _fetchStatus(GarageDoorInitial event, Emitter<GarageDoorSensorState> emit) async {
     emit(GarageDoorLoadingState());
     try {
       var response = await DevicesAPI.getDeviceStatus(GDId);
@@ -114,8 +113,8 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
     }
   }
 
-  void _toggleClosingReminder(ToggleClosingReminderEvent event,
-      Emitter<GarageDoorSensorState> emit) async {
+  void _toggleClosingReminder(
+      ToggleClosingReminderEvent event, Emitter<GarageDoorSensorState> emit) async {
     emit(LoadingNewSate(doorSensor: deviceStatus));
     try {
       closingReminder = event.isClosingReminderEnabled;
@@ -133,8 +132,7 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
     }
   }
 
-  void _toggleDoorAlarm(
-      ToggleDoorAlarmEvent event, Emitter<GarageDoorSensorState> emit) async {
+  void _toggleDoorAlarm(ToggleDoorAlarmEvent event, Emitter<GarageDoorSensorState> emit) async {
     emit(LoadingNewSate(doorSensor: deviceStatus));
     try {
       doorAlarm = event.isDoorAlarmEnabled;
@@ -152,8 +150,7 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
     }
   }
 
-  DeviceReport recordGroups =
-      DeviceReport(startTime: '0', endTime: '0', data: []);
+  DeviceReport recordGroups = DeviceReport(startTime: '0', endTime: '0', data: []);
 
   Future<void> fetchLogsForLastMonth(
       ReportLogsInitial event, Emitter<GarageDoorSensorState> emit) async {
@@ -172,8 +169,6 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
       );
       recordGroups = response;
 
-
-      
       emit(UpdateState(garageSensor: deviceStatus));
     } on DioException catch (e) {
       final errorData = e.response!.data;
@@ -184,16 +179,14 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
 
   _listenToChanges() {
     try {
-      DatabaseReference ref =
-          FirebaseDatabase.instance.ref('device-status/$GDId');
+      DatabaseReference ref = FirebaseDatabase.instance.ref('device-status/$GDId');
       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>;
+        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: true));
@@ -268,8 +261,7 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
         deviceId: GDId,
       );
       List<dynamic> jsonData = response;
-      listSchedule =
-          jsonData.map((item) => ScheduleModel.fromJson(item)).toList();
+      listSchedule = jsonData.map((item) => ScheduleModel.fromJson(item)).toList();
       emit(UpdateState(garageSensor: deviceStatus));
     } on DioException catch (e) {
       final errorData = e.response!.data;
@@ -280,13 +272,12 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
 
   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<GarageDoorSensorState> emit) async {
+  Future toggleChange(ToggleScheduleEvent event, Emitter<GarageDoorSensorState> emit) async {
     try {
       emit(GarageDoorLoadingState());
       final response = await DevicesAPI.changeSchedule(
@@ -304,8 +295,7 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
     }
   }
 
-  Future deleteSchedule(
-      DeleteScheduleEvent event, Emitter<GarageDoorSensorState> emit) async {
+  Future deleteSchedule(DeleteScheduleEvent event, Emitter<GarageDoorSensorState> emit) async {
     try {
       emit(GarageDoorLoadingState());
       final response = await DevicesAPI.deleteSchedule(
@@ -324,15 +314,13 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
     }
   }
 
-  void toggleSelectedIndex(
-      ToggleSelectedEvent event, Emitter<GarageDoorSensorState> emit) {
+  void toggleSelectedIndex(ToggleSelectedEvent event, Emitter<GarageDoorSensorState> emit) {
     emit(GarageDoorLoadingState());
     selectedTabIndex = event.index;
     emit(ChangeSlidingSegmentState(value: selectedTabIndex));
   }
 
-  void toggleCreateSchedule(
-      ToggleCreateScheduleEvent event, Emitter<GarageDoorSensorState> emit) {
+  void toggleCreateSchedule(ToggleCreateScheduleEvent event, Emitter<GarageDoorSensorState> emit) {
     emit(GarageDoorLoadingState());
     createSchedule = !createSchedule;
     selectedDays.clear();
@@ -349,16 +337,13 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
 
   int secondSelected = 0;
   bool toggleDoor = false;
-  Future<void> selectSeconds(
-      SelectSecondsEvent event, Emitter<GarageDoorSensorState> emit) async {
+  Future<void> selectSeconds(SelectSecondsEvent event, Emitter<GarageDoorSensorState> emit) async {
     try {
       emit(GarageDoorLoadingState());
       secondSelected = event.seconds;
 
       await DevicesAPI.controlDevice(
-          DeviceControlModel(
-              deviceId: GDId, code: 'tr_timecon', value: secondSelected),
-          GDId);
+          DeviceControlModel(deviceId: GDId, code: 'tr_timecon', value: secondSelected), GDId);
       emit(UpdateState(garageSensor: deviceStatus));
     } on DioException catch (e) {
       final errorData = e.response!.data;
@@ -367,15 +352,12 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
     }
   }
 
-  openCloseGarageDoor(
-      ToggleDoorEvent event, Emitter<GarageDoorSensorState> emit) async {
+  openCloseGarageDoor(ToggleDoorEvent event, Emitter<GarageDoorSensorState> emit) async {
     emit(GarageDoorLoadingState());
     try {
       toggleDoor = !event.toggle;
       await DevicesAPI.controlDevice(
-          DeviceControlModel(
-              deviceId: GDId, code: 'switch_1', value: toggleDoor),
-          GDId);
+          DeviceControlModel(deviceId: GDId, code: 'switch_1', value: toggleDoor), GDId);
       add(const GarageDoorInitial());
       emit(UpdateState(garageSensor: deviceStatus));
     } on DioException catch (e) {
@@ -385,16 +367,13 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
     }
   }
 
-  void _setCounterValue(
-      SetCounterValue event, Emitter<GarageDoorSensorState> emit) async {
+  void _setCounterValue(SetCounterValue event, Emitter<GarageDoorSensorState> emit) async {
     emit(LoadingNewSate(doorSensor: deviceStatus));
     int seconds = 0;
     try {
       seconds = event.duration.inSeconds;
       final response = await DevicesAPI.controlDevice(
-          DeviceControlModel(
-              deviceId: GDId, code: 'countdown_1', value: seconds),
-          GDId);
+          DeviceControlModel(deviceId: GDId, code: 'countdown_1', value: seconds), GDId);
 
       if (response['success'] ?? false) {
         deviceStatus.countdown1 = seconds;
@@ -414,8 +393,7 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
     }
   }
 
-  void _getCounterValue(
-      GetCounterEvent event, Emitter<GarageDoorSensorState> emit) async {
+  void _getCounterValue(GetCounterEvent event, Emitter<GarageDoorSensorState> emit) async {
     emit(LoadingInitialState());
     try {
       var response = await DevicesAPI.getDeviceStatus(GDId);
@@ -456,8 +434,7 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
   List<GroupGarageModel> groupList = [];
   bool allSwitchesOn = true;
 
-  void _fetchWizardStatus(
-      InitialWizardEvent event, Emitter<GarageDoorSensorState> emit) async {
+  void _fetchWizardStatus(InitialWizardEvent event, Emitter<GarageDoorSensorState> emit) async {
     emit(LoadingInitialState());
     try {
       devicesList = [];
@@ -467,8 +444,7 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
           HomeCubit.getInstance().selectedSpace?.id ?? '', 'GD');
 
       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));
@@ -497,8 +473,7 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
     }
   }
 
-  void _groupAllOn(
-      GroupAllOnEvent event, Emitter<GarageDoorSensorState> emit) async {
+  void _groupAllOn(GroupAllOnEvent event, Emitter<GarageDoorSensorState> emit) async {
     emit(LoadingNewSate(doorSensor: deviceStatus));
     try {
       // Set all switches (firstSwitch and secondSwitch) based on the event value (on/off)
@@ -510,8 +485,7 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
       emit(UpdateGroupState(garageList: groupList, allSwitches: true));
 
       // Get a list of all device IDs
-      List<String> allDeviceIds =
-          groupList.map((device) => device.deviceId).toList();
+      List<String> allDeviceIds = groupList.map((device) => device.deviceId).toList();
 
       // First call for switch_1
       final response = await DevicesAPI.deviceBatchController(
@@ -531,8 +505,7 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
     }
   }
 
-  void _groupAllOff(
-      GroupAllOffEvent event, Emitter<GarageDoorSensorState> emit) async {
+  void _groupAllOff(GroupAllOffEvent event, Emitter<GarageDoorSensorState> emit) async {
     emit(LoadingNewSate(doorSensor: deviceStatus));
     try {
       // Set all switches (firstSwitch and secondSwitch) based on the event value (on/off)
@@ -544,8 +517,7 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
       emit(UpdateGroupState(garageList: groupList, allSwitches: false));
 
       // Get a list of all device IDs
-      List<String> allDeviceIds =
-          groupList.map((device) => device.deviceId).toList();
+      List<String> allDeviceIds = groupList.map((device) => device.deviceId).toList();
 
       // First call for switch_1
       final response = await DevicesAPI.deviceBatchController(
@@ -566,8 +538,8 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
     }
   }
 
-  void _changeFirstWizardSwitch(ChangeFirstWizardSwitchStatusEvent event,
-      Emitter<GarageDoorSensorState> emit) async {
+  void _changeFirstWizardSwitch(
+      ChangeFirstWizardSwitchStatusEvent event, Emitter<GarageDoorSensorState> emit) async {
     emit(LoadingNewSate(doorSensor: deviceStatus));
     try {
       bool allSwitchesValue = true;
@@ -580,8 +552,7 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
         }
       });
 
-      emit(UpdateGroupState(
-          garageList: groupList, allSwitches: allSwitchesValue));
+      emit(UpdateGroupState(garageList: groupList, allSwitches: allSwitchesValue));
 
       final response = await DevicesAPI.deviceBatchController(
         code: 'switch_1',
@@ -597,16 +568,13 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
     }
   }
 
-  void _setTimeOutAlarm(
-      SetTimeOutValue event, Emitter<GarageDoorSensorState> emit) async {
+  void _setTimeOutAlarm(SetTimeOutValue event, Emitter<GarageDoorSensorState> emit) async {
     emit(LoadingNewSate(doorSensor: deviceStatus));
     int seconds = 0;
     try {
       seconds = event.duration.inSeconds;
       final response = await DevicesAPI.controlDevice(
-          DeviceControlModel(
-              deviceId: GDId, code: 'countdown_alarm', value: seconds),
-          GDId);
+          DeviceControlModel(deviceId: GDId, code: 'countdown_alarm', value: seconds), GDId);
 
       if (response['success'] ?? false) {
         deviceStatus.countdownAlarm = seconds;

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

@@ -26,8 +26,7 @@ class OneGangBloc extends Bloc<OneGangEvent, OneGangState> {
   bool oneGangGroup = false;
   List<DeviceModel> devicesList = [];
 
-  OneGangBloc({required this.oneGangId, required this.switchCode})
-      : super(InitialState()) {
+  OneGangBloc({required this.oneGangId, required this.switchCode}) : super(InitialState()) {
     on<InitialEvent>(_fetchOneGangStatus);
     on<OneGangUpdated>(_oneGangUpdated);
     on<ChangeFirstSwitchStatusEvent>(_changeFirstSwitch);
@@ -50,8 +49,7 @@ class OneGangBloc extends Bloc<OneGangEvent, OneGangState> {
     on<GroupAllOffEvent>(_groupAllOff);
   }
 
-  void _fetchOneGangStatus(
-      InitialEvent event, Emitter<OneGangState> emit) async {
+  void _fetchOneGangStatus(InitialEvent event, Emitter<OneGangState> emit) async {
     emit(LoadingInitialState());
     try {
       var response = await DevicesAPI.getDeviceStatus(oneGangId);
@@ -70,21 +68,18 @@ class OneGangBloc extends Bloc<OneGangEvent, OneGangState> {
 
   _listenToChanges() {
     try {
-      DatabaseReference ref =
-          FirebaseDatabase.instance.ref('device-status/$oneGangId');
+      DatabaseReference ref = FirebaseDatabase.instance.ref('device-status/$oneGangId');
       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>;
+        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']));
+          statusList.add(StatusModel(code: element['code'], value: element['value']));
         });
 
         deviceStatus = OneGangModel.fromJson(statusList);
@@ -99,8 +94,7 @@ class OneGangBloc extends Bloc<OneGangEvent, OneGangState> {
     emit(UpdateState(oneGangModel: deviceStatus));
   }
 
-  void _changeFirstSwitch(
-      ChangeFirstSwitchStatusEvent event, Emitter<OneGangState> emit) async {
+  void _changeFirstSwitch(ChangeFirstSwitchStatusEvent event, Emitter<OneGangState> emit) async {
     emit(LoadingNewSate(oneGangModel: deviceStatus));
     try {
       deviceStatus.firstSwitch = !event.value;
@@ -125,20 +119,17 @@ class OneGangBloc extends Bloc<OneGangEvent, OneGangState> {
     }
   }
 
-  void _changeSliding(
-      ChangeSlidingSegment event, Emitter<OneGangState> emit) async {
+  void _changeSliding(ChangeSlidingSegment event, Emitter<OneGangState> emit) async {
     emit(ChangeSlidingSegmentState(value: event.value));
   }
 
-  void _setCounterValue(
-      SetCounterValue event, Emitter<OneGangState> emit) async {
+  void _setCounterValue(SetCounterValue event, Emitter<OneGangState> emit) async {
     emit(LoadingNewSate(oneGangModel: deviceStatus));
     int seconds = 0;
     try {
       seconds = event.duration.inSeconds;
       final response = await DevicesAPI.controlDevice(
-          DeviceControlModel(
-              deviceId: oneGangId, code: event.deviceCode, value: seconds),
+          DeviceControlModel(deviceId: oneGangId, code: event.deviceCode, value: seconds),
           oneGangId);
 
       if (response['success'] ?? false) {
@@ -161,8 +152,7 @@ class OneGangBloc extends Bloc<OneGangEvent, OneGangState> {
     }
   }
 
-  void _getCounterValue(
-      GetCounterEvent event, Emitter<OneGangState> emit) async {
+  void _getCounterValue(GetCounterEvent event, Emitter<OneGangState> emit) async {
     emit(LoadingInitialState());
     try {
       var response = await DevicesAPI.getDeviceStatus(oneGangId);
@@ -251,8 +241,7 @@ class OneGangBloc extends Bloc<OneGangEvent, OneGangState> {
         deviceId: oneGangId,
       );
       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;
@@ -263,13 +252,12 @@ class OneGangBloc extends Bloc<OneGangEvent, OneGangState> {
 
   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<OneGangState> emit) async {
+  Future toggleChange(ToggleScheduleEvent event, Emitter<OneGangState> emit) async {
     try {
       emit(LoadingInitialState());
       final response = await DevicesAPI.changeSchedule(
@@ -288,8 +276,7 @@ class OneGangBloc extends Bloc<OneGangEvent, OneGangState> {
     }
   }
 
-  Future deleteSchedule(
-      DeleteScheduleEvent event, Emitter<OneGangState> emit) async {
+  Future deleteSchedule(DeleteScheduleEvent event, Emitter<OneGangState> emit) async {
     try {
       emit(LoadingInitialState());
       final response = await DevicesAPI.deleteSchedule(
@@ -309,8 +296,7 @@ class OneGangBloc extends Bloc<OneGangEvent, OneGangState> {
     }
   }
 
-  void toggleCreateSchedule(
-      ToggleCreateScheduleEvent event, Emitter<OneGangState> emit) {
+  void toggleCreateSchedule(ToggleCreateScheduleEvent event, Emitter<OneGangState> emit) {
     emit(LoadingInitialState());
     createSchedule = !createSchedule;
     selectedDays.clear();
@@ -339,8 +325,7 @@ class OneGangBloc extends Bloc<OneGangEvent, OneGangState> {
 
   int selectedTabIndex = 0;
 
-  void toggleSelectedIndex(
-      ToggleSelectedEvent event, Emitter<OneGangState> emit) {
+  void toggleSelectedIndex(ToggleSelectedEvent event, Emitter<OneGangState> emit) {
     emit(LoadingInitialState());
     selectedTabIndex = event.index;
     emit(ChangeSlidingSegmentState(value: selectedTabIndex));
@@ -349,8 +334,7 @@ class OneGangBloc extends Bloc<OneGangEvent, OneGangState> {
   List<GroupOneGangModel> groupOneGangList = [];
   bool allSwitchesOn = true;
 
-  void _fetchOneGangWizardStatus(
-      InitialWizardEvent event, Emitter<OneGangState> emit) async {
+  void _fetchOneGangWizardStatus(InitialWizardEvent event, Emitter<OneGangState> emit) async {
     emit(LoadingInitialState());
     try {
       devicesList = [];
@@ -360,8 +344,7 @@ class OneGangBloc extends Bloc<OneGangEvent, OneGangState> {
           HomeCubit.getInstance().selectedSpace?.id ?? '', '1G');
 
       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));
@@ -382,16 +365,15 @@ class OneGangBloc extends Bloc<OneGangEvent, OneGangState> {
           return true;
         });
       }
-      emit(UpdateGroupState(
-          oneGangList: groupOneGangList, allSwitches: allSwitchesOn));
+      emit(UpdateGroupState(oneGangList: groupOneGangList, allSwitches: allSwitchesOn));
     } catch (e) {
       emit(FailedState(error: e.toString()));
       return;
     }
   }
 
-  void _changeFirstWizardSwitch(ChangeFirstWizardSwitchStatusEvent event,
-      Emitter<OneGangState> emit) async {
+  void _changeFirstWizardSwitch(
+      ChangeFirstWizardSwitchStatusEvent event, Emitter<OneGangState> emit) async {
     emit(LoadingNewSate(oneGangModel: deviceStatus));
     try {
       bool allSwitchesValue = true;
@@ -404,8 +386,7 @@ class OneGangBloc extends Bloc<OneGangEvent, OneGangState> {
         }
       });
 
-      emit(UpdateGroupState(
-          oneGangList: groupOneGangList, allSwitches: allSwitchesValue));
+      emit(UpdateGroupState(oneGangList: groupOneGangList, allSwitches: allSwitchesValue));
 
       final response = await DevicesAPI.deviceBatchController(
         code: 'switch_1',
@@ -433,8 +414,7 @@ class OneGangBloc extends Bloc<OneGangEvent, OneGangState> {
       emit(UpdateGroupState(oneGangList: groupOneGangList, allSwitches: true));
 
       // Get a list of all device IDs
-      List<String> allDeviceIds =
-          groupOneGangList.map((device) => device.deviceId).toList();
+      List<String> allDeviceIds = groupOneGangList.map((device) => device.deviceId).toList();
 
       // First call for switch_1
       final response = await DevicesAPI.deviceBatchController(
@@ -466,8 +446,7 @@ class OneGangBloc extends Bloc<OneGangEvent, OneGangState> {
       emit(UpdateGroupState(oneGangList: groupOneGangList, allSwitches: false));
 
       // Get a list of all device IDs
-      List<String> allDeviceIds =
-          groupOneGangList.map((device) => device.deviceId).toList();
+      List<String> allDeviceIds = groupOneGangList.map((device) => device.deviceId).toList();
 
       // First call for switch_1
       final response = await DevicesAPI.deviceBatchController(

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

@@ -30,8 +30,7 @@ class OneTouchBloc extends Bloc<OneTouchEvent, OneTouchState> {
   bool oneTouchGroup = false;
   List<DeviceModel> devicesList = [];
 
-  OneTouchBloc({required this.oneTouchId, required this.switchCode})
-      : super(InitialState()) {
+  OneTouchBloc({required this.oneTouchId, required this.switchCode}) : super(InitialState()) {
     on<InitialEvent>(_fetchOneTouchStatus);
     on<OneTouchUpdated>(_oneTouchUpdated);
     on<ChangeFirstSwitchStatusEvent>(_changeFirstSwitch);
@@ -54,8 +53,7 @@ class OneTouchBloc extends Bloc<OneTouchEvent, OneTouchState> {
     on<ChangeStatusEvent>(_changeStatus);
   }
 
-  void _fetchOneTouchStatus(
-      InitialEvent event, Emitter<OneTouchState> emit) async {
+  void _fetchOneTouchStatus(InitialEvent event, Emitter<OneTouchState> emit) async {
     emit(LoadingInitialState());
     try {
       var response = await DevicesAPI.getDeviceStatus(oneTouchId);
@@ -74,21 +72,18 @@ class OneTouchBloc extends Bloc<OneTouchEvent, OneTouchState> {
 
   _listenToChanges() {
     try {
-      DatabaseReference ref =
-          FirebaseDatabase.instance.ref('device-status/$oneTouchId');
+      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>;
+        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']));
+          statusList.add(StatusModel(code: element['code'], value: element['value']));
         });
 
         deviceStatus = OneTouchModel.fromJson(statusList);
@@ -103,8 +98,7 @@ class OneTouchBloc extends Bloc<OneTouchEvent, OneTouchState> {
     emit(UpdateState(oneTouchModel: deviceStatus));
   }
 
-  void _changeFirstSwitch(
-      ChangeFirstSwitchStatusEvent event, Emitter<OneTouchState> emit) async {
+  void _changeFirstSwitch(ChangeFirstSwitchStatusEvent event, Emitter<OneTouchState> emit) async {
     emit(LoadingNewSate(oneTouchModel: deviceStatus));
     try {
       deviceStatus.firstSwitch = !event.value;
@@ -129,20 +123,17 @@ class OneTouchBloc extends Bloc<OneTouchEvent, OneTouchState> {
     }
   }
 
-  void _changeSliding(
-      ChangeSlidingSegment event, Emitter<OneTouchState> emit) async {
+  void _changeSliding(ChangeSlidingSegment event, Emitter<OneTouchState> emit) async {
     emit(ChangeSlidingSegmentState(value: event.value));
   }
 
-  void _setCounterValue(
-      SetCounterValue event, Emitter<OneTouchState> emit) async {
+  void _setCounterValue(SetCounterValue event, Emitter<OneTouchState> emit) async {
     emit(LoadingNewSate(oneTouchModel: deviceStatus));
     int seconds = 0;
     try {
       seconds = event.duration.inSeconds;
       final response = await DevicesAPI.controlDevice(
-          DeviceControlModel(
-              deviceId: oneTouchId, code: event.deviceCode, value: seconds),
+          DeviceControlModel(deviceId: oneTouchId, code: event.deviceCode, value: seconds),
           oneTouchId);
 
       if (response['success'] ?? false) {
@@ -165,8 +156,7 @@ class OneTouchBloc extends Bloc<OneTouchEvent, OneTouchState> {
     }
   }
 
-  void _getCounterValue(
-      GetCounterEvent event, Emitter<OneTouchState> emit) async {
+  void _getCounterValue(GetCounterEvent event, Emitter<OneTouchState> emit) async {
     emit(LoadingInitialState());
     try {
       var response = await DevicesAPI.getDeviceStatus(oneTouchId);
@@ -255,8 +245,7 @@ class OneTouchBloc extends Bloc<OneTouchEvent, OneTouchState> {
         deviceId: oneTouchId,
       );
       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;
@@ -267,13 +256,12 @@ class OneTouchBloc extends Bloc<OneTouchEvent, OneTouchState> {
 
   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<OneTouchState> emit) async {
+  Future toggleChange(ToggleScheduleEvent event, Emitter<OneTouchState> emit) async {
     try {
       emit(LoadingInitialState());
       final response = await DevicesAPI.changeSchedule(
@@ -292,8 +280,7 @@ class OneTouchBloc extends Bloc<OneTouchEvent, OneTouchState> {
     }
   }
 
-  Future deleteSchedule(
-      DeleteScheduleEvent event, Emitter<OneTouchState> emit) async {
+  Future deleteSchedule(DeleteScheduleEvent event, Emitter<OneTouchState> emit) async {
     try {
       emit(LoadingInitialState());
       final response = await DevicesAPI.deleteSchedule(
@@ -313,8 +300,7 @@ class OneTouchBloc extends Bloc<OneTouchEvent, OneTouchState> {
     }
   }
 
-  void toggleCreateSchedule(
-      ToggleCreateScheduleEvent event, Emitter<OneTouchState> emit) {
+  void toggleCreateSchedule(ToggleCreateScheduleEvent event, Emitter<OneTouchState> emit) {
     emit(LoadingInitialState());
     createSchedule = !createSchedule;
     selectedDays.clear();
@@ -343,8 +329,7 @@ class OneTouchBloc extends Bloc<OneTouchEvent, OneTouchState> {
 
   int selectedTabIndex = 0;
 
-  void toggleSelectedIndex(
-      ToggleSelectedEvent event, Emitter<OneTouchState> emit) {
+  void toggleSelectedIndex(ToggleSelectedEvent event, Emitter<OneTouchState> emit) {
     emit(LoadingInitialState());
     selectedTabIndex = event.index;
     emit(ChangeSlidingSegmentState(value: selectedTabIndex));
@@ -353,8 +338,7 @@ class OneTouchBloc extends Bloc<OneTouchEvent, OneTouchState> {
   List<GroupOneTouchModel> groupOneTouchList = [];
   bool allSwitchesOn = true;
 
-  void _fetchOneTouchWizardStatus(
-      InitialWizardEvent event, Emitter<OneTouchState> emit) async {
+  void _fetchOneTouchWizardStatus(InitialWizardEvent event, Emitter<OneTouchState> emit) async {
     emit(LoadingInitialState());
     try {
       devicesList = [];
@@ -364,8 +348,7 @@ class OneTouchBloc extends Bloc<OneTouchEvent, OneTouchState> {
           HomeCubit.getInstance().selectedSpace?.id ?? '', '1GT');
 
       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));
@@ -386,16 +369,15 @@ class OneTouchBloc extends Bloc<OneTouchEvent, OneTouchState> {
           return true;
         });
       }
-      emit(UpdateGroupState(
-          oneTouchList: groupOneTouchList, allSwitches: allSwitchesOn));
+      emit(UpdateGroupState(oneTouchList: groupOneTouchList, allSwitches: allSwitchesOn));
     } catch (e) {
       emit(FailedState(error: e.toString()));
       return;
     }
   }
 
-  void _changeFirstWizardSwitch(ChangeFirstWizardSwitchStatusEvent event,
-      Emitter<OneTouchState> emit) async {
+  void _changeFirstWizardSwitch(
+      ChangeFirstWizardSwitchStatusEvent event, Emitter<OneTouchState> emit) async {
     emit(LoadingNewSate(oneTouchModel: deviceStatus));
     try {
       bool allSwitchesValue = true;
@@ -413,8 +395,7 @@ class OneTouchBloc extends Bloc<OneTouchEvent, OneTouchState> {
         value: !event.value,
       );
 
-      emit(UpdateGroupState(
-          oneTouchList: groupOneTouchList, allSwitches: allSwitchesValue));
+      emit(UpdateGroupState(oneTouchList: groupOneTouchList, allSwitches: allSwitchesValue));
       if (response['success']) {
         add(InitialEvent(groupScreen: oneTouchGroup));
       }
@@ -432,12 +413,10 @@ class OneTouchBloc extends Bloc<OneTouchEvent, OneTouchState> {
       }
 
       // Emit the state with updated values
-      emit(
-          UpdateGroupState(oneTouchList: groupOneTouchList, allSwitches: true));
+      emit(UpdateGroupState(oneTouchList: groupOneTouchList, allSwitches: true));
 
       // Get a list of all device IDs
-      List<String> allDeviceIds =
-          groupOneTouchList.map((device) => device.deviceId).toList();
+      List<String> allDeviceIds = groupOneTouchList.map((device) => device.deviceId).toList();
 
       // First call for switch_1
       final response1 = await DevicesAPI.deviceBatchController(
@@ -466,12 +445,10 @@ class OneTouchBloc extends Bloc<OneTouchEvent, OneTouchState> {
       }
 
       // Emit the state with updated values
-      emit(UpdateGroupState(
-          oneTouchList: groupOneTouchList, allSwitches: false));
+      emit(UpdateGroupState(oneTouchList: groupOneTouchList, allSwitches: false));
 
       // Get a list of all device IDs
-      List<String> allDeviceIds =
-          groupOneTouchList.map((device) => device.deviceId).toList();
+      List<String> allDeviceIds = groupOneTouchList.map((device) => device.deviceId).toList();
 
       // First call for switch_1
       final response1 = await DevicesAPI.deviceBatchController(
@@ -495,8 +472,7 @@ class OneTouchBloc extends Bloc<OneTouchEvent, OneTouchState> {
   String statusSelected = '';
   String optionSelected = '';
 
-  Future<void> _changeStatus(
-      ChangeStatusEvent event, Emitter<OneTouchState> emit) async {
+  Future<void> _changeStatus(ChangeStatusEvent event, Emitter<OneTouchState> emit) async {
     try {
       emit(LoadingInitialState());
 
@@ -521,10 +497,7 @@ class OneTouchBloc extends Bloc<OneTouchEvent, OneTouchState> {
       final selectedControl = controlMap[optionSelected]?[statusSelected];
       if (selectedControl != null) {
         await DevicesAPI.controlDevice(
-          DeviceControlModel(
-              deviceId: oneTouchId,
-              code: optionSelected,
-              value: selectedControl),
+          DeviceControlModel(deviceId: oneTouchId, code: optionSelected, value: selectedControl),
           oneTouchId,
         );
       } else {

lib/features/devices/bloc/power_clamp_bloc/power_clamp_bloc.dart

@@ -22,7 +22,8 @@ class PowerClampBloc extends Bloc<PowerClampEvent, PowerClampState> {
     on<FilterRecordsByDateEvent>(_filterRecordsByDate);
   }
   DateTime? dateTime = DateTime.now();
-  String formattedDate = DateFormat('yyyy/MM/dd').format(DateTime.now());
+
+  String formattedDate = DateFormat('dd/MM/yyyy').format(DateTime.now());
   bool lowBattery = false;
   bool closingReminder = false;
   bool doorAlarm = false;
@@ -305,8 +306,8 @@ class PowerClampBloc extends Bloc<PowerClampEvent, PowerClampState> {
         (newDate) {
           if (newDate != null) {
             dateTime = newDate;
-            formattedDate = DateFormat('yyyy/MM/dd').format(dateTime!);
-
+            // formattedDate = DateFormat('yyyy/MM/dd').format(dateTime!);
+            formattedDate = DateFormat('dd/MM/yyyy').format(dateTime!);
             add(FilterRecordsByDateEvent(
               selectedDate: dateTime!,
               viewType: views[currentIndex],
@@ -319,8 +320,7 @@ class PowerClampBloc extends Bloc<PowerClampEvent, PowerClampState> {
         (newDate) {
           if (newDate != null) {
             dateTime = newDate;
-            formattedDate = DateFormat('yyyy-MM').format(dateTime!);
-
+            formattedDate = DateFormat('yyyy/MM').format(dateTime!);
             add(FilterRecordsByDateEvent(
               selectedDate: dateTime!,
               viewType: views[currentIndex],
@@ -359,7 +359,7 @@ class PowerClampBloc extends Bloc<PowerClampEvent, PowerClampState> {
       context: context,
       builder: (BuildContext context) {
         return SizedBox(
-          height: 300,
+          height: MediaQuery.of(context).size.height * 0.4,
           child: Column(
             children: [
               const Padding(
@@ -463,7 +463,7 @@ class PowerClampBloc extends Bloc<PowerClampEvent, PowerClampState> {
       context: context,
       builder: (BuildContext context) {
         return SizedBox(
-          height: 300,
+          height: MediaQuery.of(context).size.height * 0.4,
           child: Column(
             children: [
               const Padding(
@@ -530,13 +530,13 @@ class PowerClampBloc extends Bloc<PowerClampEvent, PowerClampState> {
   Future<DateTime?> dayMonthYearPicker({
     required BuildContext context,
   }) async {
-    DateTime selectedDate = DateTime.now(); // Default selected date
+    DateTime selectedDate = DateTime.now();
 
     return await showModalBottomSheet<DateTime>(
       context: context,
       builder: (BuildContext context) {
         return SizedBox(
-          height: 350, // Increased height to accommodate the buttons
+          height: MediaQuery.of(context).size.height * 0.4,
           child: Column(
             children: [
               Expanded(
@@ -546,8 +546,7 @@ class PowerClampBloc extends Bloc<PowerClampEvent, PowerClampState> {
                   minimumYear: 1900,
                   maximumYear: DateTime.now().year,
                   onDateTimeChanged: (DateTime newDateTime) {
-                    selectedDate =
-                        newDateTime; // Update the selected date when changed
+                    selectedDate = newDateTime;
                   },
                 ),
               ),
@@ -561,15 +560,13 @@ class PowerClampBloc extends Bloc<PowerClampEvent, PowerClampState> {
                     TextButton(
                       child: const Text('Cancel'),
                       onPressed: () {
-                        Navigator.of(context)
-                            .pop(); // Dismiss the modal without returning a value
+                        Navigator.of(context).pop();
                       },
                     ),
                     TextButton(
                       child: const Text('OK'),
                       onPressed: () {
-                        Navigator.of(context)
-                            .pop(selectedDate); // Return the selected date
+                        Navigator.of(context).pop(selectedDate);
                       },
                     ),
                   ],
@@ -591,6 +588,8 @@ class PowerClampBloc extends Bloc<PowerClampEvent, PowerClampState> {
           .where((record) => record.eventTime!.year == event.selectedDate.year)
           .toList();
     } else if (event.viewType == 'Month') {
+      formattedDate =
+          "${getMonthShortName(event.selectedDate.month)} ${event.selectedDate.year.toString()}";
       filteredRecords = record
           .where((record) =>
               record.eventTime!.year == event.selectedDate.year &&
@@ -604,10 +603,6 @@ class PowerClampBloc extends Bloc<PowerClampEvent, PowerClampState> {
               record.eventTime!.day == event.selectedDate.day)
           .toList();
     }
-    String getMonthShortName(int month) {
-      final date = DateTime(0, month);
-      return DateFormat.MMM().format(date);
-    }
 
     energyDataList = filteredRecords.map((eventDevice) {
       return EnergyData(
@@ -615,18 +610,32 @@ class PowerClampBloc extends Bloc<PowerClampEvent, PowerClampState> {
             ? getMonthShortName(
                 int.tryParse(DateFormat('MM').format(eventDevice.eventTime!))!)
             : event.viewType == 'Month'
-                ? DateFormat('yyyy/MM/dd').format(eventDevice.eventTime!)
+                ? DateFormat('dd/MM').format(eventDevice.eventTime!)
                 : DateFormat('HH:mm:ss').format(eventDevice.eventTime!),
         double.parse(eventDevice.value!),
       );
     }).toList();
-
+    selectDateRange();
     Future.delayed(const Duration(milliseconds: 500));
     emit(FilterRecordsState(filteredRecords: energyDataList));
   }
+
+  String getMonthShortName(int month) {
+    final date = DateTime(0, month);
+    return DateFormat.MMM().format(date);
+  }
+
+  String endChartDate = '';
+
+  void selectDateRange() async {
+    DateTime startDate = dateTime!;
+    DateTime endDate = DateTime(startDate.year, startDate.month + 1, 1)
+        .subtract(Duration(days: 1));
+    String formattedEndDate = DateFormat('dd/MM/yyyy').format(endDate);
+    endChartDate = ' - $formattedEndDate';
+  }
 }
 
-// Event for filtering records by date
 
 
 // _listenToChanges() {

lib/features/devices/bloc/smart_door_bloc/smart_door_bloc.dart

@@ -37,8 +37,7 @@ class SmartDoorBloc extends Bloc<SmartDoorEvent, SmartDoorState> {
     on<SelectTimeEvent>(selectTimeOfLinePassword);
     on<SelectTimeOnlinePasswordEvent>(selectTimeOnlinePassword);
     on<DeletePasswordEvent>(deletePassword);
-    on<GenerateAndSavePasswordTimeLimitEvent>(
-        generateAndSavePasswordTimeLimited);
+    on<GenerateAndSavePasswordTimeLimitEvent>(generateAndSavePasswordTimeLimited);
     on<GenerateAndSavePasswordOneTimeEvent>(generateAndSavePasswordOneTime);
     on<ToggleDaySelectionEvent>(toggleDaySelection);
     on<RenamePasswordEvent>(_renamePassword);
@@ -60,8 +59,7 @@ class SmartDoorBloc extends Bloc<SmartDoorEvent, SmartDoorState> {
   List<OfflinePasswordModel>? oneTimePasswords = [];
   List<OfflinePasswordModel>? timeLimitPasswords = [];
 
-  Future generate7DigitNumber(
-      GeneratePasswordEvent event, Emitter<SmartDoorState> emit) async {
+  Future generate7DigitNumber(GeneratePasswordEvent event, Emitter<SmartDoorState> emit) async {
     emit(LoadingInitialState());
     passwordController.clear();
     Random random = Random();
@@ -73,8 +71,7 @@ class SmartDoorBloc extends Bloc<SmartDoorEvent, SmartDoorState> {
   }
 
   Future generateAndSavePasswordOneTime(
-      GenerateAndSavePasswordOneTimeEvent event,
-      Emitter<SmartDoorState> emit) async {
+      GenerateAndSavePasswordOneTimeEvent event, Emitter<SmartDoorState> emit) async {
     try {
       if (isSavingPassword) return;
       isSavingPassword = true;
@@ -95,8 +92,7 @@ class SmartDoorBloc extends Bloc<SmartDoorEvent, SmartDoorState> {
     }
   }
 
-  void _fetchSmartDoorStatus(
-      InitialEvent event, Emitter<SmartDoorState> emit) async {
+  void _fetchSmartDoorStatus(InitialEvent event, Emitter<SmartDoorState> emit) async {
     try {
       emit(LoadingInitialState());
       var response = await DevicesAPI.getDeviceStatus(deviceId);
@@ -115,18 +111,15 @@ class SmartDoorBloc extends Bloc<SmartDoorEvent, SmartDoorState> {
 
   _listenToChanges() {
     try {
-      DatabaseReference ref =
-          FirebaseDatabase.instance.ref('device-status/$deviceId');
+      DatabaseReference ref = FirebaseDatabase.instance.ref('device-status/$deviceId');
       Stream<DatabaseEvent> stream = ref.onValue;
 
       stream.listen((DatabaseEvent event) {
-        Map<dynamic, dynamic> usersMap =
-            event.snapshot.value as Map<dynamic, dynamic>;
+        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']));
+          statusList.add(StatusModel(code: element['code'], value: element['value']));
         });
 
         deviceStatus = SmartDoorModel.fromJson(statusList);
@@ -140,14 +133,11 @@ class SmartDoorBloc extends Bloc<SmartDoorEvent, SmartDoorState> {
     emit(UpdateState(smartDoorModel: deviceStatus));
   }
 
-  void _renamePassword(
-      RenamePasswordEvent event, Emitter<SmartDoorState> emit) async {
+  void _renamePassword(RenamePasswordEvent event, Emitter<SmartDoorState> emit) async {
     try {
       emit(LoadingInitialState());
       await DevicesAPI.renamePass(
-          name: passwordNameController.text,
-          doorLockUuid: deviceId,
-          passwordId: passwordId);
+          name: passwordNameController.text, doorLockUuid: deviceId, passwordId: passwordId);
       add(InitialOneTimePassword());
       add(InitialTimeLimitPassword());
       emit(UpdateState(smartDoorModel: deviceStatus));
@@ -157,58 +147,46 @@ class SmartDoorBloc extends Bloc<SmartDoorEvent, SmartDoorState> {
     }
   }
 
-  void getTemporaryPasswords(
-      InitialPasswordsPage event, Emitter<SmartDoorState> emit) async {
+  void getTemporaryPasswords(InitialPasswordsPage event, Emitter<SmartDoorState> emit) async {
     try {
       emit(LoadingInitialState());
       var response = await DevicesAPI.getTemporaryPasswords(
         deviceId,
       );
       if (response is List) {
-        temporaryPasswords =
-            response.map((item) => TemporaryPassword.fromJson(item)).toList();
+        temporaryPasswords = response.map((item) => TemporaryPassword.fromJson(item)).toList();
       } else if (response is Map && response.containsKey('data')) {
-        temporaryPasswords = (response['data'] as List)
-            .map((item) => TemporaryPassword.fromJson(item))
-            .toList();
+        temporaryPasswords =
+            (response['data'] as List).map((item) => TemporaryPassword.fromJson(item)).toList();
       }
-      emit(TemporaryPasswordsLoadedState(
-          temporaryPassword: temporaryPasswords!));
+      emit(TemporaryPasswordsLoadedState(temporaryPassword: temporaryPasswords!));
     } catch (e) {
       emit(FailedState(errorMessage: e.toString()));
     }
   }
 
-  void getOneTimePasswords(
-      InitialOneTimePassword event, Emitter<SmartDoorState> emit) async {
+  void getOneTimePasswords(InitialOneTimePassword event, Emitter<SmartDoorState> emit) async {
     try {
       emit(LoadingInitialState());
       var response = await DevicesAPI.getOneTimePasswords(deviceId);
       if (response is List) {
-        oneTimePasswords = response
-            .map((item) => OfflinePasswordModel.fromJson(item))
-            .toList();
+        oneTimePasswords = response.map((item) => OfflinePasswordModel.fromJson(item)).toList();
       }
-      emit(TemporaryPasswordsLoadedState(
-          temporaryPassword: temporaryPasswords!));
+      emit(TemporaryPasswordsLoadedState(temporaryPassword: temporaryPasswords!));
     } catch (e) {
       emit(FailedState(errorMessage: e.toString()));
     }
   }
 
-  void getTimeLimitPasswords(
-      InitialTimeLimitPassword event, Emitter<SmartDoorState> emit) async {
+  void getTimeLimitPasswords(InitialTimeLimitPassword event, Emitter<SmartDoorState> emit) async {
     try {
       emit(LoadingInitialState());
       var response = await DevicesAPI.getTimeLimitPasswords(deviceId);
       if (response is List) {
-        timeLimitPasswords = response
-            .map((item) => OfflinePasswordModel.fromJson(item))
-            .toList();
+        timeLimitPasswords = response.map((item) => OfflinePasswordModel.fromJson(item)).toList();
       }
 
-      emit(TemporaryPasswordsLoadedState(
-          temporaryPassword: temporaryPasswords!));
+      emit(TemporaryPasswordsLoadedState(temporaryPassword: temporaryPasswords!));
     } catch (e) {
       emit(FailedState(errorMessage: e.toString()));
     }
@@ -229,8 +207,7 @@ class SmartDoorBloc extends Bloc<SmartDoorEvent, SmartDoorState> {
     return repeat;
   }
 
-  bool setStartEndTime(
-      SetStartEndTimeEvent event, Emitter<SmartDoorState> emit) {
+  bool setStartEndTime(SetStartEndTimeEvent event, Emitter<SmartDoorState> emit) {
     emit(LoadingInitialState());
     isStartEndTime = event.val;
     emit(IsStartEndState(isStartEndTime: isStartEndTime));
@@ -253,8 +230,7 @@ class SmartDoorBloc extends Bloc<SmartDoorEvent, SmartDoorState> {
     emit(UpdateState(smartDoorModel: deviceStatus));
   }
 
-  Future<void> selectTimeOfLinePassword(
-      SelectTimeEvent event, Emitter<SmartDoorState> emit) async {
+  Future<void> selectTimeOfLinePassword(SelectTimeEvent event, Emitter<SmartDoorState> emit) async {
     emit(ChangeTimeState());
     final DateTime? picked = await showDatePicker(
       context: event.context,
@@ -284,27 +260,20 @@ class SmartDoorBloc extends Bloc<SmartDoorEvent, SmartDoorState> {
             ).millisecondsSinceEpoch ~/
             1000; // Divide by 1000 to remove milliseconds
         if (event.isEffective) {
-          if (expirationTimeTimeStamp != null &&
-              selectedTimestamp > expirationTimeTimeStamp!) {
-            CustomSnackBar.displaySnackBar(
-                'Effective Time cannot be later than Expiration Time.');
+          if (expirationTimeTimeStamp != null && selectedTimestamp > expirationTimeTimeStamp!) {
+            CustomSnackBar.displaySnackBar('Effective Time cannot be later than Expiration Time.');
           } else {
-            effectiveTime = selectedDateTime
-                .toString()
-                .split('.')
-                .first; // Remove seconds and milliseconds
+            effectiveTime =
+                selectedDateTime.toString().split('.').first; // Remove seconds and milliseconds
             effectiveTimeTimeStamp = selectedTimestamp;
           }
         } else {
-          if (effectiveTimeTimeStamp != null &&
-              selectedTimestamp < effectiveTimeTimeStamp!) {
+          if (effectiveTimeTimeStamp != null && selectedTimestamp < effectiveTimeTimeStamp!) {
             CustomSnackBar.displaySnackBar(
                 'Expiration Time cannot be earlier than Effective Time.');
           } else {
-            expirationTime = selectedDateTime
-                .toString()
-                .split('.')
-                .first; // Remove seconds and milliseconds
+            expirationTime =
+                selectedDateTime.toString().split('.').first; // Remove seconds and milliseconds
             expirationTimeTimeStamp = selectedTimestamp;
           }
         }
@@ -360,27 +329,20 @@ class SmartDoorBloc extends Bloc<SmartDoorEvent, SmartDoorState> {
             ).millisecondsSinceEpoch ~/
             1000; // Divide by 1000 to remove milliseconds
         if (event.isEffective) {
-          if (expirationTimeTimeStamp != null &&
-              selectedTimestamp > expirationTimeTimeStamp!) {
-            CustomSnackBar.displaySnackBar(
-                'Effective Time cannot be later than Expiration Time.');
+          if (expirationTimeTimeStamp != null && selectedTimestamp > expirationTimeTimeStamp!) {
+            CustomSnackBar.displaySnackBar('Effective Time cannot be later than Expiration Time.');
           } else {
-            effectiveTime = selectedDateTime
-                .toString()
-                .split('.')
-                .first; // Remove seconds and milliseconds
+            effectiveTime =
+                selectedDateTime.toString().split('.').first; // Remove seconds and milliseconds
             effectiveTimeTimeStamp = selectedTimestamp;
           }
         } else {
-          if (effectiveTimeTimeStamp != null &&
-              selectedTimestamp < effectiveTimeTimeStamp!) {
+          if (effectiveTimeTimeStamp != null && selectedTimestamp < effectiveTimeTimeStamp!) {
             CustomSnackBar.displaySnackBar(
                 'Expiration Time cannot be earlier than Effective Time.');
           } else {
-            expirationTime = selectedDateTime
-                .toString()
-                .split('.')
-                .first; // Remove seconds and milliseconds
+            expirationTime =
+                selectedDateTime.toString().split('.').first; // Remove seconds and milliseconds
             expirationTimeTimeStamp = selectedTimestamp;
           }
         }
@@ -389,8 +351,7 @@ class SmartDoorBloc extends Bloc<SmartDoorEvent, SmartDoorState> {
     }
   }
 
-  Future<void> savePassword(
-      SavePasswordEvent event, Emitter<SmartDoorState> emit) async {
+  Future<void> savePassword(SavePasswordEvent event, Emitter<SmartDoorState> emit) async {
     if (_validateInputs() || isSavingPassword) return;
     try {
       isSavingPassword = true;
@@ -420,8 +381,7 @@ class SmartDoorBloc extends Bloc<SmartDoorEvent, SmartDoorState> {
   }
 
   Future<void> generateAndSavePasswordTimeLimited(
-      GenerateAndSavePasswordTimeLimitEvent event,
-      Emitter<SmartDoorState> emit) async {
+      GenerateAndSavePasswordTimeLimitEvent event, Emitter<SmartDoorState> emit) async {
     if (timeLimitValidate() || isSavingPassword) return;
     try {
       isSavingPassword = true;
@@ -447,12 +407,10 @@ class SmartDoorBloc extends Bloc<SmartDoorEvent, SmartDoorState> {
     }
   }
 
-  Future<void> deletePassword(
-      DeletePasswordEvent event, Emitter<SmartDoorState> emit) async {
+  Future<void> deletePassword(DeletePasswordEvent event, Emitter<SmartDoorState> emit) async {
     try {
       emit(LoadingInitialState());
-      await DevicesAPI.deletePassword(
-              deviceId: deviceId, passwordId: event.passwordId)
+      await DevicesAPI.deletePassword(deviceId: deviceId, passwordId: event.passwordId)
           .then((value) async {
         add(InitialPasswordsPage());
       });
@@ -487,8 +445,7 @@ class SmartDoorBloc extends Bloc<SmartDoorEvent, SmartDoorState> {
     }
 
     if (repeat == true && (endTime == null || startTime == null)) {
-      CustomSnackBar.displaySnackBar(
-          'Start Time and End time and the days required ');
+      CustomSnackBar.displaySnackBar('Start Time and End time and the days required ');
       return true;
     }
     return false;

lib/features/devices/bloc/wall_sensor_bloc/wall_sensor_bloc.dart

@@ -20,9 +20,7 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
     on<WallSensorUpdatedEvent>(_wallSensorUpdated);
   }
 
-  void _fetchCeilingSensorStatus(
-      InitialEvent event,
-      Emitter<WallSensorState> emit) async {
+  void _fetchCeilingSensorStatus(InitialEvent event, Emitter<WallSensorState> emit) async {
     emit(LoadingInitialState());
     try {
       var response = await DevicesAPI.getDeviceStatus(deviceId);
@@ -41,18 +39,15 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
 
   _listenToChanges() {
     try {
-      DatabaseReference ref =
-          FirebaseDatabase.instance.ref('device-status/$deviceId');
+      DatabaseReference ref = FirebaseDatabase.instance.ref('device-status/$deviceId');
       Stream<DatabaseEvent> stream = ref.onValue;
 
       stream.listen((DatabaseEvent event) {
-        Map<dynamic, dynamic> usersMap =
-            event.snapshot.value as Map<dynamic, dynamic>;
+        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']));
+          statusList.add(StatusModel(code: element['code'], value: element['value']));
         });
 
         deviceStatus = WallSensorModel.fromJson(statusList);
@@ -61,19 +56,15 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
     } catch (_) {}
   }
 
-  _wallSensorUpdated(
-      WallSensorUpdatedEvent event, Emitter<WallSensorState> emit) {
+  _wallSensorUpdated(WallSensorUpdatedEvent event, Emitter<WallSensorState> emit) {
     emit(UpdateState(wallSensorModel: deviceStatus));
   }
 
-  void _changeIndicator(
-      ChangeIndicatorEvent event, Emitter<WallSensorState> emit) async {
+  void _changeIndicator(ChangeIndicatorEvent event, Emitter<WallSensorState> emit) async {
     emit(LoadingNewSate(wallSensorModel: deviceStatus));
     try {
       final response = await DevicesAPI.controlDevice(
-          DeviceControlModel(
-              deviceId: deviceId, code: 'indicator', value: !event.value),
-          deviceId);
+          DeviceControlModel(deviceId: deviceId, code: 'indicator', value: !event.value), deviceId);
 
       if (response['success'] ?? false) {
         deviceStatus.indicator = !event.value;
@@ -82,14 +73,11 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
     emit(UpdateState(wallSensorModel: deviceStatus));
   }
 
-  void _changeValue(
-      ChangeValueEvent event, Emitter<WallSensorState> emit) async {
+  void _changeValue(ChangeValueEvent event, Emitter<WallSensorState> emit) async {
     emit(LoadingNewSate(wallSensorModel: deviceStatus));
     try {
       final response = await DevicesAPI.controlDevice(
-          DeviceControlModel(
-              deviceId: deviceId, code: event.code, value: event.value),
-          deviceId);
+          DeviceControlModel(deviceId: deviceId, code: event.code, value: event.value), deviceId);
 
       if (response['success'] ?? false) {
         if (event.code == 'far_detection') {

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

@@ -35,8 +35,7 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
   List<ScheduleModel> listSchedule = [];
   DateTime? selectedTime = DateTime.now();
 
-  WaterHeaterBloc({required this.whId, required this.switchCode})
-      : super(WHInitialState()) {
+  WaterHeaterBloc({required this.whId, required this.switchCode}) : super(WHInitialState()) {
     on<WaterHeaterInitial>(_fetchWaterHeaterStatus);
     on<WaterHeaterSwitch>(_changeFirstSwitch);
     on<SetCounterValue>(_setCounterValue);
@@ -61,8 +60,7 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     on<WaterHeaterUpdated>(_waterHeaterUpdated);
   }
 
-  void _fetchWaterHeaterStatus(
-      WaterHeaterInitial event, Emitter<WaterHeaterState> emit) async {
+  void _fetchWaterHeaterStatus(WaterHeaterInitial event, Emitter<WaterHeaterState> emit) async {
     emit(WHLoadingState());
     try {
       var response = await DevicesAPI.getDeviceStatus(whId);
@@ -83,21 +81,18 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
 
   _listenToChanges() {
     try {
-      DatabaseReference ref =
-          FirebaseDatabase.instance.ref('device-status/$whId');
+      DatabaseReference ref = FirebaseDatabase.instance.ref('device-status/$whId');
       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>;
+        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']));
+          statusList.add(StatusModel(code: element['code'], value: element['value']));
         });
 
         deviceStatus = WHModel.fromJson(statusList);
@@ -108,14 +103,12 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     } catch (_) {}
   }
 
-  _waterHeaterUpdated(
-      WaterHeaterUpdated event, Emitter<WaterHeaterState> emit) async {
+  _waterHeaterUpdated(WaterHeaterUpdated event, Emitter<WaterHeaterState> emit) async {
     emit(WHLoadingState());
     emit(UpdateState(whModel: deviceStatus));
   }
 
-  void _changeFirstSwitch(
-      WaterHeaterSwitch event, Emitter<WaterHeaterState> emit) async {
+  void _changeFirstSwitch(WaterHeaterSwitch event, Emitter<WaterHeaterState> emit) async {
     emit(LoadingNewSate(whModel: deviceStatus));
     try {
       deviceStatus.firstSwitch = !event.whSwitch;
@@ -125,10 +118,7 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
       }
       _timer = Timer(const Duration(milliseconds: 500), () async {
         final response = await DevicesAPI.controlDevice(
-            DeviceControlModel(
-                deviceId: whId,
-                code: 'switch_1',
-                value: deviceStatus.firstSwitch),
+            DeviceControlModel(deviceId: whId, code: 'switch_1', value: deviceStatus.firstSwitch),
             whId);
 
         if (!response['success']) {
@@ -142,16 +132,13 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
 
   //=====================---------- timer ----------------------------------------
 
-  void _setCounterValue(
-      SetCounterValue event, Emitter<WaterHeaterState> emit) async {
+  void _setCounterValue(SetCounterValue event, Emitter<WaterHeaterState> emit) async {
     emit(LoadingNewSate(whModel: deviceStatus));
     int seconds = 0;
     try {
       seconds = event.duration.inSeconds;
       final response = await DevicesAPI.controlDevice(
-          DeviceControlModel(
-              deviceId: whId, code: event.deviceCode, value: seconds),
-          whId);
+          DeviceControlModel(deviceId: whId, code: event.deviceCode, value: seconds), whId);
 
       if (response['success'] ?? false) {
         if (event.deviceCode == 'countdown_1') {
@@ -173,8 +160,7 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     }
   }
 
-  void _getCounterValue(
-      GetCounterEvent event, Emitter<WaterHeaterState> emit) async {
+  void _getCounterValue(GetCounterEvent event, Emitter<WaterHeaterState> emit) async {
     emit(WHLoadingState());
     try {
       var response = await DevicesAPI.getDeviceStatus(whId);
@@ -264,8 +250,7 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
         deviceId: whId,
       );
       List<dynamic> jsonData = response;
-      listSchedule =
-          jsonData.map((item) => ScheduleModel.fromJson(item)).toList();
+      listSchedule = jsonData.map((item) => ScheduleModel.fromJson(item)).toList();
       emit(WHInitialState());
     } on DioException catch (e) {
       final errorData = e.response!.data;
@@ -276,13 +261,12 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
 
   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<WaterHeaterState> emit) async {
+  Future toggleChange(ToggleScheduleEvent event, Emitter<WaterHeaterState> emit) async {
     try {
       emit(WHLoadingState());
       final response = await DevicesAPI.changeSchedule(
@@ -300,8 +284,7 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     }
   }
 
-  Future deleteSchedule(
-      DeleteScheduleEvent event, Emitter<WaterHeaterState> emit) async {
+  Future deleteSchedule(DeleteScheduleEvent event, Emitter<WaterHeaterState> emit) async {
     try {
       emit(WHLoadingState());
       final response = await DevicesAPI.deleteSchedule(
@@ -320,8 +303,7 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     }
   }
 
-  void _toggleCreateCirculate(
-      ToggleCreateCirculate event, Emitter<WaterHeaterState> emit) {
+  void _toggleCreateCirculate(ToggleCreateCirculate event, Emitter<WaterHeaterState> emit) {
     emit(WHLoadingState());
     createCirculate = !createCirculate;
     selectedDays.clear();
@@ -329,15 +311,13 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     emit(UpdateCreateScheduleState(createCirculate));
   }
 
-  void toggleSelectedIndex(
-      ToggleSelectedEvent event, Emitter<WaterHeaterState> emit) {
+  void toggleSelectedIndex(ToggleSelectedEvent event, Emitter<WaterHeaterState> emit) {
     emit(WHLoadingState());
     selectedTabIndex = event.index;
     emit(ChangeSlidingSegmentState(value: selectedTabIndex));
   }
 
-  void toggleCreateSchedule(
-      ToggleCreateScheduleEvent event, Emitter<WaterHeaterState> emit) {
+  void toggleCreateSchedule(ToggleCreateScheduleEvent event, Emitter<WaterHeaterState> emit) {
     emit(WHLoadingState());
     createSchedule = !createSchedule;
     selectedDays.clear();
@@ -386,8 +366,8 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
   List<GroupWHModel> groupWaterHeaterList = [];
   bool allSwitchesOn = true;
 
-  void _changeFirstWizardSwitch(ChangeFirstWizardSwitchStatusEvent event,
-      Emitter<WaterHeaterState> emit) async {
+  void _changeFirstWizardSwitch(
+      ChangeFirstWizardSwitchStatusEvent event, Emitter<WaterHeaterState> emit) async {
     emit(LoadingNewSate(whModel: deviceStatus));
     try {
       bool allSwitchesValue = true;
@@ -399,8 +379,7 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
           allSwitchesValue = false;
         }
       });
-      emit(UpdateGroupState(
-          twoGangList: groupWaterHeaterList, allSwitches: allSwitchesValue));
+      emit(UpdateGroupState(twoGangList: groupWaterHeaterList, allSwitches: allSwitchesValue));
 
       final response = await DevicesAPI.deviceBatchController(
         code: 'switch_1',
@@ -415,8 +394,7 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     }
   }
 
-  void _fetchWHWizardStatus(
-      InitialWizardEvent event, Emitter<WaterHeaterState> emit) async {
+  void _fetchWHWizardStatus(InitialWizardEvent event, Emitter<WaterHeaterState> emit) async {
     emit(WHLoadingState());
     try {
       devicesList = [];
@@ -426,8 +404,7 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
           HomeCubit.getInstance().selectedSpace?.id ?? '', 'WH');
 
       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));
@@ -449,27 +426,23 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
           return true;
         });
       }
-      emit(UpdateGroupState(
-          twoGangList: groupWaterHeaterList, allSwitches: allSwitchesOn));
+      emit(UpdateGroupState(twoGangList: groupWaterHeaterList, allSwitches: allSwitchesOn));
     } catch (e) {
       // emit(FailedState(error: e.toString()));
       return;
     }
   }
 
-  void _groupAllOn(
-      GroupAllOnEvent event, Emitter<WaterHeaterState> emit) async {
+  void _groupAllOn(GroupAllOnEvent event, Emitter<WaterHeaterState> emit) async {
     emit(LoadingNewSate(whModel: deviceStatus));
     try {
       for (int i = 0; i < groupWaterHeaterList.length; i++) {
         groupWaterHeaterList[i].firstSwitch = true;
       }
 
-      emit(UpdateGroupState(
-          twoGangList: groupWaterHeaterList, allSwitches: true));
+      emit(UpdateGroupState(twoGangList: groupWaterHeaterList, allSwitches: true));
 
-      List<String> allDeviceIds =
-          groupWaterHeaterList.map((device) => device.deviceId).toList();
+      List<String> allDeviceIds = groupWaterHeaterList.map((device) => device.deviceId).toList();
 
       final response = await DevicesAPI.deviceBatchController(
         code: 'switch_1',
@@ -487,18 +460,15 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     }
   }
 
-  void _groupAllOff(
-      GroupAllOffEvent event, Emitter<WaterHeaterState> emit) async {
+  void _groupAllOff(GroupAllOffEvent event, Emitter<WaterHeaterState> emit) async {
     emit(LoadingNewSate(whModel: deviceStatus));
     try {
       for (int i = 0; i < groupWaterHeaterList.length; i++) {
         groupWaterHeaterList[i].firstSwitch = false;
       }
-      emit(UpdateGroupState(
-          twoGangList: groupWaterHeaterList, allSwitches: false));
+      emit(UpdateGroupState(twoGangList: groupWaterHeaterList, allSwitches: false));
 
-      List<String> allDeviceIds =
-          groupWaterHeaterList.map((device) => device.deviceId).toList();
+      List<String> allDeviceIds = groupWaterHeaterList.map((device) => device.deviceId).toList();
 
       final response = await DevicesAPI.deviceBatchController(
         code: 'switch_1',

lib/features/devices/view/widgets/power_clamp/power_clamp_card.dart

@@ -22,6 +22,8 @@ class PowerClampCard extends StatelessWidget {
   final String? totalFactor;
   final Widget? dateSwitcher;
   final String? formattedDate;
+  final String? phaseType;
+
   final String? energyConsumption;
   final Function()? selectDateEvent;
   final List<EnergyData>? chartData;
@@ -37,6 +39,7 @@ class PowerClampCard extends StatelessWidget {
     this.totalCurrentGeneral,
     this.totalFrequencyGeneral,
     this.totalVoltage,
+    this.phaseType,
     this.totalActive,
     this.totalFrequency,
     this.totalFactor,
@@ -53,8 +56,7 @@ class PowerClampCard extends StatelessWidget {
   Widget build(BuildContext context) {
     return DefaultContainer(
       child: Padding(
-        padding:
-            const EdgeInsets.only(left: 10, right: 10, top: 10, bottom: 10),
+        padding: const EdgeInsets.only(left: 5, right: 5, top: 10, bottom: 10),
         child: Column(
             crossAxisAlignment: CrossAxisAlignment.stretch,
             mainAxisAlignment: MainAxisAlignment.center,
@@ -116,7 +118,7 @@ class PowerClampCard extends StatelessWidget {
                             PowerClampInfoCard(
                               iconPath: Assets.voltageIcon,
                               title: 'Voltage',
-                              value: totalVoltage!,
+                              value: '${double.parse(totalVoltage!) / 10}',
                               unit: ' V',
                             ),
                             PowerClampInfoCard(
@@ -152,13 +154,15 @@ class PowerClampCard extends StatelessWidget {
                   Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
-                      const BodyMedium(
-                        text: 'Total consumption',
+                      BodyMedium(
+                        text: isGeneral == true
+                            ? 'Total consumption'
+                            : phaseType!,
                         fontSize: 12,
                         fontWeight: FontWeight.w700,
                       ),
                       Text(
-                        dateTimeSelected !,
+                        dateTimeSelected!,
                         style: const TextStyle(
                             fontSize: 8, fontWeight: FontWeight.w400),
                       ),

lib/features/devices/view/widgets/power_clamp/power_clamp_page.dart

@@ -55,7 +55,6 @@ class _PowerClampPageState extends State<PowerClampPage> {
       child: BlocProvider(
         create: (context) => PowerClampBloc(PCId: widget.device?.uuid ?? '')
           ..add(const PowerClampInitial()),
-        // ..add(const ReportLogsInitial(code: 'VoltageA')),
         child: BlocBuilder<PowerClampBloc, PowerClampState>(
           builder: (context, state) {
             final blocProvider = context.read<PowerClampBloc>();
@@ -88,6 +87,7 @@ class _PowerClampPageState extends State<PowerClampPage> {
                     },
                     child: PageView(controller: _pageController, children: [
                       _buildPowerClampCard(
+                        phaseType: '',
                         title: 'Total Energy \nConsumption',
                         phase: model.status.general,
                         isGeneral: true,
@@ -96,18 +96,21 @@ class _PowerClampPageState extends State<PowerClampPage> {
                       ),
                       _buildPowerClampCard(
                         title: 'Phase A Energy \nConsumption',
+                        phaseType: 'Phase A consumption',
                         phase: model.status.phaseA,
                         chartData: chartData,
                         blocProvider: blocProvider,
                       ),
                       _buildPowerClampCard(
                         title: 'Phase B Energy \nConsumption',
+                        phaseType: 'Phase B consumption',
                         phase: model.status.phaseB,
                         chartData: chartData,
                         blocProvider: blocProvider,
                       ),
                       _buildPowerClampCard(
                         title: 'Phase C Energy \nConsumption',
+                        phaseType: 'Phase C consumption',
                         phase: model.status.phaseC,
                         chartData: chartData,
                         blocProvider: blocProvider,
@@ -154,6 +157,7 @@ class _PowerClampPageState extends State<PowerClampPage> {
       List<EnergyData> chartData, PowerClampBloc blocProvider) {
     return [
       _buildPowerClampCard(
+        phaseType: '',
         title: 'Total Energy \nConsumption',
         phase: model.status.general,
         isGeneral: true,
@@ -161,18 +165,21 @@ class _PowerClampPageState extends State<PowerClampPage> {
         blocProvider: blocProvider,
       ),
       _buildPowerClampCard(
+        phaseType: 'Phase A consumption',
         title: 'Phase A Energy \nConsumption',
         phase: model.status.phaseA,
         chartData: chartData,
         blocProvider: blocProvider,
       ),
       _buildPowerClampCard(
+        phaseType: 'Phase B consumption',
         title: 'Phase B Energy \nConsumption',
         phase: model.status.phaseB,
         chartData: chartData,
         blocProvider: blocProvider,
       ),
       _buildPowerClampCard(
+        phaseType: 'Phase C consumption',
         title: 'Phase C Energy \nConsumption',
         phase: model.status.phaseC,
         chartData: chartData,
@@ -183,15 +190,18 @@ class _PowerClampPageState extends State<PowerClampPage> {
 
   Widget _buildPowerClampCard({
     required String title,
+    required String phaseType,
     required Phase phase,
     bool isGeneral = false,
     required List<EnergyData> chartData,
     required PowerClampBloc blocProvider,
   }) {
     return PowerClampCard(
-      dateTimeSelected:blocProvider.formattedDate,
+      dateTimeSelected:
+          '${blocProvider.dateTime!.day}/${blocProvider.dateTime!.month}/${blocProvider.dateTime!.year} ${blocProvider.endChartDate}',
       energyConsumption: _getValueOrNA(phase.dataPoints, isGeneral ? 0 : 5),
       title: title,
+      phaseType: phaseType,
       isGeneral: isGeneral,
       dateSwitcher: blocProvider.dateSwitcher(),
       formattedDate: blocProvider.formattedDate,

lib/features/devices/view/widgets/power_clamp/power_info_card.dart

@@ -21,53 +21,50 @@ class PowerClampInfoCard extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Expanded(
-      child: Padding(
-        padding: const EdgeInsets.all(5.0),
-        child: DefaultContainer(
-          height: 55,
-          color: ColorsManager.grayBox,
-          child: Row(
-            crossAxisAlignment: CrossAxisAlignment.center,
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              Expanded(
-                child: SvgPicture.asset(
-                  iconPath,
-                  fit: BoxFit.fill,
-                ),
+      child: DefaultContainer(
+        height: 55,
+        color: ColorsManager.grayBox,
+        child: Row(
+          crossAxisAlignment: CrossAxisAlignment.center,
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Expanded(
+              child: SvgPicture.asset(
+                iconPath,
+                fit: BoxFit.contain,
               ),
-              Expanded(
-                flex: 3,
-                child: Column(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  crossAxisAlignment: CrossAxisAlignment.center,
-                  children: [
-                    BodyMedium(
-                      fontWeight: FontWeight.w400,
-                      fontSize: 8,
-                      text: title,
-                    ),
-                    Row(
-                      mainAxisAlignment: MainAxisAlignment.center,
-                      crossAxisAlignment: CrossAxisAlignment.center,
-                      children: [
-                        BodyMedium(
-                          fontWeight: FontWeight.w700,
-                          fontSize: 15,
-                          text: value,
-                        ),
-                        BodyMedium(
-                          fontWeight: FontWeight.w700,
-                          fontSize: 8,
-                          text: unit,
-                        ),
-                      ],
-                    ),
-                  ],
-                ),
-              )
-            ],
-          ),
+            ),
+            Expanded(
+              flex: 3,
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.center,
+                crossAxisAlignment: CrossAxisAlignment.center,
+                children: [
+                  BodyMedium(
+                    fontWeight: FontWeight.w400,
+                    fontSize: 8,
+                    text: title,
+                  ),
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    crossAxisAlignment: CrossAxisAlignment.center,
+                    children: [
+                      BodyMedium(
+                        fontWeight: FontWeight.w700,
+                        fontSize: 15,
+                        text: value,
+                      ),
+                      BodyMedium(
+                        fontWeight: FontWeight.w700,
+                        fontSize: 8,
+                        text: unit,
+                      ),
+                    ],
+                  ),
+                ],
+              ),
+            )
+          ],
         ),
       ),
     );

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

@@ -67,21 +67,40 @@ class _RoomPageState extends State<RoomPage> {
               ),
             ),
           ),
-        Expanded(
-          child: GridView.builder(
-            gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
-              crossAxisCount: 2,
-              crossAxisSpacing: 10,
-              mainAxisSpacing: 10,
-              childAspectRatio: 1.5,
-            ),
-            padding: const EdgeInsets.only(top: 10),
-            itemCount: _filteredDevices.length,
-            itemBuilder: (context, index) {
-              return RoomPageSwitch(device: _filteredDevices[index]);
-            },
-          ),
-        ),
+        _filteredDevices.isNotEmpty
+            ? Expanded(
+                child: GridView.builder(
+                  gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
+                    crossAxisCount: 2,
+                    crossAxisSpacing: 10,
+                    mainAxisSpacing: 10,
+                    childAspectRatio: 1.5,
+                  ),
+                  padding: const EdgeInsets.only(top: 10),
+                  itemCount: _filteredDevices.length,
+                  itemBuilder: (context, index) {
+                    return RoomPageSwitch(device: _filteredDevices[index]);
+                  },
+                ),
+              )
+            : widget.room.devices!.isNotEmpty
+                ? const Expanded(
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.stretch,
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      children: [
+                        Center(
+                            child: Text(
+                          'No Results Found',
+                          style: TextStyle(
+                              color: ColorsManager.grayColor,
+                              fontSize: 14,
+                              fontWeight: FontWeight.w400),
+                        )),
+                      ],
+                    ),
+                  )
+                : const SizedBox(),
       ],
     );
   }

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

@@ -22,7 +22,6 @@ class RoomsSlider extends StatelessWidget {
             onPageChanged: (index) {
               HomeCubit.getInstance().roomSliderPageChanged(index);
             },
-
             children: [
               Padding(
                 padding: const EdgeInsets.symmetric(horizontal: 15),
@@ -45,15 +44,20 @@ class RoomsSlider extends StatelessWidget {
                         (room) => InkWell(
                           onTap: () {
                             HomeCubit.getInstance().roomSliderPageChanged(
-                                HomeCubit.getInstance().selectedSpace!.rooms!.indexOf(room));
+                                HomeCubit.getInstance()
+                                    .selectedSpace!
+                                    .rooms!
+                                    .indexOf(room));
                           },
                           child: TitleMedium(
                             text: room.name!,
                             style: context.titleMedium.copyWith(
                               fontSize: 25,
-                              color: HomeCubit.getInstance().selectedRoom == room
-                                  ? ColorsManager.textPrimaryColor
-                                  : ColorsManager.textPrimaryColor.withOpacity(.2),
+                              color:
+                                  HomeCubit.getInstance().selectedRoom == room
+                                      ? ColorsManager.textPrimaryColor
+                                      : ColorsManager.textPrimaryColor
+                                          .withOpacity(.2),
                             ),
                           ),
                         ),

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

@@ -35,7 +35,7 @@ class WizardPage extends StatelessWidget {
 
     return StatefulBuilder(
       builder: (context, setState) {
-        return ListView(
+        return Column(
           children: [
             if (groupsList.isNotEmpty)
               TextFormField(
@@ -64,129 +64,170 @@ class WizardPage extends StatelessWidget {
                   ),
                 ),
               ),
-            GridView.builder(
-              gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
-                crossAxisCount: 2,
-                crossAxisSpacing: 10,
-                mainAxisSpacing: 10,
-                childAspectRatio: 1.5,
-              ),
-              padding: const EdgeInsets.only(top: 10),
-              shrinkWrap: true,
-              physics: const NeverScrollableScrollPhysics(),
-              itemCount: _filteredGroups.length,
-              itemBuilder: (_, index) {
-                return GestureDetector(
-                  onTap: () {
-                    if (_filteredGroups[index].name == 'AC') {
-                      Navigator.push(
-                          context,
-                          PageRouteBuilder(
-                              pageBuilder: (context, animation1, animation2) =>
-                                  const ACsView()));
-                    }
-                    if (_filteredGroups[index].name == '3G') {
-                      Navigator.push(
-                          context,
-                          PageRouteBuilder(
-                              pageBuilder: (context, animation1, animation2) =>
-                                  const ThreeGangWizard()));
-                    }
-                    if (_filteredGroups[index].name == '2G') {
-                      Navigator.push(
-                          context,
-                          PageRouteBuilder(
-                              pageBuilder: (context, animation1, animation2) =>
-                                  const TwoGangWizard()));
-                    }
-                    if (_filteredGroups[index].name == '1G') {
-                      Navigator.push(
-                          context,
-                          PageRouteBuilder(
-                              pageBuilder: (context, animation1, animation2) =>
-                                  const OneGangWizard()));
-                    }
-                    if (_filteredGroups[index].name == 'WH') {
-                      Navigator.push(
-                          context,
-                          PageRouteBuilder(
-                              pageBuilder: (context, animation1, animation2) =>
-                                  const WHWizard()));
-                    }
-
-                    if (_filteredGroups[index].name == '1GT') {
-                      Navigator.push(
-                          context,
-                          PageRouteBuilder(
-                              pageBuilder: (context, animation1, animation2) =>
-                                  const OneTouchWizard()));
-                    }
-
-                    if (_filteredGroups[index].name == '2GT') {
-                      Navigator.push(
-                          context,
-                          PageRouteBuilder(
-                              pageBuilder: (context, animation1, animation2) =>
-                                  const TwoTouchWizard()));
-                    }
-
-                    if (_filteredGroups[index].name == '3GT') {
-                      Navigator.push(
-                          context,
-                          PageRouteBuilder(
-                              pageBuilder: (context, animation1, animation2) =>
-                                  const ThreeTouchWizard()));
-                    }
-
-                    if (_filteredGroups[index].name == 'GD') {
-                      Navigator.push(
-                          context,
-                          PageRouteBuilder(
-                              pageBuilder: (context, animation1, animation2) =>
-                                  const GarageWizard()));
-                    }
-                    if (_filteredGroups[index].name == 'CUR') {
-                      Navigator.push(
-                          context,
-                          PageRouteBuilder(
-                              pageBuilder: (context, animation1, animation2) =>
-                                  const CurtainsWizard()));
-                    }
-                  },
-                  child: DefaultContainer(
-                    padding: const EdgeInsets.all(15),
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            const SizedBox(
+              height: 10,
+            ),
+            _filteredGroups.isNotEmpty
+                ? Expanded(
+                    child: ListView(
+                      shrinkWrap: true,
                       children: [
-                        Row(
-                          crossAxisAlignment: CrossAxisAlignment.start,
-                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                          children: [
-                            SvgPicture.asset(
-                              _filteredGroups[index].icon!,
-                              fit: BoxFit.contain,
-                            ),
-                          ],
-                        ),
-                        FittedBox(
-                          fit: BoxFit.scaleDown,
-                          child: BodyLarge(
-                            text: _filteredGroups[index].name!,
-                            style: context.bodyLarge.copyWith(
-                              fontWeight: FontWeight.bold,
-                              height: 0,
-                              fontSize: 20,
-                              color: Colors.grey,
-                            ),
+                        GridView.builder(
+                          gridDelegate:
+                              const SliverGridDelegateWithFixedCrossAxisCount(
+                            crossAxisCount: 2,
+                            crossAxisSpacing: 10,
+                            mainAxisSpacing: 10,
+                            childAspectRatio: 1.5,
                           ),
-                        ),
+                          padding: const EdgeInsets.only(top: 10),
+                          shrinkWrap: true,
+                          physics: const NeverScrollableScrollPhysics(),
+                          itemCount: _filteredGroups.length,
+                          itemBuilder: (_, index) {
+                            return GestureDetector(
+                              onTap: () {
+                                if (_filteredGroups[index].name == 'AC') {
+                                  Navigator.push(
+                                      context,
+                                      PageRouteBuilder(
+                                          pageBuilder: (context, animation1,
+                                                  animation2) =>
+                                              const ACsView()));
+                                }
+                                if (_filteredGroups[index].name == '3G') {
+                                  Navigator.push(
+                                      context,
+                                      PageRouteBuilder(
+                                          pageBuilder: (context, animation1,
+                                                  animation2) =>
+                                              const ThreeGangWizard()));
+                                }
+                                if (_filteredGroups[index].name == '2G') {
+                                  Navigator.push(
+                                      context,
+                                      PageRouteBuilder(
+                                          pageBuilder: (context, animation1,
+                                                  animation2) =>
+                                              const TwoGangWizard()));
+                                }
+                                if (_filteredGroups[index].name == '1G') {
+                                  Navigator.push(
+                                      context,
+                                      PageRouteBuilder(
+                                          pageBuilder: (context, animation1,
+                                                  animation2) =>
+                                              const OneGangWizard()));
+                                }
+                                if (_filteredGroups[index].name == 'WH') {
+                                  Navigator.push(
+                                      context,
+                                      PageRouteBuilder(
+                                          pageBuilder: (context, animation1,
+                                                  animation2) =>
+                                              const WHWizard()));
+                                }
+
+                                if (_filteredGroups[index].name == '1GT') {
+                                  Navigator.push(
+                                      context,
+                                      PageRouteBuilder(
+                                          pageBuilder: (context, animation1,
+                                                  animation2) =>
+                                              const OneTouchWizard()));
+                                }
+
+                                if (_filteredGroups[index].name == '2GT') {
+                                  Navigator.push(
+                                      context,
+                                      PageRouteBuilder(
+                                          pageBuilder: (context, animation1,
+                                                  animation2) =>
+                                              const TwoTouchWizard()));
+                                }
+
+                                if (_filteredGroups[index].name == '3GT') {
+                                  Navigator.push(
+                                      context,
+                                      PageRouteBuilder(
+                                          pageBuilder: (context, animation1,
+                                                  animation2) =>
+                                              const ThreeTouchWizard()));
+                                }
+
+                                if (_filteredGroups[index].name == 'GD') {
+                                  Navigator.push(
+                                      context,
+                                      PageRouteBuilder(
+                                          pageBuilder: (context, animation1,
+                                                  animation2) =>
+                                              const GarageWizard()));
+                                }
+                                if (_filteredGroups[index].name == 'CUR') {
+                                  Navigator.push(
+                                      context,
+                                      PageRouteBuilder(
+                                          pageBuilder: (context, animation1,
+                                                  animation2) =>
+                                              const CurtainsWizard()));
+                                }
+                              },
+                              child: DefaultContainer(
+                                padding: const EdgeInsets.all(15),
+                                child: Column(
+                                  crossAxisAlignment: CrossAxisAlignment.start,
+                                  mainAxisAlignment:
+                                      MainAxisAlignment.spaceBetween,
+                                  children: [
+                                    Row(
+                                      crossAxisAlignment:
+                                          CrossAxisAlignment.start,
+                                      mainAxisAlignment:
+                                          MainAxisAlignment.spaceBetween,
+                                      children: [
+                                        SvgPicture.asset(
+                                          _filteredGroups[index].icon!,
+                                          fit: BoxFit.contain,
+                                        ),
+                                      ],
+                                    ),
+                                    FittedBox(
+                                      fit: BoxFit.scaleDown,
+                                      child: BodyLarge(
+                                        text: _filteredGroups[index].name!,
+                                        style: context.bodyLarge.copyWith(
+                                          fontWeight: FontWeight.bold,
+                                          height: 0,
+                                          fontSize: 20,
+                                          color: Colors.grey,
+                                        ),
+                                      ),
+                                    ),
+                                  ],
+                                ),
+                              ),
+                            );
+                          },
+                        )
+                      ],
+                    ),
+                  )
+                : const Expanded(
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.stretch,
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      children: [
+                        Center(
+                            child: Text(
+                          'No Results Found',
+                          style: TextStyle(
+                              color: ColorsManager.grayColor,
+                              fontSize: 14,
+                              fontWeight: FontWeight.w400),
+                        )),
                       ],
                     ),
                   ),
-                );
-              },
-            ),
           ],
         );
       },

lib/features/scene/view/scene_auto_settings.dart

@@ -3,8 +3,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/scene/bloc/create_scene/create_scene_bloc.dart';
 import 'package:syncrow_app/features/scene/enum/create_scene_enum.dart';
-import 'package:syncrow_app/features/scene/view/scene_tasks_view.dart';
 import 'package:syncrow_app/features/scene/widgets/alert_dialogs/icons_dialog.dart';
+import 'package:syncrow_app/features/scene/widgets/delete_routine_b.dart';
 import 'package:syncrow_app/features/scene/widgets/effective_period_setting/effective_period_bottom_sheet.dart';
 import 'package:syncrow_app/features/scene/widgets/scene_list_tile.dart';
 import 'package:syncrow_app/features/shared_widgets/default_container.dart';
@@ -18,10 +18,12 @@ class SceneAutoSettings extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final sceneSettings = ModalRoute.of(context)!.settings.arguments as Map<String, dynamic>? ?? {};
+    final sceneSettings =
+        ModalRoute.of(context)!.settings.arguments as Map<String, dynamic>? ??
+            {};
     final sceneId = sceneSettings['sceneId'] as String? ?? '';
-    final isAutomation =
-        context.read<CreateSceneBloc>().sceneType == CreateSceneEnum.deviceStatusChanges;
+    final isAutomation = context.read<CreateSceneBloc>().sceneType ==
+        CreateSceneEnum.deviceStatusChanges;
     final sceneName = sceneSettings['sceneName'] as String? ?? '';
     bool showInDevice = context.read<CreateSceneBloc>().showInDeviceScreen;
     String selectedIcon = '';
@@ -35,7 +37,8 @@ class SceneAutoSettings extends StatelessWidget {
             icon: const Icon(
               Icons.arrow_back_ios,
             )),
-        child: BlocBuilder<CreateSceneBloc, CreateSceneState>(builder: (context, state) {
+        child: BlocBuilder<CreateSceneBloc, CreateSceneState>(
+            builder: (context, state) {
           if (state is AddSceneTask) {
             showInDevice = state.showInDevice ?? false;
           }
@@ -47,7 +50,8 @@ class SceneAutoSettings extends StatelessWidget {
                 if (!isAutomation)
                   DefaultContainer(
                       child: Padding(
-                    padding: const EdgeInsets.only(top: 10, left: 10, right: 10, bottom: 10),
+                    padding: const EdgeInsets.only(
+                        top: 10, left: 10, right: 10, bottom: 10),
                     child: Column(
                       children: [
                         InkWell(
@@ -55,20 +59,24 @@ class SceneAutoSettings extends StatelessWidget {
                             showDialog(
                               context: context,
                               builder: (context) {
-                                BlocProvider.of<CreateSceneBloc>(context).add(SceneIconEvent());
+                                BlocProvider.of<CreateSceneBloc>(context)
+                                    .add(SceneIconEvent());
                                 return IconsDialog(
                                   widgetList: Container(
-                                    height: MediaQuery.sizeOf(context).height * 0.4,
+                                    height:
+                                        MediaQuery.sizeOf(context).height * 0.4,
                                     width: MediaQuery.sizeOf(context).width,
                                     padding: const EdgeInsets.all(24),
-                                    child: BlocBuilder<CreateSceneBloc, CreateSceneState>(
+                                    child: BlocBuilder<CreateSceneBloc,
+                                        CreateSceneState>(
                                       builder: (context, state) {
                                         if (state is CreateSceneLoading) {
                                           return const Center(
                                             child: SizedBox(
                                                 height: 50,
                                                 width: 50,
-                                                child: CircularProgressIndicator()),
+                                                child:
+                                                    CircularProgressIndicator()),
                                           );
                                         } else if (state is AddSceneTask) {
                                           return GridView.builder(
@@ -78,25 +86,35 @@ class SceneAutoSettings extends StatelessWidget {
                                               crossAxisSpacing: 12,
                                               mainAxisSpacing: 12,
                                             ),
-                                            itemCount: state.iconModels?.length ?? 0,
+                                            itemCount:
+                                                state.iconModels?.length ?? 0,
                                             itemBuilder: (context, index) {
-                                              final iconModel = state.iconModels![index];
+                                              final iconModel =
+                                                  state.iconModels![index];
                                               return InkWell(
                                                 onTap: () {
-                                                  BlocProvider.of<CreateSceneBloc>(context).add(
-                                                      IconSelected(
-                                                          iconId: iconModel.uuid,
-                                                          confirmSelection: false));
+                                                  BlocProvider.of<
+                                                              CreateSceneBloc>(
+                                                          context)
+                                                      .add(IconSelected(
+                                                          iconId:
+                                                              iconModel.uuid,
+                                                          confirmSelection:
+                                                              false));
                                                   selectedIcon = iconModel.uuid;
                                                 },
                                                 child: ClipOval(
                                                   child: Container(
-                                                    padding: const EdgeInsets.all(1),
+                                                    padding:
+                                                        const EdgeInsets.all(1),
                                                     decoration: BoxDecoration(
                                                       border: Border.all(
-                                                        color: state.selectedIcon == iconModel.uuid
-                                                            ? ColorsManager.primaryColorWithOpacity
-                                                            : Colors.transparent,
+                                                        color: state.selectedIcon ==
+                                                                iconModel.uuid
+                                                            ? ColorsManager
+                                                                .primaryColorWithOpacity
+                                                            : Colors
+                                                                .transparent,
                                                         width: 2,
                                                       ),
                                                       shape: BoxShape.circle,
@@ -123,8 +141,10 @@ class SceneAutoSettings extends StatelessWidget {
                                     Navigator.of(context).pop();
                                   },
                                   confirmTab: () {
-                                    BlocProvider.of<CreateSceneBloc>(context).add(
-                                        IconSelected(iconId: selectedIcon, confirmSelection: true));
+                                    BlocProvider.of<CreateSceneBloc>(context)
+                                        .add(IconSelected(
+                                            iconId: selectedIcon,
+                                            confirmSelection: true));
                                     Navigator.of(context).pop();
                                   },
                                   title: 'Icons',
@@ -171,7 +191,8 @@ class SceneAutoSettings extends StatelessWidget {
                                     value: showInDevice,
                                     onChanged: (value) {
                                       BlocProvider.of<CreateSceneBloc>(context)
-                                          .add(ShowOnDeviceClicked(value: value));
+                                          .add(ShowOnDeviceClicked(
+                                              value: value));
                                     },
                                     applyTheme: true,
                                   ),
@@ -219,7 +240,8 @@ class SceneAutoSettings extends StatelessWidget {
                           visible: isAutomation,
                           child: SceneListTile(
                             titleString: "Effective Period",
-                            trailingWidget: const Icon(Icons.arrow_forward_ios_rounded),
+                            trailingWidget:
+                                const Icon(Icons.arrow_forward_ios_rounded),
                             onPressed: () {
                               context.customBottomSheet(
                                 child: const EffectPeriodBottomSheetContent(),
@@ -236,19 +258,29 @@ class SceneAutoSettings extends StatelessWidget {
                             ),
                           ),
                         ),
-                        Visibility(
+                      ],
+                    ),
+                  ),
+                const SizedBox(
+                  height: 15,
+                ),
+                Row(
+                  crossAxisAlignment: CrossAxisAlignment.center,
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    SizedBox(
+                      child: Center(
+                        child: Visibility(
                           visible: sceneName.isNotEmpty,
-                          child: DeleteBottomSheetContent(
+                          child: DeleteRoutineButton(
                             isAutomation: isAutomation,
                             sceneId: sceneId,
                           ),
                         ),
-                        const SizedBox(
-                          height: 16,
-                        ),
-                      ],
+                      ),
                     ),
-                  ),
+                  ],
+                ),
               ],
             ),
           );

lib/features/scene/view/scene_tasks_view.dart

@@ -7,10 +7,10 @@ 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/enum/create_scene_enum.dart';
 import 'package:syncrow_app/features/scene/model/scene_settings_route_arguments.dart';
+import 'package:syncrow_app/features/scene/widgets/alert_dialogs/delete_routine_dialog.dart';
 import 'package:syncrow_app/features/scene/widgets/create_scene_save_button.dart';
 import 'package:syncrow_app/features/scene/widgets/if_then_containers/if_container.dart';
 import 'package:syncrow_app/features/scene/widgets/if_then_containers/then_container.dart';
-import 'package:syncrow_app/features/scene/widgets/scene_list_tile.dart';
 import 'package:syncrow_app/features/shared_widgets/default_scaffold.dart';
 import 'package:syncrow_app/generated/assets.dart';
 import 'package:syncrow_app/navigation/navigate_to_route.dart';
@@ -117,49 +117,3 @@ class SceneTasksView extends StatelessWidget {
     );
   }
 }
-
-class DeleteBottomSheetContent extends StatelessWidget {
-  const DeleteBottomSheetContent(
-      {super.key, required this.sceneId, required this.isAutomation});
-
-  final String sceneId;
-  final bool isAutomation;
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocConsumer<CreateSceneBloc, CreateSceneState>(
-      listener: (context, state) {
-        if (state is DeleteSceneSuccess) {
-          if (state.success) {
-            navigateToRoute(context, Routes.homeRoute);
-            BlocProvider.of<SceneBloc>(context)
-                .add(LoadScenes(HomeCubit.getInstance().selectedSpace!.id!));
-            BlocProvider.of<SceneBloc>(context).add(
-                LoadAutomation(HomeCubit.getInstance().selectedSpace!.id!));
-          }
-        }
-      },
-      builder: (context, state) {
-        return SceneListTile(
-          onPressed: () {
-            context.read<CreateSceneBloc>().add(DeleteSceneEvent(
-                  sceneId: sceneId,
-                  unitUuid: HomeCubit.getInstance().selectedSpace!.id!,
-                ));
-          },
-          padding: const EdgeInsets.symmetric(horizontal: 8),
-          titleString: isAutomation
-              ? StringsManager.deleteAutomation
-              : StringsManager.deleteScene,
-          leadingWidget: (state is DeleteSceneLoading)
-              ? const SizedBox(
-                  height: 24, width: 24, child: CircularProgressIndicator())
-              : SvgPicture.asset(
-                  Assets.assetsDeleteIcon,
-                  color: ColorsManager.red,
-                ),
-        );
-      },
-    );
-  }
-}

lib/features/scene/widgets/alert_dialogs/delete_routine_dialog.dart

@@ -0,0 +1,114 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_app/features/shared_widgets/text_widgets/body_large.dart';
+import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
+
+class DeleteRoutineDialog extends StatelessWidget {
+  final Function()? cancelTab;
+  final Function()? confirmTab;
+
+  const DeleteRoutineDialog({
+    super.key,
+    required this.cancelTab,
+    required this.confirmTab,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return AlertDialog(
+      contentPadding: EdgeInsets.zero,
+      content: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: <Widget>[
+          const SizedBox(
+            height: 10,
+          ),
+          const BodyLarge(
+            text: 'Delete Routine',
+            fontWeight: FontWeight.w700,
+            fontColor: ColorsManager.red,
+            fontSize: 16,
+          ),
+          const Padding(
+            padding: EdgeInsets.only(left: 15, right: 15),
+            child: Divider(
+              color: ColorsManager.textGray,
+            ),
+          ),
+          const Padding(
+            padding: EdgeInsets.only(left: 20, right: 20, top: 20, bottom: 20),
+            child: Column(
+              children: [
+                Center(child: const Text('Are you sure you want to ')),
+                Center(child: const Text('delete the routine?'))
+              ],
+            ),
+          ),
+          Row(
+            children: [
+              Expanded(
+                child: Container(
+                  decoration: const BoxDecoration(
+                      border: Border(
+                    right: BorderSide(
+                      color: ColorsManager.textGray,
+                      width: 0.5,
+                    ),
+                    top: BorderSide(
+                      color: ColorsManager.textGray,
+                      width: 1.0,
+                    ),
+                  )),
+                  child: SizedBox(
+                    child: InkWell(
+                      onTap: cancelTab,
+                      child: const Padding(
+                        padding: EdgeInsets.all(15),
+                        child: Center(
+                          child: Text(
+                            'Cancel',
+                            style: TextStyle(
+                                color: ColorsManager.textGray,
+                                fontSize: 14,
+                                fontWeight: FontWeight.w400),
+                          ),
+                        ),
+                      ),
+                    ),
+                  ),
+                ),
+              ),
+              Expanded(
+                  child: Container(
+                decoration: const BoxDecoration(
+                    border: Border(
+                  left: BorderSide(
+                    color: ColorsManager.textGray,
+                    width: 0.5,
+                  ),
+                  top: BorderSide(
+                    color: ColorsManager.textGray,
+                    width: 1.0,
+                  ),
+                )),
+                child: InkWell(
+                    onTap: confirmTab,
+                    child: const Padding(
+                      padding: EdgeInsets.all(15),
+                      child: Center(
+                        child: Text(
+                          'Confirm',
+                          style: TextStyle(
+                              color: ColorsManager.red,
+                              fontSize: 14,
+                              fontWeight: FontWeight.w400),
+                        ),
+                      ),
+                    )),
+              ))
+            ],
+          )
+        ],
+      ),
+    );
+  }
+}

lib/features/scene/widgets/delete_routine_b.dart

@@ -0,0 +1,81 @@
+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/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/widgets/alert_dialogs/delete_routine_dialog.dart';
+import 'package:syncrow_app/navigation/navigate_to_route.dart';
+import 'package:syncrow_app/navigation/routing_constants.dart';
+import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
+
+class DeleteRoutineButton extends StatelessWidget {
+  const DeleteRoutineButton(
+      {super.key, required this.sceneId, required this.isAutomation});
+
+  final String sceneId;
+  final bool isAutomation;
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocConsumer<CreateSceneBloc, CreateSceneState>(
+      listener: (context, state) {
+        if (state is DeleteSceneSuccess) {
+          if (state.success) {
+            navigateToRoute(context, Routes.homeRoute);
+            BlocProvider.of<SceneBloc>(context)
+                .add(LoadScenes(HomeCubit.getInstance().selectedSpace!.id!));
+            BlocProvider.of<SceneBloc>(context).add(
+                LoadAutomation(HomeCubit.getInstance().selectedSpace!.id!));
+          }
+        }
+      },
+      builder: (context, state) {
+        return InkWell(
+            onTap: () {
+              showDialog(
+                context: context,
+                builder: (context) {
+                  return DeleteRoutineDialog(
+                    cancelTab: () {
+                      Navigator.of(context).pop();
+                    },
+                    confirmTab: () {
+                      context.read<CreateSceneBloc>().add(DeleteSceneEvent(
+                            sceneId: sceneId,
+                            unitUuid:
+                                HomeCubit.getInstance().selectedSpace!.id!,
+                          ));
+                      Navigator.of(context).pop();
+                    },
+                  );
+                },
+              );
+            },
+            child: const Center(
+                child: Text(
+              'Remove Routine',
+              style: TextStyle(color: ColorsManager.red),
+            ))
+            // : SceneListTile(
+            //     onPressed: () {
+
+            //     },
+            //     padding: const EdgeInsets.symmetric(horizontal: 8),
+            //     titleString: isAutomation
+            //         ? StringsManager.deleteAutomation
+            //         : StringsManager.deleteScene,
+            //     leadingWidget: (state is DeleteSceneLoading)
+            //         ? const SizedBox(
+            //             height: 24,
+            //             width: 24,
+            //             child: CircularProgressIndicator())
+            //         : SvgPicture.asset(
+            //             Assets.assetsDeleteIcon,
+            //             color: ColorsManager.red,
+            //           ),
+            );
+      },
+    );
+  }
+}

lib/services/api/authentication_api.dart

@@ -5,7 +5,8 @@ import 'package:syncrow_app/services/api/api_links_endpoints.dart';
 import 'package:syncrow_app/services/api/http_service.dart';
 
 class AuthenticationAPI {
-  static Future<Map<String, dynamic>> verifyPassCode({required Map<String, dynamic> body}) async {
+  static Future<Map<String, dynamic>> verifyPassCode(
+      {required Map<String, dynamic> body}) async {
     final response = await HTTPService().post(
         path: ApiEndpoints.verifyOtp,
         body: body,
@@ -14,7 +15,8 @@ class AuthenticationAPI {
     return response;
   }
 
-  static Future<Token> loginWithEmail({required LoginWithEmailModel model}) async {
+  static Future<Token> loginWithEmail(
+      {required LoginWithEmailModel model}) async {
     final response = await HTTPService().post(
         path: ApiEndpoints.login,
         body: model.toJson(),
@@ -32,17 +34,29 @@ class AuthenticationAPI {
     return response;
   }
 
-  static Future<Map<String, dynamic>> sendOtp({required Map<String, dynamic> body}) async {
+  static Future<Map<String, dynamic>> sendOtp(
+      {required Map<String, dynamic> body}) async {
     final response = await HTTPService().post(
         path: ApiEndpoints.sendOtp,
         body: body,
         showServerMessage: false,
-        expectedResponseModel: (json) => json['data']);
+        expectedResponseModel: (json) {
+          print(json['data']);
+          return json['data'];
+        });
     return response;
   }
 
-  static Future<Map<String, dynamic>> forgetPassword({required String email,required String password ,}) async {
-    Map<String, dynamic> params = {"email": email, "password": password,};
+  static Future<Map<String, dynamic>> forgetPassword({
+    required String otpCode,
+    required String email,
+    required String password,
+  }) async {
+    Map<String, dynamic> params = {
+      "email": email,
+      "password": password,
+      "otpCode": otpCode
+    };
     final response = await HTTPService().post(
         path: ApiEndpoints.forgetPassword,
         body: params,

lib/utils/resource_manager/strings_manager.dart

@@ -39,6 +39,6 @@ class StringsManager {
       'Example: when an unusual activity is detected.';
   static const String functions = "Functions";
   static const String firstLaunch = "firstLaunch";
-  static const String deleteScene = 'Delete Scene';
+  static const String deleteScene = 'Remove Routine';
   static const String deleteAutomation = 'Delete Automation';
 }

pubspec.yaml

@@ -5,7 +5,7 @@ description: This is the mobile application project, developed with Flutter for
 # pub.dev using `flutter pub publish`. This is preferred for private packages.
 publish_to: "none" # Remove this line if you wish to publish to pub.dev
 
-version: 1.0.5+33
+version: 1.0.5+35
 
 environment:
   sdk: ">=3.0.6 <4.0.0"