Refactor widget lifecycle methods for temperature control and presence sensor

.github/workflows/azure-static-web-apps-mango-bush-01e607f10.yml

@@ -31,7 +31,7 @@ jobs:
         run: flutter pub get
 
       - name: Build Flutter Web App
-        run: flutter build web --web-renderer canvaskit -t lib/main.dart
+        run: flutter build web --release --dart-define=FLAVOR=production
 
       - name: Build And Deploy
         id: builddeploy

.github/workflows/azure-static-web-apps-polite-smoke-017c65c10.yml

@@ -31,7 +31,7 @@ jobs:
         run: flutter pub get
 
       - name: Build Flutter Web App
-        run: flutter build web --web-renderer canvaskit -t lib/main_dev.dart
+        run: flutter build web --release --dart-define=FLAVOR=development
 
       - name: Build And Deploy
         id: builddeploy

.vscode/launch.json

@@ -10,12 +10,11 @@
             "type": "dart",
        
             "args": [
-              "-d",
-              "chrome",
-              "--web-port",
-              "3000",
-              "-t",
-              "lib/main_dev.dart",
+       
+              "--dart-define",
+       
+              "FLAVOR=development"
+       
             ],
        
             "flutterMode": "debug"
@@ -29,12 +28,11 @@
             "type": "dart",
        
             "args": [
-                "-d",
-                "chrome",
-                "--web-port",
-                "3000",
-                "-t",
-                "lib/main_staging.dart",
+       
+              "--dart-define",
+       
+              "FLAVOR=staging"
+       
             ],
        
             "flutterMode": "debug"
@@ -48,12 +46,11 @@
             "type": "dart",
        
             "args": [
-              "-d",
-              "chrome",
-              "--web-port",
-              "3000",
-              "-t",
-              "lib/main.dart",
+       
+              "--dart-define",
+       
+              "FLAVOR=production"
+       
             ],
        
             "flutterMode": "debug"

README.md

@@ -16,12 +16,7 @@ samples, guidance on mobile development, and a full API reference.
 
 ## USEFUL COMMANDS
 
-- Building for the Web
-  - CanvasKit
-    - `flutter build web --web-renderer canvaskit -t lib/main_dev.dart --output=build/web_dev` - build for DEVELOPMENT.
-    - `flutter build web --web-renderer canvaskit -t lib/main_staging.dart --output=build/web_stg` - build for STAGING.
-    - `flutter build web --web-renderer canvaskit -t lib/main.dart --output=build/web` - build for PRODUCTION.
-
-- run command: `flutter run -d chrome --target=lib/main_dev.dart`
+Run on chrome: flutter run -d chrome --dart-define=FLAVOR='ENV_NAME'
 
+Build: flutter build web --release --dart-define=FLAVOR='ENV_NAME'
 

lib/main_dev.dart

@@ -16,12 +16,12 @@ import 'package:syncrow_web/pages/visitor_password/bloc/visitor_password_bloc.da
 import 'package:syncrow_web/services/locator.dart';
 import 'package:syncrow_web/utils/app_routes.dart';
 import 'package:syncrow_web/utils/constants/routes_const.dart';
