Solved conflicts and added latest update from routines design branch

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

@@ -12,6 +12,7 @@ import 'package:syncrow_app/features/devices/model/create_temporary_password_mod
 import 'package:syncrow_app/features/devices/model/temporary_password_model.dart';
 import 'package:syncrow_app/services/api/devices_api.dart';
 import 'package:syncrow_app/utils/helpers/snack_bar.dart';
+import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
 
 class SmartDoorBloc extends Bloc<SmartDoorEvent, SmartDoorState> {
   final String deviceId;
@@ -30,8 +31,7 @@ class SmartDoorBloc extends Bloc<SmartDoorEvent, SmartDoorState> {
     on<SelectTimeEvent>(selectTime);
     on<DeletePasswordEvent>(deletePassword);
   }
-  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);
@@ -47,24 +47,20 @@ 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());
       pageType = event.type!;
       var response = await DevicesAPI.getTemporaryPasswords(deviceId, pageType);
       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();
       } else {
         throw Exception("Unexpected response format");
       }
-      emit(TemporaryPasswordsLoadedState(
-          temporaryPassword: temporaryPasswords!));
+      emit(TemporaryPasswordsLoadedState(temporaryPassword: temporaryPasswords!));
     } catch (e) {
       emit(FailedState(errorMessage: e.toString()));
     }
@@ -91,7 +87,7 @@ class SmartDoorBloc extends Bloc<SmartDoorEvent, SmartDoorState> {
     } else {
       endTime = event.val;
     }
