use very_good_analysis lints.

<!--
  Thanks for contributing!

Provide a description of your changes below and a general summary in the
title

Please look at the following checklist to ensure that your PR can be
accepted quickly:
-->

## Jira Ticket
[sp:1702 fix Bug](https://syncrow.atlassian.net/browse/SP-1702)

## Description

fix the issue when nothing edited save button not appears
## Type of Change

<!--- Put an `x` in all the boxes that apply: -->

- [ ] ✨ New feature (non-breaking change which adds functionality)
- [x] 🛠️ Bug fix (non-breaking change which fixes an issue)
- [ ] ❌ Breaking change (fix or feature that would cause existing
functionality to change)
- [ ] 🧹 Code refactor
- [ ] ✅ Build configuration change
- [ ] 📝 Documentation
- [ ] 🗑️ Chore

analysis_options.yaml

@@ -1,33 +1,27 @@
-# This file configures the analyzer, which statically analyzes Dart code to
+include: package:very_good_analysis/analysis_options.yaml
-# check for errors, warnings, and lints.
-#
-# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
-# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
-# invoked from the command line by running `flutter analyze`.
 
-# The following line activates a set of recommended lints for Flutter apps,
-# packages, and plugins designed to encourage good coding practices.
 analyzer:
   errors:
-    constant_identifier_names: ignore
+    strict_raw_type: warning
-    overridden_fields: ignore
+    argument_type_not_assignable: warning
-include: package:flutter_lints/flutter.yaml
+    invalid_assignment: warning
+    return_of_invalid_type: warning
+    return_of_invalid_type_from_closure: warning
+    list_element_type_not_assignable: warning
+    for_in_of_invalid_type: warning
+    cast_nullable_to_non_nullable: warning
+    non_bool_condition: warning
+    field_initializer_not_assignable: warning
+    non_bool_negation_expression: warning
+    non_bool_operand: warning
 
 linter:
-  # The lint rules applied to this project can be customized in the
-  # section below to disable rules from the `package:flutter_lints/flutter.yaml`
-  # included above or to enable additional rules. A list of all available lints
-  # and their documentation is published at https://dart.dev/lints.
-  #
-  # Instead of disabling a lint rule for the entire project in the
-  # section below, it can also be suppressed for a single line of code
-  # or a specific dart file by using the `// ignore: name_of_lint` and
-  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
-  # producing the lint.
   rules:
-    # avoid_print: false  # Uncomment to disable the `avoid_print` rule
+    prefer_single_quotes: true
-    # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
+    avoid_print: false
-    prefer_const_constructors: true
+    public_member_api_docs: false
-
+    sort_pub_dependencies: false
-# Additional information about this file can be found at
+    one_member_abstracts: false
-# https://dart.dev/guides/language/analysis-options
+    prefer_int_literals: false
+    sort_constructors_first: false
+    avoid_redundant_argument_values: false

lib/pages/access_management/bloc/access_bloc.dart

@@ -267,7 +267,8 @@ class AccessBloc extends Bloc<AccessEvent, AccessState> {
     selectedIndex = 0;
     effectiveTimeTimeStamp = null;
     expirationTimeTimeStamp = null;
-    add(FetchTableData());
+    filteredData = List.from(data);
+    emit(TableLoaded(filteredData));
   }
 
   String timestampToDate(dynamic timestamp) {

lib/pages/device_managment/all_devices/widgets/device_search_filters.dart

@@ -34,7 +34,8 @@ class _DeviceSearchFiltersState extends State<DeviceSearchFilters>
       runSpacing: 10,
       children: [
         _buildSearchField("Space Name", _unitNameController, 200),
-        _buildSearchField("Device Name / Product Name", _productNameController, 300),
+        _buildSearchField(
+            "Device Name / Product Name", _productNameController, 300),
         _buildSearchResetButtons(),
       ],
     );
@@ -74,9 +75,7 @@ class _DeviceSearchFiltersState extends State<DeviceSearchFilters>
       onReset: () {
         _unitNameController.clear();
         _productNameController.clear();
-        context.read<DeviceManagementBloc>()
+        context.read<DeviceManagementBloc>().add(ResetFilters());
-          ..add(ResetFilters())
-          ..add(FetchDevices(context));
       },
     );
   }

