Refactor RoutineDevices to consolidate device data preparation in a single map to remove code duplication.

lib/pages/device_managment/all_devices/models/devices_model.dart

@@ -247,18 +247,12 @@ SOS
     switch (productType) {
       case 'AC':
         return [
-          SwitchFunction(
+          SwitchFunction(deviceId: uuid ?? '', deviceName: name ?? ''),
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          ModeFunction(deviceId: uuid ?? '', deviceName: name ?? ''),
-          ModeFunction(
+          TempSetFunction(deviceId: uuid ?? '', deviceName: name ?? ''),
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          CurrentTempFunction(deviceId: uuid ?? '', deviceName: name ?? ''),
-          TempSetFunction(
+          LevelFunction(deviceId: uuid ?? '', deviceName: name ?? ''),
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          ChildLockFunction(deviceId: uuid ?? '', deviceName: name ?? ''),
-          CurrentTempFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
-          LevelFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
-          ChildLockFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
         ];
 
       case '1G':
@@ -281,17 +275,17 @@ SOS
       case '3G':
         return [
           ThreeGangSwitch1Function(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+              deviceId: uuid ?? '', deviceName: name ?? ''),
           ThreeGangSwitch2Function(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+              deviceId: uuid ?? '', deviceName: name ?? ''),
           ThreeGangSwitch3Function(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+              deviceId: uuid ?? '', deviceName: name ?? ''),
           ThreeGangCountdown1Function(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+              deviceId: uuid ?? '', deviceName: name ?? ''),
           ThreeGangCountdown2Function(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+              deviceId: uuid ?? '', deviceName: name ?? ''),
           ThreeGangCountdown3Function(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+              deviceId: uuid ?? '', deviceName: name ?? ''),
         ];
       case 'WPS':
         return [
@@ -317,6 +311,8 @@ SOS
           NoOneTimeFunction(
               deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
 
+          // FarDetectionSliderFunction(
+          //     deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN')
         ];
       default:
         return [];

lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart

@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.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/routine_dialogs/ac_dialog.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/three_gang_switch_dialog.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/two_gang_switch_dialog.dart';
+import 'package:syncrow_web/pages/routines/models/device_functions.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart';
 
 class DeviceDialogHelper {
@@ -49,46 +49,45 @@ class DeviceDialogHelper {
     final deviceSelectedFunctions =
         routineBloc.state.selectedFunctions[data['uniqueCustomId']] ?? [];
 
+    if (removeComparetors && data['productType'] != 'WPS') {
+      //remove the current temp function in the 'if container'
+      functions.removeAt(3);
+    }
 
     switch (productType) {
       case 'AC':
         return ACHelper.showACFunctionsDialog(
-          context: context,
+            context,
-          functions: functions,
+            functions,
-          device: data['device'],
+            data['device'],
-          deviceSelectedFunctions: deviceSelectedFunctions,
+            deviceSelectedFunctions,
-          uniqueCustomId: data['uniqueCustomId'],
+            data['uniqueCustomId'],
-          removeComparetors: removeComparetors,
+            removeComparetors);
-          dialogType: dialogType,
-        );
 
       case '1G':
         return OneGangSwitchHelper.showSwitchFunctionsDialog(
-            dialogType: dialogType,
+            context,
-            context: context,
+            functions,
-            functions: functions,
+            data['device'],
-            device: data['device'],
+            deviceSelectedFunctions,
-            deviceSelectedFunctions: deviceSelectedFunctions,
+            data['uniqueCustomId'],
-            uniqueCustomId: data['uniqueCustomId'],
+            removeComparetors);
-            removeComparetors: removeComparetors);
       case '2G':
         return TwoGangSwitchHelper.showSwitchFunctionsDialog(
-            dialogType: dialogType,
+            context,
-            context: context,
+            functions,
-            functions: functions,
+            data['device'],
-            device: data['device'],
+            deviceSelectedFunctions,
-            deviceSelectedFunctions: deviceSelectedFunctions,
+            data['uniqueCustomId'],
-            uniqueCustomId: data['uniqueCustomId'],
+            removeComparetors);
-            removeComparetors: removeComparetors);
       case '3G':
         return ThreeGangSwitchHelper.showSwitchFunctionsDialog(
-            dialogType: dialogType,
+            context,
-            context: context,
+            functions,
-            functions: functions,
+            data['device'],
-            device: data['device'],
+            deviceSelectedFunctions,
-            deviceSelectedFunctions: deviceSelectedFunctions,
+            data['uniqueCustomId'],
-            uniqueCustomId: data['uniqueCustomId'],
+            removeComparetors);
-            removeComparetors: removeComparetors);
       case 'WPS':
         return WallPresenceSensor.showWPSFunctionsDialog(
             dialogType: dialogType,

lib/pages/routines/models/ac/ac_function.dart

@@ -5,28 +5,23 @@ import 'package:syncrow_web/utils/constants/app_enum.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 
 abstract class ACFunction extends DeviceFunction<AcStatusModel> {
-  final String type;
-
   ACFunction({
     required super.deviceId,
     required super.deviceName,
     required super.code,
     required super.operationName,
     required super.icon,
-    required this.type,
   });
 
   List<ACOperationalValue> getOperationalValues();
 }
 
 class SwitchFunction extends ACFunction {
-  SwitchFunction(
+  SwitchFunction({required super.deviceId, required super.deviceName})
-      {required super.deviceId, required super.deviceName, required type})
       : super(
           code: 'switch',
           operationName: 'Power',
           icon: Assets.assetsAcPower,
-          type: type,
         );
 
   @override
@@ -45,13 +40,11 @@ class SwitchFunction extends ACFunction {
 }
 
 class ModeFunction extends ACFunction {
-  ModeFunction(
+  ModeFunction({required super.deviceId, required super.deviceName})
-      {required super.deviceId, required super.deviceName, required type})
       : super(
           code: 'mode',
           operationName: 'Mode',
           icon: Assets.assetsFreezing,
-          type: type,
         );
 
   @override
@@ -79,8 +72,7 @@ class TempSetFunction extends ACFunction {
   final int max;
   final int step;
 
-  TempSetFunction(
+  TempSetFunction({required super.deviceId, required super.deviceName})
-      {required super.deviceId, required super.deviceName, required type})
       : min = 160,
         max = 300,
         step = 1,
@@ -88,7 +80,6 @@ class TempSetFunction extends ACFunction {
           code: 'temp_set',
           operationName: 'Set Temperature',
           icon: Assets.assetsTempreture,
-          type: type,
         );
 
   @override
@@ -106,10 +97,8 @@ class TempSetFunction extends ACFunction {
 }
 
 class LevelFunction extends ACFunction {
-  LevelFunction(
+  LevelFunction({required super.deviceId, required super.deviceName})
-      {required super.deviceId, required super.deviceName, required type})
       : super(
-          type: type,
           code: 'level',
           operationName: 'Fan Speed',
           icon: Assets.assetsFanSpeed,
@@ -141,10 +130,8 @@ class LevelFunction extends ACFunction {
 }
 
 class ChildLockFunction extends ACFunction {
-  ChildLockFunction(
+  ChildLockFunction({required super.deviceId, required super.deviceName})
-      {required super.deviceId, required super.deviceName, required type})
       : super(
-          type: type,
           code: 'child_lock',
           operationName: 'Child Lock',
           icon: Assets.assetsChildLock,
@@ -170,13 +157,11 @@ class CurrentTempFunction extends ACFunction {
   final int max;
   final int step;
 
-  CurrentTempFunction(
+  CurrentTempFunction({required super.deviceId, required super.deviceName})
-      {required super.deviceId, required super.deviceName, required type})
       : min = -100,
         max = 990,
         step = 1,
         super(
-          type: type,
           code: 'temp_current',
           operationName: 'Current Temperature',
           icon: Assets.currentTemp,

lib/pages/routines/models/gang_switches/three_gang_switch/three_gang_switch.dart

@@ -3,7 +3,7 @@ import 'package:syncrow_web/pages/routines/models/gang_switches/switch_operation
 import 'package:syncrow_web/utils/constants/assets.dart';
 
 class ThreeGangSwitch1Function extends BaseSwitchFunction {
-  ThreeGangSwitch1Function({required super.deviceId, required super.deviceName ,required type})
+  ThreeGangSwitch1Function({required super.deviceId, required super.deviceName})
       : super(
           code: 'switch_1',
           operationName: 'Light 1 Switch',
@@ -26,7 +26,7 @@ class ThreeGangSwitch1Function extends BaseSwitchFunction {
 }
 
 class ThreeGangCountdown1Function extends BaseSwitchFunction {
-  ThreeGangCountdown1Function({required super.deviceId, required super.deviceName ,required type})
+  ThreeGangCountdown1Function({required super.deviceId, required super.deviceName})
       : super(
           code: 'countdown_1',
           operationName: 'Light 1 Countdown',
@@ -47,7 +47,7 @@ class ThreeGangCountdown1Function extends BaseSwitchFunction {
 }
 
 class ThreeGangSwitch2Function extends BaseSwitchFunction {
-  ThreeGangSwitch2Function({required super.deviceId, required super.deviceName, required type})
+  ThreeGangSwitch2Function({required super.deviceId, required super.deviceName})
       : super(
           code: 'switch_2',
           operationName: 'Light 2 Switch',
@@ -70,7 +70,7 @@ class ThreeGangSwitch2Function extends BaseSwitchFunction {
 }
 
 class ThreeGangCountdown2Function extends BaseSwitchFunction {
-  ThreeGangCountdown2Function({required super.deviceId, required super.deviceName ,required type})
+  ThreeGangCountdown2Function({required super.deviceId, required super.deviceName})
       : super(
           code: 'countdown_2',
           operationName: 'Light 2 Countdown',
@@ -91,7 +91,7 @@ class ThreeGangCountdown2Function extends BaseSwitchFunction {
 }
 
 class ThreeGangSwitch3Function extends BaseSwitchFunction {
-  ThreeGangSwitch3Function({required super.deviceId, required super.deviceName ,required type})
+  ThreeGangSwitch3Function({required super.deviceId, required super.deviceName})
       : super(
           code: 'switch_3',
           operationName: 'Light 3 Switch',
@@ -114,7 +114,7 @@ class ThreeGangSwitch3Function extends BaseSwitchFunction {
 }
 
 class ThreeGangCountdown3Function extends BaseSwitchFunction {
-  ThreeGangCountdown3Function({required super.deviceId, required super.deviceName ,required type})
+  ThreeGangCountdown3Function({required super.deviceId, required super.deviceName})
       : super(
           code: 'countdown_3',
           operationName: 'Light 3 Countdown',

lib/pages/routines/widgets/if_container.dart

@@ -71,8 +71,7 @@ class IfContainer extends StatelessWidget {
                                       '1G',
                                       '2G',
                                       '3G',
-                                      'WPS',
+                                      'WPS'
-                                      'CPS',
                                     ].contains(
                                         state.ifItems[index]['productType'])) {
                                       context.read<RoutineBloc>().add(
@@ -130,7 +129,7 @@ class IfContainer extends StatelessWidget {
                   context
                       .read<RoutineBloc>()
                       .add(AddToIfContainer(mutableData, false));
-                } else if (!['AC', '1G', '2G', '3G', 'WPS', 'CPS']
+                } else if (!['AC', '1G', '2G', '3G', 'WPS']
                     .contains(mutableData['productType'])) {
                   context
                       .read<RoutineBloc>()

lib/pages/routines/widgets/routine_devices.dart

@@ -1,6 +1,5 @@
 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/routines/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/widgets/dragable_card.dart';
 
@@ -18,6 +17,8 @@ class _RoutineDevicesState extends State<RoutineDevices> {
     context.read<RoutineBloc>().add(FetchDevicesInRoutine());
   }
 
+  static const _allowedProductTypes = {'AC', '1G', '2G', '3G', 'WPS', 'GW'};
+
   @override
   Widget build(BuildContext context) {
     return BlocBuilder<RoutineBloc, RoutineState>(
@@ -32,14 +33,8 @@ class _RoutineDevicesState extends State<RoutineDevices> {
           }
         });
 
-        List<AllDevicesModel> deviceList = state.devices
+        final deviceList = state.devices
-            .where((device) =>
+            .where((device) => _allowedProductTypes.contains(device.productType))
-                device.productType == 'AC' ||
-                device.productType == '1G' ||
-                device.productType == '2G' ||
-                device.productType == '3G' ||
-                device.productType == 'WPS' ||
-                device.productType == 'CPS')
             .toList();
 
         return Wrap(
@@ -47,37 +42,32 @@ class _RoutineDevicesState extends State<RoutineDevices> {
           runSpacing: 10,
           children: deviceList.asMap().entries.map((entry) {
             final device = entry.value;
+
+            final deviceData = {
+              'device': device,
+              'imagePath': device.getDefaultIcon(device.productType),
+              'title': device.name ?? '',
+              'deviceId': device.uuid,
+              'productType': device.productType,
+              'functions': device.functions,
+              'uniqueCustomId': '',
+            };
+
             if (state.searchText != null && state.searchText!.isNotEmpty) {
               return device.name!
                       .toLowerCase()
                       .contains(state.searchText!.toLowerCase())
                   ? DraggableCard(
-                      imagePath: device.getDefaultIcon(device.productType),
+                      imagePath: deviceData['imagePath'] as String,
-                      title: device.name ?? '',
+                      title: deviceData['title'] as String,
-                      deviceData: {
+                      deviceData: deviceData,
-                        'device': device,
-                        'imagePath': device.getDefaultIcon(device.productType),
-                        'title': device.name ?? '',
-                        'deviceId': device.uuid,
-                        'productType': device.productType,
-                        'functions': device.functions,
-                        'uniqueCustomId': '',
-                      },
                     )
-                  : Container();
+                  : const SizedBox.shrink();
             } else {
               return DraggableCard(
-                imagePath: device.getDefaultIcon(device.productType),
+                imagePath: deviceData['imagePath'] as String,
-                title: device.name ?? '',
+                title: deviceData['title'] as String,
-                deviceData: {
+                deviceData: deviceData,
-                  'device': device,
-                  'imagePath': device.getDefaultIcon(device.productType),
-                  'title': device.name ?? '',
-                  'deviceId': device.uuid,
-                  'productType': device.productType,
-                  'functions': device.functions,
-                  'uniqueCustomId': '',
-                },
               );
             }
           }).toList(),

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

@@ -13,38 +13,29 @@ 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({
+  static Future<Map<String, dynamic>?> showACFunctionsDialog(
-    required BuildContext context,
+    BuildContext context,
-    required List<DeviceFunction> functions,
+    List<DeviceFunction> functions,
-    required AllDevicesModel? device,
+    AllDevicesModel? device,
-    required List<DeviceFunctionData>? deviceSelectedFunctions,
+    List<DeviceFunctionData>? deviceSelectedFunctions,
-    required String uniqueCustomId,
+    String uniqueCustomId,
-    required bool? removeComparetors,
+    bool? removeComparetors,
-    required String dialogType,
+  ) async {
-  }) async {
+    List<ACFunction> acFunctions = functions.whereType<ACFunction>().toList();
-    List<ACFunction> acFunctions =
-        functions.whereType<ACFunction>().where((function) {
-      if (dialogType == 'THEN') {
-        return function.type == 'THEN' || function.type == 'BOTH';
-      }
-      return function.type == 'IF' || function.type == 'BOTH';
-    }).toList();
-    // List<ACFunction> acFunctions = functions.whereType<ACFunction>().toList();
 
     return showDialog<Map<String, dynamic>?>(
       context: context,
       builder: (BuildContext context) {
         return BlocProvider(
-          create: (_) => FunctionBloc()
+          create: (_) => FunctionBloc()..add(InitializeFunctions(deviceSelectedFunctions ?? [])),
-            ..add(InitializeFunctions(deviceSelectedFunctions ?? [])),
           child: AlertDialog(
             contentPadding: EdgeInsets.zero,
             content: BlocBuilder<FunctionBloc, FunctionBlocState>(
               builder: (context, state) {
                 final selectedFunction = state.selectedFunction;
                 final selectedOperationName = state.selectedOperationName;
-                final selectedFunctionData = state.addedFunctions
+                final selectedFunctionData =
-                    .firstWhere((f) => f.functionCode == selectedFunction,
+                    state.addedFunctions.firstWhere((f) => f.functionCode == selectedFunction,
                         orElse: () => DeviceFunctionData(
                               entityId: '',
                               functionCode: selectedFunction ?? '',
@@ -74,10 +65,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,
                                         )),
@@ -205,8 +194,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(
@@ -302,8 +290,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(),
     );
   }
@@ -397,13 +384,9 @@ 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
+            color: isSelected ? ColorsManager.primaryColorWithOpacity : ColorsManager.textGray,
-                ? ColorsManager.primaryColorWithOpacity
-                : ColorsManager.textGray,
           ),
           onTap: () {
             if (!isSelected) {
@@ -415,8 +398,7 @@ class ACHelper {
                         operationName: operationName,
                         value: value.value,
                         condition: selectedFunctionData?.condition,
-                        valueDescription:
+                        valueDescription: selectedFunctionData?.valueDescription,
-                            selectedFunctionData?.valueDescription,
                       ),
                     ),
                   );

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

@@ -5,10 +5,8 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_mo
 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/helper/duration_format_helper.dart';
-import 'package:syncrow_web/pages/routines/models/ac/ac_function.dart';
 import 'package:syncrow_web/pages/routines/models/device_functions.dart';
 import 'package:syncrow_web/pages/routines/models/gang_switches/base_switch_function.dart';
-import 'package:syncrow_web/pages/routines/models/gang_switches/one_gang_switch/one_gang_switch.dart';
 import 'package:syncrow_web/pages/routines/models/gang_switches/switch_operational_value.dart';
 import 'package:syncrow_web/pages/routines/widgets/dialog_footer.dart';
 import 'package:syncrow_web/pages/routines/widgets/dialog_header.dart';
@@ -16,32 +14,29 @@ import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
 class OneGangSwitchHelper {
-  static Future<Map<String, dynamic>?> showSwitchFunctionsDialog({
+  static Future<Map<String, dynamic>?> showSwitchFunctionsDialog(
-    required String dialogType,
+    BuildContext context,
-    required BuildContext context,
+    List<DeviceFunction> functions,
-    required List<DeviceFunction> functions,
+    AllDevicesModel? device,
-    required AllDevicesModel? device,
+    List<DeviceFunctionData>? deviceSelectedFunctions,
-    required List<DeviceFunctionData>? deviceSelectedFunctions,
+    String uniqueCustomId,
-    required String uniqueCustomId,
+    bool removeComparetors,
-    required bool removeComparetors,
+  ) async {
-  }) async {
+    List<BaseSwitchFunction> acFunctions = functions.whereType<BaseSwitchFunction>().toList();
-    List<BaseSwitchFunction> oneGangFunctions =
-        functions.whereType<BaseSwitchFunction>().toList();
 
     return showDialog<Map<String, dynamic>?>(
       context: context,
       builder: (BuildContext context) {
         return BlocProvider(
-            create: (_) => FunctionBloc()
+            create: (_) => FunctionBloc()..add(InitializeFunctions(deviceSelectedFunctions ?? [])),
-              ..add(InitializeFunctions(deviceSelectedFunctions ?? [])),
             child: AlertDialog(
               contentPadding: EdgeInsets.zero,
               content: BlocBuilder<FunctionBloc, FunctionBlocState>(
                 builder: (context, state) {
                   final selectedFunction = state.selectedFunction;
                   final selectedOperationName = state.selectedOperationName;
-                  final selectedFunctionData = state.addedFunctions
+                  final selectedFunctionData =
-                      .firstWhere((f) => f.functionCode == selectedFunction,
+                      state.addedFunctions.firstWhere((f) => f.functionCode == selectedFunction,
                           orElse: () => DeviceFunctionData(
                                 entityId: '',
                                 functionCode: selectedFunction ?? '',
@@ -66,12 +61,12 @@ class OneGangSwitchHelper {
                               // Left side: Function list
                               Expanded(
                                 child: ListView.separated(
-                                  itemCount: oneGangFunctions.length,
+                                  itemCount: acFunctions.length,
                                   separatorBuilder: (_, __) => const Divider(
                                     color: ColorsManager.dividerColor,
                                   ),
                                   itemBuilder: (context, index) {
-                                    final function = oneGangFunctions[index];
+                                    final function = acFunctions[index];
                                     return ListTile(
                                       leading: SvgPicture.asset(
                                         function.icon,
@@ -88,12 +83,9 @@ class OneGangSwitchHelper {
                                         color: ColorsManager.textGray,
                                       ),
                                       onTap: () {
-                                        context
+                                        context.read<FunctionBloc>().add(SelectFunction(
-                                            .read<FunctionBloc>()
-                                            .add(SelectFunction(
                                               functionCode: function.code,
-                                              operationName:
+                                              operationName: function.operationName,
-                                                  function.operationName,
                                             ));
                                       },
                                     );
@@ -107,7 +99,7 @@ class OneGangSwitchHelper {
                                     context: context,
                                     selectedFunction: selectedFunction,
                                     selectedFunctionData: selectedFunctionData,
-                                    acFunctions: oneGangFunctions,
+                                    acFunctions: acFunctions,
                                     device: device,
                                     operationName: selectedOperationName ?? '',
                                     removeComparetors: removeComparetors,
@@ -182,14 +174,8 @@ class OneGangSwitchHelper {
         removeComparetors: removeComparetors,
       );
     }
-    final selectedFn = acFunctions.firstWhere(
-      (f) => f.code == selectedFunction,
-      orElse: () => OneGangSwitchFunction(
-        deviceId: '',
-        deviceName: '',
-      ),
-    );
 
+    final selectedFn = acFunctions.firstWhere((f) => f.code == selectedFunction);
     final values = selectedFn.getOperationalValues();
 
     return _buildOperationalValuesList(
@@ -226,11 +212,11 @@ class OneGangSwitchHelper {
             selectedFunctionData,
           ),
         const SizedBox(height: 20),
-        _buildCountDownDisplay(context, initialValue, device, operationName,
+        _buildCountDownDisplay(
-            selectedFunctionData, selectCode),
+            context, initialValue, device, operationName, selectedFunctionData, selectCode),
         const SizedBox(height: 20),
-        _buildCountDownSlider(context, initialValue, device, operationName,
+        _buildCountDownSlider(
-            selectedFunctionData, selectCode),
+            context, initialValue, device, operationName, selectedFunctionData, selectCode),
       ],
     );
   }
@@ -271,8 +257,7 @@ class OneGangSwitchHelper {
         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(),
     );
   }
@@ -320,8 +305,7 @@ class OneGangSwitchHelper {
       value: (initialValue ?? 0).toDouble(),
       min: operationalValues.minValue?.toDouble() ?? 0.0,
       max: operationalValues.maxValue?.toDouble() ?? 0.0,
-      divisions: (((operationalValues.maxValue ?? 0) -
+      divisions: (((operationalValues.maxValue ?? 0) - (operationalValues.minValue ?? 0)) /
-                  (operationalValues.minValue ?? 0)) /
               (operationalValues.stepValue ?? 1))
           .round(),
       onChanged: (value) {
@@ -373,13 +357,9 @@ class OneGangSwitchHelper {
             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
+            color: isSelected ? ColorsManager.primaryColorWithOpacity : ColorsManager.textGray,
-                ? ColorsManager.primaryColorWithOpacity
-                : ColorsManager.textGray,
           ),
           onTap: () {
             if (!isSelected) {
@@ -391,8 +371,7 @@ class OneGangSwitchHelper {
                         operationName: operationName,
                         value: value.value,
                         condition: selectedFunctionData?.condition,
-                        valueDescription:
+                        valueDescription: selectedFunctionData?.valueDescription,
-                            selectedFunctionData?.valueDescription,
                       ),
                     ),
                   );

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

@@ -14,15 +14,14 @@ import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
 class ThreeGangSwitchHelper {
-  static Future<Map<String, dynamic>?> showSwitchFunctionsDialog({
+  static Future<Map<String, dynamic>?> showSwitchFunctionsDialog(
-    required BuildContext context,
+    BuildContext context,
-    required List<DeviceFunction> functions,
+    List<DeviceFunction> functions,
-    required AllDevicesModel? device,
+    AllDevicesModel? device,
-    required List<DeviceFunctionData>? deviceSelectedFunctions,
+    List<DeviceFunctionData>? deviceSelectedFunctions,
-    required String uniqueCustomId,
+    String uniqueCustomId,
-    required String dialogType,
+    bool removeComparetors,
-    required bool removeComparetors,
+  ) async {
-  }) async {
     List<BaseSwitchFunction> switchFunctions =
         functions.whereType<BaseSwitchFunction>().toList();
 

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

@@ -14,32 +14,29 @@ import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
 class TwoGangSwitchHelper {
-  static Future<Map<String, dynamic>?> showSwitchFunctionsDialog({
+  static Future<Map<String, dynamic>?> showSwitchFunctionsDialog(
-    required BuildContext context,
+    BuildContext context,
-    required List<DeviceFunction> functions,
+    List<DeviceFunction> functions,
-    required AllDevicesModel? device,
+    AllDevicesModel? device,
-    required List<DeviceFunctionData>? deviceSelectedFunctions,
+    List<DeviceFunctionData>? deviceSelectedFunctions,
-    required String uniqueCustomId,
+    String uniqueCustomId,
-    required bool removeComparetors,
+    bool removeComparetors,
-    required String dialogType,
+  ) async {
-  }) async {
+    List<BaseSwitchFunction> switchFunctions = functions.whereType<BaseSwitchFunction>().toList();
-    List<BaseSwitchFunction> switchFunctions =
-        functions.whereType<BaseSwitchFunction>().toList();
 
     return showDialog<Map<String, dynamic>?>(
       context: context,
       builder: (BuildContext context) {
         return BlocProvider(
-            create: (_) => FunctionBloc()
+            create: (_) => FunctionBloc()..add(InitializeFunctions(deviceSelectedFunctions ?? [])),
-              ..add(InitializeFunctions(deviceSelectedFunctions ?? [])),
             child: AlertDialog(
               contentPadding: EdgeInsets.zero,
               content: BlocBuilder<FunctionBloc, FunctionBlocState>(
                 builder: (context, state) {
                   final selectedFunction = state.selectedFunction;
                   final selectedOperationName = state.selectedOperationName;
-                  final selectedFunctionData = state.addedFunctions
+                  final selectedFunctionData =
-                      .firstWhere((f) => f.functionCode == selectedFunction,
+                      state.addedFunctions.firstWhere((f) => f.functionCode == selectedFunction,
                           orElse: () => DeviceFunctionData(
                                 entityId: '',
                                 functionCode: selectedFunction ?? '',
@@ -86,12 +83,9 @@ class TwoGangSwitchHelper {
                                         color: ColorsManager.textGray,
                                       ),
                                       onTap: () {
-                                        context
+                                        context.read<FunctionBloc>().add(SelectFunction(
-                                            .read<FunctionBloc>()
-                                            .add(SelectFunction(
                                               functionCode: function.code,
-                                              operationName:
+                                              operationName: function.operationName,
-                                                  function.operationName,
                                             ));
                                       },
                                     );
@@ -167,8 +161,7 @@ class TwoGangSwitchHelper {
     required String operationName,
     required bool removeComparetors,
   }) {
-    if (selectedFunction == 'countdown_1' ||
+    if (selectedFunction == 'countdown_1' || selectedFunction == 'countdown_2') {
-        selectedFunction == 'countdown_2') {
       final initialValue = selectedFunctionData?.value ?? 200;
       return _buildTemperatureSelector(
         context: context,
@@ -182,8 +175,7 @@ class TwoGangSwitchHelper {
       );
     }
 
-    final selectedFn =
+    final selectedFn = switchFunctions.firstWhere((f) => f.code == selectedFunction);
-        switchFunctions.firstWhere((f) => f.code == selectedFunction);
     final values = selectedFn.getOperationalValues();
 
     return _buildOperationalValuesList(
@@ -220,11 +212,11 @@ class TwoGangSwitchHelper {
             selectedFunctionData,
           ),
         const SizedBox(height: 20),
-        _buildCountDownDisplay(context, initialValue, device, operationName,
+        _buildCountDownDisplay(
-            selectedFunctionData, selectCode),
+            context, initialValue, device, operationName, selectedFunctionData, selectCode),
         const SizedBox(height: 20),
-        _buildCountDownSlider(context, initialValue, device, operationName,
+        _buildCountDownSlider(
-            selectedFunctionData, selectCode),
+            context, initialValue, device, operationName, selectedFunctionData, selectCode),
       ],
     );
   }
@@ -265,8 +257,7 @@ class TwoGangSwitchHelper {
         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(),
     );
   }
@@ -314,8 +305,7 @@ class TwoGangSwitchHelper {
       value: (initialValue ?? 0).toDouble(),
       min: operationalValues.minValue?.toDouble() ?? 0.0,
       max: operationalValues.maxValue?.toDouble() ?? 0.0,
-      divisions: (((operationalValues.maxValue ?? 0) -
+      divisions: (((operationalValues.maxValue ?? 0) - (operationalValues.minValue ?? 0)) /
-                  (operationalValues.minValue ?? 0)) /
               (operationalValues.stepValue ?? 1))
           .round(),
       onChanged: (value) {
@@ -367,13 +357,9 @@ class TwoGangSwitchHelper {
             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
+            color: isSelected ? ColorsManager.primaryColorWithOpacity : ColorsManager.textGray,
-                ? ColorsManager.primaryColorWithOpacity
-                : ColorsManager.textGray,
           ),
           onTap: () {
             if (!isSelected) {
@@ -385,8 +371,7 @@ class TwoGangSwitchHelper {
                         operationName: operationName,
                         value: value.value,
                         condition: selectedFunctionData?.condition,
-                        valueDescription:
+                        valueDescription: selectedFunctionData?.valueDescription,
-                            selectedFunctionData?.valueDescription,
                       ),
                     ),
                   );

lib/pages/routines/widgets/then_container.dart

@@ -3,10 +3,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
-import 'package:syncrow_web/pages/routines/helper/dialog_helper/device_dialog_helper.dart';
-import 'package:syncrow_web/pages/routines/widgets/dragable_card.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/automation_dialog.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/delay_dialog.dart';
+import 'package:syncrow_web/pages/routines/helper/dialog_helper/device_dialog_helper.dart';
+import 'package:syncrow_web/pages/routines/widgets/dragable_card.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:uuid/uuid.dart';
 
@@ -113,8 +113,7 @@ class ThenContainer extends StatelessWidget {
                                           '1G',
                                           '2G',
                                           '3G',
-                                          'WPS',
+                                          'WPS'
-                                          'CPS',
                                         ].contains(state.thenItems[index]
                                             ['productType'])) {
                                           context.read<RoutineBloc>().add(
@@ -230,7 +229,7 @@ class ThenContainer extends StatelessWidget {
                 dialogType: "THEN");
             if (result != null) {
               context.read<RoutineBloc>().add(AddToThenContainer(mutableData));
-            } else if (!['AC', '1G', '2G', '3G', 'WPS', 'CPS']
+            } else if (!['AC', '1G', '2G', '3G', 'WPS']
                 .contains(mutableData['productType'])) {
               context.read<RoutineBloc>().add(AddToThenContainer(mutableData));
             }