SP-1189-FE-Add-Button-Not-clickable-Opening-Pop-up-in-Community-Screen

simplify space selection logic.
simplify if statements readabaility.
2025-07-14 09:17:37 +00:00 · 2025-04-13 14:50:07 +03:00 · 2025-04-13 13:12:48 +03:00 · 2025-04-13 13:08:23 +03:00 · 2025-04-13 12:52:38 +03:00 · 2025-04-13 12:47:05 +03:00
22 changed files with 774 additions and 582 deletions
--- a/lib/pages/device_managment/all_devices/models/devices_model.dart
+++ b/lib/pages/device_managment/all_devices/models/devices_model.dart
@ -248,12 +248,18 @@ SOS
    switch (productType) {
      case 'AC':
        return [
-          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 ?? ''),
+          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'),
        ];

      case '1G':
@ -276,17 +282,17 @@ SOS
      case '3G':
        return [
          ThreeGangSwitch1Function(
-              deviceId: uuid ?? '', deviceName: name ?? ''),
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
          ThreeGangSwitch2Function(
-              deviceId: uuid ?? '', deviceName: name ?? ''),
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
          ThreeGangSwitch3Function(
-              deviceId: uuid ?? '', deviceName: name ?? ''),
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
          ThreeGangCountdown1Function(
-              deviceId: uuid ?? '', deviceName: name ?? ''),
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
          ThreeGangCountdown2Function(
-              deviceId: uuid ?? '', deviceName: name ?? ''),
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
          ThreeGangCountdown3Function(
-              deviceId: uuid ?? '', deviceName: name ?? ''),
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
        ];
      case 'WPS':
        return [
@ -312,8 +318,6 @@ 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,27 +14,36 @@ class GatewayModel {
  });

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

-    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;
+    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;
+      }
+    }

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

      case '1G':
        return OneGangSwitchHelper.showSwitchFunctionsDialog(
-            context,
-            functions,
-            data['device'],
-            deviceSelectedFunctions,
-            data['uniqueCustomId'],
-            removeComparetors);
+            dialogType: dialogType,
+            context: context,
+            functions: functions,
+            device: data['device'],
+            deviceSelectedFunctions: deviceSelectedFunctions,
+            uniqueCustomId: data['uniqueCustomId'],
+            removeComparetors: removeComparetors);
      case '2G':
        return TwoGangSwitchHelper.showSwitchFunctionsDialog(
-            context,
-            functions,
-            data['device'],
-            deviceSelectedFunctions,
-            data['uniqueCustomId'],
-            removeComparetors);
+            dialogType: dialogType,
+            context: context,
+            functions: functions,
+            device: data['device'],
+            deviceSelectedFunctions: deviceSelectedFunctions,
+            uniqueCustomId: data['uniqueCustomId'],
+            removeComparetors: removeComparetors);
      case '3G':
        return ThreeGangSwitchHelper.showSwitchFunctionsDialog(
-            context,
-            functions,
-            data['device'],
-            deviceSelectedFunctions,
-            data['uniqueCustomId'],
-            removeComparetors);
+            dialogType: dialogType,
+            context: context,
+            functions: functions,
+            device: data['device'],
+            deviceSelectedFunctions: deviceSelectedFunctions,
+            uniqueCustomId: data['uniqueCustomId'],
+            removeComparetors: removeComparetors);
      case 'WPS':
        return WallPresenceSensor.showWPSFunctionsDialog(
            dialogType: dialogType,
@ -105,6 +104,7 @@ 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,23 +5,28 @@ 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})
+  SwitchFunction(
+      {required super.deviceId, required super.deviceName, required type})
      : super(
          code: 'switch',
          operationName: 'Power',
          icon: Assets.assetsAcPower,
+          type: type,
        );

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

 class ModeFunction extends ACFunction {
-  ModeFunction({required super.deviceId, required super.deviceName})
+  ModeFunction(
+      {required super.deviceId, required super.deviceName, required type})
      : super(
          code: 'mode',
          operationName: 'Mode',
          icon: Assets.assetsFreezing,
+          type: type,
        );

  @override
@ -72,7 +79,8 @@ class TempSetFunction extends ACFunction {
  final int max;
  final int step;

-  TempSetFunction({required super.deviceId, required super.deviceName})
+  TempSetFunction(
+      {required super.deviceId, required super.deviceName, required type})
      : min = 160,
        max = 300,
        step = 1,
@ -80,6 +88,7 @@ class TempSetFunction extends ACFunction {
          code: 'temp_set',
          operationName: 'Set Temperature',
          icon: Assets.assetsTempreture,
+          type: type,
        );

  @override
@ -97,8 +106,10 @@ class TempSetFunction extends ACFunction {
 }

 class LevelFunction extends ACFunction {
-  LevelFunction({required super.deviceId, required super.deviceName})
+  LevelFunction(
+      {required super.deviceId, required super.deviceName, required type})
      : super(
+          type: type,
          code: 'level',
          operationName: 'Fan Speed',
          icon: Assets.assetsFanSpeed,
@ -130,8 +141,10 @@ class LevelFunction extends ACFunction {
 }

 class ChildLockFunction extends ACFunction {
-  ChildLockFunction({required super.deviceId, required super.deviceName})
+  ChildLockFunction(
+      {required super.deviceId, required super.deviceName, required type})
      : super(
+          type: type,
          code: 'child_lock',
          operationName: 'Child Lock',
          icon: Assets.assetsChildLock,
@ -157,11 +170,13 @@ class CurrentTempFunction extends ACFunction {
  final int max;
  final int step;

-  CurrentTempFunction({required super.deviceId, required super.deviceName})
+  CurrentTempFunction(
+      {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,
--- 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})
+  ThreeGangSwitch1Function({required super.deviceId, required super.deviceName ,required type})
      : 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})
+  ThreeGangCountdown1Function({required super.deviceId, required super.deviceName ,required type})
      : 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})
+  ThreeGangSwitch2Function({required super.deviceId, required super.deviceName, required type})
      : 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})
+  ThreeGangCountdown2Function({required super.deviceId, required super.deviceName ,required type})
      : 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})
+  ThreeGangSwitch3Function({required super.deviceId, required super.deviceName ,required type})
      : 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})
+  ThreeGangCountdown3Function({required super.deviceId, required super.deviceName ,required type})
      : super(
          code: 'countdown_3',
          operationName: 'Light 3 Countdown',
--- a/lib/pages/routines/models/gateway.dart
+++ b/lib/pages/routines/models/gateway.dart
@ -33,10 +33,11 @@ final class GatewaySwitchAlarmSound extends GatewayFunctions {
    required super.deviceId,
    required super.deviceName,
    required super.type,
-    super.code = 'switch_alarm_sound',
-    super.operationName = 'Switch Alarm Sound',
-    super.icon = Assets.activeBell,
-  });
+  }) : super(
+          code: 'switch_alarm_sound',
+          operationName: 'Switch Alarm Sound',
+          icon: Assets.activeBell,
+        );

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

  @override
  List<GatewayOperationalValue> getOperationalValues() {
@ -69,12 +71,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',
      ),
    ];
  }
@ -85,10 +87,11 @@ final class GatewayFactoryReset extends GatewayFunctions {
    required super.deviceId,
    required super.deviceName,
    required super.type,
-    super.code = 'factory_reset',
-    super.operationName = 'Factory Reset',
-    super.icon = Assets.factoryReset,
-  });
+  }) : super(
+          code: 'factory_reset',
+          operationName: 'Factory Reset',
+          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.scenes[index].spaceName,
+                                            state.automations[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,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>(
@ -31,47 +33,41 @@ class _RoutineDevicesState extends State<RoutineDevices> {
          }
        });

-        final deviceList = state.devices.where((device) {
-          const allowedProductTypes = {'AC', '1G', '2G', '3G', 'WPS', 'GW'};
-          return allowedProductTypes.contains(device.productType);
-        }).toList();
+        final deviceList = state.devices
+            .where((device) => _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: 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': '',
-                      },
+                      imagePath: deviceData['imagePath'] as String,
+                      title: deviceData['title'] as String,
+                      deviceData: deviceData,
                    )
                  : const SizedBox.shrink();
            } else {
              return DraggableCard(
-                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': '',
-                },
+                imagePath: deviceData['imagePath'] as String,
+                title: deviceData['title'] as String,
+                deviceData: deviceData,
              );
            }
          }).toList(),
