Refactor RoutineDevices to consolidate device data preparation in a single map to remove code duplication.

Fix routine popup and wall sensor bugs

assets/icons/scenesPlayIcon.svg

@@ -1,17 +0,0 @@
-<svg width="36" height="36" viewBox="0 0 36 36" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_6675_32326)">
-<path d="M18 3C9.71584 3 3 9.71572 3 18C3 26.2843 9.71584 33 18 33C26.2842 33 33 26.2843 33 18C33 9.71572 26.2842 3 18 3ZM23.1844 18.7951L15.6844 23.4826C15.5326 23.5774 15.3601 23.625 15.1875 23.625C15.0312 23.625 14.8746 23.5861 14.7329 23.5073C14.4349 23.3421 14.25 23.0285 14.25 22.6875V13.3125C14.25 12.9715 14.4349 12.6579 14.7329 12.4927C15.0309 12.3265 15.3953 12.3366 15.6844 12.5174L23.1844 17.2049C23.4584 17.3766 23.625 17.6769 23.625 18C23.625 18.3231 23.4584 18.6235 23.1844 18.7951Z" fill="#F4F4F4"/>
-</g>
-<defs>
-<filter id="filter0_d_6675_32326" x="0" y="0" width="36" height="36" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset/>
-<feGaussianBlur stdDeviation="1.5"/>
-<feComposite in2="hardAlpha" operator="out"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_6675_32326"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_6675_32326" result="shape"/>
-</filter>
-</defs>
-</svg>

assets/icons/scenesPlayIconCheck.svg

@@ -1,30 +0,0 @@
-<svg width="36" height="36" viewBox="0 0 36 36" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_7280_5211)">
-<circle cx="18" cy="18" r="15" fill="#F4F4F4"/>
-</g>
-<g filter="url(#filter1_i_7280_5211)">
-<path d="M25.1663 13.187C24.8231 12.8439 24.2666 12.8439 23.9234 13.1871L16.1621 20.9484L12.0766 16.8628C11.7334 16.5196 11.1768 16.5196 10.8336 16.8628C10.4904 17.206 10.4904 17.7625 10.8336 18.1057L15.5406 22.8127C15.7122 22.9844 15.9372 23.0701 16.1621 23.0701C16.3869 23.0701 16.6119 22.9843 16.7835 22.8127L25.1663 14.43C25.5095 14.0868 25.5095 13.5303 25.1663 13.187Z" fill="white"/>
-</g>
-<defs>
-<filter id="filter0_d_7280_5211" x="0" y="0" width="36" height="36" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset/>
-<feGaussianBlur stdDeviation="1.5"/>
-<feComposite in2="hardAlpha" operator="out"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_7280_5211"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_7280_5211" result="shape"/>
-</filter>
-<filter id="filter1_i_7280_5211" x="10.5762" y="12.9297" width="14.8475" height="10.1406" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset/>
-<feGaussianBlur stdDeviation="1.5"/>
-<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0"/>
-<feBlend mode="normal" in2="shape" result="effect1_innerShadow_7280_5211"/>
-</filter>
-</defs>
-</svg>

lib/pages/routines/bloc/create_routine_bloc/create_routine_bloc.dart

@@ -2,6 +2,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_event.dart';
 import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_state.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
 import 'package:syncrow_web/services/space_mana_api.dart';
 
@@ -10,11 +11,12 @@ class CreateRoutineBloc extends Bloc<CreateRoutineEvent, CreateRoutineState> {
     on<SpaceOnlyWithDevicesEvent>(_fetchSpaceOnlyWithDevices);
     on<SaveCommunityIdAndSpaceIdEvent>(saveSpaceIdCommunityId);
     on<ResetSelectedEvent>(resetSelected);
+    on<FetchCommunityEvent>(_fetchCommunity);
   }
 
   String selectedSpaceId = '';
   String selectedCommunityId = '';
-
+  List<CommunityModel> communities = [];
   List<SpaceModel> spacesOnlyWithDevices = [];
 
   Future<void> _fetchSpaceOnlyWithDevices(
@@ -30,7 +32,7 @@ class CreateRoutineBloc extends Bloc<CreateRoutineEvent, CreateRoutineState> {
 
       emit(SpaceWithDeviceLoadedState(spacesOnlyWithDevices));
     } catch (e) {
-      emit(SpaceTreeErrorState('Error loading communities and spaces: $e'));
+      emit(SpaceTreeErrorState('Error loading spaces: $e'));
     }
   }
 
@@ -48,4 +50,18 @@ class CreateRoutineBloc extends Bloc<CreateRoutineEvent, CreateRoutineState> {
     selectedCommunityId = '';
     emit(const ResetSelectedState());
   }
+
+  Future<void> _fetchCommunity(
+      FetchCommunityEvent event, Emitter<CreateRoutineState> emit) async {
+    emit(const CommunitiesLoadingState());
+
+    try {
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+      communities =
+          await CommunitySpaceManagementApi().fetchCommunities(projectUuid);
+      emit(const CommunityLoadedState());
+    } catch (e) {
+      emit(SpaceTreeErrorState('Error loading communities $e'));
+    }
+  }
 }

lib/pages/routines/bloc/create_routine_bloc/create_routine_event.dart

@@ -41,3 +41,11 @@ class ResetSelectedEvent extends CreateRoutineEvent {
   @override
   List<Object> get props => [];
 }
+
+
+class FetchCommunityEvent extends CreateRoutineEvent {
+  const FetchCommunityEvent();
+
+  @override
+  List<Object> get props => [];
+}

lib/pages/routines/bloc/create_routine_bloc/create_routine_state.dart

@@ -44,3 +44,10 @@ class ResetSelectedState extends CreateRoutineState {
   const ResetSelectedState();
 }
 
+class CommunityLoadedState extends CreateRoutineState {
+  const CommunityLoadedState();
+}
+
+class CommunitiesLoadingState extends CreateRoutineState {
+  const CommunitiesLoadingState();
+}

lib/pages/routines/create_new_routines/commu_dropdown.dart

@@ -1,12 +1,11 @@
 import 'package:dropdown_button2/dropdown_button2.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_state.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 
 class CommunityDropdown extends StatelessWidget {
   final String? selectedValue;
+  final List<CommunityModel> communities;
   final Function(String?) onChanged;
   final TextEditingController _searchController = TextEditingController();
 
@@ -14,6 +13,7 @@ class CommunityDropdown extends StatelessWidget {
     Key? key,
     required this.selectedValue,
     required this.onChanged,
+    required this.communities,
   }) : super(key: key);
 
   @override
@@ -32,123 +32,123 @@ class CommunityDropdown extends StatelessWidget {
                 ),
           ),
           const SizedBox(height: 8),
