Merge branch 'dev' of https://github.com/SyncrowIOT/syncrow-app into SP-1246

lib/features/scene/helper/scene_bloc_factory.dart

@@ -1,48 +0,0 @@
-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/view/scene_view.dart

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

lib/features/shared_widgets/app_loading_indicator.dart

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

lib/services/api/api_links_endpoints.dart

@@ -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';
-  static const String powerClamp =
-      '/device/{powerClampUuid}/power-clamp/status';
+      '/devices/{deviceUuid}/functions/status';
+
+
 
   ///Device Permission Module
 //POST

lib/services/api/devices_api.dart

@@ -1,6 +1,5 @@
 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 +7,6 @@ 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 '../../features/devices/model/create_temporary_password_model.dart';
 
 class DevicesAPI {
@@ -39,7 +37,7 @@ class DevicesAPI {
         path: ApiEndpoints.deviceByUuid.replaceAll('{deviceUuid}', deviceId),
         body: {"deviceName": deviceName},
         expectedResponseModel: (json) {
-          return json;
+          return json['data'];
         },
       );
       return response;
@@ -92,7 +90,7 @@ class DevicesAPI {
           .replaceAll('{deviceUuid}', deviceId),
       showServerMessage: false,
       expectedResponseModel: (json) {
-        return json;
+        return json['data'];
       },
     );
     return response;
@@ -101,7 +99,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('{powerClampUuid}', deviceId),
       showServerMessage: false,
       expectedResponseModel: (json) {
         return json;
@@ -132,7 +130,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 +186,7 @@ class DevicesAPI {
         path: ApiEndpoints.deviceByUuid.replaceAll('{deviceUuid}', deviceId),
         showServerMessage: false,
         expectedResponseModel: (json) {
-          return json;
+          return json['data'];
         });
     return response;
   }
@@ -264,7 +262,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;

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