-import 'package:syncrow_web/utils/navigation_service.dart';
 import 'package:syncrow_web/utils/theme/theme.dart';
 
 Future<void> main() async {
   try {
-    const environment = String.fromEnvironment('FLAVOR', defaultValue: 'development');
+    const environment =
+        String.fromEnvironment('FLAVOR', defaultValue: 'development');
     await dotenv.load(fileName: '.env.$environment');
     WidgetsFlutterBinding.ensureInitialized();
     await Firebase.initializeApp(
@@ -33,7 +33,9 @@ Future<void> main() async {
 }
 
 class MyApp extends StatelessWidget {
-  MyApp({super.key});
+  MyApp({
+    super.key,
+  });
 
   final GoRouter _router = GoRouter(
     initialLocation: RoutesConst.auth,
@@ -54,10 +56,11 @@ class MyApp extends StatelessWidget {
   Widget build(BuildContext context) {
     return MultiBlocProvider(
         providers: [
-          BlocProvider<CreateRoutineBloc>(
+               BlocProvider<CreateRoutineBloc>(
             create: (context) => CreateRoutineBloc(),
           ),
-          BlocProvider(create: (context) => HomeBloc()..add(const FetchUserInfo())),
+          BlocProvider(
+              create: (context) => HomeBloc()..add(const FetchUserInfo())),
           BlocProvider<VisitorPasswordBloc>(
             create: (context) => VisitorPasswordBloc(),
           ),
@@ -78,8 +81,6 @@ class MyApp extends StatelessWidget {
               PointerDeviceKind.unknown,
             },
           ),
-          key: NavigationService.navigatorKey,
-          // scaffoldMessengerKey: NavigationService.snackbarKey,
           theme: myTheme,
           routerConfig: _router,
         ));

lib/main_staging.dart

@@ -1,87 +0,0 @@
-import 'package:firebase_core/firebase_core.dart';
-import 'package:flutter/gestures.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:go_router/go_router.dart';
-import 'package:syncrow_web/firebase_options_prod.dart';
-import 'package:syncrow_web/pages/auth/bloc/auth_bloc.dart';
-import 'package:syncrow_web/pages/home/bloc/home_bloc.dart';
-import 'package:syncrow_web/pages/home/bloc/home_event.dart';
-import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_bloc.dart';
-import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
-import 'package:syncrow_web/pages/visitor_password/bloc/visitor_password_bloc.dart';
-import 'package:syncrow_web/services/locator.dart';
-import 'package:syncrow_web/utils/app_routes.dart';
-import 'package:syncrow_web/utils/constants/routes_const.dart';
-import 'package:syncrow_web/utils/navigation_service.dart';
-import 'package:syncrow_web/utils/theme/theme.dart';
-
-Future<void> main() async {
-  try {
-    const environment = String.fromEnvironment('FLAVOR', defaultValue: 'staging');
-    await dotenv.load(fileName: '.env.$environment');
-    WidgetsFlutterBinding.ensureInitialized();
-    await Firebase.initializeApp(
-      options: DefaultFirebaseOptionsStaging.currentPlatform,
-    );
-    initialSetup();
-  } catch (_) {}
-  runApp(MyApp());
-}
-
-class MyApp extends StatelessWidget {
-  MyApp({super.key});
-
-  final GoRouter _router = GoRouter(
-    initialLocation: RoutesConst.auth,
-    routes: AppRoutes.getRoutes(),
-    redirect: (context, state) async {
-      String checkToken = await AuthBloc.getTokenAndValidate();
-      final loggedIn = checkToken == 'Success';
-      final goingToLogin = state.uri.toString() == RoutesConst.auth;
-
-      if (!loggedIn && !goingToLogin) return RoutesConst.auth;
-      if (loggedIn && goingToLogin) return RoutesConst.home;
-
-      return null;
-    },
-  );
-
-  @override
-  Widget build(BuildContext context) {
-    return MultiBlocProvider(
-        providers: [
-          BlocProvider<CreateRoutineBloc>(
-            create: (context) => CreateRoutineBloc(),
-          ),
-          BlocProvider(create: (context) => HomeBloc()..add(const FetchUserInfo())),
-          BlocProvider<VisitorPasswordBloc>(
-            create: (context) => VisitorPasswordBloc(),
-          ),
-          BlocProvider<RoutineBloc>(
-            create: (context) => RoutineBloc(),
-          ),
-          BlocProvider<SpaceTreeBloc>(
-            create: (context) => SpaceTreeBloc()..add(InitialEvent()),
-          ),
-        ],
-        child: MaterialApp.router(
-          debugShowCheckedModeBanner: false,
-          scrollBehavior: const MaterialScrollBehavior().copyWith(
-            dragDevices: {
-              PointerDeviceKind.mouse,
-              PointerDeviceKind.touch,
-              PointerDeviceKind.stylus,
-              PointerDeviceKind.unknown,
-            },
-          ),
-          key: NavigationService.navigatorKey,
-          // scaffoldMessengerKey: NavigationService.snackbarKey,
-          theme: myTheme,
-          routerConfig: _router,
-        ));
-  }
-}

lib/pages/auth/bloc/auth_bloc.dart

@@ -10,7 +10,6 @@ import 'package:syncrow_web/pages/auth/model/region_model.dart';
 import 'package:syncrow_web/pages/auth/model/token.dart';
 import 'package:syncrow_web/pages/auth/model/user_model.dart';
 import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
-import 'package:syncrow_web/pages/home/bloc/home_bloc.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
 import 'package:syncrow_web/services/auth_api.dart';
@@ -433,13 +432,9 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
   }
 
   static Future<void> logout(BuildContext context) async {
-    const storage = FlutterSecureStorage();
+    final storage = FlutterSecureStorage();
+    ProjectManager.clearProjectUUID();
     context.read<SpaceTreeBloc>().add(ClearAllData());
-    user = null;
-    context.read<HomeBloc>().user = null;
-    await Future.wait<void>([
-      ProjectManager.clearProjectUUID(),
-      storage.deleteAll(),
-    ]);
+    storage.deleteAll();
   }
 }

lib/pages/auth/view/login_web_page.dart

@@ -55,12 +55,12 @@ class _LoginWebPageState extends State<LoginWebPage> with HelperResponsiveLayout
     final isSmallScreen = isSmallScreenSize(context);
     final isMediumScreen = isMediumScreenSize(context);
     Size size = MediaQuery.of(context).size;
-    late ScrollController scrollController;
-    scrollController = ScrollController();
+    late ScrollController _scrollController;
+    _scrollController = ScrollController();
 
-    void scrollToCenter() {
-      final double middlePosition = scrollController.position.maxScrollExtent / 2;
-      scrollController.animateTo(
+    void _scrollToCenter() {
+      final double middlePosition = _scrollController.position.maxScrollExtent / 2;
+      _scrollController.animateTo(
         middlePosition,
         duration: const Duration(seconds: 1),
         curve: Curves.easeInOut,
@@ -68,7 +68,7 @@ class _LoginWebPageState extends State<LoginWebPage> with HelperResponsiveLayout
     }
 
     WidgetsBinding.instance.addPostFrameCallback((_) {
-      scrollToCenter();
+      _scrollToCenter();
     });
 
     return Stack(
@@ -76,7 +76,7 @@ class _LoginWebPageState extends State<LoginWebPage> with HelperResponsiveLayout
         FirstLayer(
           second: Center(
             child: ListView(
-              controller: scrollController,
+              controller: _scrollController,
               shrinkWrap: true,
               children: [
                 Container(
@@ -199,7 +199,7 @@ class _LoginWebPageState extends State<LoginWebPage> with HelperResponsiveLayout
           width: size.width * 0.9,
           child: DropdownButtonHideUnderline(
             child: DropdownButton2<String>(
-              style: const TextStyle(color: Colors.black),
+              style: TextStyle(color: Colors.black),
               isExpanded: true,
               hint: Text(
                 'Select your region/country',
@@ -336,16 +336,6 @@ class _LoginWebPageState extends State<LoginWebPage> with HelperResponsiveLayout
             obscureText: loginBloc.obscureText,
             keyboardType: TextInputType.visiblePassword,
             controller: loginBloc.loginPasswordController,
-            onFieldSubmitted: (value) {
-              if (loginBloc.loginFormKey.currentState!.validate()) {
-                loginBloc.add(LoginButtonPressed(    
-                  username: loginBloc.loginEmailController.text,
-                  password: value,
-                ));
-              } else {
-                loginBloc.add(ChangeValidateEvent());
-              }
-            },
             decoration: textBoxDecoration()!.copyWith(
               hintText: 'At least 8 characters',
               hintStyle: Theme.of(context)
@@ -403,7 +393,7 @@ class _LoginWebPageState extends State<LoginWebPage> with HelperResponsiveLayout
         Transform.scale(
           scale: 1.2,
           child: Checkbox(
-            fillColor: WidgetStateProperty.all<Color>(Colors.white),
+            fillColor: MaterialStateProperty.all<Color>(Colors.white),
             activeColor: Colors.white,
             value: loginBloc.isChecked,
             checkColor: Colors.black,

lib/pages/device_managment/ac/view/control_list/current_temp.dart

@@ -60,7 +60,15 @@ class _CurrentTempState extends State<CurrentTemp> {
           );
     });
   }
-
+  @override
+  void didUpdateWidget(CurrentTemp oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.tempSet != widget.tempSet) {
+      setState(() {
+        _adjustedValue = _initialAdjustedValue(widget.tempSet);
+      });
+    }
+  }
   @override
   void dispose() {
     _debounce?.cancel();

lib/pages/device_managment/all_devices/helper/route_controls_based_code.dart

@@ -9,7 +9,6 @@ import 'package:syncrow_web/pages/device_managment/curtain/view/curtain_batch_st
 import 'package:syncrow_web/pages/device_managment/curtain/view/curtain_status_view.dart';
 import 'package:syncrow_web/pages/device_managment/door_lock/view/door_lock_batch_control_view.dart';
 import 'package:syncrow_web/pages/device_managment/door_lock/view/door_lock_control_view.dart';
-import 'package:syncrow_web/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart';
 import 'package:syncrow_web/pages/device_managment/garage_door/view/garage_door_batch_control_view.dart';
 import 'package:syncrow_web/pages/device_managment/garage_door/view/garage_door_control_view.dart';
 import 'package:syncrow_web/pages/device_managment/gateway/view/gateway_batch_control.dart';
@@ -105,9 +104,6 @@ mixin RouteControlsBasedCode {
         );
       case 'SOS':
         return SosDeviceControlsView(device: device);
-
-      case 'NCPS': 
-        return FlushMountedPresenceSensorControlView(device: device);
       default:
         return const SizedBox();
     }

lib/pages/device_managment/ceiling_sensor/view/ceiling_sensor_controls.dart

@@ -16,7 +16,8 @@ import 'package:syncrow_web/pages/device_managment/shared/table/report_table.dar
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
-class CeilingSensorControlsView extends StatelessWidget with HelperResponsiveLayout {
+class CeilingSensorControlsView extends StatelessWidget
+    with HelperResponsiveLayout {
   const CeilingSensorControlsView({super.key, required this.device});
 
   final AllDevicesModel device;
@@ -31,29 +32,35 @@ class CeilingSensorControlsView extends StatelessWidget with HelperResponsiveLay
         ..add(CeilingInitialEvent(device.uuid ?? '')),
       child: BlocBuilder<CeilingSensorBloc, CeilingSensorState>(
         builder: (context, state) {
-          if (state is CeilingLoadingInitialState || state is CeilingReportsLoadingState) {
+          if (state is CeilingLoadingInitialState ||
+              state is CeilingReportsLoadingState) {
             return const Center(child: CircularProgressIndicator());
           } else if (state is CeilingUpdateState) {
-            return _buildGridView(
-                context, state.ceilingSensorModel, isExtraLarge, isLarge, isMedium);
+            return _buildGridView(context, state.ceilingSensorModel,
+                isExtraLarge, isLarge, isMedium);
           } else if (state is CeilingReportsState) {
             return ReportsTable(
               report: state.deviceReport,
               onRowTap: (index) {},
               onClose: () {
-                context.read<CeilingSensorBloc>().add(BackToCeilingGridViewEvent());
+                context
+                    .read<CeilingSensorBloc>()
+                    .add(BackToCeilingGridViewEvent());
               },
             );
           } else if (state is ShowCeilingDescriptionState) {
             return DescriptionView(
               description: state.description,
               onClose: () {
-                context.read<CeilingSensorBloc>().add(BackToCeilingGridViewEvent());
+                context
+                    .read<CeilingSensorBloc>()
+                    .add(BackToCeilingGridViewEvent());
               },
             );
           } else if (state is CeilingReportsFailedState) {
             final model = context.read<CeilingSensorBloc>().deviceStatus;
-            return _buildGridView(context, model, isExtraLarge, isLarge, isMedium);
+            return _buildGridView(
+                context, model, isExtraLarge, isLarge, isMedium);
           }
           return const Center(child: Text('Error fetching status'));
         },
@@ -61,8 +68,8 @@ class CeilingSensorControlsView extends StatelessWidget with HelperResponsiveLay
     );
   }
 
-  Widget _buildGridView(BuildContext context, CeilingSensorModel model, bool isExtraLarge,
-      bool isLarge, bool isMedium) {
+  Widget _buildGridView(BuildContext context, CeilingSensorModel model,
+      bool isExtraLarge, bool isLarge, bool isMedium) {
     return GridView(
       padding: const EdgeInsets.symmetric(horizontal: 50),
       shrinkWrap: true,
@@ -143,8 +150,8 @@ class CeilingSensorControlsView extends StatelessWidget with HelperResponsiveLay
         ),
         GestureDetector(
           onTap: () {
-            context.read<CeilingSensorBloc>().add(
-                GetCeilingDeviceReportsEvent(code: 'presence_state', deviceUuid: device.uuid!));
+            context.read<CeilingSensorBloc>().add(GetCeilingDeviceReportsEvent(
+                code: 'presence_state', deviceUuid: device.uuid!));
           },
           child: const PresenceStaticWidget(
             icon: Assets.illuminanceRecordIcon,
@@ -153,9 +160,8 @@ class CeilingSensorControlsView extends StatelessWidget with HelperResponsiveLay
         ),
         GestureDetector(
           onTap: () {
-            context
-                .read<CeilingSensorBloc>()
-                .add(GetCeilingDeviceReportsEvent(code: '', deviceUuid: device.uuid!));
+            context.read<CeilingSensorBloc>().add(GetCeilingDeviceReportsEvent(
+                code: '', deviceUuid: device.uuid!));
           },
           child: const PresenceStaticWidget(
             icon: Assets.helpDescriptionIcon,

lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart

@@ -1,237 +0,0 @@
-import 'dart:async';
-import 'dart:developer';
-
-import 'package:bloc/bloc.dart';
-import 'package:equatable/equatable.dart';
-import 'package:firebase_database/firebase_database.dart';
-import 'package:syncrow_web/pages/device_managment/all_devices/models/device_reports.dart';
-import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
-import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
-import 'package:syncrow_web/pages/device_managment/flush_mounted_presence_sensor/models/flush_mounted_presence_sensor_model.dart';
-import 'package:syncrow_web/services/batch_control_devices_service.dart';
-import 'package:syncrow_web/services/control_device_service.dart';
-import 'package:syncrow_web/services/devices_mang_api.dart';
-
-part 'flush_mounted_presence_sensor_event.dart';
-part 'flush_mounted_presence_sensor_state.dart';
-
-class FlushMountedPresenceSensorBloc
-    extends Bloc<FlushMountedPresenceSensorEvent, FlushMountedPresenceSensorState> {
-  final String deviceId;
-  final ControlDeviceService controlDeviceService;
-  final BatchControlDevicesService batchControlDevicesService;
-
-  late FlushMountedPresenceSensorModel deviceStatus;
-  FlushMountedPresenceSensorBloc({
-    required this.deviceId,
-    required this.controlDeviceService,
-    required this.batchControlDevicesService,
-  }) : super(FlushMountedPresenceSensorInitialState()) {
-    on<FlushMountedPresenceSensorFetchStatusEvent>(
-      _onFlushMountedPresenceSensorFetchStatusEvent,
-    );
-    on<FlushMountedPresenceSensorFetchBatchStatusEvent>(
-        _onFlushMountedPresenceSensorFetchBatchStatusEvent);
-    on<FlushMountedPresenceSensorChangeValueEvent>(
-      _onFlushMountedPresenceSensorChangeValueEvent,
-    );
-    on<FlushMountedPresenceSensorBatchControlEvent>(
-      _onFlushMountedPresenceSensorBatchControlEvent,
-    );
-    on<FlushMountedPresenceSensorGetDeviceReportsEvent>(
-        _onFlushMountedPresenceSensorGetDeviceReportsEvent);
-    on<FlushMountedPresenceSensorShowDescriptionEvent>(
-      _onFlushMountedPresenceSensorShowDescriptionEvent,
-    );
-    on<FlushMountedPresenceSensorBackToGridViewEvent>(
-      _onFlushMountedPresenceSensorBackToGridViewEvent,
-    );
-    on<FlushMountedPresenceSensorFactoryResetEvent>(
-      _onFlushMountedPresenceSensorFactoryResetEvent,
-    );
-  }
-
-  void _onFlushMountedPresenceSensorFetchStatusEvent(
-    FlushMountedPresenceSensorFetchStatusEvent event,
-    Emitter<FlushMountedPresenceSensorState> emit,
-  ) async {
-    emit(FlushMountedPresenceSensorLoadingInitialState());
-    try {
-      final response = await DevicesManagementApi().getDeviceStatus(deviceId);
-      deviceStatus = FlushMountedPresenceSensorModel.fromJson(response.status);
-      emit(FlushMountedPresenceSensorUpdateState(model: deviceStatus));
-      _listenToChanges(emit, deviceId);
-    } catch (e) {
-      emit(FlushMountedPresenceSensorFailedState(error: e.toString()));
-      return;
-    }
-  }
-
-  Future<void> _onFlushMountedPresenceSensorFetchBatchStatusEvent(
-    FlushMountedPresenceSensorFetchBatchStatusEvent event,
-    Emitter<FlushMountedPresenceSensorState> emit,
-  ) async {
-    emit(FlushMountedPresenceSensorLoadingInitialState());
-    try {
-      final response = await DevicesManagementApi().getBatchStatus(event.devicesIds);
-      deviceStatus = FlushMountedPresenceSensorModel.fromJson(response.status);
-      emit(FlushMountedPresenceSensorUpdateState(model: deviceStatus));
-    } catch (e) {
-      emit(FlushMountedPresenceSensorFailedState(error: e.toString()));
-    }
-  }
-
-  Future<void> _listenToChanges(
-    Emitter<FlushMountedPresenceSensorState> emit,
-    String deviceId,
-  ) async {
-    final ref = FirebaseDatabase.instance.ref(
-      'device-status/$deviceId',
-    );
-
-    await ref.onValue.listen(
-      (DatabaseEvent event) async {
-        Map<dynamic, dynamic> usersMap =
-            event.snapshot.value as Map<dynamic, dynamic>;
-        List<Status> statusList = [];
-    
-        (usersMap['status'] as List<dynamic>?)?.forEach((element) {
-          statusList.add(Status(code: element['code'], value: element['value']));
-        });
-    
-        deviceStatus = FlushMountedPresenceSensorModel.fromJson(statusList);
-        if (!emit.isDone) {
-          emit(FlushMountedPresenceSensorLoadingNewSate(model: deviceStatus));
-        }
-      },
-      onError: (error) => log(error.toString(), name: 'FirebaseDatabaseError'),
-    ).asFuture();
-  }
-
-  void _onFlushMountedPresenceSensorChangeValueEvent(
-    FlushMountedPresenceSensorChangeValueEvent event,
-    Emitter<FlushMountedPresenceSensorState> emit,
-  ) async {
-    emit(FlushMountedPresenceSensorLoadingNewSate(model: deviceStatus));
-    _updateDeviceFunctionFromCode(event.code, event.value);
-    emit(FlushMountedPresenceSensorUpdateState(model: deviceStatus));
-    try {
-      await controlDeviceService.controlDevice(
-        deviceUuid: deviceId,
-        status: Status(code: event.code, value: event.value),
-      );
-    } catch (_) {
-      await _reloadDeviceStatus();
-    }
-  }
-
-  Future<void> _onFlushMountedPresenceSensorBatchControlEvent(
-    FlushMountedPresenceSensorBatchControlEvent event,
-    Emitter<FlushMountedPresenceSensorState> emit,
-  ) async {
-    emit(FlushMountedPresenceSensorLoadingNewSate(model: deviceStatus));
-    _updateDeviceFunctionFromCode(event.code, event.value);
-    emit(FlushMountedPresenceSensorUpdateState(model: deviceStatus));
-
-    try {
-      await batchControlDevicesService.batchControlDevices(
-        uuids: event.deviceIds,
-        code: event.code,
-        value: event.value,
-      );
-    } catch (_) {
-      await _reloadDeviceStatus();
-    }
-  }
-
-  void _updateDeviceFunctionFromCode(String code, int value) {
-    switch (code) {
-      case FlushMountedPresenceSensorModel.codeFarDetection:
-        deviceStatus.farDetection = value;
-        break;
-      case FlushMountedPresenceSensorModel.codeSensitivity:
-        deviceStatus.sensitivity = value;
-        break;
-      case FlushMountedPresenceSensorModel.codeNoneDelay:
-        deviceStatus.noneDelay = value;
-        break;
-      case FlushMountedPresenceSensorModel.codePresenceDelay:
-        deviceStatus.presenceDelay = value;
-        break;
-      case FlushMountedPresenceSensorModel.codeNearDetection:
-        deviceStatus.nearDetection = value;
-        break;
-      case FlushMountedPresenceSensorModel.codeOccurDistReduce:
-        deviceStatus.occurDistReduce = value;
-        break;
-      case FlushMountedPresenceSensorModel.codeSensiReduce:
-        deviceStatus.sensiReduce = value;
-        break;
-      default:
-        return;
-    }
-  }
-
-  Future<void> _reloadDeviceStatus() async {
-    await Future.delayed(const Duration(milliseconds: 500), () {
-      add(FlushMountedPresenceSensorFetchStatusEvent());
-    });
-  }
-
-  Future<void> _onFlushMountedPresenceSensorGetDeviceReportsEvent(
-    FlushMountedPresenceSensorGetDeviceReportsEvent event,
-    Emitter<FlushMountedPresenceSensorState> emit,
-  ) async {
-    emit(FlushMountedPresenceSensorDeviceReportsLoadingState());
-
-    try {
-      await DevicesManagementApi.getDeviceReports(deviceId, event.code)
-          .then((value) {
-        emit(FlushMountedPresenceSensorDeviceReportsState(
-            deviceReport: value, code: event.code));
-      });
-    } catch (e) {
-      emit(FlushMountedPresenceSensorDeviceReportsFailedState(error: e.toString()));
-      return;
-    }
-  }
-
-  void _onFlushMountedPresenceSensorShowDescriptionEvent(
-    FlushMountedPresenceSensorShowDescriptionEvent event,
-    Emitter<FlushMountedPresenceSensorState> emit,
-  ) {
-    emit(FlushMountedPresenceSensorShowDescriptionState(
-        description: event.description));
-  }
-
-  void _onFlushMountedPresenceSensorBackToGridViewEvent(
-    FlushMountedPresenceSensorBackToGridViewEvent event,
-    Emitter<FlushMountedPresenceSensorState> emit,
-  ) {
-    emit(FlushMountedPresenceSensorUpdateState(model: deviceStatus));
-  }
-
-  Future<void> _onFlushMountedPresenceSensorFactoryResetEvent(
-    FlushMountedPresenceSensorFactoryResetEvent event,
-    Emitter<FlushMountedPresenceSensorState> emit,
-  ) async {
-    emit(FlushMountedPresenceSensorLoadingNewSate(model: deviceStatus));
-    try {
-      final response = await DevicesManagementApi().factoryReset(
-        event.factoryReset,
-        event.deviceId,
-      );
-      if (!response) {
-        emit(
-          const FlushMountedPresenceSensorFailedState(
-            error: 'Something went wrong with factory reset, please try again',
-          ),
-        );
-      } else {
-        emit(FlushMountedPresenceSensorUpdateState(model: deviceStatus));
-      }
-    } catch (e) {
-      emit(FlushMountedPresenceSensorFailedState(error: e.toString()));
-    }
-  }
-}

lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_event.dart

@@ -1,84 +0,0 @@
-part of 'flush_mounted_presence_sensor_bloc.dart';
-
-sealed class FlushMountedPresenceSensorEvent extends Equatable {
-  const FlushMountedPresenceSensorEvent();
-
-  @override
-  List<Object> get props => [];
-}
-
-class FlushMountedPresenceSensorFetchStatusEvent
-    extends FlushMountedPresenceSensorEvent {}
-
-class FlushMountedPresenceSensorChangeValueEvent
-    extends FlushMountedPresenceSensorEvent {
-  final int value;
-  final String code;
-  final bool isBatchControl;
-  const FlushMountedPresenceSensorChangeValueEvent({
-    required this.value,
-    required this.code,
-    this.isBatchControl = false,
-  });
-
-  @override
-  List<Object> get props => [value, code];
-}
-
-class FlushMountedPresenceSensorFetchBatchStatusEvent
-    extends FlushMountedPresenceSensorEvent {
-  final List<String> devicesIds;
-  const FlushMountedPresenceSensorFetchBatchStatusEvent(this.devicesIds);
-
-  @override
-  List<Object> get props => [devicesIds];
-}
-
-class FlushMountedPresenceSensorGetDeviceReportsEvent
-    extends FlushMountedPresenceSensorEvent {
-  final String deviceUuid;
-  final String code;
-  const FlushMountedPresenceSensorGetDeviceReportsEvent({
-    required this.deviceUuid,
-    required this.code,
-  });
-
-  @override
-  List<Object> get props => [deviceUuid, code];
-}
-
-class FlushMountedPresenceSensorShowDescriptionEvent
-    extends FlushMountedPresenceSensorEvent {
-  final String description;
-  const FlushMountedPresenceSensorShowDescriptionEvent({required this.description});
-}
-
-class FlushMountedPresenceSensorBackToGridViewEvent
-    extends FlushMountedPresenceSensorEvent {}
-
-class FlushMountedPresenceSensorBatchControlEvent
-    extends FlushMountedPresenceSensorEvent {
-  final List<String> deviceIds;
-  final String code;
-  final dynamic value;
-
-  const FlushMountedPresenceSensorBatchControlEvent({
-    required this.deviceIds,
-    required this.code,
-    required this.value,
-  });
-
-  @override
-  List<Object> get props => [deviceIds, code, value];
-}
-
-class FlushMountedPresenceSensorFactoryResetEvent
-    extends FlushMountedPresenceSensorEvent {
-  final String deviceId;
-  final FactoryResetModel factoryReset;
-
-  const FlushMountedPresenceSensorFactoryResetEvent({
-    required this.deviceId,
-    required this.factoryReset,
-  });
-}

lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_state.dart

@@ -1,76 +0,0 @@
-part of 'flush_mounted_presence_sensor_bloc.dart';
-
-sealed class FlushMountedPresenceSensorState extends Equatable {
-  const FlushMountedPresenceSensorState();
-
-  @override
-  List<Object> get props => [];
-}
-
-class FlushMountedPresenceSensorInitialState
-    extends FlushMountedPresenceSensorState {}
-
-class FlushMountedPresenceSensorLoadingInitialState
-    extends FlushMountedPresenceSensorState {}
-
-class FlushMountedPresenceSensorUpdateState extends FlushMountedPresenceSensorState {
-  final FlushMountedPresenceSensorModel model;
-  const FlushMountedPresenceSensorUpdateState({required this.model});
-
-  @override
-  List<Object> get props => [model];
-}
-
-class FlushMountedPresenceSensorLoadingNewSate
-    extends FlushMountedPresenceSensorState {
-  final FlushMountedPresenceSensorModel model;
-  const FlushMountedPresenceSensorLoadingNewSate({required this.model});
-
-  @override
-  List<Object> get props => [model];
-}
-
-class FlushMountedPresenceSensorFailedState extends FlushMountedPresenceSensorState {
-  final String error;
-
-  const FlushMountedPresenceSensorFailedState({required this.error});
-
-  @override
-  List<Object> get props => [error];
-}
-
-class FlushMountedPresenceSensorDeviceReportsLoadingState
-    extends FlushMountedPresenceSensorState {}
-
-class FlushMountedPresenceSensorDeviceReportsState
-    extends FlushMountedPresenceSensorState {
-  const FlushMountedPresenceSensorDeviceReportsState({
-    required this.deviceReport,
-    required this.code,
-  });
-
-  final DeviceReport deviceReport;
-  final String code;
-
-  @override
-  List<Object> get props => [deviceReport, code];
-}
-
-class FlushMountedPresenceSensorDeviceReportsFailedState
-    extends FlushMountedPresenceSensorState {
-  const FlushMountedPresenceSensorDeviceReportsFailedState({required this.error});
-
-  final String error;
-
-  @override
-  List<Object> get props => [error];
-}
-
-class FlushMountedPresenceSensorShowDescriptionState
-    extends FlushMountedPresenceSensorState {
-  const FlushMountedPresenceSensorShowDescriptionState({required this.description});
-
-  final String description;
-  @override
-  List<Object> get props => [description];
-}

lib/pages/device_managment/flush_mounted_presence_sensor/factories/flush_mounted_presence_sensor_bloc_factory.dart

@@ -1,21 +0,0 @@
-import 'package:syncrow_web/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart';
-import 'package:syncrow_web/services/batch_control_devices_service.dart';
-import 'package:syncrow_web/services/control_device_service.dart';
-
-abstract final class FlushMountedPresenceSensorBlocFactory {
-  const FlushMountedPresenceSensorBlocFactory._();
-
-  static FlushMountedPresenceSensorBloc create({
-    required String deviceId,
-  }) {
-    return FlushMountedPresenceSensorBloc(
-      deviceId: deviceId,
-      controlDeviceService: DebouncedControlDeviceService(
-        decoratee: RemoteControlDeviceService(),
-      ),
-      batchControlDevicesService: DebouncedBatchControlDevicesService(
-        decoratee: RemoteBatchControlDevicesService(),
-      ),
-    )..add(FlushMountedPresenceSensorFetchStatusEvent());
-  }
-}

lib/pages/device_managment/flush_mounted_presence_sensor/models/flush_mounted_presence_sensor_model.dart

@@ -1,99 +0,0 @@
-import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
-
-class FlushMountedPresenceSensorModel {
-  FlushMountedPresenceSensorModel({
-    required this.presenceState,
-    required this.farDetection,
-    required this.illuminance,
-    required this.sensitivity,
-    required this.occurDistReduce,
-    required this.noneDelay,
-    required this.presenceDelay,
-    required this.nearDetection,
-    required this.sensiReduce,
-    required this.checkingResult,
-  });
-
-  static const String codePresenceState = 'presence_state';
-  static const String codeSensitivity = 'sensitivity';
-  static const String codeNearDetection = 'near_detection';
-  static const String codeFarDetection = 'far_detection';
-  static const String codeCheckingResult = 'checking_result';
-  static const String codePresenceDelay = 'presence_delay';
-  static const String codeNoneDelay = 'none_delay';
-  static const String codeOccurDistReduce = 'occur_dist_reduce';
-  static const String codeIlluminance = 'illum_value';
-  static const String codeSensiReduce = 'sensi_reduce';
-
-  String presenceState;
-  int sensitivity;
-  int nearDetection;
-  int farDetection;
-  String checkingResult;
-  int presenceDelay;
-  int noneDelay;
-  int occurDistReduce;
-  int illuminance;
-  int sensiReduce;
-
-  factory FlushMountedPresenceSensorModel.fromJson(List<Status> jsonList) {
-    String presenceState = 'none';
-    int sensitivity = 0;
-    int nearDetection = 0;
-    int farDetection = 0;
-    String checkingResult = 'none';
-    int presenceDelay = 0;
-    int noneDelay = 0;
-    int occurDistReduce = 0;
-    int illuminance = 0;
-    int sensiReduce = 0;
-
-    for (var status in jsonList) {
-      switch (status.code) {
-        case codePresenceState:
-          presenceState = status.value ?? 'presence';
-          break;
-        case codeSensitivity:
-          sensitivity = status.value ?? 0;
-          break;
-        case codeNearDetection:
-          nearDetection = status.value ?? 0;
-          break;
-        case codeFarDetection:
-          farDetection = status.value ?? 0;
-          break;
-        case codeCheckingResult:
-          checkingResult = status.value ?? 'check_success';
-          break;
-        case codePresenceDelay:
-          presenceDelay = status.value ?? 0;
-          break;
-        case codeNoneDelay:
-          noneDelay = status.value ?? 0;
-          break;
-        case codeOccurDistReduce:
-          occurDistReduce = status.value ?? 0;
-          break;
-        case codeIlluminance:
-          illuminance = status.value ?? 0;
-          break;
-        case codeSensiReduce:
-          sensiReduce = status.value ?? 0;
-          break;
-      }
-    }
-
-    return FlushMountedPresenceSensorModel(
-      presenceState: presenceState,
-      sensitivity: sensitivity,
-      nearDetection: nearDetection,
-      farDetection: farDetection,
-      checkingResult: checkingResult,
-      presenceDelay: presenceDelay,
-      noneDelay: noneDelay,
-      occurDistReduce: occurDistReduce,
-      illuminance: illuminance,
-      sensiReduce: sensiReduce,
-    );
-  }
-}

lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_batch_control_view.dart

@@ -1,176 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
-import 'package:syncrow_web/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/flush_mounted_presence_sensor/factories/flush_mounted_presence_sensor_bloc_factory.dart';
-import 'package:syncrow_web/pages/device_managment/flush_mounted_presence_sensor/models/flush_mounted_presence_sensor_model.dart';
-import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_reset.dart';
-import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presence_update_data.dart';
-import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
-
-class FlushMountedPresenceSensorBatchControlView extends StatelessWidget
-    with HelperResponsiveLayout {
-  const FlushMountedPresenceSensorBatchControlView({
-    required this.devicesIds,
-    super.key,
-  });
-
-  final List<String> devicesIds;
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocProvider(
-      create: (context) => FlushMountedPresenceSensorBlocFactory.create(
-        deviceId: devicesIds.first,
-      ),
-      child: BlocBuilder<FlushMountedPresenceSensorBloc,
-          FlushMountedPresenceSensorState>(
-        builder: (context, state) {
-          if (state is FlushMountedPresenceSensorLoadingInitialState ||
-              state is FlushMountedPresenceSensorDeviceReportsLoadingState) {
-            return const Center(child: CircularProgressIndicator());
-          } else if (state is FlushMountedPresenceSensorUpdateState) {
-            return _buildGridView(context, state.model);
-          }
-          return const Center(child: Text('Error fetching status'));
-        },
-      ),
-    );
-  }
-
-  Widget _buildGridView(
-    BuildContext context,
-    FlushMountedPresenceSensorModel model,
-  ) {
-    final isExtraLarge = isExtraLargeScreenSize(context);
-    final isLarge = isLargeScreenSize(context);
-    final isMedium = isMediumScreenSize(context);
-    return GridView(
-      padding: const EdgeInsets.symmetric(horizontal: 50),
-      shrinkWrap: true,
-      physics: const NeverScrollableScrollPhysics(),
-      gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-        crossAxisCount: isLarge || isExtraLarge
-            ? 3
-            : isMedium
-                ? 2
-                : 1,
-        mainAxisExtent: 140,
-        crossAxisSpacing: 12,
-        mainAxisSpacing: 12,
-      ),
-      children: [
-        PresenceUpdateData(
-          value: model.sensitivity.toDouble(),
-          title: 'Sensitivity:',
-          minValue: 0,
-          maxValue: 9,
-          steps: 1,
-          action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
-                FlushMountedPresenceSensorChangeValueEvent(
-                  code: FlushMountedPresenceSensorModel.codeSensitivity,
-                  value: value,
-                ),
-              ),
-        ),
-        PresenceUpdateData(
-          value: (model.nearDetection / 100).toDouble(),
-          title: 'Nearest Detect Dist:',
-          description: 'm',
-          minValue: 0.0,
-          maxValue: 9.5,
-          steps: 0.1,
-          valuesPercision: 1,
-          action: (double value) =>
-              context.read<FlushMountedPresenceSensorBloc>().add(
-                    FlushMountedPresenceSensorChangeValueEvent(
-                      code: FlushMountedPresenceSensorModel.codeNearDetection,
-                      value: (value * 100).toInt(),
-                    ),
-                  ),
-        ),
-        PresenceUpdateData(
-          value: (model.farDetection / 100).toDouble(),
-          title: 'Max Detect Dist:',
-          description: 'm',
-          minValue: 0.0,
-          maxValue: 9.5,
-          steps: 0.1,
-          valuesPercision: 1,
-          action: (double value) =>
-              context.read<FlushMountedPresenceSensorBloc>().add(
-                    FlushMountedPresenceSensorChangeValueEvent(
-                      code: FlushMountedPresenceSensorModel.codeFarDetection,
-                      value: (value * 100).toInt(),
-                    ),
-                  ),
-        ),
-        PresenceUpdateData(
-          value: model.presenceDelay.toDouble(),
-          title: 'Trigger Level:',
-          minValue: 0,
-          maxValue: 3,
-          steps: 1,
-          action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
-                FlushMountedPresenceSensorChangeValueEvent(
-                  code: FlushMountedPresenceSensorModel.codePresenceDelay,
-                  value: value,
-                ),
-              ),
-        ),
-        PresenceUpdateData(
-          value: (model.occurDistReduce.toDouble()),
-          title: 'Indent Level:',
-          minValue: 0,
-          maxValue: 3,
-          steps: 1,
-          action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
-                FlushMountedPresenceSensorChangeValueEvent(
-                  code: FlushMountedPresenceSensorModel.codeOccurDistReduce,
-                  value: value,
-                ),
-              ),
-        ),
-        PresenceUpdateData(
-          value: (model.sensiReduce.toDouble()),
-          title: 'Target Confirm Time:',
-          description: 's',
-          minValue: 0,
-          maxValue: 3,
-          steps: 1,
-          action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
-                FlushMountedPresenceSensorChangeValueEvent(
-                  code: FlushMountedPresenceSensorModel.codeSensiReduce,
-                  value: value,
-                ),
-              ),
-        ),
-        PresenceUpdateData(
-          value: ((model.noneDelay / 10).toDouble()),
-          description: 's',
-          title: 'Disappe Delay:',
-          minValue: 20,
-          maxValue: 300,
-          steps: 1,
-          action: (double value) =>
-              context.read<FlushMountedPresenceSensorBloc>().add(
-                    FlushMountedPresenceSensorChangeValueEvent(
-                      code: FlushMountedPresenceSensorModel.codeNoneDelay,
-                      value: (value * 10).round(),
-                    ),
-                  ),
-        ),
-        FactoryResetWidget(
-          callFactoryReset: () {
-            context.read<FlushMountedPresenceSensorBloc>().add(
-                  FlushMountedPresenceSensorFactoryResetEvent(
-                    deviceId: devicesIds.first,
-                    factoryReset: FactoryResetModel(devicesUuid: devicesIds),
-                  ),
-                );
-          },
-        ),
-      ],
-    );
-  }
-}

lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart

@@ -1,217 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
-import 'package:syncrow_web/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/flush_mounted_presence_sensor/factories/flush_mounted_presence_sensor_bloc_factory.dart';
-import 'package:syncrow_web/pages/device_managment/flush_mounted_presence_sensor/models/flush_mounted_presence_sensor_model.dart';
-import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presence_display_data.dart';
-import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presence_static_widget.dart';
-import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presence_status.dart';
-import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presence_update_data.dart';
-import 'package:syncrow_web/pages/device_managment/shared/table/description_view.dart';
-import 'package:syncrow_web/pages/device_managment/shared/table/report_table.dart';
-import 'package:syncrow_web/utils/constants/assets.dart';
-import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
-
-class FlushMountedPresenceSensorControlView extends StatelessWidget
-    with HelperResponsiveLayout {
-  const FlushMountedPresenceSensorControlView({super.key, required this.device});
-
-  final AllDevicesModel device;
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocProvider(
-      create: (context) => FlushMountedPresenceSensorBlocFactory.create(
-        deviceId: device.uuid ?? '-1',
-      ),
-      child: BlocBuilder<FlushMountedPresenceSensorBloc,
-          FlushMountedPresenceSensorState>(
-        builder: (context, state) {
-          if (state is FlushMountedPresenceSensorLoadingInitialState ||
-              state is FlushMountedPresenceSensorDeviceReportsLoadingState) {
-            return const Center(child: CircularProgressIndicator());
-          } else if (state is FlushMountedPresenceSensorUpdateState) {
-            return _buildGridView(context, state.model);
-          } else if (state is FlushMountedPresenceSensorDeviceReportsState) {
-            return ReportsTable(
-              report: state.deviceReport,
-              thirdColumnTitle:
-                  state.code == 'illuminance_value' ? "Value" : 'Status',
-              thirdColumnDescription:
-                  state.code == 'illuminance_value' ? "Lux" : null,
-              onRowTap: (index) {},
-              onClose: () {
-                context
-                    .read<FlushMountedPresenceSensorBloc>()
-                    .add(FlushMountedPresenceSensorBackToGridViewEvent());
-              },
-            );
-          } else if (state is FlushMountedPresenceSensorShowDescriptionState) {
-            return DescriptionView(
-              description: state.description,
-              onClose: () {
-                context
-                    .read<FlushMountedPresenceSensorBloc>()
-                    .add(FlushMountedPresenceSensorBackToGridViewEvent());
-              },
-            );
-          } else if (state is FlushMountedPresenceSensorDeviceReportsFailedState) {
-            final model =
-                context.read<FlushMountedPresenceSensorBloc>().deviceStatus;
-            return _buildGridView(context, model);
-          }
-          return const Center(
-            child: Text('Error fetching status', textAlign: TextAlign.center),
-          );
-        },
-      ),
-    );
-  }
-
-  Widget _buildGridView(
-    BuildContext context,
-    FlushMountedPresenceSensorModel model,
-  ) {
-    final isExtraLarge = isExtraLargeScreenSize(context);
-    final isLarge = isLargeScreenSize(context);
-    final isMedium = isMediumScreenSize(context);
-    return GridView(
-      padding: const EdgeInsets.symmetric(horizontal: 50),
-      shrinkWrap: true,
-      physics: const NeverScrollableScrollPhysics(),
-      gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-        crossAxisCount: isLarge || isExtraLarge
-            ? 3
-            : isMedium
-                ? 2
-                : 1,
-        mainAxisExtent: 140,
-        crossAxisSpacing: 12,
-        mainAxisSpacing: 12,
-      ),
-      children: [
-        PresenceState(
-          value: model.presenceState,
-        ),
-        PresenceDisplayValue(
-          value: model.illuminance.toString(),
-          postfix: 'Lux',
-          description: 'Illuminance Value',
-        ),
-        PresenceUpdateData(
-          value: model.sensitivity.toDouble(),
-          title: 'Sensitivity:',
-          minValue: 0,
-          maxValue: 9,
-          steps: 1,
-          action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
-                FlushMountedPresenceSensorChangeValueEvent(
-                  code: FlushMountedPresenceSensorModel.codeSensitivity,
-                  value: value,
-                ),
-              ),
-        ),
-        PresenceUpdateData(
-          value: (model.nearDetection / 100).toDouble(),
-          title: 'Nearest Detect Dist:',
-          description: 'm',
-          minValue: 0.0,
-          maxValue: 9.5,
-          steps: 0.1,
-          valuesPercision: 1,
-          action: (double value) =>
-              context.read<FlushMountedPresenceSensorBloc>().add(
-                    FlushMountedPresenceSensorChangeValueEvent(
-                      code: FlushMountedPresenceSensorModel.codeNearDetection,
-                      value: (value * 100).toInt(),
-                    ),
-                  ),
-        ),
-        PresenceUpdateData(
-          value: (model.farDetection / 100).toDouble(),
-          title: 'Max Detect Dist:',
-          description: 'm',
-          minValue: 0.0,
-          maxValue: 9.5,
-          steps: 0.1,
-          valuesPercision: 1,
-          action: (double value) =>
-              context.read<FlushMountedPresenceSensorBloc>().add(
-                    FlushMountedPresenceSensorChangeValueEvent(
-                      code: FlushMountedPresenceSensorModel.codeFarDetection,
-                      value: (value * 100).toInt(),
-                    ),
-                  ),
-        ),
-        PresenceUpdateData(
-          value: (model.presenceDelay.toDouble()),
-          title: 'Trigger Level:',
-          minValue: 0,
-          maxValue: 3,
-          steps: 1,
-          action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
-                FlushMountedPresenceSensorChangeValueEvent(
-                  code: FlushMountedPresenceSensorModel.codePresenceDelay,
-                  value: value,
-                ),
-              ),
-        ),
-        PresenceUpdateData(
-          value: (model.occurDistReduce.toDouble()),
-          title: 'Indent Level:',
-          minValue: 0,
-          maxValue: 3,
-          steps: 1,
-          action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
-                FlushMountedPresenceSensorChangeValueEvent(
-                  code: FlushMountedPresenceSensorModel.codeOccurDistReduce,
-                  value: value,
-                ),
-              ),
-        ),
-        PresenceUpdateData(
-          value: (model.sensiReduce.toDouble()),
-          title: 'Target Confirm Time:',
-          description: 's',
-          minValue: 0,
-          maxValue: 3,
-          steps: 1,
-          action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
-                FlushMountedPresenceSensorChangeValueEvent(
-                  code: FlushMountedPresenceSensorModel.codeSensiReduce,
-                  value: value,
-                ),
-              ),
-        ),
-        PresenceUpdateData(
-          value: ((model.noneDelay / 10).toDouble()),
-          description: 's',
-          title: 'Disappe Delay:',
-          minValue: 20,
-          maxValue: 300,
-          steps: 1,
-          action: (double value) =>
-              context.read<FlushMountedPresenceSensorBloc>().add(
-                    FlushMountedPresenceSensorChangeValueEvent(
-                      code: FlushMountedPresenceSensorModel.codeNoneDelay,
-                      value: (value * 10).round(),
-                    ),
-                  ),
-        ),
-        GestureDetector(
-          onTap: () => context.read<FlushMountedPresenceSensorBloc>().add(
-                FlushMountedPresenceSensorGetDeviceReportsEvent(
-                  code: 'presence_state',
-                  deviceUuid: device.uuid!,
-                ),
-              ),
-          child: const PresenceStaticWidget(
-            icon: Assets.presenceRecordIcon,
-            description: 'Presence Record',
-          ),
-        ),
-      ],
-    );
-  }
-}

lib/pages/device_managment/shared/sensors_widgets/presence_update_data.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/device_managment/shared/device_controls_container.dart';
 import 'package:syncrow_web/pages/device_managment/shared/increament_decreament.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
 class PresenceUpdateData extends StatefulWidget {
   const PresenceUpdateData({
@@ -14,7 +13,6 @@ class PresenceUpdateData extends StatefulWidget {
     required this.maxValue,
     required this.steps,
     this.description,
-    this.valuesPercision = 0,
   });
 
   final String title;
@@ -24,7 +22,6 @@ class PresenceUpdateData extends StatefulWidget {
   final double steps;
   final Function action;
   final String? description;
-  final int valuesPercision;
 
   @override
   State<PresenceUpdateData> createState() => _CurrentTempState();
@@ -48,7 +45,7 @@ class _CurrentTempState extends State<PresenceUpdateData> {
   }
 
   void _onValueChanged(double newValue) {
-    widget.action(newValue);
+    widget.action(newValue.toInt());
   }
 
   @override
@@ -65,14 +62,11 @@ class _CurrentTempState extends State<PresenceUpdateData> {
         children: [
           Text(
             widget.title,
-            style: context.textTheme.bodySmall?.copyWith(
-              color: ColorsManager.blackColor,
-              fontWeight: FontWeight.w400,
-              fontSize: 10,
-            ),
+            style: Theme.of(context).textTheme.bodySmall!.copyWith(
+                color: ColorsManager.blackColor, fontWeight: FontWeight.w400, fontSize: 10),
           ),
           IncrementDecrementWidget(
-              value: widget.value.toStringAsFixed(widget.valuesPercision),
+              value: widget.value.toString(),
               description: widget.description ?? '',
               descriptionColor: ColorsManager.blackColor,
               onIncrement: () {

lib/pages/device_managment/shared/sensors_widgets/presense_nobody_time.dart

@@ -84,6 +84,16 @@ class _PresenceUpdateDataState extends State<PresenceNoBodyTime> {
     }
   }
 
+  @override
+  void didUpdateWidget(PresenceNoBodyTime oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.value != widget.value) {
+      setState(() {
+        _currentValue = widget.value;
+      });
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     return DeviceControlsContainer(

lib/pages/device_managment/wall_sensor/bloc/wall_bloc.dart

@@ -21,6 +21,7 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
     on<ShowDescriptionEvent>(_showDescription);
     on<BackToGridViewEvent>(_backToGridView);
     on<WallSensorFactoryResetEvent>(_onFactoryReset);
+    on<WallSensorRealtimeUpdateEvent>(_onRealtimeUpdate);
   }
 
   void _fetchWallSensorStatus(
@@ -30,7 +31,7 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
       var response = await DevicesManagementApi().getDeviceStatus(deviceId);
       deviceStatus = WallSensorModel.fromJson(response.status);
       emit(WallSensorUpdateState(wallSensorModel: deviceStatus));
-      _listenToChanges(emit, deviceId);
+      _listenToChanges(deviceId);
     } catch (e) {
       emit(WallSensorFailedState(error: e.toString()));
       return;
@@ -52,28 +53,27 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
     }
   }
 
-  _listenToChanges(Emitter<WallSensorState> emit, deviceId) {
-    try {
-      DatabaseReference ref =
-          FirebaseDatabase.instance.ref('device-status/$deviceId');
-      Stream<DatabaseEvent> stream = ref.onValue;
+  void _listenToChanges(String deviceId) {
+    DatabaseReference ref =
+        FirebaseDatabase.instance.ref('device-status/$deviceId');
+    ref.onValue.listen((DatabaseEvent event) {
+      final data = event.snapshot.value as Map<dynamic, dynamic>?;
+      if (data == null) return;
 
-      stream.listen((DatabaseEvent event) {
-        Map<dynamic, dynamic> usersMap =
-            event.snapshot.value as Map<dynamic, dynamic>;
-        List<Status> statusList = [];
+      final statusList = (data['status'] as List?)
+          ?.map((e) => Status(code: e['code'], value: e['value']))
+          .toList();
 
-        usersMap['status'].forEach((element) {
-          statusList
-              .add(Status(code: element['code'], value: element['value']));
-        });
-
-        deviceStatus = WallSensorModel.fromJson(statusList);
-        emit(WallSensorLoadingNewSate(wallSensorModel: deviceStatus));
-      });
-    } catch (_) {}
+      if (statusList != null) {
+        final updatedDeviceStatus = WallSensorModel.fromJson(statusList);
+        if (!isClosed) {
+          add(WallSensorRealtimeUpdateEvent(updatedDeviceStatus));
+        }
+      }
+    });
   }
 
+
   void _changeValue(
       WallSensorChangeValueEvent event, Emitter<WallSensorState> emit) async {
     emit(WallSensorLoadingNewSate(wallSensorModel: deviceStatus));
@@ -195,4 +195,12 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
       emit(WallSensorFailedState(error: e.toString()));
     }
   }
+
+  void _onRealtimeUpdate(
+    WallSensorRealtimeUpdateEvent event,
+    Emitter<WallSensorState> emit,
+  ) {
+    deviceStatus = event.deviceStatus;
+    emit(WallSensorUpdateState(wallSensorModel: deviceStatus));
+  }
 }

lib/pages/device_managment/wall_sensor/bloc/wall_event.dart

@@ -1,5 +1,6 @@
 import 'package:equatable/equatable.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
+import 'package:syncrow_web/pages/device_managment/wall_sensor/model/wall_sensor_model.dart';
 
 abstract class WallSensorEvent extends Equatable {
   const WallSensorEvent();
@@ -70,3 +71,8 @@ class WallSensorFactoryResetEvent extends WallSensorEvent {
     required this.factoryReset,
   });
 }
+
+class WallSensorRealtimeUpdateEvent extends WallSensorEvent {
+  final WallSensorModel deviceStatus;
+  const WallSensorRealtimeUpdateEvent(this.deviceStatus);
+}

lib/pages/routines/helper/save_routine_helper.dart

@@ -5,6 +5,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/models/device_functions.dart';
+import 'package:syncrow_web/pages/routines/widgets/dialog_header.dart';
 import 'package:syncrow_web/pages/routines/widgets/dialog_footer.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
@@ -14,18 +15,13 @@ class SaveRoutineHelper {
   static Future<void> showSaveRoutineDialog(BuildContext context) async {
     return showDialog<void>(
       context: context,
-      builder: (context) {
+      builder: (BuildContext context) {
         return BlocBuilder<RoutineBloc, RoutineState>(
           builder: (context, state) {
-            final selectedConditionLabel = state.selectedAutomationOperator == 'and'
-                ? 'All Conditions are met'
-                : 'Any Condition is met';
-
             return AlertDialog(
               contentPadding: EdgeInsets.zero,
               content: Container(
-                width: context.screenWidth * 0.5,
-                height: 500,
+                width: MediaQuery.sizeOf(context).width * 0.5,
                 decoration: BoxDecoration(
                   color: Colors.white,
                   borderRadius: BorderRadius.circular(20),
@@ -33,42 +29,99 @@ class SaveRoutineHelper {
                 child: Column(
                   mainAxisSize: MainAxisSize.min,
                   children: [
-                    const SizedBox(height: 18),
-                    Text(
-                      'Create a scene: ${state.routineName ?? ""}',
-                      textAlign: TextAlign.center,
-                      style: Theme.of(context).textTheme.headlineMedium!.copyWith(
-                            color: ColorsManager.primaryColorWithOpacity,
-                            fontWeight: FontWeight.bold,
-                          ),
-                    ),
-                    const SizedBox(height: 18),
-                    _buildDivider(),
-                    _buildListsLabelRow(selectedConditionLabel),
-                    Expanded(
-                      child: Padding(
-                        padding: const EdgeInsetsDirectional.symmetric(
-                          horizontal: 16,
-                        ),
-                        child: Row(
-                          crossAxisAlignment: CrossAxisAlignment.start,
-                          mainAxisSize: MainAxisSize.min,
-                          spacing: 24,
-                          children: [
-                            _buildIfConditions(state, context),
-                            Container(
-                              width: 1,
-                              color: ColorsManager.greyColor.withValues(alpha: 0.8),
+                    DialogHeader('Create a scene: ${state.routineName ?? ""}'),
+                    Padding(
+                      padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+                      child: Row(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          // Left side - IF
+                          Expanded(
+                            child: ListView(
+                              // crossAxisAlignment: CrossAxisAlignment.start,
+                              shrinkWrap: true,
+                              children: [
+                                const Text(
+                                  'IF:',
+                                  style: TextStyle(
+                                    fontSize: 16,
+                                  ),
+                                ),
+                                const SizedBox(height: 8),
+                                if (state.isTabToRun)
+                                  ListTile(
+                                    leading: SvgPicture.asset(
+                                      Assets.tabToRun,
+                                      width: 24,
+                                      height: 24,
+                                    ),
+                                    title: const Text('Tab to run'),
+                                  ),
+                                if (state.isAutomation)
+                                  ...state.ifItems.map((item) {
+                                    final functions =
+                                        state.selectedFunctions[item['uniqueCustomId']] ?? [];
+                                    return functionRow(item, context, functions);
+                                  }),
+                              ],
                             ),
-                            _buildThenActions(state, context),
-                          ],
-                        ),
+                          ),
+                          const SizedBox(width: 16),
+                          // Right side - THEN items
+
+                          Expanded(
+                            child: ListView(
+                              // crossAxisAlignment: CrossAxisAlignment.start,
+                              shrinkWrap: true,
+                              children: [
+                                const Text(
+                                  'THEN:',
+                                  style: TextStyle(
+                                    fontSize: 16,
+                                  ),
+                                ),
+                                const SizedBox(height: 8),
+                                ...state.thenItems.map((item) {
+                                  final functions =
+                                      state.selectedFunctions[item['uniqueCustomId']] ?? [];
+                                  return functionRow(item, context, functions);
+                                }),
+                              ],
+                            ),
+                          ),
+                        ],
                       ),
                     ),
-                    _buildDivider(),
-                    const SizedBox(height: 8),
-                    _buildDialogFooter(context, state),
-                    const SizedBox(height: 8),
+                    // if (state.errorMessage != null || state.errorMessage!.isNotEmpty)
+                    //   Padding(
+                    //     padding: const EdgeInsets.all(8.0),
+                    //     child: Text(
+                    //       state.errorMessage!,
+                    //       style: const TextStyle(color: Colors.red),
+                    //     ),
+                    //   ),
+                    DialogFooter(
+                      onCancel: () => Navigator.pop(context),
+                      onConfirm: () async {
+                        if (state.isAutomation) {
+                          if (state.isUpdate ?? false) {
+                            context.read<RoutineBloc>().add(const UpdateAutomation());
+                          } else {
+                            context.read<RoutineBloc>().add(const CreateAutomationEvent());
+                          }
+                        } else {
+                          if (state.isUpdate ?? false) {
+                            context.read<RoutineBloc>().add(const UpdateScene());
+                          } else {
+                            context.read<RoutineBloc>().add(const CreateSceneEvent());
+                          }
+                        }
+                        // if (state.errorMessage == null || state.errorMessage!.isEmpty) {
+                        Navigator.pop(context);
+                        // }
+                      },
+                      isConfirmEnabled: true,
+                    ),
                   ],
                 ),
               ),
@@ -79,107 +132,8 @@ class SaveRoutineHelper {
     );
   }
 
-  static Container _buildDivider() {
-    return Container(
-      height: 1,
-      width: double.infinity,
-      color: ColorsManager.greyColor,
-    );
-  }
-
-  static Widget _buildListsLabelRow(String selectedConditionLabel) {
-    const textStyle = TextStyle(
-      fontSize: 16,
-    );
-    return Container(
-      color: ColorsManager.backgroundColor.withValues(alpha: 0.5),
-      padding: const EdgeInsetsDirectional.all(20),
-      child: Row(
-        spacing: 16,
-        children: [
-          Expanded(child: Text('IF: $selectedConditionLabel', style: textStyle)),
-          const Expanded(child: Text('THEN:', style: textStyle)),
-        ],
-      ),
-    );
-  }
-
-  static Widget _buildDialogFooter(BuildContext context, RoutineState state) {
-    return Row(
-      spacing: 16,
-      mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-      children: [
-        DialogFooterButton(
-          text: 'Cancel',
-          onTap: () => Navigator.pop(context),
-        ),
-        DialogFooterButton(
-          text: 'Confirm',
-          onTap: () {
-            if (state.isAutomation) {
-              if (state.isUpdate ?? false) {
-                context.read<RoutineBloc>().add(const UpdateAutomation());
-              } else {
-                context.read<RoutineBloc>().add(const CreateAutomationEvent());
-              }
-            } else {
-              if (state.isUpdate ?? false) {
-                context.read<RoutineBloc>().add(const UpdateScene());
-              } else {
-                context.read<RoutineBloc>().add(const CreateSceneEvent());
-              }
-            }
-
-            Navigator.pop(context);
-          },
-          textColor: ColorsManager.primaryColorWithOpacity,
-        ),
-      ],
-    );
-  }
-
-  static Widget _buildThenActions(RoutineState state, BuildContext context) {
-    return Expanded(
-      child: ListView(
-        // shrinkWrap: true,
-        children: state.thenItems.map((item) {
-          final functions = state.selectedFunctions[item['uniqueCustomId']] ?? [];
-          return functionRow(item, context, functions);
-        }).toList(),
-      ),
-    );
-  }
-
-  static Widget _buildIfConditions(RoutineState state, BuildContext context) {
-    return Expanded(
-      child: ListView(
-        // shrinkWrap: true,
-        children: [
-          if (state.isTabToRun)
-            ListTile(
-              leading: SvgPicture.asset(
-                Assets.tabToRun,
-                width: 24,
-                height: 24,
-              ),
-              title: const Text('Tab to run'),
-            ),
-          if (state.isAutomation)
-            ...state.ifItems.map((item) {
-              final functions =
-                  state.selectedFunctions[item['uniqueCustomId']] ?? [];
-              return functionRow(item, context, functions);
-            }),
-        ],
-      ),
-    );
-  }
-
   static Widget functionRow(
-    dynamic item,
-    BuildContext context,
-    List<DeviceFunctionData> functions,
-  ) {
+      dynamic item, BuildContext context, List<DeviceFunctionData> functions) {
     return Padding(
       padding: const EdgeInsets.only(top: 6),
       child: Row(
@@ -188,36 +142,19 @@ class SaveRoutineHelper {
           Expanded(
             child: Row(
               mainAxisAlignment: MainAxisAlignment.start,
-              spacing: 17,
+              spacing: 8,
               children: [
-                Container(
-                  width: 22,
-                  height: 22,
-                  padding: const EdgeInsetsDirectional.all(4),
-                  decoration: BoxDecoration(
-                    shape: BoxShape.circle,
-                    color: ColorsManager.textFieldGreyColor,
-                    border: Border.all(
-                      color: ColorsManager.neutralGray,
-                      width: 1.5,
-                    ),
-                  ),
-                  child: Center(
-                    child: item['type'] == 'tap_to_run' || item['type'] == 'scene'
-                        ? Image.memory(
-                            base64Decode(item['icon']),
-                            width: 12,
-                            height: 22,
-                            fit: BoxFit.scaleDown,
-                          )
-                        : SvgPicture.asset(
-                            item['imagePath'],
-                            width: 12,
-                            height: 12,
-                            fit: BoxFit.scaleDown,
-                          ),
-                  ),
-                ),
+                item['type'] == 'tap_to_run' || item['type'] == 'scene'
+                    ? Image.memory(
+                        base64Decode(item['icon']),
+                        width: 22,
+                        height: 22,
+                      )
+                    : SvgPicture.asset(
+                        item['imagePath'],
+                        width: 22,
+                        height: 22,
+                      ),
                 Flexible(
                   child: Column(
                     mainAxisAlignment: MainAxisAlignment.start,
@@ -229,25 +166,19 @@ class SaveRoutineHelper {
                         maxLines: 1,
                         overflow: TextOverflow.ellipsis,
                         style: context.textTheme.bodySmall?.copyWith(
-                          fontSize: 15,
+                          fontSize: 14,
                           color: ColorsManager.textPrimaryColor,
                         ),
                       ),
                       Wrap(
-                        runSpacing: 16,
-                        spacing: 4,
                         children: functions
-                            .map(
-                              (function) => Text(
-                                '${function.operationName}: ${function.value}',
-                                style: context.textTheme.bodySmall?.copyWith(
-                                  color: ColorsManager.grayColor,
-                                  fontSize: 8,
-                                ),
-                                overflow: TextOverflow.ellipsis,
-                                maxLines: 3,
-                              ),
-                            )
+                            .map((f) => Text(
+                                  '${f.operationName}: ${f.value}',
+                                  style: context.textTheme.bodySmall
+                                      ?.copyWith(color: ColorsManager.grayColor, fontSize: 8),
+                                  overflow: TextOverflow.ellipsis,
+                                  maxLines: 3,
+                                ))
                             .toList(),
                       ),
                     ],
@@ -266,13 +197,7 @@ class SaveRoutineHelper {
                 child: Row(
                   spacing: 2,
                   children: [
-                    SizedBox(
-                      width: 8,
-                      height: 8,
-                      child: SvgPicture.asset(
-                        Assets.deviceTagIcon,
-                      ),
-                    ),
+                    SizedBox(width: 8, height: 8, child: SvgPicture.asset(Assets.deviceTagIcon)),
                     Text(
                       item['tag'] ?? '',
                       textAlign: TextAlign.center,
@@ -293,12 +218,7 @@ class SaveRoutineHelper {
                   spacing: 2,
                   children: [
                     SizedBox(
-                      width: 8,
-                      height: 8,
-                      child: SvgPicture.asset(
-                        Assets.spaceLocationIcon,
-                      ),
-                    ),
+                        width: 8, height: 8, child: SvgPicture.asset(Assets.spaceLocationIcon)),
                     Text(
                       item['subSpace'] ?? '',
                       textAlign: TextAlign.center,

lib/pages/routines/widgets/dialog_footer.dart

@@ -28,40 +28,32 @@ class DialogFooter extends StatelessWidget {
       child: Row(
         mainAxisAlignment: MainAxisAlignment.spaceEvenly,
         children: [
-          DialogFooterButton(
+          _buildFooterButton(
+            context: context,
             text: 'Cancel',
             onTap: onCancel,
           ),
           if (isConfirmEnabled) ...[
             Container(width: 1, height: 50, color: ColorsManager.greyColor),
-            DialogFooterButton(
+            _buildFooterButton(
+              context: context,
               text: 'Confirm',
               onTap: onConfirm,
-              textColor: isConfirmEnabled
-                  ? ColorsManager.primaryColorWithOpacity
-                  : Colors.red,
+              textColor:
+                  isConfirmEnabled ? ColorsManager.primaryColorWithOpacity : Colors.red,
             ),
           ],
         ],
       ),
     );
   }
-}
 
-class DialogFooterButton extends StatelessWidget {
-  const DialogFooterButton({
-    required this.text,
-    required this.onTap,
-    this.textColor,
-    super.key,
-  });
-
-  final String text;
-  final VoidCallback? onTap;
-  final Color? textColor;
-
-  @override
-  Widget build(BuildContext context) {
+  Widget _buildFooterButton({
+    required BuildContext context,
+    required String text,
+    required VoidCallback? onTap,
+    Color? textColor,
+  }) {
     return Expanded(
       child: TextButton(
         style: TextButton.styleFrom(

lib/pages/routines/widgets/dialog_header.dart

@@ -16,7 +16,6 @@ class DialogHeader extends StatelessWidget {
         ),
         Text(
           title,
-          textAlign: TextAlign.center,
           style: Theme.of(context).textTheme.bodyMedium!.copyWith(
                 color: ColorsManager.primaryColorWithOpacity,
                 fontWeight: FontWeight.bold,

lib/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart

@@ -301,13 +301,12 @@ class OneGangSwitchHelper {
     DeviceFunctionData? selectedFunctionData,
     String selectCode,
   ) {
-    const twelveHoursInSeconds = 43200.0;
     final operationalValues = SwitchOperationalValue(
       icon: '',
       description: "sec",
       value: 0.0,
       minValue: 0,
-      maxValue: twelveHoursInSeconds,
+      maxValue: 86400,
       stepValue: 1,
     );
     return Slider(

lib/pages/routines/widgets/routine_dialogs/three_gang_switch_dialog.dart

@@ -303,13 +303,12 @@ class ThreeGangSwitchHelper {
     DeviceFunctionData? selectedFunctionData,
     String selectCode,
   ) {
-    const twelveHoursInSeconds = 43200.0;
     final operationalValues = SwitchOperationalValue(
       icon: '',
       description: "sec",
       value: 0.0,
       minValue: 0,
-      maxValue: twelveHoursInSeconds,
+      maxValue: 86400,
       stepValue: 1,
     );
     return Slider(

lib/pages/routines/widgets/routine_dialogs/two_gang_switch_dialog.dart

@@ -302,13 +302,12 @@ class TwoGangSwitchHelper {
     DeviceFunctionData? selectedFunctionData,
     String selectCode,
   ) {
-    const twelveHoursInSeconds = 43200.0;
     final operationalValues = SwitchOperationalValue(
       icon: '',
       description: "sec",
       value: 0.0,
       minValue: 0,
-      maxValue: twelveHoursInSeconds,
+      maxValue: 86400,
       stepValue: 1,
     );
     return Slider(

lib/pages/space_tree/view/space_tree_view.dart

@@ -41,12 +41,14 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
   @override
   Widget build(BuildContext context) {
     return BlocBuilder<SpaceTreeBloc, SpaceTreeState>(builder: (context, state) {
-      final communities =
-          state.searchQuery.isNotEmpty ? state.filteredCommunity : state.communityList;
+      final communities = state.searchQuery.isNotEmpty
+          ? state.filteredCommunity
+          : state.communityList;
       return Container(
         height: MediaQuery.sizeOf(context).height,
         decoration: widget.isSide == true
-            ? subSectionContainerDecoration.copyWith(color: ColorsManager.whiteColors)
+            ? subSectionContainerDecoration.copyWith(
+                color: ColorsManager.whiteColors)
             : const BoxDecoration(color: ColorsManager.whiteColors),
         child: state is SpaceTreeLoadingState
             ? const Center(child: CircularProgressIndicator())
@@ -79,10 +81,12 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
                                   style: context.textTheme.bodyMedium?.copyWith(
                                     color: ColorsManager.blackColor,
                                   ),
-                                  onChanged: (value) => context.read<SpaceTreeBloc>().add(
-                                        SearchQueryEvent(value),
-                                      ),
-                                  decoration: textBoxDecoration(radios: 20)?.copyWith(
+                                  onChanged: (value) =>
+                                      context.read<SpaceTreeBloc>().add(
+                                            SearchQueryEvent(value),
+                                          ),
+                                  decoration:
+                                      textBoxDecoration(radios: 20)?.copyWith(
                                     fillColor: Colors.white,
                                     suffixIcon: Padding(
                                       padding: const EdgeInsets.only(right: 16),
@@ -92,7 +96,8 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
                                         height: 24,
                                       ),
                                     ),
-                                    hintStyle: context.textTheme.bodyMedium?.copyWith(
+                                    hintStyle:
+                                        context.textTheme.bodyMedium?.copyWith(
                                       fontWeight: FontWeight.w400,
                                       fontSize: 12,
                                       color: ColorsManager.textGray,
@@ -116,30 +121,27 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
                     child: state.isSearching
                         ? const Center(child: CircularProgressIndicator())
                         : SidebarCommunitiesList(
-                            onScrollToEnd: () {
-                              if (!state.paginationIsLoading) {
-                                context.read<SpaceTreeBloc>().add(
-                                      PaginationEvent(
-                                        state.paginationModel,
-                                        state.communityList,
-                                      ),
-                                    );
-                              }
-                            },
+                            onScrollToEnd: () => context.read<SpaceTreeBloc>().add(
+                                  PaginationEvent(
+                                    state.paginationModel,
+                                    state.communityList,
+                                  ),
+                                ),
                             scrollController: _scrollController,
                             communities: communities,
                             itemBuilder: (context, index) {
                               return CustomExpansionTileSpaceTree(
                                 title: communities[index].name,
-                                isSelected:
-                                    state.selectedCommunities.contains(communities[index].uuid),
-                                isSoldCheck:
-                                    state.selectedCommunities.contains(communities[index].uuid),
-                                onExpansionChanged: () => context.read<SpaceTreeBloc>().add(
-                                      OnCommunityExpanded(
-                                        communities[index].uuid,
-                                      ),
-                                    ),
+                                isSelected: state.selectedCommunities
+                                    .contains(communities[index].uuid),
+                                isSoldCheck: state.selectedCommunities
+                                    .contains(communities[index].uuid),
+                                onExpansionChanged: () =>
+                                    context.read<SpaceTreeBloc>().add(
+                                          OnCommunityExpanded(
+                                            communities[index].uuid,
+                                          ),
+                                        ),
                                 isExpanded: state.expandedCommunities.contains(
                                   communities[index].uuid,
                                 ),
@@ -156,7 +158,8 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
                                   (space) {
                                     return CustomExpansionTileSpaceTree(
                                       title: space.name,
-                                      isExpanded: state.expandedSpaces.contains(space.uuid),
+                                      isExpanded:
+                                          state.expandedSpaces.contains(space.uuid),
                                       onItemSelected: () {
                                         context.read<SpaceTreeBloc>().add(
                                               OnSpaceSelected(
@@ -167,15 +170,18 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
                                             );
                                         widget.onSelect();
                                       },
-                                      onExpansionChanged: () => context.read<SpaceTreeBloc>().add(
-                                            OnSpaceExpanded(
-                                              communities[index].uuid,
-                                              space.uuid ?? '',
-                                            ),
-                                          ),
-                                      isSelected: state.selectedSpaces.contains(space.uuid) ||
+                                      onExpansionChanged: () =>
+                                          context.read<SpaceTreeBloc>().add(
+                                                OnSpaceExpanded(
+                                                  communities[index].uuid,
+                                                  space.uuid ?? '',
+                                                ),
+                                              ),
+                                      isSelected: state.selectedSpaces
+                                              .contains(space.uuid) ||
+                                          state.soldCheck.contains(space.uuid),
+                                      isSoldCheck:
                                           state.soldCheck.contains(space.uuid),
-                                      isSoldCheck: state.soldCheck.contains(space.uuid),
                                       children: _buildNestedSpaces(
                                         context,
                                         state,
@@ -204,8 +210,8 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
   ) {
     return space.children.map((child) {
       return CustomExpansionTileSpaceTree(
-        isSelected:
-            state.selectedSpaces.contains(child.uuid) || state.soldCheck.contains(child.uuid),
+        isSelected: state.selectedSpaces.contains(child.uuid) ||
+            state.soldCheck.contains(child.uuid),
         isSoldCheck: state.soldCheck.contains(child.uuid),
         title: child.name,
         isExpanded: state.expandedSpaces.contains(child.uuid),

lib/services/batch_control_devices_service.dart

@@ -1,85 +0,0 @@
-import 'dart:developer';
-
-import 'package:syncrow_web/services/api/http_service.dart';
-import 'package:syncrow_web/utils/constants/api_const.dart';
-
-abstract interface class BatchControlDevicesService {
-  Future<bool> batchControlDevices({
-    required List<String> uuids,
-    required String code,
-    required Object value,
-  });
-}
-
-final class RemoteBatchControlDevicesService implements BatchControlDevicesService {
-  @override
-  Future<bool> batchControlDevices({
-    required List<String> uuids,
-    required String code,
-    required Object value,
-  }) async {
-    try {
-      final body = {
-        'devicesUuid': uuids,
-        'code': code,
-        'value': value,
-        'operationType': 'COMMAND',
-      };
-
-      final response = await HTTPService().post(
-        path: ApiEndpoints.deviceBatchControl,
-        body: body,
-        showServerMessage: true,
-        expectedResponseModel: (json) => (json['success'] as bool?) ?? false,
-      );
-
-      return response;
-    } catch (e) {
-      log('Error fetching $e', name: 'BatchControlDevicesService');
-      return false;
-    }
-  }
-}
-
-final class DebouncedBatchControlDevicesService
-    implements BatchControlDevicesService {
-  final BatchControlDevicesService decoratee;
-  final Duration debounceDuration;
-
-  final _pendingRequests = <(List<String> uuids, String code, Object value)>[];
-  var _isProcessing = false;
-
-  DebouncedBatchControlDevicesService({
-    required this.decoratee,
-    this.debounceDuration = const Duration(milliseconds: 1500),
-  });
-
-  @override
-  Future<bool> batchControlDevices({
-    required List<String> uuids,
-    required String code,
-    required Object value,
-  }) async {
-    _pendingRequests.add((uuids, code, value));
-
-    if (_isProcessing) return false;
-
-    _isProcessing = true;
-
-    await Future.delayed(debounceDuration);
-
-    final lastRequest = _pendingRequests.last;
-    _pendingRequests.clear();
-
-    try {
-      final (lastRequestUuids, lastRequestCode, lastRequestValue) = lastRequest;
-      return decoratee.batchControlDevices(
-        uuids: lastRequestUuids,
-        code: lastRequestCode,
-        value: lastRequestValue,
-      );
-    } finally {
-      _isProcessing = false;
-    }
-  }
-}

lib/services/control_device_service.dart

@@ -1,75 +0,0 @@
-import 'dart:developer';
-
-import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
-import 'package:syncrow_web/services/api/http_service.dart';
-import 'package:syncrow_web/utils/constants/api_const.dart';
-
-abstract interface class ControlDeviceService {
-  Future<bool> controlDevice({
-    required String deviceUuid,
-    required Status status,
-  });
-}
-
-final class RemoteControlDeviceService implements ControlDeviceService {
-  @override
-  Future<bool> controlDevice({
-    required String deviceUuid,
-    required Status status,
-  }) async {
-    try {
-      final response = await HTTPService().post(
-        path: ApiEndpoints.deviceControl.replaceAll('{uuid}', deviceUuid),
-        body: status.toMap(),
-        showServerMessage: true,
-        expectedResponseModel: (json) {
-          return (json['success'] as bool?) ?? false;
-        },
-      );
-      return response;
-    } catch (e) {
-      log('Error fetching  $e', name: 'ControlDeviceService');
-      return false;
-    }
-  }
-}
-
-final class DebouncedControlDeviceService implements ControlDeviceService {
-  final ControlDeviceService decoratee;
-  final Duration debounceDuration;
-
-  DebouncedControlDeviceService({
-    required this.decoratee,
-    this.debounceDuration = const Duration(milliseconds: 1500),
-  });
-
-  final _pendingRequests = <(String deviceUuid, Status status)>[];
-  var _isProcessing = false;
-
-  @override
-  Future<bool> controlDevice({
-    required String deviceUuid,
-    required Status status,
-  }) async {
-    _pendingRequests.add((deviceUuid, status));
-
-    if (_isProcessing) return false;
-
-    _isProcessing = true;
-
-    await Future.delayed(debounceDuration);
-
-    final lastRequest = _pendingRequests.last;
-    _pendingRequests.clear();
-
-    try {
-      final (lastRequestDeviceUuid, lastRequestStatus) = lastRequest;
-      return decoratee.controlDevice(
-        deviceUuid: lastRequestDeviceUuid,
-        status: lastRequestStatus,
-      );
-    } finally {
-      _isProcessing = false;
-    }
-  }
-}

pubspec.yaml

@@ -60,7 +60,6 @@ dependencies:
   firebase_core: ^3.11.0
   firebase_crashlytics: ^4.3.2
   firebase_database: ^11.3.2
-  bloc: ^8.1.4
 
 
 dev_dependencies: