Merge pull request #117 from SyncrowIOT/Add-Booking-to-bottom-navigation-bar

[FE] Add Booking to bottom navigation bar

.vscode/launch.json

@@ -36,11 +36,11 @@
        
               "--flavor",
               
-              "staging",
+              "prod",
 
               "-t",
   
-              "lib/main_staging.dart"
+              "lib/main.dart"
        
             ],
        

android/app/build.gradle

@@ -26,15 +26,9 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
-def keystoreProperties = new Properties()
-def keystorePropertiesFile = rootProject.file('key.properties')
-if (keystorePropertiesFile.exists()) {
-    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
-}
-
 android {
-    namespace "com.syncrow.mobile"
-    compileSdkVersion 35
+    namespace "com.example.syncrow_application"
+    compileSdkVersion 34
     ndkVersion flutter.ndkVersion
 
     compileOptions {
@@ -54,44 +48,30 @@ android {
     productFlavors {
         dev {
             dimension "env"
-            applicationId "com.syncrow.mobile.dev"
-        }
-        staging {
-            dimension "env"
-            applicationId "com.syncrow.mobile.staging"
+            applicationId "com.example.syncrow_application"
         }
         prod {
             dimension "env"
-            applicationId "com.syncrow.mobile"
+            applicationId "com.example.syncrow_application"
         }
     }
 
     defaultConfig {
-        applicationId "com.syncrow.mobile"
+        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
+        applicationId "com.example.syncrow_application"
+        // 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 21
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
 
-    signingConfigs {
-        release {
-            if (keystorePropertiesFile.exists()) {
-                storeFile file(keystoreProperties['storeFile'])
-                storePassword keystoreProperties['storePassword']
-                keyAlias keystoreProperties['keyAlias']
-                keyPassword keystoreProperties['keyPassword']
-            }
-        }
-    }
-
     buildTypes {
         release {
-            if (keystorePropertiesFile.exists()) {
-                signingConfig signingConfigs.release
-            } else {
-                signingConfig signingConfigs.debug
-            }
+            // 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
         }
     }
 }

android/app/src/dev/google-services.json

@@ -1,30 +1,48 @@
 {
-  "project_info": {
-    "project_number": "255001682464",
-    "firebase_url": "https://syncrow-dev-79446.asia-southeast1.firebasedatabase.app",
-    "project_id": "syncrow-prod-79446",
-    "storage_bucket": "syncrow-prod-79446.firebasestorage.app"
-  },
-  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:255001682464:android:40e1d92346106850561245",
-        "android_client_info": {
-          "package_name": "com.syncrow.mobile.dev"
+    "project_info": {
+      "project_number": "427332280600",
+      "project_id": "test2-8a3d2",
+      "storage_bucket": "test2-8a3d2.appspot.com"
+    },
+    "client": [
+      {
+        "client_info": {
+          "mobilesdk_app_id": "1:427332280600:android:550f67441246cb1a0c7e6d",
+          "android_client_info": {
+            "package_name": "com.example.syncrow_application"
+          }
+        },
+        "oauth_client": [],
+        "api_key": [
+          {
+            "current_key": "AIzaSyA5qOErxdm0zJmoHIB0TixfebYEsNRpwV0"
+          }
+        ],
+        "services": {
+          "appinvite_service": {
+            "other_platform_oauth_client": []
+          }
         }
       },
-      "oauth_client": [],
-      "api_key": [
-        {
-          "current_key": "AIzaSyARJ5Wx2Uf8sbmb-AHB8WVfFwEFzrCIOKY"
-        }
-      ],
-      "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": []
+          }
         }
       }
-    }
-  ],
-  "configuration_version": "1"
-}
+    ],
+    "configuration_version": "1"
+  }

android/app/src/main/AndroidManifest.xml

@@ -9,12 +9,12 @@
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
 
     <application
-        android:label="SyncOS"
+        android:label="syncrow_app"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
         android:allowBackup="false">
         <activity
-            android:name="com.syncrow.mobile.MainActivity"
+            android:name=".MainActivity"
             android:exported="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"

android/app/src/main/kotlin/com/example/syncrow_app/MainActivity.kt

@@ -1,4 +1,4 @@
-package com.syncrow.mobile
+package com.example.syncrow_application
 
 import io.flutter.embedding.android.FlutterActivity
 

android/app/src/prod/google-services.json

@@ -1,22 +1,22 @@
 {
   "project_info": {
-    "project_number": "255001682464",
-    "firebase_url": "https://syncrow-prod-79446.asia-southeast1.firebasedatabase.app",
-    "project_id": "syncrow-prod-79446",
-    "storage_bucket": "syncrow-prod-79446.firebasestorage.app"
+    "project_number": "786692570726",
+    "firebase_url": "https://syncrow-staging-default-rtdb.firebaseio.com",
+    "project_id": "syncrow-staging",
+    "storage_bucket": "syncrow-staging.appspot.com"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:255001682464:android:40e1d92346106850561245",
+        "mobilesdk_app_id": "1:786692570726:android:0ef7079c2b978d4417b7a7",
         "android_client_info": {
-          "package_name": "com.syncrow.mobile"
+          "package_name": "com.example.syncrow_application"
         }
       },
       "oauth_client": [],
       "api_key": [
         {
-          "current_key": "AIzaSyARJ5Wx2Uf8sbmb-AHB8WVfFwEFzrCIOKY"
+          "current_key": "AIzaSyDP9GpYfLE8gHTj3kZ1hW8fx_FkJqOqSQk"
         }
       ],
       "services": {

android/app/src/staging/google-services.json

@@ -1,30 +0,0 @@
-{
-  "project_info": {
-    "project_number": "255001682464",
-    "firebase_url": "https://syncrow-staging-79446.asia-southeast1.firebasedatabase.app/",
-    "project_id": "syncrow-prod-79446",
-    "storage_bucket": "syncrow-prod-79446.firebasestorage.app"
-  },
-  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:255001682464:android:40e1d92346106850561245",
-        "android_client_info": {
-          "package_name": "com.syncrow.mobile.staging"
-        }
-      },
-      "oauth_client": [],
-      "api_key": [
-        {
-          "current_key": "AIzaSyARJ5Wx2Uf8sbmb-AHB8WVfFwEFzrCIOKY"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": []
-        }
-      }
-    }
-  ],
-  "configuration_version": "1"
-}

assets/icons/booking_icon.svg

@@ -0,0 +1,10 @@
+<svg width="21" height="20" viewBox="0 0 21 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_11681_2046)">
+<path d="M20.615 14.4212L18.9717 5.10949C18.62 3.11866 16.89 1.66699 14.8684 1.66699H6.46502C3.58336 1.66699 2.57836 3.87949 2.36169 5.10949L0.726691 14.3703C0.625024 14.9487 0.646691 15.5512 0.848357 16.102C1.35502 17.4895 2.62252 18.3337 4.00086 18.3337C4.00086 18.3337 4.93586 18.3287 4.98752 18.3187C5.35502 18.2495 5.60836 17.9462 5.64919 17.5928C5.14919 16.9095 4.77586 16.122 4.61086 15.2453L3.61836 9.97616C3.47252 9.20199 3.47586 8.40866 3.62752 7.63532C3.86252 6.43866 4.20669 4.74033 4.29836 4.58199L6.24752 14.937C6.61836 16.9062 8.33836 18.3328 10.3425 18.3328H17.2109C17.9684 18.3328 18.7284 18.1287 19.3317 17.6695C20.3575 16.8895 20.83 15.6403 20.615 14.4212ZM8.16669 6.66699C8.16669 6.20699 8.54002 5.83366 9.00002 5.83366H14.8334C15.2934 5.83366 15.6667 6.20699 15.6667 6.66699C15.6667 7.12699 15.2934 7.50033 14.8334 7.50033H9.00002C8.54002 7.50033 8.16669 7.12699 8.16669 6.66699ZM8.77586 10.0003C8.77586 9.54033 9.14919 9.16699 9.60919 9.16699H15.4425C15.9025 9.16699 16.2759 9.54033 16.2759 10.0003C16.2759 10.4603 15.9025 10.8337 15.4425 10.8337H9.60919C9.14919 10.8337 8.77586 10.4603 8.77586 10.0003ZM16.0834 14.167H10.25C9.79002 14.167 9.41669 13.7945 9.41669 13.3337C9.41669 12.8728 9.79002 12.5003 10.25 12.5003H16.0834C16.5434 12.5003 16.9167 12.8728 16.9167 13.3337C16.9167 13.7945 16.5434 14.167 16.0834 14.167Z" fill="#999999"/>
+</g>
+<defs>
+<clipPath id="clip0_11681_2046">
+<rect width="20" height="20" fill="white" transform="translate(0.666687)"/>
+</clipPath>
+</defs>
+</svg>

firebase.json

@@ -1 +1 @@
-{"flutter":{"platforms":{"android":{"default":{"projectId":"syncrow-prod-79446","appId":"1:255001682464:android:55ba58e8297b3cab561245","fileOutput":"android/app/google-services.json"}},"ios":{"default":{"projectId":"syncrow-prod-79446","appId":"1:255001682464:ios:8a57c70f7f16f785561245","uploadDebugSymbols":true,"fileOutput":"ios/Runner/GoogleService-Info.plist"}},"dart":{"lib/firebase_options.dart":{"projectId":"syncrow-prod-79446","configurations":{"android":"1:255001682464:android:40e1d92346106850561245","ios":"1:255001682464:ios:40f00bf201768612561245"}},"lib/firebase_options_staging.dart":{"projectId":"syncrow-prod-79446","configurations":{"android":"1:255001682464:android:ed8920a3067fb40a561245","ios":"1:255001682464:ios:41b89a7702b75227561245","web":"1:255001682464:web:a03e2d6214c13101561245"}},"lib/firebase_options_dev.dart":{"projectId":"syncrow-prod-79446","configurations":{"android":"1:255001682464:android:55ba58e8297b3cab561245","ios":"1:255001682464:ios:8a57c70f7f16f785561245","web":"1:255001682464:web:a03e2d6214c13101561245"}}}}}}
+{"flutter":{"platforms":{"android":{"default":{"projectId":"syncrow-staging","appId":"1:786692570726:android:0ef7079c2b978d4417b7a7","fileOutput":"android/app/google-services.json"}},"ios":{"default":{"projectId":"syncrow-staging","appId":"1:786692570726:ios:455a6fcff77e130f17b7a7","uploadDebugSymbols":true,"fileOutput":"ios/Runner/GoogleService-Info.plist"}},"dart":{"lib/firebase_options.dart":{"projectId":"syncrow-staging","configurations":{"android":"1:786692570726:android:0ef7079c2b978d4417b7a7","ios":"1:786692570726:ios:455a6fcff77e130f17b7a7","web":"1:786692570726:web:93c931e6701797b317b7a7"}}}}}}

ios/Podfile.lock

@@ -1,80 +1,143 @@
 PODS:
   - device_info_plus (0.0.1):
     - Flutter
-  - Firebase/CoreOnly (11.13.0):
-    - FirebaseCore (~> 11.13.0)
-  - Firebase/Crashlytics (11.13.0):
+  - Firebase/Analytics (11.6.0):
+    - Firebase/Core
+  - Firebase/Core (11.6.0):
     - Firebase/CoreOnly
-    - FirebaseCrashlytics (~> 11.13.0)
-  - Firebase/Database (11.13.0):
+    - FirebaseAnalytics (~> 11.6.0)
+  - Firebase/CoreOnly (11.6.0):
+    - FirebaseCore (~> 11.6.0)
+  - Firebase/Crashlytics (11.6.0):
     - Firebase/CoreOnly
-    - FirebaseDatabase (~> 11.13.0)
-  - firebase_core (3.14.0):
-    - Firebase/CoreOnly (= 11.13.0)
-    - Flutter
-  - firebase_crashlytics (4.3.7):
-    - Firebase/Crashlytics (= 11.13.0)
+    - FirebaseCrashlytics (~> 11.6.0)
+  - Firebase/Database (11.6.0):
+    - Firebase/CoreOnly
+    - FirebaseDatabase (~> 11.6.0)
+  - firebase_analytics (11.4.0):
+    - Firebase/Analytics (= 11.6.0)
     - firebase_core
     - Flutter
-  - firebase_database (11.3.7):
-    - Firebase/Database (= 11.13.0)
+  - firebase_core (3.10.0):
+    - Firebase/CoreOnly (= 11.6.0)
+    - Flutter
+  - firebase_crashlytics (4.3.0):
+    - Firebase/Crashlytics (= 11.6.0)
     - firebase_core
     - Flutter
