uncommented code.

2025-07-10 15:17:31 +00:00 · 2025-04-09 10:41:24 +03:00
19 changed files with 456 additions and 621 deletions
--- a/lib/pages/device_managment/all_devices/models/devices_model.dart
+++ b/lib/pages/device_managment/all_devices/models/devices_model.dart
@ -248,18 +248,12 @@ SOS
    switch (productType) {
      case 'AC':
        return [
-          SwitchFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
-          ModeFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
-          TempSetFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
-          CurrentTempFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
-          LevelFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
-          ChildLockFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          SwitchFunction(deviceId: uuid ?? '', deviceName: name ?? ''),
+          ModeFunction(deviceId: uuid ?? '', deviceName: name ?? ''),
+          TempSetFunction(deviceId: uuid ?? '', deviceName: name ?? ''),
+          CurrentTempFunction(deviceId: uuid ?? '', deviceName: name ?? ''),
+          LevelFunction(deviceId: uuid ?? '', deviceName: name ?? ''),
+          ChildLockFunction(deviceId: uuid ?? '', deviceName: name ?? ''),
        ];

      case '1G':
@ -282,17 +276,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 [
@ -318,6 +312,8 @@ SOS
          NoOneTimeFunction(
              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),

+          // FarDetectionSliderFunction(
+          //     deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN')
        ];
      case 'GW':
        return [
--- a/lib/pages/device_managment/gateway/model/gateway_model.dart
+++ b/lib/pages/device_managment/gateway/model/gateway_model.dart
@ -14,36 +14,27 @@ class GatewayModel {
  });

  factory GatewayModel.fromJson(Map<String, dynamic> json) {
-    final status = json['status'] as List<dynamic>? ?? <dynamic>[];
+    final status = json['status'] as List<dynamic>;

-    bool? switchAlarmSound;
-    String? masterState;
-    bool? factoryReset;
-    String? alarmActive;
-
-    for (final item in status) {
-      switch (item['code']) {
-        case 'switch_alarm_sound':
-          switchAlarmSound = item['value'] as bool;
-          break;
-        case 'master_state':
-          masterState = item['value'] as String;
-          break;
-        case 'factory_reset':
-          factoryReset = item['value'] as bool;
-          break;
-        case 'alarm_active':
-          alarmActive = item['value'] as String;
-          break;
-      }
-    }
+    final switchAlarmSound = status.firstWhere(
+      (item) => item['code'] == 'switch_alarm_sound',
+    )['value'] as bool;
+    final masterState = status.firstWhere(
+      (item) => item['code'] == 'master_state',
+    )['value'] as String;
+    final factoryReset = status.firstWhere(
+      (item) => item['code'] == 'factory_reset',
+    )['value'] as bool;
+    final alarmActive = status.firstWhere(
+      (item) => item['code'] == 'alarm_active',
+    )['value'] as String;

    return GatewayModel(
-      uuid: json['uuid'] as String? ?? '',
-      switchAlarmSound: switchAlarmSound ?? false,
-      masterState: masterState ?? '',
-      factoryReset: factoryReset ?? false,
-      alarmActive: alarmActive ?? '',
+      uuid: json['uuid'] as String,
+      switchAlarmSound: switchAlarmSound,
+      masterState: masterState,
+      factoryReset: factoryReset,
+      alarmActive: alarmActive,
    );
  }
 }