--- a/lib/pages/routines/widgets/routine_dialog_function_list_tile.dart
+++ b/lib/pages/routines/widgets/routine_dialog_function_list_tile.dart
@ -0,0 +1,42 @@
+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
@ -0,0 +1,47 @@
+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,29 +13,38 @@ 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(
-    BuildContext context,
-    List<DeviceFunction> functions,
-    AllDevicesModel? device,
-    List<DeviceFunctionData>? deviceSelectedFunctions,
-    String uniqueCustomId,
-    bool? removeComparetors,
-  ) async {
-    List<ACFunction> acFunctions = functions.whereType<ACFunction>().toList();
+  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();

    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 ?? '',
@ -65,8 +74,10 @@ 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,
                                        )),
@ -194,7 +205,8 @@ class ACHelper {
      );
    }

-    final selectedFn = acFunctions.firstWhere((f) => f.code == selectedFunction);
+    final selectedFn =
+        acFunctions.firstWhere((f) => f.code == selectedFunction);
    final values = selectedFn.getOperationalValues();

    return _buildOperationalValuesList(
@ -290,7 +302,8 @@ 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(),
    );
  }
@ -384,9 +397,13 @@ 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) {
@ -398,7 +415,8 @@ 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,28 +1,130 @@
 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/widgets/routine_dialogs/gateway/gateway_if_dialog.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';

-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),
-          ),
-        child: GatewayIfDialog(
-            uniqueCustomId: uniqueCustomId,
-            functions: functions,
-            deviceSelectedFunctions: deviceSelectedFunctions),
+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,
+            ),
+          ),
+      ],
+    );
+  }
+
+  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,
+    );
+  }
 }
--- 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
@ -0,0 +1,58 @@
+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
@ -0,0 +1,43 @@
+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
@ -0,0 +1,34 @@
+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
@ -1,243 +0,0 @@
-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,8 +5,10 @@ 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';
@ -14,29 +16,32 @@ 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(
-    BuildContext context,
-    List<DeviceFunction> functions,
-    AllDevicesModel? device,
-    List<DeviceFunctionData>? deviceSelectedFunctions,
-    String uniqueCustomId,
-    bool removeComparetors,
-  ) async {
-    List<BaseSwitchFunction> acFunctions = functions.whereType<BaseSwitchFunction>().toList();
+  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();

    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 ?? '',
@ -61,12 +66,12 @@ class OneGangSwitchHelper {
                              // Left side: Function list
                              Expanded(
                                child: ListView.separated(
-                                  itemCount: acFunctions.length,
+                                  itemCount: oneGangFunctions.length,
                                  separatorBuilder: (_, __) => const Divider(
                                    color: ColorsManager.dividerColor,
                                  ),
                                  itemBuilder: (context, index) {
-                                    final function = acFunctions[index];
+                                    final function = oneGangFunctions[index];
                                    return ListTile(
                                      leading: SvgPicture.asset(
                                        function.icon,
@ -83,9 +88,12 @@ 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,
                                            ));
                                      },
                                    );
@ -99,7 +107,7 @@ class OneGangSwitchHelper {
                                    context: context,
                                    selectedFunction: selectedFunction,
                                    selectedFunctionData: selectedFunctionData,
-                                    acFunctions: acFunctions,
+                                    acFunctions: oneGangFunctions,
                                    device: device,
                                    operationName: selectedOperationName ?? '',
                                    removeComparetors: removeComparetors,
@ -174,8 +182,14 @@ 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(
@ -212,11 +226,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),
      ],
    );
  }
@ -257,7 +271,8 @@ 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(),
    );
  }
@ -305,7 +320,8 @@ 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) {
@ -357,9 +373,13 @@ 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) {
@ -371,7 +391,8 @@ 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,14 +14,15 @@ 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(
-    BuildContext context,
-    List<DeviceFunction> functions,
-    AllDevicesModel? device,
-    List<DeviceFunctionData>? deviceSelectedFunctions,
-    String uniqueCustomId,
-    bool removeComparetors,
-  ) async {
+  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 {
    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,29 +14,32 @@ 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(
-    BuildContext context,
-    List<DeviceFunction> functions,
-    AllDevicesModel? device,
-    List<DeviceFunctionData>? deviceSelectedFunctions,
-    String uniqueCustomId,
-    bool removeComparetors,
-  ) async {
-    List<BaseSwitchFunction> switchFunctions = functions.whereType<BaseSwitchFunction>().toList();
+  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();

    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 ?? '',
@ -83,9 +86,12 @@ 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,
                                            ));
                                      },
                                    );
@ -161,7 +167,8 @@ 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,
@ -175,7 +182,8 @@ class TwoGangSwitchHelper {
      );
    }