-  - FirebaseAppCheckInterop (11.15.0)
-  - FirebaseCore (11.13.0):
-    - FirebaseCoreInternal (~> 11.13.0)
-    - GoogleUtilities/Environment (~> 8.1)
-    - GoogleUtilities/Logger (~> 8.1)
-  - FirebaseCoreExtension (11.13.0):
-    - FirebaseCore (~> 11.13.0)
-  - FirebaseCoreInternal (11.13.0):
-    - "GoogleUtilities/NSData+zlib (~> 8.1)"
-  - FirebaseCrashlytics (11.13.0):
-    - FirebaseCore (~> 11.13.0)
+  - firebase_database (11.3.0):
+    - Firebase/Database (= 11.6.0)
+    - firebase_core
+    - Flutter
+  - FirebaseAnalytics (11.6.0):
+    - FirebaseAnalytics/AdIdSupport (= 11.6.0)
+    - FirebaseCore (~> 11.6.0)
+    - FirebaseInstallations (~> 11.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
+    - GoogleUtilities/MethodSwizzler (~> 8.0)
+    - GoogleUtilities/Network (~> 8.0)
+    - "GoogleUtilities/NSData+zlib (~> 8.0)"
+    - nanopb (~> 3.30910.0)
+  - FirebaseAnalytics/AdIdSupport (11.6.0):
+    - FirebaseCore (~> 11.6.0)
+    - FirebaseInstallations (~> 11.0)
+    - GoogleAppMeasurement (= 11.6.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
+    - GoogleUtilities/MethodSwizzler (~> 8.0)
+    - GoogleUtilities/Network (~> 8.0)
+    - "GoogleUtilities/NSData+zlib (~> 8.0)"
+    - nanopb (~> 3.30910.0)
+  - FirebaseAppCheckInterop (11.6.0)
+  - FirebaseCore (11.6.0):
+    - FirebaseCoreInternal (~> 11.6.0)
+    - GoogleUtilities/Environment (~> 8.0)
+    - GoogleUtilities/Logger (~> 8.0)
+  - FirebaseCoreExtension (11.6.0):
+    - FirebaseCore (~> 11.6.0)
+  - FirebaseCoreInternal (11.6.0):
+    - "GoogleUtilities/NSData+zlib (~> 8.0)"
+  - FirebaseCrashlytics (11.6.0):
+    - FirebaseCore (~> 11.6.0)
     - FirebaseInstallations (~> 11.0)
     - FirebaseRemoteConfigInterop (~> 11.0)
     - FirebaseSessions (~> 11.0)
     - GoogleDataTransport (~> 10.0)
-    - GoogleUtilities/Environment (~> 8.1)
+    - GoogleUtilities/Environment (~> 8.0)
     - nanopb (~> 3.30910.0)
     - PromisesObjC (~> 2.4)
-  - FirebaseDatabase (11.13.0):
+  - FirebaseDatabase (11.6.0):
     - FirebaseAppCheckInterop (~> 11.0)
-    - FirebaseCore (~> 11.13.0)
+    - FirebaseCore (~> 11.6.0)
     - FirebaseSharedSwift (~> 11.0)
-    - GoogleUtilities/UserDefaults (~> 8.1)
+    - GoogleUtilities/UserDefaults (~> 8.0)
     - leveldb-library (~> 1.22)
-  - FirebaseInstallations (11.13.0):
-    - FirebaseCore (~> 11.13.0)
-    - GoogleUtilities/Environment (~> 8.1)
-    - GoogleUtilities/UserDefaults (~> 8.1)
+  - FirebaseInstallations (11.6.0):
+    - FirebaseCore (~> 11.6.0)
+    - GoogleUtilities/Environment (~> 8.0)
+    - GoogleUtilities/UserDefaults (~> 8.0)
     - PromisesObjC (~> 2.4)
-  - FirebaseRemoteConfigInterop (11.15.0)
-  - FirebaseSessions (11.13.0):
-    - FirebaseCore (~> 11.13.0)
-    - FirebaseCoreExtension (~> 11.13.0)
+  - FirebaseRemoteConfigInterop (11.6.0)
+  - FirebaseSessions (11.6.0):
+    - FirebaseCore (~> 11.6.0)
+    - FirebaseCoreExtension (~> 11.6.0)
     - FirebaseInstallations (~> 11.0)
     - GoogleDataTransport (~> 10.0)
-    - GoogleUtilities/Environment (~> 8.1)
-    - GoogleUtilities/UserDefaults (~> 8.1)
+    - GoogleUtilities/Environment (~> 8.0)
+    - GoogleUtilities/UserDefaults (~> 8.0)
     - nanopb (~> 3.30910.0)
     - PromisesSwift (~> 2.1)
-  - FirebaseSharedSwift (11.15.0)
+  - FirebaseSharedSwift (11.6.0)
   - Flutter (1.0.0)
   - flutter_secure_storage (6.0.0):
     - Flutter
+  - GoogleAppMeasurement (11.6.0):
+    - GoogleAppMeasurement/AdIdSupport (= 11.6.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
+    - GoogleUtilities/MethodSwizzler (~> 8.0)
+    - GoogleUtilities/Network (~> 8.0)
+    - "GoogleUtilities/NSData+zlib (~> 8.0)"
+    - nanopb (~> 3.30910.0)
+  - GoogleAppMeasurement/AdIdSupport (11.6.0):
+    - GoogleAppMeasurement/WithoutAdIdSupport (= 11.6.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
+    - GoogleUtilities/MethodSwizzler (~> 8.0)
+    - GoogleUtilities/Network (~> 8.0)
+    - "GoogleUtilities/NSData+zlib (~> 8.0)"
+    - nanopb (~> 3.30910.0)
+  - GoogleAppMeasurement/WithoutAdIdSupport (11.6.0):
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
+    - GoogleUtilities/MethodSwizzler (~> 8.0)
+    - GoogleUtilities/Network (~> 8.0)
+    - "GoogleUtilities/NSData+zlib (~> 8.0)"
+    - nanopb (~> 3.30910.0)
   - GoogleDataTransport (10.1.0):
     - nanopb (~> 3.30910.0)
     - PromisesObjC (~> 2.4)
-  - GoogleUtilities/Environment (8.1.0):
+  - GoogleUtilities/AppDelegateSwizzler (8.0.2):
+    - GoogleUtilities/Environment
+    - GoogleUtilities/Logger
+    - GoogleUtilities/Network
     - GoogleUtilities/Privacy
-  - GoogleUtilities/Logger (8.1.0):
+  - GoogleUtilities/Environment (8.0.2):
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Logger (8.0.2):
     - GoogleUtilities/Environment
     - GoogleUtilities/Privacy
-  - "GoogleUtilities/NSData+zlib (8.1.0)":
+  - GoogleUtilities/MethodSwizzler (8.0.2):
+    - GoogleUtilities/Logger
     - GoogleUtilities/Privacy
-  - GoogleUtilities/Privacy (8.1.0)
-  - GoogleUtilities/UserDefaults (8.1.0):
+  - GoogleUtilities/Network (8.0.2):
+    - GoogleUtilities/Logger
+    - "GoogleUtilities/NSData+zlib"
+    - GoogleUtilities/Privacy
+    - GoogleUtilities/Reachability
+  - "GoogleUtilities/NSData+zlib (8.0.2)":
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Privacy (8.0.2)
+  - GoogleUtilities/Reachability (8.0.2):
+    - GoogleUtilities/Logger
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/UserDefaults (8.0.2):
     - GoogleUtilities/Logger
     - GoogleUtilities/Privacy
   - image_picker_ios (0.0.1):
@@ -85,6 +148,55 @@ PODS:
     - nanopb/encode (= 3.30910.0)
   - nanopb/decode (3.30910.0)
   - nanopb/encode (3.30910.0)
+  - onesignal_flutter (5.2.0):
+    - Flutter
+    - OneSignalXCFramework (= 5.2.0)
+  - OneSignalXCFramework (5.2.0):
+    - OneSignalXCFramework/OneSignalComplete (= 5.2.0)
+  - OneSignalXCFramework/OneSignal (5.2.0):
+    - OneSignalXCFramework/OneSignalCore
+    - OneSignalXCFramework/OneSignalExtension
+    - OneSignalXCFramework/OneSignalLiveActivities
+    - OneSignalXCFramework/OneSignalNotifications
+    - OneSignalXCFramework/OneSignalOSCore
+    - OneSignalXCFramework/OneSignalOutcomes
+    - OneSignalXCFramework/OneSignalUser
+  - OneSignalXCFramework/OneSignalComplete (5.2.0):
+    - OneSignalXCFramework/OneSignal
+    - OneSignalXCFramework/OneSignalInAppMessages
+    - OneSignalXCFramework/OneSignalLocation
+  - OneSignalXCFramework/OneSignalCore (5.2.0)
+  - OneSignalXCFramework/OneSignalExtension (5.2.0):
+    - OneSignalXCFramework/OneSignalCore
+    - OneSignalXCFramework/OneSignalOutcomes
+  - OneSignalXCFramework/OneSignalInAppMessages (5.2.0):
+    - OneSignalXCFramework/OneSignalCore
+    - OneSignalXCFramework/OneSignalNotifications
+    - OneSignalXCFramework/OneSignalOSCore
+    - OneSignalXCFramework/OneSignalOutcomes
+    - OneSignalXCFramework/OneSignalUser
+  - OneSignalXCFramework/OneSignalLiveActivities (5.2.0):
+    - OneSignalXCFramework/OneSignalCore
+    - OneSignalXCFramework/OneSignalOSCore
+    - OneSignalXCFramework/OneSignalUser
+  - OneSignalXCFramework/OneSignalLocation (5.2.0):
+    - OneSignalXCFramework/OneSignalCore
+    - OneSignalXCFramework/OneSignalNotifications
+    - OneSignalXCFramework/OneSignalOSCore
+    - OneSignalXCFramework/OneSignalUser
+  - OneSignalXCFramework/OneSignalNotifications (5.2.0):
+    - OneSignalXCFramework/OneSignalCore
+    - OneSignalXCFramework/OneSignalExtension
+    - OneSignalXCFramework/OneSignalOutcomes
+  - OneSignalXCFramework/OneSignalOSCore (5.2.0):
+    - OneSignalXCFramework/OneSignalCore
+  - OneSignalXCFramework/OneSignalOutcomes (5.2.0):
+    - OneSignalXCFramework/OneSignalCore
+  - OneSignalXCFramework/OneSignalUser (5.2.0):
+    - OneSignalXCFramework/OneSignalCore
+    - OneSignalXCFramework/OneSignalNotifications
+    - OneSignalXCFramework/OneSignalOSCore
+    - OneSignalXCFramework/OneSignalOutcomes
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
@@ -98,7 +210,7 @@ PODS:
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - sqflite_darwin (0.0.4):
+  - sqflite (0.0.3):
     - Flutter
     - FlutterMacOS
   - url_launcher_ios (0.0.1):
@@ -106,22 +218,25 @@ PODS:
 
 DEPENDENCIES:
   - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
+  - firebase_analytics (from `.symlinks/plugins/firebase_analytics/ios`)
   - firebase_core (from `.symlinks/plugins/firebase_core/ios`)
   - firebase_crashlytics (from `.symlinks/plugins/firebase_crashlytics/ios`)
   - firebase_database (from `.symlinks/plugins/firebase_database/ios`)
   - Flutter (from `Flutter`)
   - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
   - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
+  - onesignal_flutter (from `.symlinks/plugins/onesignal_flutter/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
-  - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`)
+  - sqflite (from `.symlinks/plugins/sqflite/darwin`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
 
 SPEC REPOS:
   trunk:
     - Firebase
+    - FirebaseAnalytics
     - FirebaseAppCheckInterop
     - FirebaseCore
     - FirebaseCoreExtension
@@ -132,16 +247,20 @@ SPEC REPOS:
     - FirebaseRemoteConfigInterop
     - FirebaseSessions
     - FirebaseSharedSwift
+    - GoogleAppMeasurement
     - GoogleDataTransport
     - GoogleUtilities
     - leveldb-library
     - nanopb
+    - OneSignalXCFramework
     - PromisesObjC
     - PromisesSwift
 
 EXTERNAL SOURCES:
   device_info_plus:
     :path: ".symlinks/plugins/device_info_plus/ios"
+  firebase_analytics:
+    :path: ".symlinks/plugins/firebase_analytics/ios"
   firebase_core:
     :path: ".symlinks/plugins/firebase_core/ios"
   firebase_crashlytics:
@@ -154,6 +273,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/flutter_secure_storage/ios"
   image_picker_ios:
     :path: ".symlinks/plugins/image_picker_ios/ios"
+  onesignal_flutter:
+    :path: ".symlinks/plugins/onesignal_flutter/ios"
   path_provider_foundation:
     :path: ".symlinks/plugins/path_provider_foundation/darwin"
   permission_handler_apple:
@@ -162,42 +283,47 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/share_plus/ios"
   shared_preferences_foundation:
     :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
-  sqflite_darwin:
-    :path: ".symlinks/plugins/sqflite_darwin/darwin"
+  sqflite:
+    :path: ".symlinks/plugins/sqflite/darwin"
   url_launcher_ios:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
 
 SPEC CHECKSUMS:
-  device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe
-  Firebase: 3435bc66b4d494c2f22c79fd3aae4c1db6662327
-  firebase_core: 700bac7ed92bb754fd70fbf01d72b36ecdd6d450
-  firebase_crashlytics: d101fbdc2dba187f483f13ae3ce9281779d664db
-  firebase_database: c808dcb003584f9925917e3b84c2a6547de31117
-  FirebaseAppCheckInterop: 06fe5a3799278ae4667e6c432edd86b1030fa3df
-  FirebaseCore: c692c7f1c75305ab6aff2b367f25e11d73aa8bd0
-  FirebaseCoreExtension: c048485c347616dba6165358dbef765c5197597b
-  FirebaseCoreInternal: 29d7b3af4aaf0b8f3ed20b568c13df399b06f68c
-  FirebaseCrashlytics: 8281e577b6f85a08ea7aeb8b66f95e1ae430c943
-  FirebaseDatabase: 56862f137a44061ca740bc05c57285fffb27becc
-  FirebaseInstallations: 0ee9074f2c1e86561ace168ee1470dc67aabaf02
-  FirebaseRemoteConfigInterop: 1c6135e8a094cc6368949f5faeeca7ee8948b8aa
-  FirebaseSessions: eaa8ec037e7793769defe4201c20bd4d976f9677
-  FirebaseSharedSwift: e17c654ef1f1a616b0b33054e663ad1035c8fd40
+  device_info_plus: bf2e3232933866d73fe290f2942f2156cdd10342
+  Firebase: 374a441a91ead896215703a674d58cdb3e9d772b
+  firebase_analytics: 07bd7cfbac54bfcdccf2bb2530f9a65486f7ef3f
+  firebase_core: feb37e79f775c2bd08dd35e02d83678291317e10
+  firebase_crashlytics: 609a5f6f4a2f5af9e40a68182e0c1be3ca2a02f6
+  firebase_database: adc9efd0b70cdc8d1e6f3c9f6bb054a625c4f45d
+  FirebaseAnalytics: 7114c698cac995602e3b1b96663473e50d54d6e7
+  FirebaseAppCheckInterop: 347aa09a805219a31249b58fc956888e9fcb314b
+  FirebaseCore: 48b0dd707581cf9c1a1220da68223fb0a562afaa
+  FirebaseCoreExtension: 2d77d6430c16cf43ca2b04608302ed02b3598361
+  FirebaseCoreInternal: d98ab91e2d80a56d7b246856a8885443b302c0c2
+  FirebaseCrashlytics: b21c665fb50138766480bce73ebdb1aa30f7f300
+  FirebaseDatabase: ce3a83a39ab50559a85c5add54f6f285544433b8
+  FirebaseInstallations: efc0946fc756e4d22d8113f7c761948120322e8c
+  FirebaseRemoteConfigInterop: e75e348953352a000331eb77caf01e424248e176
+  FirebaseSessions: 9529d14180868e29a8da164b3a729c036204918b
+  FirebaseSharedSwift: a4e5dfca3e210633bb3a3dfb94176c019211948b
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13
+  flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
+  GoogleAppMeasurement: 6a9e6317b6a6d810ad03d4a66564ca6c4c5818a3
   GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
-  GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
-  image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a
+  GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d
+  image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1
   leveldb-library: cc8b8f8e013647a295ad3f8cd2ddf49a6f19be19
   nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
-  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
-  permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
+  onesignal_flutter: 5ce68a29861960168e81101cb1bd685d264361de
+  OneSignalXCFramework: bdf74fdc06888f9466dc21e826fe1549ed143095
+  path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
+  permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
   PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851
-  share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
-  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
-  sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
-  url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
+  share_plus: 8b6f8b3447e494cca5317c8c3073de39b3600d1f
+  shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
+  sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
+  url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
 
 PODFILE CHECKSUM: deba6d843ff3cf709e6e9051ce6601a587b24105
 

ios/Runner.xcodeproj/project.pbxproj

@@ -8,7 +8,6 @@
 
 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
-		1D86ABCDEBDE5C18BA4024D4 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = C7C3AF69AC7495E5213543A5 /* GoogleService-Info.plist */; };
 		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 */; };
@@ -51,15 +50,11 @@
 		274C82CD6955A1499B0B1ECC /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		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; };
-		360705D89E99475E029CC3CB /* Pods-RunnerTests.profile-staging.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile-staging.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile-staging.xcconfig"; sourceTree = "<group>"; };
-		366027C8C73E30993A6559C1 /* Pods-RunnerTests.debug-staging.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug-staging.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug-staging.xcconfig"; sourceTree = "<group>"; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
 		4F6A2F89436864C7EE769652 /* Pods-RunnerTests.profile-dev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile-dev.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile-dev.xcconfig"; sourceTree = "<group>"; };
 		54B9D4926B53AAFC49A54F19 /* Pods-Runner.release-prod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release-prod.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release-prod.xcconfig"; sourceTree = "<group>"; };
-		66EDA61B784317B71C06349D /* Pods-RunnerTests.release-staging.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release-staging.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release-staging.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>"; };
-		78F71F362D8018E4EEE452EB /* Pods-Runner.profile-staging.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile-staging.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile-staging.xcconfig"; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/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>"; };
@@ -69,10 +64,7 @@
 		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>"; };
 		9D1B204BC7CD29434FE9D537 /* Pods-Runner.profile-dev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile-dev.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile-dev.xcconfig"; sourceTree = "<group>"; };
-		B83F7E68D31337B2EE230E7E /* Pods-Runner.release-staging.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release-staging.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release-staging.xcconfig"; sourceTree = "<group>"; };
 		C33EAABFBF3F560A8EFB0BC0 /* Pods-RunnerTests.release-dev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release-dev.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release-dev.xcconfig"; sourceTree = "<group>"; };
-		C7C3AF69AC7495E5213543A5 /* GoogleService-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "Runner/GoogleService-Info.plist"; sourceTree = "<group>"; };
-		D4A8BEAA2CBF924DE3581BD1 /* Pods-Runner.debug-staging.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug-staging.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug-staging.xcconfig"; sourceTree = "<group>"; };
 		E0A467016A4C6B17ECA05534 /* Pods-Runner.profile-prod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile-prod.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile-prod.xcconfig"; sourceTree = "<group>"; };
 		E2512B7B8C737577EB9DB570 /* Pods-RunnerTests.debug-dev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug-dev.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug-dev.xcconfig"; sourceTree = "<group>"; };
 		F5E8A17F8AB7D50983179FD3 /* Pods-Runner.debug-dev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug-dev.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug-dev.xcconfig"; sourceTree = "<group>"; };
@@ -116,12 +108,6 @@
 				C33EAABFBF3F560A8EFB0BC0 /* Pods-RunnerTests.release-dev.xcconfig */,
 				0D60D6C4BBD804473BD9E4A0 /* Pods-RunnerTests.profile-prod.xcconfig */,
 				4F6A2F89436864C7EE769652 /* Pods-RunnerTests.profile-dev.xcconfig */,
-				D4A8BEAA2CBF924DE3581BD1 /* Pods-Runner.debug-staging.xcconfig */,
-				B83F7E68D31337B2EE230E7E /* Pods-Runner.release-staging.xcconfig */,
-				78F71F362D8018E4EEE452EB /* Pods-Runner.profile-staging.xcconfig */,
-				366027C8C73E30993A6559C1 /* Pods-RunnerTests.debug-staging.xcconfig */,
-				66EDA61B784317B71C06349D /* Pods-RunnerTests.release-staging.xcconfig */,
-				360705D89E99475E029CC3CB /* Pods-RunnerTests.profile-staging.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -163,7 +149,6 @@
 				331C8082294A63A400263BE5 /* RunnerTests */,
 				2F70EB4341A83C900EB253DC /* Pods */,
 				61B46FA3FB0932D29E3C6E47 /* Frameworks */,
-				C7C3AF69AC7495E5213543A5 /* GoogleService-Info.plist */,
 			);
 			sourceTree = "<group>";
 		};