--- a/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart
+++ b/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart
@ -3,7 +3,7 @@ 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/gateway/gateway_helper.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/gateway/gateway_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';
@ -50,45 +50,46 @@ 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,
-          functions: functions,
-          device: data['device'],
-          deviceSelectedFunctions: deviceSelectedFunctions,
-          uniqueCustomId: data['uniqueCustomId'],
-          removeComparetors: removeComparetors,
-          dialogType: dialogType,
+          context,
+          functions,
+          data['device'],
+          deviceSelectedFunctions,
+          data['uniqueCustomId'],
+          removeComparetors,
        );

      case '1G':
        return OneGangSwitchHelper.showSwitchFunctionsDialog(
-            dialogType: dialogType,
-            context: context,
-            functions: functions,
-            device: data['device'],
-            deviceSelectedFunctions: deviceSelectedFunctions,
-            uniqueCustomId: data['uniqueCustomId'],
-            removeComparetors: removeComparetors);
+            context,
+            functions,
+            data['device'],
+            deviceSelectedFunctions,
+            data['uniqueCustomId'],
+            removeComparetors);
      case '2G':
        return TwoGangSwitchHelper.showSwitchFunctionsDialog(
-            dialogType: dialogType,
-            context: context,
-            functions: functions,
-            device: data['device'],
-            deviceSelectedFunctions: deviceSelectedFunctions,
-            uniqueCustomId: data['uniqueCustomId'],
-            removeComparetors: removeComparetors);
+            context,
+            functions,
+            data['device'],
+            deviceSelectedFunctions,
+            data['uniqueCustomId'],
+            removeComparetors);
      case '3G':
        return ThreeGangSwitchHelper.showSwitchFunctionsDialog(
-            dialogType: dialogType,
-            context: context,
-            functions: functions,
-            device: data['device'],
-            deviceSelectedFunctions: deviceSelectedFunctions,
-            uniqueCustomId: data['uniqueCustomId'],
-            removeComparetors: removeComparetors);
+            context,
+            functions,
+            data['device'],
+            deviceSelectedFunctions,
+            data['uniqueCustomId'],
+            removeComparetors);
      case 'WPS':
        return WallPresenceSensor.showWPSFunctionsDialog(
            dialogType: dialogType,
@ -104,7 +105,6 @@ class DeviceDialogHelper {
          functions: functions,
          uniqueCustomId: data['uniqueCustomId'],
          deviceSelectedFunctions: deviceSelectedFunctions,
-          device: data['device'],
        );

      default:
--- a/lib/pages/routines/models/ac/ac_function.dart
+++ b/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(
-      {required super.deviceId, required super.deviceName, required type})
+  SwitchFunction({required super.deviceId, required super.deviceName})
      : super(
          code: 'switch',
          operationName: 'Power',
          icon: Assets.assetsAcPower,
-          type: type,
        );

  @override
@ -45,13 +40,11 @@ class SwitchFunction extends ACFunction {
 }

 class ModeFunction extends ACFunction {
-  ModeFunction(
-      {required super.deviceId, required super.deviceName, required type})
+  ModeFunction({required super.deviceId, required super.deviceName})
      : 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(
-      {required super.deviceId, required super.deviceName, required type})
+  TempSetFunction({required super.deviceId, required super.deviceName})
      : 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(
-      {required super.deviceId, required super.deviceName, required type})
+  LevelFunction({required super.deviceId, required super.deviceName})
      : super(
-          type: type,
          code: 'level',
          operationName: 'Fan Speed',
          icon: Assets.assetsFanSpeed,
@ -141,10 +130,8 @@ class LevelFunction extends ACFunction {
 }

 class ChildLockFunction extends ACFunction {
-  ChildLockFunction(
-      {required super.deviceId, required super.deviceName, required type})
+  ChildLockFunction({required super.deviceId, required super.deviceName})
      : 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(
-      {required super.deviceId, required super.deviceName, required type})
+  CurrentTempFunction({required super.deviceId, required super.deviceName})
      : min = -100,
        max = 990,
        step = 1,
        super(
-          type: type,
          code: 'temp_current',
          operationName: 'Current Temperature',
          icon: Assets.currentTemp,
--- a/lib/pages/routines/models/gang_switches/three_gang_switch/three_gang_switch.dart
+++ b/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',
--- a/lib/pages/routines/models/gateway.dart
+++ b/lib/pages/routines/models/gateway.dart
@ -33,11 +33,10 @@ final class GatewaySwitchAlarmSound extends GatewayFunctions {
    required super.deviceId,
    required super.deviceName,
    required super.type,
-  }) : super(
-          code: 'switch_alarm_sound',
-          operationName: 'Switch Alarm Sound',
-          icon: Assets.activeBell,
-        );
+    super.code = 'switch_alarm_sound',
+    super.operationName = 'Switch Alarm Sound',
+    super.icon = Assets.activeBell,
+  });

  @override
  List<GatewayOperationalValue> getOperationalValues() => [
@ -59,11 +58,10 @@ final class GatewayMasterState extends GatewayFunctions {
    required super.deviceId,
    required super.deviceName,
    required super.type,
-  }) : super(
-          code: 'master_state',
-          operationName: 'Master State',
-          icon: Assets.gear,
-        );
+    super.code = 'master_state',
+    super.operationName = 'Master State',
+    super.icon = Assets.gear,
+  });

  @override
  List<GatewayOperationalValue> getOperationalValues() {
@ -71,12 +69,12 @@ final class GatewayMasterState extends GatewayFunctions {
      GatewayOperationalValue(
        icon: Assets.assetsAcPower,
        description: "Normal",
-        value: 'normal',
+        value: 'Normal',
      ),
      GatewayOperationalValue(
        icon: Assets.assetsAcPowerOFF,
        description: "Alarm",
-        value: 'alarm',
+        value: 'Alarm',
      ),
    ];
  }
@ -87,11 +85,10 @@ final class GatewayFactoryReset extends GatewayFunctions {
    required super.deviceId,
    required super.deviceName,
    required super.type,
-  }) : super(
-          code: 'factory_reset',
-          operationName: 'Factory Reset',
-          icon: Assets.factoryReset,
-        );
+    super.code = 'factory_reset',
+    super.operationName = 'Factory Reset',
+    super.icon = Assets.factoryReset,
+  });

  @override
  List<GatewayOperationalValue> getOperationalValues() {
--- a/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart
+++ b/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart
@ -183,7 +183,7 @@ class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
                                            state.automations[index].id,
                                        cardType: 'automations',
                                        spaceName:
-                                            state.automations[index].spaceName,
+                                            state.scenes[index].spaceName,
                                        onTap: () {
                                          BlocProvider.of<RoutineBloc>(context)
                                              .add(
--- a/lib/pages/routines/widgets/routine_devices.dart
+++ b/lib/pages/routines/widgets/routine_devices.dart
@ -17,8 +17,6 @@ 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>(
@ -33,41 +31,47 @@ class _RoutineDevicesState extends State<RoutineDevices> {
          }
        });

-        final deviceList = state.devices
-            .where((device) => _allowedProductTypes.contains(device.productType))
-            .toList();
+        final deviceList = state.devices.where((device) {
+          const allowedProductTypes = {'AC', '1G', '2G', '3G', 'WPS', 'GW'};
+          return allowedProductTypes.contains(device.productType);
+        }).toList();

        return Wrap(
          spacing: 10,
          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: deviceData['imagePath'] as String,
-                      title: deviceData['title'] as String,
-                      deviceData: deviceData,
+                      imagePath: device.getDefaultIcon(device.productType),
+                      title: device.name ?? '',
+                      deviceData: {
+                        'device': device,
+                        'imagePath': device.getDefaultIcon(device.productType),
+                        'title': device.name ?? '',
+                        'deviceId': device.uuid,
+                        'productType': device.productType,
+                        'functions': device.functions,
+                        'uniqueCustomId': '',
+                      },
                    )
                  : const SizedBox.shrink();
            } else {
              return DraggableCard(
-                imagePath: deviceData['imagePath'] as String,
-                title: deviceData['title'] as String,
-                deviceData: deviceData,
+                imagePath: device.getDefaultIcon(device.productType),
+                title: device.name ?? '',
+                deviceData: {
+                  'device': device,
+                  'imagePath': device.getDefaultIcon(device.productType),
+                  'title': device.name ?? '',
+                  'deviceId': device.uuid,
+                  'productType': device.productType,
+                  'functions': device.functions,
+                  'uniqueCustomId': '',
+                },
              );
            }
          }).toList(),