-          BlocBuilder<SpaceTreeBloc, SpaceTreeState>(
-            builder: (context, state) {
-              return SizedBox(
-                  child: Container(
+          SizedBox(
+              child: Container(
+            decoration: BoxDecoration(
+              borderRadius: BorderRadius.circular(10),
+            ),
+            child: DropdownButton2<String>(
+              underline: const SizedBox(),
+              value: selectedValue,
+              items: communities.map((community) {
+                return DropdownMenuItem<String>(
+                  value: community.uuid,
+                  child: Text(
+                    '  ${community.name}',
+                    overflow: TextOverflow.ellipsis,
+                    maxLines: 1,
+                  ),
+                );
+              }).toList(),
+              onChanged: onChanged,
+              style: const TextStyle(color: Colors.black),
+              hint: Padding(
+                padding: const EdgeInsets.only(left: 10),
+                child: Text(
+                  "  Please Select",
+                  style: Theme.of(context).textTheme.bodySmall!.copyWith(
+                        color: ColorsManager.textGray,
+                      ),
+                ),
+              ),
+              customButton: Container(
+                height: 45,
+                decoration: BoxDecoration(
+                  border: Border.all(color: ColorsManager.textGray, width: 1.0),
+                  borderRadius: BorderRadius.circular(10),
+                ),
+                child: Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                  children: [
+                    Expanded(
+                      flex: 5,
+                      child: Text(
+                        selectedValue != null
+                            ? "  ${communities.firstWhere((element) => element.uuid == selectedValue).name}"
+                            : '  Please Select',
+                        style: Theme.of(context).textTheme.bodySmall!.copyWith(
+                              color: selectedValue != null
+                                  ? Colors.black
+                                  : ColorsManager.textGray,
+                            ),
+                        overflow: TextOverflow.ellipsis,
+                      ),
+                    ),
+                    Expanded(
+                      child: Container(
+                        decoration: BoxDecoration(
+                          color: Colors.grey[100],
+                          borderRadius: const BorderRadius.only(
+                            topRight: Radius.circular(10),
+                            bottomRight: Radius.circular(10),
+                          ),
+                        ),
+                        height: 45,
+                        child: const Icon(
+                          Icons.keyboard_arrow_down,
+                          color: ColorsManager.textGray,
+                        ),
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+              dropdownStyleData: DropdownStyleData(
+                maxHeight: MediaQuery.of(context).size.height * 0.4,
                 decoration: BoxDecoration(
                   borderRadius: BorderRadius.circular(10),
                 ),
-                child: DropdownButton2<String>(
-                  underline: SizedBox(),
-                  value: selectedValue,
-                  items: state.communityList.map((community) {
-                    return DropdownMenuItem<String>(
-                      value: community.uuid,
-                      child: Text(
-                        '  ${community.name}',
-                        overflow: TextOverflow.ellipsis,
-                        maxLines: 1,
+              ),
+              dropdownSearchData: DropdownSearchData(
+                searchController: _searchController,
+                searchInnerWidgetHeight: 50,
+                searchInnerWidget: Container(
+                  height: 50,
+                  padding:
+                      const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+                  child: TextFormField(
+                    style: const TextStyle(color: Colors.black),
+                    controller: _searchController,
+                    decoration: InputDecoration(
+                      isDense: true,
+                      contentPadding: const EdgeInsets.symmetric(
+                        horizontal: 10,
+                        vertical: 12,
                       ),
-                    );
-                  }).toList(),
-                  onChanged: onChanged,
-                  style: TextStyle(color: Colors.black),
-                  hint: Padding(
-                    padding: EdgeInsets.only(left: 10),
-                    child: Text(
-                      "  Please Select",
-                      style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                            color: ColorsManager.textGray,
-                          ),
-                    ),
-                  ),
-                  customButton: Container(
-                    height: 45,
-                    decoration: BoxDecoration(
-                      border: Border.all(color: ColorsManager.textGray, width: 1.0),
-                      borderRadius: BorderRadius.circular(10),
-                    ),
-                    child: Row(
-                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                      children: [
-                        Expanded(
-                          flex: 5,
-                          child: Text(
-                            selectedValue != null
-                                ? "  ${state.communityList.firstWhere((element) => element.uuid == selectedValue).name}"
-                                : '  Please Select',
-                            style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                                  color:
-                                      selectedValue != null ? Colors.black : ColorsManager.textGray,
-                                ),
-                            overflow: TextOverflow.ellipsis,
-                          ),
-                        ),
-                        Expanded(
-                          child: Container(
-                            decoration: BoxDecoration(
-                              color: Colors.grey[100],
-                              borderRadius: const BorderRadius.only(
-                                topRight: Radius.circular(10),
-                                bottomRight: Radius.circular(10),
-                              ),
-                            ),
-                            height: 45,
-                            child: const Icon(
-                              Icons.keyboard_arrow_down,
-                              color: ColorsManager.textGray,
-                            ),
-                          ),
-                        ),
-                      ],
-                    ),
-                  ),
-                  dropdownStyleData: DropdownStyleData(
-                    maxHeight: MediaQuery.of(context).size.height * 0.4,
-                    decoration: BoxDecoration(
-                      borderRadius: BorderRadius.circular(10),
-                    ),
-                  ),
-                  dropdownSearchData: DropdownSearchData(
-                    searchController: _searchController,
-                    searchInnerWidgetHeight: 50,
-                    searchInnerWidget: Container(
-                      height: 50,
-                      padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
-                      child: TextFormField(
-                        style: const TextStyle(color: Colors.black),
-                        controller: _searchController,
-                        decoration: InputDecoration(
-                          isDense: true,
-                          contentPadding: const EdgeInsets.symmetric(
-                            horizontal: 10,
-                            vertical: 12,
-                          ),
-                          hintText: 'Search for community...',
-                          border: OutlineInputBorder(
-                            borderRadius: BorderRadius.circular(8),
-                          ),
-                        ),
+                      hintText: 'Search for community...',
+                      border: OutlineInputBorder(
+                        borderRadius: BorderRadius.circular(8),
                       ),
                     ),
-                    searchMatchFn: (item, searchValue) {
-                      final communityName = (item.child as Text).data?.toLowerCase() ?? '';
-                      return communityName.contains(searchValue.toLowerCase().trim());
-                    },
-                  ),
-                  onMenuStateChange: (isOpen) {
-                    if (!isOpen) {
-                      _searchController.clear();
-                    }
-                  },
-                  menuItemStyleData: const MenuItemStyleData(
-                    height: 40,
                   ),
                 ),
-              ));
-            },
-          ),
+                searchMatchFn: (item, searchValue) {
+                  final communityName =
+                      (item.child as Text).data?.toLowerCase() ?? '';
+                  return communityName
+                      .contains(searchValue.toLowerCase().trim());
+                },
+              ),
+              onMenuStateChange: (isOpen) {
+                if (!isOpen) {
+                  _searchController.clear();
+                }
+              },
+              menuItemStyleData: const MenuItemStyleData(
+                height: 40,
+              ),
+            ),
+          ))
         ],
       ),
     );

lib/pages/routines/create_new_routines/create_new_routines.dart

@@ -5,11 +5,10 @@ import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routi
 import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/create_new_routines/commu_dropdown.dart';
 import 'package:syncrow_web/pages/routines/create_new_routines/space_dropdown.dart';
-
 import 'package:syncrow_web/utils/color_manager.dart';
 
 class CreateNewRoutinesDialog extends StatefulWidget {
-  const CreateNewRoutinesDialog({Key? key}) : super(key: key);
+  const CreateNewRoutinesDialog({super.key});
 
   @override
   State<CreateNewRoutinesDialog> createState() =>
@@ -19,136 +18,160 @@ class CreateNewRoutinesDialog extends StatefulWidget {
 class _CreateNewRoutinesDialogState extends State<CreateNewRoutinesDialog> {
   String? _selectedCommunity;
   String? _selectedSpace;
-  void _fetchSpaces(String communityId) {
-    context
-        .read<CreateRoutineBloc>()
-        .add(SpaceOnlyWithDevicesEvent(communityId));
-  }
 
   @override
   Widget build(BuildContext context) {
-    return BlocBuilder<CreateRoutineBloc, CreateRoutineState>(
-      builder: (context, state) {
-        final _bloc = BlocProvider.of<CreateRoutineBloc>(context);
-        final spaces = _bloc.spacesOnlyWithDevices;
-        final isLoading = state is SpaceWithDeviceLoadingState;
+    return BlocProvider(
+        create: (BuildContext context) =>
+            CreateRoutineBloc()..add(const FetchCommunityEvent()),
+        child: BlocBuilder<CreateRoutineBloc, CreateRoutineState>(
+          builder: (context, state) {
+            final _bloc = BlocProvider.of<CreateRoutineBloc>(context);
+            final spaces = _bloc.spacesOnlyWithDevices;
+            final isLoadingCommunities = state is CommunitiesLoadingState;
+            final isLoadingSpaces = state is SpaceWithDeviceLoadingState;
+            String spaceHint = 'Select a community first';
+            if (_selectedCommunity != null) {
+              if (isLoadingSpaces) {
+                spaceHint = 'Loading spaces...';
+              } else if (spaces.isEmpty) {
+                spaceHint = 'No spaces available';
+              } else {
+                spaceHint = 'Select Space';
+              }
+            }
 
-        String spaceHint = 'Select a community first';
-
-        if (_selectedCommunity != null) {
-          if (isLoading) {
-            spaceHint = 'Loading spaces...';
-          } else if (spaces.isEmpty) {
-            spaceHint = 'No spaces available';
-          } else {
-            spaceHint = 'Select Space';
-          }
-        }
-
-        return AlertDialog(
-          backgroundColor: Colors.white,
-          insetPadding: EdgeInsets.zero,
-          contentPadding: EdgeInsets.zero,
-          shape:
-              RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
-          title: Text(
-            'Create New Routines',
-            textAlign: TextAlign.center,
-            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                  color: ColorsManager.primaryColor,
-                ),
-          ),
-          content: Column(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              const Divider(),
-              Padding(
-                padding: const EdgeInsets.only(left: 15, right: 15),
-                child: CommunityDropdown(
-                  selectedValue: _selectedCommunity,
-                  onChanged: (String? newValue) {
-                    setState(() {
-                      _selectedCommunity = newValue;
-                      _selectedSpace = null;
-                    });
-                    if (newValue != null) {
-                      _fetchSpaces(newValue);
-                    }
-                  },
-                ),
+            return AlertDialog(
+              backgroundColor: Colors.white,
+              insetPadding: EdgeInsets.zero,
+              contentPadding: EdgeInsets.zero,
+              shape: RoundedRectangleBorder(
+                  borderRadius: BorderRadius.circular(12)),
+              title: Text(
+                'Create New Routines',
+                textAlign: TextAlign.center,
+                style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                      color: ColorsManager.primaryColor,
+                    ),
               ),
-              const SizedBox(height: 5),
-              Padding(
-                padding: const EdgeInsets.only(left: 15, right: 15),
-                child: SpaceDropdown(
-                  hintMessage: spaceHint,
-                  spaces: spaces,
-                  selectedValue: _selectedSpace,
-                  onChanged: (String? newValue) {
-                    setState(() {
-                      _selectedSpace = newValue;
-                    });
-                  },
-                ),
-              ),
-              const Divider(),
-              Row(
-                mainAxisAlignment: MainAxisAlignment.spaceAround,
+              content: Stack(
                 children: [
-                  Padding(
-                    padding: const EdgeInsets.only(
-                      left: 20,
-                      right: 20,
-                    ),
-                    child: TextButton(
-                      onPressed: () {
-                        Navigator.of(context).pop();
-                      },
-                      child: Text(
-                        'Cancel',
-                        style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                              fontWeight: FontWeight.w400,
-                              fontSize: 14,
-                              color: ColorsManager.blackColor,
-                            ),
+                  Column(
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      const Divider(),
+                      Padding(
+                        padding: const EdgeInsets.only(left: 15, right: 15),
+                        child: CommunityDropdown(
+                          communities: _bloc.communities,
+                          selectedValue: _selectedCommunity,
+                          onChanged: (String? newValue) {
+                            setState(() {
+                              _selectedCommunity = newValue;
+                              _selectedSpace = null;
+                            });
+                            if (newValue != null) {
+                              _bloc.add(SpaceOnlyWithDevicesEvent(newValue));
+                            }
+                          },
+                        ),
                       ),
-                    ),
-                  ),
-                  Padding(
-                    padding: const EdgeInsets.only(
-                      left: 20,
-                      right: 20,
-                    ),
-                    child: TextButton(
-                      onPressed:
-                          _selectedCommunity != null && _selectedSpace != null
-                              ? () {
-                                  Navigator.of(context).pop({
-                                    'community': _selectedCommunity,
-                                    'space': _selectedSpace,
-                                  });
-                                }
-                              : null,
-                      child: Text(
-                        'Next',
-                        style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                              fontWeight: FontWeight.w400,
-                              fontSize: 14,
-                              color: _selectedCommunity != null &&
+                      const SizedBox(height: 5),
+                      Padding(
+                        padding: const EdgeInsets.only(left: 15, right: 15),
+                        child: SpaceDropdown(
+                          hintMessage: spaceHint,
+                          spaces: spaces,
+                          selectedValue: _selectedSpace,
+                          onChanged: (String? newValue) {
+                            setState(() {
+                              _selectedSpace = newValue;
+                            });
+                          },
+                        ),
+                      ),
+                      const Divider(),
+                      Row(
+                        mainAxisAlignment: MainAxisAlignment.spaceAround,
+                        children: [
+                          Padding(
+                            padding: const EdgeInsets.only(
+                              left: 20,
+                              right: 20,
+                            ),
+                            child: TextButton(
+                              onPressed: () {
+                                Navigator.of(context).pop();
+                              },
+                              child: Text(
+                                'Cancel',
+                                style: Theme.of(context)
+                                    .textTheme
+                                    .bodyMedium!
+                                    .copyWith(
+                                      fontWeight: FontWeight.w400,
+                                      fontSize: 14,
+                                      color: ColorsManager.blackColor,
+                                    ),
+                              ),
+                            ),
+                          ),
+                          Padding(
+                            padding: const EdgeInsets.only(
+                              left: 20,
+                              right: 20,
+                            ),
+                            child: TextButton(
+                              onPressed: _selectedCommunity != null &&
                                       _selectedSpace != null
-                                  ? ColorsManager.blueColor
-                                  : Colors.blue.shade100,
+                                  ? () {
+                                      Navigator.of(context).pop({
+                                        'community': _selectedCommunity,
+                                        'space': _selectedSpace,
+                                      });
+                                    }
+                                  : null,
+                              child: Text(
+                                'Next',
+                                style: Theme.of(context)
+                                    .textTheme
+                                    .bodyMedium!
+                                    .copyWith(
+                                      fontWeight: FontWeight.w400,
+                                      fontSize: 14,
+                                      color: _selectedCommunity != null &&
+                                              _selectedSpace != null
+                                          ? ColorsManager.blueColor
+                                          : Colors.blue.shade100,
+                                    ),
+                              ),
                             ),
+                          ),
+                        ],
+                      ),
+                      const SizedBox(height: 10),
+                    ],
+                  ),
+                  if (isLoadingCommunities)
+                    const SizedBox(
+                      height: 200,
+                      child: Column(
+                        mainAxisSize: MainAxisSize.min,
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        crossAxisAlignment: CrossAxisAlignment.center,
+                        children: [
+                          Center(
+                            child: CircularProgressIndicator(
+                              color: ColorsManager.primaryColor,
+                            ),
+                          ),
+                        ],
                       ),
                     ),
-                  ),
                 ],
               ),
-              SizedBox(height: 10),
-            ],
-          ),
-        );
-      },
-    );
+            );
+          },
+        ));
   }
 }

lib/pages/routines/models/wps/wps_functions.dart

@@ -244,11 +244,12 @@ class CurrentDistanceFunction extends WpsFunctions {
   @override
   List<WpsOperationalValue> getOperationalValues() {
     List<WpsOperationalValue> values = [];
-    for (int temp = min; temp <= max; temp += step) {
+    for (int cm = min; cm <= max; cm += step) {
       values.add(WpsOperationalValue(
         icon: Assets.assetsTempreture,
-        description: "${temp}CM",
-        value: temp,
+        description: "${cm}CM",
+
+        value: cm,
       ));
     }
     return values;

lib/pages/routines/view/routines_view.dart

@@ -90,6 +90,7 @@ class _RoutinesViewState extends State<RoutinesView> {
                       ],
                     ),
                   ),
+                  const SizedBox(height: 50),
                 ],
               ),
             )

lib/pages/routines/widgets/if_container.dart

@@ -105,9 +105,7 @@ class IfContainer extends StatelessWidget {
             );
           },
           onAcceptWithDetails: (data) async {
-            print('data.data=${data.data}');
             final uniqueCustomId = const Uuid().v4();
-
             final mutableData = Map<String, dynamic>.from(data.data);
             mutableData['uniqueCustomId'] = uniqueCustomId;
 

lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart

@@ -31,165 +31,185 @@ class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
             ? const Center(
                 child: CircularProgressIndicator(),
               )
-            : Padding(
-                padding: const EdgeInsets.symmetric(vertical: 16.0),
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    Text(
-                      "Scenes (Tab to Run)",
-                      style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                            color: ColorsManager.grayColor,
-                            fontWeight: FontWeight.bold,
-                          ),
-                    ),
-                    const SizedBox(height: 10),
-                    if (state.scenes.isEmpty)
-                      Expanded(
-                        child: Text(
+            : SingleChildScrollView(
+                child: Padding(
+                  padding: const EdgeInsets.symmetric(vertical: 16.0),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      Text(
+                        "Scenes (Tab to Run)",
+                        style: Theme.of(context).textTheme.titleLarge?.copyWith(
+                              color: ColorsManager.grayColor,
+                              fontWeight: FontWeight.bold,
+                            ),
+                      ),
+                      const SizedBox(height: 10),
+                      if (state.scenes.isEmpty)
+                        Text(
                           "No scenes found",
                           style: context.textTheme.bodyMedium?.copyWith(
                             color: ColorsManager.grayColor,
                           ),
                         ),
-                      ),
-                    if (state.scenes.isNotEmpty)
-                      ConstrainedBox(
-                        constraints: BoxConstraints(
-                            maxHeight: isSmallScreenSize(context) ? 190 : 200,
-                            maxWidth: MediaQuery.sizeOf(context).width * 0.8),
-                        child: ListView.builder(
-                            scrollDirection: Axis.horizontal,
-                            itemCount: state.scenes.length,
-                            itemBuilder: (context, index) {
-                              final scene = state.scenes[index];
-                              final isLoading =
-                                  state.loadingSceneId == scene.id;
+                      if (state.scenes.isNotEmpty)
+                        SizedBox(
+                          height: 200, 
+                          child: ListView.builder(
+                              shrinkWrap: true,
+                              scrollDirection: Axis.horizontal,
+                              itemCount: state.scenes.length,
+                              itemBuilder: (context, index) {
+                                final scene = state.scenes[index];
+                                final isLoading =
+                                    state.loadingSceneId == scene.id;
 
-                              return Padding(
-                                padding: EdgeInsets.only(
-                                  right: isSmallScreenSize(context) ? 4.0 : 8.0,
-                                ),
-                                child: RoutineViewCard(
-                                  isLoading: isLoading,
-                                  sceneOnTap: () {
-                                    context.read<RoutineBloc>().add(
-                                        SceneTrigger(
-                                            sceneId: scene.id,
-                                            name: scene.name));
-                                  },
-                                  status: state.scenes[index].status,
-                                  communityId:
-                                      state.scenes[index].communityId ?? '',
-                                  spaceId: state.scenes[index].spaceId,
-                                  sceneId: state.scenes[index].sceneTuyaId!,
-                                  automationId: state.scenes[index].id,
-                                  cardType: 'scenes',
-                                  spaceName: state.scenes[index].spaceName,
-                                  onTap: () {
-                                    BlocProvider.of<RoutineBloc>(context).add(
-                                      const CreateNewRoutineViewEvent(
-                                          createRoutineView: true),
-                                    );
-                                    context.read<RoutineBloc>().add(
-                                          GetSceneDetails(
-                                            sceneId: state.scenes[index].id,
-                                            isTabToRun: true,
-                                            isUpdate: true,
-                                          ),
-                                        );
-                                  },
-                                  textString: state.scenes[index].name,
-                                  icon: state.scenes[index].icon ??
-                                      Assets.logoHorizontal,
-                                  isFromScenes: true,
-                                  iconInBytes: state.scenes[index].iconInBytes,
-                                ),
-                              );
-                            }),
+                                return Padding(
+                                  padding: EdgeInsets.only(
+                                    right:
+                                        isSmallScreenSize(context) ? 4.0 : 8.0,
+                                  ),
+                                  child: Column(
+                                    children: [
+                                      RoutineViewCard(
+                                        isLoading: isLoading,
+                                        sceneOnTap: () {
+                                          context.read<RoutineBloc>().add(
+                                              SceneTrigger(
+                                                  sceneId: scene.id,
+                                                  name: scene.name));
+                                        },
+                                        status: state.scenes[index].status,
+                                        communityId:
+                                            state.scenes[index].communityId ??
+                                                '',
+                                        spaceId: state.scenes[index].spaceId,
+                                        sceneId:
+                                            state.scenes[index].sceneTuyaId!,
+                                        automationId: state.scenes[index].id,
+                                        cardType: 'scenes',
+                                        spaceName:
+                                            state.scenes[index].spaceName,
+                                        onTap: () {
+                                          BlocProvider.of<RoutineBloc>(context)
+                                              .add(
+                                            const CreateNewRoutineViewEvent(
+                                                createRoutineView: true),
+                                          );
+                                          context.read<RoutineBloc>().add(
+                                                GetSceneDetails(
+                                                  sceneId:
+                                                      state.scenes[index].id,
+                                                  isTabToRun: true,
+                                                  isUpdate: true,
+                                                ),
+                                              );
+                                        },
+                                        textString: state.scenes[index].name,
+                                        icon: state.scenes[index].icon ??
+                                            Assets.logoHorizontal,
+                                        isFromScenes: true,
+                                        iconInBytes:
+                                            state.scenes[index].iconInBytes,
+                                      ),
+                                    ],
+                                  ),
+                                );
+                              }),
+                        ),
+                      const SizedBox(height: 10),
+                      Text(
+                        "Automations",
+                        style: Theme.of(context).textTheme.titleLarge?.copyWith(
+                              color: ColorsManager.grayColor,
+                              fontWeight: FontWeight.bold,
+                            ),
                       ),
-                    const SizedBox(height: 10),
-                    Text(
-                      "Automations",
-                      style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                            color: ColorsManager.grayColor,
-                            fontWeight: FontWeight.bold,
-                          ),
-                    ),
-                    const SizedBox(height: 5),
-                    if (state.automations.isEmpty)
-                      Expanded(
-                        child: Text(
+                      const SizedBox(height: 3),
+                      if (state.automations.isEmpty)
+                        Text(
                           "No automations found",
                           style: context.textTheme.bodyMedium?.copyWith(
                             color: ColorsManager.grayColor,
                           ),
                         ),
-                      ),
-                    if (state.automations.isNotEmpty)
-                      ConstrainedBox(
-                        constraints: BoxConstraints(
-                            maxHeight: isSmallScreenSize(context) ? 185 : 192,
-                            maxWidth: MediaQuery.sizeOf(context).width * 0.7),
-                        child: ListView.builder(
-                            scrollDirection: Axis.horizontal,
-                            itemCount: state.automations.length,
-                            itemBuilder: (context, index) {
-                              final isLoading = state.automations!
-                                  .contains(state.automations[index].id);
+                      if (state.automations.isNotEmpty)
+                        SizedBox(
+                          height: 200, 
 
-                              return Padding(
-                                padding: EdgeInsets.only(
-                                  right: isSmallScreenSize(context) ? 4.0 : 8.0,
-                                ),
-                                child: RoutineViewCard(
-                                  isLoading: isLoading,
-                                  onChanged: (v) {
-                                    // BlocProvider.of<RoutineBloc>(context)
-                                    context.read<RoutineBloc>().add(
-                                          UpdateAutomationStatus(
-                                            automationId:
-                                                state.automations[index].id,
-                                            automationStatusUpdate:
-                                                AutomationStatusUpdate(
-                                                    spaceUuid: state
-                                                        .automations[index]
-                                                        .spaceId,
-                                                    isEnable: v),
-                                            communityId: state
-                                                .automations[index].communityId,
-                                          ),
-                                        );
-                                  },
-                                  status: state.automations[index].status,
-                                  communityId: '',
-                                  spaceId: state.automations[index].spaceId,
-                                  sceneId: '',
-                                  automationId: state.automations[index].id,
-                                  cardType: 'automations',
-                                  spaceName: state.scenes[index].spaceName,
-                                  onTap: () {
-                                    BlocProvider.of<RoutineBloc>(context).add(
-                                      const CreateNewRoutineViewEvent(
-                                          createRoutineView: true),
-                                    );
-                                    context.read<RoutineBloc>().add(
-                                          GetAutomationDetails(
-                                              automationId:
-                                                  state.automations[index].id,
-                                              isAutomation: true,
-                                              isUpdate: true),
-                                        );
-                                  },
-                                  textString: state.automations[index].name,
-                                  icon: state.automations[index].icon ??
-                                      Assets.automation,
-                                ),
-                              );
-                            }),
-                      ),
-                  ],
+                          child: ListView.builder(
+                              shrinkWrap: true,
+                              scrollDirection: Axis.horizontal,
+                              itemCount: state.automations.length,
+                              itemBuilder: (context, index) {
+                                final isLoading = state.automations!
+                                    .contains(state.automations[index].id);
+
+                                return Column(
+                                  children: [
+                                    Padding(
+                                      padding: EdgeInsets.only(
+                                        right: isSmallScreenSize(context)
+                                            ? 4.0
+                                            : 8.0,
+                                      ),
+                                      child: RoutineViewCard(
+                                        isLoading: isLoading,
+                                        onChanged: (v) {
+                                          context.read<RoutineBloc>().add(
+                                                UpdateAutomationStatus(
+                                                  automationId: state
+                                                      .automations[index].id,
+                                                  automationStatusUpdate:
+                                                      AutomationStatusUpdate(
+                                                          spaceUuid: state
+                                                              .automations[
+                                                                  index]
+                                                              .spaceId,
+                                                          isEnable: v),
+                                                  communityId: state
+                                                      .automations[index]
+                                                      .communityId,
+                                                ),
+                                              );
+                                        },
+                                        status: state.automations[index].status,
+                                        communityId: '',
+                                        spaceId:
+                                            state.automations[index].spaceId,
+                                        sceneId: '',
+                                        automationId:
+                                            state.automations[index].id,
+                                        cardType: 'automations',
+                                        spaceName:
+                                            state.scenes[index].spaceName,
+                                        onTap: () {
+                                          BlocProvider.of<RoutineBloc>(context)
+                                              .add(
+                                            const CreateNewRoutineViewEvent(
+                                                createRoutineView: true),
+                                          );
+                                          context.read<RoutineBloc>().add(
+                                                GetAutomationDetails(
+                                                    automationId: state
+                                                        .automations[index].id,
+                                                    isAutomation: true,
+                                                    isUpdate: true),
+                                              );
+                                        },
+                                        textString:
+                                            state.automations[index].name,
+                                        icon: state.automations[index].icon ??
+                                            Assets.automation,
+                                      ),
+                                    ),
+                                  ],
+                                );
+                              }),
+                        ),
+                    ],
+                  ),
                 ),
               );
       },

lib/pages/routines/widgets/main_routine_view/routine_view_card.dart

@@ -106,10 +106,10 @@ class _RoutineViewCardState extends State<RoutineViewCard> {
                           if (widget.isFromScenes ?? false)
                             InkWell(
                               onTap: _handleSceneTap,
-                              child: SvgPicture.asset(
+                              child: Image.asset(
                                 _showTemporaryCheck
-                                    ? Assets.scenesPlayIconCheck
-                                    : Assets.scenesPlayIcon,
+                                    ? Assets.scenesPlayIcon
+                                    : Assets.scenesPlayIconCheck,
                                 fit: BoxFit.contain,
                               ),
                             )
@@ -177,6 +177,8 @@ class _RoutineViewCardState extends State<RoutineViewCard> {
                               : (widget.icon is String &&
                                       widget.icon.endsWith('.svg'))
                                   ? SvgPicture.asset(
+                                      height: iconSize,
+                                      width: iconSize,
                                       widget.icon,
                                       fit: BoxFit.contain,
                                     )

lib/pages/routines/widgets/routine_devices.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/widgets/dragable_card.dart';
 
@@ -18,6 +17,8 @@ class _RoutineDevicesState extends State<RoutineDevices> {
     context.read<RoutineBloc>().add(FetchDevicesInRoutine());
   }
 
+  static const _allowedProductTypes = {'AC', '1G', '2G', '3G', 'WPS', 'GW'};
+
   @override
   Widget build(BuildContext context) {
     return BlocBuilder<RoutineBloc, RoutineState>(
@@ -32,13 +33,8 @@ class _RoutineDevicesState extends State<RoutineDevices> {
           }
         });
 
-        List<AllDevicesModel> deviceList = state.devices
-            .where((device) =>
-                device.productType == 'AC' ||
-                device.productType == '1G' ||
-                device.productType == '2G' ||
-                device.productType == '3G' ||
-                device.productType == 'WPS')
+        final deviceList = state.devices
+            .where((device) => _allowedProductTypes.contains(device.productType))
             .toList();
 
         return Wrap(
@@ -46,37 +42,32 @@ class _RoutineDevicesState extends State<RoutineDevices> {
           runSpacing: 10,
           children: deviceList.asMap().entries.map((entry) {
             final device = entry.value;
+
+            final deviceData = {
+              'device': device,
+              'imagePath': device.getDefaultIcon(device.productType),
+              'title': device.name ?? '',
+              'deviceId': device.uuid,
+              'productType': device.productType,
+              'functions': device.functions,
+              'uniqueCustomId': '',
+            };
+
             if (state.searchText != null && state.searchText!.isNotEmpty) {
               return device.name!
                       .toLowerCase()
                       .contains(state.searchText!.toLowerCase())
                   ? DraggableCard(
-                      imagePath: device.getDefaultIcon(device.productType),
-                      title: device.name ?? '',
-                      deviceData: {
-                        'device': device,
-                        'imagePath': device.getDefaultIcon(device.productType),
-                        'title': device.name ?? '',
-                        'deviceId': device.uuid,
-                        'productType': device.productType,
-                        'functions': device.functions,
-                        'uniqueCustomId': '',
-                      },
+                      imagePath: deviceData['imagePath'] as String,
+                      title: deviceData['title'] as String,
+                      deviceData: deviceData,
                     )
-                  : Container();
+                  : const SizedBox.shrink();
             } else {
               return DraggableCard(
-                imagePath: device.getDefaultIcon(device.productType),
-                title: device.name ?? '',
-                deviceData: {
-                  'device': device,
-                  'imagePath': device.getDefaultIcon(device.productType),
-                  'title': device.name ?? '',
-                  'deviceId': device.uuid,
-                  'productType': device.productType,
-                  'functions': device.functions,
-                  'uniqueCustomId': '',
-                },
+                imagePath: deviceData['imagePath'] as String,
+                title: deviceData['title'] as String,
+                deviceData: deviceData,
               );
             }
           }).toList(),

lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart

@@ -13,7 +13,6 @@ import 'package:syncrow_web/utils/extension/build_context_x.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/routines/bloc/functions_bloc/functions_bloc_bloc.dart';
 
-
 class WallPresenceSensor extends StatefulWidget {
   final List<DeviceFunction> functions;
   final AllDevicesModel? device;
@@ -171,7 +170,7 @@ class _WallPresenceSensorState extends State<WallPresenceSensor> {
       orElse: () => DeviceFunctionData(
         entityId: '',
         functionCode: selectedFunction,
-        operationName: '',
+        operationName: state.selectedOperationName ?? '',
         value: null,
       ),
     );
@@ -251,11 +250,8 @@ class _ValueSelector extends StatelessWidget {
     );
   }
 
-  bool _isSliderFunction(String function) => [
-        'dis_current',
-        'presence_time',
-        'illuminance_value'
-      ].contains(function);
+  bool _isSliderFunction(String function) =>
+      ['dis_current', 'presence_time', 'illuminance_value'].contains(function);
 }
 
 class _SliderValueSelector extends StatelessWidget {

lib/utils/constants/assets.dart

@@ -408,9 +408,9 @@ class Assets {
   static const String spaceLinkIcon = 'assets/icons/space_link_icon.svg';
   static const String successIcon = 'assets/icons/success_icon.svg';
   static const String spaceLocationIcon = 'assets/icons/spaseLocationIcon.svg';
-  static const String scenesPlayIcon = 'assets/icons/scenesPlayIcon.svg';
+  static const String scenesPlayIcon = 'assets/icons/scenesPlayIcon.png';
   static const String scenesPlayIconCheck =
-      'assets/icons/scenesPlayIconCheck.svg';
+      'assets/icons/scenesPlayIconCheck.png';
   static const String presenceStateIcon = 'assets/icons/presence_state.svg';
   static const String currentDistanceIcon =
       'assets/icons/current_distance_icon.svg';
@@ -427,5 +427,4 @@ class Assets {
     static const String presenceTimeIcon = 'assets/icons/presence_time_icon.svg';
     static const String IlluminanceIcon = 'assets/icons/Illuminance_icon.svg';
 
-  //Illuminance_icon
 }