@@ -293,7 +278,6 @@
 				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
 				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
 				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
-				1D86ABCDEBDE5C18BA4024D4 /* GoogleService-Info.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -349,7 +333,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\n#!/bin/bash\nPATH=\"${PATH}:$FLUTTER_ROOT/bin:${PUB_CACHE}/bin:$HOME/.pub-cache/bin\"\n\nif [ -z \"$PODS_ROOT\" ] || [ ! -d \"$PODS_ROOT/FirebaseCrashlytics\" ]; then\n  # Cannot use \"BUILD_DIR%/Build/*\" as per Firebase documentation, it points to \"flutter-project/build/ios/*\" path which doesn't have run script\n  DERIVED_DATA_PATH=$(echo \"$BUILD_ROOT\" | sed -E 's|(.*DerivedData/[^/]+).*|\\1|')\n  PATH_TO_CRASHLYTICS_UPLOAD_SCRIPT=\"${DERIVED_DATA_PATH}/SourcePackages/checkouts/firebase-ios-sdk/Crashlytics/run\"\nelse\n  PATH_TO_CRASHLYTICS_UPLOAD_SCRIPT=\"$PODS_ROOT/FirebaseCrashlytics/run\"\nfi\n\n# Command to upload symbols script used to upload symbols to Firebase server\nflutterfire upload-crashlytics-symbols --upload-symbols-script-path=\"$PATH_TO_CRASHLYTICS_UPLOAD_SCRIPT\" --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";
+			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";
 		};
 		6CF71F42A45B39E9945C8410 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -421,7 +405,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# Get a reference to the destination location for the GoogleService-Info.plist\n# This is the default location where Firebase init code expects to find GoogleServices-Info.plist file.\nPLIST_DESTINATION=${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app\n# We have named our Build Configurations as Debug-dev, Debug-prod etc.\n# Here, dev and prod are the scheme names. This kind of naming is required by Flutter for flavors to work.\n# We are using the $CONFIGURATION variable available in the XCode build environment to get the build configuration.\nif [ \"${CONFIGURATION}\" == \"Debug-prod\" ] || [ \"${CONFIGURATION}\" == \"Release-prod\" ] || [ \"${CONFIGURATION}\" == \"Profile-prod\" ] || [ \"${CONFIGURATION}\" == \"Release\" ]; then\ncp \"${PROJECT_DIR}/config/prod/GoogleService-Info.plist\" \"${PLIST_DESTINATION}/GoogleService-Info.plist\"\necho \"Production plist copied\"\nelif [ \"${CONFIGURATION}\" == \"Debug-staging\" ] || [ \"${CONFIGURATION}\" == \"Release-staging\" ] || [ \"${CONFIGURATION}\" == \"Profile-staging\" ]; then\ncp \"${PROJECT_DIR}/config/staging/GoogleService-Info.plist\" \"${PLIST_DESTINATION}/GoogleService-Info.plist\"\necho \"Staging plist copied\"\nelif [ \"${CONFIGURATION}\" == \"Debug-dev\" ] || [ \"${CONFIGURATION}\" == \"Release-dev\" ] || [ \"${CONFIGURATION}\" == \"Profile-dev\" ] || [ \"${CONFIGURATION}\" == \"Debug\" ]; then\ncp \"${PROJECT_DIR}/config/dev/GoogleService-Info.plist\" \"${PLIST_DESTINATION}/GoogleService-Info.plist\"\necho \"Development plist copied\"\nfi\n";
+			shellScript = "# Get a reference to the destination location for the GoogleService-Info.plist\n# This is the default location where Firebase init code expects to find GoogleServices-Info.plist file.\nPLIST_DESTINATION=${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app\n# We have named our Build Configurations as Debug-dev, Debug-prod etc.\n# Here, dev and prod are the scheme names. This kind of naming is required by Flutter for flavors to work.\n# We are using the $CONFIGURATION variable available in the XCode build environment to get the build configuration.\nif [ \"${CONFIGURATION}\" == \"Debug-prod\" ] || [ \"${CONFIGURATION}\" == \"Release-prod\" ] || [ \"${CONFIGURATION}\" == \"Profile-prod\" ] || [ \"${CONFIGURATION}\" == \"Release\" ]; then\ncp \"${PROJECT_DIR}/config/prod/GoogleService-Info.plist\" \"${PLIST_DESTINATION}/GoogleService-Info.plist\"\necho \"Production plist copied\"\nelif [ \"${CONFIGURATION}\" == \"Debug-dev\" ] || [ \"${CONFIGURATION}\" == \"Release-dev\" ] || [ \"${CONFIGURATION}\" == \"Profile-dev\" ] || [ \"${CONFIGURATION}\" == \"Debug\" ]; then\ncp \"${PROJECT_DIR}/config/dev/GoogleService-Info.plist\" \"${PLIST_DESTINATION}/GoogleService-Info.plist\"\necho \"Development plist copied\"\nfi\n";
 		};
 		BF71A0E0099ADA10FE9B580A /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -541,7 +525,6 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
-				PRODUCT_BUNDLE_IDENTIFIER = com.syncrow.iot.ex;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -554,26 +537,23 @@
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 31;
-				DART_DEBUG_BONJOUR_SERVICE = "";
 				DEVELOPMENT_TEAM = 48V27SBR8J;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = SyncOS;
+				INFOPLIST_KEY_CFBundleDisplayName = Syncrow;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
-				INFOPLIST_KEY_NSLocalNetworkUsageDescription = "SyncOS needs to access the local network to discover and connect to SyncOS devices.";
-				INFOPLIST_KEY_NSNetworkVolumesUsageDescription = "SyncOS needs to access the local network to discover and connect to SyncOS devices.";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0.5;
-				PRODUCT_BUNDLE_IDENTIFIER = com.syncrow.iot.ex;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.syncrow.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -632,11 +612,11 @@
 			};
 			name = "Profile-prod";
 		};
-		3483022B2E23986E0002E53F /* Debug-staging */ = {
+		97C147031CF9000F007C117D /* Debug-prod */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -685,170 +665,12 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = com.syncrow.iot.ex.staging;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
-			name = "Debug-staging";
+			name = "Debug-prod";
 		};
-		3483022C2E23986E0002E53F /* Debug-staging */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
-				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 31;
-				DART_DEBUG_BONJOUR_SERVICE = _dartobservatory._tcp;
-				DEVELOPMENT_TEAM = 48V27SBR8J;
-				ENABLE_BITCODE = NO;
-				INFOPLIST_FILE = Runner/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = SyncOS;
-				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
-				INFOPLIST_KEY_NSLocalNetworkUsageDescription = "SyncOS needs to access the local network to discover and connect to SyncOS devices.";
-				INFOPLIST_KEY_NSNetworkVolumesUsageDescription = "SyncOS needs to access the local network to discover and connect to SyncOS devices.";
-				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
-				MARKETING_VERSION = 1.0.5;
-				PRODUCT_BUNDLE_IDENTIFIER = com.syncrow.iot.ex.staging;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
-				VERSIONING_SYSTEM = "apple-generic";
-			};
-			name = "Debug-staging";
-		};
-		3483022D2E23986E0002E53F /* Debug-staging */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 366027C8C73E30993A6559C1 /* Pods-RunnerTests.debug-staging.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.syncrowApp.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-staging";
-		};
-		3483022E2E2398790002E53F /* Release-staging */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
-				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_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
-				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;
-				PRODUCT_BUNDLE_IDENTIFIER = com.syncrow.iot.ex.staging;
-				SDKROOT = iphoneos;
-				SUPPORTED_PLATFORMS = iphoneos;
-				SWIFT_COMPILATION_MODE = wholemodule;
-				SWIFT_OPTIMIZATION_LEVEL = "-O";
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VALIDATE_PRODUCT = YES;
-			};
-			name = "Release-staging";
-		};
-		3483022F2E2398790002E53F /* Release-staging */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
-				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 31;
-				DART_DEBUG_BONJOUR_SERVICE = _dartobservatory._tcp;
-				DEVELOPMENT_TEAM = 48V27SBR8J;
-				ENABLE_BITCODE = NO;
-				INFOPLIST_FILE = Runner/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = SyncOS;
-				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
-				INFOPLIST_KEY_NSLocalNetworkUsageDescription = "SyncOS needs to access the local network to discover and connect to SyncOS devices.";
-				INFOPLIST_KEY_NSNetworkVolumesUsageDescription = "SyncOS needs to access the local network to discover and connect to SyncOS devices.";
-				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
-				MARKETING_VERSION = 1.0.5;
-				PRODUCT_BUNDLE_IDENTIFIER = com.syncrow.iot.ex.staging;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
-				SWIFT_VERSION = 5.0;
-				VERSIONING_SYSTEM = "apple-generic";
-			};
-			name = "Release-staging";
-		};
-		348302302E2398790002E53F /* Release-staging */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 66EDA61B784317B71C06349D /* Pods-RunnerTests.release-staging.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.syncrowApp.RunnerTests;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 5.0;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
-			};
-			name = "Release-staging";
-		};
-		348302312E2398800002E53F /* Profile-staging */ = {
+		97C147041CF9000F007C117D /* Release-prod */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
@@ -894,169 +716,6 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
-				PRODUCT_BUNDLE_IDENTIFIER = com.syncrow.iot.ex.staging;
-				SDKROOT = iphoneos;
-				SUPPORTED_PLATFORMS = iphoneos;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VALIDATE_PRODUCT = YES;
-			};
-			name = "Profile-staging";
-		};
-		348302322E2398800002E53F /* Profile-staging */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
-				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 31;
-				DART_DEBUG_BONJOUR_SERVICE = _dartobservatory._tcp;
-				DEVELOPMENT_TEAM = 48V27SBR8J;
-				ENABLE_BITCODE = NO;
-				INFOPLIST_FILE = Runner/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = SyncOS;
-				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
-				INFOPLIST_KEY_NSLocalNetworkUsageDescription = "SyncOS needs to access the local network to discover and connect to SyncOS devices.";
-				INFOPLIST_KEY_NSNetworkVolumesUsageDescription = "SyncOS needs to access the local network to discover and connect to SyncOS devices.";
-				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
-				MARKETING_VERSION = 1.0.5;
-				PRODUCT_BUNDLE_IDENTIFIER = com.syncrow.iot.ex.staging;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
-				SWIFT_VERSION = 5.0;
-				VERSIONING_SYSTEM = "apple-generic";
-			};
-			name = "Profile-staging";
-		};
-		348302332E2398800002E53F /* Profile-staging */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 360705D89E99475E029CC3CB /* Pods-RunnerTests.profile-staging.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.syncrowApp.RunnerTests;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 5.0;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
-			};
-			name = "Profile-staging";
-		};
-		97C147031CF9000F007C117D /* Debug-prod */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
-				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_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
-				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;
-				PRODUCT_BUNDLE_IDENTIFIER = com.syncrow.iot.ex;
-				SDKROOT = iphoneos;
-				TARGETED_DEVICE_FAMILY = "1,2";
-			};
-			name = "Debug-prod";
-		};
-		97C147041CF9000F007C117D /* Release-prod */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
-				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_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
-				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;
-				PRODUCT_BUNDLE_IDENTIFIER = com.syncrow.iot.ex;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -1071,26 +730,23 @@
 			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 31;