--- a/lib/pages/routines/widgets/routine_dialog_function_list_tile.dart
+++ b/lib/pages/routines/widgets/routine_dialog_function_list_tile.dart
@ -1,42 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_svg/svg.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
-
-class RoutineDialogFunctionListTile extends StatelessWidget {
-  const RoutineDialogFunctionListTile({
-    super.key,
-    required this.iconPath,
-    required this.operationName,
-    required this.onTap,
-  });
-
-  final String iconPath;
-  final String operationName;
-  final void Function() onTap;
-
-  @override
-  Widget build(BuildContext context) {
-    return ListTile(
-      leading: SvgPicture.asset(
-        iconPath,
-        width: 24,
-        height: 24,
-        placeholderBuilder: (context) => const SizedBox(
-          width: 24,
-          height: 24,
-        ),
-      ),
-      title: Text(
-        operationName,
-        style: context.textTheme.bodyMedium,
-      ),
-      trailing: const Icon(
-        Icons.arrow_forward_ios,
-        size: 16,
-        color: ColorsManager.textGray,
-      ),
-      onTap: onTap,
-    );
-  }
-}
--- a/lib/pages/routines/widgets/routine_dialog_selection_list_tile.dart
+++ b/lib/pages/routines/widgets/routine_dialog_selection_list_tile.dart
@ -1,47 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_svg/svg.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
-
-class RoutineDialogSelectionListTile extends StatelessWidget {
-  const RoutineDialogSelectionListTile({
-    required this.iconPath,
-    required this.description,
-    required this.isSelected,
-    required this.onTap,
-    super.key,
-  });
-
-  final bool isSelected;
-  final String iconPath;
-  final String description;
-  final void Function() onTap;
-
-  @override
-  Widget build(BuildContext context) {
-    return ListTile(
-      leading: SvgPicture.asset(
-        iconPath,
-        width: 24,
-        height: 24,
-        placeholderBuilder: (context) => Container(
-          width: 24,
-          height: 24,
-          color: Colors.transparent,
-        ),
-      ),
-      title: Text(
-        description,
-        style: context.textTheme.bodyMedium,
-      ),
-      trailing: Icon(
-        isSelected ? Icons.radio_button_checked : Icons.radio_button_unchecked,
-        size: 24,
-        color: isSelected
-            ? ColorsManager.primaryColorWithOpacity
-            : ColorsManager.textGray,
-      ),
-      onTap: onTap,
-    );
-  }
-}
--- a/lib/pages/routines/widgets/routine_dialogs/ac_dialog.dart
+++ b/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({
-    required BuildContext context,
-    required List<DeviceFunction> functions,
-    required AllDevicesModel? device,
-    required List<DeviceFunctionData>? deviceSelectedFunctions,
-    required String uniqueCustomId,
-    required bool? removeComparetors,
-    required String dialogType,
-  }) async {
-    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();
+  static Future<Map<String, dynamic>?> showACFunctionsDialog(
+    BuildContext context,
+    List<DeviceFunction> functions,
+    AllDevicesModel? device,
+    List<DeviceFunctionData>? deviceSelectedFunctions,
+    String uniqueCustomId,
+    bool? removeComparetors,
+  ) async {
+    List<ACFunction> acFunctions = functions.whereType<ACFunction>().toList();

    return showDialog<Map<String, dynamic>?>(
      context: context,
      builder: (BuildContext context) {
        return BlocProvider(
-          create: (_) => FunctionBloc()
-            ..add(InitializeFunctions(deviceSelectedFunctions ?? [])),
+          create: (_) => FunctionBloc()..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
-                    .firstWhere((f) => f.functionCode == selectedFunction,
+                final selectedFunctionData =
+                    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:
-                                    (functionCode, operationName) => context
-                                        .read<FunctionBloc>()
-                                        .add(SelectFunction(
+                                onFunctionSelected: (functionCode, operationName) =>
+                                    context.read<FunctionBloc>().add(SelectFunction(
                                          functionCode: functionCode,
                                          operationName: operationName,
                                        )),
@ -205,8 +194,7 @@ class ACHelper {
      );
    }

-    final selectedFn =
-        acFunctions.firstWhere((f) => f.code == selectedFunction);
+    final selectedFn = 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:
-          conditions.map((c) => c == (currentCondition ?? "==")).toList(),
+      isSelected: 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
-                ? Icons.radio_button_checked
-                : Icons.radio_button_unchecked,
+            isSelected ? Icons.radio_button_checked : Icons.radio_button_unchecked,
            size: 24,
-            color: isSelected
-                ? ColorsManager.primaryColorWithOpacity
-                : ColorsManager.textGray,
+            color: isSelected ? ColorsManager.primaryColorWithOpacity : ColorsManager.textGray,
          ),
          onTap: () {
            if (!isSelected) {
@ -415,8 +398,7 @@ class ACHelper {
                        operationName: operationName,
                        value: value.value,
                        condition: selectedFunctionData?.condition,
-                        valueDescription:
-                            selectedFunctionData?.valueDescription,
+                        valueDescription: selectedFunctionData?.valueDescription,
                      ),
                    ),
                  );
--- a/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_dialog.dart
@ -1,130 +1,28 @@
 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/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/device_functions.dart';
-import 'package:syncrow_web/pages/routines/models/gateway.dart';
-import 'package:syncrow_web/pages/routines/widgets/dialog_footer.dart';
-import 'package:syncrow_web/pages/routines/widgets/dialog_header.dart';
-import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/gateway/gateway_dialog_value_selector.dart';
-import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/gateway/gateway_functions_list.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/gateway/gateway_if_dialog.dart';

-class GatewayDialog extends StatefulWidget {
-  const GatewayDialog({
-    required this.uniqueCustomId,
-    required this.functions,
-    required this.deviceSelectedFunctions,
-    required this.device,
-    super.key,
-  });
-
-  final String? uniqueCustomId;
-  final List<DeviceFunction> functions;
-  final List<DeviceFunctionData> deviceSelectedFunctions;
-  final AllDevicesModel? device;
-
-  @override
-  State<GatewayDialog> createState() => _GatewayDialogState();
-}
-
-class _GatewayDialogState extends State<GatewayDialog> {
-  late final List<GatewayFunctions> _gatewayFunctions;
-
-  @override
-  void initState() {
-    super.initState();
-    _gatewayFunctions = widget.functions.whereType<GatewayFunctions>().toList();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return AlertDialog(
-      contentPadding: EdgeInsets.zero,
-      content: BlocBuilder<FunctionBloc, FunctionBlocState>(
-        builder: (context, state) {
-          final selectedFunction = state.selectedFunction;
-          return Container(
-            width: selectedFunction != null ? 600 : 360,
-            height: 450,
-            decoration: BoxDecoration(
-              color: Colors.white,
-              borderRadius: BorderRadius.circular(20),
-            ),
-            padding: const EdgeInsets.only(top: 20),
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                const DialogHeader('Gateway Conditions'),
-                Expanded(child: _buildMainContent(context, state)),
-                _buildDialogFooter(context, state),
-              ],
-            ),
-          );
-        },
-      ),
-    );
-  }
-
-  Widget _buildMainContent(BuildContext context, FunctionBlocState state) {
-    final selectedFunction = state.selectedFunction;
-    final selectedOperationName = state.selectedOperationName;
-    final selectedFunctionData = state.addedFunctions.firstWhere(
-      (f) => f.functionCode == selectedFunction,
-      orElse: () => DeviceFunctionData(
-        entityId: '',
-        functionCode: selectedFunction ?? '',
-        operationName: '',
-        value: null,
-      ),
-    );
-    final selectedGatewayFunctions = _gatewayFunctions.firstWhere(
-      (f) => f.code == selectedFunction,
-      orElse: () => GatewaySwitchAlarmSound(
-        deviceId: '',
-        deviceName: '',
-        type: '',
-      ),
-    );
-    final operations = selectedGatewayFunctions.getOperationalValues();
-
-    return Row(
-      crossAxisAlignment: CrossAxisAlignment.stretch,
-      children: [
-        GatewayFunctionsList(gatewayFunctions: _gatewayFunctions),
-        if (state.selectedFunction != null)
-          Expanded(
-            child: GatewayDialogValueSelector(
-              operations: operations,
-              selectedFunction: selectedFunction ?? '',
-              selectedFunctionData: selectedFunctionData,
-              gatewayFunctions: _gatewayFunctions,
-              operationName: selectedOperationName ?? '',
-              device: widget.device,
-            ),
+final class GatewayHelper {
+  static Future<Map<String, dynamic>?> showGatewayFunctionsDialog({
+    required BuildContext context,
+    required List<DeviceFunction> functions,
+    required String? uniqueCustomId,
+    required List<DeviceFunctionData> deviceSelectedFunctions,
+  }) async {
+    return showDialog(
+      context: context,
+      builder: (context) => BlocProvider<FunctionBloc>(
+        create: (context) => FunctionBloc()
+          ..add(
+            InitializeFunctions(deviceSelectedFunctions),
          ),
-      ],
-    );
-  }
-
-  Widget _buildDialogFooter(BuildContext context, FunctionBlocState state) {
-    return DialogFooter(
-      onCancel: () => Navigator.pop(context),
-      onConfirm: state.addedFunctions.isNotEmpty
-          ? () {
-              context.read<RoutineBloc>().add(
-                    AddFunctionToRoutine(
-                      state.addedFunctions,
-                      widget.uniqueCustomId ?? '-1',
-                    ),
-                  );
-              Navigator.pop(
-                context,
-                {'deviceId': widget.functions.firstOrNull?.deviceId},
-              );
-            }
-          : null,
-      isConfirmEnabled: state.selectedFunction != null,
+        child: GatewayIfDialog(
+            uniqueCustomId: uniqueCustomId,
+            functions: functions,
+            deviceSelectedFunctions: deviceSelectedFunctions),
+      ),
    );
  }
 }
--- a/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_dialog_value_selector.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_dialog_value_selector.dart
@ -1,58 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
-import 'package:syncrow_web/pages/routines/bloc/functions_bloc/functions_bloc_bloc.dart';
-import 'package:syncrow_web/pages/routines/models/device_functions.dart';
-import 'package:syncrow_web/pages/routines/models/gateway.dart';
-import 'package:syncrow_web/pages/routines/widgets/routine_dialog_selection_list_tile.dart';
-
-class GatewayDialogValueSelector extends StatelessWidget {
-  const GatewayDialogValueSelector({
-    required this.operations,
-    required this.selectedFunction,
-    required this.selectedFunctionData,
-    required this.gatewayFunctions,
-    required this.device,
-    required this.operationName,
-    super.key,
-  });
-
-  final List<GatewayOperationalValue> operations;
-  final String selectedFunction;
-  final DeviceFunctionData? selectedFunctionData;
-  final List<GatewayFunctions> gatewayFunctions;
-  final AllDevicesModel? device;
-  final String operationName;
-
-  @override
-  Widget build(BuildContext context) {
-    return ListView.builder(
-      itemCount: operations.length,
-      itemBuilder: (context, index) {
-        final operation = operations[index];
-        final isSelected = selectedFunctionData?.value == operation.value;
-        return RoutineDialogSelectionListTile(
-          iconPath: operation.icon,
-          description: operation.description,
-          isSelected: isSelected,
-          onTap: () {
-            if (!isSelected) {
-              context.read<FunctionBloc>().add(
-                    AddFunction(
-                      functionData: DeviceFunctionData(
-                        entityId: device?.uuid ?? '',
-                        functionCode: selectedFunction,
-                        operationName: operationName,
-                        value: operation.value,
-                        condition: selectedFunctionData?.condition,
-                        valueDescription: selectedFunctionData?.valueDescription,
-                      ),
-                    ),
-                  );
-            }
-          },
-        );
-      },
-    );
-  }
-}
--- a/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_functions_list.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_functions_list.dart
@ -1,43 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/routines/bloc/functions_bloc/functions_bloc_bloc.dart';
-import 'package:syncrow_web/pages/routines/models/gateway.dart';
-import 'package:syncrow_web/pages/routines/widgets/routine_dialog_function_list_tile.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-
-class GatewayFunctionsList extends StatelessWidget {
-  const GatewayFunctionsList({
-    required this.gatewayFunctions,
-    super.key,
-  });
-
-  final List<GatewayFunctions> gatewayFunctions;
-
-  @override
-  Widget build(BuildContext context) {
-    return SizedBox(
-      width: 360,
-      child: ListView.separated(
-        shrinkWrap: false,
-        itemCount: gatewayFunctions.length,
-        separatorBuilder: (context, index) => const Padding(
-          padding: EdgeInsets.symmetric(horizontal: 40.0),
-          child: Divider(color: ColorsManager.dividerColor),
-        ),
-        itemBuilder: (context, index) {
-          final function = gatewayFunctions[index];
-          return RoutineDialogFunctionListTile(
-            iconPath: function.icon,
-            operationName: function.operationName,
-            onTap: () => context.read<FunctionBloc>().add(
-                  SelectFunction(
-                    functionCode: function.code,
-                    operationName: function.operationName,
-                  ),
-                ),
-          );
-        },
-      ),
-    );
-  }
-}
--- a/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_helper.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_helper.dart
@ -1,34 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
-import 'package:syncrow_web/pages/routines/bloc/functions_bloc/functions_bloc_bloc.dart';
-import 'package:syncrow_web/pages/routines/models/device_functions.dart';
-import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/gateway/gateway_dialog.dart';
-
-abstract final class GatewayHelper {
-  const GatewayHelper._();
-
-  static Future<Map<String, dynamic>?> showGatewayFunctionsDialog({
-    required BuildContext context,
-    required List<DeviceFunction> functions,
-    required String? uniqueCustomId,
-    required List<DeviceFunctionData> deviceSelectedFunctions,
-    required AllDevicesModel? device,
-  }) async {
-    return showDialog(
-      context: context,
-      builder: (context) => BlocProvider<FunctionBloc>(
-        create: (context) => FunctionBloc()
-          ..add(
-            InitializeFunctions(deviceSelectedFunctions),
-          ),
-        child: GatewayDialog(
-          uniqueCustomId: uniqueCustomId,
-          functions: functions,
-          deviceSelectedFunctions: deviceSelectedFunctions,
-          device: device,
-        ),
-      ),
-    );
-  }
-}
--- a/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_if_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_if_dialog.dart
@ -0,0 +1,243 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_svg/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/device_functions.dart';
+import 'package:syncrow_web/pages/routines/models/gateway.dart';
+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';
+
+class GatewayIfDialog extends StatefulWidget {
+  const GatewayIfDialog({
+    required this.uniqueCustomId,
+    required this.functions,
+    required this.deviceSelectedFunctions,
+    super.key,
+  });
+
+  final String? uniqueCustomId;
+  final List<DeviceFunction> functions;
+  final List<DeviceFunctionData> deviceSelectedFunctions;
+
+  @override
+  State<GatewayIfDialog> createState() => _GatewayIfDialogState();
+}
+
+class _GatewayIfDialogState extends State<GatewayIfDialog> {
+  late final List<GatewayFunctions> _gatewayFunctions;
+
+  @override
+  void initState() {
+    super.initState();
+    _gatewayFunctions = widget.functions.whereType<GatewayFunctions>().toList();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AlertDialog(
+      contentPadding: EdgeInsets.zero,
+      content: BlocBuilder<FunctionBloc, FunctionBlocState>(
+        builder: (context, state) {
+          final selectedFunction = state.selectedFunction;
+          return Container(
+            width: selectedFunction != null ? 600 : 360,
+            height: 450,
+            decoration: BoxDecoration(
+              color: Colors.white,
+              borderRadius: BorderRadius.circular(20),
+            ),
+            padding: const EdgeInsets.only(top: 20),
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                const DialogHeader('Gateway Conditions'),
+                Expanded(child: _buildMainContent(context, state)),
+                _buildDialogFooter(context, state),
+              ],
+            ),
+          );
+        },
+      ),
+    );
+  }
+
+  Widget _buildDialogFooter(BuildContext context, FunctionBlocState state) {
+    return DialogFooter(
+      onCancel: () => Navigator.pop(context),
+      onConfirm: state.addedFunctions.isNotEmpty
+          ? () {
+              context.read<RoutineBloc>().add(
+                    AddFunctionToRoutine(
+                      state.addedFunctions,
+                      widget.uniqueCustomId ?? '-1',
+                    ),
+                  );
+              Navigator.pop(
+                context,
+                {'deviceId': widget.functions.firstOrNull?.deviceId},
+              );
+            }
+          : null,
+      isConfirmEnabled: state.selectedFunction != null,
+    );
+  }
+
+  Widget _buildMainContent(BuildContext context, FunctionBlocState state) {
+    final selectedFunction = state.selectedFunction;
+    final selectedOperationName = state.selectedOperationName;
+    final selectedFunctionData = state.addedFunctions.firstWhere(
+      (f) => f.functionCode == selectedFunction,
+      orElse: () => DeviceFunctionData(
+        entityId: '',
+        functionCode: selectedFunction ?? '',
+        operationName: '',
+        value: null,
+      ),
+    );
+
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.stretch,
+      children: [
+        _buildFunctionList(context),
+        if (state.selectedFunction != null)
+          Expanded(
+            child: _buildValueSelector(
+              context: context,
+              selectedFunction: selectedFunction ?? '',
+              selectedFunctionData: selectedFunctionData,
+              acFunctions: _gatewayFunctions,
+              operationName: selectedOperationName ?? '',
+            ),
+          ),
+      ],
+    );
+  }
+
+  Widget _buildFunctionList(BuildContext context) {
+    return SizedBox(
+      width: 360,
+      child: ListView.separated(
+        shrinkWrap: false,
+        itemCount: _gatewayFunctions.length,
+        separatorBuilder: (context, index) => const Padding(
+          padding: EdgeInsets.symmetric(horizontal: 40.0),
+          child: Divider(color: ColorsManager.dividerColor),
+        ),
+        itemBuilder: (context, index) {
+          final function = _gatewayFunctions[index];
+          return ListTile(
+            leading: SvgPicture.asset(
+              function.icon,
+              width: 24,
+              height: 24,
+              placeholderBuilder: (context) => const SizedBox(
+                width: 24,
+                height: 24,
+              ),
+            ),
+            title: Text(
+              function.operationName,
+              style: context.textTheme.bodyMedium,
+            ),
+            trailing: const Icon(
+              Icons.arrow_forward_ios,
+              size: 16,
+              color: ColorsManager.textGray,
+            ),
+            onTap: () => context.read<FunctionBloc>().add(
+                  SelectFunction(
+                    functionCode: function.code,
+                    operationName: function.operationName,
+                  ),
+                ),
+          );
+        },
+      ),
+    );
+  }
+
+  static Widget _buildValueSelector({
+    required BuildContext context,
+    required String selectedFunction,
+    required DeviceFunctionData? selectedFunctionData,
+    required List<GatewayFunctions> acFunctions,
+    AllDevicesModel? device,
+    required String operationName,
+  }) {
+    final selectedGatewayFunctions = acFunctions.firstWhere(
+      (f) => f.code == selectedFunction,
+    );
+    final values = selectedGatewayFunctions.getOperationalValues();
+
+    return _buildOperationalValuesList(
+      context: context,
+      values: values,
+      selectedValue: selectedFunctionData?.value,
+      device: device,
+      operationName: operationName,
+      selectCode: selectedFunction,
+      selectedFunctionData: selectedFunctionData,
+    );
+  }
+
+  static Widget _buildOperationalValuesList({
+    required BuildContext context,
+    required List<GatewayOperationalValue> values,
+    required dynamic selectedValue,
+    AllDevicesModel? device,
+    required String operationName,
+    required String selectCode,
+    DeviceFunctionData? selectedFunctionData,
+  }) {
+    return ListView.builder(
+      itemCount: values.length,
+      itemBuilder: (context, index) {
+        final value = values[index];
+        final isSelected = selectedValue == value.value;
+        return ListTile(
+          leading: SvgPicture.asset(
+            value.icon,
+            width: 24,
+            height: 24,
+            placeholderBuilder: (context) => Container(
+              width: 24,
+              height: 24,
+              color: Colors.transparent,
+            ),
+          ),
+          title: Text(
+            value.description,
+            style: context.textTheme.bodyMedium,
+          ),
+          trailing: Icon(
+            isSelected ? Icons.radio_button_checked : Icons.radio_button_unchecked,
+            size: 24,
+            color: isSelected
+                ? ColorsManager.primaryColorWithOpacity
+                : ColorsManager.textGray,
+          ),
+          onTap: () {
+            if (!isSelected) {
+              context.read<FunctionBloc>().add(
+                    AddFunction(
+                      functionData: DeviceFunctionData(
+                        entityId: device?.uuid ?? '',
+                        functionCode: selectCode,
+                        operationName: operationName,
+                        value: value.value,
+                        condition: selectedFunctionData?.condition,
+                        valueDescription: selectedFunctionData?.valueDescription,
+                      ),
+                    ),
+                  );
+            }
+          },
+        );
+      },
+    );
+  }
+}
--- a/lib/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart
+++ b/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({
-    required String dialogType,
-    required BuildContext context,
-    required List<DeviceFunction> functions,
-    required AllDevicesModel? device,
-    required List<DeviceFunctionData>? deviceSelectedFunctions,
-    required String uniqueCustomId,
-    required bool removeComparetors,
-  }) async {
-    List<BaseSwitchFunction> oneGangFunctions =
-        functions.whereType<BaseSwitchFunction>().toList();
+  static Future<Map<String, dynamic>?> showSwitchFunctionsDialog(
+    BuildContext context,
+    List<DeviceFunction> functions,
+    AllDevicesModel? device,
+    List<DeviceFunctionData>? deviceSelectedFunctions,
+    String uniqueCustomId,
+    bool removeComparetors,
+  ) async {
+    List<BaseSwitchFunction> acFunctions = functions.whereType<BaseSwitchFunction>().toList();

    return showDialog<Map<String, dynamic>?>(
      context: context,
      builder: (BuildContext context) {
        return BlocProvider(
-            create: (_) => FunctionBloc()
-              ..add(InitializeFunctions(deviceSelectedFunctions ?? [])),
+            create: (_) => FunctionBloc()..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
-                      .firstWhere((f) => f.functionCode == selectedFunction,
+                  final selectedFunctionData =
+                      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
-                                            .read<FunctionBloc>()
-                                            .add(SelectFunction(
+                                        context.read<FunctionBloc>().add(SelectFunction(
                                              functionCode: function.code,
-                                              operationName:
-                                                  function.operationName,
+                                              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,
-            selectedFunctionData, selectCode),
+        _buildCountDownDisplay(
+            context, initialValue, device, operationName, selectedFunctionData, selectCode),
        const SizedBox(height: 20),
-        _buildCountDownSlider(context, initialValue, device, operationName,
-            selectedFunctionData, selectCode),
+        _buildCountDownSlider(
+            context, initialValue, device, operationName, selectedFunctionData, selectCode),
      ],
    );
  }
@ -271,8 +257,7 @@ class OneGangSwitchHelper {
        minHeight: 40.0,
        minWidth: 40.0,
      ),
-      isSelected:
-          conditions.map((c) => c == (currentCondition ?? "==")).toList(),
+      isSelected: 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) -
-                  (operationalValues.minValue ?? 0)) /
+      divisions: (((operationalValues.maxValue ?? 0) - (operationalValues.minValue ?? 0)) /
              (operationalValues.stepValue ?? 1))
          .round(),
      onChanged: (value) {
@ -373,13 +357,9 @@ class OneGangSwitchHelper {
            style: context.textTheme.bodyMedium,
          ),
          trailing: Icon(
-            isSelected
-                ? Icons.radio_button_checked
-                : Icons.radio_button_unchecked,
+            isSelected ? Icons.radio_button_checked : Icons.radio_button_unchecked,
            size: 24,
-            color: isSelected
-                ? ColorsManager.primaryColorWithOpacity
-                : ColorsManager.textGray,
+            color: isSelected ? ColorsManager.primaryColorWithOpacity : ColorsManager.textGray,
          ),
          onTap: () {
            if (!isSelected) {
@ -391,8 +371,7 @@ class OneGangSwitchHelper {
                        operationName: operationName,
                        value: value.value,
                        condition: selectedFunctionData?.condition,
-                        valueDescription:
-                            selectedFunctionData?.valueDescription,
+                        valueDescription: selectedFunctionData?.valueDescription,
                      ),
                    ),
                  );
--- a/lib/pages/routines/widgets/routine_dialogs/three_gang_switch_dialog.dart
+++ b/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({
-    required BuildContext context,
-    required List<DeviceFunction> functions,
-    required AllDevicesModel? device,
-    required List<DeviceFunctionData>? deviceSelectedFunctions,
-    required String uniqueCustomId,
-    required String dialogType,
-    required bool removeComparetors,
-  }) async {
+  static Future<Map<String, dynamic>?> showSwitchFunctionsDialog(
+    BuildContext context,
+    List<DeviceFunction> functions,
+    AllDevicesModel? device,
+    List<DeviceFunctionData>? deviceSelectedFunctions,
+    String uniqueCustomId,
+    bool removeComparetors,
+  ) async {
    List<BaseSwitchFunction> switchFunctions =
        functions.whereType<BaseSwitchFunction>().toList();

--- a/lib/pages/routines/widgets/routine_dialogs/two_gang_switch_dialog.dart
+++ b/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({
-    required BuildContext context,
-    required List<DeviceFunction> functions,
-    required AllDevicesModel? device,
-    required List<DeviceFunctionData>? deviceSelectedFunctions,
-    required String uniqueCustomId,
-    required bool removeComparetors,
-    required String dialogType,
-  }) async {
-    List<BaseSwitchFunction> switchFunctions =
-        functions.whereType<BaseSwitchFunction>().toList();
+  static Future<Map<String, dynamic>?> showSwitchFunctionsDialog(
+    BuildContext context,
+    List<DeviceFunction> functions,
+    AllDevicesModel? device,
+    List<DeviceFunctionData>? deviceSelectedFunctions,
+    String uniqueCustomId,
+    bool removeComparetors,
+  ) async {
+    List<BaseSwitchFunction> switchFunctions = functions.whereType<BaseSwitchFunction>().toList();

    return showDialog<Map<String, dynamic>?>(
      context: context,
      builder: (BuildContext context) {
        return BlocProvider(
-            create: (_) => FunctionBloc()
-              ..add(InitializeFunctions(deviceSelectedFunctions ?? [])),
+            create: (_) => FunctionBloc()..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
-                      .firstWhere((f) => f.functionCode == selectedFunction,
+                  final selectedFunctionData =
+                      state.addedFunctions.firstWhere((f) => f.functionCode == selectedFunction,
                          orElse: () => DeviceFunctionData(
                                entityId: '',
                                functionCode: selectedFunction ?? '',
@ -86,12 +83,9 @@ class TwoGangSwitchHelper {
                                        color: ColorsManager.textGray,
                                      ),
                                      onTap: () {
-                                        context
-                                            .read<FunctionBloc>()
-                                            .add(SelectFunction(
+                                        context.read<FunctionBloc>().add(SelectFunction(
                                              functionCode: function.code,
-                                              operationName:
-                                                  function.operationName,
+                                              operationName: function.operationName,
                                            ));
                                      },
                                    );
@ -167,8 +161,7 @@ class TwoGangSwitchHelper {
    required String operationName,
    required bool removeComparetors,
  }) {
-    if (selectedFunction == 'countdown_1' ||
-        selectedFunction == 'countdown_2') {
+    if (selectedFunction == 'countdown_1' || selectedFunction == 'countdown_2') {
      final initialValue = selectedFunctionData?.value ?? 200;
      return _buildTemperatureSelector(
        context: context,
@ -182,8 +175,7 @@ class TwoGangSwitchHelper {
      );
    }

-    final selectedFn =
-        switchFunctions.firstWhere((f) => f.code == selectedFunction);
+    final selectedFn = 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,
-            selectedFunctionData, selectCode),
+        _buildCountDownDisplay(
+            context, initialValue, device, operationName, selectedFunctionData, selectCode),
        const SizedBox(height: 20),
-        _buildCountDownSlider(context, initialValue, device, operationName,
-            selectedFunctionData, selectCode),
+        _buildCountDownSlider(
+            context, initialValue, device, operationName, selectedFunctionData, selectCode),
      ],
    );
  }
@ -265,8 +257,7 @@ class TwoGangSwitchHelper {
        minHeight: 40.0,
        minWidth: 40.0,
      ),
-      isSelected:
-          conditions.map((c) => c == (currentCondition ?? "==")).toList(),
+      isSelected: 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) -
-                  (operationalValues.minValue ?? 0)) /
+      divisions: (((operationalValues.maxValue ?? 0) - (operationalValues.minValue ?? 0)) /
              (operationalValues.stepValue ?? 1))
          .round(),
      onChanged: (value) {
@ -367,13 +357,9 @@ class TwoGangSwitchHelper {
            style: context.textTheme.bodyMedium,
          ),
          trailing: Icon(
-            isSelected
-                ? Icons.radio_button_checked
-                : Icons.radio_button_unchecked,
+            isSelected ? Icons.radio_button_checked : Icons.radio_button_unchecked,
            size: 24,
-            color: isSelected
-                ? ColorsManager.primaryColorWithOpacity
-                : ColorsManager.textGray,
+            color: isSelected ? ColorsManager.primaryColorWithOpacity : ColorsManager.textGray,
          ),
          onTap: () {
            if (!isSelected) {
@ -385,8 +371,7 @@ class TwoGangSwitchHelper {
                        operationName: operationName,
                        value: value.value,
                        condition: selectedFunctionData?.condition,
-                        valueDescription:
-                            selectedFunctionData?.valueDescription,
+                        valueDescription: selectedFunctionData?.valueDescription,
                      ),
                    ),
                  );