Refactor Action class to use type annotations for actionExecutor and entityId

- Extracted the logic for filtering implemented devices into a separate method `_getOnlyImplementedDevices`
- Created a set `allowedDevices` to store the allowed device types
- Updated the filtering logic to use the `allowedDevices` set for checking device types
- Removed unnecessary conditions for filtering devices

Fix nullability issues in `Action` model

- Added null checks for `actionExecutor`, `entityId`, `name`, `type`, and `productType` properties in the `fromJson` method of the `Action` model
- Set default values for `actionExecutor` and `entityId` if they are null
- Updated the type casting for `name`, `type`, and `productType` properties to avoid potential nullability issues

lib/features/devices/bloc/device_manager_bloc/device_manager_bloc.dart

@@ -169,18 +169,19 @@ class DeviceManagerBloc extends Bloc<DeviceManagerEvent, DeviceManagerState> {
     }
   }
 
-  _getOnlyImplementedDevices(List<DeviceModel> devices) {
-    List<DeviceModel> implementedDevices = [];
-    for (int i = 0; i < devices.length; i++) {
-      if (devices[i].productType == DeviceType.AC ||
-          devices[i].productType == DeviceType.DoorLock ||
-          devices[i].productType == DeviceType.Gateway ||
-          devices[i].productType == DeviceType.WallSensor ||
-          devices[i].productType == DeviceType.CeilingSensor ||
-          devices[i].productType == DeviceType.ThreeGang) {
-        implementedDevices.add(devices[i]);
-      }
-    }
-    return implementedDevices;
+  List<DeviceModel> _getOnlyImplementedDevices(List<DeviceModel> devices) {
+    const allowedDeviceTypes = {
+      DeviceType.AC,
+      DeviceType.DoorLock,
+      DeviceType.Gateway,
+      DeviceType.WallSensor,
+      DeviceType.CeilingSensor,
+      DeviceType.ThreeGang,
+      DeviceType.OneGang,
+    };
+
+    return devices
+        .where((device) => allowedDeviceTypes.contains(device.productType))
+        .toList();
   }
 }

lib/features/devices/view/widgets/garage_door/garage_list.dart