-				DART_DEBUG_BONJOUR_SERVICE = "";
 				DEVELOPMENT_TEAM = 48V27SBR8J;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = SyncOS;
+				INFOPLIST_KEY_CFBundleDisplayName = Syncrow;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
-				INFOPLIST_KEY_NSLocalNetworkUsageDescription = "SyncOS needs to access the local network to discover and connect to SyncOS devices.";
-				INFOPLIST_KEY_NSNetworkVolumesUsageDescription = "SyncOS needs to access the local network to discover and connect to SyncOS devices.";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0.5;
-				PRODUCT_BUNDLE_IDENTIFIER = com.syncrow.iot.ex;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.syncrow.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -1105,26 +761,23 @@
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 31;
-				DART_DEBUG_BONJOUR_SERVICE = "";
 				DEVELOPMENT_TEAM = 48V27SBR8J;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = SyncOS;
+				INFOPLIST_KEY_CFBundleDisplayName = Syncrow;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
-				INFOPLIST_KEY_NSLocalNetworkUsageDescription = "SyncOS needs to access the local network to discover and connect to SyncOS devices.";
-				INFOPLIST_KEY_NSNetworkVolumesUsageDescription = "SyncOS needs to access the local network to discover and connect to SyncOS devices.";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0.5;
-				PRODUCT_BUNDLE_IDENTIFIER = com.syncrow.iot.ex;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.syncrow.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -1137,7 +790,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -1186,7 +839,6 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = com.syncrow.iot.ex.dev;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -1197,26 +849,23 @@
 			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 31;
-				DART_DEBUG_BONJOUR_SERVICE = _dartobservatory._tcp;
 				DEVELOPMENT_TEAM = 48V27SBR8J;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = SyncOS;
+				INFOPLIST_KEY_CFBundleDisplayName = Syncrow;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
-				INFOPLIST_KEY_NSLocalNetworkUsageDescription = "SyncOS needs to access the local network to discover and connect to SyncOS devices.";
-				INFOPLIST_KEY_NSNetworkVolumesUsageDescription = "SyncOS needs to access the local network to discover and connect to SyncOS devices.";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0.5;
-				PRODUCT_BUNDLE_IDENTIFIER = com.syncrow.iot.ex.dev;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.syncrow.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -1248,7 +897,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -1290,7 +939,6 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
-				PRODUCT_BUNDLE_IDENTIFIER = com.syncrow.iot.ex.dev;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -1305,26 +953,23 @@
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 31;
-				DART_DEBUG_BONJOUR_SERVICE = _dartobservatory._tcp;
 				DEVELOPMENT_TEAM = 48V27SBR8J;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = SyncOS;
+				INFOPLIST_KEY_CFBundleDisplayName = Syncrow;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
-				INFOPLIST_KEY_NSLocalNetworkUsageDescription = "SyncOS needs to access the local network to discover and connect to SyncOS devices.";
-				INFOPLIST_KEY_NSNetworkVolumesUsageDescription = "SyncOS needs to access the local network to discover and connect to SyncOS devices.";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0.5;
-				PRODUCT_BUNDLE_IDENTIFIER = com.syncrow.iot.ex.dev;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.syncrow.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -1353,7 +998,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -1395,7 +1040,6 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
-				PRODUCT_BUNDLE_IDENTIFIER = com.syncrow.iot.ex.dev;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -1408,26 +1052,23 @@
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 31;
-				DART_DEBUG_BONJOUR_SERVICE = _dartobservatory._tcp;
 				DEVELOPMENT_TEAM = 48V27SBR8J;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = SyncOS;
+				INFOPLIST_KEY_CFBundleDisplayName = Syncrow;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
-				INFOPLIST_KEY_NSLocalNetworkUsageDescription = "SyncOS needs to access the local network to discover and connect to SyncOS devices.";
-				INFOPLIST_KEY_NSNetworkVolumesUsageDescription = "SyncOS needs to access the local network to discover and connect to SyncOS devices.";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0.5;
-				PRODUCT_BUNDLE_IDENTIFIER = com.syncrow.iot.ex.dev;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.syncrow.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -1459,13 +1100,10 @@
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				331C8088294A63A400263BE5 /* Debug-prod */,
-				3483022D2E23986E0002E53F /* Debug-staging */,
 				B07E4A0E2C9B8C45001F6910 /* Debug-dev */,
 				331C8089294A63A400263BE5 /* Release-prod */,
-				348302302E2398790002E53F /* Release-staging */,
 				B07E4A112C9B8C52001F6910 /* Release-dev */,
 				331C808A294A63A400263BE5 /* Profile-prod */,
-				348302332E2398800002E53F /* Profile-staging */,
 				B07E4A142C9B8C5C001F6910 /* Profile-dev */,
 			);
 			defaultConfigurationIsVisible = 0;
@@ -1475,13 +1113,10 @@
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				97C147031CF9000F007C117D /* Debug-prod */,
-				3483022B2E23986E0002E53F /* Debug-staging */,
 				B07E4A0C2C9B8C45001F6910 /* Debug-dev */,
 				97C147041CF9000F007C117D /* Release-prod */,
-				3483022E2E2398790002E53F /* Release-staging */,
 				B07E4A0F2C9B8C52001F6910 /* Release-dev */,
 				249021D3217E4FDB00AE95B9 /* Profile-prod */,
-				348302312E2398800002E53F /* Profile-staging */,
 				B07E4A122C9B8C5C001F6910 /* Profile-dev */,
 			);
 			defaultConfigurationIsVisible = 0;
@@ -1491,13 +1126,10 @@
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				97C147061CF9000F007C117D /* Debug-prod */,
-				3483022C2E23986E0002E53F /* Debug-staging */,
 				B07E4A0D2C9B8C45001F6910 /* Debug-dev */,
 				97C147071CF9000F007C117D /* Release-prod */,
-				3483022F2E2398790002E53F /* Release-staging */,
 				B07E4A102C9B8C52001F6910 /* Release-dev */,
 				249021D4217E4FDB00AE95B9 /* Profile-prod */,
-				348302322E2398800002E53F /* Profile-staging */,
 				B07E4A132C9B8C5C001F6910 /* Profile-dev */,
 			);
 			defaultConfigurationIsVisible = 0;

ios/Runner.xcodeproj/xcshareddata/xcschemes/dev.xcscheme

@@ -26,7 +26,6 @@
       buildConfiguration = "Debug-dev"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       shouldUseLaunchSchemeArgsEnv = "YES"
       shouldAutocreateTestPlan = "YES">
    </TestAction>
@@ -34,7 +33,6 @@
       buildConfiguration = "Debug-dev"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

ios/Runner.xcodeproj/xcshareddata/xcschemes/staging.xcscheme