-    emit(changeTimeState());
+    emit(ChangeTimeState());
   }
 
   bool toggleRepeat(ToggleRepeatEvent event, Emitter<SmartDoorState> emit) {
@@ -101,7 +97,6 @@ class SmartDoorBloc extends Bloc<SmartDoorEvent, SmartDoorState> {
     return repeat;
   }
 
-
   bool setStartEndTime(SetStartEndTimeEvent event, Emitter<SmartDoorState> emit) {
     emit(LoadingInitialState());
     isStartEndTime = event.val;
@@ -113,10 +108,7 @@ class SmartDoorBloc extends Bloc<SmartDoorEvent, SmartDoorState> {
     emit(LoadingNewSate(smartDoorModel: deviceStatus));
     try {
       final response = await DevicesAPI.controlDevice(
-          DeviceControlModel(
-              deviceId: deviceId,
-              code: 'normal_open_switch',
-              value: !event.value),
+          DeviceControlModel(deviceId: deviceId, code: 'normal_open_switch', value: !event.value),
           deviceId);
 
       if (response['success'] ?? false) {
@@ -137,6 +129,7 @@ class SmartDoorBloc extends Bloc<SmartDoorEvent, SmartDoorState> {
   }
 
   Future<void> selectTime(SelectTimeEvent event, Emitter<SmartDoorState> emit) async {
+    emit(ChangeTimeState());
     final DateTime? picked = await showDatePicker(
       context: event.context,
       initialDate: DateTime.now(),
@@ -147,6 +140,22 @@ class SmartDoorBloc extends Bloc<SmartDoorEvent, SmartDoorState> {
       final TimeOfDay? timePicked = await showTimePicker(
         context: event.context,
         initialTime: TimeOfDay.now(),
+        builder: (context, child) {
+          return Theme(
+            data: ThemeData.light().copyWith(
+              colorScheme: const ColorScheme.light(
+                primary: ColorsManager.primaryColor,
+                onSurface: Colors.black,
+              ),
+              buttonTheme: const ButtonThemeData(
+                colorScheme: ColorScheme.light(
+                  primary: Colors.green,
+                ),
+              ),
+            ),
+            child: child!,
+          );
+        },
       );
       if (timePicked != null) {
         final selectedDateTime = DateTime(
@@ -156,23 +165,31 @@ class SmartDoorBloc extends Bloc<SmartDoorEvent, SmartDoorState> {
           timePicked.hour,
           timePicked.minute,
         );
+        // Convert selectedDateTime to a timestamp without seconds and milliseconds
+        final selectedTimestamp = DateTime(
+              selectedDateTime.year,
+              selectedDateTime.month,
+              selectedDateTime.day,
+              selectedDateTime.hour,
+              selectedDateTime.minute,
+            ).millisecondsSinceEpoch ~/
+            1000; // Divide by 1000 to remove milliseconds
         if (event.isEffective) {
-          if (expirationTimeTimeStamp != null &&
-              selectedDateTime.millisecondsSinceEpoch >
-                  expirationTimeTimeStamp!) {
+          if (expirationTimeTimeStamp != null && selectedTimestamp > expirationTimeTimeStamp!) {
             CustomSnackBar.displaySnackBar('Effective Time cannot be later than Expiration Time.');
           } else {
-            effectiveTime = selectedDateTime.toString();
-            effectiveTimeTimeStamp = selectedDateTime.millisecondsSinceEpoch;
+            effectiveTime =
+                selectedDateTime.toString().split('.').first; // Remove seconds and milliseconds
+            effectiveTimeTimeStamp = selectedTimestamp;
           }
         } else {
-          if (effectiveTimeTimeStamp != null &&
-              selectedDateTime.millisecondsSinceEpoch <
-                  effectiveTimeTimeStamp!) {
-            CustomSnackBar.displaySnackBar('Expiration Time cannot be earlier than Effective Time.');
+          if (effectiveTimeTimeStamp != null && selectedTimestamp < effectiveTimeTimeStamp!) {
+            CustomSnackBar.displaySnackBar(
+                'Expiration Time cannot be earlier than Effective Time.');
           } else {
-            expirationTime = selectedDateTime.toString();
-            expirationTimeTimeStamp = selectedDateTime.millisecondsSinceEpoch;
+            expirationTime =
+                selectedDateTime.toString().split('.').first; // Remove seconds and milliseconds
+            expirationTimeTimeStamp = selectedTimestamp;
           }
         }
         emit(TimeSelectedState());
@@ -183,8 +200,8 @@ class SmartDoorBloc extends Bloc<SmartDoorEvent, SmartDoorState> {
   Future<void> savePassword(SavePasswordEvent event, Emitter<SmartDoorState> emit) async {
     if (_validateInputs()) return;
     try {
-       emit(LoadingSaveState());
-   var res = await DevicesAPI.createPassword(
+      emit(LoadingSaveState());
+      var res = await DevicesAPI.createPassword(
         pageType: pageType,
         deviceId: deviceId,
         effectiveTime: effectiveTimeTimeStamp.toString(),
@@ -200,20 +217,18 @@ class SmartDoorBloc extends Bloc<SmartDoorEvent, SmartDoorState> {
             ),
         ],
       );
-       Navigator.of(event.context).pop(true);
-       CustomSnackBar.displaySnackBar('Save Successfully');
-       emit(SaveState());
-
-    } catch (_) {
-    }
+      Navigator.of(event.context).pop(true);
+      CustomSnackBar.displaySnackBar('Save Successfully');
+      emit(SaveState());
+    } catch (_) {}
   }
 
   Future<void> deletePassword(DeletePasswordEvent event, Emitter<SmartDoorState> emit) async {
     try {
       emit(LoadingInitialState());
-      var response = await DevicesAPI.deletePassword(
-              deviceId: deviceId, passwordId: event.passwordId)
-          .then((value) async {
+      var response =
+          await DevicesAPI.deletePassword(deviceId: deviceId, passwordId: event.passwordId)
+              .then((value) async {
         add(InitialPasswordsPage(type: pageType));
       });
     } catch (e) {
@@ -222,7 +237,7 @@ class SmartDoorBloc extends Bloc<SmartDoorEvent, SmartDoorState> {
   }
 
   bool _validateInputs() {
-    if (passwordController.text.length<7) {
+    if (passwordController.text.length < 7) {
       CustomSnackBar.displaySnackBar('Password less than 7');
       return true;
     }
@@ -242,16 +257,13 @@ class SmartDoorBloc extends Bloc<SmartDoorEvent, SmartDoorState> {
       CustomSnackBar.displaySnackBar('Select expiration time');
       return true;
     }
-    if (repeat == true &&
-        (endTime == null || startTime == null || selectedDay == null)) {
+    if (repeat == true && (endTime == null || startTime == null || selectedDay == null)) {
       CustomSnackBar.displaySnackBar('Start Time and End time and the days required ');
       return true;
     }
     return false;
   }
 
-
-
   List<DayInWeek> days = [
     DayInWeek("S", dayKey: 'Sun'),
     DayInWeek("M", dayKey: 'Mon'),
@@ -266,5 +278,4 @@ class SmartDoorBloc extends Bloc<SmartDoorEvent, SmartDoorState> {
     if (dateTime == null) return '';
     return DateFormat('HH:mm').format(dateTime);
   }
-
 }

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

@@ -38,16 +38,25 @@ class FailedState extends SmartDoorState {
   List<Object> get props => [errorMessage];
 }
 
-class GeneratePasswordState extends SmartDoorState{}
-class TimeSelectedState extends SmartDoorState{}
-class IsRepeatState extends SmartDoorState{}
-class IsStartEndState extends SmartDoorState{}
-class changeStartTimeState extends SmartDoorState{}
-class changeEndTimeState extends SmartDoorState{}
-class changeTimeState extends SmartDoorState{}
-class SaveState extends SmartDoorState{}
-class LoadingSaveState extends SmartDoorState{}
-class TemporaryPasswordsLoadedState extends SmartDoorState{
-  final  List<TemporaryPassword> temporaryPassword;
+class GeneratePasswordState extends SmartDoorState {}
+
+class TimeSelectedState extends SmartDoorState {}
+
+class IsRepeatState extends SmartDoorState {}
+
+class IsStartEndState extends SmartDoorState {}
+
+class ChangeStartTimeState extends SmartDoorState {}
+
+class ChangeEndTimeState extends SmartDoorState {}
+
+class ChangeTimeState extends SmartDoorState {}
+
+class SaveState extends SmartDoorState {}
+
+class LoadingSaveState extends SmartDoorState {}
+
+class TemporaryPasswordsLoadedState extends SmartDoorState {
+  final List<TemporaryPassword> temporaryPassword;
   const TemporaryPasswordsLoadedState({required this.temporaryPassword});
 }