Refactor widget lifecycle methods for temperature control and presence sensor

Sp 1441 fe on routine creation page when the user drags a card that has signs and selects a sign without a number then confirms the value appears to be null

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;
+    late ScrollController _scrollController;
-    scrollController = ScrollController();
+    _scrollController = ScrollController();
 
-    void scrollToCenter() {
+    void _scrollToCenter() {
-      final double middlePosition = scrollController.position.maxScrollExtent / 2;
+      final double middlePosition = _scrollController.position.maxScrollExtent / 2;
-      scrollController.animateTo(
+      _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/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(
+            return _buildGridView(context, state.ceilingSensorModel,
-                context, state.ceilingSensorModel, isExtraLarge, isLarge, isMedium);
+                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,
+  Widget _buildGridView(BuildContext context, CeilingSensorModel model,
-      bool isLarge, bool isMedium) {
+      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(
+            context.read<CeilingSensorBloc>().add(GetCeilingDeviceReportsEvent(
-                GetCeilingDeviceReportsEvent(code: 'presence_state', deviceUuid: device.uuid!));
+                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
+            context.read<CeilingSensorBloc>().add(GetCeilingDeviceReportsEvent(
-                .read<CeilingSensorBloc>()
+                code: '', deviceUuid: device.uuid!));
-                .add(GetCeilingDeviceReportsEvent(code: '', deviceUuid: device.uuid!));
           },
           child: const PresenceStaticWidget(
             icon: Assets.helpDescriptionIcon,

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,27 +53,26 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
     }
   }
 
-  _listenToChanges(Emitter<WallSensorState> emit, deviceId) {
+  void _listenToChanges(String deviceId) {
-    try {
     DatabaseReference ref =
         FirebaseDatabase.instance.ref('device-status/$deviceId');
-      Stream<DatabaseEvent> stream = ref.onValue;
+    ref.onValue.listen((DatabaseEvent event) {
+      final data = event.snapshot.value as Map<dynamic, dynamic>?;
+      if (data == null) return;
 
-      stream.listen((DatabaseEvent event) {
+      final statusList = (data['status'] as List?)
-        Map<dynamic, dynamic> usersMap =
+          ?.map((e) => Status(code: e['code'], value: e['value']))
-            event.snapshot.value as Map<dynamic, dynamic>;
+          .toList();
-        List<Status> statusList = [];
 
-        usersMap['status'].forEach((element) {
+      if (statusList != null) {
-          statusList
+        final updatedDeviceStatus = WallSensorModel.fromJson(statusList);
-              .add(Status(code: element['code'], value: element['value']));
+        if (!isClosed) {
-        });
+          add(WallSensorRealtimeUpdateEvent(updatedDeviceStatus));
-
-        deviceStatus = WallSensorModel.fromJson(statusList);
-        emit(WallSensorLoadingNewSate(wallSensorModel: deviceStatus));
-      });
-    } catch (_) {}
         }
+      }
+    });
+  }
+
 
   void _changeValue(
       WallSensorChangeValueEvent event, Emitter<WallSensorState> emit) async {
@@ -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,
+                width: MediaQuery.sizeOf(context).width * 0.5,
-                height: 500,
                 decoration: BoxDecoration(
                   color: Colors.white,
                   borderRadius: BorderRadius.circular(20),
@@ -33,128 +29,25 @@ class SaveRoutineHelper {
                 child: Column(
                   mainAxisSize: MainAxisSize.min,
                   children: [
-                    const SizedBox(height: 18),
+                    DialogHeader('Create a scene: ${state.routineName ?? ""}'),
-                    Text(
+                    Padding(
-                      'Create a scene: ${state.routineName ?? ""}',
+                      padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
-                      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),
+                          // Left side - IF
-                            Container(
+                          Expanded(
-                              width: 1,
+                            child: ListView(
-                              color: ColorsManager.greyColor.withValues(alpha: 0.8),
+                              // crossAxisAlignment: CrossAxisAlignment.start,
-                            ),
+                              shrinkWrap: true,
-                            _buildThenActions(state, context),
+                              children: [
-                          ],
+                                const Text(
-                        ),
+                                  'IF:',
-                      ),
+                                  style: TextStyle(
-                    ),
-                    _buildDivider(),
-                    const SizedBox(height: 8),
-                    _buildDialogFooter(context, state),
-                    const SizedBox(height: 8),
-                  ],
-                ),
-              ),
-            );
-          },
-        );
-      },
-    );
-  }
-
-  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(
+                                const SizedBox(height: 8),
-          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(
@@ -172,14 +65,75 @@ class SaveRoutineHelper {
                                   }),
                               ],
                             ),
+                          ),
+                          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);
+                                }),
+                              ],
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                    // 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,
+                    ),
+                  ],
+                ),
+              ),
+            );
+          },
+        );
+      },
     );
   }
 
   static Widget functionRow(
-    dynamic item,
+      dynamic item, BuildContext context, List<DeviceFunctionData> functions) {
-    BuildContext context,
-    List<DeviceFunctionData> functions,
-  ) {
     return Padding(
       padding: const EdgeInsets.only(top: 6),
       child: Row(
@@ -188,35 +142,18 @@ class SaveRoutineHelper {
           Expanded(
             child: Row(
               mainAxisAlignment: MainAxisAlignment.start,
-              spacing: 17,
+              spacing: 8,
               children: [
-                Container(
+                item['type'] == 'tap_to_run' || item['type'] == 'scene'
-                  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,
+                        width: 22,
                         height: 22,
-                            fit: BoxFit.scaleDown,
                       )
                     : SvgPicture.asset(
                         item['imagePath'],
-                            width: 12,
+                        width: 22,
-                            height: 12,
+                        height: 22,
-                            fit: BoxFit.scaleDown,
-                          ),
-                  ),
                       ),
                 Flexible(
                   child: Column(
@@ -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(
+                            .map((f) => Text(
-                              (function) => Text(
+                                  '${f.operationName}: ${f.value}',
-                                '${function.operationName}: ${function.value}',
+                                  style: context.textTheme.bodySmall
-                                style: context.textTheme.bodySmall?.copyWith(
+                                      ?.copyWith(color: ColorsManager.grayColor, fontSize: 8),
-                                  color: ColorsManager.grayColor,
-                                  fontSize: 8,
-                                ),
                                   overflow: TextOverflow.ellipsis,
                                   maxLines: 3,
-                              ),
+                                ))
-                            )
                             .toList(),
                       ),
                     ],
@@ -266,13 +197,7 @@ class SaveRoutineHelper {
                 child: Row(
                   spacing: 2,
                   children: [
-                    SizedBox(
+                    SizedBox(width: 8, height: 8, child: SvgPicture.asset(Assets.deviceTagIcon)),
-                      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,
+                        width: 8, height: 8, child: SvgPicture.asset(Assets.spaceLocationIcon)),
-                      height: 8,
-                      child: SvgPicture.asset(
-                        Assets.spaceLocationIcon,
-                      ),
-                    ),
                     Text(
                       item['subSpace'] ?? '',
                       textAlign: TextAlign.center,

lib/pages/routines/view/routines_view.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_event.dart';
 import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_bloc.dart';
+import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_event.dart';
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/create_new_routines/create_new_routines.dart';
 import 'package:syncrow_web/pages/routines/view/create_new_routine_view.dart';
@@ -9,6 +9,7 @@ import 'package:syncrow_web/pages/routines/widgets/main_routine_view/fetch_routi
 import 'package:syncrow_web/pages/routines/widgets/main_routine_view/routine_view_card.dart';
 import 'package:syncrow_web/pages/space_tree/view/space_tree_view.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
 class RoutinesView extends StatefulWidget {
   const RoutinesView({super.key});
@@ -27,9 +28,10 @@ class _RoutinesViewState extends State<RoutinesView> {
     if (result == null) return;
     final communityId = result['community'];
     final spaceId = result['space'];
-    final _bloc = BlocProvider.of<CreateRoutineBloc>(context);
+    final bloc = BlocProvider.of<CreateRoutineBloc>(context);
     final routineBloc = context.read<RoutineBloc>();
-    _bloc.add(SaveCommunityIdAndSpaceIdEvent(communityID: communityId, spaceID: spaceId));
+    bloc.add(
+        SaveCommunityIdAndSpaceIdEvent(communityID: communityId, spaceID: spaceId));
     await Future.delayed(const Duration(seconds: 1));
     routineBloc.add(const CreateNewRoutineViewEvent(createRoutineView: true));
   }
@@ -54,13 +56,15 @@ class _RoutinesViewState extends State<RoutinesView> {
             ),
             Expanded(
               flex: 4,
-              child: ListView(
+              child: SizedBox(
-                children: [
+                height: context.screenHeight,
-                  Container(
+                width: context.screenWidth,
-                    padding: const EdgeInsets.all(16),
+                child: SingleChildScrollView(
-                    height: MediaQuery.sizeOf(context).height,
+                  padding: const EdgeInsetsDirectional.all(16),
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
+                    mainAxisAlignment: MainAxisAlignment.start,
+                    spacing: 16,
                     children: [
                       Text(
                         "Create New Routines",
@@ -69,7 +73,6 @@ class _RoutinesViewState extends State<RoutinesView> {
                               fontWeight: FontWeight.bold,
                             ),
                       ),
-                        const SizedBox(height: 10),
                       RoutineViewCard(
                         isLoading: false,
                         onChanged: (v) {},
@@ -84,13 +87,10 @@ class _RoutinesViewState extends State<RoutinesView> {
                         icon: Icons.add,
                         textString: '',
                       ),
-                        const SizedBox(height: 15),
+                      const FetchRoutineScenesAutomation(),
-                        const Expanded(child: FetchRoutineScenesAutomation()),
                     ],
                   ),
                 ),
-                  const SizedBox(height: 50),
-                ],
               ),
             )
           ],

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
+              textColor:
-                  ? ColorsManager.primaryColorWithOpacity
+                  isConfirmEnabled ? ColorsManager.primaryColorWithOpacity : Colors.red,
-                  : Colors.red,
             ),
           ],
         ],
       ),
     );
   }
-}
 
-class DialogFooterButton extends StatelessWidget {
+  Widget _buildFooterButton({
-  const DialogFooterButton({
+    required BuildContext context,
-    required this.text,
+    required String text,
-    required this.onTap,
+    required VoidCallback? onTap,
-    this.textColor,
+    Color? textColor,
-    super.key,
+  }) {
-  });
-
-  final String text;
-  final VoidCallback? onTap;
-  final Color? textColor;
-
-  @override
-  Widget build(BuildContext context) {
     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/dragable_card.dart

@@ -225,7 +225,7 @@ class DraggableCard extends StatelessWidget {
     if (function.functionCode == 'temp_set' || function.functionCode == 'temp_current') {
       return '${(function.value / 10).toStringAsFixed(0)}°C';
     } else if (function.functionCode.contains('countdown')) {
-      final seconds = function.value.toInt();
+      final seconds = function.value?.toInt() ?? 0;
       if (seconds >= 3600) {
         final hours = (seconds / 3600).floor();
         final remainingMinutes = ((seconds % 3600) / 60).floor();

lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart

@@ -8,67 +8,121 @@ import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
-class FetchRoutineScenesAutomation extends StatefulWidget {
+class FetchRoutineScenesAutomation extends StatelessWidget
-  const FetchRoutineScenesAutomation({super.key});
-
-  @override
-  State<FetchRoutineScenesAutomation> createState() =>
-      _FetchRoutineScenesState();
-}
-
-class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
     with HelperResponsiveLayout {
-  @override
+  const FetchRoutineScenesAutomation({super.key});
-  void initState() {
-    super.initState();
-  }
 
   @override
   Widget build(BuildContext context) {
     return BlocBuilder<RoutineBloc, RoutineState>(
       builder: (context, state) {
-        return state.isLoading
+        if (state.isLoading) return const Center(child: CircularProgressIndicator());
-            ? const Center(
+
-                child: CircularProgressIndicator(),
+        return SingleChildScrollView(
-              )
-            : SingleChildScrollView(
           child: Padding(
             padding: const EdgeInsets.symmetric(vertical: 16.0),
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               mainAxisSize: MainAxisSize.min,
               children: [
-                      Text(
+                _buildListTitle(context, "Scenes (Tab to Run)"),
-                        "Scenes (Tab to Run)",
+                const SizedBox(height: 10),
-                        style: Theme.of(context).textTheme.titleLarge?.copyWith(
+                Visibility(
-                              color: ColorsManager.grayColor,
+                  visible: state.scenes.isNotEmpty,
-                              fontWeight: FontWeight.bold,
+                  replacement: _buildEmptyState(context, "No scenes found"),
+                  child: SizedBox(
+                    height: 200,
+                    child: _buildScenes(state),
                   ),
                 ),
                 const SizedBox(height: 10),
-                      if (state.scenes.isEmpty)
+                _buildListTitle(context, "Automations"),
-                        Text(
+                const SizedBox(height: 3),
-                          "No scenes found",
+                Visibility(
-                          style: context.textTheme.bodyMedium?.copyWith(
+                  visible: state.automations.isNotEmpty,
-                            color: ColorsManager.grayColor,
+                  replacement: _buildEmptyState(context, "No automations found"),
-                          ),
+                  child: SizedBox(
-                        ),
-                      if (state.scenes.isNotEmpty)
-                        SizedBox(
                     height: 200,
-                          child: ListView.builder(
+                    child: _buildAutomations(state),
-                              shrinkWrap: true,
+                  ),
+                )
+              ],
+            ),
+          ),
+        );
+      },
+    );
+  }
+
+  Widget _buildAutomations(RoutineState state) {
+    return ListView.builder(
+      scrollDirection: Axis.horizontal,
+      itemCount: state.automations.length,
+      itemBuilder: (context, index) {
+        final isLoading = state.automations.contains(state.automations[index].id);
+
+        return Column(
+          children: [
+            Padding(
+              padding: EdgeInsets.only(
+                right: isSmallScreenSize(context) ? 4.0 : 8.0,
+              ),
+              child: RoutineViewCard(
+                isLoading: isLoading,
+                onChanged: (v) {
+                  context.read<RoutineBloc>().add(
+                        UpdateAutomationStatus(
+                          automationId: state.automations[index].id,
+                          automationStatusUpdate: AutomationStatusUpdate(
+                            spaceUuid: state.automations[index].spaceId,
+                            isEnable: v,
+                          ),
+                          communityId: state.automations[index].communityId,
+                        ),
+                      );
+                },
+                status: state.automations[index].status,
+                communityId: '',
+                spaceId: state.automations[index].spaceId,
+                sceneId: '',
+                automationId: state.automations[index].id,
+                cardType: 'automations',
+                spaceName: state.automations[index].spaceName,
+                onTap: () {
+                  BlocProvider.of<RoutineBloc>(context).add(
+                    const CreateNewRoutineViewEvent(
+                      createRoutineView: true,
+                    ),
+                  );
+                  context.read<RoutineBloc>().add(
+                        GetAutomationDetails(
+                          automationId: state.automations[index].id,
+                          isAutomation: true,
+                          isUpdate: true,
+                        ),
+                      );
+                },
+                textString: state.automations[index].name,
+                icon: state.automations[index].icon ?? Assets.automation,
+              ),
+            ),
+          ],
+        );
+      },
+    );
+  }
+
+  Widget _buildScenes(RoutineState state) {
+    return ListView.builder(
         scrollDirection: Axis.horizontal,
         itemCount: state.scenes.length,
         itemBuilder: (context, index) {
           final scene = state.scenes[index];
-                                final isLoading =
+          final isLoading = state.loadingSceneId == scene.id;
-                                    state.loadingSceneId == scene.id;
 
           return Padding(
             padding: EdgeInsets.only(
-                                    right:
+              right: isSmallScreenSize(context) ? 4.0 : 8.0,
-                                        isSmallScreenSize(context) ? 4.0 : 8.0,
             ),
             child: Column(
               children: [
@@ -78,141 +132,58 @@ class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
                     context.read<RoutineBloc>().add(
                           SceneTrigger(
                             sceneId: scene.id,
-                                                  name: scene.name));
+                            name: scene.name,
+                          ),
+                        );
                   },
                   status: state.scenes[index].status,
-                                        communityId:
+                  communityId: state.scenes[index].communityId,
-                                            state.scenes[index].communityId ??
-                                                '',
                   spaceId: state.scenes[index].spaceId,
-                                        sceneId:
+                  sceneId: state.scenes[index].sceneTuyaId!,
-                                            state.scenes[index].sceneTuyaId!,
                   automationId: state.scenes[index].id,
                   cardType: 'scenes',
-                                        spaceName:
+                  spaceName: state.scenes[index].spaceName,
-                                            state.scenes[index].spaceName,
                   onTap: () {
-                                          BlocProvider.of<RoutineBloc>(context)
+                    BlocProvider.of<RoutineBloc>(context).add(
-                                              .add(
                       const CreateNewRoutineViewEvent(
-                                                createRoutineView: true),
+                        createRoutineView: true,
+                      ),
                     );
                     context.read<RoutineBloc>().add(
                           GetSceneDetails(
-                                                  sceneId:
+                            sceneId: state.scenes[index].id,
-                                                      state.scenes[index].id,
                             isTabToRun: true,
                             isUpdate: true,
                           ),
                         );
                   },
                   textString: state.scenes[index].name,
-                                        icon: state.scenes[index].icon ??
+                  icon: state.scenes[index].icon ?? Assets.logoHorizontal,
-                                            Assets.logoHorizontal,
                   isFromScenes: true,
-                                        iconInBytes:
+                  iconInBytes: state.scenes[index].iconInBytes,
-                                            state.scenes[index].iconInBytes,
                 ),
               ],
             ),
           );
-                              }),
+        });
-                        ),
+  }
-                      const SizedBox(height: 10),
+
-                      Text(
+  Widget _buildListTitle(BuildContext context, String title) {
-                        "Automations",
+    return Text(
+      title,
       style: Theme.of(context).textTheme.titleLarge?.copyWith(
             color: ColorsManager.grayColor,
             fontWeight: FontWeight.bold,
           ),
-                      ),
+    );
-                      const SizedBox(height: 3),
+  }
-                      if (state.automations.isEmpty)
+
-                        Text(
+  Widget _buildEmptyState(BuildContext context, String title) {
-                          "No automations found",
+    return Text(
+      title,
       style: context.textTheme.bodyMedium?.copyWith(
         color: ColorsManager.grayColor,
       ),
-                        ),
-                      if (state.automations.isNotEmpty)
-                        SizedBox(
-                          height: 200, 
-
-                          child: ListView.builder(
-                              shrinkWrap: true,
-                              scrollDirection: Axis.horizontal,
-                              itemCount: state.automations.length,
-                              itemBuilder: (context, index) {
-                                final isLoading = state.automations!
-                                    .contains(state.automations[index].id);
-
-                                return Column(
-                                  children: [
-                                    Padding(
-                                      padding: EdgeInsets.only(
-                                        right: isSmallScreenSize(context)
-                                            ? 4.0
-                                            : 8.0,
-                                      ),
-                                      child: RoutineViewCard(
-                                        isLoading: isLoading,
-                                        onChanged: (v) {
-                                          context.read<RoutineBloc>().add(
-                                                UpdateAutomationStatus(
-                                                  automationId: state
-                                                      .automations[index].id,
-                                                  automationStatusUpdate:
-                                                      AutomationStatusUpdate(
-                                                          spaceUuid: state
-                                                              .automations[
-                                                                  index]
-                                                              .spaceId,
-                                                          isEnable: v),
-                                                  communityId: state
-                                                      .automations[index]
-                                                      .communityId,
-                                                ),
-                                              );
-                                        },
-                                        status: state.automations[index].status,
-                                        communityId: '',
-                                        spaceId:
-                                            state.automations[index].spaceId,
-                                        sceneId: '',
-                                        automationId:
-                                            state.automations[index].id,
-                                        cardType: 'automations',
-                                        spaceName:
-                                            state.automations[index].spaceName,
-                                        onTap: () {
-                                          BlocProvider.of<RoutineBloc>(context)
-                                              .add(
-                                            const CreateNewRoutineViewEvent(
-                                                createRoutineView: true),
-                                          );
-                                          context.read<RoutineBloc>().add(
-                                                GetAutomationDetails(
-                                                    automationId: state
-                                                        .automations[index].id,
-                                                    isAutomation: true,
-                                                    isUpdate: true),
-                                              );
-                                        },
-                                        textString:
-                                            state.automations[index].name,
-                                        icon: state.automations[index].icon ??
-                                            Assets.automation,
-                                      ),
-                                    ),
-                                  ],
-                                );
-                              }),
-                        ),
-                    ],
-                  ),
-                ),
-              );
-      },
     );
   }
 }

lib/pages/routines/widgets/main_routine_view/routine_view_card.dart

@@ -1,4 +1,5 @@
 import 'dart:async';
+
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -66,7 +67,6 @@ class _RoutineViewCardState extends State<RoutineViewCard> {
 
   @override
   Widget build(BuildContext context) {
-    // Use widget.<mixinMethod> instead of just <mixinMethod>
     final double cardWidth = widget.isSmallScreenSize(context)
         ? 120
         : widget.isMediumScreenSize(context)
@@ -127,22 +127,23 @@ class _RoutineViewCardState extends State<RoutineViewCard> {
                             )
                           else
                             CupertinoSwitch(
-                              activeColor: ColorsManager.primaryColor,
+                              activeTrackColor: ColorsManager.primaryColor,
                               value: widget.status == 'enable',
                               onChanged: widget.onChanged,
                             )
                         ],
                       )
                     : const SizedBox(),
-                InkWell(
+                Column(
-                  onTap: widget.onTap,
-                  child: Column(
                   children: [
                     Center(
+                      child: InkWell(
+                        customBorder: const CircleBorder(),
+                        onTap: widget.onTap,
                         child: Container(
                           decoration: BoxDecoration(
                             color: ColorsManager.graysColor,
-                            borderRadius: BorderRadius.circular(120),
+                            shape: BoxShape.circle,
                             border: Border.all(
                               color: ColorsManager.greyColor,
                               width: 2.0,
@@ -158,7 +159,8 @@ class _RoutineViewCardState extends State<RoutineViewCard> {
                                       height: iconSize,
                                       width: iconSize,
                                       fit: BoxFit.contain,
-                                      errorBuilder: (context, error, stackTrace) => Image.asset(
+                                      errorBuilder: (context, error, stackTrace) =>
+                                          Image.asset(
                                         Assets.logo,
                                         height: iconSize,
                                         width: iconSize,
@@ -171,7 +173,8 @@ class _RoutineViewCardState extends State<RoutineViewCard> {
                                       width: iconSize,
                                       fit: BoxFit.contain,
                                     )
-                              : (widget.icon is String && widget.icon.endsWith('.svg'))
+                              : (widget.icon is String &&
+                                      widget.icon.endsWith('.svg'))
                                   ? SvgPicture.asset(
                                       height: iconSize,
                                       width: iconSize,
@@ -181,7 +184,10 @@ class _RoutineViewCardState extends State<RoutineViewCard> {
                                   : Icon(
                                       widget.icon,
                                       color: ColorsManager.dialogBlueTitle,
-                                      size: widget.isSmallScreenSize(context) ? 30 : 40,
+                                      size: widget.isSmallScreenSize(context)
+                                          ? 30
+                                          : 40,
+                                    ),
                         ),
                       ),
                     ),
@@ -216,7 +222,8 @@ class _RoutineViewCardState extends State<RoutineViewCard> {
                                   maxLines: 1,
                                   style: context.textTheme.bodySmall?.copyWith(
                                     color: ColorsManager.blackColor,
-                                      fontSize: widget.isSmallScreenSize(context) ? 10 : 12,
+                                    fontSize:
+                                        widget.isSmallScreenSize(context) ? 10 : 12,
                                   ),
                                 ),
                               ],
@@ -226,7 +233,6 @@ class _RoutineViewCardState extends State<RoutineViewCard> {
                     ),
                   ],
                 ),
-                ),
               ],
             ),
           ),

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

@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
+import 'package:syncrow_web/pages/routines/bloc/functions_bloc/functions_bloc_bloc.dart';
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/models/ac/ac_function.dart';
 import 'package:syncrow_web/pages/routines/models/ac/ac_operational_value.dart';
@@ -9,8 +11,6 @@ import 'package:syncrow_web/pages/routines/widgets/dialog_footer.dart';
 import 'package:syncrow_web/pages/routines/widgets/dialog_header.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/routines/bloc/functions_bloc/functions_bloc_bloc.dart';
 
 class ACHelper {
   static Future<Map<String, dynamic>?> showACFunctionsDialog({
@@ -74,10 +74,8 @@ class ACHelper {
                               child: _buildFunctionsList(
                                 context: context,
                                 acFunctions: acFunctions,
-                                onFunctionSelected:
+                                onFunctionSelected: (functionCode, operationName) =>
-                                    (functionCode, operationName) => context
+                                    context.read<FunctionBloc>().add(SelectFunction(
-                                        .read<FunctionBloc>()
-                                        .add(SelectFunction(
                                           functionCode: functionCode,
                                           operationName: operationName,
                                         )),
@@ -191,8 +189,9 @@ class ACHelper {
     required String operationName,
     bool? removeComparators,
   }) {
+    final initialVal = selectedFunction == 'temp_set' ? 200 : -100;
     if (selectedFunction == 'temp_set' || selectedFunction == 'temp_current') {
-      final initialValue = selectedFunctionData?.value ?? 250;
+      final initialValue = selectedFunctionData?.value ?? initialVal;
       return _buildTemperatureSelector(
         context: context,
         initialValue: initialValue,
@@ -205,8 +204,7 @@ class ACHelper {
       );
     }
 
-    final selectedFn =
+    final selectedFn = acFunctions.firstWhere((f) => f.code == selectedFunction);
-        acFunctions.firstWhere((f) => f.code == selectedFunction);
     final values = selectedFn.getOperationalValues();
 
     return _buildOperationalValuesList(
@@ -287,7 +285,9 @@ class ACHelper {
                   functionCode: selectCode,
                   operationName: operationName,
                   condition: conditions[index],
-                  value: selectedFunctionData?.value,
+                  value: selectedFunctionData?.value ?? selectCode == 'temp_set'
+                      ? 200
+                      : -100,
                   valueDescription: selectedFunctionData?.valueDescription,
                 ),
               ),
@@ -302,8 +302,7 @@ class ACHelper {
         minHeight: 40.0,
         minWidth: 40.0,
       ),
-      isSelected:
+      isSelected: conditions.map((c) => c == (currentCondition ?? "==")).toList(),
-          conditions.map((c) => c == (currentCondition ?? "==")).toList(),
       children: conditions.map((c) => Text(c)).toList(),
     );
   }
@@ -317,6 +316,7 @@ class ACHelper {
     DeviceFunctionData? selectedFunctionData,
     String selectCode,
   ) {
+    final initialVal = selectCode == 'temp_set' ? 200 : -100;
     return Container(
       padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 10),
       decoration: BoxDecoration(
@@ -324,7 +324,7 @@ class ACHelper {
         borderRadius: BorderRadius.circular(10),
       ),
       child: Text(
-        '${(initialValue ?? 200) / 10}°C',
+        '${(initialValue ?? initialVal) / 10}°C',
         style: context.textTheme.headlineMedium!.copyWith(
           color: ColorsManager.primaryColorWithOpacity,
         ),
@@ -397,9 +397,7 @@ class ACHelper {
             style: context.textTheme.bodyMedium,
           ),
           trailing: Icon(
-            isSelected
+            isSelected ? Icons.radio_button_checked : Icons.radio_button_unchecked,
-                ? Icons.radio_button_checked
-                : Icons.radio_button_unchecked,
             size: 24,
             color: isSelected
                 ? ColorsManager.primaryColorWithOpacity
@@ -415,8 +413,7 @@ class ACHelper {
                         operationName: operationName,
                         value: value.value,
                         condition: selectedFunctionData?.condition,
-                        valueDescription:
+                        valueDescription: selectedFunctionData?.valueDescription,
-                            selectedFunctionData?.valueDescription,
                       ),
                     ),
                   );

lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart

@@ -46,7 +46,7 @@ class CpsDialogSliderSelector extends StatelessWidget {
                 functionCode: selectedFunction,
                 operationName: operationName,
                 condition: condition,
-                value: selectedFunctionData.value,
+                value: selectedFunctionData.value ?? 0,
               ),
             ),
           ),

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

@@ -164,7 +164,7 @@ class OneGangSwitchHelper {
     required bool removeComparetors,
   }) {
     if (selectedFunction == 'countdown_1') {
-      final initialValue = selectedFunctionData?.value ?? 200;
+      final initialValue = selectedFunctionData?.value ?? 0;
       return _buildCountDownSelector(
         context: context,
         initialValue: initialValue,
@@ -250,7 +250,7 @@ class OneGangSwitchHelper {
                   functionCode: selectCode,
                   operationName: operationName,
                   condition: conditions[index],
-                  value: selectedFunctionData?.value,
+                  value: selectedFunctionData?.value ?? 0,
                   valueDescription: selectedFunctionData?.valueDescription,
                 ),
               ),

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

@@ -170,7 +170,7 @@ class ThreeGangSwitchHelper {
     if (selectedFunction == 'countdown_1' ||
         selectedFunction == 'countdown_2' ||
         selectedFunction == 'countdown_3') {
-      final initialValue = selectedFunctionData?.value ?? 200;
+      final initialValue = selectedFunctionData?.value ?? 0;
       return _buildTemperatureSelector(
         context: context,
         initialValue: initialValue,
@@ -251,7 +251,7 @@ class ThreeGangSwitchHelper {
                   functionCode: selectCode,
                   operationName: operationName,
                   condition: conditions[index],
-                  value: selectedFunctionData?.value,
+                  value: selectedFunctionData?.value ?? 0,
                   valueDescription: selectedFunctionData?.valueDescription,
                 ),
               ),

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

@@ -169,7 +169,7 @@ class TwoGangSwitchHelper {
   }) {
     if (selectedFunction == 'countdown_1' ||
         selectedFunction == 'countdown_2') {
-      final initialValue = selectedFunctionData?.value ?? 200;
+      final initialValue = selectedFunctionData?.value ?? 0;
       return _buildTemperatureSelector(
         context: context,
         initialValue: initialValue,
@@ -250,7 +250,7 @@ class TwoGangSwitchHelper {
                   functionCode: selectCode,
                   operationName: operationName,
                   condition: conditions[index],
-                  value: selectedFunctionData?.value,
+                  value: selectedFunctionData?.value ?? 0,
                   valueDescription: selectedFunctionData?.valueDescription,
                 ),
               ),

lib/pages/routines/widgets/routine_dialogs/wall_sensor/wps_value_selector_widget.dart

@@ -36,7 +36,7 @@ class WpsValueSelectorWidget extends StatelessWidget {
         dialogType: dialogType,
         sliderRange: sliderRange,
         displayedValue: getDisplayText,
-        initialValue: functionData.value ?? 250,
+        initialValue: functionData.value ?? 0.0,
         onConditionChanged: (condition) => context.read<FunctionBloc>().add(
               AddFunction(
                 functionData: DeviceFunctionData(
@@ -44,7 +44,7 @@ class WpsValueSelectorWidget extends StatelessWidget {
                   functionCode: selectedFunction,
                   operationName: functionData.operationName,
                   condition: condition,
-                  value: functionData.value,
+                  value: functionData.value ?? 0,
                 ),
               ),
             ),
@@ -87,7 +87,7 @@ class WpsValueSelectorWidget extends StatelessWidget {
     final intValue = int.tryParse('${functionData.value ?? ''}');
     return switch (functionData.functionCode) {
       'presence_time' => '${intValue ?? '0'}',
-      'dis_current' => '${intValue ?? '250'}',
+      'dis_current' => '${intValue ?? '0'}',
       'illuminance_value' => '${intValue ?? '0'}',
       _ => '$intValue',
     };

lib/pages/spaces_management/all_spaces/widgets/dialogs/create_space_dialog.dart

@@ -592,8 +592,6 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
         return CreateSubSpaceDialog(
             spaceName: name,
             dialogTitle: isEdit ? 'Edit Sub-space' : 'Create Sub-space',
-            spaceTags: spaceTags,
-            isEdit: isEdit,
             products: products,
             existingSubSpaces: existingSubSpaces,
             onSave: (slectedSubspaces) {

lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart

@@ -136,6 +136,17 @@ class _SidebarWidgetState extends State<SidebarWidget> {
   }
 
   Widget _buildCommunityTile(BuildContext context, CommunityModel community) {
+    final spaces = community.spaces
+        .where(
+          (space) =>
+              {
+                SpaceStatus.deleted,
+                SpaceStatus.parentDeleted,
+              }.contains(space.status) ==
+              false,
+        )
+        .map((space) => _buildSpaceTile(space: space, community: community))
+        .toList();
     return CommunityTile(
       title: community.name,
       key: ValueKey(community.uuid),
@@ -154,15 +165,7 @@ class _SidebarWidgetState extends State<SidebarWidget> {
             );
       },
       onExpansionChanged: (title, expanded) {},
-      children: community.spaces
+      children: spaces,
-          .where(
-            (space) => {
-              SpaceStatus.deleted,
-              SpaceStatus.parentDeleted,
-            }.contains(space.status),
-          )
-          .map((space) => _buildSpaceTile(space: space, community: community))
-          .toList(),
     );
   }
 

lib/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart

@@ -4,169 +4,155 @@ import 'package:syncrow_web/pages/common/buttons/cancel_button.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/subspace_model.dart';
-import 'package:syncrow_web/pages/spaces_management/all_spaces/model/tag.dart';
 import 'package:syncrow_web/pages/spaces_management/create_subspace/bloc/subspace_bloc.dart';
 import 'package:syncrow_web/pages/spaces_management/create_subspace/bloc/subspace_event.dart';
 import 'package:syncrow_web/pages/spaces_management/create_subspace/bloc/subspace_state.dart';
+import 'package:syncrow_web/pages/spaces_management/create_subspace_model/widgets/subspace_chip.dart';
+import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_template_model.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
-class CreateSubSpaceDialog extends StatelessWidget {
+class CreateSubSpaceDialog extends StatefulWidget {
-  final bool isEdit;
   final String dialogTitle;
   final List<SubspaceModel>? existingSubSpaces;
   final String? spaceName;
-  final List<Tag>? spaceTags;
   final List<ProductModel>? products;
-  final Function(List<SubspaceModel>?)? onSave;
+  final void Function(List<SubspaceModel>?)? onSave;
 
-  const CreateSubSpaceDialog(
+  const CreateSubSpaceDialog({
-      {Key? key,
-      required this.isEdit,
     required this.dialogTitle,
-      this.existingSubSpaces,
     required this.spaceName,
-      required this.spaceTags,
     required this.products,
-      required this.onSave})
+    required this.onSave,
-      : super(key: key);
+    this.existingSubSpaces,
+    super.key,
+  });
+
+  @override
+  State<CreateSubSpaceDialog> createState() => _CreateSubSpaceDialogState();
+}
+
+class _CreateSubSpaceDialogState extends State<CreateSubSpaceDialog> {
+  late final TextEditingController _subspaceNameController;
+
+  @override
+  void initState() {
+    _subspaceNameController = TextEditingController();
+    super.initState();
+  }
+
+  @override
+  void dispose() {
+    _subspaceNameController.dispose();
+    super.dispose();
+  }
 
   @override
   Widget build(BuildContext context) {
-    final screenWidth = MediaQuery.of(context).size.width;
+    return BlocProvider(
-    final textController = TextEditingController();
-
-    return Dialog(
-      shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(20),
-      ),
-      child: BlocProvider(
       create: (_) {
         final bloc = SubSpaceBloc();
-          if (existingSubSpaces != null) {
+        if (widget.existingSubSpaces != null) {
-            for (var subSpace in existingSubSpaces!) {
+          for (final subSpace in widget.existingSubSpaces ?? []) {
             bloc.add(AddSubSpace(subSpace));
           }
         }
         return bloc;
       },
+      child: Dialog(
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(20),
+        ),
         child: BlocBuilder<SubSpaceBloc, SubSpaceState>(
           builder: (context, state) {
             return Container(
+              width: context.screenWidth * 0.35,
               color: ColorsManager.whiteColors,
-                child: SizedBox(
+              padding: const EdgeInsets.all(16),
-                  width: screenWidth * 0.35,
-                  child: Padding(
-                    padding: const EdgeInsets.all(16.0),
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 mainAxisSize: MainAxisSize.min,
                 children: [
                   Text(
-                          dialogTitle,
+                    widget.dialogTitle,
-                          style: Theme.of(context)
+                    style: context.textTheme.headlineLarge?.copyWith(
-                              .textTheme
+                      color: ColorsManager.blackColor,
-                              .headlineLarge
+                    ),
-                              ?.copyWith(color: ColorsManager.blackColor),
                   ),
                   const SizedBox(height: 16),
                   Container(
-                          width: screenWidth * 0.35,
+                    width: context.screenWidth * 0.35,
                     padding: const EdgeInsets.symmetric(
-                              vertical: 10.0, horizontal: 16.0),
+                      vertical: 10,
+                      horizontal: 16,
+                    ),
                     decoration: BoxDecoration(
                       color: ColorsManager.boxColor,
                       borderRadius: BorderRadius.circular(10),
                     ),
                     child: Wrap(
-                            spacing: 8.0,
+                      spacing: 8,
-                            runSpacing: 8.0,
+                      runSpacing: 8,
+                      alignment: WrapAlignment.start,
+                      crossAxisAlignment: WrapCrossAlignment.center,
                       children: [
                         ...state.subSpaces.asMap().entries.map(
                           (entry) {
                             final index = entry.key;
                             final subSpace = entry.value;
 
-                                  final lowerName =
+                            final lowerName = subSpace.subspaceName.toLowerCase();
-                                      subSpace.subspaceName.toLowerCase();
 
                             final duplicateIndices = state.subSpaces
                                 .asMap()
                                 .entries
                                 .where((e) =>
-                                          e.value.subspaceName.toLowerCase() ==
+                                    e.value.subspaceName.toLowerCase() == lowerName)
-                                          lowerName)
                                 .map((e) => e.key)
                                 .toList();
-                                  final isDuplicate =
+                            final isDuplicate = duplicateIndices.length > 1 &&
-                                      duplicateIndices.length > 1 &&
                                 duplicateIndices.indexOf(index) != 0;
-
+                            return SubspaceChip(
-                                  return Chip(
+                              subSpace: SubspaceTemplateModel(
-                                    label: Text(subSpace.subspaceName,
+                                subspaceName: entry.value.subspaceName,
-                                        style: Theme.of(context)
+                                disabled: entry.value.disabled,
-                                            .textTheme
-                                            .bodyMedium
-                                            ?.copyWith(
-                                                color:
-                                                    ColorsManager.spaceColor)),
-                                    backgroundColor: ColorsManager.whiteColors,
-                                    shape: RoundedRectangleBorder(
-                                      borderRadius: BorderRadius.circular(10),
-                                      side: BorderSide(
-                                        color: isDuplicate
-                                            ? ColorsManager.red
-                                            : ColorsManager.transparentColor,
-                                        width: 0,
                               ),
+                              isDuplicate: isDuplicate,
+                              onDeleted: () => context.read<SubSpaceBloc>().add(
+                                    RemoveSubSpace(subSpace),
                                   ),
-                                    deleteIcon: Container(
-                                      width: 24,
-                                      height: 24,
-                                      decoration: BoxDecoration(
-                                        shape: BoxShape.circle,
-                                        border: Border.all(
-                                          color: ColorsManager.lightGrayColor,
-                                          width: 1.5,
-                                        ),
-                                      ),
-                                      child: const Icon(
-                                        Icons.close,
-                                        size: 16,
-                                        color: ColorsManager.lightGrayColor,
-                                      ),
-                                    ),
-                                    onDeleted: () => context
-                                        .read<SubSpaceBloc>()
-                                        .add(RemoveSubSpace(subSpace)),
                             );
                           },
                         ),
                         SizedBox(
                           width: 200,
                           child: TextField(
-                                    controller: textController,
+                            controller: _subspaceNameController,
                             decoration: InputDecoration(
                               border: InputBorder.none,
                               hintText: state.subSpaces.isEmpty
                                   ? 'Please enter the name'
                                   : null,
-                                        hintStyle: Theme.of(context)
+                              hintStyle: context.textTheme.bodySmall?.copyWith(
-                                            .textTheme
+                                color: ColorsManager.lightGrayColor,
-                                            .bodySmall
+                              ),
-                                            ?.copyWith(
+                            ),
-                                                color: ColorsManager
-                                                    .lightGrayColor)),
                             onSubmitted: (value) {
-                                      if (value.trim().isNotEmpty) {
+                              final trimmedValue = value.trim();
+                              if (trimmedValue.isNotEmpty) {
                                 context.read<SubSpaceBloc>().add(
-                                            AddSubSpace(SubspaceModel(
+                                      AddSubSpace(
-                                                subspaceName: value.trim(),
+                                        SubspaceModel(
-                                                disabled: false)));
+                                          subspaceName: trimmedValue,
-                                        textController.clear();
+                                          disabled: false,
+                                        ),
+                                      ),
+                                    );
+                                _subspaceNameController.clear();
                               }
                             },
-                                    style:
+                            style: context.textTheme.bodyMedium,
-                                        Theme.of(context).textTheme.bodyMedium),
+                          ),
                         ),
                       ],
                     ),
@@ -174,13 +160,12 @@ class CreateSubSpaceDialog extends StatelessWidget {
                   if (state.errorMessage.isNotEmpty)
                     Padding(
                       padding: const EdgeInsets.only(top: 8.0),
-                            child: Text(state.errorMessage,
+                      child: Text(
-                                style: Theme.of(context)
+                        state.errorMessage,
-                                    .textTheme
+                        style: context.textTheme.bodySmall?.copyWith(
-                                    .bodySmall
-                                    ?.copyWith(
                           color: ColorsManager.warningRed,
-                                    )),
+                        ),
+                      ),
                     ),
                   const SizedBox(height: 16),
                   Row(
@@ -196,16 +181,14 @@ class CreateSubSpaceDialog extends StatelessWidget {
                       const SizedBox(width: 10),
                       Expanded(
                         child: DefaultButton(
-                                onPressed: (state.errorMessage.isNotEmpty)
+                          onPressed: state.errorMessage.isEmpty
-                                    ? null
+                              ? () {
-                                    : () async {
+                                  final subSpacesBloc = context.read<SubSpaceBloc>();
-                                        final subSpaces = context
+                                  final subSpaces = subSpacesBloc.state.subSpaces;
-                                            .read<SubSpaceBloc>()
+                                  widget.onSave?.call(subSpaces);
-                                            .state
-                                            .subSpaces;
-                                        onSave!(subSpaces);
                                   Navigator.of(context).pop();
-                                      },
+                                }
+                              : null,
                           backgroundColor: ColorsManager.secondaryColor,
                           borderRadius: 10,
                           foregroundColor: state.errorMessage.isNotEmpty
@@ -218,8 +201,7 @@ class CreateSubSpaceDialog extends StatelessWidget {
                   ),
                 ],
               ),
-                  ),
+            );
-                ));
           },
         ),
       ),

lib/pages/spaces_management/create_subspace_model/widgets/create_subspace_model_chips_box.dart

@@ -1,4 +1,7 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/spaces_management/create_subspace_model/bloc/subspace_model_bloc.dart';
+import 'package:syncrow_web/pages/spaces_management/create_subspace_model/bloc/subspace_model_event.dart';
 import 'package:syncrow_web/pages/spaces_management/create_subspace_model/widgets/subspace_chip.dart';
 import 'package:syncrow_web/pages/spaces_management/create_subspace_model/widgets/subspaces_textfield.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_template_model.dart';
@@ -51,6 +54,9 @@ class CreateSubspaceModelChipsBox extends StatelessWidget {
               return SubspaceChip(
                 subSpace: subSpace,
                 isDuplicate: isDuplicate,
+                onDeleted: () => context.read<SubSpaceModelBloc>().add(
+                      RemoveSubSpaceModel(subSpace),
+                    ),
               );
             },
           ),

lib/pages/spaces_management/create_subspace_model/widgets/subspace_chip.dart

@@ -1,7 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/spaces_management/create_subspace_model/bloc/subspace_model_bloc.dart';
-import 'package:syncrow_web/pages/spaces_management/create_subspace_model/bloc/subspace_model_event.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_template_model.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
@@ -11,10 +8,12 @@ class SubspaceChip extends StatelessWidget {
     required this.subSpace,
     required this.isDuplicate,
     super.key,
+    required this.onDeleted,
   });
 
   final SubspaceTemplateModel subSpace;
   final bool isDuplicate;
+  final void Function() onDeleted;
 
   @override
   Widget build(BuildContext context) {
@@ -50,9 +49,7 @@ class SubspaceChip extends StatelessWidget {
           ),
         ),
       ),
-      onDeleted: () => context.read<SubSpaceModelBloc>().add(
+      onDeleted: onDeleted,
-            RemoveSubSpaceModel(subSpace),
-          ),
     );
   }
 }