-    final selectedFn = switchFunctions.firstWhere((f) => f.code == selectedFunction);
+    final selectedFn =
+        switchFunctions.firstWhere((f) => f.code == selectedFunction);
    final values = selectedFn.getOperationalValues();

    return _buildOperationalValuesList(
@ -212,11 +220,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),
      ],
    );
  }
@ -257,7 +265,8 @@ 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(),
    );
  }
@ -305,7 +314,8 @@ 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) {
@ -357,9 +367,13 @@ 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) {
@ -371,7 +385,8 @@ class TwoGangSwitchHelper {
                        operationName: operationName,
                        value: value.value,
                        condition: selectedFunctionData?.condition,
-                        valueDescription: selectedFunctionData?.valueDescription,
+                        valueDescription:
+                            selectedFunctionData?.valueDescription,
                      ),
                    ),
                  );
--- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_add_community_button.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_add_community_button.dart
@ -0,0 +1,51 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_svg/svg.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_event.dart';
+import 'package:syncrow_web/pages/spaces_management/create_community/view/create_community_dialog.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/constants/assets.dart';
+
+class SidebarAddCommunityButton extends StatelessWidget {
+  const SidebarAddCommunityButton({
+    required this.existingCommunityNames,
+    super.key,
+  });
+
+  final List<String> existingCommunityNames;
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox.square(
+      dimension: 30,
+      child: IconButton(
+        style: IconButton.styleFrom(
+          iconSize: 20,
+          backgroundColor: ColorsManager.circleImageBackground,
+          shape: const CircleBorder(
+            side: BorderSide(
+              color: ColorsManager.lightGrayBorderColor,
+              width: 3,
+            ),
+          ),
+        ),
+        onPressed: () => _showCreateCommunityDialog(context),
+        icon: SvgPicture.asset(Assets.addIcon),
+      ),
+    );
+  }
+
+  void _showCreateCommunityDialog(BuildContext context) => showDialog<void>(
+        context: context,
+        builder: (context) => CreateCommunityDialog(
+          isEditMode: false,
+          existingCommunityNames: existingCommunityNames,
+          onCreateCommunity: (name, description) {
+            context.read<SpaceManagementBloc>().add(
+                  CreateCommunityEvent(name, description, context),
+                );
+          },
+        ),
+      );
+}
--- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_header.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_header.dart
@ -0,0 +1,31 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/sidebar_add_community_button.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
+import 'package:syncrow_web/utils/style.dart';
+
+class SidebarHeader extends StatelessWidget {
+  const SidebarHeader({required this.existingCommunityNames, super.key});
+
+  final List<String> existingCommunityNames;
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      decoration: subSectionContainerDecoration,
+      padding: const EdgeInsets.all(16),
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        children: [
+          Text(
+            'Communities',
+            style: context.textTheme.titleMedium?.copyWith(
+              color: ColorsManager.blackColor,
+            ),
+          ),
+          SidebarAddCommunityButton(existingCommunityNames: existingCommunityNames),
+        ],
+      ),
+    );
+  }
+}
--- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
@ -1,17 +1,15 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_svg/svg.dart';
 import 'package:syncrow_web/common/widgets/search_bar.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_event.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/community_tile.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/sidebar_header.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/space_tile_widget.dart';
 import 'package:syncrow_web/pages/spaces_management/structure_selector/bloc/center_body_bloc.dart';
 import 'package:syncrow_web/pages/spaces_management/structure_selector/bloc/center_body_event.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/style.dart';

 class SidebarWidget extends StatefulWidget {
@ -19,62 +17,59 @@ class SidebarWidget extends StatefulWidget {
  final String? selectedSpaceUuid;

  const SidebarWidget({
-    super.key,
    required this.communities,
    this.selectedSpaceUuid,
+    super.key,
  });

  @override
-  _SidebarWidgetState createState() => _SidebarWidgetState();
+  State<SidebarWidget> createState() => _SidebarWidgetState();
 }

 class _SidebarWidgetState extends State<SidebarWidget> {
-  String _searchQuery = ''; // Track search query
+  String _searchQuery = '';
  String? _selectedSpaceUuid;
  String? _selectedId;

  @override
  void initState() {
+    _selectedId = widget.selectedSpaceUuid;
    super.initState();
-    _selectedId = widget.selectedSpaceUuid; // Initialize with the passed selected space UUID
  }

  @override
  void didUpdateWidget(covariant SidebarWidget oldWidget) {
-    super.didUpdateWidget(oldWidget);
    if (widget.selectedSpaceUuid != oldWidget.selectedSpaceUuid) {
-      setState(() {
-        _selectedId = widget.selectedSpaceUuid;
-      });
+      setState(() => _selectedId = widget.selectedSpaceUuid);
    }
+    super.didUpdateWidget(oldWidget);
  }

-  // Function to filter communities based on the search query
-  List<CommunityModel> _filterCommunities() {
+  List<CommunityModel> _filteredCommunities() {
    if (_searchQuery.isEmpty) {
-      // Reset the selected community and space UUIDs if there's no query
      _selectedSpaceUuid = null;
      return widget.communities;
    }

-    // Filter communities and expand only those that match the query
    return widget.communities.where((community) {
      final containsQueryInCommunity =
          community.name.toLowerCase().contains(_searchQuery.toLowerCase());
-      final containsQueryInSpaces =
-          community.spaces.any((space) => _containsQuery(space, _searchQuery.toLowerCase()));
+      final containsQueryInSpaces = community.spaces.any((space) =>
+          _containsQuery(space: space, query: _searchQuery.toLowerCase()));

      return containsQueryInCommunity || containsQueryInSpaces;
    }).toList();
  }

-  // Helper function to determine if any space or its children match the search query
-  bool _containsQuery(SpaceModel space, String query) {
+  bool _containsQuery({
+    required SpaceModel space,
+    required String query,
+  }) {
    final matchesSpace = space.name.toLowerCase().contains(query);
-    final matchesChildren =
-        space.children.any((child) => _containsQuery(child, query)); // Recursive check for children
+    final matchesChildren = space.children.any(
+      (child) => _containsQuery(space: child, query: query),
+    );

-    // If the space or any of its children match the query, expand this space
    if (matchesSpace || matchesChildren) {
      _selectedSpaceUuid = space.uuid;
    }
@ -83,79 +78,35 @@ class _SidebarWidgetState extends State<SidebarWidget> {
  }

  bool _isSpaceOrChildSelected(SpaceModel space) {
-    // Return true if the current space or any of its child spaces is selected
-    if (_selectedSpaceUuid == space.uuid) {
-      return true;
-    }
-
-    // Recursively check if any child spaces match the query
-    for (var child in space.children) {
-      if (_isSpaceOrChildSelected(child)) {
-        return true;
-      }
-    }
-
-    return false;
+    final isSpaceSelected = _selectedSpaceUuid == space.uuid;
+    final anySubSpaceIsSelected = space.children.any(_isSpaceOrChildSelected);
+    return isSpaceSelected || anySubSpaceIsSelected;
  }

  @override
  Widget build(BuildContext context) {
-    final filteredCommunities = _filterCommunities();
+    final filteredCommunities = _filteredCommunities();

    return Container(
      width: 300,
      decoration: subSectionContainerDecoration,
      child: Column(
-        mainAxisSize: MainAxisSize.min, // Ensures the Column only takes necessary height
+        mainAxisSize: MainAxisSize.min,
        crossAxisAlignment: CrossAxisAlignment.start,
        children: [
-          // Communities title with the add button
-          Container(
-            decoration: subSectionContainerDecoration,
-            padding: const EdgeInsets.all(16.0),
-            child: Row(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              children: [
-                Text('Communities',
-                    style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                          color: ColorsManager.blackColor,
-                        )),
-                GestureDetector(
-                  onTap: () => _navigateToBlank(context),
-                  child: Container(
-                    width: 30,
-                    height: 30,
-                    decoration: const BoxDecoration(
-                      color: ColorsManager.whiteColors,
-                      shape: BoxShape.circle,
-                    ),
-                    child: Center(
-                      child: SvgPicture.asset(
-                        Assets.roundedAddIcon,
-                        width: 24,
-                        height: 24,
-                      ),
-                    ),
-                  ),
-                ),
-              ],
-            ),
+          SidebarHeader(
+            existingCommunityNames:
+                widget.communities.map((community) => community.name).toList(),
          ),
-          // Search bar
          CustomSearchBar(
-            onSearchChanged: (query) {
-              setState(() {
-                _searchQuery = query;
-              });
-            },
+            onSearchChanged: (query) => setState(() => _searchQuery = query),
          ),
          const SizedBox(height: 16),
-          // Community list
          Expanded(
            child: ListView(
-              children: filteredCommunities.map((community) {
-                return _buildCommunityTile(context, community);
-              }).toList(),
+              children: filteredCommunities
+                  .map((community) => _buildCommunityTile(context, community))
+                  .toList(),
            ),
          ),
        ],
@ -163,18 +114,7 @@ class _SidebarWidgetState extends State<SidebarWidget> {
    );
  }

-  void _navigateToBlank(BuildContext context) {
-    setState(() {
-      _selectedId = '';
-    });
-    context.read<SpaceManagementBloc>().add(
-          NewCommunityEvent(communities: widget.communities),
-        );
-  }
-
  Widget _buildCommunityTile(BuildContext context, CommunityModel community) {
-    bool hasChildren = community.spaces.isNotEmpty;
-
    return CommunityTile(
      title: community.name,
      key: ValueKey(community.uuid),
@ -183,7 +123,7 @@ class _SidebarWidgetState extends State<SidebarWidget> {
      onItemSelected: () {
        setState(() {
          _selectedId = community.uuid;
-          _selectedSpaceUuid = null; // Update the selected community
+          _selectedSpaceUuid = null;
        });

        context.read<CenterBodyBloc>().add(CommunitySelectedEvent());
@ -192,46 +132,51 @@ class _SidebarWidgetState extends State<SidebarWidget> {
              SelectCommunityEvent(selectedCommunity: community),
            );
      },
-      onExpansionChanged: (String title, bool expanded) {
-        _handleExpansionChange(community.uuid, expanded);
-      },
-      children: hasChildren
-          ? community.spaces
-              .where((space) => (space.status != SpaceStatus.deleted ||
-                  space.status != SpaceStatus.parentDeleted))
-              .map((space) => _buildSpaceTile(space, community))
-              .toList()
-          : null,
+      onExpansionChanged: (title, expanded) {},
+      children: community.spaces
+          .where((space) {
+            final isDeleted = space.status != SpaceStatus.deleted;
+            final isParentDeleted = space.status != SpaceStatus.parentDeleted;
+            return (isDeleted || isParentDeleted);
+          })
+          .map((space) => _buildSpaceTile(space: space, community: community))
+          .toList(),
    );
  }

-  Widget _buildSpaceTile(SpaceModel space, CommunityModel community, {int depth = 1}) {
-    bool isExpandedSpace = _isSpaceOrChildSelected(space);
+  Widget _buildSpaceTile({
+    required SpaceModel space,
+    required CommunityModel community,
+  }) {
+    final spaceIsExpanded = _isSpaceOrChildSelected(space);
+    final isSelected = _selectedId == space.uuid;
    return Padding(
-        padding: EdgeInsets.only(left: depth * 16.0),
-        child: SpaceTile(
-          title: space.name,
-          key: ValueKey(space.uuid),
-          isSelected: _selectedId == space.uuid,
-          initiallyExpanded: isExpandedSpace,
-          onExpansionChanged: (bool expanded) {
-            _handleExpansionChange(space.uuid ?? '', expanded);
-          },
-          onItemSelected: () {
-            setState(() {
-              _selectedId = space.uuid;
-              _selectedSpaceUuid = space.uuid;
-            });
+      padding: const EdgeInsetsDirectional.only(start: 16.0),
+      child: SpaceTile(
+        title: space.name,
+        key: ValueKey(space.uuid),
+        isSelected: isSelected,
+        initiallyExpanded: spaceIsExpanded,
+        onExpansionChanged: (expanded) {},
+        onItemSelected: () {
+          setState(() {
+            _selectedId = space.uuid;
+            _selectedSpaceUuid = space.uuid;
+          });

-            context.read<SpaceManagementBloc>().add(
-                  SelectSpaceEvent(selectedCommunity: community, selectedSpace: space),
-                );
-          },
-          children: space.children.isNotEmpty
-              ? space.children.map((childSpace) => _buildSpaceTile(childSpace, community)).toList()
-              : [], // Recursively render child spaces if available
-        ));
+          context.read<SpaceManagementBloc>().add(
+                SelectSpaceEvent(selectedCommunity: community, selectedSpace: space),
+              );
+        },
+        children: space.children
+            .map(
+              (childSpace) => _buildSpaceTile(
+                space: childSpace,
+                community: community,
+              ),
+            )
+            .toList(),
+      ),
+    );
  }
-
-  void _handleExpansionChange(String uuid, bool expanded) {}
 }
Author	SHA1	Message	Date
Faris Armoush	acad0e8c9c	SP-1189-FE-Add-Button-Not-clickable-Opening-Pop-up-in-Community-Screen	2025-04-13 14:50:07 +03:00
Faris Armoush	79f5ef7871	simplify space selection logic.	2025-04-13 13:12:48 +03:00
Faris Armoush	6493f02bcc	simplify if statements readabaility.	2025-04-13 13:08:23 +03:00
Faris Armoush	c7c8898763	removed redundant code.	2025-04-13 12:52:38 +03:00
Faris Armoush	62ee9a72d6	moved `SidebarHeader` and `SidebarAddCommunityButton` to their own files.	2025-04-13 12:47:05 +03:00
Faris Armoush	55695ca5db	refactor: improve readability and structure in SidebarWidget's space tile handling	2025-04-13 12:33:50 +03:00
Faris Armoush	c2f5a8df10	refactor: streamline context usage and improve readability in SidebarWidget	2025-04-13 12:31:17 +03:00
Faris Armoush	cd9821679e	added trailing commas.	2025-04-13 12:29:38 +03:00
Faris Armoush	bfd3d4542e	refactor: simplify onSearchChanged callback to use expressions.	2025-04-13 12:28:50 +03:00
Faris Armoush	35a99ccda7	removed unnecessary comments from `SidebarWidget`.	2025-04-13 12:27:04 +03:00
Faris Armoush	978934399e	fixed invalid use of a private type in a public API in `SidebarWidget`.	2025-04-13 12:25:28 +03:00
Faris Armoush	bc32fe7941	removed unused method and its use.	2025-04-13 12:25:03 +03:00
Faris Armoush	c23176706f	Merge pull request #136 from SyncrowIOT/SP-1367-FE-Save-Flow-edit-or-delete-the-device-functions Implementing the Ceiling Sensor in Routine WEB	2025-04-09 13:19:53 +03:00
Faris Armoush	387ef99728	fix: handle nullable uuid in GatewayModel.fromJson	2025-04-09 12:33:20 +03:00
Faris Armoush	694a5a7dda	Refactor GatewayModel.fromJson to use a loop for status parsing instead of firstWhere.	2025-04-09 12:32:44 +03:00
Faris Armoush	c90b9a1912	bugfix/ range index errorof automations in routines.	2025-04-09 12:24:59 +03:00
Faris Armoush	7860292276	Merge branch 'dev' of https://github.com/SyncrowIOT/web into SP-1367-FE-Save-Flow-edit-or-delete-the-device-functions	2025-04-09 12:19:53 +03:00
mohammadnemer1	550acc4953	Merge pull request #137 from SyncrowIOT/fix-remove-option-from-then-dialog-routins add dialogType to devices and add parameter in showSwitchFunctionsDialog	2025-04-09 12:18:33 +03:00
mohammad	fd6b737556	Refactor one_gang_switch_dialog.dart to use one_gang_switch instead of ac in function names and variables	2025-04-09 12:17:26 +03:00
Faris Armoush	3d5825adca	Merge branch 'SP-1366-FE-Add-Gateway-Device-Card-to-Devices-Section' of https://github.com/SyncrowIOT/web into SP-1367-FE-Save-Flow-edit-or-delete-the-device-functions	2025-04-09 11:21:20 +03:00
Faris Armoush	9c97e2879a	Refactor constructor syntax for Gateway functions to use initializer list	2025-04-09 10:57:22 +03:00
Faris Armoush	fda96025e9	uncommented code.	2025-04-09 10:41:38 +03:00
Faris Armoush	92aa574944	update `GatewayMasterState.getOperationalValues` to match what the api expects.	2025-04-09 10:21:49 +03:00
mohammad	d08ab8caac	add dialogType to devices and add parameter in showSwitchFunctionsDialog	2025-04-09 10:09:56 +03:00
Faris Armoush	774f21a55b	Refactor RoutineDevices to consolidate device data preparation in a single map to remove code duplication.	2025-04-09 09:59:15 +03:00
Faris Armoush	9b69ec31e9	Refactor RoutineDevices to use a class-level constant for allowed product types.	2025-04-09 09:57:18 +03:00
Faris Armoush	a242377ea6	Fully refactored `CreateRoutine/Gateway` feature.	2025-04-09 09:46:45 +03:00