SP-1477

SP-1268 Rework

.env.dev

@@ -1,3 +1,5 @@
 ENV_NAME=development
 BASE_URL=https://syncrow-dev.azurewebsites.net
 PROJECT_ID=0e62577c-06fa-41b9-8a92-99a21fbaf51c
+CLIENT_ID=c024573d191a327ce74db7d4502fdc29
+CLIENT_SECRET=fec6ccbc33664f94a3b84a45c7cceef3f3ebd1613ef4307db8946ede530cd1ed

.gitignore

@@ -42,3 +42,4 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+/android/app/.cxx/

assets/icons/cancel_icon.svg

@@ -0,0 +1,10 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_7302_4118)">
+<path d="M11.1049 10.0001L19.7712 1.33381C20.0763 1.02869 20.0763 0.534007 19.7712 0.228929C19.4661 -0.0761485 18.9714 -0.0761876 18.6663 0.228929L9.99999 8.89524L1.33372 0.228929C1.0286 -0.0761876 0.533915 -0.0761876 0.228837 0.228929C-0.0762401 0.534046 -0.0762792 1.02873 0.228837 1.33381L8.89511 10.0001L0.228837 18.6664C-0.0762792 18.9715 -0.0762792 19.4662 0.228837 19.7713C0.381376 19.9238 0.581337 20.0001 0.781297 20.0001C0.981258 20.0001 1.18118 19.9238 1.33376 19.7713L9.99999 11.105L18.6663 19.7713C18.8188 19.9238 19.0188 20.0001 19.2187 20.0001C19.4187 20.0001 19.6186 19.9238 19.7712 19.7713C20.0763 19.4662 20.0763 18.9715 19.7712 18.6664L11.1049 10.0001Z" fill="#999999"/>
+</g>
+<defs>
+<clipPath id="clip0_7302_4118">
+<rect width="20" height="20" fill="white"/>
+</clipPath>
+</defs>
+</svg>

assets/icons/empty_routines.svg

@@ -0,0 +1,15 @@
+<svg width="100" height="100" viewBox="0 0 100 100" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.5419 20.2424C11.1182 19.3486 10.0545 18.9678 9.16647 19.3935L1.38334 23.1268C0.591819 23.3098 0 24.0197 0 24.8727V33.8466C0 34.8381 0.797668 35.6413 1.78229 35.6413C2.76668 35.6413 3.56412 34.8381 3.56412 33.8466V27.6644L9.16647 30.3516C9.41376 30.4704 9.67449 30.5264 9.93112 30.5264C10.5974 30.5264 11.2359 30.1484 11.5419 29.5025C11.9643 28.6076 11.5875 27.5367 10.699 27.1103L6.03295 24.8725L10.699 22.6346C11.5877 22.2085 11.9643 21.1376 11.5419 20.2424Z" fill="#D5D5D5"/>
+<path d="M20.6084 17.6894C20.8655 17.6894 21.1257 17.6334 21.3737 17.5146L32.0481 12.3951C32.9366 11.9685 33.3141 10.8974 32.891 10.0024C32.4682 9.10864 31.4052 8.72813 30.5156 9.15359L19.8408 14.2736C18.9522 14.6999 18.5754 15.7706 18.998 16.6658C19.3038 17.3112 19.9423 17.6894 20.6084 17.6894Z" fill="#D5D5D5"/>
+<path d="M42.7227 7.27445L48.1841 4.65449V10.9114C48.1841 11.9027 48.9818 12.7061 49.9659 12.7061C50.9503 12.7061 51.7478 11.9027 51.7478 10.9114V4.62192L57.2779 7.27445C57.5259 7.39303 57.7862 7.44922 58.0433 7.44922C58.7091 7.44922 59.3478 7.07124 59.6534 6.42537C60.0763 5.53041 59.6994 4.45953 58.8106 4.03316L50.7663 0.174427C50.2813 -0.0581424 49.7189 -0.0581424 49.2338 0.174427L41.19 4.03316C40.3015 4.45953 39.9244 5.53018 40.3472 6.42537C40.771 7.32101 41.8362 7.70198 42.7227 7.27445Z" fill="#D5D5D5"/>
+<path d="M67.9533 12.3944L78.6281 17.5146C78.875 17.6334 79.1361 17.6894 79.3932 17.6894C80.059 17.6894 80.6978 17.3114 81.0034 16.6655C81.426 15.7706 81.0494 14.6997 80.1606 14.2733L69.4856 9.1529C68.5982 8.72721 67.5345 9.10726 67.1105 10.0018C66.6875 10.8967 67.0645 11.9676 67.9533 12.3944Z" fill="#D5D5D5"/>
+<path d="M81.539 34.8099C82.4275 34.3837 82.8046 33.3128 82.3815 32.4177C81.9587 31.5232 80.8946 31.1424 80.0065 31.5695L73.167 34.8509L51.7477 24.577V16.5765C51.7477 15.5846 50.9503 14.7818 49.9659 14.7818C48.9817 14.7818 48.1841 15.5848 48.1841 16.5765V24.6096L26.8346 34.85L20.6999 31.9073C19.8093 31.481 18.7482 31.8612 18.3244 32.7564C17.9016 33.6514 18.2787 34.7225 19.1672 35.1489L25.8031 38.3319V61.6684L19.0593 64.9031C18.1707 65.3295 17.7939 66.4001 18.2165 67.2955C18.5221 67.9412 19.1606 68.3192 19.8266 68.3192C20.0837 68.3192 20.3447 68.2632 20.5917 68.1444L26.8349 65.1499L48.1841 75.3903V81.5075C48.1841 82.4993 48.9817 83.3022 49.9659 83.3022C50.9503 83.3022 51.7477 82.499 51.7477 81.5075V75.4233L73.1657 65.1501L79.6524 68.2616C79.9002 68.3802 80.1607 68.4364 80.4175 68.4364C81.0834 68.4364 81.7221 68.0584 82.0277 67.4125C82.4508 66.5175 82.0735 65.4467 81.1849 65.0201L74.1977 61.6687V38.3319L81.539 34.8099ZM70.634 62.3879L51.7479 71.4467V49.0994L70.634 40.0402V62.3879ZM29.4788 61.8939C29.4472 61.8269 29.4053 61.7691 29.3668 61.7081V40.0404L48.1841 49.0663V71.4141L29.6409 62.5198C29.6239 62.3086 29.5745 62.0964 29.4788 61.8939ZM50.0003 27.7151L69.0207 36.8383L50.0003 45.9611L30.9799 36.8383L50.0003 27.7151Z" fill="#D5D5D5"/>
+<path d="M78.6271 82.486L67.9525 87.6062C67.0639 88.0328 66.6864 89.1036 67.1095 89.9979C67.4153 90.644 68.054 91.0215 68.7199 91.0215C68.9767 91.0215 69.2379 90.9656 69.485 90.8477L80.1598 85.7273C81.0483 85.3009 81.4252 84.2295 81.0025 83.3346C80.579 82.4401 79.5149 82.0616 78.6271 82.486Z" fill="#D5D5D5"/>
+<path d="M57.2782 92.7266L51.748 95.3793V88.227C51.748 87.2357 50.9506 86.4323 49.9662 86.4323C48.982 86.4323 48.1844 87.2357 48.1844 88.227V95.3468L42.723 92.7266C41.8335 92.3023 40.7713 92.6807 40.3475 93.5759C39.9246 94.4709 40.3015 95.5413 41.1903 95.9676L49.2346 99.8259C49.4769 99.9417 49.7387 100 50.0008 100C50.2629 100 50.5248 99.9417 50.7671 99.8259L58.8114 95.9676C59.6999 95.5413 60.077 94.4709 59.6541 93.5759C59.2304 92.6807 58.166 92.3032 57.2782 92.7266Z" fill="#D5D5D5"/>
+<path d="M32.0476 87.6061L21.3728 82.4859C20.4863 82.0605 19.4217 82.4394 18.9975 83.3343C18.5749 84.2293 18.9517 85.3006 19.8403 85.727L30.5153 90.8474C30.7622 90.9653 31.0233 91.0213 31.2802 91.0213C31.946 91.0213 32.5847 90.6438 32.8903 89.9977C33.3132 89.1036 32.9361 88.0328 32.0476 87.6061Z" fill="#D5D5D5"/>
+<path d="M11.5419 70.4974C11.1182 69.6029 10.0545 69.224 9.16647 69.6488L3.56412 72.3355V65.6178C3.56412 64.6265 2.76668 63.823 1.78229 63.823C0.797668 63.823 0 64.6265 0 65.6178V74.5919C0 74.8162 0.0457694 75.0284 0.120686 75.2263C0.156892 75.8784 0.53193 76.4651 1.12215 76.7486L9.16647 80.6073C9.41376 80.7254 9.67449 80.7818 9.93112 80.7818C10.5974 80.7818 11.2359 80.4038 11.5419 79.7582C11.9643 78.8632 11.5875 77.7924 10.699 77.3655L6.03295 75.1281L10.699 72.8903C11.5877 72.4637 11.9643 71.3923 11.5419 70.4974Z" fill="#D5D5D5"/>
+<path d="M1.78229 56.8226C2.76668 56.8226 3.56412 56.0193 3.56412 55.0274V44.4374C3.56412 43.4461 2.76668 42.6427 1.78229 42.6427C0.797668 42.6427 0 43.4461 0 44.4374V55.0274C0.00022771 56.0193 0.797896 56.8226 1.78229 56.8226Z" fill="#D5D5D5"/>
+<path d="M98.6173 23.1268L90.8342 19.3935C89.9443 18.9667 88.8825 19.3479 88.4589 20.2424C88.0363 21.1378 88.4132 22.2084 89.3017 22.6351L93.9677 24.8729L89.3017 27.1108C88.4132 27.5371 88.0363 28.6078 88.4589 29.503C88.7645 30.1488 89.4032 30.5268 90.0691 30.5268C90.3262 30.5268 90.5873 30.4709 90.8342 30.3521L96.4365 27.6649V33.847C96.4365 34.8385 97.234 35.6418 98.2184 35.6418C99.2027 35.6418 100 34.8385 100 33.847V24.8731C100 24.0197 99.4088 23.3098 98.6173 23.1268Z" fill="#D5D5D5"/>
+<path d="M98.2184 42.642C97.2337 42.642 96.4365 43.4455 96.4365 44.4367V55.0267C96.4365 56.0187 97.234 56.8214 98.2184 56.8214C99.2027 56.8214 100 56.0184 100 55.0267V44.4367C100 43.4455 99.203 42.642 98.2184 42.642Z" fill="#D5D5D5"/>
+<path d="M98.2184 63.8228C97.2337 63.8228 96.4365 64.6263 96.4365 65.6175V72.3352L90.8342 69.6485C89.9443 69.2231 88.8825 69.6022 88.4589 70.4971C88.0363 71.3921 88.4132 72.4634 89.3017 72.8898L93.9677 75.1277L89.3017 77.3651C88.4132 77.7919 88.0363 78.8628 88.4589 79.7577C88.7645 80.4034 89.4032 80.7814 90.0691 80.7814C90.3262 80.7814 90.5873 80.7249 90.8342 80.6068L98.8785 76.7481C99.4687 76.4646 99.8438 75.8779 99.88 75.2258C99.9546 75.0279 100 74.8157 100 74.5914V65.6173C100 64.6263 99.203 63.8228 98.2184 63.8228Z" fill="#D5D5D5"/>
+</svg>

assets/icons/save_routines_icon.svg

@@ -0,0 +1,10 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_7302_4149)">
+<path d="M19.9969 4.94279C19.986 4.83232 19.943 4.72146 19.8674 4.62924C19.8382 4.59358 20.1367 4.89431 15.4141 0.17176C15.3015 0.0591838 15.1487 8.30277e-05 14.9996 0.00012209C14.6443 0.00012209 2.11177 0.00012209 1.75779 0.00012209C0.788544 0.00012209 0 0.788666 0 1.75791V18.2421C0 19.2113 0.788544 19.9998 1.75779 19.9998H18.2419C19.2112 19.9998 19.9997 19.2113 19.9997 18.2421C19.9998 4.01624 20.0013 4.98771 19.9969 4.94279ZM13.4764 1.17198V5.00005C13.4764 5.32314 13.2136 5.58598 12.8905 5.58598H12.1483V1.17198H13.4764ZM10.9765 1.17198V5.58598H5.54684C5.22376 5.58598 4.96091 5.32314 4.96091 5.00005V1.17198H10.9765ZM13.4764 12.539H4.96091V11.7968C4.96091 11.4738 5.22376 11.2109 5.54684 11.2109H12.8905C13.2136 11.2109 13.4764 11.4738 13.4764 11.7968V12.539ZM4.96091 18.828V13.7109H13.4764V18.828H4.96091ZM18.8279 18.2421C18.8279 18.5651 18.5651 18.828 18.242 18.828H14.6483C14.6483 18.0641 14.6483 12.6676 14.6483 11.7968C14.6483 10.8276 13.8597 10.039 12.8905 10.039H5.54684C4.57759 10.039 3.78905 10.8276 3.78905 11.7968V18.828H1.75783C1.43475 18.828 1.1719 18.5651 1.1719 18.2421V1.75791C1.1719 1.43483 1.43475 1.17198 1.75783 1.17198H3.78905V5.00005C3.78905 5.9693 4.57759 6.75784 5.54684 6.75784H12.8905C13.8597 6.75784 14.6483 5.9693 14.6483 5.00005V1.17198H14.7571L18.8279 5.24278V18.2421Z" fill="#023DFE" fill-opacity="0.6"/>
+</g>
+<defs>
+<clipPath id="clip0_7302_4149">
+<rect width="20" height="20" fill="white"/>
+</clipPath>
+</defs>
+</svg>

lib/features/app_layout/bloc/home_cubit.dart

@@ -22,7 +22,7 @@ import 'package:syncrow_app/features/scene/bloc/effective_period/effect_period_e
 import 'package:syncrow_app/features/scene/bloc/smart_scene/smart_scene_select_dart_bloc.dart';
 import 'package:syncrow_app/features/scene/enum/create_scene_enum.dart';
 import 'package:syncrow_app/features/scene/model/scene_settings_route_arguments.dart';
-import 'package:syncrow_app/features/scene/view/scene_view.dart';
+import 'package:syncrow_app/features/scene/view/routines_view.dart';
 import 'package:syncrow_app/generated/assets.dart';
 import 'package:syncrow_app/navigation/navigation_service.dart';
 import 'package:syncrow_app/navigation/routing_constants.dart';
@@ -580,7 +580,7 @@ class HomeCubit extends Cubit<HomeState> {
       create: (context) => DevicesCubit.getInstance(),
       child: const DevicesViewBody(),
     ),
-    const SceneView(),
+    const RoutinesView(),
     const MenuView(),
   ];
 

lib/features/auth/bloc/auth_cubit.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:syncrow_app/features/auth/model/login_with_email_model.dart';
 import 'package:syncrow_app/features/auth/model/signup_model.dart';