@@ -8,8 +8,7 @@ import 'package:syncrow_app/features/shared_widgets/devices_default_switch.dart'
 import 'package:syncrow_app/features/shared_widgets/text_widgets/body_small.dart';
 
 class GarageList extends StatelessWidget {
-  const GarageList(
-      {super.key, required this.garageList, required this.allSwitches});
+  const GarageList({super.key, required this.garageList, required this.allSwitches});
 
   final List<GroupGarageModel> garageList;
   final bool allSwitches;
@@ -23,43 +22,42 @@ class GarageList extends StatelessWidget {
             crossAxisAlignment: CrossAxisAlignment.stretch,
             children: [
               const SizedBox(height: 10),
-              const BodySmall(text: 'All Lights'),
+              const BodySmall(text: 'All Garages'),
               const SizedBox(height: 5),
               DevicesDefaultSwitch(
-                off: 'OFF',
-                on: 'ON',
+                off: 'Close',
+                on: 'Open',
                 switchValue: allSwitches,
-                action: () {
-                  BlocProvider.of<GarageDoorBloc>(context)
-                      .add(GroupAllOnEvent());
-                },
-                secondAction: () {
-                  BlocProvider.of<GarageDoorBloc>(context)
-                      .add(GroupAllOffEvent());
-                },
+                action: () => BlocProvider.of<GarageDoorBloc>(context).add(
+                  GroupAllOnEvent(),
+                ),
+                secondAction: () => BlocProvider.of<GarageDoorBloc>(context).add(
+                  GroupAllOffEvent(),
+                ),
               ),
               ListView.builder(
                 shrinkWrap: true,
                 physics: const NeverScrollableScrollPhysics(),
-                padding: const EdgeInsets.all(0),
+                padding: EdgeInsetsDirectional.zero,
                 itemCount: garageList.length,
                 itemBuilder: (context, index) {
+                  final garageDoor = garageList[index];
                   return Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
                       const SizedBox(height: 10),
-                      BodySmall(text: garageList[index].deviceName),
+                      BodySmall(text: garageDoor.deviceName),
                       const SizedBox(height: 5),
                       DevicesDefaultSwitch(
-                        off: 'OFF',
-                        on: 'ON',
-                        switchValue: garageList[index].firstSwitch,
-                        action: () {
-                          BlocProvider.of<GarageDoorBloc>(context).add(
-                              ChangeFirstWizardSwitchStatusEvent(
-                                  value: garageList[index].firstSwitch,
-                                  deviceId: garageList[index].deviceId));
-                        },
+                        off: 'Close',
+                        on: 'Open',
+                        switchValue: garageDoor.firstSwitch,
+                        action: () => BlocProvider.of<GarageDoorBloc>(context).add(
+                          ChangeFirstWizardSwitchStatusEvent(
+                            value: garageDoor.firstSwitch,
+                            deviceId: garageDoor.deviceId,
+                          ),
+                        ),
                       ),
                     ],
                   );

lib/features/devices/view/widgets/water_heater/wh_list.dart

@@ -8,7 +8,11 @@ import 'package:syncrow_app/features/shared_widgets/devices_default_switch.dart'
 import 'package:syncrow_app/features/shared_widgets/text_widgets/body_small.dart';
 
 class WHList extends StatelessWidget {
-  const WHList({super.key, required this.whList, required this.allSwitches});
+  const WHList({
+    required this.whList,
+    required this.allSwitches,
+    super.key,
+  });
 
   final List<GroupWHModel> whList;
   final bool allSwitches;
@@ -22,43 +26,42 @@ class WHList extends StatelessWidget {
             crossAxisAlignment: CrossAxisAlignment.stretch,
             children: [
               const SizedBox(height: 10),
-              const BodySmall(text: 'All Lights'),
+              const BodySmall(text: 'All Water Heaters'),
               const SizedBox(height: 5),
               DevicesDefaultSwitch(
                 off: 'OFF',
                 on: 'ON',
                 switchValue: allSwitches,
-                action: () {
-                  BlocProvider.of<WaterHeaterBloc>(context)
-                      .add(GroupAllOnEvent());
-                },
-                secondAction: () {
-                  BlocProvider.of<WaterHeaterBloc>(context)
-                      .add(GroupAllOffEvent());
-                },
+                action: () => context.read<WaterHeaterBloc>().add(
+                      GroupAllOnEvent(),
+                    ),
+                secondAction: () => context.read<WaterHeaterBloc>().add(
+                      GroupAllOffEvent(),
+                    ),
               ),
               ListView.builder(
                 shrinkWrap: true,
                 physics: const NeverScrollableScrollPhysics(),
-                padding: const EdgeInsets.all(0),
+                padding: EdgeInsetsDirectional.zero,
                 itemCount: whList.length,
                 itemBuilder: (context, index) {
+                  final waterHeater = whList[index];
                   return Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
                       const SizedBox(height: 10),
-                      BodySmall(text: whList[index].deviceName),
+                      BodySmall(text: waterHeater.deviceName),
                       const SizedBox(height: 5),
                       DevicesDefaultSwitch(
                         off: 'OFF',
                         on: 'ON',
-                        switchValue: whList[index].firstSwitch,
-                        action: () {
-                          BlocProvider.of<WaterHeaterBloc>(context).add(
+                        switchValue: waterHeater.firstSwitch,
+                        action: () => context.read<WaterHeaterBloc>().add(
                               ChangeFirstWizardSwitchStatusEvent(
-                                  value: whList[index].firstSwitch,
-                                  deviceId: whList[index].deviceId));
-                        },
+                                value: waterHeater.firstSwitch,
+                                deviceId: waterHeater.deviceId,
+                              ),
+                            ),
                       ),
                     ],
                   );

lib/features/scene/helper/functions_per_device/one_gang_functions.dart

@@ -0,0 +1,78 @@
+import 'package:syncrow_app/features/scene/enum/operation_dialog_type.dart';
+import 'package:syncrow_app/features/scene/model/scene_static_function.dart';
+import 'package:syncrow_app/generated/assets.dart';
+
+class OneGangHelperFunctions {
+  static List<SceneStaticFunction> oneGangHelperFunctions(
+      String deviceId, String deviceName, functionValue) {
+    return [
+      SceneStaticFunction(
+        deviceId: deviceId,
+        deviceName: deviceName,
+        icon: Assets.assetsAcPower,
+        operationName: 'Light Switch',
+        code: 'switch_1',
+        functionValue: functionValue,
+        operationDialogType: OperationDialogType.onOff,
+        operationalValues: [
+          SceneOperationalValue(
+              icon: Assets.assetsAcPower, description: "ON", value: true),
+          SceneOperationalValue(
+              icon: Assets.assetsAcPowerOFF, description: "OFF", value: false),
+        ],
+      ),
+      SceneStaticFunction(
+        deviceId: deviceId,
+        deviceName: deviceName,
+        icon: Assets.assetsLightCountdown,
+        operationName: 'Light CountDown',
+        code: 'countdown_1',
+        functionValue: functionValue,
+        operationDialogType: OperationDialogType.countdown,
+        operationalValues: [
+          SceneOperationalValue(icon: '', value: 0),
+        ],
+      ),
+    ];
+  }
+
+  static List<SceneStaticFunction> oneGangAutomationFunctions(
+      String deviceId, String deviceName, functionValue) {
+    return [
+      SceneStaticFunction(
+        deviceId: deviceId,
+        deviceName: deviceName,
+        icon: Assets.assetsAcPower,
+        operationName: 'Light Switch',
+        code: 'switch_1',
+        functionValue: functionValue,
+        operationDialogType: OperationDialogType.onOff,
+        operationalValues: [
+          SceneOperationalValue(
+              icon: Assets.assetsAcPower, description: "ON", value: true),
+          SceneOperationalValue(
+              icon: Assets.assetsAcPowerOFF, description: "OFF", value: false),
+        ],
+      ),
+      SceneStaticFunction(
+        deviceId: deviceId,
+        deviceName: deviceName,
+        icon: Assets.assetsLightCountdown,
+        operationName: 'Light CountDown',
+        code: 'countdown_1',
+        functionValue: functionValue,
+        operationDialogType: OperationDialogType.integerSteps,
+        operationalValues: [
+          SceneOperationalValue(
+            icon: '',
+            description: "sec",
+            value: 0.0,
+            minValue: 0,
+            maxValue: 43200,
+            stepValue: 1,
+          ),
+        ],
+      ),
+    ];
+  }
+}

lib/features/scene/helper/scene_bloc_factory.dart

@@ -0,0 +1,48 @@
+import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
+import 'package:syncrow_app/features/app_layout/model/community_model.dart';
+import 'package:syncrow_app/features/app_layout/model/space_model.dart';
+import 'package:syncrow_app/features/scene/bloc/scene_bloc/scene_bloc.dart';
+import 'package:syncrow_app/features/scene/bloc/scene_bloc/scene_event.dart';
+
+abstract final class SceneBlocFactory {
+  static SceneBloc create({
+    required bool pageType,
+    required HomeCubit homeCubit,
+  }) {
+    final selectedSpace = homeCubit.selectedSpace;
+    final defaultSpace = SpaceModel(
+      id: '-1',
+      name: '',
+      community: Community(
+        uuid: '-1',
+        name: '',
+      ),
+    );
+
+    final spaceId = selectedSpace?.id ?? defaultSpace.id;
+    final space = selectedSpace ?? defaultSpace;
+    final communityUuid =
+        selectedSpace?.community.uuid ?? defaultSpace.community.uuid;
+
+    final sceneBloc = SceneBloc();
+
+    sceneBloc.add(
+      LoadScenes(
+        spaceId,
+        space,
+        showInDevice: pageType,
+      ),
+    );
+
+    if (!pageType) {
+      sceneBloc.add(
+        LoadAutomation(
+          spaceId,
+          communityUuid,
+        ),
+      );
+    }
+
+    return sceneBloc;
+  }
+}

lib/features/scene/helper/scene_operations_data_helper.dart

@@ -6,6 +6,7 @@ import 'package:syncrow_app/features/scene/helper/functions_per_device/ac_functi
 import 'package:syncrow_app/features/scene/helper/functions_per_device/door_lock_functions.dart';
 import 'package:syncrow_app/features/scene/helper/functions_per_device/gateway_functions.dart';
 import 'package:syncrow_app/features/scene/helper/functions_per_device/human_presence_functions.dart';
+import 'package:syncrow_app/features/scene/helper/functions_per_device/one_gang_functions.dart';
 import 'package:syncrow_app/features/scene/helper/functions_per_device/presence_sensor.dart';
 import 'package:syncrow_app/features/scene/helper/functions_per_device/three_gang_functions.dart';
 import 'package:syncrow_app/features/scene/model/scene_details_model.dart';
@@ -14,8 +15,9 @@ import 'package:syncrow_app/generated/assets.dart';
 import 'package:syncrow_app/utils/resource_manager/constants.dart';
 
 mixin SceneOperationsDataHelper {
-  final Map<DeviceType, Function(List<FunctionModel>, String, String, dynamic, bool)> _functionMap =
-      {
+  final Map<DeviceType,
+          Function(List<FunctionModel>, String, String, dynamic, bool)>
+      _functionMap = {
     DeviceType.LightBulb: lightBulbFunctions,
     DeviceType.CeilingSensor: ceilingSensorFunctions,
     DeviceType.WallSensor: wallSensorFunctions,
@@ -24,6 +26,7 @@ mixin SceneOperationsDataHelper {
     DeviceType.Curtain: curtainFunctions,
     DeviceType.ThreeGang: threeGangFunctions,
     DeviceType.Gateway: gatewayFunctions,
+    DeviceType.OneGang: oneGangFunctions,
   };
 
   final Map<DeviceType, String> _titleMap = {
@@ -35,7 +38,24 @@ mixin SceneOperationsDataHelper {
     DeviceType.Curtain: 'Curtain Functions',
     DeviceType.ThreeGang: '3G Light Switch Functions',
     DeviceType.Gateway: 'Gateway Functions',
+    DeviceType.OneGang: '1G Light Switch Conditions',
   };
+  static String _productTypeCache = '';
+
+  //one gang functions
+  static List<SceneStaticFunction> oneGangFunctions(
+      List<FunctionModel> functions,
+      String deviceId,
+      String deviceName,
+      dynamic functionValue,
+      bool isAutomation) {
+    if (isAutomation) {
+      return OneGangHelperFunctions.oneGangAutomationFunctions(
+          deviceId, deviceName, functionValue);
+    }
+    return OneGangHelperFunctions.oneGangHelperFunctions(
+        deviceId, deviceName, functionValue);
+  }
 
   List<SceneStaticFunction> getFunctionsWithIcons({
     DeviceType? type,
@@ -45,16 +65,22 @@ mixin SceneOperationsDataHelper {
     required bool isAutomation,
   }) {
     final functionValue = null;
-    return _functionMap[type]?.call(functions, deviceId, deviceName, functionValue, isAutomation) ??
-        lightBulbFunctions(functions, deviceId, deviceName, functionValue, isAutomation);
+    return _functionMap[type]?.call(
+            functions, deviceId, deviceName, functionValue, isAutomation) ??
+        lightBulbFunctions(
+            functions, deviceId, deviceName, functionValue, isAutomation);
   }
 
   String getTitle({DeviceType? type}) {
     return _titleMap[type] ?? '';
   }
 
-  static List<SceneStaticFunction> ceilingSensorFunctions(List<FunctionModel> functions,
-      String deviceId, String deviceName, dynamic functionValue, bool isAutomation) {
+  static List<SceneStaticFunction> ceilingSensorFunctions(
+      List<FunctionModel> functions,
+      String deviceId,
+      String deviceName,
+      dynamic functionValue,
+      bool isAutomation) {
     if (isAutomation) {
       return PresenceSensorHelperFunctions.automationPresenceSensorFunctions(
           deviceId, deviceName, functionValue);
@@ -63,22 +89,35 @@ mixin SceneOperationsDataHelper {
         deviceId, deviceName, functionValue);
   }
 
-  static List<SceneStaticFunction> curtainFunctions(List<FunctionModel> functions, String deviceId,
-      String deviceName, dynamic functionValue, bool isAutomation) {
+  static List<SceneStaticFunction> curtainFunctions(
+      List<FunctionModel> functions,
+      String deviceId,
+      String deviceName,
+      dynamic functionValue,
+      bool isAutomation) {
     return [];
   }
 
-  static List<SceneStaticFunction> doorLockFunctions(List<FunctionModel> functions, String deviceId,
-      String deviceName, dynamic functionValue, bool isAutomation) {
+  static List<SceneStaticFunction> doorLockFunctions(
+      List<FunctionModel> functions,
+      String deviceId,
+      String deviceName,
+      dynamic functionValue,
+      bool isAutomation) {
     if (isAutomation) {
       return DoorLockHelperFunctions.doorLockAutomationFunctions(
           deviceId, deviceName, functionValue);
     }
-    return DoorLockHelperFunctions.doorLockTapToRunFunctions(deviceId, deviceName, functionValue);
+    return DoorLockHelperFunctions.doorLockTapToRunFunctions(
+        deviceId, deviceName, functionValue);
   }
 
-  static List<SceneStaticFunction> wallSensorFunctions(List<FunctionModel> functions,
-      String deviceId, String deviceName, dynamic functionValue, bool isAutomation) {
+  static List<SceneStaticFunction> wallSensorFunctions(
+      List<FunctionModel> functions,
+      String deviceId,
+      String deviceName,
+      dynamic functionValue,
+      bool isAutomation) {
     if (isAutomation) {
       return HumanPresenceHelperFunctions.automationHumanPresenceFunctions(
           deviceId, deviceName, functionValue);
@@ -87,31 +126,51 @@ mixin SceneOperationsDataHelper {
         deviceId, deviceName, functionValue);
   }
 
-  static List<SceneStaticFunction> lightBulbFunctions(List<FunctionModel> functions,
-      String deviceId, String deviceName, dynamic functionValue, bool isAutomation) {
+  static List<SceneStaticFunction> lightBulbFunctions(
+      List<FunctionModel> functions,
+      String deviceId,
+      String deviceName,
+      dynamic functionValue,
+      bool isAutomation) {
     return [];
   }
 
-  static List<SceneStaticFunction> gatewayFunctions(List<FunctionModel> functions, String deviceId,
-      String deviceName, dynamic functionValue, bool isAutomation) {
-    return GatewayHelperFunctions.tabToRunGatewayFunctions(deviceId, deviceName, functionValue);
+  static List<SceneStaticFunction> gatewayFunctions(
+      List<FunctionModel> functions,
+      String deviceId,
+      String deviceName,
+      dynamic functionValue,
+      bool isAutomation) {
+    return GatewayHelperFunctions.tabToRunGatewayFunctions(
+        deviceId, deviceName, functionValue);
   }
 
-  static List<SceneStaticFunction> threeGangFunctions(List<FunctionModel> functions,
-      String deviceId, String deviceName, dynamic functionValue, bool isAutomation) {
+  static List<SceneStaticFunction> threeGangFunctions(
+      List<FunctionModel> functions,
+      String deviceId,
+      String deviceName,
+      dynamic functionValue,
+      bool isAutomation) {
     if (isAutomation) {
       return ThreeGangHelperFunctions.threeGangAutomationFunctions(
           deviceId, deviceName, functionValue);
     }
-    return ThreeGangHelperFunctions.threeGangHelperFunctions(deviceId, deviceName, functionValue);
+    return ThreeGangHelperFunctions.threeGangHelperFunctions(
+        deviceId, deviceName, functionValue);
   }
 
-  static List<SceneStaticFunction> acFunctions(List<FunctionModel> functions, String deviceId,
-      String deviceName, dynamic functionValue, bool isAutomation) {
+  static List<SceneStaticFunction> acFunctions(
+      List<FunctionModel> functions,
+      String deviceId,
+      String deviceName,
+      dynamic functionValue,
+      bool isAutomation) {
     if (isAutomation) {
-      return ACFunctionsHelper.automationAcFunctions(deviceId, deviceName, functionValue);
+      return ACFunctionsHelper.automationAcFunctions(
+          deviceId, deviceName, functionValue);
     }
-    return ACFunctionsHelper.tabToRunAcFunctions(deviceId, deviceName, functionValue);
+    return ACFunctionsHelper.tabToRunAcFunctions(
+        deviceId, deviceName, functionValue);
   }
 
   List<SceneStaticFunction> getTaskListFunctionsFromApi({
@@ -149,8 +208,12 @@ mixin SceneOperationsDataHelper {
           SceneStaticFunction(
             deviceId: action.entityId,
             deviceName: action.name.toString(),
-            deviceIcon: action.type == 'automation' ? Assets.player : Assets.handClickIcon,
-            icon: action.type == 'automation' ? Assets.player : Assets.handClickIcon,
+            deviceIcon: action.type == 'automation'
+                ? Assets.player
+                : Assets.handClickIcon,
+            icon: action.type == 'automation'
+                ? Assets.player
+                : Assets.handClickIcon,
             operationName: action.type.toString(),
             operationDialogType: OperationDialogType.onOff,
             functionValue: action.actionExecutor,
@@ -170,7 +233,8 @@ mixin SceneOperationsDataHelper {
           ),
         );
       } else {
-        functions.add(_mapExecutorPropertyToSceneFunction(action, isAutomation));
+        functions
+            .add(_mapExecutorPropertyToSceneFunction(action, isAutomation));
       }
     }
 
@@ -206,7 +270,9 @@ mixin SceneOperationsDataHelper {
   }) {
     final executorProperty = action.executorProperty;
 
-    final Map<String, SceneStaticFunction Function(Action, bool, String?, String?)> functionMap = {
+    final Map<String,
+            SceneStaticFunction Function(Action, bool, String?, String?)>
+        functionMap = {
       'sensitivity': _createSensitivityFunction,
       'normal_open_switch': _createNormalOpenSwitchFunction,
       'unlock_fingerprint': _createUnlockFingerprintFunction,
@@ -282,14 +348,16 @@ mixin SceneOperationsDataHelper {
     );
   }
 
-  SceneStaticFunction _createSensitivityFunction(
-      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createSensitivityFunction(Action action,
+      bool isAutomation, String? comparator, String? uniqueCustomId) {
     return _createSceneFunction(
       action,
       'Presence Sensor',
       Assets.assetsIconsSensors,
       'Sensitivity',
-      isAutomation ? OperationDialogType.integerSteps : OperationDialogType.listOfOptions,
+      isAutomation
+          ? OperationDialogType.integerSteps
+          : OperationDialogType.listOfOptions,
       isAutomation ? _createIntegerStepsOptions() : _createSensitivityOptions(),
       isAutomation,
       comparator,
@@ -297,8 +365,8 @@ mixin SceneOperationsDataHelper {
     );
   }
 
-  SceneStaticFunction _createNormalOpenSwitchFunction(
-      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createNormalOpenSwitchFunction(Action action,
+      bool isAutomation, String? comparator, String? uniqueCustomId) {
     return _createSceneFunction(
       action,
       'WIFI LOCK PRO',
@@ -351,8 +419,8 @@ mixin SceneOperationsDataHelper {
     ];
   }
 
-  SceneStaticFunction _createUnlockFingerprintFunction(
-      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createUnlockFingerprintFunction(Action action,
+      bool isAutomation, String? comparator, String? uniqueCustomId) {
     return _createSceneFunction(
       action,
       'WIFI LOCK PRO',
@@ -366,8 +434,8 @@ mixin SceneOperationsDataHelper {
     );
   }
 
-  SceneStaticFunction _createUnlockPasswordFunction(
-      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createUnlockPasswordFunction(Action action,
+      bool isAutomation, String? comparator, String? uniqueCustomId) {
     return _createSceneFunction(
       action,
       'WIFI LOCK PRO',
@@ -381,8 +449,8 @@ mixin SceneOperationsDataHelper {
     );
   }
 
-  SceneStaticFunction _createUnlockCardFunction(
-      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createUnlockCardFunction(Action action,
+      bool isAutomation, String? comparator, String? uniqueCustomId) {
     return _createSceneFunction(
       action,
       'WIFI LOCK PRO',
@@ -396,8 +464,8 @@ mixin SceneOperationsDataHelper {
     );
   }
 
-  SceneStaticFunction _createAlarmLockFunction(
-      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createAlarmLockFunction(Action action, bool isAutomation,
+      String? comparator, String? uniqueCustomId) {
     return _createSceneFunction(
       action,
       'WIFI LOCK PRO',
@@ -411,8 +479,8 @@ mixin SceneOperationsDataHelper {
     );
   }
 
-  SceneStaticFunction _createUnlockRequestFunction(
-      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createUnlockRequestFunction(Action action,
+      bool isAutomation, String? comparator, String? uniqueCustomId) {
     return _createSceneFunction(
       action,
       'WIFI LOCK PRO',
@@ -426,8 +494,8 @@ mixin SceneOperationsDataHelper {
     );
   }
 
-  SceneStaticFunction _createResidualElectricityFunction(
-      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createResidualElectricityFunction(Action action,
+      bool isAutomation, String? comparator, String? uniqueCustomId) {
     return _createSceneFunction(
       action,
       'WIFI LOCK PRO',
@@ -441,8 +509,8 @@ mixin SceneOperationsDataHelper {
     );
   }
 
-  SceneStaticFunction _createReverseLockFunction(
-      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createReverseLockFunction(Action action,
+      bool isAutomation, String? comparator, String? uniqueCustomId) {
     return _createSceneFunction(
       action,
       'WIFI LOCK PRO',
@@ -456,8 +524,8 @@ mixin SceneOperationsDataHelper {
     );
   }
 
-  SceneStaticFunction _createUnlockAppFunction(
-      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createUnlockAppFunction(Action action, bool isAutomation,
+      String? comparator, String? uniqueCustomId) {
     return _createSceneFunction(
       action,
       'WIFI LOCK PRO',
@@ -471,8 +539,8 @@ mixin SceneOperationsDataHelper {
     );
   }
 
-  SceneStaticFunction _createHijackFunction(
-      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createHijackFunction(Action action, bool isAutomation,
+      String? comparator, String? uniqueCustomId) {
     return _createSceneFunction(
       action,
       'WIFI LOCK PRO',
@@ -486,8 +554,8 @@ mixin SceneOperationsDataHelper {
     );
   }
 
-  SceneStaticFunction _createDoorbellFunction(
-      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createDoorbellFunction(Action action, bool isAutomation,
+      String? comparator, String? uniqueCustomId) {
     return _createSceneFunction(
       action,
       'WIFI LOCK PRO',
@@ -501,8 +569,8 @@ mixin SceneOperationsDataHelper {
     );
   }
 
-  SceneStaticFunction _createUnlockTemporaryFunction(
-      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createUnlockTemporaryFunction(Action action,
+      bool isAutomation, String? comparator, String? uniqueCustomId) {
     return _createSceneFunction(
       action,
       'WIFI LOCK PRO',
@@ -516,8 +584,8 @@ mixin SceneOperationsDataHelper {
     );
   }
 
-  SceneStaticFunction _createFarDetectionFunction(
-      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createFarDetectionFunction(Action action,
+      bool isAutomation, String? comparator, String? uniqueCustomId) {
     return _createSceneFunction(
       action,
       'Human Presence Sensor',
@@ -531,8 +599,8 @@ mixin SceneOperationsDataHelper {
     );
   }
 
-  SceneStaticFunction _createMotionSensitivityFunction(
-      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createMotionSensitivityFunction(Action action,
+      bool isAutomation, String? comparator, String? uniqueCustomId) {
     return _createSceneFunction(
       action,
       'Human Presence Sensor',
@@ -546,8 +614,8 @@ mixin SceneOperationsDataHelper {
     );
   }
 
-  SceneStaticFunction _createMotionlessSensitivityFunction(
-      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createMotionlessSensitivityFunction(Action action,
+      bool isAutomation, String? comparator, String? uniqueCustomId) {
     return _createSceneFunction(
       action,
       'Human Presence Sensor',
@@ -561,8 +629,8 @@ mixin SceneOperationsDataHelper {
     );
   }
 
-  SceneStaticFunction _createIndicatorFunction(
-      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createIndicatorFunction(Action action, bool isAutomation,
+      String? comparator, String? uniqueCustomId) {
     return _createSceneFunction(
       action,
       'Human Presence Sensor',
@@ -576,8 +644,8 @@ mixin SceneOperationsDataHelper {
     );
   }
 
-  SceneStaticFunction _createPresenceTimeFunction(
-      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createPresenceTimeFunction(Action action,
+      bool isAutomation, String? comparator, String? uniqueCustomId) {
     return _createSceneFunction(
       action,
       'Human Presence Sensor',
@@ -591,8 +659,8 @@ mixin SceneOperationsDataHelper {
     );
   }
 
-  SceneStaticFunction _createPresenceStateFunction(
-      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createPresenceStateFunction(Action action,
+      bool isAutomation, String? comparator, String? uniqueCustomId) {
     return _createSceneFunction(
       action,
       'Human Presence Sensor',
@@ -606,14 +674,16 @@ mixin SceneOperationsDataHelper {
     );
   }
 
-  SceneStaticFunction _createDisCurrentFunction(
-      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createDisCurrentFunction(Action action,
+      bool isAutomation, String? comparator, String? uniqueCustomId) {
     return _createSceneFunction(
       action,
       'Human Presence Sensor',
       Assets.assetsIconsSensors,
       'Current Distance',
-      isAutomation ? OperationDialogType.integerSteps : OperationDialogType.countdown,
+      isAutomation
+          ? OperationDialogType.integerSteps
+          : OperationDialogType.countdown,
       _createCurrentDistanceOptions(),
       isAutomation,
       comparator,
@@ -621,8 +691,8 @@ mixin SceneOperationsDataHelper {
     );
   }
 
-  SceneStaticFunction _createIlluminanceValueFunction(
-      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createIlluminanceValueFunction(Action action,
+      bool isAutomation, String? comparator, String? uniqueCustomId) {
     return _createSceneFunction(
       action,
       'Human Presence Sensor',
@@ -636,8 +706,8 @@ mixin SceneOperationsDataHelper {
     );
   }
 
-  SceneStaticFunction _createCheckingResultFunction(
-      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createCheckingResultFunction(Action action,
+      bool isAutomation, String? comparator, String? uniqueCustomId) {
     return _createSceneFunction(
       action,
       'Human Presence Sensor',
@@ -651,8 +721,8 @@ mixin SceneOperationsDataHelper {
     );
   }
 
-  SceneStaticFunction _createSwitchFunction(
-      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createSwitchFunction(Action action, bool isAutomation,
+      String? comparator, String? uniqueCustomId) {
     return _createSceneFunction(
       action,
       'Smart AC Thermostat - Grey - Model A',
@@ -666,23 +736,27 @@ mixin SceneOperationsDataHelper {
     );
   }
 
-  SceneStaticFunction _createTempSetFunction(
-      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createTempSetFunction(Action action, bool isAutomation,
+      String? comparator, String? uniqueCustomId) {
     return _createSceneFunction(
       action,
       'Smart AC Thermostat - Grey - Model A',
       Assets.assetsIconsAC,
       'Set Temperature',
-      isAutomation ? OperationDialogType.integerSteps : OperationDialogType.temperature,
-      isAutomation ? _createAutomationTemperatureOptions() : _createTemperatureOptions(),
+      isAutomation
+          ? OperationDialogType.integerSteps
+          : OperationDialogType.temperature,
+      isAutomation
+          ? _createAutomationTemperatureOptions()
+          : _createTemperatureOptions(),
       isAutomation,
       comparator,
       uniqueCustomId,
     );
   }
 
-  SceneStaticFunction _createTempCurrentFunction(
-      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createTempCurrentFunction(Action action,
+      bool isAutomation, String? comparator, String? uniqueCustomId) {
     return _createSceneFunction(
       action,
       'Smart AC Thermostat - Grey - Model A',
@@ -696,8 +770,8 @@ mixin SceneOperationsDataHelper {
     );
   }
 
-  SceneStaticFunction _createModeFunction(
-      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createModeFunction(Action action, bool isAutomation,
+      String? comparator, String? uniqueCustomId) {
     return _createSceneFunction(
       action,
       'Smart AC Thermostat - Grey - Model A',
@@ -711,8 +785,8 @@ mixin SceneOperationsDataHelper {
     );
   }
 
-  SceneStaticFunction _createLevelFunction(
-      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createLevelFunction(Action action, bool isAutomation,
+      String? comparator, String? uniqueCustomId) {
     return _createSceneFunction(
       action,
       'Smart AC Thermostat - Grey - Model A',
@@ -726,8 +800,8 @@ mixin SceneOperationsDataHelper {
     );
   }
 
-  SceneStaticFunction _createChildLockFunction(
-      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createChildLockFunction(Action action, bool isAutomation,
+      String? comparator, String? uniqueCustomId) {
     return _createSceneFunction(
       action,
       'Smart AC Thermostat - Grey - Model A',
@@ -741,23 +815,38 @@ mixin SceneOperationsDataHelper {
     );
   }
 
-  SceneStaticFunction _createSwitch1Function(
-      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
-    return _createSceneFunction(
-      action,
-      '3 Gang Button Switch L-L',
-      Assets.assetsIcons3GangSwitch,
-      'Light 1 Switch',
-      OperationDialogType.onOff,
-      _createOnOffOptions(),
-      isAutomation,
-      comparator,
-      uniqueCustomId,
-    );
+  SceneStaticFunction _createSwitch1Function(Action action, bool isAutomation,
+      String? comparator, String? uniqueCustomId) {
+    switch (action.productType) {
+      case "3G":
+        return _createSceneFunction(
+          action,
+          '3 Gang Button Switch L-L',
+          Assets.assetsIcons3GangSwitch,
+          'Light 1 Switch',
+          OperationDialogType.onOff,
+          _createOnOffOptions(),
+          isAutomation,
+          comparator,
+          uniqueCustomId,
+        );
+      default:
+        return _createSceneFunction(
+          action,
+          '1 Gang Button Switch L-L',
+          Assets.oneGang,
+          'Light Switch',
+          OperationDialogType.onOff,
+          _createOnOffOptions(),
+          isAutomation,
+          comparator,
+          uniqueCustomId,
+        );
+    }
   }
 
-  SceneStaticFunction _createSwitch2Function(
-      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createSwitch2Function(Action action, bool isAutomation,
+      String? comparator, String? uniqueCustomId) {
     return _createSceneFunction(
       action,
       '3 Gang Button Switch L-L',
@@ -771,8 +860,8 @@ mixin SceneOperationsDataHelper {
     );
   }
 
-  SceneStaticFunction _createSwitch3Function(
-      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createSwitch3Function(Action action, bool isAutomation,
+      String? comparator, String? uniqueCustomId) {
     return _createSceneFunction(
       action,
       '3 Gang Button Switch L-L',
@@ -786,53 +875,84 @@ mixin SceneOperationsDataHelper {
     );
   }
 
-  SceneStaticFunction _createCountdown1Function(
-      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
-    return _createSceneFunction(
-      action,
-      '3 Gang Button Switch L-L',
-      Assets.assetsIcons3GangSwitch,
-      'Light 1 CountDown',
-      isAutomation ? OperationDialogType.integerSteps : OperationDialogType.countdown,
-      isAutomation ? _createAutomationCountDownOptions() : _createCountdownOptions(),
-      isAutomation,
-      comparator,
-      uniqueCustomId,
-    );
+  SceneStaticFunction _createCountdown1Function(Action action,
+      bool isAutomation, String? comparator, String? uniqueCustomId) {
+    switch (action.productType) {
+      case "3G":
+        return _createSceneFunction(
+          action,
+          '3 Gang Button Switch L-L',
+          Assets.assetsIcons3GangSwitch,
+          'Light 1 CountDown',
+          isAutomation
+              ? OperationDialogType.integerSteps
+              : OperationDialogType.countdown,
+          isAutomation
+              ? _createAutomationCountDownOptions()
+              : _createCountdownOptions(),
+          isAutomation,
+          comparator,
+          uniqueCustomId,
+        );
+      default:
+        return _createSceneFunction(
+          action,
+          '1 Gang Button Switch L-L',
+          Assets.oneGang,
+          'Light CountDown',
+          isAutomation
+              ? OperationDialogType.integerSteps
+              : OperationDialogType.countdown,
+          isAutomation
+              ? _createAutomationCountDownOptions()
+              : _createCountdownOptions(),
+          isAutomation,
+          comparator,
+          uniqueCustomId,
+        );
+    }
   }
 
-  SceneStaticFunction _createCountdown2Function(
-      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createCountdown2Function(Action action,
+      bool isAutomation, String? comparator, String? uniqueCustomId) {
     return _createSceneFunction(
       action,
       '3 Gang Button Switch L-L',
       Assets.assetsIcons3GangSwitch,
       'Light 2 CountDown',
-      isAutomation ? OperationDialogType.integerSteps : OperationDialogType.countdown,
-      isAutomation ? _createAutomationCountDownOptions() : _createCountdownOptions(),
+      isAutomation
+          ? OperationDialogType.integerSteps
+          : OperationDialogType.countdown,
+      isAutomation
+          ? _createAutomationCountDownOptions()
+          : _createCountdownOptions(),
       isAutomation,
       comparator,
       uniqueCustomId,
     );
   }
 
-  SceneStaticFunction _createCountdown3Function(
-      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createCountdown3Function(Action action,
+      bool isAutomation, String? comparator, String? uniqueCustomId) {
     return _createSceneFunction(
       action,
       '3 Gang Button Switch L-L',
       Assets.assetsIcons3GangSwitch,
       'Light 3 CountDown',
-      isAutomation ? OperationDialogType.integerSteps : OperationDialogType.countdown,
-      isAutomation ? _createAutomationCountDownOptions() : _createCountdownOptions(),
+      isAutomation
+          ? OperationDialogType.integerSteps
+          : OperationDialogType.countdown,
+      isAutomation
+          ? _createAutomationCountDownOptions()
+          : _createCountdownOptions(),
       isAutomation,
       comparator,
       uniqueCustomId,
     );
   }
 
-  SceneStaticFunction _createSwitchAlarmSoundFunction(
-      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createSwitchAlarmSoundFunction(Action action,
+      bool isAutomation, String? comparator, String? uniqueCustomId) {
     return _createSceneFunction(
       action,
       'Gateway',
@@ -846,8 +966,8 @@ mixin SceneOperationsDataHelper {
     );
   }
 
-  SceneStaticFunction _createMasterStateFunction(
-      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createMasterStateFunction(Action action,
+      bool isAutomation, String? comparator, String? uniqueCustomId) {
     return _createSceneFunction(
       action,
       'Gateway',
@@ -861,8 +981,8 @@ mixin SceneOperationsDataHelper {
     );
   }
 
-  SceneStaticFunction _createFactoryResetFunction(
-      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
+  SceneStaticFunction _createFactoryResetFunction(Action action,
+      bool isAutomation, String? comparator, String? uniqueCustomId) {
     return _createSceneFunction(
       action,
       'Gateway',
@@ -1180,8 +1300,12 @@ mixin SceneOperationsDataHelper {
           uniqueCustomId: taskItem.uniqueCustomId,
           deviceId: taskItem.deviceId,
           deviceName: taskItem.deviceName.toString(),
-          deviceIcon: taskItem.operationName == 'automation' ? Assets.player : Assets.handClickIcon,
-          icon: taskItem.operationName == 'automation' ? Assets.player : Assets.handClickIcon,
+          deviceIcon: taskItem.operationName == 'automation'
+              ? Assets.player
+              : Assets.handClickIcon,
+          icon: taskItem.operationName == 'automation'
+              ? Assets.player
+              : Assets.handClickIcon,
           operationName: taskItem.operationName,
           operationDialogType: OperationDialogType.onOff,
           functionValue: taskItem.functionValue == 'rule_enable' ? true : false,

lib/features/scene/model/scene_details_model.dart

@@ -74,6 +74,7 @@ class Action {
   ExecutorProperty? executorProperty;
   String? name;
   String? type;
+  String? productType;
 
   Action({
     required this.actionExecutor,
@@ -81,6 +82,7 @@ class Action {
     this.executorProperty,
     this.name,
     this.type,
+    this.productType,
   });
 
   String toRawJson() => json.encode(toJson());
@@ -88,10 +90,11 @@ class Action {
   static Action? fromJson(Map<String, dynamic> json) {
     if (json['name'] != null && json['type'] != null) {
       return Action(
-        actionExecutor: json["actionExecutor"],
-        entityId: json["entityId"],
-        name: json['name'],
-        type: json['type'],
+        actionExecutor: json["actionExecutor"] as String,
+        entityId: json["entityId"] as String,
+        name: json['name'] as String?,
+        type: json['type'] as String?,
+        productType: json['productType'] as String?,
       );
     }
     if (json["executorProperty"] == null) {
@@ -99,9 +102,10 @@ class Action {
     }
 
     return Action(
-      actionExecutor: json["actionExecutor"],
-      entityId: json["entityId"],
+      actionExecutor: json["actionExecutor"] as String,
+      entityId: json["entityId"] as String,
       executorProperty: ExecutorProperty.fromJson(json["executorProperty"]),
+      productType: json['productType'] as String?,
     );
   }
 

lib/features/scene/view/scene_rooms_tabbar.dart

@@ -29,25 +29,38 @@ class _SceneRoomsTabBarDevicesViewState
 
   @override
   void initState() {
-    selectedSpace = HomeCubit.getInstance().selectedSpace!;
-    rooms = List.from(HomeCubit.getInstance().selectedSpace?.subspaces ?? []);
-    if (rooms != null) {
-      if (rooms![0].id != '-1') {
-        rooms?.insert(
-          0,
+    super.initState();
+
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      selectedSpace = HomeCubit.getInstance().selectedSpace!;
+
+      rooms = List.from(selectedSpace.subspaces ?? []);
+
+      if (rooms != null && rooms!.isNotEmpty) {
+        if (rooms![0].id != '-1') {
+          rooms?.insert(
+            0,
+            SubSpaceModel(
+              name: 'All Devices',
+              devices: context.read<DevicesCubit>().allDevices,
+              id: '-1',
+            ),
+          );
+        }
+      } else {
+        rooms = [
           SubSpaceModel(
             name: 'All Devices',
             devices: context.read<DevicesCubit>().allDevices,
             id: '-1',
-          ),
-        );
+          )
+        ];
       }
-    }
 
-    _tabController =
-        TabController(length: rooms!.length, vsync: this, initialIndex: 0);
-    _tabController.addListener(_handleTabSwitched);
-    super.initState();
+      _tabController = TabController(length: rooms!.length, vsync: this);
+      _tabController.addListener(_handleTabSwitched);
+      setState(() {});
+    });
   }
 
   void _handleTabSwitched() {

lib/features/scene/view/scene_view.dart

@@ -1,92 +1,54 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
-import 'package:syncrow_app/features/app_layout/model/community_model.dart';
 import 'package:syncrow_app/features/app_layout/model/space_model.dart';
 import 'package:syncrow_app/features/devices/view/widgets/scene_listview.dart';
 import 'package:syncrow_app/features/scene/bloc/create_scene/create_scene_bloc.dart';
 import 'package:syncrow_app/features/scene/bloc/scene_bloc/scene_bloc.dart';
 import 'package:syncrow_app/features/scene/bloc/scene_bloc/scene_event.dart';
 import 'package:syncrow_app/features/scene/bloc/smart_scene/smart_scene_select_dart_bloc.dart';
+import 'package:syncrow_app/features/scene/helper/scene_bloc_factory.dart';
 import 'package:syncrow_app/features/scene/widgets/empty_devices_widget.dart';
 import 'package:syncrow_app/features/scene/widgets/scene_view_widget/scene_grid_view.dart';
 import 'package:syncrow_app/features/scene/widgets/scene_view_widget/scene_header.dart';
+import 'package:syncrow_app/features/shared_widgets/app_loading_indicator.dart';
 import 'package:syncrow_app/features/shared_widgets/text_widgets/body_medium.dart';
 import 'package:syncrow_app/utils/context_extension.dart';
 import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
 
 class SceneView extends StatelessWidget {
+  const SceneView({
+    this.pageType = false,
+    super.key,
+  });
+
   final bool pageType;
-  const SceneView({super.key, this.pageType = false});
 
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (BuildContext context) {
-        if (pageType) {
-          return SceneBloc()
-            ..add(LoadScenes(
-                HomeCubit.getInstance().selectedSpace?.id ?? '',
-                HomeCubit.getInstance().selectedSpace ??
-                    SpaceModel(
-                        id: '-1',
-                        name: '',
-                        community: Community(
-                          uuid: '-1',
-                          name: '',
-                        )),
-                showInDevice: pageType));
-        } else {
-          return SceneBloc()
-            ..add(LoadScenes(
-                HomeCubit.getInstance().selectedSpace?.id ?? '',
-                HomeCubit.getInstance().selectedSpace ??
-                    SpaceModel(
-                        id: '-1',
-                        name: '',
-                        community: Community(
-                          uuid: '-1',
-                          name: '',
-                        )),
-                showInDevice: pageType))
-            ..add(LoadAutomation(
-                HomeCubit.getInstance().selectedSpace?.id ?? '',
-                HomeCubit.getInstance().selectedSpace?.community.uuid ?? ''));
-        }
-      },
+      create: (context) => SceneBlocFactory.create(
+        pageType: pageType,
+        homeCubit: HomeCubit.getInstance(),
+      ),
       child: BlocBuilder<CreateSceneBloc, CreateSceneState>(
         builder: (context, state) {
+          final selectedSpace = HomeCubit.getInstance().selectedSpace;
           if (state is DeleteSceneSuccess) {
-            if (state.success) {
-              BlocProvider.of<SceneBloc>(context).add(LoadScenes(
-                  HomeCubit.getInstance().selectedSpace!.id,
-                  HomeCubit.getInstance().selectedSpace!,
-                  showInDevice: pageType));
-              BlocProvider.of<SceneBloc>(context).add(LoadAutomation(
-                  HomeCubit.getInstance().selectedSpace!.id,
-                  HomeCubit.getInstance().selectedSpace!.community.uuid));
-            }
+            if (state.success) _loadScenesAndAutomations(context, selectedSpace);
           }
           if (state is CreateSceneWithTasks) {
-            if (state.success == true) {
-              BlocProvider.of<SceneBloc>(context).add(LoadScenes(
-                  HomeCubit.getInstance().selectedSpace!.id,
-                  HomeCubit.getInstance().selectedSpace!,
-                  showInDevice: pageType));
-              BlocProvider.of<SceneBloc>(context).add(LoadAutomation(
-                  HomeCubit.getInstance().selectedSpace!.id,
-                  HomeCubit.getInstance().selectedSpace!.community.uuid));
-              context
-                  .read<SmartSceneSelectBloc>()
-                  .add(const SmartSceneClearEvent());
+            if (state.success) {
+              _loadScenesAndAutomations(context, selectedSpace);
+              context.read<SmartSceneSelectBloc>().add(const SmartSceneClearEvent());
             }
           }
           return BlocListener<SceneBloc, SceneState>(
             listener: (context, state) {
               if (state is SceneTriggerSuccess) {
                 context.showCustomSnackbar(
-                    message:
-                        'Scene ${state.sceneName} triggered successfully!');
+                  message: 'Scene ${state.sceneName} triggered successfully!',
+                );
               }
             },
             child: HomeCubit.getInstance().spaces.isEmpty
@@ -95,13 +57,14 @@ class SceneView extends StatelessWidget {
                     mainAxisAlignment: MainAxisAlignment.start,
                     crossAxisAlignment: CrossAxisAlignment.stretch,
                     children: [
-                      if (pageType == false) const SceneHeader(),
-                      if (pageType == false) const SizedBox(height: 8),
+                      if (!pageType) ...[
+                        const SceneHeader(),
+                        const SizedBox(height: 8),
+                      ],
                       BlocBuilder<SceneBloc, SceneState>(
                         builder: (context, state) {
                           if (state is SceneLoading) {
-                            return const Center(
-                                child: CircularProgressIndicator());
+                            return const AppLoadingIndicator();
                           }
                           if (state is SceneError) {
                             return Center(
@@ -111,84 +74,81 @@ class SceneView extends StatelessWidget {
                           if (state is SceneLoaded) {
                             final scenes = state.scenes;
                             final automationList = state.automationList;
+                            if (scenes.isEmpty) return const EmptyDevicesWidget();
 
-                            return pageType
-                                ? SizedBox(
-                                    height: context.height * 0.1,
-                                    child: SceneListview(
-                                      scenes: scenes,
-                                      loadingSceneId: state.loadingSceneId,
-                                    ),
-                                  )
-                                : Expanded(
-                                    child: ListView(
+                            if (pageType) {
+                              return SizedBox(
+                                height: context.height * 0.1,
+                                child: SceneListview(
+                                  scenes: scenes,
+                                  loadingSceneId: state.loadingSceneId,
+                                ),
+                              );
+                            }
+
+                            return Theme(
+                              data: Theme.of(context).copyWith(
+                                dividerColor: Colors.transparent,
+                              ),
+                              child: Expanded(
+                                child: ListView(
+                                  children: [
+                                    ExpansionTile(
+                                      tilePadding: const EdgeInsets.symmetric(
+                                        horizontal: 6,
+                                      ),
+                                      initiallyExpanded: true,
+                                      iconColor: ColorsManager.grayColor,
+                                      title: const BodyMedium(
+                                        text: 'Tap to run routines',
+                                      ),
                                       children: [
-                                        Theme(
-                                          data: ThemeData().copyWith(
-                                              dividerColor: Colors.transparent),
-                                          child: ExpansionTile(
-                                            tilePadding:
-                                                const EdgeInsets.symmetric(
-                                                    horizontal: 6),
-                                            initiallyExpanded: true,
-                                            iconColor: ColorsManager.grayColor,
-                                            title: const BodyMedium(
-                                                text: 'Tap to run routines'),
-                                            children: [
-                                              scenes.isNotEmpty
-                                                  ? SceneGrid(
-                                                      scenes: scenes,
-                                                      loadingSceneId:
-                                                          state.loadingSceneId,
-                                                      disablePlayButton: false,
-                                                      loadingStates: state
-                                                          .loadingStates, // Add this line
-                                                    )
-                                                  : const Center(
-                                                      child: BodyMedium(
-                                                        text:
-                                                            'No scenes have been added yet',
-                                                      ),
-                                                    ),
-                                              const SizedBox(height: 10),
-                                            ],
+                                        if (scenes.isNotEmpty)
+                                          SceneGrid(
+                                            scenes: scenes,
+                                            loadingSceneId: state.loadingSceneId,
+                                            disablePlayButton: false,
+                                            loadingStates: state.loadingStates,
+                                          )
+                                        else
+                                          const Center(
+                                            child: BodyMedium(
+                                              text: 'No scenes have been added yet',
+                                            ),
                                           ),
-                                        ),
-                                        Theme(
-                                          data: ThemeData().copyWith(
-                                              dividerColor: Colors.transparent),
-                                          child: ExpansionTile(
-                                            initiallyExpanded: true,
-                                            iconColor: ColorsManager.grayColor,
-                                            tilePadding:
-                                                const EdgeInsets.symmetric(
-                                                    horizontal: 6),
-                                            title: const BodyMedium(
-                                                text: 'Automation'),
-                                            children: [
-                                              automationList.isNotEmpty
-                                                  ? SceneGrid(
-                                                      scenes: automationList,
-                                                      loadingSceneId:
-                                                          state.loadingSceneId,
-                                                      disablePlayButton: true,
-                                                      loadingStates: state
-                                                          .loadingStates, // Add this line
-                                                    )
-                                                  : const Center(
-                                                      child: BodyMedium(
-                                                        text:
-                                                            'No automations have been added yet',
-                                                      ),
-                                                    ),
-                                              const SizedBox(height: 10),
-                                            ],
-                                          ),
-                                        ),
-                                        const SizedBox(height: 15),
+                                        const SizedBox(height: 10),
                                       ],
                                     ),
-                                  );
+                                    ExpansionTile(
+                                      initiallyExpanded: true,
+                                      iconColor: ColorsManager.grayColor,
+                                      tilePadding: const EdgeInsets.symmetric(
+                                        horizontal: 6,
+                                      ),
+                                      title: const BodyMedium(text: 'Automation'),
+                                      children: [
+                                        if (automationList.isNotEmpty)
+                                          SceneGrid(
+                                            scenes: automationList,
+                                            loadingSceneId: state.loadingSceneId,
+                                            disablePlayButton: true,
+                                            loadingStates: state.loadingStates,
+                                          )
+                                        else
+                                          const Center(
+                                            child: BodyMedium(
+                                              text:
+                                                  'No automations have been added yet',
+                                            ),
+                                          ),
+                                        const SizedBox(height: 10),
+                                      ],
+                                    ),
+                                    const SizedBox(height: 15),
+                                  ],
+                                ),
+                              ),
+                            );
                           }
                           return const SizedBox.shrink();
                         },
@@ -200,4 +160,21 @@ class SceneView extends StatelessWidget {
       ),
     );
   }
+
+  void _loadScenesAndAutomations(BuildContext context, SpaceModel? selectedSpace) {
+    BlocProvider.of<SceneBloc>(context)
+      ..add(
+        LoadScenes(
+          selectedSpace!.id,
+          selectedSpace,
+          showInDevice: pageType,
+        ),
+      )
+      ..add(
+        LoadAutomation(
+          selectedSpace.id,
+          selectedSpace.community.uuid,
+        ),
+      );
+  }
 }

lib/features/shared_widgets/app_loading_indicator.dart

@@ -0,0 +1,12 @@
+import 'package:flutter/material.dart';
+
+class AppLoadingIndicator extends StatelessWidget {
+  const AppLoadingIndicator({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Center(
+      child: CircularProgressIndicator.adaptive(),
+    );
+  }
+}