lib/pages/device_managment/device_setting/device_management_content.dart

@@ -1,10 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
 import 'package:syncrow_web/pages/device_managment/device_setting/settings_model/device_info_model.dart';
 import 'package:syncrow_web/pages/device_managment/device_setting/settings_model/sub_space_model.dart';
 import 'package:syncrow_web/pages/device_managment/device_setting/sub_space_dialog.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 import 'package:syncrow_web/web_layout/default_container.dart';
 
@@ -28,7 +30,7 @@ class DeviceManagementContent extends StatelessWidget {
         Widget? trailing,
         required Color? valueColor}) {
       return Padding(
-        padding: const EdgeInsets.symmetric(vertical: 6.0),
+        padding: const EdgeInsets.symmetric(vertical: 10.0, horizontal: 10),
         child: Row(
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: [
@@ -39,6 +41,7 @@ class DeviceManagementContent extends StatelessWidget {
                 color: ColorsManager.grayColor,
               ),
             ),
+            const SizedBox(width: 15),
             Expanded(
               child: Text(
                 value,
@@ -48,7 +51,7 @@ class DeviceManagementContent extends StatelessWidget {
                 overflow: TextOverflow.ellipsis,
               ),
             ),
-            const SizedBox(width: 8),
+            const SizedBox(width: 12),
             trailing ?? const SizedBox.shrink(),
           ],
         ),
@@ -75,13 +78,13 @@ class DeviceManagementContent extends StatelessWidget {
               child: infoRow(
                   label: 'Sub-Space:',
                   value: deviceInfo.subspace.subspaceName,
-                valueColor: ColorsManager.textGray,
+                  valueColor: ColorsManager.blackColor,
-                trailing: const Icon(
+                  trailing: SvgPicture.asset(
-                  Icons.arrow_forward_ios,
+                    Assets.arrowDown,
-                  size: 16,
+                    width: 10,
+                    height: 10,
                     color: ColorsManager.greyColor,
-                ),
+                  )),
-              ),
             ),
           ),
           const Divider(color: ColorsManager.dividerColor),
@@ -104,7 +107,7 @@ class DeviceManagementContent extends StatelessWidget {
                 },
                 child: const Icon(
                   Icons.copy,
-                  size: 16,
+                  size: 15,
                   color: ColorsManager.greyColor,
                 ),
               ),

lib/pages/device_managment/device_setting/device_settings_panel.dart