@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1640"
-   version = "2.2">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES"
-      buildArchitectures = "Automatic">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <AutocreatedTestPlanReference>
-            </AutocreatedTestPlanReference>
-         </BuildActionEntry>
-         <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-staging"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      shouldAutocreateTestPlan = "YES">
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug-staging"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
-      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-staging"
-      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-staging">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release-staging"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1 +1,122 @@
-{"images":[{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@3x.png","scale":"3x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@3x.png","scale":"3x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@3x.png","scale":"3x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@1x.png","scale":"1x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@3x.png","scale":"3x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@1x.png","scale":"1x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@1x.png","scale":"1x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@1x.png","scale":"1x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@2x.png","scale":"2x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@1x.png","scale":"1x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@2x.png","scale":"2x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@1x.png","scale":"1x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@2x.png","scale":"2x"},{"size":"83.5x83.5","idiom":"ipad","filename":"Icon-App-83.5x83.5@2x.png","scale":"2x"},{"size":"1024x1024","idiom":"ios-marketing","filename":"Icon-App-1024x1024@1x.png","scale":"1x"}],"info":{"version":1,"author":"xcode"}}
+{
+  "images" : [
+    {
+      "filename" : "Syncrow Icon-20@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "Syncrow Icon-20@3x.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "Syncrow Icon-29.png",
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "Syncrow Icon-29@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "Syncrow Icon-29@3x.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "Syncrow Icon-40@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "Syncrow Icon-40@3x.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "Syncrow Icon-60@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "Syncrow Icon-60@3x.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "Syncrow Icon-20.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "Syncrow Icon-20@2x 1.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "Syncrow Icon-29 1.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "Syncrow Icon-29@2x 1.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "Syncrow Icon-40.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "Syncrow Icon-40@2x 1.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "Syncrow Icon-76.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "76x76"
+    },
+    {
+      "filename" : "Syncrow Icon-76@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "76x76"
+    },
+    {
+      "filename" : "Syncrow Icon-83.5@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
+    },
+    {
+      "filename" : "Syncrow Icon-1024.png",
+      "idiom" : "ios-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ios/Runner/GoogleService-Info.plist

@@ -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>AIzaSyDeUWSHReSROpDbENGr--F49DH4VRzVM5A</string>
-	<key>GCM_SENDER_ID</key>
-	<string>255001682464</string>
-	<key>PLIST_VERSION</key>
-	<string>1</string>
-	<key>BUNDLE_ID</key>
-	<string>com.syncrow.iot.ex</string>
-	<key>PROJECT_ID</key>
-	<string>syncrow-prod-79446</string>
-	<key>STORAGE_BUCKET</key>
-	<string>syncrow-prod-79446.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:255001682464:ios:40f00bf201768612561245</string>
-	<key>DATABASE_URL</key>
-	<string>https://syncrow-prod-79446-default-rtdb.firebaseio.com</string>
-</dict>
-</plist>

ios/Runner/Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>SyncOS</string>
+	<string>Syncrow App</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -15,7 +15,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>SyncOS</string>
+	<string>syncrow_app</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
@@ -24,15 +24,8 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
-	<key>LSApplicationQueriesSchemes</key>
-	<array>
-		<string>sms</string>
-		<string>tel</string>
-	</array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
-	<key>NSLocalNetworkUsageDescription</key>
-	<string>SyncOS needs to access the local network to discover and connect to SyncOS devices.</string>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>We need access to your photo library to allow you to select and upload photos.</string>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
@@ -44,16 +37,11 @@
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
 	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
+	<key>LSApplicationQueriesSchemes</key>
 	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
+  	<string>sms</string>
+  	<string>tel</string>
 	</array>
 </dict>
 </plist>

ios/config/dev/GoogleService-Info.plist

@@ -3,17 +3,17 @@
 <plist version="1.0">
 <dict>
 	<key>API_KEY</key>
-	<string>AIzaSyDeUWSHReSROpDbENGr--F49DH4VRzVM5A</string>
+	<string>AIzaSyABnpH6yo2RRjtkp4PlvtK84hKwRm2DhBw</string>
 	<key>GCM_SENDER_ID</key>
-	<string>255001682464</string>
+	<string>427332280600</string>
 	<key>PLIST_VERSION</key>
 	<string>1</string>
 	<key>BUNDLE_ID</key>
-	<string>com.syncrow.iot.ex.dev</string>
+	<string>com.example.syncrow.app</string>
 	<key>PROJECT_ID</key>
-	<string>syncrow-prod-79446</string>
+	<string>test2-8a3d2</string>
 	<key>STORAGE_BUCKET</key>
-	<string>syncrow-prod-79446.firebasestorage.app</string>
+	<string>test2-8a3d2.appspot.com</string>
 	<key>IS_ADS_ENABLED</key>
 	<false></false>
 	<key>IS_ANALYTICS_ENABLED</key>
@@ -25,8 +25,6 @@
 	<key>IS_SIGNIN_ENABLED</key>
 	<true></true>
 	<key>GOOGLE_APP_ID</key>
-	<string>1:255001682464:ios:40f00bf201768612561245</string>
-	<key>DATABASE_URL</key>
-	<string>https://syncrow-dev-79446.asia-southeast1.firebasedatabase.app/</string>
+	<string>1:427332280600:ios:c904c0a7a19a4ed90c7e6d</string>
 </dict>
 </plist>

ios/config/prod/GoogleService-Info.plist

@@ -3,17 +3,17 @@
 <plist version="1.0">
 <dict>
 	<key>API_KEY</key>
-	<string>AIzaSyDeUWSHReSROpDbENGr--F49DH4VRzVM5A</string>
+	<string>AIzaSyAWlRiuJ75FMlf2_UDdri1voWKvkaSHtRg</string>
 	<key>GCM_SENDER_ID</key>
-	<string>255001682464</string>
+	<string>786692570726</string>
 	<key>PLIST_VERSION</key>
 	<string>1</string>
 	<key>BUNDLE_ID</key>
-	<string>com.syncrow.iot.ex</string>
+	<string>com.example.syncrow.app</string>
 	<key>PROJECT_ID</key>
-	<string>syncrow-prod-79446</string>
+	<string>syncrow-staging</string>
 	<key>STORAGE_BUCKET</key>
-	<string>syncrow-prod-79446.firebasestorage.app</string>
+	<string>syncrow-staging.appspot.com</string>
 	<key>IS_ADS_ENABLED</key>
 	<false></false>
 	<key>IS_ANALYTICS_ENABLED</key>
@@ -25,8 +25,8 @@
 	<key>IS_SIGNIN_ENABLED</key>
 	<true></true>
 	<key>GOOGLE_APP_ID</key>
-	<string>1:255001682464:ios:40f00bf201768612561245</string>
+	<string>1:786692570726:ios:455a6fcff77e130f17b7a7</string>
 	<key>DATABASE_URL</key>
-	<string>https://syncrow-prod-79446.asia-southeast1.firebasedatabase.app/</string>
+	<string>https://syncrow-staging-default-rtdb.firebaseio.com</string>
 </dict>
 </plist>

ios/config/staging/GoogleService-Info.plist

@@ -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>AIzaSyDeUWSHReSROpDbENGr--F49DH4VRzVM5A</string>
-	<key>GCM_SENDER_ID</key>
-	<string>255001682464</string>
-	<key>PLIST_VERSION</key>
-	<string>1</string>
-	<key>BUNDLE_ID</key>
-	<string>com.syncrow.iot.ex.staging</string>
-	<key>PROJECT_ID</key>
-	<string>syncrow-prod-79446</string>
-	<key>STORAGE_BUCKET</key>
-	<string>syncrow-prod-79446.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:255001682464:ios:40f00bf201768612561245</string>
-	<key>DATABASE_URL</key>
-	<string>https://syncrow-staging-79446.asia-southeast1.firebasedatabase.app/</string>
-</dict>
-</plist>

lib/features/app_layout/bloc/home_cubit.dart

@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:flutter_svg/flutter_svg.dart';
+import 'package:onesignal_flutter/onesignal_flutter.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:share_plus/share_plus.dart';
 import 'package:syncrow_app/features/app_layout/model/permission_model.dart';
@@ -11,6 +12,7 @@ import 'package:syncrow_app/features/app_layout/model/space_model.dart';
 import 'package:syncrow_app/features/app_layout/view/widgets/app_bar_home_dropdown.dart';
 import 'package:syncrow_app/features/auth/model/project_model.dart';
 import 'package:syncrow_app/features/auth/model/user_model.dart';
+import 'package:syncrow_app/features/booking_system/presentation/screens/booking_system_page.dart';
 import 'package:syncrow_app/features/devices/bloc/devices_cubit.dart';
 import 'package:syncrow_app/features/devices/model/subspace_model.dart';
 import 'package:syncrow_app/features/devices/view/widgets/devices_view_body.dart';
@@ -31,6 +33,7 @@ import 'package:syncrow_app/services/api/spaces_api.dart';
 import 'package:syncrow_app/utils/constants/temp_const.dart';
 import 'package:syncrow_app/utils/helpers/snack_bar.dart';
 import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
+import 'package:syncrow_app/utils/resource_manager/font_manager.dart';
 part 'home_state.dart';
 
 class HomeCubit extends Cubit<HomeState> {
@@ -195,6 +198,63 @@ class HomeCubit extends Cubit<HomeState> {
   //   emit(SpaceSelected(space));
   // }
 
+  checkIfNotificationPermissionGranted() async {
+    try {
+      OneSignal.initialize('762350c9-1e5d-4d95-a648-16d4dc8a25e1');
+
+      //Show native push notification dialog
+      if (Platform.isIOS) {
+        await OneSignal.Notifications.permissionNative();
+      } else {
+        await OneSignal.Notifications.requestPermission(true);
+      }
+
+      if (await Permission.notification.isGranted == false) {
+        return;
+      }
+
+      var userUuid =
+          await const FlutterSecureStorage().read(key: UserModel.userUuidKey) ??
+              '';
+      if (userUuid.isNotEmpty) {
+        await OneSignal.login(userUuid);
+      }
+      //Enable push notifications
+      await OneSignal.User.pushSubscription.optIn();
+
+      // //this function will be called once a user is subscribed
+      // oneSignalSubscriptionObserver =
+      //     OneSignal.User.pushSubscription.addObserver((state) async {
+      //   if (state.current.optedIn) {
+      //     await _sendSubscriptionId();
+      //   }
+      // });
+
+      // // Send the player id when a user allows notifications
+      // oneSignalPermissionObserver =
+      //     OneSignal.Notifications.addPermissionObserver((state) async {
+      //   await _sendSubscriptionId();
+      // });
+
+      // //check if the player id is sent, if not send it again
+      // await _sendSubscriptionId();
+
+      // oneSignalClickListenerObserver =
+      //     OneSignal.Notifications.addClickListener((event) async {
+      //   //Once the user clicks on the notification
+      // });
+    } catch (err) {
+      debugPrint("******* Error");
+      debugPrint(err.toString());
+      rethrow;
+    }
+  }
+
+  _sendSubscriptionId() async {
+    // String? subscriptionId = OneSignal.User.pushSubscription.id ?? '';
+    //TODO send the subscription id to BE
+  }
+
   changeSelectedSpace(SpaceModel space) {
     selectedSpace = space;
     emitSafe(SpaceSelected(space));
@@ -421,7 +481,7 @@ class HomeCubit extends Cubit<HomeState> {
       //   onPressed: () {},
       // ),
     ],
-    'Routine': [
+    'Automation': [
       // IconButton(
       //   icon: Image.asset(
       //     Assets.assetsIconsFilter,
@@ -480,6 +540,7 @@ class HomeCubit extends Cubit<HomeState> {
       //   onPressed: () {},
       // ),
     ],
+    'Booking': [],
     'Menu': [
       // IconButton(
       //   icon: SvgPicture.asset(
@@ -495,7 +556,19 @@ class HomeCubit extends Cubit<HomeState> {
   static Map<String, Widget?> appBarLeading = {
     // 'Dashboard': const AppBarHomeDropdown(),
     'Devices': const AppBarHomeDropdown(),
-    'Routine': const AppBarHomeDropdown(),
+    'Automation': const AppBarHomeDropdown(),
+    'Booking': Padding(
+      padding: const EdgeInsets.only(left: 15),
+      child: Text(
+        'Booking',
+        style: TextStyle(
+          color: ColorsManager.textPrimaryColor,
+          fontSize: 26,
+          fontFamily: FontsManager.fontFamily,
+          fontWeight: FontWeight.w700,
+        ),
+      ),
+    ),
     'Menu': Padding(
       padding: const EdgeInsets.only(left: 15),
       child: Image.asset(
@@ -511,7 +584,9 @@ class HomeCubit extends Cubit<HomeState> {
     // defaultBottomNavBarItem(icon: Assets.assetsIconsDashboard, label: 'Dashboard'),
     // defaultBottomNavBarItem(icon: Assets.assetsIconslayout, label: 'Layout'),
     defaultBottomNavBarItem(icon: Assets.assetsIconsDevices, label: 'Devices'),
-    defaultBottomNavBarItem(icon: Assets.assetsIconsRoutines, label: 'Routine'),
+    defaultBottomNavBarItem(
+        icon: Assets.assetsIconsRoutines, label: 'Automation'),
+    defaultBottomNavBarItem(icon: Assets.bookingIcon, label: 'Booking'),
     defaultBottomNavBarItem(icon: Assets.assetsIconsMenu, label: 'Menu'),
   ];
 
@@ -523,6 +598,7 @@ class HomeCubit extends Cubit<HomeState> {
       child: const DevicesViewBody(),
     ),
     const RoutinesView(),
+    const BookingSystemPage(),
     const MenuView(),
   ];
 
@@ -558,7 +634,6 @@ BottomNavigationBarItem defaultBottomNavBarItem(
   );
 }
 
-
 // class PermissionUtils {
 //   // Check if the "VIEW" permission exists in "MANAGE_SUBSPACE"
 //   static bool hasViewPermission(List<dynamic> permissions) {

lib/features/booking_system/presentation/screens/booking_system_page.dart

@@ -3,9 +3,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
 import 'package:syncrow_app/features/booking_system/data/booking_dummy_source.dart';
 import 'package:syncrow_app/features/booking_system/presentation/blocs/upcoming_bookings_bloc/upcoming_bookings_bloc.dart';
-import 'package:syncrow_app/features/shared_widgets/default_scaffold.dart';
 import '../blocs/past_bookings_bloc/past_bookings_bloc.dart';
-import '../widgets/booking_appbar_widget.dart';
 import '../widgets/current_balance_widget.dart';
 import '../widgets/past_booking_widget.dart';
 import '../widgets/upcoming_bookings_widget.dart';
@@ -26,41 +24,35 @@ class BookingSystemPage extends StatelessWidget {
               ..add(GetPastBookingsEvent()),
           )
         ],
-        child: DefaultScaffold(
-          appBar: BookingAppBar(),
-          child: Padding(
-            padding: EdgeInsets.symmetric(horizontal: 10),
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                SizedBox(
-                  height: 20,
+        child: Padding(
+          padding: EdgeInsets.symmetric(horizontal: 10),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Expanded(
+                flex: 2,
+                child: CurrentBalanceWidget(
+                  userBalance: HomeCubit.user!.points == null
+                      ? '0'
+                      : HomeCubit.user!.points.toString(),
                 ),
-                Expanded(
-                  flex: 2,
-                  child: CurrentBalanceWidget(
-                    userBalance: HomeCubit.user!.points == null
-                        ? '0'
-                        : HomeCubit.user!.points.toString(),
-                  ),
+              ),
+              SizedBox(
+                height: 20,
+              ),
+              Expanded(
+                flex: 8,
+                child: Column(
+                  children: [
+                    UpcomingBookingsWidget(),
+                    SizedBox(
+                      height: 10,
+                    ),
+                    PastBookingsWidget(),
+                  ],
                 ),
-                SizedBox(
-                  height: 20,
-                ),
-                Expanded(
-                  flex: 8,
-                  child: Column(
-                    children: [
-                      UpcomingBookingsWidget(),
-                      SizedBox(
-                        height: 10,
-                      ),
-                      PastBookingsWidget(),
-                    ],
-                  ),
-                )
-              ],
-            ),
+              )
+            ],
           ),
         ));
   }

lib/features/booking_system/presentation/widgets/booking_appbar_widget.dart

@@ -10,10 +10,7 @@ class BookingAppBar extends StatelessWidget implements PreferredSizeWidget {
     return AppBar(
       backgroundColor: Colors.transparent,
       centerTitle: true,
-      leading: IconButton(
-          onPressed: () => Navigator.pop(context),
-          icon: Icon(Icons.arrow_back_ios_new)),
-      title: Text(
+      leading: Text(
         'Booking',
         style: TextStyle(
           color: ColorsManager.blueColor1,

lib/features/booking_system/presentation/widgets/past_booking_widget.dart

@@ -39,7 +39,7 @@ class PastBookingsWidget extends StatelessWidget {
               );
             } else if (state is PastBookingLoadedState) {
               return SizedBox(
-                height: deviceHeight(context) * 0.3,
+                height: deviceHeight(context) * 0.22,
                 child: state.pastBookings.isEmpty
                     ? Text('You Dont Have past Bookings')
                     : ListView.separated(

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

@@ -44,7 +44,7 @@ class _EnergyConsumptionPageState extends State<EnergyConsumptionPage> {
                       },
                       touchTooltipData: LineTouchTooltipData(
                         getTooltipColor: (touchTooltipItem) => Colors.white,
-                        tooltipBorderRadius: BorderRadius.circular(10.0),
+                        tooltipRoundedRadius: 10.0,
                         tooltipPadding: const EdgeInsets.all(8.0),
                         tooltipBorder: BorderSide(color: Colors.grey, width: 1),
                         getTooltipItems: (List<LineBarSpot> touchedSpots) {

lib/features/menu/bloc/menu_cubit.dart

@@ -45,18 +45,6 @@ class MenuCubit extends Cubit<MenuState> {
   }
 
   List<Map<String, Object>> menuSections = [
-//Booking System
-    {
-      'title': 'Booking System',
-      'color': const Color(0xFF8AB9FF),
-      'buttons': [
-        {
-          'title': 'Booking',
-          'Icon': Assets.assetsIconsMenuBookingSystem,
-          'page': BookingSystemPage()
-        },
-      ],
-    },
     //Home Management
     {
       'title': 'Home Management',

lib/features/menu/bloc/profile_bloc/profile_bloc.dart

@@ -262,6 +262,17 @@ class ProfileBloc extends Bloc<ProfileEvent, ProfileState> {
     if (parts.any((part) => part.length < 2 || part.length > 30)) {
       return 'Full name parts must be between 2 and 30 characters long';
     }
+    if (RegExp(r"\s{2,}").hasMatch(value)) {
+      return 'Only one space is allowed between first and last names';
+    }
+    // Check for leading or trailing spaces
+    if (value != value.trim()) {
+      return 'No leading or trailing spaces allowed';
+    }
+    // Check if only alphabetic characters and one space are used
+    if (!RegExp(r'^[A-Za-z]+(?: [A-Za-z]+)?$').hasMatch(value)) {
+      return 'Only alphabetic characters and a single space are allowed';
+    }
     return null;
   }
 

lib/features/menu/view/widgets/securty/bloc/security_bloc.dart

@@ -20,6 +20,7 @@ class SecurityBloc extends Bloc<SecurityEvent, SecurityState> {
     on<UpdateTimerEvent>(_onUpdateTimer);
     on<VerifyPassCodeEvent>(verifyCode);
     on<ChangePasswordEvent>(changePassword);
+    on<DeleteAccountEvent>(onDeleteAccountEvent);
   }
 
   void _onSetPassword(SetPassword event, Emitter<SecurityState> emit) {
@@ -180,7 +181,6 @@ class SecurityBloc extends Bloc<SecurityEvent, SecurityState> {
       ChangePasswordEvent event, Emitter<SecurityState> emit) async {
     emit(LoadingForgetState());
     try {
-
       final response = await AuthenticationAPI.forgetPassword(
         email: HomeCubit.user!.email!,
         otpCode: event.otpCode,
@@ -195,5 +195,16 @@ class SecurityBloc extends Bloc<SecurityEvent, SecurityState> {
       emit(AuthInitialState());
     }
   }
-  
+
+  Future<void> onDeleteAccountEvent(
+      DeleteAccountEvent event, Emitter<SecurityState> emit) async {
+    emit(LoadingForgetState());
+    try {
+      await AuthenticationAPI.deleteAccount();
+      emit(ChangedPassState());
+    } catch (e) {
+      validate = e.toString();
+      emit(AuthInitialState());
+    }
+  }
 }

lib/features/menu/view/widgets/securty/bloc/security_event.dart

@@ -29,3 +29,5 @@ class ChangePasswordEvent extends SecurityEvent {
 }
 
 class VerifyPassCodeEvent extends SecurityEvent {}
+
+class DeleteAccountEvent extends SecurityEvent {}

lib/features/menu/view/widgets/securty/delete_account/delete_account_page.dart

@@ -0,0 +1,107 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_svg/svg.dart';
+import 'package:syncrow_app/features/auth/bloc/auth_cubit.dart';
+import 'package:syncrow_app/features/menu/view/widgets/securty/bloc/security_bloc.dart';
+import 'package:syncrow_app/features/menu/view/widgets/securty/bloc/security_event.dart';
+import 'package:syncrow_app/features/menu/view/widgets/securty/bloc/security_state.dart';
+import 'package:syncrow_app/features/shared_widgets/default_scaffold.dart';
+import 'package:syncrow_app/features/shared_widgets/text_widgets/body_medium.dart';
+import 'package:syncrow_app/generated/assets.dart';
+import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
+
+class DeleteAccountPage extends StatelessWidget {
+  const DeleteAccountPage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocListener<SecurityBloc, SecurityState>(
+      listener: (context, state) {
+        if (state is ChangedPassState) {
+          AuthCubit.get(context).logout();
+        }
+      },
+      child: DefaultScaffold(
+        title: 'Delete Account',
+        bottomNavBar: SizedBox(
+          height: 150,
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.stretch,
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              Column(
+                children: [
+                  BodyMedium(
+                    text: 'Thank you for using Syncrow',
+                    fontWeight: FontWeight.w400,
+                    fontSize: 14,
+                    textAlign: TextAlign.center,
+                  ),
+                  SizedBox(
+                    height: 10,
+                  ),
+                  BlocBuilder<SecurityBloc, SecurityState>(
+                    builder: (context, state) {
+                      if (state is LoadingForgetState) {
+                        return Center(
+                          child: CircularProgressIndicator(),
+                        );
+                      }
+                      return ElevatedButton(
+                        onPressed: () {
+                          context
+                              .read<SecurityBloc>()
+                              .add(DeleteAccountEvent());
+                        },
+                        style: ElevatedButton.styleFrom(
+                          backgroundColor: ColorsManager.blueColor,
+                          shape: RoundedRectangleBorder(
+                            borderRadius: BorderRadius.circular(12),
+                          ),
+                          fixedSize: Size(
+                            MediaQuery.sizeOf(context).width * 0.8,
+                            40,
+                          ),
+                        ),
+                        child: Text(
+                          'Delete Account',
+                          style: TextStyle(
+                              fontSize: 16,
+                              fontWeight: FontWeight.w700,
+                              color: ColorsManager.onPrimaryColor),
+                        ),
+                      );
+                    },
+                  )
+                ],
+              ),
+            ],
+          ),
+        ),
+        child: Column(
+          children: [
+            Padding(
+              padding: const EdgeInsets.only(top: 80, bottom: 30),
+              child: SvgPicture.asset(Assets.deleteAccountIcon),
+            ),
+            const Padding(
+              padding: EdgeInsets.all(8.0),
+              child: BodyMedium(
+                text: 'Account Verification',
+                fontWeight: FontWeight.w700,
+                fontSize: 18,
+              ),
+            ),
+            const BodyMedium(
+              text:
+                  'if you confirm to "delete account",the account will be deleted',
+              fontWeight: FontWeight.w400,
+              fontSize: 16,
+              textAlign: TextAlign.center,
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/features/menu/view/widgets/securty/view/change_password_page.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/rendering.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:syncrow_app/features/menu/view/widgets/securty/bloc/security_bloc.dart';
@@ -24,13 +23,15 @@ class ChangePasswordPage extends StatelessWidget {
           children: [
             InkWell(
               onTap: () {
-                // In your parent widget or navigator
                 Navigator.push(
                   context,
                   MaterialPageRoute(
                     builder: (context) => BlocProvider(
-                      create: (_) => SecurityBloc(), // Provide the Bloc
-                      child: const VerificationCodePage(),
+                      create: (_) => SecurityBloc(),
+                      child: const VerificationCodePage(
+                        title: 'Change Password',
+                        isDeleteAccountMode: false,
+                      ),
                     ),
                   ),
                 );

lib/features/menu/view/widgets/securty/view/securty_view.dart

@@ -1,5 +1,9 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_app/features/menu/view/widgets/securty/bloc/security_bloc.dart';
+import 'package:syncrow_app/features/menu/view/widgets/securty/bloc/security_event.dart';
 import 'package:syncrow_app/features/menu/view/widgets/securty/view/change_password_page.dart';
+import 'package:syncrow_app/features/menu/view/widgets/securty/view/verification_code_page.dart';
 import 'package:syncrow_app/features/shared_widgets/default_container.dart';
 import 'package:syncrow_app/features/shared_widgets/default_scaffold.dart';
 import 'package:syncrow_app/features/shared_widgets/text_widgets/body_medium.dart';
@@ -23,134 +27,34 @@ class SecurtyView extends StatelessWidget {
               mainAxisSize: MainAxisSize.min,
               mainAxisAlignment: MainAxisAlignment.start,
               children: [
-                InkWell(
+                SecurityListTileWidget(
+                  title: 'Change Password',
                   onTap: () {
                     Navigator.of(context).push(MaterialPageRoute(
                       builder: (context) => const ChangePasswordPage(),
                     ));
                   },
-                  child: const Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    mainAxisSize: MainAxisSize.min,
-                    children: [
-                      Row(
-                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                        children: [
-                          BodyMedium(
-                            text: 'Change Password',
-                          ),
-                          Icon(
-                            Icons.arrow_forward_ios,
-                            color: ColorsManager.greyColor,
-                            size: 15,
-                          )
-                        ],
-                      ),
-                      // Container(
-                      //   margin: const EdgeInsets.symmetric(vertical: 15),
-                      //   height: 1,
-                      //   color: ColorsManager.greyColor,
-                      // ),
-                    ],
-                  ),
                 ),
-                // InkWell(
-                //   onTap: () {},
-                //   child: Column(
-                //     crossAxisAlignment: CrossAxisAlignment.start,
-                //     mainAxisSize: MainAxisSize.min,
-                //     children: [
-                //       const Row(
-                //         mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                //         children: [
-                //           BodyMedium(
-                //             text: 'App Lock',
-                //           ),
-                //           Icon(
-                //             Icons.arrow_forward_ios,
-                //             color: ColorsManager.greyColor,
-                //             size: 15,
-                //           )
-                //         ],
-                //       ),
-                //       Container(
-                //         margin: const EdgeInsets.symmetric(vertical: 15),
-                //         height: 1,
-                //         color: ColorsManager.greyColor,
-                //       ),
-                //     ],
-                //   ),
-                // ),
-                // InkWell(
-                //   onTap: () {},
-                //   child: Column(
-                //     crossAxisAlignment: CrossAxisAlignment.start,
-                //     mainAxisSize: MainAxisSize.min,
-                //     children: [
-                //       const Row(
-                //         mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                //         children: [
-                //           BodyMedium(
-                //             text: 'User Code',
-                //           ),
-                //           Icon(
-                //             Icons.arrow_forward_ios,
-                //             color: ColorsManager.greyColor,
-                //             size: 15,
-                //           )
-                //         ],
-                //       ),
-                //       Container(
-                //         margin: const EdgeInsets.symmetric(vertical: 15),
-                //         height: 1,
-                //         color: ColorsManager.greyColor,
-                //       ),
-                //     ],
-                //   ),
-                // ),
-                // InkWell(
-                //   onTap: () {},
-                //   child: Column(
-                //     crossAxisAlignment: CrossAxisAlignment.start,
-                //     mainAxisSize: MainAxisSize.min,
-                //     children: [
-                //       const Row(
-                //         mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                //         children: [
-                //           BodyMedium(
-                //             text: 'Delete Account',
-                //           ),
-                //           Icon(
-                //             Icons.arrow_forward_ios,
-                //             color: ColorsManager.greyColor,
-                //             size: 15,
-                //           )
-                //         ],
-                //       ),
-                //       Container(
-                //         margin: const EdgeInsets.symmetric(vertical: 15),
-                //         height: 1,
-                //         color: ColorsManager.greyColor,
-                //       ),
-                //     ],
-                //   ),
-                // ),
-                // InkWell(
-                //   onTap: () {},
-                //   child: const Row(
-                //     mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                //     children: [
-                //       BodyMedium(
-                //         text: 'Device Update',
-                //       ),
-                //       Icon(
-                //         Icons.arrow_forward_ios,
-                //         color: ColorsManager.greyColor,
-                //         size: 15,
-                //       )
-                //     ],
-                //   ),
-                // ),
+                Container(
+                  margin: const EdgeInsets.symmetric(vertical: 15),
+                  height: 1,
+                  color: ColorsManager.greyColor,
+                ),
+                SecurityListTileWidget(
+                  title: 'Delete Account',
+                  fontColor: ColorsManager.red,
+                  onTap: () {
+                    Navigator.of(context).push(MaterialPageRoute(
+                      builder: (context) => BlocProvider(
+                        create: (_) => SecurityBloc()..add(StartTimerEvent()),
+                        child: VerificationCodePage(
+                          title: '',
+                          isDeleteAccountMode: true,
+                        ),
+                      ),
+                    ));
+                  },
+                ),
               ],
             ),
           ),
@@ -159,3 +63,42 @@ class SecurtyView extends StatelessWidget {
     );
   }
 }
+
+class SecurityListTileWidget extends StatelessWidget {
+  final String title;
+  final void Function() onTap;
+  final Color? fontColor;
+  const SecurityListTileWidget({
+    super.key,
+    required this.title,
+    required this.onTap,
+    this.fontColor,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return InkWell(
+      onTap: onTap,
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              BodyMedium(
+                text: title,
+                fontColor: fontColor,
+              ),
+              Icon(
+                Icons.arrow_forward_ios,
+                color: ColorsManager.greyColor,
+                size: 15,
+              )
+            ],
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/features/menu/view/widgets/securty/view/verification_code_page.dart

@@ -4,6 +4,7 @@ import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
 import 'package:syncrow_app/features/menu/view/widgets/securty/bloc/security_bloc.dart';
 import 'package:syncrow_app/features/menu/view/widgets/securty/bloc/security_event.dart';
 import 'package:syncrow_app/features/menu/view/widgets/securty/bloc/security_state.dart';
+import 'package:syncrow_app/features/menu/view/widgets/securty/delete_account/delete_account_page.dart';
 import 'package:syncrow_app/features/menu/view/widgets/securty/view/set_password_page.dart';
 import 'package:syncrow_app/features/shared_widgets/default_scaffold.dart';
 import 'package:syncrow_app/features/shared_widgets/text_widgets/body_medium.dart';
@@ -11,7 +12,13 @@ import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
 import 'package:pin_code_fields/pin_code_fields.dart';
 
 class VerificationCodePage extends StatelessWidget {
-  const VerificationCodePage({super.key});
+  final String title;
+  final bool isDeleteAccountMode;
+  const VerificationCodePage({
+    super.key,
+    required this.title,
+    required this.isDeleteAccountMode,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -20,19 +27,29 @@ class VerificationCodePage extends StatelessWidget {
       create: (context) => SecurityBloc()..add(StartTimerEvent()),
       child: BlocConsumer<SecurityBloc, SecurityState>(
         listener: (context, state) {
+          final securityBloc = context.read<SecurityBloc>();
           if (state is SuccessForgetState) {
-            Navigator.of(context).push(MaterialPageRoute(
-              builder: (context) => SetPasswordPage(
-                otpCode: otp,
-              ),
-            ));
+            if (isDeleteAccountMode) {
+              Navigator.of(context).push(MaterialPageRoute(
+                builder: (context) => BlocProvider.value(
+                  value: securityBloc,
+                  child: DeleteAccountPage(),
+                ),
+              ));
+            } else {
+              Navigator.of(context).push(MaterialPageRoute(
+                builder: (context) => SetPasswordPage(
+                  otpCode: otp,
+                ),
+              ));
+            }
           }
         },
         builder: (context, state) {
           final _bloc = BlocProvider.of<SecurityBloc>(context);
 
           return DefaultScaffold(
-            title: 'Change Password',
+            title: title,
             child: Column(
               children: [
                 const SizedBox(height: 55),
@@ -86,8 +103,8 @@ class VerificationCodePage extends StatelessWidget {
                           selectedFillColor: Colors.white70,
                           activeFillColor: Colors.white,
                           errorBorderColor: Colors.white,
-                          fieldHeight: 55.0,
-                          fieldWidth: 55.0,
+                          fieldHeight: 45.0,
+                          fieldWidth: 45.0,
                           fieldOuterPadding: const EdgeInsets.only(right: 8),
                           borderRadius: BorderRadius.circular(17),
                           borderWidth: 1,
@@ -109,27 +126,35 @@ class VerificationCodePage extends StatelessWidget {
                   children: [
                     Expanded(
                         child: InkWell(
-                      onTap:
-                          state is TimerState && !state.isButtonEnabled && state.remainingTime != 1
-                              ? null
-                              : () {
-                                  _bloc.add(StartTimerEvent());
-                                },
+                      onTap: state is TimerState &&
+                              !state.isButtonEnabled &&
+                              state.remainingTime != 1
+                          ? null
+                          : () {
+                              _bloc.add(StartTimerEvent());
+                            },
                       child: Container(
-                        padding: const EdgeInsets.only(right: 20, left: 20, top: 15, bottom: 15),
+                        padding: const EdgeInsets.only(
+                            right: 20, left: 20, top: 15, bottom: 15),
                         decoration: BoxDecoration(
                             color: state is TimerState && !state.isButtonEnabled
                                 ? ColorsManager.blueButton
                                 : ColorsManager.blueColor,
-                            borderRadius: BorderRadius.all(Radius.circular(20))),
+                            borderRadius:
+                                BorderRadius.all(Radius.circular(20))),
                         child: Center(
                           child: Center(
                             child: Text(
-                              '${state is TimerState && !state.isButtonEnabled && state.remainingTime != 1 ? "${_bloc.formattedTime(state.remainingTime)} " : "Resend"}',
+                              state is TimerState &&
+                                      !state.isButtonEnabled &&
+                                      state.remainingTime != 1
+                                  ? "${_bloc.formattedTime(state.remainingTime)} "
+                                  : "Resend",
                               style: TextStyle(
                                 fontSize: 16,
                                 fontWeight: FontWeight.w700,
-                                color: state is TimerState && !state.isButtonEnabled
+                                color: state is TimerState &&
+                                        !state.isButtonEnabled
                                     ? Colors.white
                                     : ColorsManager.onPrimaryColor,
                               ),
@@ -142,18 +167,24 @@ class VerificationCodePage extends StatelessWidget {
                     Expanded(
                       child: InkWell(
                         onTap: () {
-                          context.read<SecurityBloc>().add(VerifyPassCodeEvent());
+                          context
+                              .read<SecurityBloc>()
+                              .add(VerifyPassCodeEvent());
                         },
                         child: Container(
-                          padding: const EdgeInsets.only(right: 20, left: 20, top: 15, bottom: 15),
+                          padding: const EdgeInsets.only(
+                              right: 20, left: 20, top: 15, bottom: 15),
                           decoration: const BoxDecoration(
                               color: ColorsManager.blueColor,
-                              borderRadius: BorderRadius.all(Radius.circular(20))),
+                              borderRadius:
+                                  BorderRadius.all(Radius.circular(20))),
                           child: const Center(
                             child: Text(
                               "Verify",
                               style: TextStyle(
-                                  fontSize: 16, color: Colors.white, fontWeight: FontWeight.w700),
+                                  fontSize: 16,
+                                  color: Colors.white,
+                                  fontWeight: FontWeight.w700),
                             ),
                           ),
                         ),

lib/features/scene/view/routines_view.dart

@@ -27,12 +27,15 @@ class RoutinesView extends StatelessWidget {
         builder: (context, state) {
           final selectedSpace = HomeCubit.getInstance().selectedSpace;
           if (state is DeleteSceneSuccess) {
-            if (state.success) _loadScenesAndAutomations(context, selectedSpace);
+            if (state.success)
+              _loadScenesAndAutomations(context, selectedSpace);
           }
           if (state is CreateSceneWithTasks) {
             if (state.success) {
               _loadScenesAndAutomations(context, selectedSpace);
-              context.read<SmartSceneSelectBloc>().add(const SmartSceneClearEvent());
+              context
+                  .read<SmartSceneSelectBloc>()
+                  .add(const SmartSceneClearEvent());
             }
           }
           return BlocListener<SceneBloc, SceneState>(
@@ -72,30 +75,28 @@ class RoutinesView extends StatelessWidget {
                           data: Theme.of(context).copyWith(
                             dividerColor: Colors.transparent,
                           ),
-                          child: Expanded(
-                            child: ListView(
-                              children: [
-                                RoutinesExpansionTile(
-                                  title: 'Tap to run routines',
-                                  emptyRoutinesMessage:
-                                      'No scenes have been added yet',
-                                  routines: state.scenes,
-                                  loadingStates: state.loadingStates,
-                                  loadingSceneId: state.loadingSceneId,
-                                  disablePlayButton: false,
-                                ),
-                                RoutinesExpansionTile(
-                                  title: 'Automation',
-                                  emptyRoutinesMessage:
-                                      'No automations have been added yet',
-                                  routines: state.automationList,
-                                  loadingStates: state.loadingStates,
-                                  loadingSceneId: state.loadingSceneId,
-                                  disablePlayButton: true,
-                                ),
-                                const SizedBox(height: 15),
-                              ],
-                            ),
+                          child: ListView(
+                            children: [
+                              RoutinesExpansionTile(
+                                title: 'Tap to run automations',
+                                emptyRoutinesMessage:
+                                    'No scenes have been added yet',
+                                routines: state.scenes,
+                                loadingStates: state.loadingStates,
+                                loadingSceneId: state.loadingSceneId,
+                                disablePlayButton: false,
+                              ),
+                              RoutinesExpansionTile(
+                                title: 'Automation',
+                                emptyRoutinesMessage:
+                                    'No automations have been added yet',
+                                routines: state.automationList,
+                                loadingStates: state.loadingStates,
+                                loadingSceneId: state.loadingSceneId,
+                                disablePlayButton: true,
+                              ),
+                              const SizedBox(height: 15),
+                            ],
                           ),
                         );
                       }
@@ -111,7 +112,8 @@ class RoutinesView extends StatelessWidget {
     );
   }
 
-  void _loadScenesAndAutomations(BuildContext context, SpaceModel? selectedSpace) {
+  void _loadScenesAndAutomations(
+      BuildContext context, SpaceModel? selectedSpace) {
     context.read<SceneBloc>()
       ..add(LoadScenes(selectedSpace!.id, selectedSpace, showInDevice: false))
       ..add(LoadAutomation(selectedSpace.id, selectedSpace.community.uuid));

lib/features/scene/view/scene_view.dart

@@ -100,7 +100,7 @@ class SceneView extends StatelessWidget {
                                       initiallyExpanded: true,
                                       iconColor: ColorsManager.grayColor,
                                       title: const BodyMedium(
-                                        text: 'Tap to run routines',
+                                        text: 'Tap to run automations',
                                       ),
                                       children: [
                                         if (scenes.isNotEmpty)

lib/features/scene/widgets/alert_dialogs/delete_routine_dialog.dart

@@ -23,7 +23,7 @@ class DeleteRoutineDialog extends StatelessWidget {
             height: 10,
           ),
           const BodyLarge(
-            text: 'Delete Routine',
+            text: 'Delete Automation',
             fontWeight: FontWeight.w700,
             fontColor: ColorsManager.red,
             fontSize: 16,
@@ -39,7 +39,7 @@ class DeleteRoutineDialog extends StatelessWidget {
             child: Column(
               children: [
                 Center(child: const Text('Are you sure you want to ')),
-                Center(child: const Text('delete the routine?'))
+                Center(child: const Text('delete the automation?'))
               ],
             ),
           ),

lib/features/scene/widgets/delete_routine_b.dart

@@ -52,7 +52,7 @@ class DeleteRoutineButton extends StatelessWidget {
             },
             child: const Center(
                 child: Text(
-              'Remove Routine',
+              'Remove Automation',
               style: TextStyle(color: ColorsManager.red),
             ))
             // : SceneListTile(

lib/features/scene/widgets/empty_devices_widget.dart

@@ -9,7 +9,7 @@ class EmptyDevicesWidget extends StatelessWidget {
     return Padding(
       padding: const EdgeInsets.symmetric(vertical: 48),
       child: Text(
-        "No routines.\nEnable 'Show on Home Screen' to add routines",
+        "No automations.\nEnable 'Show on Home Screen' to add automations",
         textAlign: TextAlign.center,
         style: TextStyle(
           color: ColorsManager.grayColor,

lib/features/scene/widgets/empty_routines_widget.dart

@@ -23,7 +23,7 @@ class EmptyRoutinesWidget extends StatelessWidget {
               ),
             ),
             BodyMedium(
-              text: 'No Routines yet',
+              text: 'No automations yet',
               fontColor: ColorsManager.textGray,
             ),
           ],

lib/firebase_options.dart

@@ -1,41 +0,0 @@
-// File generated by FlutterFire CLI.
-// ignore_for_file: type=lint
-import 'package:firebase_core/firebase_core.dart' show FirebaseOptions;
-import 'package:flutter/foundation.dart' show kIsWeb;
-import 'package:syncrow_app/firebase_options_dev.dart' as dev;
-import 'package:syncrow_app/firebase_options_prod.dart' as prod;
-import 'package:syncrow_app/firebase_options_staging.dart' as staging;
-
-/// Default [FirebaseOptions] for use with your Firebase apps.
-///
-/// Example:
-/// ```dart
-/// import 'firebase_options.dart';
-/// // ...
-/// await Firebase.initializeApp(
-///   options: DefaultFirebaseOptions.currentPlatform,
-/// );
-/// ```
-class DefaultFirebaseOptions {
-  static FirebaseOptions currentPlatform(String flavor) {
-    if (kIsWeb) {
-      throw UnsupportedError(
-        'DefaultFirebaseOptions have not been configured for web - '
-        'you can reconfigure this by running the FlutterFire CLI again.',
-      );
-    }
-    switch (flavor) {
-      case 'dev':
-        return dev.DefaultFirebaseOptions.currentPlatform;
-      case 'staging':
-        return staging.DefaultFirebaseOptions.currentPlatform;
-      case 'production':
-        return prod.DefaultFirebaseOptions.currentPlatform;
-      default:
-      throw UnsupportedError(
-        'DefaultFirebaseOptions have not been configured for web - '
-        'you can reconfigure this by running the FlutterFire CLI again.',
-      );
-    }
-  }
-}

lib/firebase_options_dev.dart

@@ -1,20 +1,19 @@
 // File generated by FlutterFire CLI.
 // ignore_for_file: type=lint
 import 'package:firebase_core/firebase_core.dart' show FirebaseOptions;
-import 'package:flutter/foundation.dart'
-    show defaultTargetPlatform, kIsWeb, TargetPlatform;
+import 'package:flutter/foundation.dart' show defaultTargetPlatform, kIsWeb, TargetPlatform;
 
 /// Default [FirebaseOptions] for use with your Firebase apps.
 ///
 /// Example:
 /// ```dart
-/// import 'firebase_options_dev.dart';
+/// import 'firebase_options.dart';
 /// // ...
 /// await Firebase.initializeApp(
 ///   options: DefaultFirebaseOptions.currentPlatform,
 /// );
 /// ```
-class DefaultFirebaseOptions {
+class DefaultFirebaseOptionsDev {
   static FirebaseOptions get currentPlatform {
     if (kIsWeb) {
       return web;
@@ -46,33 +45,30 @@ class DefaultFirebaseOptions {
     }
   }
 
-  static const FirebaseOptions web = FirebaseOptions(
-    apiKey: 'AIzaSyDgq5ywsnFVbbQO-Xz1Z4sR5bBcuiDaS9g',
-    appId: '1:255001682464:web:a03e2d6214c13101561245',
-    messagingSenderId: '255001682464',
-    projectId: 'syncrow-prod-79446',
-    authDomain: 'syncrow-prod-79446.firebaseapp.com',
-    databaseURL: 'https://syncrow-staging-79446.asia-southeast1.firebasedatabase.app/',
-    storageBucket: 'syncrow-prod-79446.firebasestorage.app',
-    measurementId: 'G-1850Q89RMK',
-  );
-
   static const FirebaseOptions android = FirebaseOptions(
-    apiKey: 'AIzaSyARJ5Wx2Uf8sbmb-AHB8WVfFwEFzrCIOKY',
-    appId: '1:255001682464:android:55ba58e8297b3cab561245',
-    messagingSenderId: '255001682464',
-    projectId: 'syncrow-prod-79446',
-    databaseURL: 'https://syncrow-staging-79446.asia-southeast1.firebasedatabase.app/',
-    storageBucket: 'syncrow-prod-79446.firebasestorage.app',
+    apiKey: 'AIzaSyA5qOErxdm0zJmoHIB0TixfebYEsNRpwV0',
+    appId: '1:427332280600:android:bb6047adeeb80fb00c7e6d',
+    messagingSenderId: '427332280600',
+    projectId: 'test2-8a3d2',
+    storageBucket: 'test2-8a3d2.appspot.com',
   );
 
   static const FirebaseOptions ios = FirebaseOptions(
-    apiKey: 'AIzaSyDeUWSHReSROpDbENGr--F49DH4VRzVM5A',
-    appId: '1:255001682464:ios:8a57c70f7f16f785561245',
-    messagingSenderId: '255001682464',
-    projectId: 'syncrow-prod-79446',
-    databaseURL: 'https://syncrow-staging-79446.asia-southeast1.firebasedatabase.app/',
-    storageBucket: 'syncrow-prod-79446.firebasestorage.app',
-    iosBundleId: 'com.syncrow.iot.ex.dev',
+    apiKey: 'AIzaSyABnpH6yo2RRjtkp4PlvtK84hKwRm2DhBw',
+    appId: '1:427332280600:ios:373a65cce55a3af40c7e6d',
+    messagingSenderId: '427332280600',
+    projectId: 'test2-8a3d2',
+    storageBucket: 'test2-8a3d2.appspot.com',
+    iosBundleId: 'com.example.syncrowApp',
+  );
+
+  static const FirebaseOptions web = FirebaseOptions(
+    apiKey: 'AIzaSyCVEvKsJYzhWDFM-9Od68FE0nPpP933st0',
+    appId: '1:427332280600:web:ad50516a87a35a1a0c7e6d',
+    messagingSenderId: '427332280600',
+    projectId: 'test2-8a3d2',
+    authDomain: 'test2-8a3d2.firebaseapp.com',
+    storageBucket: 'test2-8a3d2.appspot.com',
+    measurementId: 'G-Z1RTTTV5H9',
   );
 }

lib/firebase_options_prod.dart

@@ -1,8 +1,7 @@
 // File generated by FlutterFire CLI.
 // ignore_for_file: type=lint
 import 'package:firebase_core/firebase_core.dart' show FirebaseOptions;
-import 'package:flutter/foundation.dart'
-    show defaultTargetPlatform, kIsWeb, TargetPlatform;
+import 'package:flutter/foundation.dart' show defaultTargetPlatform, kIsWeb, TargetPlatform;
 
 /// Default [FirebaseOptions] for use with your Firebase apps.
 ///
@@ -14,7 +13,7 @@ import 'package:flutter/foundation.dart'
 ///   options: DefaultFirebaseOptions.currentPlatform,
 /// );
 /// ```
-class DefaultFirebaseOptions {
+class DefaultFirebaseOptionsStaging {
   static FirebaseOptions get currentPlatform {
     if (kIsWeb) {
       return web;
@@ -60,9 +59,9 @@ class DefaultFirebaseOptions {
     appId: '1:786692570726:ios:455a6fcff77e130f17b7a7',
     messagingSenderId: '786692570726',
     projectId: 'syncrow-staging',
-    databaseURL: 'https://syncrow-prod-79446.asia-southeast1.firebasedatabase.app/',
+    databaseURL: 'https://syncrow-staging-default-rtdb.firebaseio.com',
     storageBucket: 'syncrow-staging.appspot.com',
-    iosBundleId: 'com.syncrow.iot.ex',
+    iosBundleId: 'com.example.syncrow.app',
   );
 
   static const FirebaseOptions web = FirebaseOptions(
@@ -71,7 +70,7 @@ class DefaultFirebaseOptions {
     messagingSenderId: '786692570726',
     projectId: 'syncrow-staging',
     authDomain: 'syncrow-staging.firebaseapp.com',
-    databaseURL: 'https://syncrow-prod-79446.asia-southeast1.firebasedatabase.app/',
+    databaseURL: 'https://syncrow-staging-default-rtdb.firebaseio.com',
     storageBucket: 'syncrow-staging.appspot.com',
     measurementId: 'G-CZ3J3G6LMQ',
   );

lib/firebase_options_staging.dart

@@ -1,78 +0,0 @@
-// File generated by FlutterFire CLI.
-// ignore_for_file: type=lint
-import 'package:firebase_core/firebase_core.dart' show FirebaseOptions;
-import 'package:flutter/foundation.dart'
-    show defaultTargetPlatform, kIsWeb, TargetPlatform;
-
-/// Default [FirebaseOptions] for use with your Firebase apps.
-///
-/// Example:
-/// ```dart
-/// import 'firebase_options_staging.dart';
-/// // ...
-/// await Firebase.initializeApp(
-///   options: DefaultFirebaseOptions.currentPlatform,
-/// );
-/// ```
-class DefaultFirebaseOptions {
-  static FirebaseOptions get currentPlatform {
-    if (kIsWeb) {
-      return web;
-    }
-    switch (defaultTargetPlatform) {
-      case TargetPlatform.android:
-        return android;
-      case TargetPlatform.iOS:
-        return ios;
-      case TargetPlatform.macOS:
-        throw UnsupportedError(
-          'DefaultFirebaseOptions have not been configured for macos - '
-          'you can reconfigure this by running the FlutterFire CLI again.',
-        );
-      case TargetPlatform.windows:
-        throw UnsupportedError(
-          'DefaultFirebaseOptions have not been configured for windows - '
-          'you can reconfigure this by running the FlutterFire CLI again.',
-        );
-      case TargetPlatform.linux:
-        throw UnsupportedError(
-          'DefaultFirebaseOptions have not been configured for linux - '
-          'you can reconfigure this by running the FlutterFire CLI again.',
-        );
-      default:
-        throw UnsupportedError(
-          'DefaultFirebaseOptions are not supported for this platform.',
-        );
-    }
-  }
-
-  static const FirebaseOptions web = FirebaseOptions(
-    apiKey: 'AIzaSyDgq5ywsnFVbbQO-Xz1Z4sR5bBcuiDaS9g',
-    appId: '1:255001682464:web:a03e2d6214c13101561245',
-    messagingSenderId: '255001682464',
-    projectId: 'syncrow-prod-79446',
-    authDomain: 'syncrow-prod-79446.firebaseapp.com',
-    databaseURL: 'https://syncrow-prod-79446-default-rtdb.firebaseio.com',
-    storageBucket: 'syncrow-prod-79446.firebasestorage.app',
-    measurementId: 'G-1850Q89RMK',
-  );
-
-  static const FirebaseOptions android = FirebaseOptions(
-    apiKey: 'AIzaSyARJ5Wx2Uf8sbmb-AHB8WVfFwEFzrCIOKY',
-    appId: '1:255001682464:android:ed8920a3067fb40a561245',
-    messagingSenderId: '255001682464',
-    projectId: 'syncrow-prod-79446',
-    databaseURL: 'https://syncrow-staging-79446.asia-southeast1.firebasedatabase.app/',
-    storageBucket: 'syncrow-prod-79446.firebasestorage.app',
-  );
-
-  static const FirebaseOptions ios = FirebaseOptions(
-    apiKey: 'AIzaSyDeUWSHReSROpDbENGr--F49DH4VRzVM5A',
-    appId: '1:255001682464:ios:41b89a7702b75227561245',
-    messagingSenderId: '255001682464',
-    projectId: 'syncrow-prod-79446',
-    databaseURL: 'https://syncrow-staging-79446.asia-southeast1.firebasedatabase.app/',
-    storageBucket: 'syncrow-prod-79446.firebasestorage.app',
-    iosBundleId: 'com.syncrow.iot.ex.staging',
-  );
-}

lib/generated/assets.dart

@@ -1128,7 +1128,8 @@ class Assets {
   static const String editNameSetting = "assets/icons/edit_name_setting.svg";
 
   static const String verificationIcon = "assets/icons/verification_icon.svg";
-
+static const String deleteAccountIcon='assets/icons/delete_account_icon.svg';
+static const String bookingIcon='assets/icons/booking_icon.svg';
   static const String passwordUnvisibility =
       "assets/icons/password_unvisibility.svg";
   static const String passwordVisibility =

lib/main.dart

@@ -1,18 +1,16 @@
 import 'dart:async';
-
 import 'package:firebase_core/firebase_core.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:permission_handler/permission_handler.dart';
-import 'package:syncrow_app/firebase_options.dart';
+import 'package:syncrow_app/firebase_options_prod.dart';
 import 'package:syncrow_app/services/locator.dart';
 import 'package:syncrow_app/utils/bloc_observer.dart';
 import 'package:syncrow_app/utils/helpers/localization_helpers.dart';
-
 import 'my_app.dart';
 
-const String buildNumber = '1.0.31+0';
+
+const String buildNumber = '1.0.30+18';
 
 void main() {
   //to observe the state of the blocs in the output console
@@ -27,10 +25,6 @@ void main() {
     // HttpOverrides.global = MyHttpOverrides();
     WidgetsFlutterBinding.ensureInitialized();
 
-    if (await Permission.nearbyWifiDevices.request().isGranted) {
-      // Permission is granted
-    }
-
     //license for the font
     // LicenseRegistry.addLicense(() async* {
     //   final license =
@@ -42,8 +36,7 @@ void main() {
     initialSetup();
 
     await Firebase.initializeApp(
-      options: DefaultFirebaseOptions.currentPlatform('production'),
-      name: 'syncrow_app',
+      options: DefaultFirebaseOptionsStaging.currentPlatform,
     );
 
     //final SharedPreferences prefs = await SharedPreferences.getInstance();

lib/main_dev.dart

@@ -1,15 +1,12 @@
 import 'dart:async';
-
 import 'package:firebase_core/firebase_core.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:permission_handler/permission_handler.dart';
-import 'package:syncrow_app/firebase_options.dart';
+import 'package:syncrow_app/firebase_options_dev.dart';
 import 'package:syncrow_app/services/locator.dart';
 import 'package:syncrow_app/utils/bloc_observer.dart';
 import 'package:syncrow_app/utils/helpers/localization_helpers.dart';
-
 import 'my_app.dart';
 
 void main() {
@@ -25,10 +22,6 @@ void main() {
     // HttpOverrides.global = MyHttpOverrides();
     WidgetsFlutterBinding.ensureInitialized();
 
-    if (await Permission.nearbyWifiDevices.request().isGranted) {
-      // Permission is granted
-    }
-
     //license for the font
     // LicenseRegistry.addLicense(() async* {
     //   final license =
@@ -40,8 +33,7 @@ void main() {
     initialSetup();
 
     await Firebase.initializeApp(
-      options: DefaultFirebaseOptions.currentPlatform('dev'),
-      name: 'syncrow_app',
+      options: DefaultFirebaseOptionsDev.currentPlatform,
     );
 
     //final SharedPreferences prefs = await SharedPreferences.getInstance();

lib/main_staging.dart

@@ -1,57 +0,0 @@
-import 'dart:async';
-
-import 'package:firebase_core/firebase_core.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:permission_handler/permission_handler.dart';
-import 'package:syncrow_app/services/locator.dart';
-import 'package:syncrow_app/utils/bloc_observer.dart';
-import 'package:syncrow_app/utils/helpers/localization_helpers.dart';
-
-import 'firebase_options.dart';
-import 'my_app.dart';
-
-void main() {
-  //to observe the state of the blocs in the output console
-  Bloc.observer = MyBlocObserver();
-  //to catch all the errors in the app and send them to firebase
-  runZonedGuarded(() async {
-    //to load the environment variables
-    // const environment = String.fromEnvironment('FLAVOR', defaultValue: 'prod');
-    await dotenv.load(fileName: '.env.staging');
-
-    // //this is to make the app work with the self-signed certificate
-    // HttpOverrides.global = MyHttpOverrides();
-    WidgetsFlutterBinding.ensureInitialized();
-
-    if (await Permission.nearbyWifiDevices.request().isGranted) {
-      // Permission is granted
-    }
-
-    //license for the font
-    // LicenseRegistry.addLicense(() async* {
-    //   final license =
-    //       await rootBundle.loadString('assets/fonts/roboto/LICENSE.txt');
-    //   yield LicenseEntryWithLineBreaks(['google_fonts'], license);
-    // });
-
-    //to initialize the locator
-    initialSetup();
-
-    await Firebase.initializeApp(
-      options: DefaultFirebaseOptions.currentPlatform('staging'),
-      name: 'syncrow_app',
-    );
-
-    //final SharedPreferences prefs = await SharedPreferences.getInstance();
-
-    //to save the locale in the shared preferences
-    await LocalizationService.saveLocale(const Locale("en", "AE"));
-    final savedLocale = await LocalizationService.savedLocale();
-
-    runApp(MyApp(savedLocale));
-  }, (error, stackTrace) {
-    // FirebaseCrashlytics.instance.recordError(error, stackTrace, fatal: true);
-  });
-}

lib/my_app.dart

@@ -46,7 +46,7 @@ class MyApp extends StatelessWidget {
         scaffoldMessengerKey: NavigationService.snackbarKey,
         debugShowCheckedModeBanner: false,
         color: ColorsManager.primaryColor,
-        title: 'SyncOS',
+        title: 'Syncrow App',
         onGenerateRoute: router.Router.generateRoute,
         initialRoute: Routes.splash,
         themeMode: ThemeMode.system,

lib/services/api/api_links_endpoints.dart

@@ -195,6 +195,7 @@ abstract class ApiEndpoints {
   static const String sendPicture = '/user/profile-picture/{userUuid}';
   static const String getRegion = '/region';
   static const String getTimezone = '/timezone';
+  static const String deleteProfile = '/user';
 
   //multiple-time  offline
   static const String addMultipleTimeTemporaryPassword =

lib/services/api/authentication_api.dart

@@ -1,3 +1,4 @@
+import 'package:dio/dio.dart';
 import 'package:syncrow_app/features/auth/model/login_with_email_model.dart';
 import 'package:syncrow_app/features/auth/model/signup_model.dart';
 import 'package:syncrow_app/features/auth/model/token.dart';
@@ -83,4 +84,18 @@ class AuthenticationAPI {
     );
     return response;
   }
+
+  static Future<void> deleteAccount() async {
+    try {
+      await HTTPService().delete(
+        path: ApiEndpoints.deleteProfile,
+        expectedResponseModel: (p0) {},
+      );
+    } on DioException catch (e) {
+      final errorData = e.response!.data;
+      String errorMessage =
+          errorData['error']['message'] ?? 'something went wrong';
+      throw Exception(errorMessage);
+    }
+  }
 }

lib/utils/resource_manager/constants.dart

@@ -12,7 +12,7 @@ import 'package:syncrow_app/generated/assets.dart';
 import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
 
 abstract class Constants {
-  static const String appName = "SyncOS";
+  static const String appName = "Syncrow App";
 
   static const String languageCode = "en";
 

lib/utils/resource_manager/strings_manager.dart

@@ -4,8 +4,8 @@ class StringsManager {
 
   static const String dashboard = 'Dashboard';
   static const String devices = 'Devices';
-  static const String routine = 'Routines';
-  static const String tapToRunRoutine = 'Tap to run routine';
+  static const String routine = 'Automation';
+  static const String tapToRunRoutine = 'Tap to run automation';
   static const String wizard = 'Wizard';
   static const String active = 'Active';
   static const String current = 'Current';
@@ -39,6 +39,6 @@ class StringsManager {
       'Example: when an unusual activity is detected.';
   static const String functions = "Functions";
   static const String firstLaunch = "firstLaunch";
-  static const String deleteScene = 'Remove Routine';
+  static const String deleteScene = 'Remove Automation';
   static const String deleteAutomation = 'Delete Automation';
 }

pubspec.yaml

@@ -5,7 +5,7 @@ description: This is the mobile application project, developed with Flutter for
 # pub.dev using `flutter pub publish`. This is preferred for private packages.
 publish_to: "none" # Remove this line if you wish to publish to pub.dev
 
-version: 1.0.31+0
+version: 1.0.30+18
 
 environment:
   sdk: ">=3.0.6 <4.0.0"
@@ -15,8 +15,9 @@ dependencies:
   cupertino_icons: ^1.0.6
   dio: ^5.4.1
   equatable: ^2.0.5
+  firebase_analytics: ^11.4.0
   firebase_core: ^3.10.0
-  firebase_crashlytics: ^4.3.7
+  firebase_crashlytics: ^4.3.0
   flutter:
     sdk: flutter
   flutter_animated_dialog: ^2.0.1
@@ -31,25 +32,26 @@ dependencies:
   get_it: ^8.0.3
   url_launcher: ^6.3.1
   # flutter_localization: ^0.2.0
-  flutter_bloc: ^9.1.1
+  flutter_bloc: ^8.1.4
   html: ^0.15.4
-  permission_handler: ^12.0.0+1
+  onesignal_flutter: ^5.2.0
+  permission_handler: ^11.3.1
   pin_code_fields: ^8.0.1
-  share_plus: ^11.0.0
+  share_plus: ^10.1.3
   shared_preferences: ^2.2.2
   smooth_page_indicator: ^1.1.0
   uuid: ^4.4.0
   time_picker_spinner: ^1.0.0
   image_picker: ^1.1.2
   device_info_plus: ^11.2.0
-  fl_chart: ^1.0.0
+  fl_chart: ^0.70.1
   firebase_database: ^11.3.0
   percent_indicator: ^4.2.3
-  flutter_html: ^3.0.0
+  flutter_html: ^3.0.0-beta.2
 
 
 dev_dependencies:
-  flutter_lints: ^6.0.0
+  flutter_lints: ^5.0.0
   flutter_test:
     sdk: flutter