@@ -217,9 +218,22 @@ class AuthCubit extends Cubit<AuthState> {
   signUp() async {
     emit(AuthLoginLoading());
     final response;
+
+    final clientId = dotenv.env['CLIENT_ID'] ?? '';
+    final clientSecret = dotenv.env['CLIENT_SECRET'] ?? '';
+
     try {
       List<String> userFullName = fullName.split(' ');
+
+      final clientToken = await AuthenticationAPI.fetchClientToken(
+        clientId: clientId,
+        clientSecret: clientSecret,
+      );
+
+      final accessToken = clientToken['accessToken'];
+
       response = await AuthenticationAPI.signUp(
+        accessToken: accessToken,
         model: SignUpModel(
             hasAcceptedAppAgreement: true,
             email: email.toLowerCase(),

lib/features/devices/bloc/curtain_bloc/curtain_bloc.dart

@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'package:firebase_database/firebase_database.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
 import 'package:syncrow_app/features/devices/bloc/curtain_bloc/curtain_event.dart';
@@ -31,6 +32,7 @@ class CurtainBloc extends Bloc<CurtainEvent, CurtainState> {
     on<InitialWizardEvent>(_fetchWizardStatus);
     on<GroupAllOffEvent>(_groupAllOff);
     on<GroupAllOnEvent>(_groupAllOn);
+    on<UpdateCurtainEvent>(_updateCurtain);
   }
 
   Future<void> _onOpenCurtain(
@@ -162,7 +164,10 @@ class CurtainBloc extends Bloc<CurtainEvent, CurtainState> {
   void _fetchStatus(InitCurtain event, Emitter<CurtainState> emit) async {
     try {
       emit(CurtainLoadingState());
+      _listenToChanges(curtainId);
+
       var response = await DevicesAPI.getDeviceStatus(curtainId);
+
       List<StatusModel> statusModelList = [];
       for (var status in response['status']) {
         statusModelList.add(StatusModel.fromJson(status));
@@ -170,7 +175,6 @@ class CurtainBloc extends Bloc<CurtainEvent, CurtainState> {
       openPercentage = double.tryParse(statusModelList[1].value.toString())!;
       curtainWidth = 270 - (openPercentage / 100) * curtainOpeningSpace;
       blindHeight = 310 - (openPercentage / 100) * blindOpeningSpace;
-      // _listenToChanges();
       emit(CurtainsOpening(
         curtainWidth: curtainWidth,
         blindHeight: blindHeight,
@@ -181,38 +185,76 @@ class CurtainBloc extends Bloc<CurtainEvent, CurtainState> {
       return;
     }
   }
-  // Real-time Database
-  // StreamSubscription<DatabaseEvent>? _streamSubscription;
-  // Timer? _timer;
-  // void _listenToChanges() {
+
+  StreamSubscription<DatabaseEvent>? _streamSubscription;
+
+  void _listenToChanges(curtainId) {
+    try {
+      _streamSubscription?.cancel();
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$curtainId');
+      Stream<DatabaseEvent> stream = ref.onValue;
+
+      _streamSubscription = stream.listen((DatabaseEvent event) {
+        Map<dynamic, dynamic> usersMap =
+            event.snapshot.value as Map<dynamic, dynamic>;
+        List<StatusModel> statusList = [];
+
+        usersMap['status'].forEach((element) {
+          statusList
+              .add(StatusModel(code: element['code'], value: element['value']));
+        });
+        openPercentage = double.tryParse(statusList[1].value.toString())!;
+        curtainWidth = 270 - (openPercentage / 100) * curtainOpeningSpace;
+        blindHeight = 310 - (openPercentage / 100) * blindOpeningSpace;
+        add(UpdateCurtainEvent());
+      });
+    } catch (_) {}
+  }
+
+  @override
+  Future<void> close() async {
+    _streamSubscription?.cancel();
+    _streamSubscription = null;
+    return super.close();
+  }
+
+  // _listenToChanges(curtainId) {
   //   try {
-  //     _streamSubscription?.cancel();
+  //     print('curtainId=$curtainId');
   //     DatabaseReference ref =
   //         FirebaseDatabase.instance.ref('device-status/$curtainId');
   //     Stream<DatabaseEvent> stream = ref.onValue;
 
-  //     _streamSubscription = stream.listen((DatabaseEvent event) async {
+  //     stream.listen((DatabaseEvent event) async {
   //       if (_timer != null) {
   //         await Future.delayed(const Duration(seconds: 2));
   //       }
   //       Map<dynamic, dynamic> usersMap =
   //           event.snapshot.value as Map<dynamic, dynamic>;
-  //       List<StatusModel> statusList = [];
-  //       usersMap['status'].forEach((element) {
-  //         statusList
-  //             .add(StatusModel(code: element['code'], value: element['value']));
-  //       });
-  //       deviceStatus = CurtainModel.fromJson(statusList);
-  //       if (!isClosed) {}
+  //       List<StatusModel> statusModelList = [];
+  //       for (var status in usersMap['status']) {
+  //         statusModelList.add(StatusModel.fromJson(status));
+  //         print('statusModelList==${statusModelList}');
+  //       }
+
+  //       openPercentage = double.tryParse(statusModelList[1].value.toString())!;
+  //       curtainWidth = 270 - (openPercentage / 100) * curtainOpeningSpace;
+  //       blindHeight = 310 - (openPercentage / 100) * blindOpeningSpace;
+  //       add(UpdateCurtainEvent());
   //     });
   //   } catch (_) {}
   // }
-  // @override
-  // Future<void> close() async {
-  //   _streamSubscription?.cancel();
-  //   _streamSubscription = null;
-  //   return super.close();
-  // }
+
+  _updateCurtain(UpdateCurtainEvent event, Emitter<CurtainState> emit) {
+    curtainWidth = 270 - (openPercentage / 100) * curtainOpeningSpace;
+    blindHeight = 310 - (openPercentage / 100) * blindOpeningSpace;
+    emit(CurtainsOpening(
+      curtainWidth: curtainWidth,
+      blindHeight: blindHeight,
+      openPercentage: openPercentage,
+    ));
+  }
 
   List<GroupCurtainModel> groupList = [];
   bool allSwitchesOn = true;

lib/features/devices/bloc/curtain_bloc/curtain_event.dart

@@ -33,6 +33,7 @@ class InitCurtain extends CurtainEvent {}
 class PauseCurtain extends CurtainEvent {}
 class useCurtainEvent extends CurtainEvent {}
 class InitialWizardEvent extends CurtainEvent {}
+class UpdateCurtainEvent extends CurtainEvent {}
 
 
 class ChangeFirstWizardSwitchStatusEvent extends CurtainEvent {

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

@@ -169,18 +169,20 @@ 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,
+      DeviceType.TwoGang
+    };
+
+    return devices
+        .where((device) => allowedDeviceTypes.contains(device.productType))
+        .toList();
   }
 }

lib/features/devices/bloc/devices_cubit.dart

@@ -463,7 +463,15 @@ class DevicesCubit extends Cubit<DevicesState> {
           projectId: project?.uuid ?? TempConst.projectIdDev);
       allDevices = devices;
       for (var deviceId in allDevices) {
-        if (deviceId.type == "3G" || deviceId.type == "AC") {
+        if (deviceId.type == "3G" ||
+            deviceId.type == "2G" ||
+            deviceId.type == "1G" ||
+            deviceId.type == "3GT" ||
+            deviceId.type == "2GT" ||
+            deviceId.type == "1GT" ||
+            deviceId.type == "WH" ||
+            deviceId.type == "CUR" ||
+            deviceId.type == "AC") {
           _listenToChanges(deviceId.uuid);
         }
       }
@@ -561,7 +569,6 @@ class DevicesCubit extends Cubit<DevicesState> {
     }
   }
 
-
   Future<void> towGangToggle(
       DeviceControlModel control, String deviceUuid) async {
     emit(SwitchControlLoading(code: control.code));
@@ -653,7 +660,6 @@ class DevicesCubit extends Cubit<DevicesState> {
             code: 'switch_1', value: toggledValue, deviceId: deviceUuid);
         final response =
             await DevicesAPI.controlDevice(controlRequest, deviceUuid);
-        print(response);
         if (response['result'] != true) {
           throw Exception('Failed to toggle switch_1');
         }

lib/features/devices/bloc/door_sensor_bloc/door_sensor_bloc.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'package:dio/dio.dart';
+import 'package:firebase_database/firebase_database.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/devices/bloc/door_sensor_bloc/door_sensor_event.dart';
 import 'package:syncrow_app/features/devices/bloc/door_sensor_bloc/door_sensor_state.dart';
@@ -40,7 +41,7 @@ class DoorSensorBloc extends Bloc<DoorSensorEvent, DoorSensorState> {
       );
       emit(UpdateState(doorSensor: deviceStatus));
       Future.delayed(const Duration(milliseconds: 500));
-      // _listenToChanges();
+      _listenToChanges();
     } catch (e) {
       emit(DoorSensorFailedState(errorMessage: e.toString()));
       return;
@@ -136,41 +137,42 @@ class DoorSensorBloc extends Bloc<DoorSensorEvent, DoorSensorState> {
       String errorMessage = errorData['message'];
     }
   }
+
   // real-time database
-  // Timer? _timer;
-  // StreamSubscription<DatabaseEvent>? _streamSubscription;
-  // void _listenToChanges() {
-  //   try {
-  //     _streamSubscription?.cancel();
-  //     DatabaseReference ref =
-  //         FirebaseDatabase.instance.ref('device-status/$DSId');
-  //     Stream<DatabaseEvent> stream = ref.onValue;
+  Timer? _timer;
+  StreamSubscription<DatabaseEvent>? _streamSubscription;
+  void _listenToChanges() {
+    try {
+      _streamSubscription?.cancel();
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$DSId');
+      Stream<DatabaseEvent> stream = ref.onValue;
 
-  //     _streamSubscription = stream.listen((DatabaseEvent event) async {
-  //       if (_timer != null) {
-  //         await Future.delayed(const Duration(seconds: 2));
-  //       }
-  //       Map<dynamic, dynamic> usersMap =
-  //           event.snapshot.value as Map<dynamic, dynamic>;
-  //       List<StatusModel> statusList = [];
-  //       usersMap['status'].forEach((element) {
-  //         statusList
-  //             .add(StatusModel(code: element['code'], value: element['value']));
-  //       });
-  //       deviceStatus = DoorSensorModel.fromJson(statusList);
-  //       if (!isClosed) {
-  //         add(
-  //           DoorSensorSwitch(switchD: deviceStatus.doorContactState),
-  //         );
-  //       }
-  //     });
-  //   } catch (_) {}
-  // }
-
-  // @override
-  // Future<void> close() async {
-  //   _streamSubscription?.cancel();
-  //   _streamSubscription = null;
-  //   return super.close();
-  // }
+      _streamSubscription = stream.listen((DatabaseEvent event) async {
+        if (_timer != null) {
+          await Future.delayed(const Duration(seconds: 2));
+        }
+        Map<dynamic, dynamic> usersMap =
+            event.snapshot.value as Map<dynamic, dynamic>;
+        List<StatusModel> statusList = [];
+        usersMap['status'].forEach((element) {
+          statusList
+              .add(StatusModel(code: element['code'], value: element['value']));
+        });
+        deviceStatus = DoorSensorModel.fromJson(statusList);
+        if (!isClosed) {
+          add(
+            DoorSensorSwitch(switchD: deviceStatus.doorContactState),
+          );
+        }
+      });
+    } catch (_) {}
+  }
+
+  @override
+  Future<void> close() async {
+    _streamSubscription?.cancel();
+    _streamSubscription = null;
+    return super.close();
+  }
 }

lib/features/devices/bloc/garage_door_bloc/garage_door_bloc.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'package:dio/dio.dart';
+import 'package:firebase_database/firebase_database.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
 import 'package:syncrow_app/features/devices/bloc/garage_door_bloc/garage_door_event.dart';
@@ -41,6 +42,8 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
     on<ChangeFirstWizardSwitchStatusEvent>(_changeFirstWizardSwitch);
     on<ToggleAlarmEvent>(_toggleAlarmEvent);
     on<DeleteScheduleEvent>(deleteSchedule);
+
+    on<UpdateStateEvent>(_updateState);
   }
   void _onClose(OnClose event, Emitter<GarageDoorSensorState> emit) {
     _timer?.cancel();
@@ -79,7 +82,7 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
       toggleDoor = deviceStatus.switch1;
       emit(UpdateState(garageSensor: deviceStatus));
       Future.delayed(const Duration(milliseconds: 500));
-      // _listenToChanges();
+      _listenToChanges();
     } catch (e) {
       emit(GarageDoorFailedState(errorMessage: e.toString()));
       return;
@@ -179,39 +182,57 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
   }
 
   // Real-time db
-  // StreamSubscription<DatabaseEvent>? _streamSubscription;
-  // void _listenToChanges() {
-  //   try {
-  //     _streamSubscription?.cancel();
-  //     DatabaseReference ref =
-  //         FirebaseDatabase.instance.ref('device-status/$GDId');
-  //     Stream<DatabaseEvent> stream = ref.onValue;
+  StreamSubscription<DatabaseEvent>? _streamSubscription;
+  void _listenToChanges() {
+    try {
+      _streamSubscription?.cancel();
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$GDId');
+      Stream<DatabaseEvent> stream = ref.onValue;
 
-  //     _streamSubscription = stream.listen((DatabaseEvent event) async {
-  //       if (_timer != null) {
-  //         await Future.delayed(const Duration(seconds: 2));
-  //       }
-  //       Map<dynamic, dynamic> usersMap =
-  //           event.snapshot.value as Map<dynamic, dynamic>;
-  //       List<StatusModel> statusList = [];
-  //       usersMap['status'].forEach((element) {
-  //         statusList
-  //             .add(StatusModel(code: element['code'], value: element['value']));
-  //       });
-  //       deviceStatus = GarageDoorModel.fromJson(statusList);
-  //       // if (!isClosed) {
-  //       //   add(ToggleSelectedEvent());
-  //       // }
-  //     });
-  //   } catch (_) {}
-  // }
+      _streamSubscription = stream.listen((DatabaseEvent event) async {
+        if (_timer != null) {
+          await Future.delayed(const Duration(seconds: 1));
+        }
 
-  // @override
-  // Future<void> close() async {
-  //   _streamSubscription?.cancel();
-  //   _streamSubscription = null;
-  //   return super.close();
-  // }
+        if (event.snapshot.value != null) {
+          Map<dynamic, dynamic> usersMap =
+              event.snapshot.value as Map<dynamic, dynamic>;
+          List<StatusModel> statusList = [];
+
+          usersMap['status'].forEach((element) {
+            statusList.add(
+                StatusModel(code: element['code'], value: element['value']));
+          });
+          deviceStatus.tr_timecon = statusList
+              .firstWhere((status) => status.code == "tr_timecon",
+                  orElse: () => StatusModel(code: "tr_timecon", value: 0))
+              .value as int;
+
+          deviceStatus.switch1 = statusList
+              .firstWhere((status) => status.code == "switch_1",
+                  orElse: () => StatusModel(code: "switch_1", value: false))
+              .value as bool;
+          secondSelected = deviceStatus.tr_timecon;
+          toggleDoor = deviceStatus.switch1;
+          add(UpdateStateEvent());
+        }
+      });
+    } catch (_) {}
+  }
+
+  Future<void> _updateState(
+      UpdateStateEvent event, Emitter<GarageDoorSensorState> emit) async {
+    emit(GarageDoorLoadingState());
+    emit(UpdateState(garageSensor: deviceStatus));
+  }
+
+  @override
+  Future<void> close() async {
+    _streamSubscription?.cancel();
+    _streamSubscription = null;
+    return super.close();
+  }
 
   List<Map<String, String>> days = [
     {"day": "Sun", "key": "Sun"},

lib/features/devices/bloc/garage_door_bloc/garage_door_event.dart

@@ -109,6 +109,8 @@ class GetScheduleEvent extends GarageDoorEvent {}
 
 class ScheduleSaveapp extends GarageDoorEvent {}
 
+class UpdateStateEvent extends GarageDoorEvent {}
+
 class ToggleScheduleEvent extends GarageDoorEvent {
   final String id;
   final bool toggle;

lib/features/devices/bloc/one_gang_bloc/one_gang_bloc.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'package:dio/dio.dart';
+import 'package:firebase_database/firebase_database.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
 import 'package:syncrow_app/features/devices/bloc/one_gang_bloc/one_gang_state.dart';
@@ -60,48 +61,46 @@ class OneGangBloc extends Bloc<OneGangEvent, OneGangState> {
       }
       deviceStatus = OneGangModel.fromJson(statusModelList);
       emit(UpdateState(oneGangModel: deviceStatus));
-      // _listenToChanges();
+      _listenToChanges(oneGangId);
     } catch (e) {
       emit(FailedState(error: e.toString()));
       return;
     }
   }
+
   // Real-time db
-  // StreamSubscription<DatabaseEvent>? _streamSubscription;
-  // void _listenToChanges() {
-  //   try {
-  //     _streamSubscription?.cancel();
-  //     DatabaseReference ref =
-  //         FirebaseDatabase.instance.ref('device-status/$oneGangId');
-  //     Stream<DatabaseEvent> stream = ref.onValue;
+  StreamSubscription<DatabaseEvent>? _streamSubscription;
+  void _listenToChanges(String id) {
+    try {
+      _streamSubscription?.cancel();
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$id'); 
+      Stream<DatabaseEvent> stream = ref.onValue;
 
-  //     _streamSubscription = stream.listen((DatabaseEvent event) async {
-  //       if (_timer != null) {
-  //         await Future.delayed(const Duration(seconds: 2));
-  //       }
-  //       Map<dynamic, dynamic> usersMap =
-  //           event.snapshot.value as Map<dynamic, dynamic>;
-  //       List<StatusModel> statusList = [];
-  //       usersMap['status'].forEach((element) {
-  //         statusList
-  //             .add(StatusModel(code: element['code'], value: element['value']));
-  //       });
-  //       deviceStatus = OneGangModel.fromJson(statusList);
-  //       if (!isClosed) {
-  //         add(OneGangUpdated());
-  //       }
-  //     });
-  //   } catch (_) {}
-  // }
+      _streamSubscription = stream.listen((DatabaseEvent event) {
+        Map<dynamic, dynamic> usersMap =
+            event.snapshot.value as Map<dynamic, dynamic>;
+        List<StatusModel> statusList = [];
 
-  // @override
-  // Future<void> close() async {
-  //   _streamSubscription?.cancel();
-  //   _streamSubscription = null;
-  //   return super.close();
-  // }
+        usersMap['status'].forEach((element) {
+          statusList
+              .add(StatusModel(code: element['code'], value: element['value']));
+        });
+        deviceStatus = OneGangModel.fromJson(statusList);
+        add(OneGangUpdated());
+      });
+    } catch (_) {}
+  }
+
+  @override
+  Future<void> close() async {
+    _streamSubscription?.cancel();
+    _streamSubscription = null;
+    return super.close();
+  }
 
   _oneGangUpdated(OneGangUpdated event, Emitter<OneGangState> emit) {
+    emit(LoadingInitialState());
     emit(UpdateState(oneGangModel: deviceStatus));
   }
 

lib/features/devices/bloc/one_touch_bloc/one_touch_bloc.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'package:dio/dio.dart';
+import 'package:firebase_database/firebase_database.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
@@ -63,39 +64,54 @@ class OneTouchBloc extends Bloc<OneTouchEvent, OneTouchState> {
         statusModelList.add(StatusModel.fromJson(status));
       }
       deviceStatus = OneTouchModel.fromJson(statusModelList);
+      _listenToChanges(oneTouchId);
+
       emit(UpdateState(oneTouchModel: deviceStatus));
-      //  _listenToChanges();
     } catch (e) {
       emit(FailedState(error: e.toString()));
       return;
     }
   }
-  // Real-time db
-  // _listenToChanges() {
-  //   try {
-  //     DatabaseReference ref = FirebaseDatabase.instance.ref('device-status/$oneTouchId');
-  //     Stream<DatabaseEvent> stream = ref.onValue;
 
-  //     stream.listen((DatabaseEvent event) async {
-  //       if (_timer != null) {
-  //         await Future.delayed(const Duration(seconds: 2));
-  //       }
-  //       Map<dynamic, dynamic> usersMap = event.snapshot.value as Map<dynamic, dynamic>;
-  //       List<StatusModel> statusList = [];
+  StreamSubscription<DatabaseEvent>? _streamSubscription;
+  void _listenToChanges(String id) {
+    try {
+      _streamSubscription?.cancel();
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$id');
+      Stream<DatabaseEvent> stream = ref.onValue;
 
-  //       usersMap['status'].forEach((element) {
-  //         statusList.add(StatusModel(code: element['code'], value: element['value']));
-  //       });
+      _streamSubscription = stream.listen((DatabaseEvent event) {
+        if (event.snapshot.value != null) {
+          Map<dynamic, dynamic> usersMap =
+              event.snapshot.value as Map<dynamic, dynamic>;
+          List<StatusModel> statusList = [];
 
-  //       deviceStatus = OneTouchModel.fromJson(statusList);
-  //       if (!isClosed) {
-  //         add(OneTouchUpdated());
-  //       }
-  //     });
-  //   } catch (_) {}
-  // }
+          usersMap['status'].forEach((element) {
+            statusList.add(
+                StatusModel(code: element['code'], value: element['value']));
+          });
+          var switchStatus = statusList.firstWhere(
+              (status) => status.code == "switch_1",
+              orElse: () => StatusModel(code: "switch_1", value: false));
+
+          deviceStatus.firstSwitch = switchStatus.value as bool;
+          add(OneTouchUpdated());
+        }
+      });
+    } catch (_) {
+    }
+  }
+
+  @override
+  Future<void> close() async {
+    _streamSubscription?.cancel();
+    _streamSubscription = null;
+    return super.close();
+  }
 
   _oneTouchUpdated(OneTouchUpdated event, Emitter<OneTouchState> emit) {
+    emit(LoadingNewSate(oneTouchModel: deviceStatus));
     emit(UpdateState(oneTouchModel: deviceStatus));
   }
 

lib/features/devices/bloc/three_touch_bloc/three_touch_bloc.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'package:dio/dio.dart';
+import 'package:firebase_database/firebase_database.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
 import 'package:syncrow_app/features/devices/bloc/three_touch_bloc/three_touch_event.dart';
@@ -37,7 +38,8 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
   List<GroupThreeTouchModel> groupThreeTouchList = [];
   bool allSwitchesOn = true;
 
-  ThreeTouchBloc({required this.threeTouchId, required this.switchCode}) : super(InitialState()) {
+  ThreeTouchBloc({required this.threeTouchId, required this.switchCode})
+      : super(InitialState()) {
     on<InitialEvent>(_fetchThreeTouchStatus);
     on<ThreeTouchUpdated>(_threeTouchUpdated);
     on<ChangeFirstSwitchStatusEvent>(_changeFirstSwitch);
@@ -62,7 +64,8 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
     on<ChangeStatusEvent>(_changeStatus);
   }
 
-  void _fetchThreeTouchStatus(InitialEvent event, Emitter<ThreeTouchState> emit) async {
+  void _fetchThreeTouchStatus(
+      InitialEvent event, Emitter<ThreeTouchState> emit) async {
     emit(LoadingInitialState());
     try {
       threeTouchGroup = event.groupScreen;
@@ -74,7 +77,8 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
             HomeCubit.getInstance().selectedSpace?.id ?? '', '3GT');
 
         for (int i = 0; i < devicesList.length; i++) {
-          var response = await DevicesAPI.getDeviceStatus(devicesList[i].uuid ?? '');
+          var response =
+              await DevicesAPI.getDeviceStatus(devicesList[i].uuid ?? '');
           List<StatusModel> statusModelList = [];
           for (var status in response['status']) {
             statusModelList.add(StatusModel.fromJson(status));
@@ -91,13 +95,16 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
 
         if (groupThreeTouchList.isNotEmpty) {
           groupThreeTouchList.firstWhere((element) {
-            if (!element.firstSwitch || !element.secondSwitch || !element.thirdSwitch) {
+            if (!element.firstSwitch ||
+                !element.secondSwitch ||
+                !element.thirdSwitch) {
               allSwitchesOn = false;
             }
             return true;
           });
         }
-        emit(UpdateGroupState(threeTouchList: groupThreeTouchList, allSwitches: allSwitchesOn));
+        emit(UpdateGroupState(
+            threeTouchList: groupThreeTouchList, allSwitches: allSwitchesOn));
       } else {
         var response = await DevicesAPI.getDeviceStatus(threeTouchId);
         List<StatusModel> statusModelList = [];
@@ -106,7 +113,7 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
         }
         deviceStatus = ThreeTouchModel.fromJson(statusModelList);
         emit(UpdateState(threeTouchModel: deviceStatus));
-      //  _listenToChanges();
+        _listenToChanges();
       }
     } catch (e) {
       emit(FailedState(error: e.toString()));
@@ -114,35 +121,39 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
     }
   }
 
-  // _listenToChanges() {
-  //   try {
-  //     DatabaseReference ref = FirebaseDatabase.instance.ref('device-status/$threeTouchId');
-  //     Stream<DatabaseEvent> stream = ref.onValue;
+  _listenToChanges() {
+    try {
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$threeTouchId');
+      Stream<DatabaseEvent> stream = ref.onValue;
 
-  //     stream.listen((DatabaseEvent event) async {
-  //       if (_timer != null) {
-  //         await Future.delayed(const Duration(seconds: 2));
-  //       }
-  //       Map<dynamic, dynamic> usersMap = event.snapshot.value as Map<dynamic, dynamic>;
-  //       List<StatusModel> statusList = [];
+      stream.listen((DatabaseEvent event) async {
+        if (_timer != null) {
+          await Future.delayed(const Duration(seconds: 2));
+        }
+        Map<dynamic, dynamic> usersMap =
+            event.snapshot.value as Map<dynamic, dynamic>;
+        List<StatusModel> statusList = [];
 
-  //       usersMap['status'].forEach((element) {
-  //         statusList.add(StatusModel(code: element['code'], value: element['value']));
-  //       });
+        usersMap['status'].forEach((element) {
+          statusList
+              .add(StatusModel(code: element['code'], value: element['value']));
+        });
 
-  //       deviceStatus = ThreeTouchModel.fromJson(statusList);
-  //       if (!isClosed) {
-  //         add(ThreeTouchUpdated());
-  //       }
-  //     });
-  //   } catch (_) {}
-  // }
+        deviceStatus = ThreeTouchModel.fromJson(statusList);
+        if (!isClosed) {
+          add(ThreeTouchUpdated());
+        }
+      });
+    } catch (_) {}
+  }
 
   _threeTouchUpdated(ThreeTouchUpdated event, Emitter<ThreeTouchState> emit) {
     emit(UpdateState(threeTouchModel: deviceStatus));
   }
 
-  void _changeFirstSwitch(ChangeFirstSwitchStatusEvent event, Emitter<ThreeTouchState> emit) async {
+  void _changeFirstSwitch(
+      ChangeFirstSwitchStatusEvent event, Emitter<ThreeTouchState> emit) async {
     emit(LoadingNewSate(threeTouchModel: deviceStatus));
     try {
       if (threeTouchGroup) {
@@ -151,11 +162,15 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
           if (element.deviceId == event.deviceId) {
             element.firstSwitch = !event.value;
           }
-          if (!element.firstSwitch || !element.secondSwitch || !element.thirdSwitch) {
+          if (!element.firstSwitch ||
+              !element.secondSwitch ||
+              !element.thirdSwitch) {
             allSwitchesValue = false;
           }
         });
-        emit(UpdateGroupState(threeTouchList: groupThreeTouchList, allSwitches: allSwitchesValue));
+        emit(UpdateGroupState(
+            threeTouchList: groupThreeTouchList,
+            allSwitches: allSwitchesValue));
       } else {
         deviceStatus.firstSwitch = !event.value;
         emit(UpdateState(threeTouchModel: deviceStatus));
@@ -182,8 +197,8 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
     }
   }
 
-  void _changeSecondSwitch(
-      ChangeSecondSwitchStatusEvent event, Emitter<ThreeTouchState> emit) async {
+  void _changeSecondSwitch(ChangeSecondSwitchStatusEvent event,
+      Emitter<ThreeTouchState> emit) async {
     emit(LoadingNewSate(threeTouchModel: deviceStatus));
     try {
       if (threeTouchGroup) {
@@ -192,11 +207,15 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
           if (element.deviceId == event.deviceId) {
             element.secondSwitch = !event.value;
           }
-          if (!element.firstSwitch || !element.secondSwitch || !element.thirdSwitch) {
+          if (!element.firstSwitch ||
+              !element.secondSwitch ||
+              !element.thirdSwitch) {
             allSwitchesValue = false;
           }
         });
-        emit(UpdateGroupState(threeTouchList: groupThreeTouchList, allSwitches: allSwitchesValue));
+        emit(UpdateGroupState(
+            threeTouchList: groupThreeTouchList,
+            allSwitches: allSwitchesValue));
       } else {
         deviceStatus.secondSwitch = !event.value;
         emit(UpdateState(threeTouchModel: deviceStatus));
@@ -222,7 +241,8 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
     }
   }
 
-  void _changeThirdSwitch(ChangeThirdSwitchStatusEvent event, Emitter<ThreeTouchState> emit) async {
+  void _changeThirdSwitch(
+      ChangeThirdSwitchStatusEvent event, Emitter<ThreeTouchState> emit) async {
     emit(LoadingNewSate(threeTouchModel: deviceStatus));
     try {
       if (threeTouchGroup) {
@@ -231,11 +251,15 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
           if (element.deviceId == event.deviceId) {
             element.thirdSwitch = !event.value;
           }
-          if (!element.firstSwitch || !element.secondSwitch || !element.thirdSwitch) {
+          if (!element.firstSwitch ||
+              !element.secondSwitch ||
+              !element.thirdSwitch) {
             allSwitchesValue = false;
           }
         });
-        emit(UpdateGroupState(threeTouchList: groupThreeTouchList, allSwitches: allSwitchesValue));
+        emit(UpdateGroupState(
+            threeTouchList: groupThreeTouchList,
+            allSwitches: allSwitchesValue));
       } else {
         deviceStatus.thirdSwitch = !event.value;
         emit(UpdateState(threeTouchModel: deviceStatus));
@@ -274,15 +298,21 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
       final response = await Future.wait([
         DevicesAPI.controlDevice(
             DeviceControlModel(
-                deviceId: threeTouchId, code: 'switch_1', value: deviceStatus.firstSwitch),
+                deviceId: threeTouchId,
+                code: 'switch_1',
+                value: deviceStatus.firstSwitch),
             threeTouchId),
         DevicesAPI.controlDevice(
             DeviceControlModel(
-                deviceId: threeTouchId, code: 'switch_2', value: deviceStatus.secondSwitch),
+                deviceId: threeTouchId,
+                code: 'switch_2',
+                value: deviceStatus.secondSwitch),
             threeTouchId),
         DevicesAPI.controlDevice(
             DeviceControlModel(
-                deviceId: threeTouchId, code: 'switch_3', value: deviceStatus.thirdSwitch),
+                deviceId: threeTouchId,
+                code: 'switch_3',
+                value: deviceStatus.thirdSwitch),
             threeTouchId),
       ]);
 
@@ -308,15 +338,21 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
       final response = await Future.wait([
         DevicesAPI.controlDevice(
             DeviceControlModel(
-                deviceId: threeTouchId, code: 'switch_1', value: deviceStatus.firstSwitch),
+                deviceId: threeTouchId,
+                code: 'switch_1',
+                value: deviceStatus.firstSwitch),
             threeTouchId),
         DevicesAPI.controlDevice(
             DeviceControlModel(
-                deviceId: threeTouchId, code: 'switch_2', value: deviceStatus.secondSwitch),
+                deviceId: threeTouchId,
+                code: 'switch_2',
+                value: deviceStatus.secondSwitch),
             threeTouchId),
         DevicesAPI.controlDevice(
             DeviceControlModel(
-                deviceId: threeTouchId, code: 'switch_3', value: deviceStatus.thirdSwitch),
+                deviceId: threeTouchId,
+                code: 'switch_3',
+                value: deviceStatus.thirdSwitch),
             threeTouchId),
       ]);
 
@@ -338,8 +374,10 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
         groupThreeTouchList[i].secondSwitch = true;
         groupThreeTouchList[i].thirdSwitch = true;
       }
-      emit(UpdateGroupState(threeTouchList: groupThreeTouchList, allSwitches: true));
-      List<String> allDeviceIds = groupThreeTouchList.map((device) => device.deviceId).toList();
+      emit(UpdateGroupState(
+          threeTouchList: groupThreeTouchList, allSwitches: true));
+      List<String> allDeviceIds =
+          groupThreeTouchList.map((device) => device.deviceId).toList();
       final response1 = await DevicesAPI.deviceBatchController(
         code: 'switch_1',
         devicesUuid: allDeviceIds,
@@ -368,7 +406,8 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
     }
   }
 
-  void _groupAllOff(GroupAllOffEvent event, Emitter<ThreeTouchState> emit) async {
+  void _groupAllOff(
+      GroupAllOffEvent event, Emitter<ThreeTouchState> emit) async {
     emit(LoadingNewSate(threeTouchModel: deviceStatus));
     try {
       for (int i = 0; i < groupThreeTouchList.length; i++) {
@@ -376,8 +415,10 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
         groupThreeTouchList[i].secondSwitch = false;
         groupThreeTouchList[i].thirdSwitch = false;
       }
-      List<String> allDeviceIds = groupThreeTouchList.map((device) => device.deviceId).toList();
-      emit(UpdateGroupState(threeTouchList: groupThreeTouchList, allSwitches: false));
+      List<String> allDeviceIds =
+          groupThreeTouchList.map((device) => device.deviceId).toList();
+      emit(UpdateGroupState(
+          threeTouchList: groupThreeTouchList, allSwitches: false));
       final response1 = await DevicesAPI.deviceBatchController(
         code: 'switch_1',
         devicesUuid: allDeviceIds,
@@ -406,17 +447,20 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
     }
   }
 
-  void _changeSliding(ChangeSlidingSegment event, Emitter<ThreeTouchState> emit) async {
+  void _changeSliding(
+      ChangeSlidingSegment event, Emitter<ThreeTouchState> emit) async {
     emit(ChangeSlidingSegmentState(value: event.value));
   }
 
-  void _setCounterValue(SetCounterValue event, Emitter<ThreeTouchState> emit) async {
+  void _setCounterValue(
+      SetCounterValue event, Emitter<ThreeTouchState> emit) async {
     emit(LoadingNewSate(threeTouchModel: deviceStatus));
     int seconds = 0;
     try {
       seconds = event.duration.inSeconds;
       final response = await DevicesAPI.controlDevice(
-          DeviceControlModel(deviceId: threeTouchId, code: event.deviceCode, value: seconds),
+          DeviceControlModel(
+              deviceId: threeTouchId, code: event.deviceCode, value: seconds),
           threeTouchId);
 
       if (response['success'] ?? false) {
@@ -443,7 +487,8 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
     }
   }
 
-  void _getCounterValue(GetCounterEvent event, Emitter<ThreeTouchState> emit) async {
+  void _getCounterValue(
+      GetCounterEvent event, Emitter<ThreeTouchState> emit) async {
     emit(LoadingInitialState());
     try {
       var response = await DevicesAPI.getDeviceStatus(threeTouchId);
@@ -553,7 +598,8 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
         deviceId: threeTouchId,
       );
       List<dynamic> jsonData = response;
-      listSchedule = jsonData.map((item) => ScheduleModel.fromJson(item)).toList();
+      listSchedule =
+          jsonData.map((item) => ScheduleModel.fromJson(item)).toList();
       emit(InitialState());
     } on DioException catch (e) {
       final errorData = e.response!.data;
@@ -564,12 +610,13 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
 
   int? getTimeStampWithoutSeconds(DateTime? dateTime) {
     if (dateTime == null) return null;
-    DateTime dateTimeWithoutSeconds =
-        DateTime(dateTime.year, dateTime.month, dateTime.day, dateTime.hour, dateTime.minute);
+    DateTime dateTimeWithoutSeconds = DateTime(dateTime.year, dateTime.month,
+        dateTime.day, dateTime.hour, dateTime.minute);
     return dateTimeWithoutSeconds.millisecondsSinceEpoch ~/ 1000;
   }
 
-  Future toggleChange(ToggleScheduleEvent event, Emitter<ThreeTouchState> emit) async {
+  Future toggleChange(
+      ToggleScheduleEvent event, Emitter<ThreeTouchState> emit) async {
     try {
       emit(LoadingInitialState());
       final response = await DevicesAPI.changeSchedule(
@@ -588,7 +635,8 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
     }
   }
 
-  Future deleteSchedule(DeleteScheduleEvent event, Emitter<ThreeTouchState> emit) async {
+  Future deleteSchedule(
+      DeleteScheduleEvent event, Emitter<ThreeTouchState> emit) async {
     try {
       emit(LoadingInitialState());
       final response = await DevicesAPI.deleteSchedule(
@@ -608,13 +656,15 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
     }
   }
 
-  void toggleSelectedIndex(ToggleSelectedEvent event, Emitter<ThreeTouchState> emit) {
+  void toggleSelectedIndex(
+      ToggleSelectedEvent event, Emitter<ThreeTouchState> emit) {
     emit(LoadingInitialState());
     selectedTabIndex = event.index;
     emit(ChangeSlidingSegmentState(value: selectedTabIndex));
   }
 
-  void toggleCreateSchedule(ToggleCreateScheduleEvent event, Emitter<ThreeTouchState> emit) {
+  void toggleCreateSchedule(
+      ToggleCreateScheduleEvent event, Emitter<ThreeTouchState> emit) {
     emit(LoadingInitialState());
     createSchedule = !createSchedule;
     selectedDays.clear();
@@ -632,7 +682,8 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
   String statusSelected = '';
   String optionSelected = '';
 
-  Future<void> _changeStatus(ChangeStatusEvent event, Emitter<ThreeTouchState> emit) async {
+  Future<void> _changeStatus(
+      ChangeStatusEvent event, Emitter<ThreeTouchState> emit) async {
     try {
       emit(LoadingInitialState());
       final Map<String, Map<String, String>> controlMap = {
@@ -666,11 +717,15 @@ class ThreeTouchBloc extends Bloc<ThreeTouchEvent, ThreeTouchState> {
       final selectedControl = controlMap[optionSelected]?[statusSelected];
       if (selectedControl != null) {
         await DevicesAPI.controlDevice(
-          DeviceControlModel(deviceId: threeTouchId, code: optionSelected, value: selectedControl),
+          DeviceControlModel(
+              deviceId: threeTouchId,
+              code: optionSelected,
+              value: selectedControl),
           threeTouchId,
         );
       } else {
-        emit(const FailedState(error: 'Invalid statusSelected or optionSelected'));
+        emit(const FailedState(
+            error: 'Invalid statusSelected or optionSelected'));
       }
     } on DioException catch (e) {
       final errorData = e.response!.data;

lib/features/devices/bloc/two_gang_bloc/two_gang_bloc.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'package:dio/dio.dart';
+import 'package:firebase_database/firebase_database.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
 import 'package:syncrow_app/features/devices/bloc/two_gang_bloc/two_gang_event.dart';
@@ -34,7 +35,8 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
   bool createSchedule = false;
   List<ScheduleModel> listSchedule = [];
 
-  TwoGangBloc({required this.twoGangId, required this.switchCode}) : super(InitialState()) {
+  TwoGangBloc({required this.twoGangId, required this.switchCode})
+      : super(InitialState()) {
     on<InitialEvent>(_fetchTwoGangStatus);
     on<TwoGangUpdated>(_twoGangUpdated);
     on<ChangeFirstSwitchStatusEvent>(_changeFirstSwitch);
@@ -64,13 +66,15 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
 
   int selectedTabIndex = 0;
 
-  void toggleSelectedIndex(ToggleSelectedEvent event, Emitter<TwoGangState> emit) {
+  void toggleSelectedIndex(
+      ToggleSelectedEvent event, Emitter<TwoGangState> emit) {
     emit(LoadingInitialState());
     selectedTabIndex = event.index;
     emit(ChangeSlidingSegmentState(value: selectedTabIndex));
   }
 
-  void toggleCreateSchedule(ToggleCreateScheduleEvent event, Emitter<TwoGangState> emit) {
+  void toggleCreateSchedule(
+      ToggleCreateScheduleEvent event, Emitter<TwoGangState> emit) {
     emit(LoadingInitialState());
     createSchedule = !createSchedule;
     selectedDays.clear();
@@ -78,7 +82,8 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
     emit(UpdateCreateScheduleState(createSchedule));
   }
 
-  void _fetchTwoGangStatus(InitialEvent event, Emitter<TwoGangState> emit) async {
+  void _fetchTwoGangStatus(
+      InitialEvent event, Emitter<TwoGangState> emit) async {
     emit(LoadingInitialState());
     try {
       var response = await DevicesAPI.getDeviceStatus(twoGangId);
@@ -88,42 +93,50 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
       }
       deviceStatus = TwoGangModel.fromJson(statusModelList);
       emit(UpdateState(twoGangModel: deviceStatus));
-      // _listenToChanges();
+      _listenToChanges(twoGangId);
     } catch (e) {
       emit(FailedState(error: e.toString()));
       return;
     }
   }
 
-  // _listenToChanges() {
-  //   try {
-  //     DatabaseReference ref = FirebaseDatabase.instance.ref('device-status/$twoGangId');
-  //     Stream<DatabaseEvent> stream = ref.onValue;
+  StreamSubscription<DatabaseEvent>? _streamSubscription;
+  void _listenToChanges(String id) {
+    try {
+      _streamSubscription?.cancel();
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$id');
+      Stream<DatabaseEvent> stream = ref.onValue;
+      _streamSubscription = stream.listen((DatabaseEvent event) {
+        Map<dynamic, dynamic> usersMap =
+            event.snapshot.value as Map<dynamic, dynamic>;
+        List<StatusModel> statusList = [];
 
-  //     stream.listen((DatabaseEvent event) async {
-  //       if (_timer != null) {
-  //         await Future.delayed(const Duration(seconds: 2));
-  //       }
-  //       Map<dynamic, dynamic> usersMap = event.snapshot.value as Map<dynamic, dynamic>;
-  //       List<StatusModel> statusList = [];
+        usersMap['status'].forEach((element) {
+          statusList
+              .add(StatusModel(code: element['code'], value: element['value']));
+        });
+        deviceStatus = TwoGangModel.fromJson(statusList);
+        add(TwoGangUpdated());
+      });
+    } catch (_) {}
+  }
 
-  //       usersMap['status'].forEach((element) {
-  //         statusList.add(StatusModel(code: element['code'], value: element['value']));
-  //       });
-
-  //       deviceStatus = TwoGangModel.fromJson(statusList);
-  //       if (!isClosed) {
-  //         add(TwoGangUpdated());
-  //       }
-  //     });
-  //   } catch (_) {}
-  // }
+  @override
+  Future<void> close() async {
+    _streamSubscription?.cancel();
+    _streamSubscription = null;
+    return super.close();
+  }
 
   _twoGangUpdated(TwoGangUpdated event, Emitter<TwoGangState> emit) {
+    emit(LoadingNewSate(twoGangModel: deviceStatus));
+
     emit(UpdateState(twoGangModel: deviceStatus));
   }
 
-  void _changeFirstSwitch(ChangeFirstSwitchStatusEvent event, Emitter<TwoGangState> emit) async {
+  void _changeFirstSwitch(
+      ChangeFirstSwitchStatusEvent event, Emitter<TwoGangState> emit) async {
     emit(LoadingNewSate(twoGangModel: deviceStatus));
     try {
       deviceStatus.firstSwitch = !event.value;
@@ -134,7 +147,8 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
 
       _timer = Timer(const Duration(milliseconds: 100), () async {
         final response = await DevicesAPI.controlDevice(
-            DeviceControlModel(deviceId: twoGangId, code: 'switch_1', value: !event.value),
+            DeviceControlModel(
+                deviceId: twoGangId, code: 'switch_1', value: !event.value),
             twoGangId);
 
         if (!response['success']) {
@@ -146,7 +160,8 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
     }
   }
 
-  void _changeSecondSwitch(ChangeSecondSwitchStatusEvent event, Emitter<TwoGangState> emit) async {
+  void _changeSecondSwitch(
+      ChangeSecondSwitchStatusEvent event, Emitter<TwoGangState> emit) async {
     emit(LoadingNewSate(twoGangModel: deviceStatus));
     try {
       deviceStatus.secondSwitch = !event.value;
@@ -156,7 +171,8 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
       }
       _timer = Timer(const Duration(milliseconds: 100), () async {
         final response = await DevicesAPI.controlDevice(
-            DeviceControlModel(deviceId: twoGangId, code: 'switch_2', value: !event.value),
+            DeviceControlModel(
+                deviceId: twoGangId, code: 'switch_2', value: !event.value),
             twoGangId);
 
         if (!response['success']) {
@@ -179,11 +195,15 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
       final response = await Future.wait([
         DevicesAPI.controlDevice(
             DeviceControlModel(
-                deviceId: twoGangId, code: 'switch_1', value: deviceStatus.firstSwitch),
+                deviceId: twoGangId,
+                code: 'switch_1',
+                value: deviceStatus.firstSwitch),
             twoGangId),
         DevicesAPI.controlDevice(
             DeviceControlModel(
-                deviceId: twoGangId, code: 'switch_2', value: deviceStatus.secondSwitch),
+                deviceId: twoGangId,
+                code: 'switch_2',
+                value: deviceStatus.secondSwitch),
             twoGangId),
       ]);
 
@@ -206,11 +226,15 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
       final response = await Future.wait([
         DevicesAPI.controlDevice(
             DeviceControlModel(
-                deviceId: twoGangId, code: 'switch_1', value: deviceStatus.firstSwitch),
+                deviceId: twoGangId,
+                code: 'switch_1',
+                value: deviceStatus.firstSwitch),
             twoGangId),
         DevicesAPI.controlDevice(
             DeviceControlModel(
-                deviceId: twoGangId, code: 'switch_2', value: deviceStatus.secondSwitch),
+                deviceId: twoGangId,
+                code: 'switch_2',
+                value: deviceStatus.secondSwitch),
             twoGangId),
       ]);
       if (response.every((element) => !element['success'])) {
@@ -231,7 +255,8 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
         groupTwoGangList[i].secondSwitch = true;
       }
       emit(UpdateGroupState(twoGangList: groupTwoGangList, allSwitches: true));
-      List<String> allDeviceIds = groupTwoGangList.map((device) => device.deviceId).toList();
+      List<String> allDeviceIds =
+          groupTwoGangList.map((device) => device.deviceId).toList();
 
       final response1 = await DevicesAPI.deviceBatchController(
         code: 'switch_1',
@@ -266,7 +291,8 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
 
       emit(UpdateGroupState(twoGangList: groupTwoGangList, allSwitches: false));
 
-      List<String> allDeviceIds = groupTwoGangList.map((device) => device.deviceId).toList();
+      List<String> allDeviceIds =
+          groupTwoGangList.map((device) => device.deviceId).toList();
 
       final response1 = await DevicesAPI.deviceBatchController(
         code: 'switch_1',
@@ -291,17 +317,20 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
     }
   }
 
-  void _changeSliding(ChangeSlidingSegment event, Emitter<TwoGangState> emit) async {
+  void _changeSliding(
+      ChangeSlidingSegment event, Emitter<TwoGangState> emit) async {
     emit(ChangeSlidingSegmentState(value: event.value));
   }
 
-  void _setCounterValue(SetCounterValue event, Emitter<TwoGangState> emit) async {
+  void _setCounterValue(
+      SetCounterValue event, Emitter<TwoGangState> emit) async {
     emit(LoadingNewSate(twoGangModel: deviceStatus));
     int seconds = 0;
     try {
       seconds = event.duration.inSeconds;
       final response = await DevicesAPI.controlDevice(
-          DeviceControlModel(deviceId: twoGangId, code: event.deviceCode, value: seconds),
+          DeviceControlModel(
+              deviceId: twoGangId, code: event.deviceCode, value: seconds),
           twoGangId);
 
       if (response['success'] ?? false) {
@@ -326,7 +355,8 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
     }
   }
 
-  void _getCounterValue(GetCounterEvent event, Emitter<TwoGangState> emit) async {
+  void _getCounterValue(
+      GetCounterEvent event, Emitter<TwoGangState> emit) async {
     emit(LoadingInitialState());
     try {
       add(GetScheduleEvent());
@@ -434,7 +464,8 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
         deviceId: twoGangId,
       );
       List<dynamic> jsonData = response;
-      listSchedule = jsonData.map((item) => ScheduleModel.fromJson(item)).toList();
+      listSchedule =
+          jsonData.map((item) => ScheduleModel.fromJson(item)).toList();
       emit(InitialState());
     } on DioException catch (e) {
       final errorData = e.response!.data;
@@ -445,12 +476,13 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
 
   int? getTimeStampWithoutSeconds(DateTime? dateTime) {
     if (dateTime == null) return null;
-    DateTime dateTimeWithoutSeconds =
-        DateTime(dateTime.year, dateTime.month, dateTime.day, dateTime.hour, dateTime.minute);
+    DateTime dateTimeWithoutSeconds = DateTime(dateTime.year, dateTime.month,
+        dateTime.day, dateTime.hour, dateTime.minute);
     return dateTimeWithoutSeconds.millisecondsSinceEpoch ~/ 1000;
   }
 
-  Future toggleRepeat(ToggleScheduleEvent event, Emitter<TwoGangState> emit) async {
+  Future toggleRepeat(
+      ToggleScheduleEvent event, Emitter<TwoGangState> emit) async {
     try {
       emit(LoadingInitialState());
       final response = await DevicesAPI.changeSchedule(
@@ -469,7 +501,8 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
     }
   }
 
-  Future deleteSchedule(DeleteScheduleEvent event, Emitter<TwoGangState> emit) async {
+  Future deleteSchedule(
+      DeleteScheduleEvent event, Emitter<TwoGangState> emit) async {
     try {
       emit(LoadingInitialState());
       final response = await DevicesAPI.deleteSchedule(
@@ -489,7 +522,8 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
     }
   }
 
-  void _fetchTwoGangWizardStatus(InitialWizardEvent event, Emitter<TwoGangState> emit) async {
+  void _fetchTwoGangWizardStatus(
+      InitialWizardEvent event, Emitter<TwoGangState> emit) async {
     emit(LoadingInitialState());
     try {
       devicesList = [];
@@ -499,7 +533,8 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
           HomeCubit.getInstance().selectedSpace?.id ?? '', '2G');
 
       for (int i = 0; i < devicesList.length; i++) {
-        var response = await DevicesAPI.getDeviceStatus(devicesList[i].uuid ?? '');
+        var response =
+            await DevicesAPI.getDeviceStatus(devicesList[i].uuid ?? '');
         List<StatusModel> statusModelList = [];
         for (var status in response['status']) {
           statusModelList.add(StatusModel.fromJson(status));
@@ -522,15 +557,16 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
           return true;
         });
       }
-      emit(UpdateGroupState(twoGangList: groupTwoGangList, allSwitches: allSwitchesOn));
+      emit(UpdateGroupState(
+          twoGangList: groupTwoGangList, allSwitches: allSwitchesOn));
     } catch (e) {
       emit(FailedState(error: e.toString()));
       return;
     }
   }
 
-  void _changeFirstWizardSwitch(
-      ChangeFirstWizardSwitchStatusEvent event, Emitter<TwoGangState> emit) async {
+  void _changeFirstWizardSwitch(ChangeFirstWizardSwitchStatusEvent event,
+      Emitter<TwoGangState> emit) async {
     emit(LoadingNewSate(twoGangModel: deviceStatus));
     try {
       bool allSwitchesValue = true;
@@ -543,9 +579,11 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
         }
       });
 
-      emit(UpdateGroupState(twoGangList: groupTwoGangList, allSwitches: allSwitchesValue));
+      emit(UpdateGroupState(
+          twoGangList: groupTwoGangList, allSwitches: allSwitchesValue));
 
-      List<String> allDeviceIds = groupTwoGangList.map((device) => device.deviceId).toList();
+      List<String> allDeviceIds =
+          groupTwoGangList.map((device) => device.deviceId).toList();
       final response = await DevicesAPI.deviceBatchController(
         code: 'switch_1',
         devicesUuid: allDeviceIds,
@@ -560,8 +598,8 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
     }
   }
 
-  void _changeSecondWizardSwitch(
-      ChangeSecondWizardSwitchStatusEvent event, Emitter<TwoGangState> emit) async {
+  void _changeSecondWizardSwitch(ChangeSecondWizardSwitchStatusEvent event,
+      Emitter<TwoGangState> emit) async {
     emit(LoadingNewSate(twoGangModel: deviceStatus));
     try {
       bool allSwitchesValue = true;
@@ -573,9 +611,11 @@ class TwoGangBloc extends Bloc<TwoGangEvent, TwoGangState> {
           allSwitchesValue = false;
         }
       });
-      List<String> allDeviceIds = groupTwoGangList.map((device) => device.deviceId).toList();
+      List<String> allDeviceIds =
+          groupTwoGangList.map((device) => device.deviceId).toList();
 
-      emit(UpdateGroupState(twoGangList: groupTwoGangList, allSwitches: allSwitchesValue));
+      emit(UpdateGroupState(
+          twoGangList: groupTwoGangList, allSwitches: allSwitchesValue));
 
       final response = await DevicesAPI.deviceBatchController(
         code: 'switch_2',

lib/features/devices/bloc/two_touch_bloc/two_touch_bloc.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'package:dio/dio.dart';
+import 'package:firebase_database/firebase_database.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
 import 'package:syncrow_app/features/devices/bloc/two_touch_bloc/two_touch_event.dart';
@@ -98,52 +99,61 @@ class TwoTouchBloc extends Bloc<TwoTouchEvent, TwoTouchState> {
       }
       deviceStatus = TwoTouchModel.fromJson(statusModelList);
       emit(UpdateState(twoTouchModel: deviceStatus));
-      // _listenToChanges();
+      _listenToChanges();
     } catch (e) {
       emit(FailedState(error: e.toString()));
       return;
     }
   }
 
-  // StreamSubscription<DatabaseEvent>? _streamSubscription;
+  StreamSubscription<DatabaseEvent>? _streamSubscription;
 
-  // void _listenToChanges() {
-  //   try {
-  //     _streamSubscription?.cancel();
-  //     DatabaseReference ref =
-  //         FirebaseDatabase.instance.ref('device-status/$twoTouchId');
-  //     Stream<DatabaseEvent> stream = ref.onValue;
+  void _listenToChanges() {
+    try {
+      _streamSubscription?.cancel();
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$twoTouchId');
+      Stream<DatabaseEvent> stream = ref.onValue;
 
-  //     _streamSubscription = stream.listen((DatabaseEvent event) async {
-  //       if (_timer != null) {
-  //         await Future.delayed(const Duration(seconds: 2));
-  //       }
-  //       Map<dynamic, dynamic> usersMap =
-  //           event.snapshot.value as Map<dynamic, dynamic>;
-  //       List<StatusModel> statusList = [];
-  //       usersMap['status'].forEach((element) {
-  //         statusList
-  //             .add(StatusModel(code: element['code'], value: element['value']));
-  //       });
-  //       print('=========${usersMap['status']}');
-  //       deviceStatus = TwoTouchModel.fromJson(statusList);
-  //       if (!isClosed) {
-  //         add(TwoTouchUpdated());
-  //       }
-  //     });
-  //   } catch (_) {}
-  // }
+      _streamSubscription = stream.listen((DatabaseEvent event) async {
+        if (_timer != null) {
+          await Future.delayed(const Duration(seconds: 1));
+        }
+        if (event.snapshot.value != null) {
+          Map<dynamic, dynamic> usersMap =
+              event.snapshot.value as Map<dynamic, dynamic>;
+          List<StatusModel> statusList = [];
 
-  // @override
-  // Future<void> close() async {
-  //   _streamSubscription?.cancel();
-  //   _streamSubscription = null;
-  //   return super.close();
-  // }
+          usersMap['status'].forEach((element) {
+            statusList.add(
+                StatusModel(code: element['code'], value: element['value']));
+          });
+          var switch1Status = statusList.firstWhere(
+              (status) => status.code == "switch_1",
+              orElse: () => StatusModel(code: "switch_1", value: false));
 
+          var switch2Status = statusList.firstWhere(
+              (status) => status.code == "switch_2",
+              orElse: () => StatusModel(code: "switch_2", value: false));
+          deviceStatus.firstSwitch = switch1Status.value as bool;
+          deviceStatus.secondSwitch = switch2Status.value as bool;
 
+          add(TwoTouchUpdated());
+        }
+      });
+    } catch (_) {
+    }
+  }
+
+  @override
+  Future<void> close() async {
+    _streamSubscription?.cancel();
+    _streamSubscription = null;
+    return super.close();
+  }
 
   _twoTouchUpdated(TwoTouchUpdated event, Emitter<TwoTouchState> emit) {
+    emit(LoadingInitialState());
     emit(UpdateState(twoTouchModel: deviceStatus));
   }
 

lib/features/devices/bloc/water_heater_bloc/water_heater_bloc.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'package:dio/dio.dart';
+import 'package:firebase_database/firebase_database.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
@@ -73,7 +74,7 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
         statusModelList,
       );
       emit(UpdateState(whModel: deviceStatus));
-      // _listenToChanges();
+      _listenToChanges();
     } catch (e) {
       emit(WHFailedState(errorMessage: e.toString()));
       return;
@@ -81,41 +82,39 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
   }
 
   //real-time db
-  // StreamSubscription<DatabaseEvent>? _streamSubscription;
-  // void _listenToChanges() {
-  //   try {
-  //     _streamSubscription?.cancel();
-  //     DatabaseReference ref =
-  //         FirebaseDatabase.instance.ref('device-status/$whId');
-  //     Stream<DatabaseEvent> stream = ref.onValue;
-
-  //     _streamSubscription = stream.listen((DatabaseEvent event) async {
-  //       if (_timer != null) {
-  //         await Future.delayed(const Duration(seconds: 2));
-  //       }
-  //       Map<dynamic, dynamic> usersMap =
-  //           event.snapshot.value as Map<dynamic, dynamic>;
-  //       List<StatusModel> statusList = [];
-  //       usersMap['status'].forEach((element) {
-  //         statusList
-  //             .add(StatusModel(code: element['code'], value: element['value']));
-  //       });
-  //       deviceStatus = WHModel.fromJson(statusList);
-  //       if (!isClosed) {
-  //         add(WaterHeaterUpdated());
-  //       }
-  //     });
-  //   } catch (_) {}
-  // }
-
-  // @override
-  // Future<void> close() async {
-  //   _streamSubscription?.cancel();
-  //   _streamSubscription = null;
-  //   return super.close();
-  // }
+  StreamSubscription<DatabaseEvent>? _streamSubscription;
+  void _listenToChanges() {
+    try {
+      _streamSubscription?.cancel();
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$whId');
+      Stream<DatabaseEvent> stream = ref.onValue;
 
+      _streamSubscription = stream.listen((DatabaseEvent event) async {
+        if (_timer != null) {
+          await Future.delayed(const Duration(seconds: 2));
+        }
+        Map<dynamic, dynamic> usersMap =
+            event.snapshot.value as Map<dynamic, dynamic>;
+        List<StatusModel> statusList = [];
+        usersMap['status'].forEach((element) {
+          statusList
+              .add(StatusModel(code: element['code'], value: element['value']));
+        });
+        deviceStatus = WHModel.fromJson(statusList);
+        if (!isClosed) {
+          add(WaterHeaterUpdated());
+        }
+      });
+    } catch (_) {}
+  }
 
+  @override
+  Future<void> close() async {
+    _streamSubscription?.cancel();
+    _streamSubscription = null;
+    return super.close();
+  }
 
   _waterHeaterUpdated(
       WaterHeaterUpdated event, Emitter<WaterHeaterState> emit) async {

lib/features/devices/view/widgets/6_scene_switch/six_scene_screen.dart

@@ -1,6 +1,4 @@
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:syncrow_app/features/devices/bloc/6_scene_switch_bloc/6_scene_bloc.dart';
@@ -31,7 +29,7 @@ class SixSceneScreen extends StatelessWidget {
         ..add(const SexSceneSwitchInitial()),
       child: BlocBuilder<SixSceneBloc, SixSceneState>(
         builder: (context, state) {
-          final _bloc = BlocProvider.of<SixSceneBloc>(context);
+          final bloc = BlocProvider.of<SixSceneBloc>(context);
           SixSceneModel model = SixSceneModel(
             scene_1: '',
             scene_2: '',
@@ -48,7 +46,7 @@ class SixSceneScreen extends StatelessWidget {
             model = state.device;
           }
           return DefaultScaffold(
-            title: _bloc.deviceInfo.name,
+            title: device?.name ?? '6 Scene Switch',
             actions: [
               InkWell(
                 onTap: () async {
@@ -58,9 +56,9 @@ class SixSceneScreen extends StatelessWidget {
                     ),
                   );
                   if (val == null) {
-                    _bloc.add(const SixSceneInitialInfo());
-                    _bloc.add(const SixSceneInitial());
-                    _bloc.add(const SexSceneSwitchInitial());
+                    bloc.add(const SixSceneInitialInfo());
+                    bloc.add(const SixSceneInitial());
+                    bloc.add(const SexSceneSwitchInitial());
                   }
                 },
                 child: SvgPicture.asset(Assets.assetsIconsSettings),
@@ -77,7 +75,7 @@ class SixSceneScreen extends StatelessWidget {
                   )
                 : RefreshIndicator(
                     onRefresh: () async {
-                      _bloc.add(const SixSceneInitial());
+                      bloc.add(const SixSceneInitial());
                     },
                     child: ListView(
                       children: [
@@ -92,22 +90,22 @@ class SixSceneScreen extends StatelessWidget {
                                 switch4Title: model.scene_4,
                                 switch5Title: model.scene_5,
                                 switch6Title: model.scene_6,
-                                switch1Down: _bloc.deviceStatus.switch_backlight
+                                switch1Down: bloc.deviceStatus.switch_backlight
                                     ? Assets.switchOn
                                     : Assets.switchOff,
-                                switch1Up: _bloc.deviceStatus.switch_backlight
+                                switch1Up: bloc.deviceStatus.switch_backlight
                                     ? Assets.switchOn
                                     : Assets.switchOff,
-                                switch2Down: _bloc.deviceStatus.switch_backlight
+                                switch2Down: bloc.deviceStatus.switch_backlight
                                     ? Assets.switchOn
                                     : Assets.switchOff,
-                                switch2Up: _bloc.deviceStatus.switch_backlight
+                                switch2Up: bloc.deviceStatus.switch_backlight
                                     ? Assets.switchOn
                                     : Assets.switchOff,
-                                switch3Up: _bloc.deviceStatus.switch_backlight
+                                switch3Up: bloc.deviceStatus.switch_backlight
                                     ? Assets.switchOn
                                     : Assets.switchOff,
-                                switch3Down: _bloc.deviceStatus.switch_backlight
+                                switch3Down: bloc.deviceStatus.switch_backlight
                                     ? Assets.switchOn
                                     : Assets.switchOff,
                                 onSwitch3DownTap: () {
@@ -135,7 +133,7 @@ class SixSceneScreen extends StatelessWidget {
                                     Expanded(
                                       child: DefaultContainer(
                                         onTap: () {
-                                          _bloc.add(ChangeSwitchStatusEvent());
+                                          bloc.add(ChangeSwitchStatusEvent());
                                         },
                                         child: Column(
                                           crossAxisAlignment:
@@ -197,9 +195,9 @@ class SixSceneScreen extends StatelessWidget {
                                           );
                                           if (value == true) {
                                             Future.delayed(
-                                                const Duration(
-                                                    milliseconds: 200), () {
-                                              _bloc.add(
+                                                const Duration(milliseconds: 200),
+                                                () {
+                                              bloc.add(
                                                   const SexSceneSwitchInitial());
                                             });
                                           }

lib/features/devices/view/widgets/devices_view_body.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:smooth_page_indicator/smooth_page_indicator.dart';
-import 'package:syncrow_app/features/devices/bloc/devices_cubit.dart';
 import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
+import 'package:syncrow_app/features/devices/bloc/devices_cubit.dart';
 import 'package:syncrow_app/features/devices/view/widgets/all_devices.dart';
 import 'package:syncrow_app/features/devices/view/widgets/room_page.dart';
 import 'package:syncrow_app/features/devices/view/widgets/rooms_slider.dart';
@@ -15,7 +15,7 @@ import 'package:syncrow_app/utils/context_extension.dart';
 import 'package:syncrow_app/utils/resource_manager/strings_manager.dart';
 
 class DevicesViewBody extends StatelessWidget {
-  const DevicesViewBody({Key? key}) : super(key: key);
+  const DevicesViewBody({super.key});
   @override
   Widget build(BuildContext context) {
     return BlocBuilder<HomeCubit, HomeState>(
@@ -80,10 +80,7 @@ class DevicesViewBody extends StatelessWidget {
             ),
           ],
         ),
-        SizedBox(
-          height: MediaQuery.of(context).size.height * 0.1,
-          child: const SceneView(pageType: true),
-        ),
+        const SceneView(pageType: true),
         const SizedBox(height: 20),
         const RoomsSlider(),
         const SizedBox(height: 10),

lib/features/devices/view/widgets/door_sensor/door_sensor_screen.dart

@@ -22,14 +22,15 @@ class DoorSensorScreen extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return DefaultScaffold(
-      title: 'Door Sensor',
+      title: device?.name,
       child: BlocProvider(
         create: (context) =>
             DoorSensorBloc(DSId: device?.uuid ?? '')..add(const DoorSensorInitial()),
         child: BlocBuilder<DoorSensorBloc, DoorSensorState>(
           builder: (context, state) {
             final doorSensorBloc = BlocProvider.of<DoorSensorBloc>(context);
-            DoorSensorModel model = DoorSensorModel(batteryPercentage: 0, doorContactState: false);
+            DoorSensorModel model =
+                DoorSensorModel(batteryPercentage: 0, doorContactState: false);
             if (state is LoadingNewSate) {
               model = state.doorSensor;
             } else if (state is UpdateState) {
@@ -37,8 +38,8 @@ class DoorSensorScreen extends StatelessWidget {
             }
             return state is DoorSensorLoadingState
                 ? const Center(
-                    child:
-                        DefaultContainer(width: 50, height: 50, child: CircularProgressIndicator()),
+                    child: DefaultContainer(
+                        width: 50, height: 50, child: CircularProgressIndicator()),
                   )
                 : RefreshIndicator(
                     onRefresh: () async {
@@ -56,7 +57,8 @@ class DoorSensorScreen extends StatelessWidget {
                               Expanded(
                                 flex: 4,
                                 child: InkWell(
-                                  overlayColor: WidgetStateProperty.all(Colors.transparent),
+                                  overlayColor:
+                                      WidgetStateProperty.all(Colors.transparent),
                                   onTap: () {},
                                   child: Row(
                                     mainAxisAlignment: MainAxisAlignment.center,
@@ -107,17 +109,21 @@ class DoorSensorScreen extends StatelessWidget {
                                           Navigator.of(context).push(
                                             MaterialPageRoute(
                                                 builder: (context) =>
-                                                    DoorRecordsScreen(DSId: device!.uuid!)),
+                                                    DoorRecordsScreen(
+                                                        DSId: device!.uuid!)),
                                           );
                                         },
                                         child: Column(
-                                          crossAxisAlignment: CrossAxisAlignment.center,
-                                          mainAxisAlignment: MainAxisAlignment.center,
+                                          crossAxisAlignment:
+                                              CrossAxisAlignment.center,
+                                          mainAxisAlignment:
+                                              MainAxisAlignment.center,
                                           children: [
                                             ConstrainedBox(
-                                              constraints:
-                                                  const BoxConstraints(maxHeight: 46, maxWidth: 50),
-                                              child: SvgPicture.asset(Assets.doorRecordsIcon),
+                                              constraints: const BoxConstraints(
+                                                  maxHeight: 46, maxWidth: 50),
+                                              child: SvgPicture.asset(
+                                                  Assets.doorRecordsIcon),
                                             ),
                                             const SizedBox(
                                               height: 15,
@@ -143,18 +149,21 @@ class DoorSensorScreen extends StatelessWidget {
                                         onTap: () {
                                           Navigator.of(context).push(
                                             MaterialPageRoute(
-                                                builder: (context) => NotificationSettingsPage()),
+                                                builder: (context) =>
+                                                    NotificationSettingsPage()),
                                           );
                                         },
                                         child: Column(
-                                          crossAxisAlignment: CrossAxisAlignment.center,
-                                          mainAxisAlignment: MainAxisAlignment.center,
+                                          crossAxisAlignment:
+                                              CrossAxisAlignment.center,
+                                          mainAxisAlignment:
+                                              MainAxisAlignment.center,
                                           children: [
                                             ConstrainedBox(
-                                              constraints:
-                                                  const BoxConstraints(maxHeight: 46, maxWidth: 50),
-                                              child:
-                                                  SvgPicture.asset(Assets.doorNotificationSetting),
+                                              constraints: const BoxConstraints(
+                                                  maxHeight: 46, maxWidth: 50),
+                                              child: SvgPicture.asset(
+                                                  Assets.doorNotificationSetting),
                                             ),
                                             const SizedBox(
                                               height: 15,

lib/features/devices/view/widgets/four_scene_switch/four_scene_screen.dart

@@ -47,7 +47,7 @@ class FourSceneScreen extends StatelessWidget {
           }
 
           return DefaultScaffold(
-            title: _bloc.deviceInfo.name,
+            title: device?.name ?? '4 Scene',
             actions: [
               InkWell(
                 onTap: () async {
@@ -165,7 +165,7 @@ class FourSceneScreen extends StatelessWidget {
                                                   Navigator.of(context).pop();
                                                 },
                                                 confirmTab:
-                                                    (switchSelected) async {
+                                                    (switchSelected)  {
                                                   Navigator.of(context).push(
                                                     MaterialPageRoute(
                                                       builder: (context) =>

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(
+                        off: 'Close',
+                        on: 'Open',
+                        switchValue: garageDoor.firstSwitch,
+                        action: () => BlocProvider.of<GarageDoorBloc>(context).add(
                           ChangeFirstWizardSwitchStatusEvent(
-                                  value: garageList[index].firstSwitch,
-                                  deviceId: garageList[index].deviceId));
-                        },
+                            value: garageDoor.firstSwitch,
+                            deviceId: garageDoor.deviceId,
+                          ),
+                        ),
                       ),
                     ],
                   );

lib/features/devices/view/widgets/gateway/gateway_view.dart

@@ -21,7 +21,8 @@ class GateWayView extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-        create: (context) => GatewayBloc()..add(GatewayInitial(gatewayId: gatewayObj.uuid ?? '')),
+        create: (context) =>
+            GatewayBloc()..add(GatewayInitial(gatewayId: gatewayObj.uuid ?? '')),
         child: BlocBuilder<GatewayBloc, GatewayState>(builder: (context, state) {
           List<DeviceModel> devicesList = [];
           if (state is UpdateGatewayState) {
@@ -37,7 +38,7 @@ class GateWayView extends StatelessWidget {
                   extendBodyBehindAppBar: true,
                   extendBody: true,
                   appBar: DeviceAppbar(
-                    deviceName: 'Gateway',
+                    deviceName: gatewayObj.name ?? 'Gateway',
                     deviceUuid: gatewayObj.uuid!,
                   ),
                   body: Container(
@@ -60,7 +61,7 @@ class GateWayView extends StatelessWidget {
                       },
                       child: ListView(
                         children: [
-                          Container(
+                          SizedBox(
                             height: MediaQuery.of(context).size.height,
                             child: SafeArea(
                               child: Column(
@@ -90,7 +91,8 @@ class GateWayView extends StatelessWidget {
                                       ),
                                     ]),
                                   ),
-                                  if (devicesList.isEmpty && state is UpdateGatewayState)
+                                  if (devicesList.isEmpty &&
+                                      state is UpdateGatewayState)
                                     Container(
                                       width: MediaQuery.sizeOf(context).width,
                                       alignment: AlignmentDirectional.center,
@@ -115,7 +117,8 @@ class GateWayView extends StatelessWidget {
                                               margin: const EdgeInsets.only(top: 20),
                                               height: 50,
                                               width: 50,
-                                              child: const RefreshProgressIndicator()),
+                                              child:
+                                                  const RefreshProgressIndicator()),
                                         )
                                       : Expanded(
                                           child: GridView.builder(
@@ -130,7 +133,8 @@ class GateWayView extends StatelessWidget {
                                             shrinkWrap: true,
                                             itemCount: devicesList.length,
                                             itemBuilder: (context, index) {
-                                              return RoomPageSwitch(device: devicesList[index]);
+                                              return RoomPageSwitch(
+                                                  device: devicesList[index]);
                                             },
                                           ),
                                         )

lib/features/devices/view/widgets/one_gang/one_gang_screen.dart

@@ -20,7 +20,8 @@ class OneGangScreen extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) => OneGangBloc(switchCode: 'switch_1', oneGangId: device?.uuid ?? '')
+      create: (context) =>
+          OneGangBloc(switchCode: 'switch_1', oneGangId: device?.uuid ?? '')
             ..add(const InitialEvent(groupScreen: false)),
       child: BlocBuilder<OneGangBloc, OneGangState>(
         builder: (context, state) {
@@ -36,13 +37,15 @@ class OneGangScreen extends StatelessWidget {
           }
           return state is LoadingInitialState
               ? const Center(
-                  child:
-                      DefaultContainer(width: 50, height: 50, child: CircularProgressIndicator()),
+                  child: DefaultContainer(
+                      width: 50,
+                      height: 50,
+                      child: CircularProgressIndicator()),
                 )
               : RefreshIndicator(
                   onRefresh: () async {
-                    BlocProvider.of<OneGangBloc>(context)
-                        .add(InitialEvent(groupScreen: device != null ? false : true));
+                    BlocProvider.of<OneGangBloc>(context).add(InitialEvent(
+                        groupScreen: device != null ? false : true));
                   },
                   child: ListView(
                     children: [
@@ -55,7 +58,8 @@ class OneGangScreen extends StatelessWidget {
                             const Expanded(child: SizedBox.shrink()),
                             Expanded(
                               child: Row(
-                                mainAxisAlignment: MainAxisAlignment.spaceAround,
+                                mainAxisAlignment:
+                                    MainAxisAlignment.spaceAround,
                                 crossAxisAlignment: CrossAxisAlignment.center,
                                 children: [
                                   Column(
@@ -64,9 +68,10 @@ class OneGangScreen extends StatelessWidget {
                                         threeGangSwitch: device!,
                                         value: oneGangModel.firstSwitch,
                                         action: () {
-                                          BlocProvider.of<OneGangBloc>(context).add(
-                                              ChangeFirstSwitchStatusEvent(
-                                                  value: oneGangModel.firstSwitch));
+                                          BlocProvider.of<OneGangBloc>(context)
+                                              .add(ChangeFirstSwitchStatusEvent(
+                                                  value: oneGangModel
+                                                      .firstSwitch));
                                         },
                                       ),
                                       const SizedBox(height: 20),
@@ -74,7 +79,8 @@ class OneGangScreen extends StatelessWidget {
                                         width: 70,
                                         child: BodySmall(
                                           text: " Entrance Light",
-                                          fontColor: ColorsManager.textPrimaryColor,
+                                          fontColor:
+                                              ColorsManager.textPrimaryColor,
                                           textAlign: TextAlign.center,
                                         ),
                                       ),
@@ -94,19 +100,23 @@ class OneGangScreen extends StatelessWidget {
                                       Card(
                                         elevation: 3,
                                         shape: RoundedRectangleBorder(
-                                          borderRadius: BorderRadius.circular(100),
+                                          borderRadius:
+                                              BorderRadius.circular(100),
                                         ),
                                         child: GestureDetector(
                                           onTap: () {
                                             Navigator.push(
                                                 context,
                                                 PageRouteBuilder(
-                                                    pageBuilder:
-                                                        (context, animation1, animation2) =>
+                                                    pageBuilder: (context,
+                                                            animation1,
+                                                            animation2) =>
                                                         TimerScheduleScreen(
-                                                              switchCode: 'switch_1',
+                                                          switchCode:
+                                                              'switch_1',
                                                           device: device!,
-                                                              deviceCode: 'countdown_1',
+                                                          deviceCode:
+                                                              'countdown_1',
                                                         )));
                                           },
                                           child: Stack(
@@ -117,7 +127,9 @@ class OneGangScreen extends StatelessWidget {
                                                 height: 60,
                                                 decoration: BoxDecoration(
                                                   color: Colors.grey[300],
-                                                  borderRadius: BorderRadius.circular(100),
+                                                  borderRadius:
+                                                      BorderRadius.circular(
+                                                          100),
                                                 ),
                                               ),
                                               Container(
@@ -125,12 +137,15 @@ class OneGangScreen extends StatelessWidget {
                                                 height: 40,
                                                 decoration: BoxDecoration(
                                                   color: Colors.white,
-                                                  borderRadius: BorderRadius.circular(100),
+                                                  borderRadius:
+                                                      BorderRadius.circular(
+                                                          100),
                                                 ),
                                                 child: Center(
                                                   child: Icon(
                                                     Icons.access_time,
-                                                    color: ColorsManager.primaryColorWithOpacity,
+                                                    color: ColorsManager
+                                                        .primaryColorWithOpacity,
                                                     size: 25,
                                                   ),
                                                 ),

lib/features/devices/view/widgets/power_clamp/power_clamp_page.dart

@@ -51,7 +51,7 @@ class _PowerClampPageState extends State<PowerClampPage> {
   @override
   Widget build(BuildContext context) {
     return DefaultScaffold(
-      title: 'Power Clamp',
+      title: widget.device?.name ?? 'Power Clamp',
       child: BlocProvider(
         create: (context) => PowerClampBloc(PCId: widget.device?.uuid ?? '')
           ..add(const PowerClampInitial()),
@@ -153,41 +153,6 @@ class _PowerClampPageState extends State<PowerClampPage> {
     ];
   }
 
-  List<Widget> _buildPowerClampCards(PowerClampModel model,
-      List<EnergyData> chartData, PowerClampBloc blocProvider) {
-    return [
-      _buildPowerClampCard(
-        phaseType: '',
-        title: 'Total Energy \nConsumption',
-        phase: model.status.general,
-        isGeneral: true,
-        chartData: chartData,
-        blocProvider: blocProvider,
-      ),
-      _buildPowerClampCard(
-        phaseType: 'Phase A consumption',
-        title: 'Phase A Energy \nConsumption',
-        phase: model.status.phaseA,
-        chartData: chartData,
-        blocProvider: blocProvider,
-      ),
-      _buildPowerClampCard(
-        phaseType: 'Phase B consumption',
-        title: 'Phase B Energy \nConsumption',
-        phase: model.status.phaseB,
-        chartData: chartData,
-        blocProvider: blocProvider,
-      ),
-      _buildPowerClampCard(
-        phaseType: 'Phase C consumption',
-        title: 'Phase C Energy \nConsumption',
-        phase: model.status.phaseC,
-        chartData: chartData,
-        blocProvider: blocProvider,
-      ),
-    ];
-  }
-
   Widget _buildPowerClampCard({
     required String title,
     required String phaseType,
@@ -209,10 +174,8 @@ class _PowerClampPageState extends State<PowerClampPage> {
         blocProvider.add(SelectDateEvent(context: context));
       },
       totalActiveGeneral: isGeneral ? _getValueOrNA(phase.dataPoints, 2) : null,
-      totalCurrentGeneral:
-          isGeneral ? _getValueOrNA(phase.dataPoints, 1) : null,
-      totalFrequencyGeneral:
-          isGeneral ? _getValueOrNA(phase.dataPoints, 4) : null,
+      totalCurrentGeneral: isGeneral ? _getValueOrNA(phase.dataPoints, 1) : null,
+      totalFrequencyGeneral: isGeneral ? _getValueOrNA(phase.dataPoints, 4) : null,
       totalFactor: !isGeneral ? _getValueOrNA(phase.dataPoints, 3) : null,
       totalActive: !isGeneral ? _getValueOrNA(phase.dataPoints, 2) : null,
       totalCurrent: !isGeneral ? _getValueOrNA(phase.dataPoints, 1) : null,
@@ -223,9 +186,7 @@ class _PowerClampPageState extends State<PowerClampPage> {
   }
 
   String _getValueOrNA(List<DataPoint> dataPoints, int index) {
-    return dataPoints.length > index
-        ? dataPoints[index].value.toString()
-        : 'N/A';
+    return dataPoints.length > index ? dataPoints[index].value.toString() : 'N/A';
   }
 
   Widget _buildPageIndicator() {
@@ -240,8 +201,7 @@ class _PowerClampPageState extends State<PowerClampPage> {
             height: 10.0,
             width: _currentPage == index ? 10.0 : 10.0,
             decoration: BoxDecoration(
-              color:
-                  _currentPage == index ? Colors.grey : ColorsManager.greyColor,
+              color: _currentPage == index ? Colors.grey : ColorsManager.greyColor,
               borderRadius: BorderRadius.circular(5.0),
             ),
           );

lib/features/devices/view/widgets/room_page_switch.dart

@@ -10,6 +10,7 @@ import 'package:syncrow_app/features/devices/bloc/devices_cubit.dart';
 import 'package:syncrow_app/features/devices/model/device_model.dart';
 import 'package:syncrow_app/features/devices/view/widgets/6_scene_switch/six_scene_screen.dart';
 import 'package:syncrow_app/features/devices/view/widgets/ACs/acs_view.dart';
+import 'package:syncrow_app/features/devices/view/widgets/ceiling_sensor/ceiling_sensor_interface.dart';
 import 'package:syncrow_app/features/devices/view/widgets/curtains/curtain_view.dart';
 import 'package:syncrow_app/features/devices/view/widgets/door_sensor/door_sensor_screen.dart';
 import 'package:syncrow_app/features/devices/view/widgets/four_scene_switch/four_scene_screen.dart';
@@ -19,14 +20,13 @@ import 'package:syncrow_app/features/devices/view/widgets/lights/light_interface
 import 'package:syncrow_app/features/devices/view/widgets/one_gang/one_gang_Interface.dart';
 import 'package:syncrow_app/features/devices/view/widgets/one_touch/one_touch_screen.dart';
 import 'package:syncrow_app/features/devices/view/widgets/power_clamp/power_clamp_page.dart';
+import 'package:syncrow_app/features/devices/view/widgets/smart_door/door_interface.dart';
 import 'package:syncrow_app/features/devices/view/widgets/sos/sos_screen.dart';
+import 'package:syncrow_app/features/devices/view/widgets/three_gang/three_gang_interface.dart';
 import 'package:syncrow_app/features/devices/view/widgets/three_touch/three_touch_interface.dart';
 import 'package:syncrow_app/features/devices/view/widgets/two_gang/two_gang_Interface.dart';
 import 'package:syncrow_app/features/devices/view/widgets/two_touch/two_touch_Interface.dart';
 import 'package:syncrow_app/features/devices/view/widgets/wall_sensor/wall_sensor_interface.dart';
-import 'package:syncrow_app/features/devices/view/widgets/ceiling_sensor/ceiling_sensor_interface.dart';
-import 'package:syncrow_app/features/devices/view/widgets/smart_door/door_interface.dart';
-import 'package:syncrow_app/features/devices/view/widgets/three_gang/three_gang_interface.dart';
 import 'package:syncrow_app/features/devices/view/widgets/water_heater/water_heater_page.dart';
 import 'package:syncrow_app/features/devices/view/widgets/water_leak/water_leak_screen.dart';
 import 'package:syncrow_app/features/shared_widgets/custom_switch.dart';
@@ -73,36 +73,32 @@ class RoomPageSwitch extends StatelessWidget {
                     ? CustomSwitch(
                         device: device,
                       )
-                    : const SizedBox(),
+                    : const SizedBox.shrink(),
               ],
             ),
-            Flexible(
-              child: FittedBox(
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
             Text(
-                      device.name ?? "",
-                      overflow: TextOverflow.ellipsis,
-                      maxLines: 2,
+              device.name ?? '',
+              textScaler: TextScaler.linear(1),
               style: context.bodyLarge.copyWith(
                 fontWeight: FontWeight.bold,
-                        fontSize: 20,
                 color: Colors.grey,
+                fontSize: 14,
               ),
+              overflow: TextOverflow.ellipsis,
+              maxLines: 1,
             ),
-                    Text(
+            FittedBox(
+              fit: BoxFit.scaleDown,
+              child: Text(
                 device.subspace!.subspaceName ?? '',
                 overflow: TextOverflow.ellipsis,
+                textScaler: TextScaler.linear(1),
                 style: context.bodySmall.copyWith(
                   fontWeight: FontWeight.w400,
-                        fontSize: 10,
+                  fontSize: 9,
                   color: Colors.grey,
                 ),
               ),
-                  ],
-                ),
-              ),
             ),
           ],
         ),
@@ -119,8 +115,6 @@ Future<void> showDeviceInterface(
     required BuildContext context,
     required isAllDevices,
     List<DeviceModel>? allDevices}) async {
-  print('object-----${device.uuid} ${device.name}');
-
   final devicesCubit = context.read<DevicesCubit>();
 
   switch (device.productType) {

lib/features/devices/view/widgets/sos/sos_screen.dart

@@ -5,7 +5,6 @@ import 'package:syncrow_app/features/devices/bloc/sos_bloc/sos_bloc.dart';
 import 'package:syncrow_app/features/devices/bloc/sos_bloc/sos_event.dart';
 import 'package:syncrow_app/features/devices/bloc/sos_bloc/sos_state.dart';
 import 'package:syncrow_app/features/devices/model/device_model.dart';
-import 'package:syncrow_app/features/devices/model/sos_model.dart';
 import 'package:syncrow_app/features/devices/view/device_settings/settings_page.dart';
 import 'package:syncrow_app/features/devices/view/widgets/sos/sos_alarm_management_page.dart';
 import 'package:syncrow_app/features/devices/view/widgets/sos/sos_records_screen.dart';
@@ -29,17 +28,8 @@ class SosScreen extends StatelessWidget {
       child: BlocBuilder<SosBloc, SosState>(
         builder: (context, state) {
           final sensor = BlocProvider.of<SosBloc>(context);
-          SosModel model = SosModel(
-            batteryPercentage: 0,
-            sosContactState: '',
-          );
-          if (state is LoadingNewSate) {
-            model = state.sosSensor;
-          } else if (state is UpdateState) {
-            model = state.sensor;
-          }
           return DefaultScaffold(
-            title: sensor.deviceInfo.name,
+            title: device?.name,
             actions: [
               InkWell(
                 onTap: () async {
@@ -82,38 +72,33 @@ class SosScreen extends StatelessWidget {
                               Expanded(
                                 flex: 4,
                                 child: InkWell(
-                                  overlayColor: MaterialStateProperty.all(
-                                      Colors.transparent),
+                                  overlayColor:
+                                      WidgetStateProperty.all(Colors.transparent),
                                   onTap: () {
                                     // Add functionality for the main SOS button here
                                   },
                                   child: Row(
                                     mainAxisAlignment: MainAxisAlignment.center,
-                                    crossAxisAlignment:
-                                        CrossAxisAlignment.center,
+                                    crossAxisAlignment: CrossAxisAlignment.center,
                                     children: [
                                       Container(
                                         decoration: BoxDecoration(
-                                          borderRadius:
-                                              BorderRadius.circular(890),
+                                          borderRadius: BorderRadius.circular(890),
                                           boxShadow: [
                                             BoxShadow(
-                                              color:
-                                                  Colors.white.withOpacity(0.1),
+                                              color: Colors.white.withOpacity(0.1),
                                               blurRadius: 24,
                                               offset: const Offset(-5, -5),
                                               blurStyle: BlurStyle.outer,
                                             ),
                                             BoxShadow(
-                                              color: Colors.black
-                                                  .withOpacity(0.11),
+                                              color: Colors.black.withOpacity(0.11),
                                               blurRadius: 25,
                                               offset: const Offset(5, 5),
                                               blurStyle: BlurStyle.outer,
                                             ),
                                             BoxShadow(
-                                              color: Colors.black
-                                                  .withOpacity(0.13),
+                                              color: Colors.black.withOpacity(0.13),
                                               blurRadius: 30,
                                               offset: const Offset(5, 5),
                                               blurStyle: BlurStyle.inner,
@@ -140,8 +125,7 @@ class SosScreen extends StatelessWidget {
                                         onTap: () {
                                           Navigator.of(context).push(
                                             MaterialPageRoute(
-                                              builder: (context) =>
-                                                  SosRecordsScreen(
+                                              builder: (context) => SosRecordsScreen(
                                                   sosId: device!.uuid!),
                                             ),
                                           );
@@ -197,8 +181,8 @@ class SosScreen extends StatelessWidget {
                                                 maxHeight: 46,
                                                 maxWidth: 50,
                                               ),
-                                              child: SvgPicture.asset(Assets
-                                                  .doorNotificationSetting),
+                                              child: SvgPicture.asset(
+                                                  Assets.doorNotificationSetting),
                                             ),
                                             const SizedBox(height: 15),
                                             const Flexible(

lib/features/devices/view/widgets/three_gang/gang_switch.dart

@@ -9,7 +9,10 @@ import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
 
 class GangSwitch extends StatelessWidget {
   const GangSwitch(
-      {super.key, required this.threeGangSwitch, required this.value, required this.action});
+      {super.key,
+      required this.threeGangSwitch,
+      required this.value,
+      required this.action});
 
   final DeviceModel threeGangSwitch;
   final bool value;

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

@@ -21,7 +21,7 @@ class WaterHeaterPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return DefaultScaffold(
-      title: 'Water heater',
+      title: device?.name?? 'Water heater',
       child: BlocProvider(
         create: (context) => WaterHeaterBloc(switchCode: 'switch_1', whId: device?.uuid ?? '')
           ..add(const WaterHeaterInitial()),

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/devices/view/widgets/water_leak/water_leak_screen.dart

@@ -22,7 +22,7 @@ class WaterLeakScreen extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return DefaultScaffold(
-      title: 'Water Leak Sensor',
+      title: device?.name ?? 'Water Leak',
       child: BlocProvider(
         create: (context) => WaterLeakBloc(WLId: device?.uuid ?? '')
           ..add(const WaterLeakInitial()),

lib/features/scene/bloc/create_scene/create_scene_bloc.dart

@@ -1,6 +1,8 @@
 import 'dart:async';
 import 'package:equatable/equatable.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
+import 'package:syncrow_app/features/auth/model/project_model.dart';
 import 'package:syncrow_app/features/devices/model/device_control_model.dart';
 import 'package:syncrow_app/features/scene/bloc/effective_period/effect_period_bloc.dart';
 import 'package:syncrow_app/features/scene/bloc/effective_period/effect_period_event.dart';
@@ -348,15 +350,18 @@ class CreateSceneBloc extends Bloc<CreateSceneEvent, CreateSceneState>
     emit(CreateSceneLoading());
     try {
       dynamic response;
+      Project? project = HomeCubit.getInstance().project;
+
       if (event.createSceneModel != null) {
         response = event.updateScene
             ? await SceneApi.updateScene(event.createSceneModel!, event.sceneId)
             : await SceneApi.createScene(event.createSceneModel!);
       } else if (event.createAutomationModel != null) {
         response = event.updateScene
-            ? await SceneApi.updateAutomation(
-                event.createAutomationModel!, event.sceneId)
-            : await SceneApi.createAutomation(event.createAutomationModel!);
+            ? await SceneApi.updateAutomation(event.createAutomationModel!,
+                event.sceneId, project?.uuid ?? '')
+            : await SceneApi.createAutomation(
+                event.createAutomationModel!, project?.uuid ?? '');
       }
 
       if (response['success'] == true) {
@@ -421,6 +426,8 @@ class CreateSceneBloc extends Bloc<CreateSceneEvent, CreateSceneState>
     emit(CreateSceneLoading());
 
     try {
+      Project? project = HomeCubit.getInstance().project;
+
       tasksList.clear();
       tempTasksList.clear();
       selectedValues.clear();
@@ -436,7 +443,8 @@ class CreateSceneBloc extends Bloc<CreateSceneEvent, CreateSceneState>
       conditionRule = 'or';
 
       final response = event.isAutomation
-          ? await SceneApi.getAutomationDetails(event.sceneId)
+          ? await SceneApi.getAutomationDetails(
+              event.sceneId, project?.uuid ?? '')
           : await SceneApi.getSceneDetails(event.sceneId);
       if (response.id.isNotEmpty) {
         if (event.isAutomation) {
@@ -605,10 +613,14 @@ class CreateSceneBloc extends Bloc<CreateSceneEvent, CreateSceneState>
     emit(DeleteSceneLoading());
 
     try {
+      Project? project = HomeCubit.getInstance().project;
+
       final response =
           sceneType.name == CreateSceneEnum.deviceStatusChanges.name
               ? await SceneApi.deleteAutomation(
-                  automationId: event.sceneId, unitUuid: event.unitUuid)
+                  automationId: event.sceneId,
+                  unitUuid: event.unitUuid,
+                  projectId: project?.uuid ?? '')
               : await SceneApi.deleteScene(
                   sceneId: event.sceneId,
                 );

lib/features/scene/bloc/scene_bloc/scene_bloc.dart

@@ -46,8 +46,11 @@ class SceneBloc extends Bloc<SceneEvent, SceneState> {
     emit(SceneLoading());
 
     try {
+      Project? project = HomeCubit.getInstance().project;
+
       if (event.unitId.isNotEmpty) {
-        automationList = await SceneApi.getAutomationByUnitId(event.unitId);
+        automationList = await SceneApi.getAutomationByUnitId(
+            event.unitId, event.communityId, project?.uuid ?? '');
         emit(SceneLoaded(scenes, automationList));
       } else {
         emit(const SceneError(message: 'Unit ID is empty'));
@@ -96,11 +99,17 @@ class SceneBloc extends Bloc<SceneEvent, SceneState> {
       ));
 
       try {
+        Project? project = HomeCubit.getInstance().project;
+
         final success = await SceneApi.updateAutomationStatus(
-            event.automationId, event.automationStatusUpdate);
+            event.automationId,
+            event.automationStatusUpdate,
+            project?.uuid ?? '');
         if (success) {
           automationList = await SceneApi.getAutomationByUnitId(
-              event.automationStatusUpdate.spaceUuid);
+              event.automationStatusUpdate.spaceUuid,
+              event.communityId,
+              project?.uuid ?? '');
           newLoadingStates[event.automationId] = false;
           emit(SceneLoaded(
             currentState.scenes,

lib/features/scene/bloc/scene_bloc/scene_event.dart

@@ -22,11 +22,13 @@ class LoadScenes extends SceneEvent {
 
 class LoadAutomation extends SceneEvent {
   final String unitId;
+    final String communityId;
 
-  const LoadAutomation(this.unitId);
+
+  const LoadAutomation(this.unitId, this.communityId);
 
   @override
-  List<Object> get props => [unitId];
+  List<Object> get props => [unitId, communityId];
 }
 
 class SceneTrigger extends SceneEvent {
@@ -43,8 +45,9 @@ class SceneTrigger extends SceneEvent {
 class UpdateAutomationStatus extends SceneEvent {
   final String automationId;
   final AutomationStatusUpdate automationStatusUpdate;
+  final String communityId;
 
-  const UpdateAutomationStatus({required this.automationStatusUpdate, required this.automationId});
+  const UpdateAutomationStatus({required this.automationStatusUpdate, required this.automationId, required this.communityId});
 
   @override
   List<Object> get props => [automationStatusUpdate];

lib/features/scene/bloc/tab_change/tab_change_bloc.dart

@@ -1,5 +1,3 @@
-import 'dart:async';
-
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/devices/bloc/device_manager_bloc/device_manager_bloc.dart';
 import 'package:syncrow_app/features/devices/bloc/device_manager_bloc/device_manager_event.dart';
@@ -7,19 +5,31 @@ import 'package:syncrow_app/features/scene/bloc/tab_change/tab_change_event.dart
 import 'package:syncrow_app/features/scene/bloc/tab_change/tab_change_state.dart';
 
 class TabBarBloc extends Bloc<TabBarEvent, TabBarState> {
-  final DeviceManagerBloc deviceManagerBloc;
-  TabBarBloc(this.deviceManagerBloc) : super(const Initial()) {
-    on<TabChanged>(_handleTabChanged);
+  TabBarBloc(this.deviceManagerBloc) : super(const TabBarInitialState()) {
+    on<TabBarTabChangedEvent>(_onTabBarTabChangedEvent);
   }
 
-  FutureOr<void> _handleTabChanged(
-      TabChanged event, Emitter<TabBarState> emit) {
+  final DeviceManagerBloc deviceManagerBloc;
+
+  void _onTabBarTabChangedEvent(
+    TabBarTabChangedEvent event,
+    Emitter<TabBarState> emit,
+  ) {
+    _getDevices(event);
+
+    emit(
+      TabBarTabSelectedState(
+        roomId: event.roomId,
+        selectedTabIndex: event.selectedIndex,
+      ),
+    );
+  }
+
+  void _getDevices(TabBarTabChangedEvent event) {
     if (event.roomId == "-1") {
       deviceManagerBloc.add(FetchAllDevices());
     } else {
       deviceManagerBloc.add(FetchDevicesByRoomId(event.roomId, event.unit));
     }
-    emit(TabSelected(
-        roomId: event.roomId, selectedTabIndex: event.selectedIndex));
   }
 }

lib/features/scene/bloc/tab_change/tab_change_event.dart

@@ -4,10 +4,14 @@ abstract class TabBarEvent {
   const TabBarEvent();
 }
 
-class TabChanged extends TabBarEvent {
+class TabBarTabChangedEvent extends TabBarEvent {
+  const TabBarTabChangedEvent({
+    required this.selectedIndex,
+    required this.roomId,
+    required this.unit,
+  });
+
   final int selectedIndex;
   final String roomId;
   final SpaceModel unit;
-  const TabChanged(
-      {required this.selectedIndex, required this.roomId, required this.unit});
 }

lib/features/scene/bloc/tab_change/tab_change_state.dart

@@ -2,12 +2,16 @@ abstract class TabBarState {
   const TabBarState();
 }
 
-class Initial extends TabBarState {
-  const Initial();
+class TabBarInitialState extends TabBarState {
+  const TabBarInitialState();
 }
 
-class TabSelected extends TabBarState {
+class TabBarTabSelectedState extends TabBarState {
+  const TabBarTabSelectedState({
+    required this.roomId,
+    required this.selectedTabIndex,
+  });
+
   final int selectedTabIndex;
   final String roomId;
-  const TabSelected({required this.roomId, required this.selectedTabIndex});
 }

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/functions_per_device/three_gang_functions.dart

@@ -10,7 +10,7 @@ class ThreeGangHelperFunctions {
         deviceId: deviceId,
         deviceName: deviceName,
         icon: Assets.assetsAcPower,
-        operationName: 'Light 1 Switch',
+        operationName: 'L - Light Switch',
         code: 'switch_1',
         functionValue: functionValue,
         operationDialogType: OperationDialogType.onOff,
@@ -21,11 +21,23 @@ class ThreeGangHelperFunctions {
               icon: Assets.assetsAcPowerOFF, description: "OFF", value: false),
         ],
       ),
+      SceneStaticFunction(
+        deviceId: deviceId,
+        deviceName: deviceName,
+        icon: Assets.assetsLightCountdown,
+        operationName: 'L - Light Countdown',
+        code: 'countdown_1',
+        functionValue: functionValue,
+        operationDialogType: OperationDialogType.countdown,
+        operationalValues: [
+          SceneOperationalValue(icon: '', value: 0),
+        ],
+      ),
       SceneStaticFunction(
         deviceId: deviceId,
         deviceName: deviceName,
         icon: Assets.assetsAcPower,
-        operationName: 'Light 2 Switch',
+        operationName: 'M - Light Switch',
         code: 'switch_2',
         functionValue: functionValue,
         operationDialogType: OperationDialogType.onOff,
@@ -36,11 +48,23 @@ class ThreeGangHelperFunctions {
               icon: Assets.assetsAcPowerOFF, description: "OFF", value: false),
         ],
       ),
+      SceneStaticFunction(
+        deviceId: deviceId,
+        deviceName: deviceName,
+        icon: Assets.assetsLightCountdown,
+        operationName: 'M - Light Countdown',
+        code: 'countdown_2',
+        functionValue: functionValue,
+        operationDialogType: OperationDialogType.countdown,
+        operationalValues: [
+          SceneOperationalValue(icon: '', value: 0),
+        ],
+      ),
       SceneStaticFunction(
         deviceId: deviceId,
         deviceName: deviceName,
         icon: Assets.assetsAcPower,
-        operationName: 'Light 3 Switch',
+        operationName: 'R - Light Switch',
         code: 'switch_3',
         functionValue: functionValue,
         operationDialogType: OperationDialogType.onOff,
@@ -55,31 +79,7 @@ class ThreeGangHelperFunctions {
         deviceId: deviceId,
         deviceName: deviceName,
         icon: Assets.assetsLightCountdown,
-        operationName: 'Light 1 CountDown',
-        code: 'countdown_1',
-        functionValue: functionValue,
-        operationDialogType: OperationDialogType.countdown,
-        operationalValues: [
-          SceneOperationalValue(icon: '', value: 0),
-        ],
-      ),
-      SceneStaticFunction(
-        deviceId: deviceId,
-        deviceName: deviceName,
-        icon: Assets.assetsLightCountdown,
-        operationName: 'Light 2 CountDown',
-        code: 'countdown_2',
-        functionValue: functionValue,
-        operationDialogType: OperationDialogType.countdown,
-        operationalValues: [
-          SceneOperationalValue(icon: '', value: 0),
-        ],
-      ),
-      SceneStaticFunction(
-        deviceId: deviceId,
-        deviceName: deviceName,
-        icon: Assets.assetsLightCountdown,
-        operationName: 'Light 3 CountDown',
+        operationName: 'R - Light Countdown',
         code: 'countdown_3',
         functionValue: functionValue,
         operationDialogType: OperationDialogType.countdown,
@@ -97,7 +97,7 @@ class ThreeGangHelperFunctions {
         deviceId: deviceId,
         deviceName: deviceName,
         icon: Assets.assetsAcPower,
-        operationName: 'Light 1 Switch',
+        operationName: 'L - Light Switch',
         code: 'switch_1',
         functionValue: functionValue,
         operationDialogType: OperationDialogType.onOff,
@@ -108,41 +108,11 @@ class ThreeGangHelperFunctions {
               icon: Assets.assetsAcPowerOFF, description: "OFF", value: false),
         ],
       ),
-      SceneStaticFunction(
-        deviceId: deviceId,
-        deviceName: deviceName,
-        icon: Assets.assetsAcPower,
-        operationName: 'Light 2 Switch',
-        code: 'switch_2',
-        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.assetsAcPower,
-        operationName: 'Light 3 Switch',
-        code: 'switch_3',
-        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 1 CountDown',
+        operationName: 'L - Light Countdown',
         code: 'countdown_1',
         functionValue: functionValue,
         operationDialogType: OperationDialogType.integerSteps,
@@ -157,11 +127,26 @@ class ThreeGangHelperFunctions {
           ),
         ],
       ),
+      SceneStaticFunction(
+        deviceId: deviceId,
+        deviceName: deviceName,
+        icon: Assets.assetsAcPower,
+        operationName: 'M - Light Switch',
+        code: 'switch_2',
+        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 2 CountDown',
+        operationName: 'M - Light Countdown',
         code: 'countdown_2',
         functionValue: functionValue,
         operationDialogType: OperationDialogType.integerSteps,
@@ -176,11 +161,26 @@ class ThreeGangHelperFunctions {
           ),
         ],
       ),
+      SceneStaticFunction(
+        deviceId: deviceId,
+        deviceName: deviceName,
+        icon: Assets.assetsAcPower,
+        operationName: 'R - Light Switch',
+        code: 'switch_3',
+        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 3 CountDown',
+        operationName: 'R - Light Countdown',
         code: 'countdown_3',
         functionValue: functionValue,
         operationDialogType: OperationDialogType.integerSteps,

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

@@ -0,0 +1,139 @@
+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 TowGangHelperFunctions {
+  static List<SceneStaticFunction> towGangHelperFunctions(
+      String deviceId, String deviceName, functionValue) {
+    return [
+      SceneStaticFunction(
+        deviceId: deviceId,
+        deviceName: deviceName,
+        icon: Assets.assetsAcPower,
+        operationName: 'L - 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: 'L - Light CountDown',
+        code: 'countdown_1',
+        functionValue: functionValue,
+        operationDialogType: OperationDialogType.countdown,
+        operationalValues: [
+          SceneOperationalValue(icon: '', value: 0),
+        ],
+      ),
+      SceneStaticFunction(
+        deviceId: deviceId,
+        deviceName: deviceName,
+        icon: Assets.assetsAcPower,
+        operationName: 'R - Light Switch',
+        code: 'switch_2',
+        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: 'R - Light CountDown',
+        code: 'countdown_2',
+        functionValue: functionValue,
+        operationDialogType: OperationDialogType.countdown,
+        operationalValues: [
+          SceneOperationalValue(icon: '', value: 0),
+        ],
+      ),
+    ];
+  }
+
+  static List<SceneStaticFunction> towGangAutomationFunctions(
+      String deviceId, String deviceName, functionValue) {
+    return [
+      SceneStaticFunction(
+        deviceId: deviceId,
+        deviceName: deviceName,
+        icon: Assets.assetsAcPower,
+        operationName: 'L - 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: 'R - Light CountDown',
+        code: 'countdown_1',
+        functionValue: functionValue,
+        operationDialogType: OperationDialogType.integerSteps,
+        operationalValues: [
+          SceneOperationalValue(
+            icon: '',
+            description: "sec",
+            value: 0.0,
+            minValue: 0,
+            maxValue: 43200,
+            stepValue: 1,
+          ),
+        ],
+      ),
+      SceneStaticFunction(
+        deviceId: deviceId,
+        deviceName: deviceName,
+        icon: Assets.assetsAcPower,
+        operationName: 'R - Light Switch',
+        code: 'switch_2',
+        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: 'R - Light CountDown',
+        code: 'countdown_2',
+        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,16 +6,19 @@ 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/helper/functions_per_device/tow_gang_helper_functions.dart';
 import 'package:syncrow_app/features/scene/model/scene_details_model.dart';
 import 'package:syncrow_app/features/scene/model/scene_static_function.dart';
 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 +27,8 @@ mixin SceneOperationsDataHelper {
     DeviceType.Curtain: curtainFunctions,
     DeviceType.ThreeGang: threeGangFunctions,
     DeviceType.Gateway: gatewayFunctions,
+    DeviceType.OneGang: oneGangFunctions,
+    DeviceType.TwoGang: towGangFunctions,
   };
 
   final Map<DeviceType, String> _titleMap = {
@@ -35,8 +40,39 @@ mixin SceneOperationsDataHelper {
     DeviceType.Curtain: 'Curtain Functions',
     DeviceType.ThreeGang: '3G Light Switch Functions',
     DeviceType.Gateway: 'Gateway Functions',
+    DeviceType.OneGang: '1G Light Switch Conditions',
+    DeviceType.TwoGang: '2G Light Switch Conditions',
   };
 
+  //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);
+  }
+
+  static List<SceneStaticFunction> towGangFunctions(
+      List<FunctionModel> functions,
+      String deviceId,
+      String deviceName,
+      dynamic functionValue,
+      bool isAutomation) {
+    if (isAutomation) {
+      return TowGangHelperFunctions.towGangAutomationFunctions(
+          deviceId, deviceName, functionValue);
+    }
+    return TowGangHelperFunctions.towGangHelperFunctions(
+        deviceId, deviceName, functionValue);
+  }
+
   List<SceneStaticFunction> getFunctionsWithIcons({
     DeviceType? type,
     required List<FunctionModel> functions,
@@ -45,16 +81,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 +105,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 +142,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 +224,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 +249,8 @@ mixin SceneOperationsDataHelper {
           ),
         );
       } else {
-        functions.add(_mapExecutorPropertyToSceneFunction(action, isAutomation));
+        functions
+            .add(_mapExecutorPropertyToSceneFunction(action, isAutomation));
       }
     }
 
@@ -179,6 +259,8 @@ mixin SceneOperationsDataHelper {
       for (var condition in conditions) {
         // Create a dummy Action from Condition to reuse _mapExecutorPropertyToSceneFunction
         Action dummyAction = Action(
+          deviceName: condition.deviceName,
+          productType: condition.productType,
           actionExecutor: 'device_report',
           entityId: condition.entityId,
           executorProperty: ExecutorProperty(
@@ -206,7 +288,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 +366,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',
+      action.deviceName,
       Assets.assetsIconsSensors,
       'Sensitivity',
-      isAutomation ? OperationDialogType.integerSteps : OperationDialogType.listOfOptions,
+      isAutomation
+          ? OperationDialogType.integerSteps
+          : OperationDialogType.listOfOptions,
       isAutomation ? _createIntegerStepsOptions() : _createSensitivityOptions(),
       isAutomation,
       comparator,
@@ -297,11 +383,11 @@ 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',
+      action.deviceName,
       Assets.assetsIconsDoorLock,
       'Set Door lock Normal Open',
       OperationDialogType.onOff,
@@ -351,11 +437,11 @@ 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',
+      action.deviceName,
       Assets.assetsIconsDoorLock,
       'Fingerprint Unlock',
       OperationDialogType.integerSteps,
@@ -366,11 +452,11 @@ 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',
+      action.deviceName,
       Assets.assetsIconsDoorLock,
       'Password Unlock',
       OperationDialogType.integerSteps,
@@ -381,11 +467,11 @@ 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',
+      action.deviceName,
       Assets.assetsIconsDoorLock,
       'Card Unlock',
       OperationDialogType.integerSteps,
@@ -396,11 +482,11 @@ 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',
+      action.deviceName,
       Assets.assetsIconsDoorLock,
       'Lock Alarm',
       OperationDialogType.listOfOptions,
@@ -411,11 +497,11 @@ 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',
+      action.deviceName,
       Assets.assetsIconsDoorLock,
       'Remote Unlock Request',
       OperationDialogType.integerSteps,
@@ -426,11 +512,11 @@ 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',
+      action.deviceName,
       Assets.assetsIconsDoorLock,
       'Residual Electricity',
       OperationDialogType.integerSteps,
@@ -441,11 +527,11 @@ 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',
+      action.deviceName,
       Assets.assetsIconsDoorLock,
       'Double Lock',
       OperationDialogType.onOff,
@@ -456,11 +542,11 @@ 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',
+      action.deviceName,
       Assets.assetsIconsDoorLock,
       'Remote Unlock Via App',
       OperationDialogType.integerSteps,
@@ -471,11 +557,11 @@ 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',
+      action.deviceName,
       Assets.assetsIconsDoorLock,
       'Hijack Alarm',
       OperationDialogType.onOff,
@@ -486,11 +572,11 @@ 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',
+      action.deviceName,
       Assets.assetsIconsDoorLock,
       'Doorbell',
       OperationDialogType.onOff,
@@ -501,11 +587,11 @@ 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',
+      action.deviceName,
       Assets.assetsIconsDoorLock,
       'Temporary Password Unlock',
       OperationDialogType.integerSteps,
@@ -516,11 +602,11 @@ 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',
+      action.deviceName,
       Assets.assetsIconsSensors,
       'Far Detection',
       OperationDialogType.listOfOptions,
@@ -531,11 +617,11 @@ 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',
+      action.deviceName,
       Assets.assetsIconsSensors,
       'Motion Detection Sensitivity',
       OperationDialogType.listOfOptions,
@@ -546,11 +632,11 @@ 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',
+      action.deviceName,
       Assets.assetsIconsSensors,
       'Motionless Detection Sensitivity',
       OperationDialogType.listOfOptions,
@@ -561,11 +647,11 @@ 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',
+      action.deviceName,
       Assets.assetsIconsSensors,
       'Indicator',
       OperationDialogType.onOff,
@@ -576,11 +662,11 @@ 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',
+      action.deviceName,
       Assets.assetsIconsSensors,
       'Nobody Time',
       OperationDialogType.countdown,
@@ -591,11 +677,11 @@ 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',
+      action.deviceName,
       Assets.assetsIconsSensors,
       'Presence State',
       OperationDialogType.listOfOptions,
@@ -606,14 +692,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',
+      action.deviceName,
       Assets.assetsIconsSensors,
       'Current Distance',
-      isAutomation ? OperationDialogType.integerSteps : OperationDialogType.countdown,
+      isAutomation
+          ? OperationDialogType.integerSteps
+          : OperationDialogType.countdown,
       _createCurrentDistanceOptions(),
       isAutomation,
       comparator,
@@ -621,11 +709,11 @@ 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',
+      action.deviceName,
       Assets.assetsIconsSensors,
       'Illuminance Value',
       OperationDialogType.integerSteps,
@@ -636,11 +724,11 @@ 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',
+      action.deviceName,
       Assets.assetsIconsSensors,
       'Self-Test Result',
       OperationDialogType.listOfOptions,
@@ -651,11 +739,11 @@ 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',
+      action.deviceName,
       Assets.assetsIconsAC,
       'Power',
       OperationDialogType.onOff,
@@ -666,26 +754,30 @@ 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',
+      action.deviceName,
       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',
+      action.deviceName,
       Assets.assetsIconsAC,
       'Current Temperature',
       OperationDialogType.integerSteps,
@@ -696,11 +788,11 @@ 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',
+      action.deviceName,
       Assets.assetsIconsAC,
       'Mode',
       OperationDialogType.listOfOptions,
@@ -711,11 +803,11 @@ 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',
+      action.deviceName,
       Assets.assetsIconsAC,
       'Fan Speed',
       OperationDialogType.listOfOptions,
@@ -726,11 +818,11 @@ 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',
+      action.deviceName,
       Assets.assetsIconsAC,
       'Child Lock',
       OperationDialogType.onOff,
@@ -741,11 +833,13 @@ mixin SceneOperationsDataHelper {
     );
   }
 
-  SceneStaticFunction _createSwitch1Function(
-      Action action, bool isAutomation, String? comparator, String? 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',
+          action.deviceName,
           Assets.assetsIcons3GangSwitch,
           'Light 1 Switch',
           OperationDialogType.onOff,
@@ -754,13 +848,52 @@ mixin SceneOperationsDataHelper {
           comparator,
           uniqueCustomId,
         );
-  }
-
-  SceneStaticFunction _createSwitch2Function(
-      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
+      case "2G":
         return _createSceneFunction(
           action,
-      '3 Gang Button Switch L-L',
+          action.deviceName,
+          Assets.twoGang,
+          'Light 1 Switch',
+          OperationDialogType.onOff,
+          _createOnOffOptions(),
+          isAutomation,
+          comparator,
+          uniqueCustomId,
+        );
+      case "1G":
+        return _createSceneFunction(
+          action,
+          action.deviceName,
+          Assets.oneGang,
+          'Light 1 Switch',
+          OperationDialogType.onOff,
+          _createOnOffOptions(),
+          isAutomation,
+          comparator,
+          uniqueCustomId,
+        );
+      default:
+        return _createSceneFunction(
+          action,
+          'None',
+          Assets.assetsRemoteUnlockReq,
+          'None',
+          OperationDialogType.onOff,
+          _createOnOffOptions(),
+          isAutomation,
+          comparator,
+          uniqueCustomId,
+        );
+    }
+  }
+
+  SceneStaticFunction _createSwitch2Function(Action action, bool isAutomation,
+      String? comparator, String? uniqueCustomId) {
+    switch (action.productType) {
+      case "3G":
+        return _createSceneFunction(
+          action,
+          action.deviceName,
           Assets.assetsIcons3GangSwitch,
           'Light 2 Switch',
           OperationDialogType.onOff,
@@ -769,13 +902,38 @@ mixin SceneOperationsDataHelper {
           comparator,
           uniqueCustomId,
         );
-  }
-
-  SceneStaticFunction _createSwitch3Function(
-      Action action, bool isAutomation, String? comparator, String? uniqueCustomId) {
+      case "2G":
         return _createSceneFunction(
           action,
-      '3 Gang Button Switch L-L',
+          action.deviceName,
+          Assets.twoGang,
+          'Light 2 Switch',
+          OperationDialogType.onOff,
+          _createOnOffOptions(),
+          isAutomation,
+          comparator,
+          uniqueCustomId,
+        );
+      default:
+        return _createSceneFunction(
+          action,
+          action.deviceName,
+          Assets.oneGang,
+          'Light Switch',
+          OperationDialogType.onOff,
+          _createOnOffOptions(),
+          isAutomation,
+          comparator,
+          uniqueCustomId,
+        );
+    }
+  }
+
+  SceneStaticFunction _createSwitch3Function(Action action, bool isAutomation,
+      String? comparator, String? uniqueCustomId) {
+    return _createSceneFunction(
+      action,
+      action.deviceName,
       Assets.assetsIcons3GangSwitch,
       'Light 3 Switch',
       OperationDialogType.onOff,
@@ -786,56 +944,138 @@ mixin SceneOperationsDataHelper {
     );
   }
 
-  SceneStaticFunction _createCountdown1Function(
-      Action action, bool isAutomation, String? comparator, String? 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',
+          action.deviceName,
           Assets.assetsIcons3GangSwitch,
           'Light 1 CountDown',
-      isAutomation ? OperationDialogType.integerSteps : OperationDialogType.countdown,
-      isAutomation ? _createAutomationCountDownOptions() : _createCountdownOptions(),
+          isAutomation
+              ? OperationDialogType.integerSteps
+              : OperationDialogType.countdown,
+          isAutomation
+              ? _createAutomationCountDownOptions()
+              : _createCountdownOptions(),
+          isAutomation,
+          comparator,
+          uniqueCustomId,
+        );
+      case "2G":
+        return _createSceneFunction(
+          action,
+          action.deviceName,
+          Assets.twoGang,
+          'Light 1 CountDown',
+          isAutomation
+              ? OperationDialogType.integerSteps
+              : OperationDialogType.countdown,
+          isAutomation
+              ? _createAutomationCountDownOptions()
+              : _createCountdownOptions(),
+          isAutomation,
+          comparator,
+          uniqueCustomId,
+        );
+      default:
+        return _createSceneFunction(
+          action,
+          action.deviceName,
+          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) {
+    switch (action.productType) {
+      case "3G":
         return _createSceneFunction(
           action,
-      '3 Gang Button Switch L-L',
+          action.deviceName,
           Assets.assetsIcons3GangSwitch,
           'Light 2 CountDown',
-      isAutomation ? OperationDialogType.integerSteps : OperationDialogType.countdown,
-      isAutomation ? _createAutomationCountDownOptions() : _createCountdownOptions(),
+          isAutomation
+              ? OperationDialogType.integerSteps
+              : OperationDialogType.countdown,
+          isAutomation
+              ? _createAutomationCountDownOptions()
+              : _createCountdownOptions(),
+          isAutomation,
+          comparator,
+          uniqueCustomId,
+        );
+      case "2G":
+        return _createSceneFunction(
+          action,
+          action.deviceName,
+          Assets.twoGang,
+          'Light 2 CountDown',
+          isAutomation
+              ? OperationDialogType.integerSteps
+              : OperationDialogType.countdown,
+          isAutomation
+              ? _createAutomationCountDownOptions()
+              : _createCountdownOptions(),
+          isAutomation,
+          comparator,
+          uniqueCustomId,
+        );
+      default:
+        return _createSceneFunction(
+          action,
+          action.deviceName,
+          Assets.oneGang,
+          'Light CountDown',
+          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',
+      action.deviceName,
       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',
+      action.deviceName,
       Assets.assetsIconsGateway,
       'Switch Alarm Sound',
       OperationDialogType.onOff,
@@ -846,11 +1086,11 @@ 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',
+      action.deviceName,
       Assets.assetsIconsGateway,
       'Master State',
       OperationDialogType.listOfOptions,
@@ -861,11 +1101,11 @@ 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',
+      action.deviceName,
       Assets.assetsIconsGateway,
       'Factory Reset',
       OperationDialogType.onOff,
@@ -1180,8 +1420,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,
@@ -1204,6 +1448,8 @@ mixin SceneOperationsDataHelper {
     return [
       _mapExecutorPropertyToSceneFunction(
         Action(
+          deviceName: taskItem.deviceName,
+          productType: '',
           entityId: deviceId,
           executorProperty: ExecutorProperty(
             functionCode: taskItem.code,

lib/features/scene/model/scene_details_model.dart

@@ -74,6 +74,9 @@ class Action {
   ExecutorProperty? executorProperty;
   String? name;
   String? type;
+  final String productType;
+
+  final String deviceName;
 
   Action({
     required this.actionExecutor,
@@ -81,6 +84,8 @@ class Action {
     this.executorProperty,
     this.name,
     this.type,
+    required this.productType,
+    required this.deviceName,
   });
 
   String toRawJson() => json.encode(toJson());
@@ -88,10 +93,12 @@ 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,
+        deviceName: json['deviceName'] as String,
       );
     }
     if (json["executorProperty"] == null) {
@@ -99,9 +106,11 @@ 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,
+      deviceName: json['deviceName'] as String,
     );
   }
 
@@ -142,12 +151,16 @@ class Condition {
   final String entityId;
   final String entityType;
   final Expr expr;
+  final String productType;
+  final String deviceName;
 
   Condition({
     required this.code,
     required this.entityId,
     required this.entityType,
     required this.expr,
+    required this.productType,
+    required this.deviceName,
   });
 
   factory Condition.fromRawJson(String str) =>
@@ -160,6 +173,8 @@ class Condition {
         entityId: json["entityId"],
         entityType: json["entityType"],
         expr: Expr.fromJson(json["expr"]),
+        productType: json['productType'] as String,
+        deviceName: json['deviceName'] as String,
       );
 
   Map<String, dynamic> toJson() => {

lib/features/scene/view/device_functions_view.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:syncrow_app/features/devices/model/device_control_model.dart';
 import 'package:syncrow_app/features/devices/model/device_model.dart';
 import 'package:syncrow_app/features/scene/bloc/create_scene/create_scene_bloc.dart';
@@ -11,11 +12,10 @@ import 'package:syncrow_app/features/scene/widgets/scene_list_tile.dart';
 import 'package:syncrow_app/features/shared_widgets/default_container.dart';
 import 'package:syncrow_app/features/shared_widgets/default_scaffold.dart';
 import 'package:syncrow_app/features/shared_widgets/light_divider.dart';
-import 'package:syncrow_app/features/shared_widgets/text_widgets/body_medium.dart';
+import 'package:syncrow_app/generated/assets.dart';
 import 'package:syncrow_app/navigation/navigate_to_route.dart';
 import 'package:syncrow_app/navigation/routing_constants.dart';
 import 'package:syncrow_app/utils/context_extension.dart';
-
 import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
 
 class DeviceFunctionsView extends StatelessWidget
@@ -51,22 +51,14 @@ class DeviceFunctionsView extends StatelessWidget
                 .add(AddTaskEvent(isAutomation: isAutomation));
             navigateToRoute(context, Routes.sceneTasksRoute);
           },
-          child: BodyMedium(
-            text: 'Save',
-            fontWeight: FontWeight.normal,
-            fontColor: ColorsManager.secondaryColor.withOpacity(0.6),
-          ),
+          child: SvgPicture.asset(Assets.saveRoutinesIcon),
         ),
       ],
       leading: TextButton(
         onPressed: () {
           _cancelOperation(context, device, isAutomation);
         },
-        child: BodyMedium(
-          text: 'Cancel',
-          fontWeight: FontWeight.normal,
-          fontColor: ColorsManager.textPrimaryColor.withOpacity(0.6),
-        ),
+        child: SvgPicture.asset(Assets.cancelIcon),
       ),
       leadingWidth: 80,
       padding: EdgeInsets.zero,
@@ -75,6 +67,63 @@ class DeviceFunctionsView extends StatelessWidget
         itemCount: functions.length,
         padding: const EdgeInsets.only(top: 24.0),
         itemBuilder: (context, index) {
+          if (device.productType!.name.toString() == 'ThreeGang' ||
+              device.productType!.name.toString() == 'TwoGang') {
+            final bool isFirstInPair = index % 2 == 0;
+            final bool isLastInPair =
+                index % 2 == 1 || index == functions.length - 1;
+            final bool isLastItem = index == functions.length - 1;
+            return Column(mainAxisSize: MainAxisSize.min, children: [
+              if (isFirstInPair && index != 0) const SizedBox(height: 16),
+              DefaultContainer(
+                padding: EdgeInsets.only(
+                  top: isFirstInPair ? 8 : 0,
+                  bottom: isLastInPair ? 8 : 0,
+                ),
+                margin: EdgeInsets.zero,
+                borderRadius: BorderRadius.only(
+                  topLeft: Radius.circular(isFirstInPair ? 20 : 0),
+                  topRight: Radius.circular(isFirstInPair ? 20 : 0),
+                  bottomLeft: Radius.circular(isLastInPair ? 20 : 0),
+                  bottomRight: Radius.circular(isLastInPair ? 20 : 0),
+                ),
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    BlocBuilder<CreateSceneBloc, CreateSceneState>(
+                      builder: (context, state) {
+                        return SceneListTile(
+                          iconsSize: 22,
+                          minLeadingWidth: 20,
+                          assetPath: functions[index].icon,
+                          titleString: functions[index].operationName,
+                          trailingWidget: const Icon(
+                            Icons.arrow_forward_ios_rounded,
+                            color: ColorsManager.greyColor,
+                            size: 16,
+                          ),
+                          onPressed: () {
+                            if (isAutomation) {
+                              _showAutomationDialog(
+                                  context, functions[index], device);
+                            } else {
+                              _showTabToRunDialog(
+                                  context, functions[index], device);
+                            }
+                          },
+                        );
+                      },
+                    ),
+                    if (isFirstInPair && !isLastItem)
+                      SizedBox(
+                        width: context.width * 0.8,
+                        child: const LightDivider(),
+                      ),
+                  ],
+                ),
+              )
+            ]);
+          } else {
             return DefaultContainer(
                 padding: index == 0
                     ? const EdgeInsets.only(top: 8)
@@ -82,13 +131,23 @@ class DeviceFunctionsView extends StatelessWidget
                         ? const EdgeInsets.only(bottom: 8)
                         : EdgeInsets.zero,
                 margin: EdgeInsets.zero,
-            borderRadius: index == 0
+                borderRadius: index == 0 && index == functions.length - 1
                     ? const BorderRadius.only(
-                    topLeft: Radius.circular(20), topRight: Radius.circular(20))
+                        topLeft: Radius.circular(20),
+                        topRight: Radius.circular(20),
+                        bottomLeft: Radius.circular(20),
+                        bottomRight: Radius.circular(20),
+                      )
+                    : index == 0
+                        ? const BorderRadius.only(
+                            topLeft: Radius.circular(20),
+                            topRight: Radius.circular(20),
+                          )
                         : index == functions.length - 1
                             ? const BorderRadius.only(
                                 bottomLeft: Radius.circular(20),
-                        bottomRight: Radius.circular(20))
+                                bottomRight: Radius.circular(20),
+                              )
                             : BorderRadius.zero,
                 child: Column(
                   mainAxisSize: MainAxisSize.min,
@@ -113,28 +172,22 @@ class DeviceFunctionsView extends StatelessWidget
                         onPressed: () {
                           if (isAutomation) {
                             _showAutomationDialog(
-                            context,
-                            functions[index],
-                            device,
-                          );
+                                context, functions[index], device);
                           } else {
                             _showTabToRunDialog(
-                            context,
-                            functions[index],
-                            device,
-                          );
+                                context, functions[index], device);
                           }
                         },
                       );
-                  },
-                ),
+                    }),
                     index != functions.length - 1
                         ? SizedBox(
-                        width: context.width * 0.8, child: const LightDivider())
+                            width: context.width * 0.8,
+                            child: const LightDivider())
                         : const SizedBox(),
                   ],
-            ),
-          );
+                ));
+          }
         },
       ),
     );

lib/features/scene/view/routines_view.dart

@@ -0,0 +1,117 @@
+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/space_model.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_routines_widget.dart';
+import 'package:syncrow_app/features/scene/widgets/routines_expansion_tile.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/utils/context_extension.dart';
+
+class RoutinesView extends StatelessWidget {
+  const RoutinesView({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocProvider(
+      create: (context) => SceneBlocFactory.create(
+        pageType: false,
+        homeCubit: HomeCubit.getInstance(),
+      ),
+      child: BlocBuilder<CreateSceneBloc, CreateSceneState>(
+        builder: (context, state) {
+          final selectedSpace = HomeCubit.getInstance().selectedSpace;
+          if (state is DeleteSceneSuccess) {
+            if (state.success) _loadScenesAndAutomations(context, selectedSpace);
+          }
+          if (state is CreateSceneWithTasks) {
+            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!',
+                );
+              }
+            },
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.start,
+              crossAxisAlignment: CrossAxisAlignment.stretch,
+              children: [
+                const SceneHeader(),
+                const SizedBox(height: 8),
+                Expanded(
+                  child: BlocBuilder<SceneBloc, SceneState>(
+                    builder: (context, state) {
+                      if (state is SceneLoading) {
+                        return const AppLoadingIndicator();
+                      }
+                      if (state is SceneError) {
+                        return Center(
+                          child: Text(state.message),
+                        );
+                      }
+                      if (state is SceneLoaded) {
+                        final scenes = state.scenes;
+                        final automationList = state.automationList;
+                        final routinesIsEmpty =
+                            scenes.isEmpty && automationList.isEmpty;
+
+                        if (routinesIsEmpty) return const EmptyRoutinesWidget();
+
+                        return Theme(
+                          data: Theme.of(context).copyWith(
+                            dividerColor: Colors.transparent,
+                          ),
+                          child: Expanded(
+                            child: ListView(
+                              children: [
+                                RoutinesExpansionTile(
+                                  title: 'Tap to run routines',
+                                  emptyRoutinesMessage:
+                                      'No scenes have been added yet',
+                                  routines: state.scenes,
+                                  loadingStates: state.loadingStates,
+                                  loadingSceneId: state.loadingSceneId,
+                                ),
+                                RoutinesExpansionTile(
+                                  title: 'Automation',
+                                  emptyRoutinesMessage:
+                                      'No automations have been added yet',
+                                  routines: state.automationList,
+                                  loadingStates: state.loadingStates,
+                                  loadingSceneId: state.loadingSceneId,
+                                ),
+                                const SizedBox(height: 15),
+                              ],
+                            ),
+                          ),
+                        );
+                      }
+                      return const SizedBox.shrink();
+                    },
+                  ),
+                ),
+              ],
+            ),
+          );
+        },
+      ),
+    );
+  }
+
+  void _loadScenesAndAutomations(BuildContext context, SpaceModel? selectedSpace) {
+    context.read<SceneBloc>()
+      ..add(LoadScenes(selectedSpace!.id, selectedSpace, showInDevice: false))
+      ..add(LoadAutomation(selectedSpace.id, selectedSpace.community.uuid));
+  }
+}

lib/features/scene/view/scene_rooms_tabbar.dart

@@ -20,69 +20,69 @@ class SceneRoomsTabBarDevicesView extends StatefulWidget {
       _SceneRoomsTabBarDevicesViewState();
 }
 
-class _SceneRoomsTabBarDevicesViewState
-    extends State<SceneRoomsTabBarDevicesView>
+class _SceneRoomsTabBarDevicesViewState extends State<SceneRoomsTabBarDevicesView>
     with SingleTickerProviderStateMixin {
   late final TabController _tabController;
-  List<SubSpaceModel>? rooms = [];
   late final SpaceModel selectedSpace;
+  var rooms = <SubSpaceModel>[];
 
   @override
   void initState() {
+    super.initState();
+
     selectedSpace = HomeCubit.getInstance().selectedSpace!;
-    rooms = List.from(HomeCubit.getInstance().selectedSpace?.subspaces ?? []);
-    if (rooms != null) {
-      if (rooms![0].id != '-1') {
-        rooms?.insert(
-          0,
-          SubSpaceModel(
+
+    rooms = List.from(selectedSpace.subspaces);
+    final defaultSubSpaceModel = SubSpaceModel(
       name: 'All Devices',
       devices: context.read<DevicesCubit>().allDevices,
       id: '-1',
-          ),
     );
+
+    if (rooms.isNotEmpty) {
+      final isFirstRoomIdValid = rooms[0].id != '-1';
+      if (isFirstRoomIdValid) {
+        rooms.insert(0, defaultSubSpaceModel);
       }
+    } else {
+      rooms = [defaultSubSpaceModel];
     }
 
-    _tabController =
-        TabController(length: rooms!.length, vsync: this, initialIndex: 0);
+    _tabController = TabController(length: rooms.length, vsync: this);
     _tabController.addListener(_handleTabSwitched);
-    super.initState();
-  }
-
-  void _handleTabSwitched() {
-    if (_tabController.indexIsChanging) {
-      final value = _tabController.index;
-
-      /// select tab
-      context.read<TabBarBloc>().add(TabChanged(
-          selectedIndex: value,
-          roomId: rooms?[value].id ?? '',
-          unit: selectedSpace));
-      return;
-    }
   }
 
   @override
   void dispose() {
     super.dispose();
-    _tabController.dispose();
     _tabController.removeListener(() {});
+    _tabController.dispose();
+  }
+
+  void _handleTabSwitched() {
+    if (_tabController.indexIsChanging) {
+      final index = _tabController.index;
+
+      context.read<TabBarBloc>().add(
+            TabBarTabChangedEvent(
+              selectedIndex: index,
+              roomId: rooms[index].id ?? '',
+              unit: selectedSpace,
+            ),
+          );
+      return;
+    }
   }
 
   @override
   Widget build(BuildContext context) {
     return DefaultScaffold(
-      title: StringsManager.createScene,
-      padding: EdgeInsets.zero,
+      padding: EdgeInsetsDirectional.zero,
       leading: IconButton(
-        onPressed: () {
-          navigateToRoute(context, Routes.sceneTasksRoute);
-        },
-        icon: const Icon(
-          Icons.arrow_back_ios,
-        ),
+        onPressed: () => navigateToRoute(context, Routes.sceneTasksRoute),
+        icon: const Icon(Icons.arrow_back_ios),
       ),
+      title: StringsManager.createScene,
       child: SceneDevicesBody(tabController: _tabController, rooms: rooms),
     );
   }

lib/features/scene/view/scene_view.dart

@@ -1,75 +1,45 @@
 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/create_unit.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 ?? ''));
-        }
-      },
+      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));
-            }
+            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));
+            if (state.success) {
+              _loadScenesAndAutomations(context, selectedSpace);
               context.read<SmartSceneSelectBloc>().add(const SmartSceneClearEvent());
             }
           }
@@ -77,23 +47,24 @@ class SceneView extends StatelessWidget {
             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 ?? true
-                ? const CreateUnitWidget()
+            child: HomeCubit.getInstance().spaces.isEmpty
+                ? const EmptyDevicesWidget()
                 : Column(
                     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(
@@ -103,80 +74,83 @@ class SceneView extends StatelessWidget {
                           if (state is SceneLoaded) {
                             final scenes = state.scenes;
                             final automationList = state.automationList;
+                            if (scenes.isEmpty) return const EmptyDevicesWidget();
 
-                            return pageType
-                                ? Expanded(
+                            if (pageType) {
+                              return SizedBox(
+                                height: context.height * 0.1,
                                 child: SceneListview(
                                   scenes: scenes,
                                   loadingSceneId: state.loadingSceneId,
-                                  ))
-                                : Expanded(
+                                ),
+                              );
+                            }
+
+                            return Theme(
+                              data: Theme.of(context).copyWith(
+                                dividerColor: Colors.transparent,
+                              ),
+                              child: Expanded(
                                 child: ListView(
                                   children: [
-                                        Theme(
-                                          data: ThemeData()
-                                              .copyWith(dividerColor: Colors.transparent),
-                                          child: ExpansionTile(
-                                            tilePadding: const EdgeInsets.symmetric(horizontal: 6),
+                                    ExpansionTile(
+                                      tilePadding: const EdgeInsets.symmetric(
+                                        horizontal: 6,
+                                      ),
                                       initiallyExpanded: true,
                                       iconColor: ColorsManager.grayColor,
-                                            title: const BodyMedium(text: 'Tap to run routines'),
+                                      title: const BodyMedium(
+                                        text: 'Tap to run routines',
+                                      ),
                                       children: [
-                                              scenes.isNotEmpty
-                                                  ? SceneGrid(
+                                        if (scenes.isNotEmpty)
+                                          SceneGrid(
                                             scenes: scenes,
                                             loadingSceneId: state.loadingSceneId,
                                             disablePlayButton: false,
-                                                      loadingStates:
-                                                          state.loadingStates, // Add this line
+                                            loadingStates: state.loadingStates,
                                           )
-                                                  : const Center(
+                                        else
+                                          const Center(
                                             child: BodyMedium(
                                               text: 'No scenes have been added yet',
                                             ),
                                           ),
-                                              const SizedBox(
-                                                height: 10,
-                                              ),
+                                        const SizedBox(height: 10),
                                       ],
                                     ),
-                                        ),
-                                        Theme(
-                                          data: ThemeData()
-                                              .copyWith(dividerColor: Colors.transparent),
-                                          child: ExpansionTile(
+                                    ExpansionTile(
                                       initiallyExpanded: true,
                                       iconColor: ColorsManager.grayColor,
-                                            tilePadding: const EdgeInsets.symmetric(horizontal: 6),
+                                      tilePadding: const EdgeInsets.symmetric(
+                                        horizontal: 6,
+                                      ),
                                       title: const BodyMedium(text: 'Automation'),
                                       children: [
-                                              automationList.isNotEmpty
-                                                  ? SceneGrid(
+                                        if (automationList.isNotEmpty)
+                                          SceneGrid(
                                             scenes: automationList,
                                             loadingSceneId: state.loadingSceneId,
                                             disablePlayButton: true,
-                                                      loadingStates:
-                                                          state.loadingStates, // Add this line
+                                            loadingStates: state.loadingStates,
                                           )
-                                                  : const Center(
+                                        else
+                                          const Center(
                                             child: BodyMedium(
-                                                        text: 'No automations have been added yet',
+                                              text:
+                                                  'No automations have been added yet',
                                             ),
                                           ),
-                                              const SizedBox(
-                                                height: 10,
-                                              ),
+                                        const SizedBox(height: 10),
                                       ],
                                     ),
-                                        ),
-                                        const SizedBox(
-                                          height: 15,
-                                        ),
+                                    const SizedBox(height: 15),
                                   ],
                                 ),
+                              ),
                             );
                           }
-                          return const SizedBox();
+                          return const SizedBox.shrink();
                         },
                       ),
                     ],
@@ -186,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/scene/widgets/delete_routine_b.dart

@@ -25,7 +25,7 @@ class DeleteRoutineButton extends StatelessWidget {
             BlocProvider.of<SceneBloc>(context).add(LoadScenes(
                 HomeCubit.getInstance().selectedSpace!.id, HomeCubit.getInstance().selectedSpace!));
             BlocProvider.of<SceneBloc>(context)
-                .add(LoadAutomation(HomeCubit.getInstance().selectedSpace!.id));
+                .add(LoadAutomation(HomeCubit.getInstance().selectedSpace!.id,HomeCubit.getInstance().selectedSpace!.community.uuid));
           }
         }
       },

lib/features/scene/widgets/empty_devices_widget.dart

@@ -0,0 +1,22 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
+
+class EmptyDevicesWidget extends StatelessWidget {
+  const EmptyDevicesWidget({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 48),
+      child: Text(
+        "No routines.\nEnable 'Show on Home Screen' to add routines",
+        textAlign: TextAlign.center,
+        style: TextStyle(
+          color: ColorsManager.grayColor,
+          fontWeight: FontWeight.w400,
+          fontSize: 12,
+        ),
+      ),
+    );
+  }
+}

lib/features/scene/widgets/empty_routines_widget.dart

@@ -0,0 +1,34 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:syncrow_app/features/shared_widgets/text_widgets/body_medium.dart';
+import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
+
+class EmptyRoutinesWidget extends StatelessWidget {
+  const EmptyRoutinesWidget({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Expanded(
+      child: Center(
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          mainAxisSize: MainAxisSize.max,
+          spacing: 16,
+          children: [
+            SvgPicture.asset(
+              'assets/icons/empty_routines.svg',
+              colorFilter: ColorFilter.mode(
+                ColorsManager.textGray,
+                BlendMode.srcIn,
+              ),
+            ),
+            BodyMedium(
+              text: 'No Routines yet',
+              fontColor: ColorsManager.textGray,
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/features/scene/widgets/routines_expansion_tile.dart

@@ -0,0 +1,53 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_app/features/scene/model/scenes_model.dart';
+import 'package:syncrow_app/features/scene/widgets/scene_view_widget/scene_grid_view.dart';
+import 'package:syncrow_app/features/shared_widgets/text_widgets/body_medium.dart';
+import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
+
+class RoutinesExpansionTile extends StatelessWidget {
+  const RoutinesExpansionTile({
+    super.key,
+    required this.title,
+    required this.emptyRoutinesMessage,
+    required this.routines,
+    required this.loadingStates,
+    this.loadingSceneId,
+  });
+  final String title;
+  final String emptyRoutinesMessage;
+  final List<ScenesModel> routines;
+  final Map<String, bool> loadingStates;
+  final String? loadingSceneId;
+
+  @override
+  Widget build(BuildContext context) {
+    return ExpansionTile(
+      tilePadding: const EdgeInsets.symmetric(
+        horizontal: 6,
+      ),
+      initiallyExpanded: true,
+      iconColor: ColorsManager.grayColor,
+      title: BodyMedium(
+        text: title,
+      ),
+      childrenPadding: EdgeInsetsDirectional.only(bottom: 10),
+      children: [
+        Visibility(
+          visible: routines.isNotEmpty,
+          replacement: Center(
+            child: BodyMedium(
+              text: emptyRoutinesMessage,
+              textAlign: TextAlign.center,
+            ),
+          ),
+          child: SceneGrid(
+            scenes: routines,
+            loadingSceneId: loadingSceneId,
+            disablePlayButton: false,
+            loadingStates: loadingStates,
+          ),
+        ),
+      ],
+    );
+  }
+}

lib/features/scene/widgets/scene_devices/scene_devices_body.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_svg/flutter_svg.dart';
 import 'package:syncrow_app/features/devices/bloc/device_manager_bloc/device_manager_bloc.dart';
 import 'package:syncrow_app/features/devices/bloc/device_manager_bloc/device_manager_state.dart';
 import 'package:syncrow_app/features/devices/model/subspace_model.dart';
@@ -8,60 +7,44 @@ import 'package:syncrow_app/features/scene/bloc/tab_change/tab_change_bloc.dart'
 import 'package:syncrow_app/features/scene/bloc/tab_change/tab_change_state.dart';
 import 'package:syncrow_app/features/scene/enum/create_scene_enum.dart';
 import 'package:syncrow_app/features/scene/model/scene_settings_route_arguments.dart';
-import 'package:syncrow_app/features/scene/widgets/scene_list_tile.dart';
-import 'package:syncrow_app/features/shared_widgets/default_container.dart';
-import 'package:syncrow_app/features/shared_widgets/text_widgets/body_large.dart';
-import 'package:syncrow_app/features/shared_widgets/text_widgets/body_medium.dart';
-import 'package:syncrow_app/navigation/routing_constants.dart';
-import 'package:syncrow_app/utils/context_extension.dart';
-import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
+import 'package:syncrow_app/features/scene/widgets/scene_devices/scene_devices_body_tab_bar.dart';
+import 'package:syncrow_app/features/scene/widgets/scene_devices/scene_devices_list.dart';
+import 'package:syncrow_app/features/shared_widgets/app_loading_indicator.dart';
 
 class SceneDevicesBody extends StatelessWidget {
   const SceneDevicesBody({
-    super.key,
-    required TabController tabController,
+    required this.tabController,
     required this.rooms,
-  }) : _tabController = tabController;
+    super.key,
+  });
 
-  final TabController _tabController;
-  final List<SubSpaceModel>? rooms;
+  final TabController tabController;
+  final List<SubSpaceModel> rooms;
 
   @override
   Widget build(BuildContext context) {
-    final isAutomationDeviceStatus =
-        ((ModalRoute.of(context)?.settings.arguments as SceneSettingsRouteArguments?)?.sceneType ==
-            CreateSceneEnum.deviceStatusChanges.name);
     return BlocBuilder<TabBarBloc, TabBarState>(
-      builder: (context, tabState) {
+      builder: (context, state) {
         return Column(
           mainAxisSize: MainAxisSize.min,
           children: [
-            TabBar(
-              controller: _tabController,
-              dividerColor: Colors.transparent,
-              indicatorColor: Colors.transparent,
-              tabs: [
-                ...rooms!.map((e) => Tab(
-                      child: BodyLarge(
-                        text: e.name ?? '',
-                        textAlign: TextAlign.start,
-                        style: context.bodyLarge.copyWith(
-                          color: (tabState is TabSelected) && tabState.roomId == e.id
-                              ? ColorsManager.textPrimaryColor
-                              : ColorsManager.textPrimaryColor.withOpacity(0.2),
-                        ),
-                      ),
-                    )),
-              ],
-              isScrollable: true,
-              tabAlignment: TabAlignment.start,
+            SceneDevicesBodyTabBar(
+              tabController: tabController,
+              rooms: rooms,
+              selectedRoomId: state is TabBarTabSelectedState ? state.roomId : '-1',
             ),
             Expanded(
               child: TabBarView(
-                controller: _tabController,
                 physics: const NeverScrollableScrollPhysics(),
-                children:
-                    rooms!.map((e) => _buildRoomTab(e, context, isAutomationDeviceStatus)).toList(),
+                controller: tabController,
+                children: rooms
+                    .map(
+                      (room) => _buildRoomTab(
+                        room,
+                        _isAutomationDeviceStatus(context),
+                      ),
+                    )
+                    .toList(),
               ),
             ),
           ],
@@ -70,52 +53,46 @@ class SceneDevicesBody extends StatelessWidget {
     );
   }
 
-  Widget _buildRoomTab(SubSpaceModel room, BuildContext context, bool isAutomationDeviceStatus) {
+  bool _isAutomationDeviceStatus(BuildContext context) {
+    final routeArguments =
+        ModalRoute.of(context)?.settings.arguments as SceneSettingsRouteArguments?;
+    final deviceStatusChangesScene = CreateSceneEnum.deviceStatusChanges.name;
+    final sceneType = routeArguments?.sceneType;
+
+    return sceneType == deviceStatusChangesScene;
+  }
+
+  Widget _buildRoomTab(
+    SubSpaceModel room,
+    bool isAutomationDeviceStatus,
+  ) {
     return BlocBuilder<DeviceManagerBloc, DeviceManagerState>(
       builder: (context, state) {
-        if (state.loading && state.devices == null) {
-          return const Center(child: CircularProgressIndicator());
-        } else if (state.devices != null && state.devices!.isNotEmpty) {
-          return ListView.builder(
-            itemCount: state.devices!.length,
-            itemBuilder: (context, index) {
-              final device = state.devices![index];
-              return DefaultContainer(
-                child: SceneListTile(
-                  minLeadingWidth: 40,
-                  leadingWidget: SvgPicture.asset(device.icon ?? ''),
-                  titleWidget: BodyMedium(
-                    text: device.name ?? '',
-                    style: context.titleSmall.copyWith(
-                      color: ColorsManager.secondaryTextColor,
-                      fontWeight: FontWeight.w400,
-                      fontSize: 20,
+        final isLoading = state.loading && state.devices == null;
+        final hasData =
+            state.devices != null && (state.devices?.isNotEmpty ?? false);
+        final hasError = state.error != null;
+
+        final widgets = <bool, Widget>{
+          isLoading: const AppLoadingIndicator(),
+          hasError: Center(child: Text('${state.error}')),
+          hasData: SceneDevicesList(
+            devices: state.devices ?? [],
+            isAutomationDeviceStatus: isAutomationDeviceStatus,
           ),
-                  ),
-                  trailingWidget: const Icon(
-                    Icons.arrow_forward_ios_rounded,
-                    color: ColorsManager.greyColor,
-                    size: 16,
-                  ),
-                  onPressed: () {
-                    Navigator.pushNamed(
-                      context,
-                      Routes.deviceFunctionsRoute,
-                      arguments: {
-                        "device": device,
-                        "isAutomationDeviceStatus": isAutomationDeviceStatus
-                      },
+        };
+
+        final invalidWidgetEntry = MapEntry(
+          true,
+          Center(child: Text('This subspace has no devices')),
         );
-                  },
-                ),
+
+        final validWidgetEntry = widgets.entries.firstWhere(
+          (entry) => entry.key == true,
+          orElse: () => invalidWidgetEntry,
         );
-            },
-          );
-        } else if (state.error != null) {
-          return const Center(child: Text('Something went wrong'));
-        } else {
-          return const SizedBox();
-        }
+
+        return validWidgetEntry.value;
       },
     );
   }

lib/features/scene/widgets/scene_devices/scene_devices_body_tab_bar.dart

@@ -0,0 +1,46 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_app/features/devices/model/subspace_model.dart';
+import 'package:syncrow_app/features/shared_widgets/text_widgets/body_large.dart';
+import 'package:syncrow_app/utils/context_extension.dart';
+import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
+
+class SceneDevicesBodyTabBar extends StatelessWidget {
+  const SceneDevicesBodyTabBar({
+    required this.tabController,
+    required this.rooms,
+    required this.selectedRoomId,
+    super.key,
+  });
+
+  final String selectedRoomId;
+
+  final TabController tabController;
+  final List<SubSpaceModel> rooms;
+
+  @override
+  Widget build(BuildContext context) {
+    return TabBar(
+      controller: tabController,
+      dividerColor: Colors.transparent,
+      indicatorColor: Colors.transparent,
+      isScrollable: true,
+      tabAlignment: TabAlignment.start,
+      tabs: rooms.map((e) {
+        final isSelected = selectedRoomId == e.id;
+        return Tab(
+          child: BodyLarge(
+            text: e.name ?? '',
+            textAlign: TextAlign.start,
+            style: context.bodyLarge.copyWith(
+              color: isSelected
+                  ? ColorsManager.textPrimaryColor
+                  : ColorsManager.textPrimaryColor.withValues(
+                      alpha: 0.2,
+                    ),
+            ),
+          ),
+        );
+      }).toList(),
+    );
+  }
+}

lib/features/scene/widgets/scene_devices/scene_devices_list.dart

@@ -0,0 +1,66 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:syncrow_app/features/devices/model/device_model.dart';
+import 'package:syncrow_app/features/scene/widgets/scene_list_tile.dart';
+import 'package:syncrow_app/features/shared_widgets/default_container.dart';
+import 'package:syncrow_app/features/shared_widgets/text_widgets/body_medium.dart';
+import 'package:syncrow_app/navigation/routing_constants.dart';
+import 'package:syncrow_app/utils/context_extension.dart';
+import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
+
+class SceneDevicesList extends StatelessWidget {
+  const SceneDevicesList({
+    required this.isAutomationDeviceStatus,
+    required this.devices,
+    super.key,
+  });
+  final List<DeviceModel> devices;
+  final bool isAutomationDeviceStatus;
+
+  @override
+  Widget build(BuildContext context) {
+    return ListView.builder(
+      itemCount: devices.length,
+      itemBuilder: (context, index) => _buildDeviceTile(context, devices[index]),
+    );
+  }
+
+  Widget _buildDeviceTile(
+    BuildContext context,
+    DeviceModel device,
+  ) {
+    return DefaultContainer(
+      child: SceneListTile(
+        minLeadingWidth: 40,
+        leadingWidget: SvgPicture.asset(device.icon ?? ''),
+        titleWidget: BodyMedium(
+          text: device.name ?? '',
+          style: context.titleSmall.copyWith(
+            color: ColorsManager.secondaryTextColor,
+            fontWeight: FontWeight.w400,
+            fontSize: 20,
+          ),
+        ),
+        trailingWidget: const Icon(
+          Icons.arrow_forward_ios_rounded,
+          color: ColorsManager.greyColor,
+          size: 16,
+        ),
+        onPressed: () => _navigateToDeviceFunctions(context, device),
+      ),
+    );
+  }
+
+  void _navigateToDeviceFunctions(
+    BuildContext context,
+    DeviceModel device,
+  ) {
+    Navigator.of(context).pushNamed(
+      Routes.deviceFunctionsRoute,
+      arguments: {
+        "device": device,
+        "isAutomationDeviceStatus": isAutomationDeviceStatus,
+      },
+    );
+  }
+}

lib/features/scene/widgets/scene_view_widget/scene_header.dart

@@ -1,7 +1,5 @@
 import 'package:flutter/material.dart';
-
 import 'package:syncrow_app/features/shared_widgets/text_widgets/title_medium.dart';
-
 import 'package:syncrow_app/utils/resource_manager/strings_manager.dart';
 
 class SceneHeader extends StatelessWidget {
@@ -19,10 +17,6 @@ class SceneHeader extends StatelessWidget {
             fontWeight: FontWeight.bold,
           ),
         ),
-        // SizedBox(height: 20),
-        // BodySmall(
-        //   text: StringsManager.tapToRunRoutine,
-        // ),
       ],
     );
   }

lib/features/scene/widgets/scene_view_widget/scene_item.dart

@@ -132,6 +132,10 @@ class SceneItem extends StatelessWidget {
                                             spaceUuid: HomeCubit.getInstance()
                                                 .selectedSpace!
                                                 .id),
+                                    communityId: HomeCubit.getInstance()
+                                        .selectedSpace!
+                                        .community
+                                        .uuid,
                                     automationId: scene.id));
                           },
                         ),

lib/features/scene/widgets/select_smart_scene/smart_enable_autoamtion.dart

@@ -22,7 +22,7 @@ class SmartEnableAutomation extends StatelessWidget {
       child: BlocBuilder<SceneBloc, SceneState>(
         bloc: context.read<SceneBloc>()
           ..add(
-              LoadAutomation(HomeCubit.getInstance().selectedSpace?.id ?? '')),
+              LoadAutomation(HomeCubit.getInstance().selectedSpace?.id ?? '',HomeCubit.getInstance().selectedSpace?.community.uuid ?? '')),
         builder: (context, state) {
           if (state is SceneLoading) {
             return const Align(

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(),
+    );
+  }
+}

lib/features/shared_widgets/default_scaffold.dart

@@ -59,13 +59,16 @@ class DefaultScaffold extends StatelessWidget {
           height: height ?? MediaQuery.sizeOf(context).height,
           padding: padding ??
               const EdgeInsets.symmetric(horizontal: Constants.defaultPadding),
-          decoration: const BoxDecoration(
-            image: DecorationImage(
+          decoration: BoxDecoration(
+            image: const DecorationImage(
+              colorFilter: ColorFilter.mode(
+                ColorsManager.backgroundGrey,
+                BlendMode.srcIn,
+              ),
               image: AssetImage(
                 Assets.assetsImagesBackground,
               ),
               fit: BoxFit.cover,
-              opacity: 0.4,
             ),
           ),
           child: SafeArea(child: child),

lib/generated/assets.dart

@@ -1142,5 +1142,9 @@ class Assets {
 
     static const String toggleSwitchSmall = 'assets/icons/toggleSwitchSmall.svg';
     static const String offToggleSwitchSmall = 'assets/icons/offToggleSwitchSmall.svg';
+    static const String saveRoutinesIcon = 'assets/icons/save_routines_icon.svg';
+    static const String cancelIcon = 'assets/icons/cancel_icon.svg';
+
+
 
 }

lib/navigation/router.dart

@@ -3,8 +3,8 @@ import 'package:flutter_bloc/flutter_bloc.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/app_layout/view/app_layout.dart';
-import 'package:syncrow_app/features/auth/view/otp_view.dart';
 import 'package:syncrow_app/features/auth/view/login_view.dart';
+import 'package:syncrow_app/features/auth/view/otp_view.dart';
 import 'package:syncrow_app/features/auth/view/sign_up_view.dart';
 import 'package:syncrow_app/features/dashboard/view/dashboard_view.dart';
 import 'package:syncrow_app/features/devices/bloc/device_manager_bloc/device_manager_bloc.dart';
@@ -17,11 +17,12 @@ import 'package:syncrow_app/features/scene/bloc/tab_change/tab_change_bloc.dart'
 import 'package:syncrow_app/features/scene/bloc/tab_change/tab_change_event.dart';
 import 'package:syncrow_app/features/scene/view/device_functions_view.dart';
 import 'package:syncrow_app/features/scene/view/scene_auto_settings.dart';
-import 'package:syncrow_app/features/scene/view/scene_tasks_view.dart';
 import 'package:syncrow_app/features/scene/view/scene_rooms_tabbar.dart';
+import 'package:syncrow_app/features/scene/view/scene_tasks_view.dart';
 import 'package:syncrow_app/features/scene/view/scene_view.dart';
 import 'package:syncrow_app/features/scene/view/smart_automation_select_route.dart';
 import 'package:syncrow_app/features/splash/view/splash_view.dart';
+
 import 'routing_constants.dart';
 
 class Router {
@@ -88,7 +89,7 @@ class Router {
                     BlocProvider(
                       create: (BuildContext context) =>
                           TabBarBloc(context.read<DeviceManagerBloc>())
-                            ..add(TabChanged(
+                            ..add(TabBarTabChangedEvent(
                                 selectedIndex: 0,
                                 roomId: '-1',
                                 unit: SpaceModel(

lib/services/api/api_links_endpoints.dart

@@ -11,7 +11,7 @@ abstract class ApiEndpoints {
   static const String sendOtp = '/authentication/user/send-otp';
   static const String verifyOtp = '/authentication/user/verify-otp';
   static const String forgetPassword = '/authentication/user/forget-password';
-
+  static const String clientLogin = '/client/token';
 ////////////////////////////////////// Spaces ///////////////////////////////////////
 
   ///Community Module
@@ -111,9 +111,9 @@ abstract class ApiEndpoints {
 //POST
   static const String addDeviceToRoom = '/device/room';
   static const String addDeviceToGroup = '/device/group';
-  static const String controlDevice = '/device/{deviceUuid}/control';
+  static const String controlDevice = '/devices/{deviceUuid}/command';
   static const String firmwareDevice =
-      '/device/{deviceUuid}/firmware/{firmwareVersion}';
+      '/devices/{deviceUuid}/firmware/{firmwareVersion}';
   static const String getDevicesByUserId = '/device/user/{userId}';
   static const String getDevicesByUnitId = '/device/unit/{unitUuid}';
   static const String openDoorLock = '/door-lock/open/{doorLockUuid}';
@@ -121,13 +121,13 @@ abstract class ApiEndpoints {
 //GET
   static const String deviceByRoom =
       '/projects/{projectUuid}/communities/{communityUuid}/spaces/{spaceUuid}/subspaces/{subSpaceUuid}/devices';
-  static const String deviceByUuid = '/device/{deviceUuid}';
-  static const String deviceFunctions = '/device/{deviceUuid}/functions';
-  static const String gatewayApi = '/device/gateway/{gatewayUuid}/devices';
+  static const String deviceByUuid = '/devices/{deviceUuid}';
+  static const String deviceFunctions = '/devices/{deviceUuid}/functions';
+  static const String gatewayApi = '/devices/gateway/{gatewayUuid}/devices';
   static const String deviceFunctionsStatus =
-      '/device/{deviceUuid}/functions/status';
+      '/devices/{deviceUuid}/functions/status';
   static const String powerClamp =
-      '/device/{powerClampUuid}/power-clamp/status';
+      '/devices/{deviceUuid}/functions/status';
 
   ///Device Permission Module
 //POST
@@ -144,7 +144,7 @@ abstract class ApiEndpoints {
   /// POST
   static const String createScene = '/scene/tap-to-run';
   static const String triggerScene = '/scene/tap-to-run/{sceneId}/trigger';
-  static const String createAutomation = '/automation';
+  static const String createAutomation = '/projects/{projectId}/automations';
 
   /// GET
   static const String getUnitScenes =
@@ -153,23 +153,26 @@ abstract class ApiEndpoints {
   static const String getScene = '/scene/tap-to-run/{sceneId}';
   static const String getIconScene = '/scene/icon';
 
-  static const String getUnitAutomation = '/automation/{unitUuid}';
+  static const String getUnitAutomation =
+      '/projects/{projectId}/communities/{communityId}/spaces/{unitUuid}/automations';
 
   static const String getAutomationDetails =
-      '/automation/details/{automationId}';
+      '/projects/{projectId}/automations/{automationId}';
 
   /// PUT
   static const String updateScene = '/scene/tap-to-run/{sceneId}';
 
-  static const String updateAutomation = '/automation/{automationId}';
+  static const String updateAutomation =
+      '/projects/{projectId}/automations/{automationId}';
 
   static const String updateAutomationStatus =
-      '/automation/status/{automationId}';
+      '/projects/{projectId}/automations/{automationId}';
 
   /// DELETE
   static const String deleteScene = '/scene/tap-to-run/{sceneId}';
 
-  static const String deleteAutomation = '/automation/{automationId}';
+  static const String deleteAutomation =
+      '/projects/{projectId}/automations/{automationId}';
 
   //////////////////////Door Lock //////////////////////
   //online
@@ -213,18 +216,18 @@ abstract class ApiEndpoints {
   static const String changeSchedule = '/schedule/enable/{deviceUuid}';
   static const String deleteSchedule = '/schedule/{deviceUuid}/{scheduleId}';
   static const String reportLogs =
-      '/device/report-logs/{deviceUuid}?code={code}&startTime={startTime}&endTime={endTime}';
-  static const String controlBatch = '/device/control/batch';
-  static const String statusBatch = '/device/status/batch';
-  static const String deviceScene = '/device/{deviceUuid}/scenes';
+      '/devices/report-logs/{deviceUuid}?code={code}&startTime={startTime}&endTime={endTime}';
+  static const String controlBatch = '/devices/batch';
+  static const String statusBatch = '/devices/batch';
+  static const String deviceScene = '/devices/{deviceUuid}/scenes';
 
   static const String fourSceneByName =
-      '/device/{deviceUuid}/scenes?switchName={switchName}';
+      '/devices/{deviceUuid}/scenes?switchName={switchName}';
 
   static const String resetDevice = '/factory/reset/{deviceUuid}';
   static const String unAssignScenesDevice =
-      '/device/{deviceUuid}/scenes?switchName={switchName}';
-  static const String getDeviceLogs = '/device/report-logs/{uuid}?code={code}';
+      '/devices/{deviceUuid}/scenes?switchName={switchName}';
+  static const String getDeviceLogs = '/devices/report-logs/{uuid}?code={code}';
   static const String terms = '/terms';
   static const String policy = '/policy';
   static const String getPermission = '/permission/{roleUuid}';

lib/services/api/authentication_api.dart

@@ -25,11 +25,15 @@ class AuthenticationAPI {
     return response;
   }
 
-  static Future<bool> signUp({required SignUpModel model}) async {
+  static Future<bool> signUp({
+    required SignUpModel model,
+    required String accessToken,
+  }) async {
     final response = await HTTPService().post(
         path: ApiEndpoints.signUp,
         body: model.toJson(),
         showServerMessage: false,
+        accessToken: accessToken,
         expectedResponseModel: (json) => json['statusCode'] == 201);
     return response;
   }
@@ -63,4 +67,20 @@ class AuthenticationAPI {
         expectedResponseModel: (json) => json['data']);
     return response;
   }
+
+  static Future<Map<String, dynamic>> fetchClientToken({
+    required String clientId,
+    required String clientSecret,
+  }) async {
+    final response = await HTTPService().post(
+      path: ApiEndpoints.clientLogin,
+      body: {
+        'clientId': clientId,
+        'clientSecret': clientSecret,
+      },
+      showServerMessage: false,
+      expectedResponseModel: (json) => json['data'],
+    );
+    return response;
+  }
 }

lib/services/api/devices_api.dart

@@ -1,6 +1,6 @@
 import 'dart:async';
 import 'dart:convert';
-import 'dart:developer';
+
 import 'package:syncrow_app/features/devices/model/device_category_model.dart';
 import 'package:syncrow_app/features/devices/model/device_control_model.dart';
 import 'package:syncrow_app/features/devices/model/device_model.dart';
@@ -8,7 +8,8 @@ import 'package:syncrow_app/features/devices/model/device_report_model.dart';
 import 'package:syncrow_app/features/devices/model/function_model.dart';
 import 'package:syncrow_app/services/api/api_links_endpoints.dart';
 import 'package:syncrow_app/services/api/http_service.dart';
-import 'package:syncrow_app/utils/constants/temp_const.dart';
+import 'package:syncrow_app/utils/resource_manager/constants.dart';
+
 import '../../features/devices/model/create_temporary_password_model.dart';
 
 class DevicesAPI {
@@ -39,7 +40,7 @@ class DevicesAPI {
         path: ApiEndpoints.deviceByUuid.replaceAll('{deviceUuid}', deviceId),
         body: {"deviceName": deviceName},
         expectedResponseModel: (json) {
-          return json;
+          return json['data'];
         },
       );
       return response;
@@ -92,7 +93,7 @@ class DevicesAPI {
           .replaceAll('{deviceUuid}', deviceId),
       showServerMessage: false,
       expectedResponseModel: (json) {
-        return json;
+        return json['data'];
       },
     );
     return response;
@@ -101,7 +102,7 @@ class DevicesAPI {
   static Future<Map<String, dynamic>> getPowerClampStatus(
       String deviceId) async {
     final response = await _httpService.get(
-      path: ApiEndpoints.powerClamp.replaceAll('{powerClampUuid}', deviceId),
+      path: ApiEndpoints.deviceFunctionsStatus.replaceAll('{deviceUuid}', deviceId),
       showServerMessage: false,
       expectedResponseModel: (json) {
         return json;
@@ -132,7 +133,7 @@ class DevicesAPI {
         path: ApiEndpoints.deviceFunctions.replaceAll('{deviceUuid}', deviceId),
         showServerMessage: false,
         expectedResponseModel: (json) {
-          final functions = FunctionModel.fromJson(json);
+          final functions = FunctionModel.fromJson(json['data']);
           return functions;
         });
     return response;
@@ -188,7 +189,7 @@ class DevicesAPI {
         path: ApiEndpoints.deviceByUuid.replaceAll('{deviceUuid}', deviceId),
         showServerMessage: false,
         expectedResponseModel: (json) {
-          return json;
+          return json['data'];
         });
     return response;
   }
@@ -264,7 +265,7 @@ class DevicesAPI {
         if (json == null || json.isEmpty || json == []) {
           return devices;
         }
-        for (var device in json['devices']) {
+        for (var device in json['data']['devices']) {
           devices.add(DeviceModel.fromJson(device));
         }
         return devices;
@@ -491,7 +492,12 @@ class DevicesAPI {
   }) async {
     final response = await _httpService.post(
       path: ApiEndpoints.controlBatch,
-      body: {"devicesUuid": devicesUuid, "code": code, "value": value},
+      body: {
+        "devicesUuid": devicesUuid,
+        "code": code,
+        "value": value,
+        "operationType": 'COMMAND',
+      },
       showServerMessage: true,
       expectedResponseModel: (json) {
         return json;
@@ -577,7 +583,7 @@ class DevicesAPI {
         path: path,
         showServerMessage: false,
         expectedResponseModel: (json) {
-          final data = json['data'];
+          final data = json['data'] as List<dynamic>?;
 
           if (data == null || data.isEmpty) {
             return <DeviceModel>[];
@@ -585,9 +591,14 @@ class DevicesAPI {
           if (json == null || json.isEmpty || json == []) {
             return <DeviceModel>[];
           }
-          return data
-              .map<DeviceModel>((device) => DeviceModel.fromJson(device))
-              .toList();
+          final result = <DeviceModel>[];
+          for (final device in data) { 
+              final mappedDevice = DeviceModel.fromJson(device);
+              if (mappedDevice.productType?.name != DeviceType.FlushMountedSensor.name) {
+                result.add(mappedDevice);
+              }
+          }
+          return result;
         },
       );
 

lib/services/api/home_management_api.dart

@@ -34,7 +34,7 @@ class HomeManagementAPI {
         path: ApiEndpoints.devices.replaceAll("{projectUuid}", projectUuid),
         showServerMessage: false,
         expectedResponseModel: (json) {
-          json.forEach((value) {
+          json['data'].forEach((value) {
             list.add(DeviceModel.fromJson(value));
           });
         });

lib/services/api/http_service.dart

@@ -48,13 +48,26 @@ class HTTPService {
       Options? options,
       dynamic body,
       bool showServerMessage = true,
+      String? accessToken,
       required T Function(dynamic) expectedResponseModel}) async {
     try {
+      final authOptions = options ??
+          Options(
+            headers: accessToken != null
+                ? {
+                    'Authorization': 'Bearer $accessToken',
+                    'Content-Type': 'application/json',
+                  }
+                : {
+                    'Content-Type': 'application/json',
+                  },
+          );
+
       final response = await client.post(
         path,
         data: body,
         queryParameters: queryParameters,
-        options: options,
+        options: authOptions,
       );
       return expectedResponseModel(response.data);
     } catch (error) {

lib/services/api/scene_api.dart

@@ -6,7 +6,6 @@ import 'package:syncrow_app/features/scene/model/scenes_model.dart';
 import 'package:syncrow_app/features/scene/model/update_automation.dart';
 import 'package:syncrow_app/services/api/api_links_endpoints.dart';
 import 'package:syncrow_app/services/api/http_service.dart';
-import 'package:syncrow_app/utils/constants/temp_const.dart';
 
 class SceneApi {
   static final HTTPService _httpService = HTTPService();
@@ -31,10 +30,11 @@ class SceneApi {
 
 // create automation
   static Future<Map<String, dynamic>> createAutomation(
-      CreateAutomationModel createAutomationModel) async {
+      CreateAutomationModel createAutomationModel, String projectId) async {
     try {
       final response = await _httpService.post(
-        path: ApiEndpoints.createAutomation,
+        path:
+            ApiEndpoints.createAutomation.replaceAll('{projectId}', projectId),
         body: createAutomationModel.toMap(),
         showServerMessage: false,
         expectedResponseModel: (json) {
@@ -78,10 +78,17 @@ class SceneApi {
 
   //getAutomation
 
-  static Future<List<ScenesModel>> getAutomationByUnitId(String unitId) async {
+  static Future<List<ScenesModel>> getAutomationByUnitId(
+    String unitId,
+    String communityId,
+    String projectId,
+  ) async {
     try {
       final response = await _httpService.get(
-        path: ApiEndpoints.getUnitAutomation.replaceAll('{unitUuid}', unitId),
+        path: ApiEndpoints.getUnitAutomation
+            .replaceAll('{unitUuid}', unitId)
+            .replaceAll('{communityId}', communityId)
+            .replaceAll('{projectId}', projectId),
         showServerMessage: false,
         expectedResponseModel: (json) {
           List<ScenesModel> scenes = [];
@@ -112,11 +119,12 @@ class SceneApi {
 
 //automation details
   static Future<SceneDetailsModel> getAutomationDetails(
-      String automationId) async {
+      String automationId, String projectId) async {
     try {
       final response = await _httpService.get(
         path: ApiEndpoints.getAutomationDetails
-            .replaceAll('{automationId}', automationId),
+            .replaceAll('{automationId}', automationId)
+            .replaceAll('{projectId}', projectId),
         showServerMessage: false,
         expectedResponseModel: (json) => SceneDetailsModel.fromJson(json),
       );
@@ -128,11 +136,12 @@ class SceneApi {
 
   //updateAutomationStatus
   static Future<bool> updateAutomationStatus(String automationId,
-      AutomationStatusUpdate createAutomationEnable) async {
+      AutomationStatusUpdate createAutomationEnable, String projectId) async {
     try {
-      final response = await _httpService.put(
+      final response = await _httpService.patch(
         path: ApiEndpoints.updateAutomationStatus
-            .replaceAll('{automationId}', automationId),
+            .replaceAll('{automationId}', automationId)
+            .replaceAll('{projectId}', projectId),
         body: createAutomationEnable.toMap(),
         expectedResponseModel: (json) => json['success'],
       );
@@ -194,12 +203,13 @@ class SceneApi {
   }
 
   //update automation
-  static updateAutomation(
-      CreateAutomationModel createAutomationModel, String automationId) async {
+  static updateAutomation(CreateAutomationModel createAutomationModel,
+      String automationId, String projectId) async {
     try {
       final response = await _httpService.put(
         path: ApiEndpoints.updateAutomation
-            .replaceAll('{automationId}', automationId),
+            .replaceAll('{automationId}', automationId)
+            .replaceAll('{projectId}', projectId),
         body: createAutomationModel
             .toJson(automationId.isNotEmpty == true ? automationId : null),
         expectedResponseModel: (json) {
@@ -229,11 +239,14 @@ class SceneApi {
 
   // delete automation
   static Future<bool> deleteAutomation(
-      {required String unitUuid, required String automationId}) async {
+      {required String unitUuid,
+      required String automationId,
+      required String projectId}) async {
     try {
       final response = await _httpService.delete(
         path: ApiEndpoints.deleteAutomation
-            .replaceAll('{automationId}', automationId),
+            .replaceAll('{automationId}', automationId)
+            .replaceAll('{projectId}', projectId),
         showServerMessage: false,
         expectedResponseModel: (json) => json['statusCode'] == 200,
       );

lib/utils/resource_manager/color_manager.dart

@@ -35,6 +35,7 @@ abstract class ColorsManager {
   static const Color blueColor1 = Color(0xff0A7AFF);
   static const Color grayButtonColors = Color(0xffCCCCCC);
   static const Color blueButton = Color(0xff85BDFF);
+  static const Color backgroundGrey = Color(0xFFF3F3F3);
   
 }
 //background: #F5F5F5;background: #85BDFF;

lib/utils/resource_manager/constants.dart

@@ -62,6 +62,7 @@ enum DeviceType {
   SixScene,
   SOS,
   Other,
+  FlushMountedSensor,
 }
 
 enum FunctionType { Boolean, Enum, Integer, Raw, String }
@@ -96,6 +97,7 @@ Map<String, DeviceType> devicesTypesMap = {
   "4S": DeviceType.FourScene,
   "6S": DeviceType.SixScene,
   "SOS": DeviceType.SOS,
+  "NCPS": DeviceType.FlushMountedSensor,
 };
 
 Map<DeviceType, List<FunctionModel>> devicesFunctionsMap = {