@@ -51,8 +51,7 @@ class DeviceSettingsPanel extends StatelessWidget {
                   Container(
                     width: MediaQuery.of(context).size.width * 0.3,
                     color: ColorsManager.grey25,
-                    padding: const EdgeInsets.symmetric(
+                    padding: const EdgeInsets.all(10),
-                        horizontal: 20, vertical: 24),
                     child: ListView(
                       children: [
                         Row(
@@ -70,22 +69,26 @@ class DeviceSettingsPanel extends StatelessWidget {
                           children: [
                             Text(
                               'Device Settings',
-                              style:
+                              style: context.theme.textTheme.titleLarge!
-                                  context.theme.textTheme.titleLarge!.copyWith(
+                                  .copyWith(
-                                fontWeight: FontWeight.bold,
+                                      fontWeight: FontWeight.w700,
-                                color: ColorsManager.primaryColor,
+                                      color: ColorsManager.vividBlue
-                              ),
+                                          .withOpacity(0.7),
+                                      fontSize: 24),
                             ),
                           ],
                         ),
                         const SizedBox(height: 24),
                         DefaultContainer(
+                          borderRadius: BorderRadius.circular(15),
                           child: Row(
                             children: [
-                              CircleAvatar(
+                              Padding(
-                                radius: 40,
+                                padding: const EdgeInsets.only(left: 15),
+                                child: CircleAvatar(
+                                  radius: 38,
                                   backgroundColor:
-                                    const Color.fromARGB(177, 213, 213, 213),
+                                      ColorsManager.grayBorder.withOpacity(0.5),
                                   child: CircleAvatar(
                                     backgroundColor: ColorsManager.whiteColors,
                                     radius: 36,
@@ -95,12 +98,14 @@ class DeviceSettingsPanel extends StatelessWidget {
                                     ),
                                   ),
                                 ),
-                              const SizedBox(width: 12),
+                              ),
+                              const SizedBox(width: 25),
                               Expanded(
                                 child: Column(
                                   mainAxisAlignment: MainAxisAlignment.start,
                                   crossAxisAlignment: CrossAxisAlignment.start,
                                   children: [
+                                    const SizedBox(height: 15),
                                     Text(
                                       'Device Name:',
                                       style: context.textTheme.bodyMedium!
@@ -108,10 +113,19 @@ class DeviceSettingsPanel extends StatelessWidget {
                                         color: ColorsManager.grayColor,
                                       ),
                                     ),
-                                    TextFormField(
+                                    SizedBox(
+                                      height: 35,
+                                      child: Row(
+                                        children: [
+                                          SizedBox(
+                                            height: 50,
+                                            width: 190,
+                                            child: TextFormField(
+                                              scrollPadding: EdgeInsets.zero,
                                               maxLength: 30,
                                               style: const TextStyle(
                                                 color: ColorsManager.blackColor,
+                                                fontSize: 16,
                                               ),
                                               textAlign: TextAlign.start,
                                               focusNode: _bloc.focusNode,
@@ -121,37 +135,57 @@ class DeviceSettingsPanel extends StatelessWidget {
                                                 _bloc.add(const ChangeNameEvent(
                                                     value: false));
                                               },
-                                      decoration: const InputDecoration(
+                                              decoration: InputDecoration(
+                                                isDense: true,
+                                                contentPadding: EdgeInsets.zero,
                                                 border: InputBorder.none,
                                                 fillColor: Colors.white10,
                                                 counterText: '',
                                               ),
                                             ),
+                                          ),
+                                          Column(
+                                            children: [
+                                              SizedBox(
+                                                width: 15,
+                                                height: 25,
+                                                child: Visibility(
+                                                  visible:
+                                                      _bloc.editName != true,
+                                                  replacement: const SizedBox(),
+                                                  child: InkWell(
+                                                    onTap: () {
+                                                      _bloc.add(
+                                                          const ChangeNameEvent(
+                                                              value: true));
+                                                    },
+                                                    child: SvgPicture.asset(
+                                                      Assets
+                                                          .editNameIconSettings,
+                                                      color: ColorsManager
+                                                          .lightGrayBorderColor,
+                                                      height: 15,
+                                                      width: 15,
+                                                    ),
+                                                  ),
+                                                ),
+                                              ),
+                                            ],
+                                          ),
                                         ],
                                       ),
                                     ),
-                              const SizedBox(width: 8),
+                                  ],
-                              Visibility(
-                                visible: _bloc.editName != true,
-                                replacement: const SizedBox(),
-                                child: GestureDetector(
-                                  onTap: () {
-                                    _bloc.add(
-                                        const ChangeNameEvent(value: true));
-                                  },
-                                  child: SvgPicture.asset(
-                                    Assets.editNameIconSettings,
-                                    color: ColorsManager.grayColor,
-                                    height: 20,
-                                    width: 20,
                                 ),
                               ),
-                              )
                             ],
                           ),
                         ),
                         const SizedBox(height: 32),
-                        Text('Device Management', style: sectionTitle),
+                        Padding(
+                          padding: const EdgeInsets.only(left: 10),
+                          child: Text('Device Management', style: sectionTitle),
+                        ),
                         DeviceManagementContent(
                           device: device,
                           subSpaces: subSpaces.cast<SubSpaceModel>(),

lib/pages/device_managment/garage_door/bloc/garage_door_bloc.dart

@@ -379,7 +379,7 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
       }
       emit(GarageDoorLoadedState(status: deviceStatus));
       add(GarageDoorControlEvent(
-          deviceId: event.deviceId,
+          deviceId: deviceId,
           value: deviceStatus.delay.inSeconds,
           code: 'countdown_1'));
     } catch (e) {
@@ -396,7 +396,7 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
     _updateLocalValue(event.code, event.value);
     emit(GarageDoorLoadedState(status: deviceStatus));
     final success = await _runDeBouncer(
-      deviceId: event.deviceId,
+      deviceId: deviceId,
       code: event.code,
       value: event.value,
       oldValue: oldValue,

lib/pages/home/bloc/home_bloc.dart

@@ -36,7 +36,7 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
 
       if (user != null && user!.project != null) {
         await ProjectManager.setProjectUUID(user!.project!.uuid);
-        // NavigationService.navigatorKey.currentContext!.read<SpaceTreeBloc>().add(InitialEvent());
+
       }
       add(FetchTermEvent());
       add(FetchPolicyEvent());

lib/pages/home/view/home_page_web.dart

@@ -20,12 +20,7 @@ class _HomeWebPageState extends State<HomeWebPage> {
   // Flag to track whether the dialog is already shown.
   bool _dialogShown = false;
 
-  @override
+
-  void initState() {
-    super.initState();
-    final homeBloc = BlocProvider.of<HomeBloc>(context);
-    // homeBloc.add(const FetchUserInfo());
-  }
 
   @override
   Widget build(BuildContext context) {

lib/pages/routines/create_new_routines/commu_dropdown.dart

@@ -1,29 +1,73 @@
-import 'package:dropdown_button2/dropdown_button2.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/routines/create_new_routines/dropdown_menu_content.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';
+import 'space_tree_dropdown_bloc.dart';
 
-class CommunityDropdown extends StatelessWidget {
+class SpaceTreeDropdown extends StatefulWidget {
-  final String? selectedValue;
+  final String? selectedSpaceId;
-  final List<CommunityModel> communities;
+  final Function(String?)? onChanged;
-  final Function(String?) onChanged;
-  final TextEditingController _searchController = TextEditingController();
 
-  CommunityDropdown({
+  const SpaceTreeDropdown({
-    Key? key,
+    super.key,
-    required this.selectedValue,
+    this.selectedSpaceId,
-    required this.onChanged,
+    this.onChanged,
-    required this.communities,
+  });
-  }) : super(key: key);
+
+  @override
+  State<SpaceTreeDropdown> createState() => _SpaceTreeDropdownState();
+}
+
+class _SpaceTreeDropdownState extends State<SpaceTreeDropdown> {
+  late SpaceTreeDropdownBloc _dropdownBloc;
+  final LayerLink _layerLink = LayerLink();
+  OverlayEntry? _overlayEntry;
+
+  @override
+  void initState() {
+    super.initState();
+    _dropdownBloc = SpaceTreeDropdownBloc(widget.selectedSpaceId);
+  }
+
+  @override
+  void dispose() {
+    _dropdownBloc.close();
+    _removeOverlay();
+    super.dispose();
+  }
+
+  void _removeOverlay() {
+    _overlayEntry?.remove();
+    _overlayEntry = null;
+  }
 
   @override
   Widget build(BuildContext context) {
-    return Padding(
+    return BlocProvider.value(
-      padding: const EdgeInsets.all(10.0),
+      value: _dropdownBloc,
-      child: Column(
+      child: BlocBuilder<SpaceTreeBloc, SpaceTreeState>(
+        builder: (context, spaceTreeState) {
+          final communities = spaceTreeState.searchQuery.isNotEmpty
+              ? spaceTreeState.filteredCommunity
+              : spaceTreeState.communityList;
+
+          return BlocBuilder<SpaceTreeDropdownBloc, SpaceTreeDropdownState>(
+            builder: (context, dropdownState) {
+              final selectedCommunity = _findCommunity(
+                communities,
+                dropdownState.selectedSpaceId,
+              );
+
+              return Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
+                mainAxisAlignment: MainAxisAlignment.start,
                 children: [
-          Text(
+                  Padding(
+                    padding: const EdgeInsets.symmetric(horizontal: 10),
+                    child: Text(
                       "Community",
                       style: Theme.of(context).textTheme.bodyMedium!.copyWith(
                             fontWeight: FontWeight.w400,
@@ -31,126 +75,107 @@ class CommunityDropdown extends StatelessWidget {
                             color: ColorsManager.blackColor,
                           ),
                     ),
-          const SizedBox(height: 8),
+                  ),
-          SizedBox(
+                  CompositedTransformTarget(
+                    link: _layerLink,
+                    child: GestureDetector(
+                      onTap: () => _toggleDropdown(context, communities),
                       child: Container(
+                        height: 46,
                         decoration: BoxDecoration(
-              borderRadius: BorderRadius.circular(10),
+                          border: Border.all(color: Colors.grey.shade300),
-            ),
+                          borderRadius: BorderRadius.circular(12),
-            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),
                         ),
+                        margin: const EdgeInsets.symmetric(horizontal: 10),
                         child: Row(
                           mainAxisAlignment: MainAxisAlignment.spaceBetween,
                           children: [
-                    Expanded(
+                            Padding(
-                      flex: 5,
+                              padding:
+                                  const EdgeInsets.symmetric(horizontal: 10),
                               child: Text(
-                        selectedValue != null
+                                selectedCommunity?.name ?? 'Please Select',
-                            ? "  ${communities.firstWhere((element) => element.uuid == selectedValue).name}"
+                                style: TextStyle(
-                            : '  Please Select',
+                                  color: selectedCommunity != null
-                        style: Theme.of(context).textTheme.bodySmall!.copyWith(
+                                      ? ColorsManager.blackColor
-                              color: selectedValue != null
-                                  ? Colors.black
                                       : ColorsManager.textGray,
-                            ),
                                   overflow: TextOverflow.ellipsis,
+                                  fontWeight: FontWeight.w400,
+                                  fontSize: 13,
                                 ),
                               ),
-                    Expanded(
+                            ),
-                      child: Container(
+                            Container(
                               decoration: BoxDecoration(
-                          color: Colors.grey[100],
+                                color: Colors.grey[200],
                                 borderRadius: const BorderRadius.only(
                                   topRight: Radius.circular(10),
                                   bottomRight: Radius.circular(10),
                                 ),
                               ),
                               height: 45,
+                              width: 33,
                               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),
-                      ),
-                    ),
-                  ),
-                ),
-                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,
-              ),
-            ),
-          ))
                 ],
+              );
+            },
+          );
+        },
       ),
     );
   }
+
+  void _toggleDropdown(BuildContext context, List<CommunityModel> communities) {
+    if (_overlayEntry != null) {
+      _removeOverlay();
+      return;
+    }
+
+    _overlayEntry = OverlayEntry(
+      builder: (context) => Positioned(
+        width: 300,
+        child: CompositedTransformFollower(
+          link: _layerLink,
+          showWhenUnlinked: false,
+          offset: const Offset(0, 48),
+          child: Material(
+            elevation: 8,
+            borderRadius: BorderRadius.circular(12),
+            child: DropdownMenuContent(
+              selectedSpaceId: _dropdownBloc.state.selectedSpaceId,
+              onChanged: (id) {
+                if (id != null && mounted) {
+                  _dropdownBloc.add(SpaceTreeDropdownSelectEvent(id));
+                  widget.onChanged?.call(id);
+                  _removeOverlay();
+                }
+              },
+              onClose: _removeOverlay,
+            ),
+          ),
+        ),
+      ),
+    );
+
+    Overlay.of(context).insert(_overlayEntry!);
+  }
+
+  CommunityModel? _findCommunity(
+      List<CommunityModel> communities, String? communityId) {
+    if (communityId == null) return null;
+    try {
+      return communities.firstWhere((c) => c.uuid == communityId);
+    } catch (e) {
+      return null;
+    }
+  }
 }

lib/pages/routines/create_new_routines/create_new_routines.dart

@@ -18,6 +18,7 @@ class CreateNewRoutinesDialog extends StatefulWidget {
 class _CreateNewRoutinesDialogState extends State<CreateNewRoutinesDialog> {
   String? _selectedCommunity;
   String? _selectedSpace;
+  String? _selectedId;
 
   @override
   Widget build(BuildContext context) {
@@ -30,7 +31,7 @@ class _CreateNewRoutinesDialogState extends State<CreateNewRoutinesDialog> {
             final spaces = _bloc.spacesOnlyWithDevices;
             final isLoadingCommunities = state is CommunitiesLoadingState;
             final isLoadingSpaces = state is SpaceWithDeviceLoadingState;
-            String spaceHint = 'Select a community first';
+            String spaceHint = 'Please Select';
             if (_selectedCommunity != null) {
               if (isLoadingSpaces) {
                 spaceHint = 'Loading spaces...';
@@ -40,7 +41,10 @@ class _CreateNewRoutinesDialogState extends State<CreateNewRoutinesDialog> {
                 spaceHint = 'Select Space';
               }
             }
-
+            if (_selectedId != null && _selectedCommunity != _selectedId) {
+              _selectedSpace = null;
+              _selectedCommunity = _selectedId;
+            }
             return AlertDialog(
               backgroundColor: Colors.white,
               insetPadding: EdgeInsets.zero,
@@ -51,7 +55,9 @@ class _CreateNewRoutinesDialogState extends State<CreateNewRoutinesDialog> {
                 'Create New Routines',
                 textAlign: TextAlign.center,
                 style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                      color: ColorsManager.primaryColor,
+                      color: ColorsManager.spaceColor,
+                      fontSize: 20,
+                      fontWeight: FontWeight.w700,
                     ),
               ),
               content: Stack(
@@ -60,27 +66,28 @@ class _CreateNewRoutinesDialogState extends State<CreateNewRoutinesDialog> {
                     mainAxisSize: MainAxisSize.min,
                     children: [
                       const Divider(),
+                      const SizedBox(height: 20),
+                      Column(
+                        children: [
                           Padding(
-                        padding: const EdgeInsets.only(left: 15, right: 15),
+                              padding:
-                        child: CommunityDropdown(
+                                  const EdgeInsets.only(left: 13, right: 8),
-                          communities: _bloc.communities..sort(
+                              child: Column(
-                              (a, b) => a.name.toLowerCase().compareTo(
+                                children: [
-                                    b.name.toLowerCase(),
+                                  SpaceTreeDropdown(
-                                  ),
+                                    selectedSpaceId: _selectedId,
-                            ),
-                          selectedValue: _selectedCommunity,
                                     onChanged: (String? newValue) {
-                            setState(() {
+                                      setState(() => _selectedId = newValue!);
-                              _selectedCommunity = newValue;
+                                      if (_selectedId != null) {
-                              _selectedSpace = null;
+                                        _bloc.add(SpaceOnlyWithDevicesEvent(
-                            });
+                                            _selectedId!));
-                            if (newValue != null) {
-                              _bloc.add(SpaceOnlyWithDevicesEvent(newValue));
                                       }
                                     },
                                   ),
-                      ),
+                                ],
+                              )),
                           const SizedBox(height: 5),
+                          const SizedBox(height: 8),
                           Padding(
                             padding: const EdgeInsets.only(left: 15, right: 15),
                             child: SpaceDropdown(
@@ -94,6 +101,9 @@ class _CreateNewRoutinesDialogState extends State<CreateNewRoutinesDialog> {
                               },
                             ),
                           ),
+                        ],
+                      ),
+                      const SizedBox(height: 20),
                       const Divider(),
                       Row(
                         mainAxisAlignment: MainAxisAlignment.spaceAround,

lib/pages/routines/create_new_routines/dropdown_menu_content.dart

@@ -0,0 +1,148 @@
+
+
+
+
+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_event.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_state.dart';
+
+class DropdownMenuContent extends StatefulWidget {
+  final String? selectedSpaceId;
+  final ValueChanged<String?> onChanged;
+  final VoidCallback onClose;
+
+  const DropdownMenuContent({
+    required this.selectedSpaceId,
+    required this.onChanged,
+    required this.onClose,
+  });
+
+  @override
+  State<DropdownMenuContent> createState() => _DropdownMenuContentState();
+}
+
+class _DropdownMenuContentState extends State<DropdownMenuContent> {
+  final ScrollController _scrollController = ScrollController();
+  final TextEditingController _searchController = TextEditingController();
+
+  @override
+  void initState() {
+    super.initState();
+    _scrollController.addListener(_onScroll);
+  }
+
+  @override
+  void dispose() {
+    _scrollController.dispose();
+    _searchController.dispose();
+    super.dispose();
+  }
+
+  void _onScroll() {
+    final bloc = context.read<SpaceTreeBloc>();
+    final state = bloc.state;
+    if (_scrollController.position.pixels >=
+        _scrollController.position.maxScrollExtent - 30) {
+      if (state is SpaceTreeState && !state.paginationIsLoading) {
+        bloc.add(PaginationEvent(state.paginationModel, state.communityList));
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return ConstrainedBox(
+      constraints: const BoxConstraints(maxHeight: 300),
+      child: BlocBuilder<SpaceTreeBloc, SpaceTreeState>(
+        builder: (context, state) {
+          final communities = state.searchQuery.isNotEmpty
+              ? state.filteredCommunity
+              : state.communityList;
+
+          return Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              // Search bar
+              Padding(
+                padding: const EdgeInsets.all(8.0),
+                child: TextFormField(
+                  controller: _searchController,
+                  onChanged: (query) {
+                    context.read<SpaceTreeBloc>().add(SearchQueryEvent(query));
+                  },
+                  style: const TextStyle(fontSize: 14, color: Colors.black),
+                  decoration: InputDecoration(
+                    hintText: 'Search for space...',
+                    prefixIcon: const Icon(Icons.search, size: 20),
+                    contentPadding:
+                        const EdgeInsets.symmetric(vertical: 8, horizontal: 12),
+                    border: OutlineInputBorder(
+                      borderRadius: BorderRadius.circular(8),
+                    ),
+                    isDense: true,
+                  ),
+                ),
+              ),
+              // Community list
+              Expanded(
+                child: ListView.builder(
+                  controller: _scrollController,
+                  itemCount:
+                      communities.length + (state.paginationIsLoading ? 1 : 0),
+                  itemBuilder: (context, index) {
+                    if (index >= communities.length) {
+                      return state.paginationIsLoading
+                          ? const Padding(
+                              padding: EdgeInsets.all(8.0),
+                              child: Center(
+                                child: SizedBox(
+                                  width: 20,
+                                  height: 20,
+                                  child:
+                                      CircularProgressIndicator(strokeWidth: 2),
+                                ),
+                              ),
+                            )
+                          : const SizedBox.shrink();
+                    }
+
+                    final community = communities[index];
+                    final isSelected = community.uuid == widget.selectedSpaceId;
+
+                    return ListTile(
+                      title: Text(
+                        community.name,
+                        style: TextStyle(
+                          color: isSelected ? Colors.blue : Colors.black,
+                          fontWeight:
+                              isSelected ? FontWeight.bold : FontWeight.normal,
+                        ),
+                      ),
+                      onTap: () {
+                        setState(() {
+                          _searchController.clear();
+                          _searchController.text.isEmpty
+                              ? context
+                                  .read<SpaceTreeBloc>()
+                                  .add(SearchQueryEvent(''))
+                              : context.read<SpaceTreeBloc>().add(
+                                  SearchQueryEvent(_searchController.text));
+                        });
+                        // Future.delayed(const Duration(seconds: 1), () {
+                        widget.onChanged(community.uuid);
+                        widget.onClose();
+                        // });
+                      },
+                    );
+                  },
+                ),
+              ),
+            ],
+          );
+        },
+      ),
+    );
+  }
+}

lib/pages/routines/create_new_routines/space_dropdown.dart

@@ -3,7 +3,6 @@ import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 
-
 class SpaceDropdown extends StatelessWidget {
   final List<SpaceModel> spaces;
   final String? selectedValue;
@@ -21,7 +20,7 @@ class SpaceDropdown extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Padding(
-      padding: const EdgeInsets.all(10.0),
+      padding: const EdgeInsets.only(left: 10),
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
@@ -33,7 +32,6 @@ class SpaceDropdown extends StatelessWidget {
                   color: ColorsManager.blackColor,
                 ),
           ),
-          const SizedBox(height: 8),
           SizedBox(
             child: Container(
               decoration: BoxDecoration(
@@ -90,7 +88,7 @@ class SpaceDropdown extends StatelessWidget {
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: [
                       Expanded(
-                        flex: 5,
+                        flex: 6,
                         child: Padding(
                           padding: const EdgeInsets.only(left: 10),
                           child: Text(

lib/pages/routines/create_new_routines/space_tree_dropdown_bloc.dart

@@ -0,0 +1,27 @@
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+part 'space_tree_dropdown_event.dart';
+part 'space_tree_dropdown_state.dart';
+
+class SpaceTreeDropdownBloc
+    extends Bloc<SpaceTreeDropdownEvent, SpaceTreeDropdownState> {
+  SpaceTreeDropdownBloc(String? initialId)
+      : super(SpaceTreeDropdownState(selectedSpaceId: initialId)) {
+    on<SpaceTreeDropdownSelectEvent>(_onSelect);
+    on<SpaceTreeDropdownResetEvent>(_onReset);
+  }
+
+  void _onSelect(
+    SpaceTreeDropdownSelectEvent event,
+    Emitter<SpaceTreeDropdownState> emit,
+  ) {
+    emit(SpaceTreeDropdownState(selectedSpaceId: event.spaceId));
+  }
+
+  void _onReset(
+    SpaceTreeDropdownResetEvent event,
+    Emitter<SpaceTreeDropdownState> emit,
+  ) {
+    emit(SpaceTreeDropdownState(selectedSpaceId: event.initialId));
+  }
+}

lib/pages/routines/create_new_routines/space_tree_dropdown_event.dart

@@ -0,0 +1,15 @@
+part of 'space_tree_dropdown_bloc.dart';
+
+abstract class SpaceTreeDropdownEvent {}
+
+class SpaceTreeDropdownSelectEvent extends SpaceTreeDropdownEvent {
+  final String? spaceId;
+
+  SpaceTreeDropdownSelectEvent(this.spaceId);
+}
+
+class SpaceTreeDropdownResetEvent extends SpaceTreeDropdownEvent {
+  final String? initialId;
+
+  SpaceTreeDropdownResetEvent(this.initialId);
+}

lib/pages/routines/create_new_routines/space_tree_dropdown_state.dart

@@ -0,0 +1,7 @@
+part of 'space_tree_dropdown_bloc.dart';
+
+class SpaceTreeDropdownState {
+  final String? selectedSpaceId;
+
+  SpaceTreeDropdownState({this.selectedSpaceId});
+}

lib/pages/spaces_management/all_spaces/model/space_model.dart

@@ -171,4 +171,13 @@ extension SpaceExtensions on SpaceModel {
 
     return tagValues;
   }
+
+  bool isNoChangesSubmited(String name, icon, SpaceTemplateModel? spaceModel,
+      List<SubspaceModel>? subspaces, List<Tag>? tags) {
+    return (name == this.name &&
+        icon == this.icon &&
+        spaceModel == this.spaceModel &&
+        subspaces == this.subspaces &&
+        tags == this.tags);
+  }
 }

lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart

@@ -384,6 +384,15 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
                 SpaceTemplateModel? spaceModel,
                 List<SubspaceModel>? subspaces,
                 List<Tag>? tags) {
+              if (widget.selectedSpace!.isNoChangesSubmited(
+                name,
+                icon,
+                spaceModel,
+                subspaces,
+                tags,
+              )) {
+                return;
+              }
               setState(() {
                 // Update the space's properties
                 widget.selectedSpace!.name = name;

lib/pages/spaces_management/all_spaces/widgets/dialogs/create_space_dialog.dart

@@ -302,13 +302,6 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                         ? enteredName
                         : (widget.name ?? '');
                     if (newName.isNotEmpty) {
-                      if (tags != null && tags!.isNotEmpty) {
-                        if (tags!.any(
-                          (tag) => tag.uuid == null || tag.uuid!.isEmpty,
-                        )) {
-                          return;
-                        }
-                      }
                       widget.onCreateSpace(
                           newName,
                           selectedIcon,

lib/pages/spaces_management/structure_selector/view/center_body_widget.dart

@@ -30,7 +30,10 @@ class CenterBodyWidget extends StatelessWidget {
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: [
                   GestureDetector(
-                    onTap: () {
+                    onTap: state is CommunityStructureState ||
+                            state is CommunitySelectedState
+                        ? null
+                        : () {
                             context
                                 .read<CenterBodyBloc>()
                                 .add(CommunityStructureSelectedEvent());

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -15,7 +15,7 @@ import shared_preferences_foundation
 import url_launcher_macos
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
-  FLTFirebaseAnalyticsPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseAnalyticsPlugin"))
+  FirebaseAnalyticsPlugin.register(with: registry.registrar(forPlugin: "FirebaseAnalyticsPlugin"))
   FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin"))
   FLTFirebaseCrashlyticsPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCrashlyticsPlugin"))
   FLTFirebaseDatabasePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseDatabasePlugin"))

pubspec.yaml

@@ -69,12 +69,7 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
 
-  # The "flutter_lints" package below contains a set of recommended lints to
+  very_good_analysis: ^9.0.0
-  # encourage good coding practices. The lint set provided by the package is
-  # activated in the `analysis_options.yaml` file located at the root of your
-  # package. See that file for information about deactivating specific lint
-  # rules and activating additional ones.
-  flutter_lints: ^5.0.0
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec