SP-1723-FE-Integrate-Charts-with-API-s-for-AQI-sensor.

doesnt load aqi data when spaceUuid is empty.
removed filtered data fromAirQualityDistributionBloc since it isnt needed for this bloc.
2026-10-26 20:07:56 +00:00 · 2025-06-16 10:59:51 +03:00 · 2025-06-16 10:46:48 +03:00 · 2025-06-16 10:29:31 +03:00 · 2025-06-16 10:29:03 +03:00 · 2025-06-16 10:28:26 +03:00
181 changed files with 697 additions and 5605 deletions
@@ -21,13 +21,13 @@ jobs:
      - name: Set up Flutter
        uses: subosito/flutter-action@v2
        with:
-          flutter-version: '3.27.3' # Specify the Flutter version you want to use
+          flutter-version: '3.32.1' # Specify the Flutter version you want to use

      - name: Install dependencies
        run: flutter pub get

      - name: Build Flutter Web App
-        run: flutter build web --web-renderer canvaskit -t lib/main.dart
+        run: flutter build web --release -t lib/main.dart

      - name: Build And Deploy
        id: builddeploy
@@ -19,13 +19,13 @@ jobs:
      - name: Set up Flutter
        uses: subosito/flutter-action@v2
        with:
-          flutter-version: '3.27.3' # Specify the Flutter version you want to use
+          flutter-version: '3.32.1' # Specify the Flutter version you want to use

      - name: Install dependencies
        run: flutter pub get

      - name: Build Flutter Web App
-        run: flutter build web --web-renderer canvaskit -t lib/main_dev.dart
+        run: flutter build web --release -t lib/main_dev.dart

      - name: Build And Deploy
        id: builddeploy
@@ -20,10 +20,10 @@ jobs:
      - name: Set up Flutter
        uses: subosito/flutter-action@v2
        with:
-          flutter-version: '3.27.3'
+          flutter-version: '3.32.1'

      - name: Install dependencies
        run: flutter pub get

      - name: Run Flutter Build
-        run: flutter build web --web-renderer canvaskit -t lib/main_dev.dart
+        run: flutter build web --release -t lib/main_dev.dart
@@ -1,33 +1,32 @@
-# This file configures the analyzer, which statically analyzes Dart code to
-# 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`.
+include: package:very_good_analysis/analysis_options.yaml

-# 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
-    overridden_fields: ignore
-include: package:flutter_lints/flutter.yaml
+    strict_raw_type: warning
+    argument_type_not_assignable: warning
+    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  # Uncomment to enable the `prefer_single_quotes` rule
-    prefer_const_constructors: true
-
-# Additional information about this file can be found at
-# https://dart.dev/guides/language/analysis-options
+    prefer_single_quotes: true
+    avoid_print: false
+    public_member_api_docs: false
+    sort_pub_dependencies: false
+    one_member_abstracts: false
+    prefer_int_literals: false
+    sort_constructors_first: false
+    avoid_redundant_argument_values: false
+    always_put_required_named_parameters_first: false
+    unnecessary_breaks: false
+    avoid_catches_without_on_clauses: false
+    cascade_invocations: false
+    overridden_fields: false
@@ -1,13 +0,0 @@
-gradle-wrapper.jar
-/.gradle
-/captures/
-/gradlew
-/gradlew.bat
-/local.properties
-GeneratedPluginRegistrant.java
-
-# Remember to never publicly share your keystore.
-# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
-key.properties
-**/*.keystore
-**/*.jks
@@ -1,71 +0,0 @@
-plugins {
-    id "com.android.application"
-    // START: FlutterFire Configuration
-    id 'com.google.gms.google-services'
-    id 'com.google.firebase.crashlytics'
-    // END: FlutterFire Configuration
-    id "kotlin-android"
-    id "dev.flutter.flutter-gradle-plugin"
-}
-
-def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
-if (localPropertiesFile.exists()) {
-    localPropertiesFile.withReader('UTF-8') { reader ->
-        localProperties.load(reader)
-    }
-}
-
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
-}
-
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
-}
-
-android {
-    namespace "com.example.syncrow_web"
-    compileSdk flutter.compileSdkVersion
-    ndkVersion flutter.ndkVersion
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
-
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
-
-    defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.example.syncrow_web"
-        // You can update the following values to match your application needs.
-        // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
-        minSdkVersion flutter.minSdkVersion
-        targetSdkVersion flutter.targetSdkVersion
-        versionCode flutterVersionCode.toInteger()
-        versionName flutterVersionName
-    }
-
-    buildTypes {
-        release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig signingConfigs.debug
-        }
-    }
-}
-
-flutter {
-    source '../..'
-}
-
-dependencies {}
@@ -1,68 +0,0 @@
-{
-  "project_info": {
-    "project_number": "427332280600",
-    "firebase_url": "https://test2-8a3d2-default-rtdb.firebaseio.com",
-    "project_id": "test2-8a3d2",
-    "storage_bucket": "test2-8a3d2.firebasestorage.app"
-  },
-  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:427332280600:android:550f67441246cb1a0c7e6d",
-        "android_client_info": {
-          "package_name": "com.example.syncrow.app"
-        }
-      },
-      "oauth_client": [],
-      "api_key": [
-        {
-          "current_key": "AIzaSyA5qOErxdm0zJmoHIB0TixfebYEsNRpwV0"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": []
-        }
-      }
-    },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:427332280600:android:bb6047adeeb80fb00c7e6d",
-        "android_client_info": {
-          "package_name": "com.example.syncrow_application"
-        }
-      },
-      "oauth_client": [],
-      "api_key": [
-        {
-          "current_key": "AIzaSyA5qOErxdm0zJmoHIB0TixfebYEsNRpwV0"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": []
-        }
-      }
-    },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:427332280600:android:2bc36fbe82994a3e0c7e6d",
-        "android_client_info": {
-          "package_name": "com.example.syncrow_web"
-        }
-      },
-      "oauth_client": [],
-      "api_key": [
-        {
-          "current_key": "AIzaSyA5qOErxdm0zJmoHIB0TixfebYEsNRpwV0"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": []
-        }
-      }
-    }
-  ],
-  "configuration_version": "1"
-}
@@ -1,7 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- The INTERNET permission is required for development. Specifically,
-         the Flutter tool needs it to communicate with the running application
-         to allow setting breakpoints, to provide hot reload, etc.
-    -->
-    <uses-permission android:name="android.permission.INTERNET"/>
-</manifest>
@@ -1,44 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <application
-        android:label="syncrow_web"
-        android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher">
-        <activity
-            android:name=".MainActivity"
-            android:exported="true"
-            android:launchMode="singleTop"
-            android:theme="@style/LaunchTheme"
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
-            android:hardwareAccelerated="true"
-            android:windowSoftInputMode="adjustResize">
-            <!-- Specifies an Android theme to apply to this Activity as soon as
-                 the Android process has started. This theme is visible to the user
-                 while the Flutter UI initializes. After that, this theme continues
-                 to determine the Window background behind the Flutter UI. -->
-            <meta-data
-              android:name="io.flutter.embedding.android.NormalTheme"
-              android:resource="@style/NormalTheme"
-              />
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
-        </activity>
-        <!-- Don't delete the meta-data below.
-             This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
-        <meta-data
-            android:name="flutterEmbedding"
-            android:value="2" />
-    </application>
-    <!-- Required to query activities that can process text, see:
-         https://developer.android.com/training/package-visibility?hl=en and
-         https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
-
-         In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
-    <queries>
-        <intent>
-            <action android:name="android.intent.action.PROCESS_TEXT"/>
-            <data android:mimeType="text/plain"/>
-        </intent>
-    </queries>
-</manifest>
@@ -1,5 +0,0 @@
-package com.example.syncrow_web
-
-import io.flutter.embedding.android.FlutterActivity
-
-class MainActivity: FlutterActivity()
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Modify this file to customize your launch splash screen -->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="?android:colorBackground" />
-
-    <!-- You can insert your own image assets here -->
-    <!-- <item>
-        <bitmap
-            android:gravity="center"
-            android:src="@mipmap/launch_image" />
-    </item> -->
-</layer-list>
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Modify this file to customize your launch splash screen -->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@android:color/white" />
-
-    <!-- You can insert your own image assets here -->
-    <!-- <item>
-        <bitmap
-            android:gravity="center"
-            android:src="@mipmap/launch_image" />
-    </item> -->
-</layer-list>
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
-    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
-        <!-- Show a splash screen on the activity. Automatically removed when
-             the Flutter engine draws its first frame -->
-        <item name="android:windowBackground">@drawable/launch_background</item>
-    </style>
-    <!-- Theme applied to the Android Window as soon as the process has started.
-         This theme determines the color of the Android Window while your
-         Flutter UI initializes, as well as behind your Flutter UI while its
-         running.
-
-         This Theme is only used starting with V2 of Flutter's Android embedding. -->
-    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
-        <item name="android:windowBackground">?android:colorBackground</item>
-    </style>
-</resources>
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
-    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
-        <!-- Show a splash screen on the activity. Automatically removed when
-             the Flutter engine draws its first frame -->
-        <item name="android:windowBackground">@drawable/launch_background</item>
-    </style>
-    <!-- Theme applied to the Android Window as soon as the process has started.
-         This theme determines the color of the Android Window while your
-         Flutter UI initializes, as well as behind your Flutter UI while its
-         running.
-
-         This Theme is only used starting with V2 of Flutter's Android embedding. -->
-    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
-        <item name="android:windowBackground">?android:colorBackground</item>
-    </style>
-</resources>
@@ -1,7 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- The INTERNET permission is required for development. Specifically,
-         the Flutter tool needs it to communicate with the running application
-         to allow setting breakpoints, to provide hot reload, etc.
-    -->
-    <uses-permission android:name="android.permission.INTERNET"/>
-</manifest>
@@ -1,18 +0,0 @@
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-    }
-}
-
-rootProject.buildDir = '../build'
-subprojects {
-    project.buildDir = "${rootProject.buildDir}/${project.name}"
-}
-subprojects {
-    project.evaluationDependsOn(':app')
-}
-
-tasks.register("clean", Delete) {
-    delete rootProject.buildDir
-}
@@ -1,3 +0,0 @@
-org.gradle.jvmargs=-Xmx4G
-android.useAndroidX=true
-android.enableJetifier=true
@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
@@ -1,30 +0,0 @@
-pluginManagement {
-    def flutterSdkPath = {
-        def properties = new Properties()
-        file("local.properties").withInputStream { properties.load(it) }
-        def flutterSdkPath = properties.getProperty("flutter.sdk")
-        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-        return flutterSdkPath
-    }
-    settings.ext.flutterSdkPath = flutterSdkPath()
-
-    includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
-
-    repositories {
-        google()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
-
-plugins {
-    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.3.0" apply false
-    // START: FlutterFire Configuration
-    id "com.google.gms.google-services" version "4.3.15" apply false
-    id "com.google.firebase.crashlytics" version "2.8.1" apply false
-    // END: FlutterFire Configuration
-    id "org.jetbrains.kotlin.android" version "1.7.10" apply false
-}
-
-include ":app"
@@ -1,34 +0,0 @@
-**/dgph
-*.mode1v3
-*.mode2v3
-*.moved-aside
-*.pbxuser
-*.perspectivev3
-**/*sync/
-.sconsign.dblite
-.tags*
-**/.vagrant/
-**/DerivedData/
-Icon?
-**/Pods/
-**/.symlinks/
-profile
-xcuserdata
-**/.generated/
-Flutter/App.framework
-Flutter/Flutter.framework
-Flutter/Flutter.podspec
-Flutter/Generated.xcconfig
-Flutter/ephemeral/
-Flutter/app.flx
-Flutter/app.zip
-Flutter/flutter_assets/
-Flutter/flutter_export_environment.sh
-ServiceDefinitions.json
-Runner/GeneratedPluginRegistrant.*
-
-# Exceptions to above rules.
-!default.mode1v3
-!default.mode2v3
-!default.pbxuser
-!default.perspectivev3
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-  <key>CFBundleDevelopmentRegion</key>
-  <string>en</string>
-  <key>CFBundleExecutable</key>
-  <string>App</string>
-  <key>CFBundleIdentifier</key>
-  <string>io.flutter.flutter.app</string>
-  <key>CFBundleInfoDictionaryVersion</key>
-  <string>6.0</string>
-  <key>CFBundleName</key>
-  <string>App</string>
-  <key>CFBundlePackageType</key>
-  <string>FMWK</string>
-  <key>CFBundleShortVersionString</key>
-  <string>1.0</string>
-  <key>CFBundleSignature</key>
-  <string>????</string>
-  <key>CFBundleVersion</key>
-  <string>1.0</string>
-  <key>MinimumOSVersion</key>
-  <string>12.0</string>
-</dict>
-</plist>
@@ -1,2 +0,0 @@
-#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
-#include "Generated.xcconfig"
@@ -1,2 +0,0 @@
-#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
-#include "Generated.xcconfig"
@@ -1,44 +0,0 @@
-# Uncomment this line to define a global platform for your project
-# platform :ios, '12.0'
-
-# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
-ENV['COCOAPODS_DISABLE_STATS'] = 'true'
-
-project 'Runner', {
-  'Debug' => :debug,
-  'Profile' => :release,
-  'Release' => :release,
-}
-
-def flutter_root
-  generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__)
-  unless File.exist?(generated_xcode_build_settings_path)
-    raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first"
-  end
-
-  File.foreach(generated_xcode_build_settings_path) do |line|
-    matches = line.match(/FLUTTER_ROOT\=(.*)/)
-    return matches[1].strip if matches
-  end
-  raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
-end
-
-require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
-
-flutter_ios_podfile_setup
-
-target 'Runner' do
-  use_frameworks!
-  use_modular_headers!
-
-  flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
-  target 'RunnerTests' do
-    inherit! :search_paths
-  end
-end
-
-post_install do |installer|
-  installer.pods_project.targets.each do |target|
-    flutter_additional_ios_build_settings(target)
-  end
-end
@@ -1,36 +0,0 @@
-PODS:
-  - Flutter (1.0.0)
-  - flutter_secure_storage (6.0.0):
-    - Flutter
-  - path_provider_foundation (0.0.1):
-    - Flutter
-    - FlutterMacOS
-  - shared_preferences_foundation (0.0.1):
-    - Flutter
-    - FlutterMacOS
-
-DEPENDENCIES:
-  - Flutter (from `Flutter`)
-  - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
-  - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
-  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
-
-EXTERNAL SOURCES:
-  Flutter:
-    :path: Flutter
-  flutter_secure_storage:
-    :path: ".symlinks/plugins/flutter_secure_storage/ios"
-  path_provider_foundation:
-    :path: ".symlinks/plugins/path_provider_foundation/darwin"
-  shared_preferences_foundation:
-    :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
-
-SPEC CHECKSUMS:
-  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12
-  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
-  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
-
-PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796
-
-COCOAPODS: 1.15.2
@@ -1,751 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 54;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
-		331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
-		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
-		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
-		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
-		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
-		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
-		E44A9405B1EB1B638DD05A58 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7ABF0EC746A2D686A0ED574F /* Pods_RunnerTests.framework */; };
-		F2A3345EC3021060731668D3 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = B14AB50E8716720E10D074BD /* GoogleService-Info.plist */; };
-		FF49F60EC38658783D8D66DA /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2AFAE479A87ECDEBD5D6EB30 /* Pods_Runner.framework */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXContainerItemProxy section */
-		331C8085294A63A400263BE5 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 97C146E61CF9000F007C117D /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 97C146ED1CF9000F007C117D;
-			remoteInfo = Runner;
-		};
-/* End PBXContainerItemProxy section */
-
-/* Begin PBXCopyFilesBuildPhase section */
-		9705A1C41CF9048500538489 /* Embed Frameworks */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 10;
-			files = (
-			);
-			name = "Embed Frameworks";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
-/* Begin PBXFileReference section */
-		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
-		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
-		22428D486F110EE0B969469D /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
-		253C5EA6840355311DB030EA /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
-		2AFAE479A87ECDEBD5D6EB30 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		2C0D722D2ED971BF672D18D5 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
-		331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
-		331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
-		544621C7727C798253BAB2C8 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
-		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
-		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
-		7ABF0EC746A2D686A0ED574F /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
-		877FDC97D8B87080E35B3EB7 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
-		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
-		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
-		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
-		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
-		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
-		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		B14AB50E8716720E10D074BD /* GoogleService-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "Runner/GoogleService-Info.plist"; sourceTree = "<group>"; };
-		D3AD250AADBF93406007C9EB /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		759A57780A409ED209817654 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				E44A9405B1EB1B638DD05A58 /* Pods_RunnerTests.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		97C146EB1CF9000F007C117D /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				FF49F60EC38658783D8D66DA /* Pods_Runner.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		1454C118FFCECEEDF59152D2 /* Pods */ = {
-			isa = PBXGroup;
-			children = (
-				253C5EA6840355311DB030EA /* Pods-Runner.debug.xcconfig */,
-				22428D486F110EE0B969469D /* Pods-Runner.release.xcconfig */,
-				D3AD250AADBF93406007C9EB /* Pods-Runner.profile.xcconfig */,
-				2C0D722D2ED971BF672D18D5 /* Pods-RunnerTests.debug.xcconfig */,
-				877FDC97D8B87080E35B3EB7 /* Pods-RunnerTests.release.xcconfig */,
-				544621C7727C798253BAB2C8 /* Pods-RunnerTests.profile.xcconfig */,
-			);
-			name = Pods;
-			path = Pods;
-			sourceTree = "<group>";
-		};
-		20A3C64D2B1CFED5A81C3251 /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				2AFAE479A87ECDEBD5D6EB30 /* Pods_Runner.framework */,
-				7ABF0EC746A2D686A0ED574F /* Pods_RunnerTests.framework */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
-		331C8082294A63A400263BE5 /* RunnerTests */ = {
-			isa = PBXGroup;
-			children = (
-				331C807B294A618700263BE5 /* RunnerTests.swift */,
-			);
-			path = RunnerTests;
-			sourceTree = "<group>";
-		};
-		9740EEB11CF90186004384FC /* Flutter */ = {
-			isa = PBXGroup;
-			children = (
-				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
-				9740EEB21CF90195004384FC /* Debug.xcconfig */,
-				7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
-				9740EEB31CF90195004384FC /* Generated.xcconfig */,
-			);
-			name = Flutter;
-			sourceTree = "<group>";
-		};
-		97C146E51CF9000F007C117D = {
-			isa = PBXGroup;
-			children = (
-				9740EEB11CF90186004384FC /* Flutter */,
-				97C146F01CF9000F007C117D /* Runner */,
-				97C146EF1CF9000F007C117D /* Products */,
-				331C8082294A63A400263BE5 /* RunnerTests */,
-				1454C118FFCECEEDF59152D2 /* Pods */,
-				20A3C64D2B1CFED5A81C3251 /* Frameworks */,
-				B14AB50E8716720E10D074BD /* GoogleService-Info.plist */,
-			);
-			sourceTree = "<group>";
-		};
-		97C146EF1CF9000F007C117D /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				97C146EE1CF9000F007C117D /* Runner.app */,
-				331C8081294A63A400263BE5 /* RunnerTests.xctest */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		97C146F01CF9000F007C117D /* Runner */ = {
-			isa = PBXGroup;
-			children = (
-				97C146FA1CF9000F007C117D /* Main.storyboard */,
-				97C146FD1CF9000F007C117D /* Assets.xcassets */,
-				97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
-				97C147021CF9000F007C117D /* Info.plist */,
-				1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */,
-				1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */,
-				74858FAE1ED2DC5600515810 /* AppDelegate.swift */,
-				74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */,
-			);
-			path = Runner;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		331C8080294A63A400263BE5 /* RunnerTests */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
-			buildPhases = (
-				B9A66CAAF434B6A1BD8C4E09 /* [CP] Check Pods Manifest.lock */,
-				331C807D294A63A400263BE5 /* Sources */,
-				331C807F294A63A400263BE5 /* Resources */,
-				759A57780A409ED209817654 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				331C8086294A63A400263BE5 /* PBXTargetDependency */,
-			);
-			name = RunnerTests;
-			productName = RunnerTests;
-			productReference = 331C8081294A63A400263BE5 /* RunnerTests.xctest */;
-			productType = "com.apple.product-type.bundle.unit-test";
-		};
-		97C146ED1CF9000F007C117D /* Runner */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
-			buildPhases = (
-				C1C48B0232C0B26BFF405512 /* [CP] Check Pods Manifest.lock */,
-				9740EEB61CF901F6004384FC /* Run Script */,
-				97C146EA1CF9000F007C117D /* Sources */,
-				97C146EB1CF9000F007C117D /* Frameworks */,
-				97C146EC1CF9000F007C117D /* Resources */,
-				9705A1C41CF9048500538489 /* Embed Frameworks */,
-				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-				33590C9CD073D3D5EBA02CDE /* [CP] Embed Pods Frameworks */,
-				7A77858F6F15CB76D2D3A872 /* FlutterFire: "flutterfire upload-crashlytics-symbols" */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = Runner;
-			productName = Runner;
-			productReference = 97C146EE1CF9000F007C117D /* Runner.app */;
-			productType = "com.apple.product-type.application";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		97C146E61CF9000F007C117D /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				BuildIndependentTargetsInParallel = YES;
-				LastUpgradeCheck = 1510;
-				ORGANIZATIONNAME = "";
-				TargetAttributes = {
-					331C8080294A63A400263BE5 = {
-						CreatedOnToolsVersion = 14.0;
-						TestTargetID = 97C146ED1CF9000F007C117D;
-					};
-					97C146ED1CF9000F007C117D = {
-						CreatedOnToolsVersion = 7.3.1;
-						LastSwiftMigration = 1100;
-					};
-				};
-			};
-			buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */;
-			compatibilityVersion = "Xcode 9.3";
-			developmentRegion = en;
-			hasScannedForEncodings = 0;
-			knownRegions = (
-				en,
-				Base,
-			);
-			mainGroup = 97C146E51CF9000F007C117D;
-			productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				97C146ED1CF9000F007C117D /* Runner */,
-				331C8080294A63A400263BE5 /* RunnerTests */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
-		331C807F294A63A400263BE5 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		97C146EC1CF9000F007C117D /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
-				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
-				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
-				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
-				F2A3345EC3021060731668D3 /* GoogleService-Info.plist in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXShellScriptBuildPhase section */
-		33590C9CD073D3D5EBA02CDE /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
-			);
-			name = "Thin Binary";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
-		};
-		7A77858F6F15CB76D2D3A872 /* FlutterFire: "flutterfire upload-crashlytics-symbols" */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-			);
-			name = "FlutterFire: \"flutterfire upload-crashlytics-symbols\"";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\n#!/bin/bash\nPATH=\"${PATH}:$FLUTTER_ROOT/bin:$HOME/.pub-cache/bin\"\nflutterfire upload-crashlytics-symbols --upload-symbols-script-path=\"$PODS_ROOT/FirebaseCrashlytics/upload-symbols\" --platform=ios --apple-project-path=\"${SRCROOT}\" --env-platform-name=\"${PLATFORM_NAME}\" --env-configuration=\"${CONFIGURATION}\" --env-project-dir=\"${PROJECT_DIR}\" --env-built-products-dir=\"${BUILT_PRODUCTS_DIR}\" --env-dwarf-dsym-folder-path=\"${DWARF_DSYM_FOLDER_PATH}\" --env-dwarf-dsym-file-name=\"${DWARF_DSYM_FILE_NAME}\" --env-infoplist-path=\"${INFOPLIST_PATH}\" --default-config=default\n";
-		};
-		9740EEB61CF901F6004384FC /* Run Script */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Run Script";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
-		};
-		B9A66CAAF434B6A1BD8C4E09 /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
-		C1C48B0232C0B26BFF405512 /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
-/* End PBXShellScriptBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		331C807D294A63A400263BE5 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		97C146EA1CF9000F007C117D /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */,
-				1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXTargetDependency section */
-		331C8086294A63A400263BE5 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 97C146ED1CF9000F007C117D /* Runner */;
-			targetProxy = 331C8085294A63A400263BE5 /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
-/* Begin PBXVariantGroup section */
-		97C146FA1CF9000F007C117D /* Main.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				97C146FB1CF9000F007C117D /* Base */,
-			);
-			name = Main.storyboard;
-			sourceTree = "<group>";
-		};
-		97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				97C147001CF9000F007C117D /* Base */,
-			);
-			name = LaunchScreen.storyboard;
-			sourceTree = "<group>";
-		};
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
-		249021D3217E4FDB00AE95B9 /* Profile */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_COMMA = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				ENABLE_NS_ASSERTIONS = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_USER_SCRIPT_SANDBOXING = NO;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				SDKROOT = iphoneos;
-				SUPPORTED_PLATFORMS = iphoneos;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VALIDATE_PRODUCT = YES;
-			};
-			name = Profile;
-		};
-		249021D4217E4FDB00AE95B9 /* Profile */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				ENABLE_BITCODE = NO;
-				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.syncrowWeb;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
-				SWIFT_VERSION = 5.0;
-				VERSIONING_SYSTEM = "apple-generic";
-			};
-			name = Profile;
-		};
-		331C8088294A63A400263BE5 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 2C0D722D2ED971BF672D18D5 /* Pods-RunnerTests.debug.xcconfig */;
-			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
-				GENERATE_INFOPLIST_FILE = YES;
-				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.syncrowWeb.RunnerTests;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
-			};
-			name = Debug;
-		};
-		331C8089294A63A400263BE5 /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 877FDC97D8B87080E35B3EB7 /* Pods-RunnerTests.release.xcconfig */;
-			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
-				GENERATE_INFOPLIST_FILE = YES;
-				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.syncrowWeb.RunnerTests;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 5.0;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
-			};
-			name = Release;
-		};
-		331C808A294A63A400263BE5 /* Profile */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 544621C7727C798253BAB2C8 /* Pods-RunnerTests.profile.xcconfig */;
-			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
-				GENERATE_INFOPLIST_FILE = YES;
-				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.syncrowWeb.RunnerTests;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 5.0;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
-			};
-			name = Profile;
-		};
-		97C147031CF9000F007C117D /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_COMMA = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = dwarf;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_TESTABILITY = YES;
-				ENABLE_USER_SCRIPT_SANDBOXING = NO;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
-				MTL_ENABLE_DEBUG_INFO = YES;
-				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = iphoneos;
-				TARGETED_DEVICE_FAMILY = "1,2";
-			};
-			name = Debug;
-		};
-		97C147041CF9000F007C117D /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_COMMA = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				ENABLE_NS_ASSERTIONS = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_USER_SCRIPT_SANDBOXING = NO;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				SDKROOT = iphoneos;
-				SUPPORTED_PLATFORMS = iphoneos;
-				SWIFT_COMPILATION_MODE = wholemodule;
-				SWIFT_OPTIMIZATION_LEVEL = "-O";
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VALIDATE_PRODUCT = YES;
-			};
-			name = Release;
-		};
-		97C147061CF9000F007C117D /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				ENABLE_BITCODE = NO;
-				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.syncrowWeb;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
-				VERSIONING_SYSTEM = "apple-generic";
-			};
-			name = Debug;
-		};
-		97C147071CF9000F007C117D /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				ENABLE_BITCODE = NO;
-				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.syncrowWeb;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
-				SWIFT_VERSION = 5.0;
-				VERSIONING_SYSTEM = "apple-generic";
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				331C8088294A63A400263BE5 /* Debug */,
-				331C8089294A63A400263BE5 /* Release */,
-				331C808A294A63A400263BE5 /* Profile */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				97C147031CF9000F007C117D /* Debug */,
-				97C147041CF9000F007C117D /* Release */,
-				249021D3217E4FDB00AE95B9 /* Profile */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				97C147061CF9000F007C117D /* Debug */,
-				97C147071CF9000F007C117D /* Release */,
-				249021D4217E4FDB00AE95B9 /* Profile */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 97C146E61CF9000F007C117D /* Project object */;
-}
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:">
-   </FileRef>
-</Workspace>
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>PreviewsEnabled</key>
-	<false/>
-</dict>
-</plist>
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1510"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "97C146ED1CF9000F007C117D"
-               BuildableName = "Runner.app"
-               BlueprintName = "Runner"
-               ReferencedContainer = "container:Runner.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "97C146ED1CF9000F007C117D"
-            BuildableName = "Runner.app"
-            BlueprintName = "Runner"
-            ReferencedContainer = "container:Runner.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <Testables>
-         <TestableReference
-            skipped = "NO"
-            parallelizable = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "331C8080294A63A400263BE5"
-               BuildableName = "RunnerTests.xctest"
-               BlueprintName = "RunnerTests"
-               ReferencedContainer = "container:Runner.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "97C146ED1CF9000F007C117D"
-            BuildableName = "Runner.app"
-            BlueprintName = "Runner"
-            ReferencedContainer = "container:Runner.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Profile"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "97C146ED1CF9000F007C117D"
-            BuildableName = "Runner.app"
-            BlueprintName = "Runner"
-            ReferencedContainer = "container:Runner.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "group:Runner.xcodeproj">
-   </FileRef>
-   <FileRef
-      location = "group:Pods/Pods.xcodeproj">
-   </FileRef>
-</Workspace>
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>PreviewsEnabled</key>
-	<false/>
-</dict>
-</plist>
@@ -1,13 +0,0 @@
-import UIKit
-import Flutter
-
-@main
-@objc class AppDelegate: FlutterAppDelegate {
-  override func application(
-    _ application: UIApplication,
-    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
-  ) -> Bool {
-    GeneratedPluginRegistrant.register(with: self)
-    return super.application(application, didFinishLaunchingWithOptions: launchOptions)
-  }
-}
@@ -1,122 +0,0 @@
-{
-  "images" : [
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "2x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "3x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "3x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "3x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "3x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "1x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "1x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "2x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "1x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "2x"
-    },
-    {
-      "size" : "83.5x83.5",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "2x"
-    },
-    {
-      "size" : "1024x1024",
-      "idiom" : "ios-marketing",
-      "filename" : "[email protected]",
-      "scale" : "1x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "LaunchImage.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "[email protected]",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "[email protected]",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
@@ -1,5 +0,0 @@
-# Launch Screen Assets
-
-You can customize the launch screen with your own desired assets by replacing the image files in this directory.
-
-You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images.
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
-    </dependencies>
-    <scenes>
-        <!--View Controller-->
-        <scene sceneID="EHf-IW-A2E">
-            <objects>
-                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="Ydg-fD-yQy"/>
-                        <viewControllerLayoutGuide type="bottom" id="xbc-2k-c8Z"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4">
-                            </imageView>
-                        </subviews>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        <constraints>
-                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="1a2-6s-vTC"/>
-                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="4X2-HB-R7a"/>
-                        </constraints>
-                    </view>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="53" y="375"/>
-        </scene>
-    </scenes>
-    <resources>
-        <image name="LaunchImage" width="168" height="185"/>
-    </resources>
-</document>
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
-    </dependencies>
-    <scenes>
-        <!--Flutter View Controller-->
-        <scene sceneID="tne-QT-ifu">
-            <objects>
-                <viewController id="BYZ-38-t0r" customClass="FlutterViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
-                        <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                    </view>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
-            </objects>
-        </scene>
-    </scenes>
-</document>
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>API_KEY</key>
-	<string>AIzaSyABnpH6yo2RRjtkp4PlvtK84hKwRm2DhBw</string>
-	<key>GCM_SENDER_ID</key>
-	<string>427332280600</string>
-	<key>PLIST_VERSION</key>
-	<string>1</string>
-	<key>BUNDLE_ID</key>
-	<string>com.example.syncrowWeb</string>
-	<key>PROJECT_ID</key>
-	<string>test2-8a3d2</string>
-	<key>STORAGE_BUCKET</key>
-	<string>test2-8a3d2.firebasestorage.app</string>
-	<key>IS_ADS_ENABLED</key>
-	<false></false>
-	<key>IS_ANALYTICS_ENABLED</key>
-	<false></false>
-	<key>IS_APPINVITE_ENABLED</key>
-	<true></true>
-	<key>IS_GCM_ENABLED</key>
-	<true></true>
-	<key>IS_SIGNIN_ENABLED</key>
-	<true></true>
-	<key>GOOGLE_APP_ID</key>
-	<string>1:427332280600:ios:14346b200780dc760c7e6d</string>
-	<key>DATABASE_URL</key>
-	<string>https://test2-8a3d2-default-rtdb.firebaseio.com</string>
-</dict>
-</plist>
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleDisplayName</key>
-	<string>Syncrow Web</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>syncrow_web</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>$(FLUTTER_BUILD_NAME)</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>$(FLUTTER_BUILD_NUMBER)</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIMainStoryboardFile</key>
-	<string>Main</string>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>CADisableMinimumFrameDurationOnPhone</key>
-	<true/>
-	<key>UIApplicationSupportsIndirectInputEvents</key>
-	<true/>
-</dict>
-</plist>
@@ -1 +0,0 @@
-#import "GeneratedPluginRegistrant.h"
@@ -1,12 +0,0 @@
-import Flutter
-import UIKit
-import XCTest
-
-class RunnerTests: XCTestCase {
-
-  func testExample() {
-    // If you add code to the Runner application, consider adding tests here.
-    // See https://developer.apple.com/documentation/xctest for more information about using XCTest.
-  }
-
-}
@@ -15,7 +15,9 @@ class AirQualityDataModel extends Equatable {
    return AirQualityDataModel(
      date: DateTime.parse(json['date'] as String),
      data: (json['data'] as List<dynamic>)
-          .map((e) => AirQualityPercentageData.fromJson(e as Map<String, dynamic>))
+          .map(
+            (e) => AirQualityPercentageData.fromJson(e as Map<String, dynamic>),
+          )
          .toList(),
    );
  }
@@ -23,9 +25,9 @@ class AirQualityDataModel extends Equatable {
  static final Map<String, Color> metricColors = {
    'good': ColorsManager.goodGreen.withValues(alpha: 0.7),
    'moderate': ColorsManager.moderateYellow.withValues(alpha: 0.7),
-    'poor': ColorsManager.poorOrange.withValues(alpha: 0.7),
+    'unhealthy_sensitive': ColorsManager.poorOrange.withValues(alpha: 0.7),
    'unhealthy': ColorsManager.unhealthyRed.withValues(alpha: 0.7),
-    'severe': ColorsManager.severePink.withValues(alpha: 0.7),
+    'very_unhealthy': ColorsManager.severePink.withValues(alpha: 0.7),
    'hazardous': ColorsManager.hazardousPurple.withValues(alpha: 0.7),
  };

@@ -36,22 +38,19 @@ class AirQualityDataModel extends Equatable {
 class AirQualityPercentageData extends Equatable {
  const AirQualityPercentageData({
    required this.type,
-    required this.name,
    required this.percentage,
  });

  final String type;
-  final String name;
  final double percentage;

  factory AirQualityPercentageData.fromJson(Map<String, dynamic> json) {
    return AirQualityPercentageData(
-      type: json['type'] as String? ?? '',   
-      name: json['name'] as String? ?? '',
+      type: json['type'] as String? ?? '',
      percentage: (json['percentage'] as num?)?.toDouble() ?? 0,
    );
  }

  @override
-  List<Object?> get props => [type, name, percentage];
+  List<Object?> get props => [type, percentage];
 }
@@ -33,7 +33,6 @@ class AirQualityDistributionBloc
        state.copyWith(
          status: AirQualityDistributionStatus.success,
          chartData: result,
-          filteredChartData: _arrangeChartDataByType(result, state.selectedAqiType),
        ),
      );
    } catch (e) {
@@ -58,24 +57,6 @@ class AirQualityDistributionBloc
    UpdateAqiTypeEvent event,
    Emitter<AirQualityDistributionState> emit,
  ) {
-    emit(
-      state.copyWith(
-        selectedAqiType: event.aqiType,
-        filteredChartData: _arrangeChartDataByType(state.chartData, event.aqiType),
-      ),
-    );
-  }
-
-  List<AirQualityDataModel> _arrangeChartDataByType(
-    List<AirQualityDataModel> data,
-    AqiType aqiType,
-  ) {
-    final filteredData = data.map(
-      (data) => AirQualityDataModel(
-        date: data.date,
-        data: data.data.where((value) => value.type == aqiType.code).toList(),
-      ),
-    );
-    return filteredData.toList();
+    emit(state.copyWith(selectedAqiType: event.aqiType));
  }
 }
@@ -11,28 +11,24 @@ class AirQualityDistributionState extends Equatable {
  const AirQualityDistributionState({
    this.status = AirQualityDistributionStatus.initial,
    this.chartData = const [],
-    this.filteredChartData = const [],
    this.errorMessage,
    this.selectedAqiType = AqiType.aqi,
  });

  final AirQualityDistributionStatus status;
  final List<AirQualityDataModel> chartData;
-  final List<AirQualityDataModel> filteredChartData;
  final String? errorMessage;
  final AqiType selectedAqiType;

  AirQualityDistributionState copyWith({
    AirQualityDistributionStatus? status,
    List<AirQualityDataModel>? chartData,
-    List<AirQualityDataModel>? filteredChartData,
    String? errorMessage,
    AqiType? selectedAqiType,
  }) {
    return AirQualityDistributionState(
      status: status ?? this.status,
      chartData: chartData ?? this.chartData,
-      filteredChartData: filteredChartData ?? this.filteredChartData,
      errorMessage: errorMessage ?? this.errorMessage,
      selectedAqiType: selectedAqiType ?? this.selectedAqiType,
    );
@@ -3,6 +3,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/air_quality/blocs/air_quality_distribution/air_quality_distribution_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/air_quality/blocs/device_location/device_location_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/air_quality/blocs/range_of_aqi/range_of_aqi_bloc.dart';
+import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/aqi_type_dropdown.dart';
 import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_date_picker_bloc/analytics_date_picker_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_devices/analytics_devices_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/energy_management/blocs/realtime_device_changes/realtime_device_changes_bloc.dart';
@@ -22,6 +23,7 @@ abstract final class FetchAirQualityDataHelper {
    bool shouldFetchAnalyticsDevices = true,
  }) {
    final date = context.read<AnalyticsDatePickerBloc>().state.monthlyDate;
+    final aqiType = context.read<AirQualityDistributionBloc>().state.selectedAqiType;
    loadAnalyticsDevices(
      context,
      communityUuid: communityUuid,
@@ -36,6 +38,7 @@ abstract final class FetchAirQualityDataHelper {
      context,
      spaceUuid: spaceUuid,
      date: date,
+      aqiType: aqiType,
    );
  }

@@ -104,10 +107,15 @@ abstract final class FetchAirQualityDataHelper {
    BuildContext context, {
    required String spaceUuid,
    required DateTime date,
+    required AqiType aqiType,
  }) {
    context.read<AirQualityDistributionBloc>().add(
          LoadAirQualityDistribution(
-            GetAirQualityDistributionParam(spaceUuid: spaceUuid, date: date),
+            GetAirQualityDistributionParam(
+              spaceUuid: spaceUuid,
+              date: date,
+              aqiType: aqiType,
+            ),
          ),
        );
  }
@@ -16,11 +16,6 @@ class AqiDistributionChart extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    final sortedData = List<AirQualityDataModel>.from(chartData)
-      ..sort(
-        (a, b) => a.date.compareTo(b.date),
-      );
-
    return BarChart(
      BarChartData(
        maxY: 100.1,
@@ -30,29 +25,25 @@ class AqiDistributionChart extends StatelessWidget {
        borderData: EnergyManagementChartsHelper.borderData(),
        barTouchData: _barTouchData(context),
        titlesData: _titlesData(context),
-        barGroups: _buildBarGroups(sortedData),
+        barGroups: _buildBarGroups(),
      ),
      duration: Duration.zero,
    );
  }

-  List<BarChartGroupData> _buildBarGroups(List<AirQualityDataModel> sortedData) {
-    return List.generate(sortedData.length, (index) {
-      final data = sortedData[index];
+  List<BarChartGroupData> _buildBarGroups() {
+    return List.generate(chartData.length, (index) {
+      final data = chartData[index];
      final stackItems = <BarChartRodData>[];
      double currentY = 0;
-      bool isFirstElement = true;
+      var isFirstElement = true;

-      // Sort data by type to ensure consistent order
-      final sortedPercentageData = List<AirQualityPercentageData>.from(data.data)
-        ..sort((a, b) => a.type.compareTo(b.type));
-
-      for (final percentageData in sortedPercentageData) {
+      for (final percentageData in data.data) {
        stackItems.add(
          BarChartRodData(
            fromY: currentY,
-            toY: currentY + percentageData.percentage ,
-            color: AirQualityDataModel.metricColors[percentageData.name]!,
+            toY: currentY + percentageData.percentage,
+            color: AirQualityDataModel.metricColors[percentageData.type],
            borderRadius: isFirstElement
                ? const BorderRadius.only(
                    topLeft: Radius.circular(22),
@@ -84,23 +75,21 @@ class AqiDistributionChart extends StatelessWidget {
        tooltipRoundedRadius: 16,
        tooltipPadding: const EdgeInsets.all(8),
        getTooltipItem: (group, groupIndex, rod, rodIndex) {
-          final data = chartData[group.x.toInt()];
+          final data = chartData[group.x];

-          final List<TextSpan> children = [];
+          final children = <TextSpan>[];

          final textStyle = context.textTheme.bodySmall?.copyWith(
            color: ColorsManager.blackColor,
-            fontSize: 12,
+            fontSize: 8,
          );

-          // Sort data by type to ensure consistent order
-          final sortedPercentageData = List<AirQualityPercentageData>.from(data.data)
-            ..sort((a, b) => a.type.compareTo(b.type));
-
-          for (final percentageData in sortedPercentageData) {
+          for (final percentageData in data.data) {
+            final percentage = percentageData.percentage.toStringAsFixed(1);
+            final type = percentageData.type[0].toUpperCase() +
+                percentageData.type.substring(1).replaceAll('_', ' ');
            children.add(TextSpan(
-              text:
-                  '\n${percentageData.type.toUpperCase()}: ${percentageData.percentage.toStringAsFixed(1)}%',
+              text: '\n$type: $percentage%',
              style: textStyle,
            ));
          }
@@ -109,9 +98,10 @@ class AqiDistributionChart extends StatelessWidget {
            DateFormat('dd/MM/yyyy').format(data.date),
            context.textTheme.bodyMedium!.copyWith(
              color: ColorsManager.blackColor,
-              fontSize: 16,
+              fontSize: 9,
              fontWeight: FontWeight.w600,
            ),
+            textAlign: TextAlign.start,
            children: children,
          );
        },
@@ -33,7 +33,7 @@ class AqiDistributionChartBox extends StatelessWidget {
              const Divider(),
              const SizedBox(height: 20),
              Expanded(
-                child: AqiDistributionChart(chartData: state.filteredChartData),
+                child: AqiDistributionChart(chartData: state.chartData),
              ),
            ],
          ),
@@ -2,8 +2,11 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/air_quality/blocs/air_quality_distribution/air_quality_distribution_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/aqi_type_dropdown.dart';
+import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_date_picker_bloc/analytics_date_picker_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/energy_management/widgets/chart_title.dart';
+import 'package:syncrow_web/pages/analytics/params/get_air_quality_distribution_param.dart';
 import 'package:syncrow_web/pages/analytics/widgets/charts_loading_widget.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';

 class AqiDistributionChartTitle extends StatelessWidget {
  const AqiDistributionChartTitle({required this.isLoading, super.key});
@@ -31,9 +34,15 @@ class AqiDistributionChartTitle extends StatelessWidget {
          child: AqiTypeDropdown(
            onChanged: (value) {
              if (value != null) {
-                context
-                    .read<AirQualityDistributionBloc>()
-                    .add(UpdateAqiTypeEvent(value));
+                final bloc = context.read<AirQualityDistributionBloc>();
+                try {
+                  final param = _makeLoadAqiDistributionParam(context, value);
+                  bloc.add(LoadAirQualityDistribution(param));
+                } catch (_) {
+                  return;
+                } finally {
+                  bloc.add(UpdateAqiTypeEvent(value));
+                }
              }
            },
          ),
@@ -41,4 +50,19 @@ class AqiDistributionChartTitle extends StatelessWidget {
      ],
    );
  }
+
+  GetAirQualityDistributionParam _makeLoadAqiDistributionParam(
+    BuildContext context,
+    AqiType aqiType,
+  ) {
+    final date = context.read<AnalyticsDatePickerBloc>().state.monthlyDate;
+    final spaceUuid =
+        context.read<SpaceTreeBloc>().state.selectedSpaces.firstOrNull ?? '';
+    if (spaceUuid.isEmpty) throw Exception('Space UUID is empty');
+    return GetAirQualityDistributionParam(
+      date: date,
+      spaceUuid: spaceUuid,
+      aqiType: aqiType,
+    );
+  }
 }
@@ -6,8 +6,8 @@ enum AqiType {
  aqi('AQI', '', 'aqi'),
  pm25('PM2.5', 'µg/m³', 'pm25'),
  pm10('PM10', 'µg/m³', 'pm10'),
-  hcho('HCHO', 'mg/m³', 'hcho'),
-  tvoc('TVOC', 'µg/m³', 'tvoc'),
+  hcho('HCHO', 'mg/m³', 'cho2'),
+  tvoc('TVOC', 'µg/m³', 'voc'),
  co2('CO2', 'ppm', 'co2');

  const AqiType(this.value, this.unit, this.code);
@@ -63,7 +63,7 @@ class RangeOfAqiChart extends StatelessWidget {
            gradient: LinearGradient(
              begin: Alignment.bottomCenter,
              end: Alignment.topCenter,
-              stops: [0.0, 0.2, 0.4, 0.6, 0.8, 1.0],
+              stops: const [0.0, 0.2, 0.4, 0.6, 0.8, 1.0],
              colors: RangeOfAqiChartsHelper.gradientData.map((e) {
                final (color, _) = e;
                return color.withValues(alpha: 0.6);
@@ -16,7 +16,7 @@ import 'package:syncrow_web/pages/analytics/modules/energy_management/blocs/real
 import 'package:syncrow_web/pages/analytics/modules/energy_management/blocs/total_energy_consumption/total_energy_consumption_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/occupancy/blocs/occupancy/occupancy_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/occupancy/blocs/occupancy_heat_map/occupancy_heat_map_bloc.dart';
-import 'package:syncrow_web/pages/analytics/services/air_quality_distribution/fake_air_quality_distribution_service.dart';
+import 'package:syncrow_web/pages/analytics/services/air_quality_distribution/remote_air_quality_distribution_service.dart';
 import 'package:syncrow_web/pages/analytics/services/analytics_devices/analytics_devices_service_delagate.dart';
 import 'package:syncrow_web/pages/analytics/services/analytics_devices/remote_energy_management_analytics_devices_service.dart';
 import 'package:syncrow_web/pages/analytics/services/analytics_devices/remote_occupancy_analytics_devices_service.dart';
@@ -27,7 +27,7 @@ import 'package:syncrow_web/pages/analytics/services/energy_consumption_per_devi
 import 'package:syncrow_web/pages/analytics/services/occupacy/remote_occupancy_service.dart';
 import 'package:syncrow_web/pages/analytics/services/occupancy_heat_map/remote_occupancy_heat_map_service.dart';
 import 'package:syncrow_web/pages/analytics/services/power_clamp_info/remote_power_clamp_info_service.dart';
-import 'package:syncrow_web/pages/analytics/services/range_of_aqi/fake_range_of_aqi_service.dart';
+import 'package:syncrow_web/pages/analytics/services/range_of_aqi/remote_range_of_aqi_service.dart';
 import 'package:syncrow_web/pages/analytics/services/realtime_device_service/firebase_realtime_device_service.dart';
 import 'package:syncrow_web/pages/analytics/services/total_energy_consumption/remote_total_energy_consumption_service.dart';
 import 'package:syncrow_web/pages/device_managment/shared/navigate_home_grid_view.dart';
@@ -104,12 +104,12 @@ class _AnalyticsPageState extends State<AnalyticsPage> {
        ),
        BlocProvider(
          create: (context) => RangeOfAqiBloc(
-            FakeRangeOfAqiService(),
+            RemoteRangeOfAqiService(_httpService),
          ),
        ),
        BlocProvider(
          create: (context) => AirQualityDistributionBloc(
-            FakeAirQualityDistributionService(),
+            RemoteAirQualityDistributionService(_httpService),
          ),
        ),
        BlocProvider(
@@ -20,7 +20,7 @@ class AnalyticsDateFilterButton extends StatefulWidget {
  final void Function(DateTime)? onDateSelected;
  final DatePickerType datePickerType;

-  static final _color = ColorsManager.blackColor.withValues(alpha: 0.8);
+  static final Color _color = ColorsManager.blackColor.withValues(alpha: 0.8);

  @override
  State<AnalyticsDateFilterButton> createState() =>
@@ -60,23 +60,21 @@ class _AnalyticsDateFilterButtonState extends State<AnalyticsDateFilterButton> {
        ),
      ),
      onPressed: () {
-        showDialog(
+        showDialog<void>(
          context: context,
-          builder: (_) {
-            return switch (widget.datePickerType) {
-              DatePickerType.month => MonthPickerWidget(
-                  selectedDate: widget.selectedDate,
-                  onDateSelected: (value) {
-                    widget.onDateSelected?.call(value);
-                  },
-                ),
-              DatePickerType.year => YearPickerWidget(
-                  selectedDate: widget.selectedDate,
-                  onDateSelected: (value) {
-                    widget.onDateSelected?.call(value);
-                  },
-                ),
-            };
+          builder: (_) => switch (widget.datePickerType) {
+            DatePickerType.month => MonthPickerWidget(
+                selectedDate: widget.selectedDate,
+                onDateSelected: (value) {
+                  widget.onDateSelected?.call(value);
+                },
+              ),
+            DatePickerType.year => YearPickerWidget(
+                selectedDate: widget.selectedDate,
+                onDateSelected: (value) {
+                  widget.onDateSelected?.call(value);
+                },
+              ),
          },
        );
      },
@@ -118,7 +118,7 @@ class AnalyticsPageTabsAndChildren extends StatelessWidget {
            communityUuid: communities.firstOrNull ?? '',
            spaceUuid: spaces.firstOrNull ?? '',
          );
-          break;
+          return;
        case AnalyticsPageTab.airQuality:
          _onAirQualityDateChanged(
            context,
@@ -126,8 +126,9 @@ class AnalyticsPageTabsAndChildren extends StatelessWidget {
            communityUuid: communities.firstOrNull ?? '',
            spaceUuid: spaces.firstOrNull ?? '',
          );
+          return;
        default:
-          break;
+          return;
      }
    }
  }
@@ -157,6 +158,7 @@ class AnalyticsPageTabsAndChildren extends StatelessWidget {
    required String communityUuid,
    required String spaceUuid,
  }) {
+    if (spaceUuid.isEmpty) return;
    FetchAirQualityDataHelper.loadAirQualityData(
      context,
      date: date,
@@ -1,9 +1,14 @@
+import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/aqi_type_dropdown.dart';
+
 class GetAirQualityDistributionParam {
  final DateTime date;
  final String spaceUuid;
+  final AqiType aqiType;

-  const GetAirQualityDistributionParam({
+  const GetAirQualityDistributionParam(
+ {
    required this.date,
    required this.spaceUuid,
+    required this.aqiType,
  });
 }
@@ -1,95 +0,0 @@
-import 'dart:math';
-
-import 'package:syncrow_web/pages/analytics/models/air_quality_data_model.dart';
-import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/aqi_type_dropdown.dart';
-import 'package:syncrow_web/pages/analytics/params/get_air_quality_distribution_param.dart';
-import 'package:syncrow_web/pages/analytics/services/air_quality_distribution/air_quality_distribution_service.dart';
-
-class FakeAirQualityDistributionService implements AirQualityDistributionService {
-  final _random = Random();
-
-  @override
-  Future<List<AirQualityDataModel>> getAirQualityDistribution(
-    GetAirQualityDistributionParam param,
-  ) async {
-    return Future.delayed(
-      const Duration(milliseconds: 400),
-      () => List.generate(30, (index) {
-        final date = DateTime(2025, 5, 1).add(Duration(days: index));
-
-        final values = _generateRandomPercentages();
-        final nullMask = List.generate(6, (_) => _shouldBeNull());
-
-        if (nullMask.every((isNull) => isNull)) {
-          nullMask[_random.nextInt(6)] = false;
-        }
-
-        final nonNullValues = _redistributePercentages(values, nullMask);
-
-        return AirQualityDataModel(
-          date: date,
-          data: [
-            AirQualityPercentageData(
-              type: AqiType.aqi.code,
-              percentage: nonNullValues[0],
-              name: 'good',
-            ),
-            AirQualityPercentageData(
-              name: 'moderate',
-              type: AqiType.co2.code,
-              percentage: nonNullValues[1],
-            ),
-            AirQualityPercentageData(
-              name: 'poor',
-              percentage: nonNullValues[2],
-              type: AqiType.hcho.code,
-
-            ),
-            AirQualityPercentageData(
-              name: 'unhealthy',
-              percentage: nonNullValues[3],
-              type: AqiType.pm10.code,
-            ),
-            AirQualityPercentageData(
-              name: 'severe',
-              type: AqiType.pm25.code,
-              percentage: nonNullValues[4],
-            ),
-            AirQualityPercentageData(
-              name: 'hazardous',
-              percentage: nonNullValues[5],
-              type: AqiType.co2.code,
-            ),
-          ],
-        );
-      }),
-    );
-  }
-
-  List<double> _redistributePercentages(
-    List<double> originalValues,
-    List<bool> nullMask,
-  ) {
-    double nonNullSum = 0;
-    for (int i = 0; i < originalValues.length; i++) {
-      if (!nullMask[i]) {
-        nonNullSum += originalValues[i];
-      }
-    }
-
-    return List.generate(originalValues.length, (i) {
-      if (nullMask[i]) return 0;
-      return (originalValues[i] / nonNullSum * 100).roundToDouble();
-    });
-  }
-
-  bool _shouldBeNull() => _random.nextDouble() < 0.6;
-
-  List<double> _generateRandomPercentages() {
-    final values = List.generate(6, (_) => _random.nextDouble());
-
-    final sum = values.reduce((a, b) => a + b);
-
-    return values.map((value) => (value / sum * 100).roundToDouble()).toList();
-  }
-}
@@ -3,7 +3,8 @@ import 'package:syncrow_web/pages/analytics/params/get_air_quality_distribution_
 import 'package:syncrow_web/pages/analytics/services/air_quality_distribution/air_quality_distribution_service.dart';
 import 'package:syncrow_web/services/api/http_service.dart';

-class RemoteAirQualityDistributionService implements AirQualityDistributionService {
+final class RemoteAirQualityDistributionService
+    implements AirQualityDistributionService {
  RemoteAirQualityDistributionService(this._httpService);

  final HTTPService _httpService;
@@ -14,10 +15,10 @@ class RemoteAirQualityDistributionService implements AirQualityDistributionServi
  ) async {
    try {
      final response = await _httpService.get(
-        path: 'endpoint',
+        path: '/aqi/distribution/space/${param.spaceUuid}',
        queryParameters: {
-          'spaceUuid': param.spaceUuid,
-          'date': param.date.toIso8601String(),
+          'monthDate': _formatDate(param.date),
+          'pollutantType': param.aqiType.code,
        },
        expectedResponseModel: (data) {
          final json = data as Map<String, dynamic>? ?? {};
@@ -33,4 +34,8 @@ class RemoteAirQualityDistributionService implements AirQualityDistributionServi
      throw Exception('Failed to load energy consumption per phase: $e');
    }
  }
+
+  static String _formatDate(DateTime date) {
+    return '${date.year}-${date.month.toString().padLeft(2, '0')}';
+  }
 }
@@ -26,15 +26,15 @@ class DeviceLocationDetailsServiceDecorator implements DeviceLocationService {
      if (data != null) {
        final addressData = data['address'] as Map<String, dynamic>;
        return deviceLocationInfo.copyWith(
-          city: addressData['city'],
-          country: addressData['country_code'].toString().toUpperCase(),
-          address: addressData['state'],
+          city: addressData['city'] as String?,
+          country: addressData['country_code']?.toString().toUpperCase(),
+          address: addressData['state'] as String?,
        );
      }

      return deviceLocationInfo;
    } catch (e) {
-      throw Exception('Failed to load device location info: ${e.toString()}');
+      throw Exception('Failed to load device location info: $e');
    }
  }
 }
@@ -1,36 +0,0 @@
-import 'package:syncrow_web/pages/analytics/models/range_of_aqi.dart';
-import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/aqi_type_dropdown.dart';
-import 'package:syncrow_web/pages/analytics/params/get_range_of_aqi_param.dart';
-import 'package:syncrow_web/pages/analytics/services/range_of_aqi/range_of_aqi_service.dart';
-
-class FakeRangeOfAqiService implements RangeOfAqiService {
-  @override
-  Future<List<RangeOfAqi>> load(GetRangeOfAqiParam param) async {
-    return await Future.delayed(const Duration(milliseconds: 800), () {
-      final random = DateTime.now().millisecondsSinceEpoch;
-
-      return List.generate(30, (index) {
-        final date = DateTime(2025, 5, 1).add(Duration(days: index));
-
-        final min = ((random + index * 17) % 200).toDouble();
-        final avgDelta = ((random + index * 23) % 50).toDouble() + 20;
-        final maxDelta = ((random + index * 31) % 50).toDouble() + 30;
-
-        final avg = (min + avgDelta).clamp(0.0, 301.0);
-        final max = (avg + maxDelta).clamp(0.0, 301.0);
-
-        return RangeOfAqi(  
-          data: [
-            RangeOfAqiValue(type: AqiType.aqi.code, min: min, average: avg, max: max),
-            RangeOfAqiValue(type: AqiType.pm25.code, min: min, average: avg, max: max),
-            RangeOfAqiValue(type: AqiType.pm10.code, min: min, average: avg, max: max),
-            RangeOfAqiValue(type: AqiType.hcho.code, min: min, average: avg, max: max),
-            RangeOfAqiValue(type: AqiType.tvoc.code, min: min, average: avg, max: max),
-            RangeOfAqiValue(type: AqiType.co2.code, min: min, average: avg, max: max),
-          ],
-          date: date,
-        );
-      });
-    });
-  }
-}
@@ -12,11 +12,8 @@ final class RemoteRangeOfAqiService implements RangeOfAqiService {
  Future<List<RangeOfAqi>> load(GetRangeOfAqiParam param) async {
    try {
      final response = await _httpService.get(
-        path: 'endpoint',
-        queryParameters: {
-          'spaceUuid': param.spaceUuid,
-          'date': param.date.toIso8601String(),
-        },
+        path: '/aqi/range/space/${param.spaceUuid}',
+        queryParameters: {'monthDate': _formatDate(param.date)},
        expectedResponseModel: (data) {
          final json = data as Map<String, dynamic>? ?? {};
          final mappedData = json['data'] as List<dynamic>? ?? [];
@@ -28,7 +25,11 @@ final class RemoteRangeOfAqiService implements RangeOfAqiService {
      );
      return response;
    } catch (e) {
-      throw Exception('Failed to load energy consumption per phase: $e');
+      throw Exception('Failed to load range of aqi: $e');
    }
  }
+
+  static String _formatDate(DateTime date) {
+    return '${date.year}-${date.month.toString().padLeft(2, '0')}';
+  }
 }
@@ -78,7 +78,7 @@ class CustomWebTextField extends StatelessWidget {
            controller: controller,
            style: const TextStyle(color: Colors.black),
            decoration: textBoxDecoration()!.copyWith(
-                errorStyle: const TextStyle(height: 0),
+                errorStyle: const TextStyle(height: 0.01),
                hintStyle: context.textTheme.titleSmall!
                    .copyWith(color: Colors.grey, fontSize: 12),
                hintText: hintText ?? 'Please enter'),
@@ -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(),
          ],
        ),
@@ -73,15 +76,15 @@ class DeviceManagementContent extends StatelessWidget {
                );
              },
              child: infoRow(
-                label: 'Sub-Space:',
-                value: deviceInfo.subspace.subspaceName,
-                valueColor: ColorsManager.textGray,
-                trailing: const Icon(
-                  Icons.arrow_forward_ios,
-                  size: 16,
-                  color: ColorsManager.greyColor,
-                ),
-              ),
+                  label: 'Sub-Space:',
+                  value: deviceInfo.subspace.subspaceName,
+                  valueColor: ColorsManager.blackColor,
+                  trailing: SvgPicture.asset(
+                    Assets.arrowDown,
+                    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,
                ),
              ),
@@ -51,8 +51,7 @@ class DeviceSettingsPanel extends StatelessWidget {
                  Container(
                    width: MediaQuery.of(context).size.width * 0.3,
                    color: ColorsManager.grey25,
-                    padding: const EdgeInsets.symmetric(
-                        horizontal: 20, vertical: 24),
+                    padding: const EdgeInsets.all(10),
                    child: ListView(
                      children: [
                        Row(
@@ -70,37 +69,43 @@ class DeviceSettingsPanel extends StatelessWidget {
                          children: [
                            Text(
                              'Device Settings',
-                              style:
-                                  context.theme.textTheme.titleLarge!.copyWith(
-                                fontWeight: FontWeight.bold,
-                                color: ColorsManager.primaryColor,
-                              ),
+                              style: context.theme.textTheme.titleLarge!
+                                  .copyWith(
+                                      fontWeight: FontWeight.w700,
+                                      color: ColorsManager.vividBlue
+                                          .withOpacity(0.7),
+                                      fontSize: 24),
                            ),
                          ],
                        ),
                        const SizedBox(height: 24),
                        DefaultContainer(
+                          borderRadius: BorderRadius.circular(15),
                          child: Row(
                            children: [
-                              CircleAvatar(
-                                radius: 40,
-                                backgroundColor:
-                                    const Color.fromARGB(177, 213, 213, 213),
+                              Padding(
+                                padding: const EdgeInsets.only(left: 15),
                                child: CircleAvatar(
-                                  backgroundColor: ColorsManager.whiteColors,
-                                  radius: 36,
-                                  child: SvgPicture.asset(
-                                    iconPath,
-                                    fit: BoxFit.cover,
+                                  radius: 38,
+                                  backgroundColor:
+                                      ColorsManager.grayBorder.withOpacity(0.5),
+                                  child: CircleAvatar(
+                                    backgroundColor: ColorsManager.whiteColors,
+                                    radius: 36,
+                                    child: SvgPicture.asset(
+                                      iconPath,
+                                      fit: BoxFit.cover,
+                                    ),
                                  ),
                                ),
                              ),
-                              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,50 +113,79 @@ class DeviceSettingsPanel extends StatelessWidget {
                                        color: ColorsManager.grayColor,
                                      ),
                                    ),
-                                    TextFormField(
-                                      maxLength: 30,
-                                      style: const TextStyle(
-                                        color: ColorsManager.blackColor,
-                                      ),
-                                      textAlign: TextAlign.start,
-                                      focusNode: _bloc.focusNode,
-                                      controller: _bloc.nameController,
-                                      enabled: _bloc.editName,
-                                      onFieldSubmitted: (value) {
-                                        _bloc.add(const ChangeNameEvent(
-                                            value: false));
-                                      },
-                                      decoration: const InputDecoration(
-                                        border: InputBorder.none,
-                                        fillColor: Colors.white10,
-                                        counterText: '',
+                                    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,
+                                              controller: _bloc.nameController,
+                                              enabled: _bloc.editName,
+                                              onFieldSubmitted: (value) {
+                                                _bloc.add(const ChangeNameEvent(
+                                                    value: false));
+                                              },
+                                              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>(),
@@ -40,7 +40,7 @@ class HomeCard extends StatelessWidget {
                      child: Text(
                        name,
                        style: const TextStyle(
-                          fontSize: 20,
+                          fontSize: 30,
                          color: Colors.white,
                          fontWeight: FontWeight.bold,
                        ),
@@ -97,7 +97,7 @@ class _HomeWebPageState extends State<HomeWebPage> {
                            itemCount: homeBloc.homeItems.length,
                            gridDelegate:
                                const SliverGridDelegateWithFixedCrossAxisCount(
-                              crossAxisCount: 3, // Adjust as needed.
+                              crossAxisCount: 4, // Adjust as needed.
                              crossAxisSpacing: 20.0,
                              mainAxisSpacing: 20.0,
                              childAspectRatio: 1.5,
@@ -11,7 +11,6 @@ class CreateRoutineBloc extends Bloc<CreateRoutineEvent, CreateRoutineState> {
    on<SpaceOnlyWithDevicesEvent>(_fetchSpaceOnlyWithDevices);
    on<SaveCommunityIdAndSpaceIdEvent>(saveSpaceIdCommunityId);
    on<ResetSelectedEvent>(resetSelected);
-    on<FetchCommunityEvent>(_fetchCommunity);
  }

  String selectedSpaceId = '';
@@ -50,18 +49,4 @@ 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'));
-    }
-  }
 }
@@ -43,9 +43,3 @@ class ResetSelectedEvent extends CreateRoutineEvent {
 }


-class FetchCommunityEvent extends CreateRoutineEvent {
-  const FetchCommunityEvent();
-
-  @override
-  List<Object> get props => [];
-}
@@ -1,13 +1,11 @@
 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 SpaceTreeDropdown extends StatefulWidget {
+class SpaceTreeDropdown extends StatelessWidget {
  final String? selectedSpaceId;
  final Function(String?)? onChanged;

@@ -18,23 +16,33 @@ class SpaceTreeDropdown extends StatefulWidget {
  });

  @override
-  State<SpaceTreeDropdown> createState() => _SpaceTreeDropdownState();
+  Widget build(BuildContext context) {
+    return BlocProvider(
+      create: (context) {
+        final bloc = SpaceTreeDropdownBloc(selectedSpaceId);
+        bloc.add(FetchSpacesEvent());
+        return bloc;
+      },
+      child: _DropdownContent(onChanged: onChanged),
+    );
+  }
 }

-class _SpaceTreeDropdownState extends State<SpaceTreeDropdown> {
-  late SpaceTreeDropdownBloc _dropdownBloc;
+class _DropdownContent extends StatefulWidget {
+  final Function(String?)? onChanged;
+
+  const _DropdownContent({this.onChanged});
+
+  @override
+  State<_DropdownContent> createState() => _DropdownContentState();
+}
+
+class _DropdownContentState extends State<_DropdownContent> {
  final LayerLink _layerLink = LayerLink();
  OverlayEntry? _overlayEntry;

-  @override
-  void initState() {
-    super.initState();
-    _dropdownBloc = SpaceTreeDropdownBloc(widget.selectedSpaceId);
-  }
-
  @override
  void dispose() {
-    _dropdownBloc.close();
    _removeOverlay();
    super.dispose();
  }
@@ -46,100 +54,120 @@ class _SpaceTreeDropdownState extends State<SpaceTreeDropdown> {

  @override
  Widget build(BuildContext context) {
-    return BlocProvider.value(
-      value: _dropdownBloc,
-      child: BlocBuilder<SpaceTreeBloc, SpaceTreeState>(
-        builder: (context, spaceTreeState) {
-          final communities = spaceTreeState.searchQuery.isNotEmpty
-              ? spaceTreeState.filteredCommunity
-              : spaceTreeState.communityList;
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      mainAxisAlignment: MainAxisAlignment.start,
+      children: [
+        Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 10),
+          child: Text(
+            "Community",
+            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                  fontWeight: FontWeight.w400,
+                  fontSize: 13,
+                  color: ColorsManager.blackColor,
+                ),
+          ),
+        ),
+        CompositedTransformTarget(
+          link: _layerLink,
+          child: GestureDetector(
+            onTap: () => _toggleDropdown(context),
+            child: BlocBuilder<SpaceTreeDropdownBloc, SpaceTreeDropdownState>(
+              builder: (context, state) {
+                return _buildDropdownTrigger(state);
+              },
+            ),
+          ),
+        ),
+      ],
+    );
+  }

-          return BlocBuilder<SpaceTreeDropdownBloc, SpaceTreeDropdownState>(
-            builder: (context, dropdownState) {
-              final selectedCommunity = _findCommunity(
-                communities,
-                dropdownState.selectedSpaceId,
-              );
+  Widget _buildDropdownTrigger(SpaceTreeDropdownState state) {
+    if (state.status == SpaceTreeDropdownStatus.loading) {
+      return Container(
+        height: 46,
+        decoration: BoxDecoration(
+          border: Border.all(color: Colors.grey.shade300),
+          borderRadius: BorderRadius.circular(12),
+        ),
+        margin: const EdgeInsets.symmetric(horizontal: 10),
+        child: const Center(child: CircularProgressIndicator()),
+      );
+    }

-              return Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                mainAxisAlignment: MainAxisAlignment.start,
-                children: [
-                  Padding(
-                    padding: const EdgeInsets.symmetric(horizontal: 10),
-                    child: Text(
-                      "Community",
-                      style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                            fontWeight: FontWeight.w400,
-                            fontSize: 13,
-                            color: ColorsManager.blackColor,
-                          ),
-                    ),
-                  ),
-                  CompositedTransformTarget(
-                    link: _layerLink,
-                    child: GestureDetector(
-                      onTap: () => _toggleDropdown(context, communities),
-                      child: Container(
-                        height: 46,
-                        decoration: BoxDecoration(
-                          border: Border.all(color: Colors.grey.shade300),
-                          borderRadius: BorderRadius.circular(12),
-                        ),
-                        margin: const EdgeInsets.symmetric(horizontal: 10),
-                        child: Row(
-                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                          children: [
-                            Padding(
-                              padding:
-                                  const EdgeInsets.symmetric(horizontal: 10),
-                              child: Text(
-                                selectedCommunity?.name ?? 'Please Select',
-                                style: TextStyle(
-                                  color: selectedCommunity != null
-                                      ? ColorsManager.blackColor
-                                      : ColorsManager.textGray,
-                                  overflow: TextOverflow.ellipsis,
-                                  fontWeight: FontWeight.w400,
-                                  fontSize: 13,
-                                ),
-                              ),
-                            ),
-                            Container(
-                              decoration: BoxDecoration(
-                                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,
-                              ),
-                            ),
-                          ],
-                        ),
-                      ),
-                    ),
-                  ),
-                ],
-              );
-            },
-          );
-        },
+    if (state.status == SpaceTreeDropdownStatus.failure) {
+      return Container(
+        height: 46,
+        decoration: BoxDecoration(
+          border: Border.all(color: Colors.grey.shade300),
+          borderRadius: BorderRadius.circular(12),
+        ),
+        margin: const EdgeInsets.symmetric(horizontal: 10),
+        child: Center(
+          child: Text(
+            'Error: ${state.errorMessage}',
+            style: const TextStyle(color: Colors.red),
+          ),
+        ),
+      );
+    }
+
+    final selectedCommunity = _findCommunity(state, state.selectedSpaceId);
+
+    return Container(
+      height: 46,
+      decoration: BoxDecoration(
+        border: Border.all(color: Colors.grey.shade300),
+        borderRadius: BorderRadius.circular(12),
+      ),
+      margin: const EdgeInsets.symmetric(horizontal: 10),
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        children: [
+          Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 10),
+            child: Text(
+              selectedCommunity?.name ?? 'Please Select',
+              style: TextStyle(
+                color: selectedCommunity != null
+                    ? ColorsManager.blackColor
+                    : ColorsManager.textGray,
+                overflow: TextOverflow.ellipsis,
+                fontWeight: FontWeight.w400,
+                fontSize: 13,
+              ),
+            ),
+          ),
+          Container(
+            decoration: BoxDecoration(
+              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,
+            ),
+          ),
+        ],
      ),
    );
  }

-  void _toggleDropdown(BuildContext context, List<CommunityModel> communities) {
+  void _toggleDropdown(BuildContext context) {
    if (_overlayEntry != null) {
      _removeOverlay();
      return;
    }

+    final bloc = context.read<SpaceTreeDropdownBloc>();
+
    _overlayEntry = OverlayEntry(
      builder: (context) => Positioned(
        width: 300,
@@ -148,18 +176,22 @@ class _SpaceTreeDropdownState extends State<SpaceTreeDropdown> {
          showWhenUnlinked: false,
          offset: const Offset(0, 48),
          child: Material(
+            color: ColorsManager.whiteColors,
            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,
+            child: BlocProvider.value(
+              value: bloc,
+              child: DropdownMenuContent(
+                selectedSpaceId: bloc.state.selectedSpaceId,
+                onChanged: (id) {
+                  if (id != null && mounted) {
+                    bloc.add(SpaceTreeDropdownSelectEvent(id));
+                    widget.onChanged?.call(id);
+                    _removeOverlay();
+                  }
+                },
+                onClose: _removeOverlay,
+              ),
            ),
          ),
        ),
@@ -170,10 +202,13 @@ class _SpaceTreeDropdownState extends State<SpaceTreeDropdown> {
  }

  CommunityModel? _findCommunity(
-      List<CommunityModel> communities, String? communityId) {
+      SpaceTreeDropdownState state, String? communityId) {
    if (communityId == null) return null;
    try {
-      return communities.firstWhere((c) => c.uuid == communityId);
+      return state.filteredCommunities.firstWhere((c) => c.uuid == communityId);
+    } catch (_) {}
+    try {
+      return state.communities.firstWhere((c) => c.uuid == communityId);
    } catch (e) {
      return null;
    }
@@ -23,8 +23,7 @@ class _CreateNewRoutinesDialogState extends State<CreateNewRoutinesDialog> {
  @override
  Widget build(BuildContext context) {
    return BlocProvider(
-        create: (BuildContext context) =>
-            CreateRoutineBloc()..add(const FetchCommunityEvent()),
+        create: (BuildContext context) => CreateRoutineBloc(),
        child: BlocBuilder<CreateRoutineBloc, CreateRoutineState>(
          builder: (context, state) {
            final _bloc = BlocProvider.of<CreateRoutineBloc>(context);
@@ -1,12 +1,7 @@
-
-
-
-
+import 'dart:async';
 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';
+import 'space_tree_dropdown_bloc.dart';

 class DropdownMenuContent extends StatefulWidget {
  final String? selectedSpaceId;
@@ -14,6 +9,7 @@ class DropdownMenuContent extends StatefulWidget {
  final VoidCallback onClose;

  const DropdownMenuContent({
+    super.key,
    required this.selectedSpaceId,
    required this.onChanged,
    required this.onClose,
@@ -26,6 +22,7 @@ class DropdownMenuContent extends StatefulWidget {
 class _DropdownMenuContentState extends State<DropdownMenuContent> {
  final ScrollController _scrollController = ScrollController();
  final TextEditingController _searchController = TextEditingController();
+  Timer? _debounceTimer;

  @override
  void initState() {
@@ -35,43 +32,49 @@ class _DropdownMenuContentState extends State<DropdownMenuContent> {

  @override
  void dispose() {
+    _debounceTimer?.cancel();
    _scrollController.dispose();
    _searchController.dispose();
    super.dispose();
  }

  void _onScroll() {
-    final bloc = context.read<SpaceTreeBloc>();
+    final bloc = context.read<SpaceTreeDropdownBloc>();
    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));
+      if (state.paginationModel?.hasNext == true &&
+          !state.paginationIsLoading) {
+        bloc.add(PaginationEvent());
      }
    }
  }

+  void _handleSearch(String query) {
+    _debounceTimer?.cancel();
+    _debounceTimer = Timer(const Duration(milliseconds: 500), () {
+      context.read<SpaceTreeDropdownBloc>().add(SearchQueryEvent(query));
+    });
+  }
+
  @override
  Widget build(BuildContext context) {
    return ConstrainedBox(
      constraints: const BoxConstraints(maxHeight: 300),
-      child: BlocBuilder<SpaceTreeBloc, SpaceTreeState>(
+      child: BlocBuilder<SpaceTreeDropdownBloc, SpaceTreeDropdownState>(
        builder: (context, state) {
          final communities = state.searchQuery.isNotEmpty
-              ? state.filteredCommunity
-              : state.communityList;
+              ? state.filteredCommunities
+              : state.communities;

          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));
-                  },
+                  onChanged: _handleSearch,
                  style: const TextStyle(fontSize: 14, color: Colors.black),
                  decoration: InputDecoration(
                    hintText: 'Search for space...',
@@ -85,7 +88,6 @@ class _DropdownMenuContentState extends State<DropdownMenuContent> {
                  ),
                ),
              ),
-              // Community list
              Expanded(
                child: ListView.builder(
                  controller: _scrollController,
@@ -121,19 +123,12 @@ class _DropdownMenuContentState extends State<DropdownMenuContent> {
                        ),
                      ),
                      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), () {
+                        context
+                            .read<SpaceTreeDropdownBloc>()
+                            .add(SearchQueryEvent(''));
+
                        widget.onChanged(community.uuid);
                        widget.onClose();
-                        // });
                      },
                    );
                  },
@@ -1,5 +1,9 @@
+import 'dart:async';
 import 'package:flutter_bloc/flutter_bloc.dart';
-
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
+import 'package:syncrow_web/pages/space_tree/model/pagination_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
+import 'package:syncrow_web/services/space_mana_api.dart';
 part 'space_tree_dropdown_event.dart';
 part 'space_tree_dropdown_state.dart';

@@ -9,19 +13,158 @@ class SpaceTreeDropdownBloc
      : super(SpaceTreeDropdownState(selectedSpaceId: initialId)) {
    on<SpaceTreeDropdownSelectEvent>(_onSelect);
    on<SpaceTreeDropdownResetEvent>(_onReset);
+    on<FetchSpacesEvent>(_fetchSpaces);
+    on<SearchQueryEvent>(_onSearch);
+    on<PaginationEvent>(_onPagination);
+    on<DebouncedSearchEvent>(_onDebouncedSearch);
  }
+  Timer? _debounceTimer;

  void _onSelect(
    SpaceTreeDropdownSelectEvent event,
    Emitter<SpaceTreeDropdownState> emit,
  ) {
-    emit(SpaceTreeDropdownState(selectedSpaceId: event.spaceId));
+    final exists = state.communities.any((c) => c.uuid == event.spaceId);
+
+    if (!exists) {
+      final community = state.filteredCommunities.firstWhere(
+        (c) => c.uuid == event.spaceId,
+        orElse: () => CommunityModel(
+            uuid: event.spaceId!,
+            name: 'Loading...',
+            createdAt: DateTime.now(),
+            updatedAt: DateTime.now(),
+            spaces: [],
+            description: ''),
+      );
+
+      emit(state.copyWith(
+        selectedSpaceId: event.spaceId,
+        communities: [...state.communities, community],
+      ));
+    } else {
+      emit(state.copyWith(selectedSpaceId: event.spaceId));
+    }
  }

  void _onReset(
    SpaceTreeDropdownResetEvent event,
    Emitter<SpaceTreeDropdownState> emit,
  ) {
-    emit(SpaceTreeDropdownState(selectedSpaceId: event.initialId));
+    emit(state.copyWith(selectedSpaceId: event.initialId));
  }
-}
+
+  Future<void> _fetchSpaces(
+    FetchSpacesEvent event,
+    Emitter<SpaceTreeDropdownState> emit,
+  ) async {
+    if (state.status != SpaceTreeDropdownStatus.initial) return;
+    emit(state.copyWith(status: SpaceTreeDropdownStatus.loading));
+    try {
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+      final paginationModel = await CommunitySpaceManagementApi()
+          .fetchCommunitiesAndSpaces(projectId: projectUuid, page: 1);
+
+      emit(state.copyWith(
+        status: SpaceTreeDropdownStatus.success,
+        communities: paginationModel.communities,
+        filteredCommunities: paginationModel.communities,
+        paginationModel: paginationModel,
+      ));
+    } catch (e) {
+      emit(state.copyWith(
+        status: SpaceTreeDropdownStatus.failure,
+        errorMessage: 'Error loading communities: $e',
+      ));
+    }
+  }
+
+  void _onSearch(
+    SearchQueryEvent event,
+    Emitter<SpaceTreeDropdownState> emit,
+  ) {
+    _debounceTimer?.cancel();
+    _debounceTimer = Timer(const Duration(seconds: 1), () {
+      add(DebouncedSearchEvent(event.searchQuery));
+    });
+  }
+
+  Future<void> _onDebouncedSearch(
+    DebouncedSearchEvent event,
+    Emitter<SpaceTreeDropdownState> emit,
+  ) async {
+    emit(state.copyWith(isSearching: true));
+
+    try {
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+      final paginationModel =
+          await CommunitySpaceManagementApi().fetchCommunitiesAndSpaces(
+        projectId: projectUuid,
+        page: 1,
+        search: event.searchQuery,
+      );
+
+      emit(state.copyWith(
+        filteredCommunities: paginationModel.communities,
+        isSearching: false,
+        searchQuery: event.searchQuery,
+        paginationModel: paginationModel,
+      ));
+    } catch (e) {
+      emit(state.copyWith(
+        isSearching: false,
+        errorMessage: 'Error searching communities: $e',
+      ));
+    }
+  }
+
+  @override
+  Future<void> close() {
+    _debounceTimer?.cancel();
+    return super.close();
+  }
+
+  Future<void> _onPagination(
+    PaginationEvent event,
+    Emitter<SpaceTreeDropdownState> emit,
+  ) async {
+    if (state.paginationIsLoading || state.paginationModel?.hasNext != true) {
+      return;
+    }
+
+    emit(state.copyWith(paginationIsLoading: true));
+
+    try {
+      final nextPage = state.paginationModel!.pageNum;
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+      final newPagination = await CommunitySpaceManagementApi()
+          .fetchCommunitiesAndSpaces(projectId: projectUuid, page: nextPage);
+
+      final combinedCommunities = [
+        ...state.communities,
+        ...newPagination.communities
+      ];
+      List<CommunityModel> filteredCommunities;
+      if (state.searchQuery.isNotEmpty) {
+        final query = state.searchQuery.toLowerCase();
+        filteredCommunities = combinedCommunities.where((community) {
+          return community.name.toLowerCase().contains(query);
+        }).toList();
+      } else {
+        filteredCommunities = combinedCommunities;
+      }
+
+      emit(state.copyWith(
+        communities: combinedCommunities,
+        filteredCommunities: filteredCommunities,
+        paginationModel: newPagination,
+        paginationIsLoading: false,
+      ));
+    } catch (e) {
+      emit(state.copyWith(
+        paginationIsLoading: false,
+        errorMessage: 'Error loading more communities: $e',
+      ));
+    }
+  }
+}
@@ -12,4 +12,20 @@ class SpaceTreeDropdownResetEvent extends SpaceTreeDropdownEvent {
  final String? initialId;

  SpaceTreeDropdownResetEvent(this.initialId);
-}
+}
+
+class FetchSpacesEvent extends SpaceTreeDropdownEvent {}
+
+class SearchQueryEvent extends SpaceTreeDropdownEvent {
+  final String searchQuery;
+
+  SearchQueryEvent(this.searchQuery);
+}
+
+class DebouncedSearchEvent extends SpaceTreeDropdownEvent {
+  final String searchQuery;
+
+  DebouncedSearchEvent(this.searchQuery);
+}
+
+class PaginationEvent extends SpaceTreeDropdownEvent {}
@@ -1,7 +1,51 @@
 part of 'space_tree_dropdown_bloc.dart';

+enum SpaceTreeDropdownStatus { initial, loading, success, failure }
+
 class SpaceTreeDropdownState {
  final String? selectedSpaceId;
+  final List<CommunityModel> communities;
+  final List<CommunityModel> filteredCommunities;
+  final SpaceTreeDropdownStatus status;
+  final String? errorMessage;
+  final String searchQuery;
+  final bool paginationIsLoading;
+  final PaginationModel? paginationModel;
+  final bool isSearching;

-  SpaceTreeDropdownState({this.selectedSpaceId});
+  SpaceTreeDropdownState({
+    this.selectedSpaceId,
+    this.communities = const [],
+    this.filteredCommunities = const [],
+    this.status = SpaceTreeDropdownStatus.initial,
+    this.errorMessage,
+    this.searchQuery = '',
+    this.paginationIsLoading = false,
+    this.paginationModel,
+    this.isSearching = false,
+  });
+
+  SpaceTreeDropdownState copyWith({
+    String? selectedSpaceId,
+    List<CommunityModel>? communities,
+    List<CommunityModel>? filteredCommunities,
+    SpaceTreeDropdownStatus? status,
+    String? errorMessage,
+    String? searchQuery,
+    bool? paginationIsLoading,
+    PaginationModel? paginationModel,
+    bool? isSearching,
+  }) {
+    return SpaceTreeDropdownState(
+      selectedSpaceId: selectedSpaceId ?? this.selectedSpaceId,
+      communities: communities ?? this.communities,
+      filteredCommunities: filteredCommunities ?? this.filteredCommunities,
+      status: status ?? this.status,
+      errorMessage: errorMessage ?? this.errorMessage,
+      searchQuery: searchQuery ?? this.searchQuery,
+      paginationIsLoading: paginationIsLoading ?? this.paginationIsLoading,
+      paginationModel: paginationModel ?? this.paginationModel,
+      isSearching: isSearching ?? this.isSearching,
+    );
+  }
 }
@@ -118,6 +118,7 @@ class DeviceDialogHelper {
          uniqueCustomId: data['uniqueCustomId'],
          deviceSelectedFunctions: deviceSelectedFunctions,
          device: data['device'],
+          dialogType: dialogType,
        );
      case 'NCPS':
        return FlushPresenceSensor.showFlushFunctionsDialog(
@@ -65,7 +65,9 @@ class ACHelper {
                  child: Column(
                    mainAxisSize: MainAxisSize.min,
                    children: [
-                      const DialogHeader('AC Functions'),
+                      DialogHeader(dialogType == 'THEN'
+                          ? 'AC Functions'
+                          : 'AC Conditions'),
                      Expanded(
                        child: Row(
                          crossAxisAlignment: CrossAxisAlignment.stretch,
@@ -96,7 +96,9 @@ class _WallPresenceSensorState extends State<FlushPresenceSensor> {
            child: Column(
              mainAxisSize: MainAxisSize.min,
              children: [
-                const DialogHeader('Presence Sensor Condition'),
+                DialogHeader(widget.dialogType == 'THEN'
+                    ? 'Presence Sensor Functions'
+                    : 'Presence Sensor Condition'),
                Expanded(child: _buildMainContent(context, state)),
                _buildDialogFooter(context, state),
              ],
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Faris Armoush	6ff9c602f1	SP-1723-FE-Integrate-Charts-with-API-s-for-AQI-sensor.	2025-06-16 10:59:51 +03:00
Faris Armoush	5f20d52e57	doesnt load aqi data when spaceUuid is empty.	2025-06-16 10:46:48 +03:00
Faris Armoush	362557d0d0	removed filtered data from`AirQualityDistributionBloc` since it isnt needed for this bloc.	2025-06-16 10:29:31 +03:00
Faris Armoush	312d185932	unsort all data from `AqiDistributionChart` since the api returns it sorted, and the pacakge handles sorting.	2025-06-16 10:29:03 +03:00
Faris Armoush	89e12e47da	ajusted `AqiType.code`s to match the api.	2025-06-16 10:28:26 +03:00
Faris Armoush	a0d9819532	Deleted `FakeRangeOfAqiService`.	2025-06-16 09:30:50 +03:00
Faris Armoush	1316820954	Injected `RemoteRangeOfAqiService` into `RangeOfAqiBloc` instead of using `FakeRangeOfAqiService`, because the API is ready.	2025-06-16 09:30:39 +03:00
Faris Armoush	5591c78d88	Refactor RemoteRangeOfAqiService to update API endpoint to match what the actual endpoint is.	2025-06-16 09:29:31 +03:00
raf-dev1	5b3152e833	SP-1673-fe-validation-red-borders-not-displayed-correctly-on-create-visitor-password-modal (#251 ) <!-- 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-1673](https://syncrow.atlassian.net/browse/SP-1673?atlOrigin=eyJpIjoiZmU3YTRmMjQ3MDk4NDM0Y2I0MTVmOTA0Yjc1ZWE2NTEiLCJwIjoiamlyYS1zbGFjay1pbnQifQ) ## Description fix the bug when validator activated textfield height get confused ## 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 [SP-1673]: https://syncrow.atlassian.net/browse/SP-1673?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ	2025-06-16 08:46:52 +03:00
raf-dev1	c1d3296b59	SP-1613-fe-remove-the-word-condition-from-the-task-dialog-in-the-routine (#253 ) <!-- 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-1613](https://syncrow.atlassian.net/browse/SP-1613) ## Description use word condition when going to if and functions when going to THEN ## 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 [SP-1613]: https://syncrow.atlassian.net/browse/SP-1613?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ	2025-06-16 08:46:07 +03:00
raf-dev1	b3069ab749	Sp 1661 fe enhance the landing page to be responsive and look like design (#252 ) <!-- 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-1661](https://syncrow.atlassian.net/browse/SP-1661) ## Description insure the colors of cards and font size with responsive make 4 cards in row as in figma ## 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 [SP-1661]: https://syncrow.atlassian.net/browse/SP-1661?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ	2025-06-16 08:42:38 +03:00
mohammadnemer1	8d408867bb	Refactor routine creation logic and add new dropdown events (#254 ) <!-- 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: --> ## Description <!--- Describe your changes in detail --> fix create new routines dialog ## 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	2025-06-15 14:12:54 +03:00
mohammad	57508fe17e	Refactor routine creation logic and add new dropdown events	2025-06-15 13:29:32 +03:00
raf-dev1	13360fe6f3	when use THEN dialog type Funtions is the word but hen if it should be condition	2025-06-13 16:10:24 +03:00
raf-dev1	3e5b501167	Merge branch 'dev' into SP-1661-FE-Enhance-the-landing-page-to-be-responsive-and-look-like-design	2025-06-13 14:52:51 +03:00
raf-dev1	4d9f08af31	make the font size big s possible as can depending on responsive UI	2025-06-13 14:48:37 +03:00
raf-dev1	28aa3bc406	make 4 elements in a row using crossAxisCount	2025-06-13 14:48:09 +03:00
raf-dev1	51ad74b2be	fix the bug	2025-06-13 14:15:23 +03:00
Faris Armoush	994e9f4e57	Revert "formatted all files." (#250 ) <!-- 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: --> ## Description Reverted formatting PR. This reverts commit `04250ebc98`. ## Type of Change <!--- Put an `x` in all the boxes that apply: --> - [ ] ✨ New feature (non-breaking change which adds functionality) - [ ] 🛠️ 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 - [x] 🗑️ Chore	2025-06-12 16:09:32 +03:00
Faris Armoush	c642ba2644	Revert "formatted all files." This reverts commit `04250ebc98`.	2025-06-12 16:04:49 +03:00
Faris Armoush	218f43bacb	Formatting all files (#249 ) <!-- 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: --> ## Description Formatted all files in the repository. ## Type of Change <!--- Put an `x` in all the boxes that apply: --> - [ ] ✨ New feature (non-breaking change which adds functionality) - [ ] 🛠️ Bug fix (non-breaking change which fixes an issue) - [ ] ❌ Breaking change (fix or feature that would cause existing functionality to change) - [x] 🧹 Code refactor - [ ] ✅ Build configuration change - [ ] 📝 Documentation - [ ] 🗑️ Chore	2025-06-12 15:40:34 +03:00
Faris Armoush	04250ebc98	formatted all files.	2025-06-12 15:33:32 +03:00
Faris Armoush	29959f567e	upgrade-flutter-version-in-deployment-actions. (#248 ) <!-- 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: --> ## Description <!--- Describe your changes in detail --> ## Type of Change <!--- Put an `x` in all the boxes that apply: --> - [ ] ✨ New feature (non-breaking change which adds functionality) - [ ] 🛠️ 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 - [x] 🗑️ Chore	2025-06-12 15:07:12 +03:00
Faris Armoush	fe3b5263a3	upgrade to not using webkit renderer command in ci/cd actions because it is deprecated.	2025-06-12 15:04:33 +03:00
Faris Armoush	c3a0c48501	Merge branch 'dev' of https://github.com/SyncrowIOT/web into upgrade-flutter-version-in-deployment-actions	2025-06-12 14:58:36 +03:00
Faris Armoush	5203491d15	upgrade-flutter-version-in-deployment-actions.	2025-06-12 14:57:55 +03:00
Faris Armoush	c379cfaed0	Update pr-check.yml (#247 ) <!-- 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: --> ## Description Upgrade pr-check GitHub action flutter version to `3.32.1`. ## Type of Change - [ ] ✨ New feature (non-breaking change which adds functionality) - [ ] 🛠️ 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 - [x] 🗑️ Chore	2025-06-12 14:55:55 +03:00
Faris Armoush	d971479256	Deleted all unnecessary build targets (#246 ) <!-- 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: --> ## Description Deleted iOS, Android, MacOS, Linux and Windows build targets, since they're not needed for this repository. If they were ever needed we can create new ones. ## Type of Change <!--- Put an `x` in all the boxes that apply: --> - [ ] ✨ New feature (non-breaking change which adds functionality) - [ ] 🛠️ 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 - [x] 🗑️ Chore	2025-06-12 14:55:45 +03:00
Faris Armoush	7109f3712a	Update pr-check.yml	2025-06-12 14:50:50 +03:00
Faris Armoush	70a94bb1c1	Merge branch 'dev' of https://github.com/SyncrowIOT/web into deletes_unnecessary_build_targets	2025-06-12 14:41:14 +03:00
Faris Armoush	88480142e1	Very good analysis (#245 ) <!-- 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: --> ## Description Migrated lints to use `very_good_analysis`. ## Type of Change <!--- Put an `x` in all the boxes that apply: --> - [ ] ✨ New feature (non-breaking change which adds functionality) - [ ] 🛠️ 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 - [x] 🗑️ Chore	2025-06-12 14:39:46 +03:00
Faris Armoush	1a2378df6e	Deleted all unnecessary build targets	2025-06-12 14:35:54 +03:00
Faris Armoush	e867c29086	use `very_good_analysis` lints.	2025-06-12 14:31:08 +03:00
raf-dev1	a3b427c570	fix the save button by removing deleted items from spaces then return… (#244 ) … all other elements status to unchanged <!-- 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-1735](https://syncrow.atlassian.net/browse/SP-1735?atlOrigin=eyJpIjoiZTI5OTQ5NzNkYWIyNDQ5OTg5YWFkYjRhMTg5NmYxMDkiLCJwIjoiamlyYS1zbGFjay1pbnQifQ) ## Description now whenever u save then save button vanish until u make another chages ## 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 [SP-1735]: https://syncrow.atlassian.net/browse/SP-1735?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ	2025-06-12 14:27:06 +03:00
raf-dev1	0b0e235f26	fix the save button by removing deleted items from spaces then return all other elements status to unchanged	2025-06-12 14:13:25 +03:00
raf-dev1	c250fb4469	Sp 1702 fe when we click on edit button for a space and click ok without editing the save button is appearing (#243 ) <!-- 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	2025-06-11 16:58:34 +03:00
mohammadnemer1	59ac1bd74d	Disable tap action on Community Structure when in specific states (#242 ) <!-- 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: --> ## Description <!--- Describe your changes in detail --> Disable tap action on Community Structure when in specific states ## 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	2025-06-11 16:48:10 +03:00
raf-dev1	bac1450c2b	User can't Add a space if he adds a device with a tag manually/1689 (#240 ) <!-- 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 (https://syncrow.atlassian.net/browse/SP-0000)](https://syncrow.atlassian.net/browse/SP-1689)](https://syncrow.atlassian.net/browse/SP-1689) ## Description when adding device and assign new manual tag (without uuid) ok button doesnt response ## 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	2025-06-11 16:47:15 +03:00
mohammadnemer1	889461db7d	Enhance device management UI with improved padding and SVG icon integ… (#241 ) …ration <!-- 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: --> ## Description <!--- Describe your changes in detail --> Enhance device setting ui ## 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	2025-06-11 16:47:00 +03:00
raf-dev1	27dbcb26f1	use function to fix bug	2025-06-11 16:35:34 +03:00
raf-dev1	0c5db9dfeb	add bool function to space model if no changes made on object	2025-06-11 16:35:19 +03:00
mohammad	1393a15eca	Disable tap action on Community Structure when in specific states	2025-06-11 16:02:40 +03:00
raf-dev1	cd6bf32aed	fix bug /non uuid assign tag to be accepted	2025-06-11 14:00:15 +03:00
mohammad	f7f3843fa7	Enhance device management UI with improved padding and SVG icon integration	2025-06-10 16:29:14 +03:00