Merge branch 'master' into fatima_dev

android/app/src/main/AndroidManifest.xml

@@ -3,6 +3,7 @@
 
     <uses-permission android:name="android.permission.USE_BIOMETRIC" />
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.USE_FINGERPRINT" />

ios/Podfile

@@ -3,6 +3,8 @@
  use_frameworks! :linkage => :static
 
 
+$FirebaseAsStaticFramework = true
+
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
 

ios/Podfile.lock

@@ -0,0 +1,211 @@
+PODS:
+  - device_info_plus (0.0.1):
+    - Flutter
+  - DKImagePickerController/Core (4.3.9):
+    - DKImagePickerController/ImageDataManager
+    - DKImagePickerController/Resource
+  - DKImagePickerController/ImageDataManager (4.3.9)
+  - DKImagePickerController/PhotoGallery (4.3.9):
+    - DKImagePickerController/Core
+    - DKPhotoGallery
+  - DKImagePickerController/Resource (4.3.9)
+  - DKPhotoGallery (0.0.19):
+    - DKPhotoGallery/Core (= 0.0.19)
+    - DKPhotoGallery/Model (= 0.0.19)
+    - DKPhotoGallery/Preview (= 0.0.19)
+    - DKPhotoGallery/Resource (= 0.0.19)
+    - SDWebImage
+    - SwiftyGif
+  - DKPhotoGallery/Core (0.0.19):
+    - DKPhotoGallery/Model
+    - DKPhotoGallery/Preview
+    - SDWebImage
+    - SwiftyGif
+  - DKPhotoGallery/Model (0.0.19):
+    - SDWebImage
+    - SwiftyGif
+  - DKPhotoGallery/Preview (0.0.19):
+    - DKPhotoGallery/Model
+    - DKPhotoGallery/Resource
+    - SDWebImage
+    - SwiftyGif
+  - DKPhotoGallery/Resource (0.0.19):
+    - SDWebImage
+    - SwiftyGif
+  - file_picker (0.0.1):
+    - DKImagePickerController/PhotoGallery
+    - Flutter
+  - Firebase/CoreOnly (11.0.0):
+    - FirebaseCore (= 11.0.0)
+  - Firebase/Messaging (11.0.0):
+    - Firebase/CoreOnly
+    - FirebaseMessaging (~> 11.0.0)
+  - firebase_core (3.4.0):
+    - Firebase/CoreOnly (= 11.0.0)
+    - Flutter
+  - firebase_messaging (15.1.0):
+    - Firebase/Messaging (= 11.0.0)
+    - firebase_core
+    - Flutter
+  - FirebaseCore (11.0.0):
+    - FirebaseCoreInternal (~> 11.0)
+    - GoogleUtilities/Environment (~> 8.0)
+    - GoogleUtilities/Logger (~> 8.0)
+  - FirebaseCoreInternal (11.15.0):
+    - "GoogleUtilities/NSData+zlib (~> 8.1)"
+  - FirebaseInstallations (11.4.0):
+    - FirebaseCore (~> 11.0)
+    - GoogleUtilities/Environment (~> 8.0)
+    - GoogleUtilities/UserDefaults (~> 8.0)
+    - PromisesObjC (~> 2.4)
+  - FirebaseMessaging (11.0.0):
+    - FirebaseCore (~> 11.0)
+    - FirebaseInstallations (~> 11.0)
+    - GoogleDataTransport (~> 10.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
+    - GoogleUtilities/Environment (~> 8.0)
+    - GoogleUtilities/Reachability (~> 8.0)
+    - GoogleUtilities/UserDefaults (~> 8.0)
+    - nanopb (~> 3.30910.0)
+  - Flutter (1.0.0)
+  - flutter_inappwebview_ios (0.0.1):
+    - Flutter
+    - flutter_inappwebview_ios/Core (= 0.0.1)
+    - OrderedSet (~> 6.0.3)
+  - flutter_inappwebview_ios/Core (0.0.1):
+    - Flutter
+    - OrderedSet (~> 6.0.3)
+  - flutter_local_notifications (0.0.1):
+    - Flutter
+  - Google-Maps-iOS-Utils (5.0.0):
+    - GoogleMaps (~> 8.0)
+  - google_maps_flutter_ios (0.0.1):
+    - Flutter
+    - Google-Maps-iOS-Utils (< 7.0, >= 5.0)
+    - GoogleMaps (< 11.0, >= 8.4)
+  - GoogleDataTransport (10.1.1):
+    - nanopb (~> 3.30910.0)
+    - PromisesObjC (~> 2.4)
+  - GoogleMaps (8.4.0):
+    - GoogleMaps/Maps (= 8.4.0)
+  - GoogleMaps/Base (8.4.0)
+  - GoogleMaps/Maps (8.4.0):
+    - GoogleMaps/Base
+  - GoogleUtilities/AppDelegateSwizzler (8.1.2):
+    - GoogleUtilities/Environment
+    - GoogleUtilities/Logger
+    - GoogleUtilities/Network
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Environment (8.1.2):
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Logger (8.1.2):
+    - GoogleUtilities/Environment
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Network (8.1.2):
+    - GoogleUtilities/Logger
+    - "GoogleUtilities/NSData+zlib"
+    - GoogleUtilities/Privacy
+    - GoogleUtilities/Reachability
+  - "GoogleUtilities/NSData+zlib (8.1.2)":
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Privacy (8.1.2)
+  - GoogleUtilities/Reachability (8.1.2):
+    - GoogleUtilities/Logger
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/UserDefaults (8.1.2):
+    - GoogleUtilities/Logger
+    - GoogleUtilities/Privacy
+  - nanopb (3.30910.0):
+    - nanopb/decode (= 3.30910.0)
+    - nanopb/encode (= 3.30910.0)
+  - nanopb/decode (3.30910.0)
+  - nanopb/encode (3.30910.0)
+  - OrderedSet (6.0.3)
+  - PromisesObjC (2.4.1)
+  - SDWebImage (5.21.7):
+    - SDWebImage/Core (= 5.21.7)
+  - SDWebImage/Core (5.21.7)
+  - share_plus (0.0.1):
+    - Flutter
+  - SwiftyGif (5.4.5)
+
+DEPENDENCIES:
+  - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
+  - file_picker (from `.symlinks/plugins/file_picker/ios`)
+  - firebase_core (from `.symlinks/plugins/firebase_core/ios`)
+  - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`)
+  - Flutter (from `Flutter`)
+  - flutter_inappwebview_ios (from `.symlinks/plugins/flutter_inappwebview_ios/ios`)
+  - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
+  - google_maps_flutter_ios (from `.symlinks/plugins/google_maps_flutter_ios/ios`)
+  - share_plus (from `.symlinks/plugins/share_plus/ios`)
+
+SPEC REPOS:
+  trunk:
+    - DKImagePickerController
+    - DKPhotoGallery
+    - Firebase
+    - FirebaseCore
+    - FirebaseCoreInternal
+    - FirebaseInstallations
+    - FirebaseMessaging
+    - Google-Maps-iOS-Utils
+    - GoogleDataTransport
+    - GoogleMaps
+    - GoogleUtilities
+    - nanopb
+    - OrderedSet
+    - PromisesObjC
+    - SDWebImage
+    - SwiftyGif
+
+EXTERNAL SOURCES:
+  device_info_plus:
+    :path: ".symlinks/plugins/device_info_plus/ios"
+  file_picker:
+    :path: ".symlinks/plugins/file_picker/ios"
+  firebase_core:
+    :path: ".symlinks/plugins/firebase_core/ios"
+  firebase_messaging:
+    :path: ".symlinks/plugins/firebase_messaging/ios"
+  Flutter:
+    :path: Flutter
+  flutter_inappwebview_ios:
+    :path: ".symlinks/plugins/flutter_inappwebview_ios/ios"
+  flutter_local_notifications:
+    :path: ".symlinks/plugins/flutter_local_notifications/ios"
+  google_maps_flutter_ios:
+    :path: ".symlinks/plugins/google_maps_flutter_ios/ios"
+  share_plus:
+    :path: ".symlinks/plugins/share_plus/ios"
+
+SPEC CHECKSUMS:
+  device_info_plus: 71ffc6ab7634ade6267c7a93088ed7e4f74e5896
+  DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
+  DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
+  file_picker: 9b3292d7c8bc68c8a7bf8eb78f730e49c8efc517
+  Firebase: 9f574c08c2396885b5e7e100ed4293d956218af9
+  firebase_core: 53cecb83c72fea329b267bb0accb06a33e9f036a
+  firebase_messaging: 62c8a01f1ee118754d01dd4fd83ba670980326a3
+  FirebaseCore: 3cf438f431f18c12cdf2aaf64434648b63f7e383
+  FirebaseCoreInternal: 9afa45b1159304c963da48addb78275ef701c6b4
+  FirebaseInstallations: 6ef4a1c7eb2a61ee1f74727d7f6ce2e72acf1414
+  FirebaseMessaging: d2d1d9c62c46dd2db49a952f7deb5b16ad2c9742
+  Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
+  flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99
+  flutter_local_notifications: 395056b3175ba4f08480a7c5de30cd36d69827e4
+  Google-Maps-iOS-Utils: 66d6de12be1ce6d3742a54661e7a79cb317a9321
+  google_maps_flutter_ios: 17552876e72723da1d41accc22f03b5f7afbde69
+  GoogleDataTransport: a24e58982ab3ba2f64d79613e027fe7f57e88539
+  GoogleMaps: 8939898920281c649150e0af74aa291c60f2e77d
+  GoogleUtilities: 766ace00c6b10d8148408f329d10c4f051931850
+  nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
+  OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
+  PromisesObjC: 752c3227f599e3467650e47ea36f433eeb10c273
+  SDWebImage: e9fc87c1aab89a8ab1bbd74eba378c6f53be8abf
+  share_plus: 011d6fb4f9d2576b83179a3a5c5e323202cdabcf
+  SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
+
+PODFILE CHECKSUM: 9e1144dabcfa020b871b14eafcd4210cf44b521b
+
+COCOAPODS: 1.16.2

ios/Runner.xcodeproj/project.pbxproj

@@ -8,14 +8,14 @@
 
 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
-		290601662C7B4B300089E959 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 290601652C7B4B300089E959 /* GoogleService-Info.plist */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
+		40C2C3493046E4D00005FD2A /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 40C2C3483046E4D00005FD2A /* GoogleService-Info.plist */; };
 		5E9559759AEA0E089FDD9FD7 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BFCFDCCDB03A7D75BCB22117 /* Pods_Runner.framework */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
+		78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
-		78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -34,11 +34,12 @@
 /* Begin PBXFileReference section */
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
-		290601652C7B4B300089E959 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "../../../../GoogleService-Info.plist"; sourceTree = "<group>"; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
+		40C2C3483046E4D00005FD2A /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
 		589B0447F002C308698802BD /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 		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>"; };
+		78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; 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>"; };
@@ -50,7 +51,6 @@
 		B5D2F47A7F9A7D8C8678860A /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		BFCFDCCDB03A7D75BCB22117 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		F095357B123772C701252686 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
-		78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -100,7 +100,6 @@
 		97C146F01CF9000F007C117D /* Runner */ = {
 			isa = PBXGroup;
 			children = (
-				290601652C7B4B300089E959 /* GoogleService-Info.plist */,
 				97C146FA1CF9000F007C117D /* Main.storyboard */,
 				97C146FD1CF9000F007C117D /* Assets.xcassets */,
 				97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
@@ -109,6 +108,7 @@
 				1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */,
 				74858FAE1ED2DC5600515810 /* AppDelegate.swift */,
 				74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */,
+				40C2C3483046E4D00005FD2A /* GoogleService-Info.plist */,
 			);
 			path = Runner;
 			sourceTree = "<group>";
@@ -135,9 +135,6 @@
 
 /* Begin PBXNativeTarget section */
 		97C146ED1CF9000F007C117D /* Runner */ = {
-			packageProductDependencies = (
-				78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */,
-			);
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
@@ -156,6 +153,9 @@
 			dependencies = (
 			);
 			name = Runner;
+			packageProductDependencies = (
+				78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */,
+			);
 			productName = Runner;
 			productReference = 97C146EE1CF9000F007C117D /* Runner.app */;
 			productType = "com.apple.product-type.application";
@@ -164,9 +164,6 @@
 
 /* Begin PBXProject section */
 		97C146E61CF9000F007C117D /* Project object */ = {
-			packageReferences = (
-				781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */,
-			);
 			isa = PBXProject;
 			attributes = {
 				LastUpgradeCheck = 1510;
@@ -187,6 +184,9 @@
 				Base,
 			);
 			mainGroup = 97C146E51CF9000F007C117D;
+			packageReferences = (
+				781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */,
+			);
 			productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -203,7 +203,7 @@
 			files = (
 				97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
 				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
-				290601662C7B4B300089E959 /* GoogleService-Info.plist in Resources */,
+				40C2C3493046E4D00005FD2A /* GoogleService-Info.plist in Resources */,
 				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
 				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
 			);
@@ -388,6 +388,7 @@
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = 99Z3UD3LJM;
@@ -516,6 +517,7 @@
 			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = 99Z3UD3LJM;
@@ -539,6 +541,7 @@
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = 99Z3UD3LJM;
@@ -580,12 +583,14 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
+
 /* Begin XCLocalSwiftPackageReference section */
-		781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = {
+		781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = {
 			isa = XCLocalSwiftPackageReference;
 			relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
 		};
 /* End XCLocalSwiftPackageReference section */
+
 /* Begin XCSwiftPackageProductDependency section */
 		78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = {
 			isa = XCSwiftPackageProductDependency;

ios/Runner/Base.lproj/Main.storyboard

@@ -1,8 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="24765" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+    <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="24743"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--Flutter View Controller-->
@@ -14,13 +16,14 @@
                         <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
             </objects>
+            <point key="canvasLocation" x="139" y="131"/>
         </scene>
     </scenes>
 </document>

lib/main.dart

@@ -134,7 +134,7 @@ Future<void> main() async {
           paymentService: injector.get<PaymentService>(),
           paymentRepo: injector.get<PaymentsRepo>(),
         ),
-      ),
+      ), 
       ChangeNotifierProvider<ShippingManagementVM>(
         create: (_) => ShippingManagementVM(
           shippingRepo: injector.get<ShippingRepo>(),

lib/views/appoinments/appointment_page.dart

@@ -76,7 +76,7 @@ class _AppointmentPageState extends State<AppointmentPage> {
                 smallSize: 20,
                 backgroundColor: MyColors.darkPrimaryColor,
                 label: Text('${appointmentsVM.appointmentFiltersCounter}'),
-                child: MyAssets.searchIcon.buildSvg(),
+                child: MyAssets.searchIcon.buildSvg(height: 22, width: 22),
               ),
             ).onPress(() {
               navigateWithName(context, AppRoutes.appoinmentSearchFilterPage);

lib/views/appoinments/update_appointment_page.dart

@@ -38,6 +38,16 @@ class _UpdateAppointmentPageState extends State<UpdateAppointmentPage> {
           height: double.infinity,
           child: Consumer(builder: (BuildContext context, AppointmentsVM appointmentsVM, Widget? child) {
             appointmentListModel = appointmentsVM.myFilteredAppointmentsForProvider[appointmentsVM.selectedAppointmentIndex].customerAppointmentList![appointmentsVM.selectedAppointmentSubIndex];
+            print('========== SELECTED APPOINTMENT ==========');
+            print('id: ${appointmentListModel.id}');
+            print('servicePaymentStatus: ${appointmentListModel.servicePaymentStatus}');
+            print(
+              'appointmentPaymentStatusEnum: '
+                  '${appointmentListModel.appointmentPaymentStatusEnum}',
+            );
+            print('paymentType: ${appointmentListModel.paymentType}');
+            print('amountRem: ${appointmentListModel.remainingAmount}');
+            print('==========================================');
             if (appointmentsVM.state == ViewState.busy) {
               return const Center(child: CircularProgressIndicator());
             } else {

lib/views/branch_management/branch/branch_detail_page.dart

@@ -60,9 +60,7 @@ class _BranchDetailPageState extends State<BranchDetailPage> {
 
   bool validation(BuildContext context) {
     bool isValid = false;
-    for (var element in context
-        .read<ServiceVM>()
-        .allProviderDealersList) {
+    for (var element in context.read<ServiceVM>().allProviderDealersList) {
       if (element.isBranchUser ?? false) {
         isValid = true;
       }
@@ -102,7 +100,7 @@ class _BranchDetailPageState extends State<BranchDetailPage> {
 
   Widget buildFooterActionWidget(BuildContext context) {
     Widget actionWidget = const SizedBox();
-    if (AppState().userType == UserType.providerDealer && widget.branchData.branchStatus == BranchStatusEnum.approvedOrActive) {
+    if ((AppState().userType == UserType.providerDealer || AppState().userType == UserType.providerIndividual) && widget.branchData.branchStatus == BranchStatusEnum.approvedOrActive) {
       actionWidget = ShowFillButton(
         title: LocaleKeys.assignDealerUser.tr(),
         maxWidth: double.infinity,
@@ -174,47 +172,45 @@ class _BranchDetailPageState extends State<BranchDetailPage> {
         8.width,
         Expanded(
             child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              mainAxisAlignment: MainAxisAlignment.start,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          mainAxisAlignment: MainAxisAlignment.start,
+          children: [
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: [
-                Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: [
-                    isArabic ? serviceVM.categories[pIndex].categoryNameN.toString().toText(fontSize: 16):
-                    serviceVM.categories[pIndex].categoryName.toString().toText(fontSize: 16),
-                  ],
-                ),
-                8.height,
-                Row(
-                  mainAxisAlignment: MainAxisAlignment.end,
-                  crossAxisAlignment: CrossAxisAlignment.end,
-                  children: [
-                    Expanded(
-                      child: ListView.builder(
-                        itemBuilder: (context, index) {
-                          return Container(
-                            child: (EasyLocalization
-                                .of(context)
-                                ?.currentLocale
-                                ?.countryCode == "SA"
+                isArabic
+                    ? serviceVM.categories[pIndex].categoryNameN.toString().toText(fontSize: 14, maxLines: 2)
+                    : serviceVM.categories[pIndex].categoryName.toString().toText(fontSize: 14, maxLines: 2),
+              ],
+            ),
+            8.height,
+            Row(
+              mainAxisAlignment: MainAxisAlignment.end,
+              crossAxisAlignment: CrossAxisAlignment.end,
+              children: [
+                Expanded(
+                  child: ListView.builder(
+                    itemBuilder: (context, index) {
+                      return Container(
+                        child: (EasyLocalization.of(context)?.currentLocale?.countryCode == "SA"
                                 ? serviceVM.categories[pIndex].services![index].serviceDescriptionN.toString()
                                 : serviceVM.categories[pIndex].services![index].serviceDescription.toString())
-                                .toText(
-                              fontSize: 12,
-                              color: MyColors.lightTextColor,
-                            ),
-                          );
-                        },
-                        itemCount: serviceVM.categories[pIndex].services?.length,
-                        physics: const NeverScrollableScrollPhysics(),
-                        shrinkWrap: true,
-                        padding: EdgeInsets.zero,
-                      ),
-                    ),
-                  ],
-                ).withArrow(isArrowEnabled: true)
+                            .toText(
+                          fontSize: 12,
+                          color: MyColors.lightTextColor,
+                        ),
+                      );
+                    },
+                    itemCount: serviceVM.categories[pIndex].services?.length,
+                    physics: const NeverScrollableScrollPhysics(),
+                    shrinkWrap: true,
+                    padding: EdgeInsets.zero,
+                  ),
+                ),
               ],
-            )),
+            ).withArrow(isArrowEnabled: true)
+          ],
+        )),
       ],
     ).toWhiteContainer(width: double.infinity, allPading: 12);
   }
@@ -290,29 +286,27 @@ class _BranchDetailPageState extends State<BranchDetailPage> {
                               8.width,
                               Expanded(
                                 child: LocaleKeys.setorEditBranchSchedule.tr().toText(
-                                  isUnderLine: true,
-                                  fontSize: 12,
-                                  color: Colors.white,
-                                  decorationColor: MyColors.white,
-                                ),
+                                      isUnderLine: true,
+                                      fontSize: 12,
+                                      color: Colors.white,
+                                      decorationColor: MyColors.white,
+                                    ),
                               ),
                             ],
                           )
                               .withArrow(
-                            isArrowEnabled: true,
-                            color: Colors.white,
-                            arrowWidth: 16.16,
-                            arrowHeight: 11.75,
-                          )
+                                isArrowEnabled: true,
+                                color: Colors.white,
+                                arrowWidth: 16.16,
+                                arrowHeight: 11.75,
+                              )
                               .margin(right: 5),
                         ).onPress(() {
                           if (widget.branchData.branchStatus == BranchStatusEnum.pending || widget.branchData.branchStatus == BranchStatusEnum.rejected) {
                             Utils.showToast(LocaleKeys.waitForBranchVerification.tr());
                             return;
                           }
-                          context
-                              .read<ScheduleVM>()
-                              .currentSelectedBranchName = widget.branchData.branchName.toString();
+                          context.read<ScheduleVM>().currentSelectedBranchName = widget.branchData.branchName.toString();
                           navigateWithName(context, AppRoutes.schedulesList, arguments: widget.branchData.id.toString());
                         }),
                         10.height,
@@ -374,39 +368,38 @@ class _BranchDetailPageState extends State<BranchDetailPage> {
                           const Center(
                             child: CircularProgressIndicator(),
                           ),
-                        ] else
-                          ...[
-                            ListView.separated(
-                              itemBuilder: (context, pIndex) {
-                                return buildServiceTileWidget(pIndex, serviceVM).onPress(() {
-                                  serviceVM.categories[pIndex].branchId = widget.branchData.id.toString();
-                                  serviceVM.categories[pIndex].branchName = widget.branchData.branchName.toString();
-                                  // CategoryData categoryData = serviceVM.categories[pIndex];
-                                  serviceVM.applyFilterOnBranchServices(serviceStatusEnum: ServiceStatusEnum.approvedOrActive);
+                        ] else ...[
+                          ListView.separated(
+                            itemBuilder: (context, pIndex) {
+                              return buildServiceTileWidget(pIndex, serviceVM).onPress(() {
+                                serviceVM.categories[pIndex].branchId = widget.branchData.id.toString();
+                                serviceVM.categories[pIndex].branchName = widget.branchData.branchName.toString();
+                                // CategoryData categoryData = serviceVM.categories[pIndex];
+                                serviceVM.applyFilterOnBranchServices(serviceStatusEnum: ServiceStatusEnum.approvedOrActive);
 
-                                  CategoryData categoryData = CategoryData(
-                                    id: serviceVM.categories[pIndex].id,
-                                    branchId: serviceVM.categories[pIndex].branchId,
-                                    branchName: serviceVM.categories[pIndex].branchName,
-                                    categoryName: serviceVM.categories[pIndex].categoryName,
-                                    categoryNameN: serviceVM.categories[pIndex].categoryNameN,
-                                    serviceCategoryIconUrl: serviceVM.categories[pIndex].serviceCategoryIconUrl,
-                                    serviceCategoryImageUrl: serviceVM.categories[pIndex].serviceCategoryImageUrl,
-                                    services: [],
-                                  );
+                                CategoryData categoryData = CategoryData(
+                                  id: serviceVM.categories[pIndex].id,
+                                  branchId: serviceVM.categories[pIndex].branchId,
+                                  branchName: serviceVM.categories[pIndex].branchName,
+                                  categoryName: serviceVM.categories[pIndex].categoryName,
+                                  categoryNameN: serviceVM.categories[pIndex].categoryNameN,
+                                  serviceCategoryIconUrl: serviceVM.categories[pIndex].serviceCategoryIconUrl,
+                                  serviceCategoryImageUrl: serviceVM.categories[pIndex].serviceCategoryImageUrl,
+                                  services: [],
+                                );
 
-                                  navigateWithName(context, AppRoutes.servicesList, arguments: categoryData);
-                                });
-                              },
-                              itemCount: serviceVM.categories.length,
-                              physics: const NeverScrollableScrollPhysics(),
-                              shrinkWrap: true,
-                              padding: const EdgeInsets.all(20),
-                              separatorBuilder: (BuildContext context, int index) {
-                                return 12.height;
-                              },
-                            ),
-                          ],
+                                navigateWithName(context, AppRoutes.servicesList, arguments: categoryData);
+                              });
+                            },
+                            itemCount: serviceVM.categories.length,
+                            physics: const NeverScrollableScrollPhysics(),
+                            shrinkWrap: true,
+                            padding: const EdgeInsets.all(20),
+                            separatorBuilder: (BuildContext context, int index) {
+                              return 12.height;
+                            },
+                          ),
+                        ],
                         12.height,
                       ],
                     ),

lib/views/branch_management/branch/branch_list_page.dart

@@ -113,7 +113,8 @@ class BranchListPage extends StatelessWidget {
                       return const Center(child: CircularProgressIndicator());
                     } else {
                       List<BranchDetailModel> branches = [];
-                      if (serviceVM.branches!.data != null) {
+                      // Safe null check - don't use ! operator on serviceVM.branches
+                      if (serviceVM.branches?.data?.serviceProviderBranch != null) {
                         if (serviceVM.selectedBranchStatus == 3) {
                           // 3 means active branch
                           branches = serviceVM.branches!.data!.serviceProviderBranch!.where((element) => element.statusId == 3).toList();

lib/views/branch_management/services/create_services_page3.dart

@@ -137,6 +137,9 @@ class _CreateServicesPage3State extends State<CreateServicesPage3> {
 
                                           if (status) {
                                             isServiceActive = value;
+                                            // Navigate back and pass the new service status
+                                            // Utils.showToast(LocaleKeys.serviceStatusUpdated.tr());
+                                            Navigator.pop(context, value ? ServiceStatusEnum.approvedOrActive : ServiceStatusEnum.deactivated);
                                           }
                                           setState(() {});
                                         },

lib/views/branch_management/services/services_list_page.dart

@@ -304,15 +304,24 @@ class _ServicesListPageState extends State<ServicesListPage> {
                                               height: 16,
                                             ),
                                           ).onPress(() async {
-                                            navigateWithName(context, AppRoutes.createServices3,
-                                                arguments: CreateBranchModel(
-                                                  branchId: categoryData.branchId ?? '',
-                                                  branchName: categoryData.branchName ?? '',
-                                                  categoryId: categoryData.id.toString(),
-                                                  categoryName: categoryData.categoryName,
-                                                  serviceProviderService: filteredServices[index],
-                                                  isForEdit: true,
-                                                ));
+                                            final ServiceStatusEnum? newStatus = await Navigator.pushNamed(
+                                              context,
+                                              AppRoutes.createServices3,
+                                              arguments: CreateBranchModel(
+                                                branchId: categoryData.branchId ?? '',
+                                                branchName: categoryData.branchName ?? '',
+                                                categoryId: categoryData.id.toString(),
+                                                categoryName: categoryData.categoryName,
+                                                serviceProviderService: filteredServices[index],
+                                                isForEdit: true,
+                                              ),
+                                            ) as ServiceStatusEnum?;
+
+                                            // If status was updated, switch to that filter and refresh
+                                            if (newStatus != null) {
+                                              selectedService = newStatus;
+                                              await _onRefresh(newStatus);
+                                            }
                                           }),
                                         ]
                                       ],

lib/views/dashboard/dashboard_view.dart

@@ -2,6 +2,7 @@ import 'dart:async';
 import 'dart:developer';
 import 'package:car_provider_app/views/branch_management/branch/branch_list_page.dart';
 import 'package:flutter/material.dart';
+import 'package:mc_common_app/classes/app_state.dart';
 import 'package:mc_common_app/utils/enums.dart';
 import 'package:mc_common_app/view_models/dashboard_view_model_provider.dart';
 import 'package:mc_common_app/views/common_fragments/requests_fragment.dart';
@@ -29,24 +30,42 @@ class _DashboardViewState extends State<DashboardView> {
     log("widget.dashboardRouteEnum: ${widget.dashboardRouteEnum}");
     super.initState();
     dashboardVMProvider = Provider.of<DashboardVMProvider>(context, listen: false);
+
+    // Ensure selected index is valid for individual providers (no Requests tab)
+    if (AppState().userType != UserType.providerDealer && AppState().userType != UserType.dealershipUser) {
+      // For individuals, max index is 3 (Ads), so if selected is 4, set to Home (2)
+      if (dashboardVMProvider.selectedNavbarBarIndex >= 4) {
+        dashboardVMProvider.selectedNavbarBarIndex = 2; // Home
+      }
+    }
+
     scheduleMicrotask(() => dashboardVMProvider.onRefresh(context, dashboardRouteEnum: widget.dashboardRouteEnum));
   }
 
   @override
   Widget build(BuildContext context) {
+    // Build fragments list conditionally based on user type
+    // Individual providers should not have access to Requests
     List<Widget> fragments = [
-      const BranchListPage(),
-      const BranchAppointmentFragment(),
-      const HomeFragment(),
-      const AdsFragment(),
-      const MyRequestsFragment(),
+      const BranchListPage(), // 0
+      const BranchAppointmentFragment(), // 1
+      const HomeFragment(), // 2
+      const AdsFragment(), // 3
+      // Only Dealerships (and dealership staff users) can access Special Requests
+      if (AppState().userType == UserType.providerDealer || AppState().userType == UserType.dealershipUser) const MyRequestsFragment(), // 4 (only for dealerships)
     ];
 
+    // Ensure the selected index is valid for the current fragments list
+    int validIndex = context.watch<DashboardVMProvider>().selectedNavbarBarIndex;
+    if (validIndex >= fragments.length) {
+      validIndex = fragments.length - 1; // Default to last valid fragment
+    }
+
     return PopScope(
       canPop: false,
       child: Scaffold(
         key: _scaffoldKey,
-        body: fragments[context.watch<DashboardVMProvider>().selectedNavbarBarIndex],
+        body: fragments[validIndex],
         bottomNavigationBar: CustomBottomNavbar(
           onSelected: (index) {
             dashboardVMProvider.onNavbarTapped(index);

lib/views/dashboard/fragments/branch_appointment_fragment.dart

@@ -37,7 +37,8 @@ class BranchAppointmentFragment extends StatelessWidget {
                     return const Center(child: CircularProgressIndicator());
                   } else {
                     List<BranchDetailModel> branches = [];
-                    if (serviceVM.branches!.data != null) {
+                    // Safe null check - don't use ! operator
+                    if (serviceVM.branches?.data?.serviceProviderBranch != null) {
                       branches = serviceVM.branches!.data!.serviceProviderBranch!.where((element) => 3 == element.statusId).toList();
                     }
                     return RefreshIndicator(

lib/views/dashboard/fragments/home_fragment.dart

@@ -23,6 +23,7 @@ class HomeFragment extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    context.locale;
     return Scaffold(
       appBar: CustomAppBar(
         isDrawerEnabled: true,

lib/views/dashboard/widget/general_appointment_widget.dart

@@ -100,216 +100,213 @@ class GeneralAppointmentWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Row(
-      mainAxisAlignment: MainAxisAlignment.start,
+    return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        if (isSelectable)
-          SizedBox(
-            child: const SizedBox(
-              width: 14,
-              height: 14,
-            ).toContainer(
-              borderRadius: 24,
-              marginAll: 4,
-              paddingAll: 0,
-              backgroundColor: (appointmentListModel.isSelected ?? false) ? MyColors.primaryColor : MyColors.greyButtonColor,
-            ),
-          ).toContainer(
-            borderRadius: 24,
-            isEnabledBorder: true,
-            paddingAll: 0,
-            borderWidget: 3,
-            borderColor: MyColors.primaryColor,
-          ),
-        if (isSelectable) 12.width,
-        Expanded(
-          child: Column(
-            mainAxisAlignment: MainAxisAlignment.start,
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              if (isNeedToShowMergeStatus)
-                LocaleKeys.merged.tr().toText(color: MyColors.white).toContainer(
-                      padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 3),
-                      borderRadius: 12,
-                      backgroundColor: MyColors.greenColor,
-                    ),
-              Row(
-                mainAxisAlignment: MainAxisAlignment.start,
+        Row(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            if (isSelectable)
+              SizedBox(
+                child: const SizedBox(
+                  width: 14,
+                  height: 14,
+                ).toContainer(
+                  borderRadius: 24,
+                  marginAll: 4,
+                  paddingAll: 0,
+                  backgroundColor: (appointmentListModel.isSelected ?? false) ? MyColors.primaryColor : MyColors.greyButtonColor,
+                ),
+              ).toContainer(
+                borderRadius: 24,
+                isEnabledBorder: true,
+                paddingAll: 0,
+                borderWidget: 3,
+                borderColor: MyColors.primaryColor,
+              ),
+            if (isSelectable) 12.width,
+            Expanded(
+              child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
-                  Expanded(
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      mainAxisAlignment: MainAxisAlignment.start,
-                      children: [
-                        (appointmentListModel.branchName ?? "").toText(
-                          fontSize: 12,
-                          color: MyColors.darkTextColor,
-                          isBold: true,
+                  if (isNeedToShowMergeStatus)
+                    LocaleKeys.merged.tr().toText(color: MyColors.white).toContainer(
+                          padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 3),
+                          borderRadius: 12,
+                          backgroundColor: MyColors.greenColor,
                         ),
-                        (appointmentListModel.customerName ?? "").toText(color: MyColors.black, isBold: true, fontSize: 16),
-                        Row(
+                  Row(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Expanded(
+                        child: Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
                           children: [
-                            "${LocaleKeys.phone.tr()}:".toText(
-                              color: MyColors.lightTextColor,
+                            (appointmentListModel.branchName ?? "").toText(
+                              fontSize: 12,
+                              color: MyColors.darkTextColor,
+                              isBold: true,
                             ),
-                            2.width,
-                            appointmentListModel.customerMobileNum.toString().toText(
-                                  fontSize: 12,
+                            (appointmentListModel.customerName ?? "").toText(color: MyColors.black, isBold: true, fontSize: 16),
+                            Row(
+                              children: [
+                                "${LocaleKeys.phone.tr()}:".toText(
+                                  color: MyColors.lightTextColor,
+                                ),
+                                2.width,
+                                Expanded(
+                                  child: appointmentListModel.customerMobileNum.toString().toText(
+                                    fontSize: 12,
+                                  ),
                                 ),
+                              ],
+                            ),
+                            Row(
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                "${LocaleKeys.time.tr()}:".toText(
+                                  color: MyColors.lightTextColor,
+                                ),
+                                4.width,
+                                Expanded(child: (appointmentListModel.duration ?? "").toText(fontSize: 8))
+                              ],
+                            ),
+
+                            Row(
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                "${LocaleKeys.date.tr()}:".toText(
+                                  color: MyColors.lightTextColor,
+                                ),
+                                4.width,
+                                Expanded(child: appointmentListModel.appointmentDate!.toFormattedDateWithoutTime().toText(fontSize: 8))
+                              ],
+                            ),
+                            Row(
+                              children: [
+                                "${LocaleKeys.delivery.tr()}: ".toText(color: MyColors.lightTextColor),
+                                2.width,
+                                Expanded(
+                                  child: (appointmentListModel.appointmentTypeEnum == AppointmentTypeEnum.home ? LocaleKeys.home.tr() : LocaleKeys.workshop.tr()).toText(
+                                    fontSize: 12,
+                                  ),
+                                ),
+                              ],
+                            ),
+                            Row(
+                              children: [
+                                "${LocaleKeys.createdOn.tr()}: ".toText(color: MyColors.lightTextColor),
+                                2.width,
+                                Expanded(child: appointmentListModel.appointmentCreatedOn!.toFormattedDateWithoutTime().toText(fontSize: 8))
+                              ],
+                            ),
+                            if (isFromUpdateAppointmentPage) ...[
+                              if (appointmentListModel.appointmentAddress != null && appointmentListModel.appointmentAddress!.isNotEmpty) ...[
+                                Row(
+                                  crossAxisAlignment: CrossAxisAlignment.start,
+                                  children: [
+                                    "${LocaleKeys.address.tr()}: ".toText(color: MyColors.lightTextColor),
+                                    2.width,
+                                    Expanded(child: (appointmentListModel.appointmentAddress ?? "").toText(fontSize: 8))
+                                  ],
+                                ),
+                              ],
+                              Row(
+                                children: [
+                                  "${LocaleKeys.paymentType.tr()}: ".toText(color: MyColors.lightTextColor),
+                                  2.width,
+                                  Expanded(child: (appointmentListModel.paymentType ?? "").toText(fontSize: 8)),
+                                ],
+                              ),
+                              LocaleKeys.openMapLocation
+                                  .tr()
+                                  .toText(
+                                    isUnderLine: true,
+                                    color: MyColors.darkPrimaryColor,
+                                    fontSize: 10,
+                                  )
+                                  .onPress(() async {
+                                double latitude, longitude = 0.0;
+                                latitude = double.parse(appointmentListModel.appointmentLatitude!);
+                                longitude = double.parse(appointmentListModel.appointmentLongitude!);
+                                await Utils.openLocationInMaps(latitude: latitude, longitude: longitude);
+                              }),
+                            ]
                           ],
                         ),
-                        Row(
-                          mainAxisAlignment: MainAxisAlignment.start,
-                          crossAxisAlignment: CrossAxisAlignment.start,
-                          children: [
-                            "${LocaleKeys.time.tr()}:".toText(
+                      ),
+                      if (!isNeedTotalPayment)
+                        if (appointmentListModel.customerAppointmentList != null && appointmentListModel.customerAppointmentList!.length > 1)
+                          "${appointmentListModel.customerAppointmentList!.length - 1}+ appts".toText(fontSize: 8).toContainer(
+                                borderRadius: 15,
+                                backgroundColor: MyColors.lightGreyEAColor,
+                                padding: const EdgeInsets.symmetric(
+                                  vertical: 4,
+                                  horizontal: 8,
+                                ),
+                              ),
+                      if (isNeedToShowAppointmentStatus)
+                        (appointmentListModel.appointmentStatusEnum!.getAppointmentNameFromEnum()).toText(color: MyColors.white).toContainer(
+                              padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 3),
+                              borderRadius: 12,
+                              backgroundColor: MyColors.primaryColor,
+                            ),
+                    ],
+                  ),
+                ],
+              ),
+            ),
+          ],
+        ),
+        8.height,
+        Row(
+          crossAxisAlignment: CrossAxisAlignment.end,
+          children: [
+            Expanded(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  ...buildServicesFromAppointment(appointmentListModel: appointmentListModel),
+                  if (isNeedTotalPayment)
+                    Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        18.height,
+                        LocaleKeys.totalAmount.tr().toText(
+                              fontSize: 12,
                               color: MyColors.lightTextColor,
                             ),
-                            4.width,
-                            Flexible(child: (appointmentListModel.duration ?? "").toText(fontSize: 8))
-                          ],
-                        ),
                         Row(
                           mainAxisAlignment: MainAxisAlignment.start,
-                          crossAxisAlignment: CrossAxisAlignment.start,
+                          crossAxisAlignment: CrossAxisAlignment.end,
                           children: [
-                            "${LocaleKeys.date.tr()}:".toText(
-                              color: MyColors.lightTextColor,
-                            ),
-                            4.width,
-                            Flexible(child: appointmentListModel.appointmentDate!.toFormattedDateWithoutTime().toText(fontSize: 8))
+                            appointmentListModel.totalAmount.toString().toText(fontSize: 16, isBold: true),
+                            2.width,
+                            LocaleKeys.sar.tr().toText(color: MyColors.lightTextColor),
                           ],
                         ),
-                        Row(
-                          children: [
-                            "${LocaleKeys.serviceDeliveryType.tr()}: ".toText(color: MyColors.lightTextColor),
-                            2.width,
-                            (appointmentListModel.appointmentTypeEnum == AppointmentTypeEnum.home ? LocaleKeys.home.tr() : LocaleKeys.workshop.tr()).toText(
+                        2.height,
+                        LocaleKeys.remainingAmount.tr().toText(
                               fontSize: 12,
+                              color: MyColors.lightTextColor,
                             ),
-                          ],
-                        ),
                         Row(
+                          mainAxisAlignment: MainAxisAlignment.start,
+                          crossAxisAlignment: CrossAxisAlignment.end,
                           children: [
-                            "${LocaleKeys.createdOn.tr()}: ".toText(color: MyColors.lightTextColor),
+                            appointmentListModel.remainingAmount.toString().toText(fontSize: 16, isBold: true),
                             2.width,
-                            Flexible(child: appointmentListModel.appointmentCreatedOn!.toFormattedDateWithoutTime().toText(fontSize: 8))
-                          ],
-                        ),
-                        if (isFromUpdateAppointmentPage) ...[
-                          if (appointmentListModel.appointmentAddress != null && appointmentListModel.appointmentAddress!.isNotEmpty) ...[
-                            Row(
-                              children: [
-                                "${LocaleKeys.address.tr()}: ".toText(color: MyColors.lightTextColor),
-                                2.width,
-                                Flexible(child: (appointmentListModel.appointmentAddress ?? "").toText(fontSize: 8))
-                              ],
-                            ),
+                            LocaleKeys.sar.tr().toText(color: MyColors.lightTextColor),
                           ],
-                          Row(
-                            children: [
-                              "${LocaleKeys.paymentType.tr()}: ".toText(color: MyColors.lightTextColor),
-                              2.width,
-                              (appointmentListModel.paymentType ?? "").toText(fontSize: 8),
-                            ],
-                          ),
-                          LocaleKeys.openMapLocation
-                              .tr()
-                              .toText(
-                                isUnderLine: true,
-                                color: MyColors.darkPrimaryColor,
-                                fontSize: 10,
-                              )
-                              .onPress(() async {
-                            double latitude, longitude = 0.0;
-                            latitude = double.parse(appointmentListModel.appointmentLatitude!);
-                            longitude = double.parse(appointmentListModel.appointmentLongitude!);
-                            await Utils.openLocationInMaps(latitude: latitude, longitude: longitude);
-                          }),
-                        ]
-                      ],
-                    ),
-                  ),
-                  if (!isNeedTotalPayment)
-                    if (appointmentListModel.customerAppointmentList != null && appointmentListModel.customerAppointmentList!.length > 1)
-                      "${appointmentListModel.customerAppointmentList!.length - 1}+ Appointments".toText(fontSize: 8).toContainer(
-                            borderRadius: 15,
-                            backgroundColor: MyColors.lightGreyEAColor,
-                            padding: const EdgeInsets.symmetric(
-                              vertical: 6,
-                              horizontal: 12,
-                            ),
-                          ),
-                  if (isNeedToShowAppointmentStatus)
-                    (appointmentListModel.appointmentStatusEnum!.getAppointmentNameFromEnum()).toText(color: MyColors.white).toContainer(
-                          padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 3),
-                          borderRadius: 12,
-                          backgroundColor: MyColors.primaryColor,
                         ),
-                ],
-              ),
-              8.height,
-              Row(
-                crossAxisAlignment: CrossAxisAlignment.end,
-                children: [
-                  Expanded(
-                    child: Column(
-                      children: [
-                        ...buildServicesFromAppointment(appointmentListModel: appointmentListModel),
-                        if (isNeedTotalPayment)
-                          Column(
-                            children: [
-                              Column(
-                                crossAxisAlignment: CrossAxisAlignment.start,
-                                children: [
-                                  18.height,
-                                  LocaleKeys.totalAmount.tr().toText(
-                                        fontSize: 12,
-                                        color: MyColors.lightTextColor,
-                                      ),
-                                  Row(
-                                    mainAxisAlignment: MainAxisAlignment.start,
-                                    crossAxisAlignment: CrossAxisAlignment.end,
-                                    children: [
-                                      appointmentListModel.totalAmount.toString().toText(fontSize: 16, isBold: true),
-                                      2.width,
-                                      LocaleKeys.sar.tr().toText(color: MyColors.lightTextColor),
-                                    ],
-                                  ),
-                                ],
-                              ),
-                              Column(
-                                crossAxisAlignment: CrossAxisAlignment.start,
-                                children: [
-                                  2.height,
-                                  LocaleKeys.remainingAmount.tr().toText(
-                                        fontSize: 12,
-                                        color: MyColors.lightTextColor,
-                                      ),
-                                  Row(
-                                    mainAxisAlignment: MainAxisAlignment.start,
-                                    crossAxisAlignment: CrossAxisAlignment.end,
-                                    children: [
-                                      appointmentListModel.remainingAmount.toString().toText(fontSize: 16, isBold: true),
-                                      2.width,
-                                      LocaleKeys.sar.tr().toText(color: MyColors.lightTextColor),
-                                    ],
-                                  ),
-                                ],
-                              ),
-                            ],
-                          )
                       ],
-                    ),
-                  ),
-                  if (!isNeedToShowItems) const Icon(Icons.arrow_forward),
+                    )
                 ],
               ),
-            ],
-          ),
-        )
+            ),
+            if (!isNeedToShowItems) const Icon(Icons.arrow_forward),
+          ],
+        ),
       ],
     ).toWhiteContainer(width: double.infinity, allPading: 12, onTap: onTap);
   }
@@ -361,3 +358,94 @@ class GeneralAppointmentWidget extends StatelessWidget {
     );
   }
 }
+
+
+
+
+//  https://ms.hmg.com/api/ServiceProviders/ServiceProviderBranchDetail_Get?ID=1061&ServiceCategoryIDs=4
+
+  // {ID: 1061, ServiceCategoryIDs: [4]}
+  // {
+//    "messageStatus": 1,
+//    "totalItemsCount": 1,
+//    "data": [
+//      {
+//        "id": 1061,
+//        "serviceProviderID": 14,
+//        "serviceProviderName": "James Bond",
+//        "branchName": "Sawaidi Branch",
+//        "branchDescription": "This is Swaidi Branch",
+//        "cityID": 1,
+//        "cityName": "Riyadh",
+//        "address": "Riyadh, KSA",
+//        "latitude": "37.541014800226456",
+//        "longitude": "-122.36278831958771",
+//        "distanceKM": 12811.22,
+//        "openTime": "12:00",
+//        "closeTime": "22:45",
+//        "branchStatus": 3,
+//        "branchStatusText": "ApprovedOrActive",
+//        "branchRateAvg": 0.0,
+//        "serviceProviderServices": [
+//          {
+//            "serviceProviderServiceID": 1212,
+//            "providerServiceDescription": null,
+//            "categoryID": 4,
+//            "categoryName": "Care and Protection",
+//            "serviceID": 16,
+//            "serviceDescription": "film body protection",
+//            "serviceDescriptionN": "فلم حماية الدهان",
+//            "serviceStatus": 1,
+//            "statusText": null,
+//            "isAllowAppointment": true,
+//            "isAllowAppointmentHome": true,
+//            "customerLocationRange": 10,
+//            "rangePricePerKm": 15.0,
+//            "itemsCount": 1
+//          }
+//        ],
+//        "serviceProviderBranchImage": [
+//          {
+//            "id": 136,
+//            "imageName": "image_picker_929CDE1A-800C-4EFE-AC48-7060BB338D77-69034-00003ADB833C597D.jpg",
+//            "imageUrl": "https://ms.hmg.com/api/serviceProviders/ServiceProviderBranchImage?imageName=61aa8beb-99b0-4876-b47a-08dce8674a2c_50243415.png&sp=Provider_14&serviceProviderBranch=ServiceProviderBranch_1061",
+//            "imageStr": null,
+//            "serviceProviderBranchID": 1061,
+//            "serviceProviderBranch": null,
+//            "isActive": true,
+//            "createdBy": 101,
+//            "createdOn": "2024-12-16T14:47:48.6633333",
+//            "modifiedBy": null,
+//            "modifiedOn": null
+//          },
+//          {
+//            "id": 137,
+//            "imageName": "image_picker_EBF6BA32-3E4E-4AAE-BC2C-1B136A1C32B3-69034-00003ADB7C82E00F.jpg",
+//            "imageUrl": "https://ms.hmg.com/api/serviceProviders/ServiceProviderBranchImage?imageName=61aa8beb-99b0-4876-b47a-08dce8674a2c_51856527.png&sp=Provider_14&serviceProviderBranch=ServiceProviderBranch_1061",
+//            "imageStr": null,
+//            "serviceProviderBranchID": 1061,
+//            "serviceProviderBranch": null,
+//            "isActive": true,
+//            "createdBy": 101,
+//            "createdOn": "2024-12-16T14:47:48.6866667",
+//            "modifiedBy": null,
+//            "modifiedOn": null
+//          },
+//          {
+//            "id": 138,
+//            "imageName": "image_picker_168879D6-4707-4D0E-ACDA-0C956BD2AC4A-69034-00003AE6922D39CF.jpg",
+//            "imageUrl": "https://ms.hmg.com/api/serviceProviders/ServiceProviderBranchImage?imageName=61aa8beb-99b0-4876-b47a-08dce8674a2c_61115226.png&sp=Provider_14&serviceProviderBranch=ServiceProviderBranch_1061",
+//            "imageStr": null,
+//            "serviceProviderBranchID": 1061,
+//            "serviceProviderBranch": null,
+//            "isActive": true,
+//            "createdBy": 101,
+//            "createdOn": "2024-12-16T14:47:48.7066667",
+//            "modifiedBy": null,
+//            "modifiedOn": null
+//          }
+//        ]
+//      }
+//    ],
+//    "message": "Success"
+//  }

lib/views/dashboard/widget/my_service_provider.dart

@@ -11,6 +11,7 @@ import 'package:mc_common_app/extensions/string_extensions.dart';
 import 'package:mc_common_app/utils/enums.dart';
 import 'package:mc_common_app/utils/navigator.dart';
 import 'package:mc_common_app/widgets/extensions/extensions_widget.dart';
+import 'package:mc_common_app/widgets/shimmer/home_shimmer_widgets.dart';
 import 'package:provider/provider.dart';
 import 'package:easy_localization/easy_localization.dart';
 
@@ -22,10 +23,10 @@ class ServiceProviderWidget extends StatelessWidget {
     return SizedBox(
       width: double.infinity,
       height: 140,
-      child: Consumer(
+      child: Consumer<ServiceVM>(
         builder: (BuildContext context, ServiceVM serviceVM, Widget? child) {
           if (serviceVM.state == ViewState.busy) {
-            return const Center(child: CircularProgressIndicator());
+            return const HomeBranchesShimmer();
           } else {
             return serviceVM.branches == null || serviceVM.branches!.data == null
                 ? Center(child: LocaleKeys.noBranchFound.tr().toText(fontSize: 16, color: MyColors.lightTextColor))

lib/views/subscriptions/all_subscriptions_page.dart

@@ -74,7 +74,7 @@ class _SubscriptionsPageState extends State<SubscriptionsPage> {
                             subcriptionsVM.tempSubscriptions[index],
                             isSubscribed: subcriptionsVM.tempSubscriptions[index].isSubscribed ?? false,
                             onRenewSubscriptionClick: () async {
-                              GenericRespModel response = await subcriptionsVM.createSubscriptionOrder(subcriptionsVM.tempSubscriptions[index].id ?? 0, true, true);
+                              GenericRespModel response = await subcriptionsVM.createSubscriptionOrder(subscriptionId: subcriptionsVM.tempSubscriptions[index].id ?? 0, isStartNow:  true, isRenew: true);
                               if (response.data != null) {
                                 context.read<PaymentVM>().updateOrderProviderSubscriptionId(id: response.data ?? 0);
                                 navigateWithName(context, AppRoutes.paymentMethodsView, arguments: PaymentTypes.subscription);

lib/views/subscriptions/sheet/downgrade_data_sheet.dart

@@ -1,4 +1,3 @@
-
 import 'package:flutter/material.dart';
 import 'package:mc_common_app/classes/app_state.dart';
 import 'package:mc_common_app/extensions/int_extensions.dart';
@@ -50,7 +49,8 @@ class _DowngradeDataSheetState extends State<DowngradeDataSheet> {
                   isBold: true,
                 ),
                 8.height,
-                "To select this subscription you need to deactivate your branches and users as this package only supports 1 branch and 2 users per branch. You can reactivate these branches later after upgrading the package".toText(
+                "To select this subscription you need to deactivate your branches and users as this package only supports 1 branch and 2 users per branch. You can reactivate these branches later after upgrading the package"
+                    .toText(
                   fontSize: 14,
                   color: MyColors.textColor,
                 ),
@@ -102,14 +102,15 @@ class _DowngradeDataSheetState extends State<DowngradeDataSheet> {
                               onTempContinue: () async {
                                 Utils.showLoading(context);
                                 GenericRespModel response = await model.payForSubscription(
-                                  widget.subscription.id!,
-                                  true,
-                                  false,
-                                  widget.subscription.price.toString(),
+                                  subscriptionId: widget.subscription.id!,
+                                  isStartNow: true,
+                                  isRenew: false,
+                                  amount: widget.subscription.price.toString(),
                                   isDegrade: true,
                                   listOfBranches: listOfBranches,
                                   listOfUsers: listOfUsers,
                                 );
+
                                 Utils.hideLoading(context);
 
                                 if (response.messageStatus == 1) {

lib/views/subscriptions/sheet/upgrade_package_sheet.dart

@@ -81,7 +81,7 @@ class _UpgradePackageSheetState extends State<UpgradePackageSheet> {
               packageItem(
                 LocaleKeys.nowVar.tr(),
                 ("${LocaleKeys.yourSubscriptionUpgradeAffectingFrom.tr()}  ${widget.subscription.dateEnd == null ? DateFormat('d MMMM yyyy', context.locale.toString()).format(DateTime.now()) : DateFormat('d MMMM yyyy', context.locale.toString()).format(DateHelper.parseStringToDate(DateHelper.formatDateT(widget.subscription.dateEnd!)))}"),
-              //  ("${LocaleKeys.yourSubscriptionUpgradeAffectingFrom.tr()}  ${widget.subscription.dateEnd == null ? DateHelper.formatAsDayMonthYear(DateTime.now()) : DateHelper.formatAsDayMonthYear(DateHelper.parseStringToDate(DateHelper.formatDateT(widget.subscription.dateEnd!)))}"),
+                //  ("${LocaleKeys.yourSubscriptionUpgradeAffectingFrom.tr()}  ${widget.subscription.dateEnd == null ? DateHelper.formatAsDayMonthYear(DateTime.now()) : DateHelper.formatAsDayMonthYear(DateHelper.parseStringToDate(DateHelper.formatDateT(widget.subscription.dateEnd!)))}"),
                 double.parse(model.newPrice).toStringAsFixed(2),
                 isNowSelected,
               ).onPress(() {
@@ -95,7 +95,7 @@ class _UpgradePackageSheetState extends State<UpgradePackageSheet> {
                 packageItem(
                   LocaleKeys.upgradeAfterCurrentExpiry.tr(),
                   ("${LocaleKeys.yourSubscriptionUpgradeCurrentSubscriptionAffectingFrom.tr()} ${AppState().getproviderSubscription.first.dateEnd == null ? "" : AppState().getproviderSubscription.first.dateEnd == null ? DateFormat('d MMMM yyyy', context.locale.toString()).format(DateTime.now()) : DateFormat('d MMMM yyyy', context.locale.toString()).format(DateHelper.parseStringToDate(DateHelper.formatDateT(AppState().getproviderSubscription.first.dateEnd!)))}"),
-               //   ("${LocaleKeys.yourSubscriptionUpgradeCurrentSubscriptionAffectingFrom.tr()} ${AppState().getproviderSubscription.first.dateEnd == null ? "" : AppState().getproviderSubscription.first.dateEnd == null ? DateHelper.formatAsDayMonthYear(DateTime.now()) : DateHelper.formatAsDayMonthYear(DateHelper.parseStringToDate(DateHelper.formatDateT(AppState().getproviderSubscription.first.dateEnd!)))}"),
+                  //   ("${LocaleKeys.yourSubscriptionUpgradeCurrentSubscriptionAffectingFrom.tr()} ${AppState().getproviderSubscription.first.dateEnd == null ? "" : AppState().getproviderSubscription.first.dateEnd == null ? DateHelper.formatAsDayMonthYear(DateTime.now()) : DateHelper.formatAsDayMonthYear(DateHelper.parseStringToDate(DateHelper.formatDateT(AppState().getproviderSubscription.first.dateEnd!)))}"),
                   widget.subscription.price.toString(),
                   isNowSelected ? false : true,
                 ).onPress(() {
@@ -112,7 +112,7 @@ class _UpgradePackageSheetState extends State<UpgradePackageSheet> {
                 onPressed: () async {
                   if (widget.isRenew) {
                     Utils.showLoading(context);
-                    GenericRespModel response = await model.createSubscriptionOrder(widget.subscription.id ?? 0, true, true);
+                    GenericRespModel response = await model.createSubscriptionOrder(subscriptionId: widget.subscription.id ?? 0, isStartNow: true, isRenew: true);
                     Utils.hideLoading(context);
                     if (response.data != null) {
                       context.read<PaymentVM>().updateOrderProviderSubscriptionId(id: response.data ?? 0);
@@ -125,7 +125,7 @@ class _UpgradePackageSheetState extends State<UpgradePackageSheet> {
                         paymentType: PaymentTypes.subscription,
                         onTempContinue: () async {
                           Utils.showLoading(context);
-                          GenericRespModel mResponse = await model.payForSubscription(widget.subscription.id!, isNowSelected, false, price);
+                          GenericRespModel mResponse = await model.payForSubscription(subscriptionId: widget.subscription.id!, isStartNow: isNowSelected, isRenew: false, amount: price);
                           Utils.hideLoading(context);
                           if (mResponse.messageStatus == 1) {
                             context.read<PaymentVM>().updateOrderProviderSubscriptionId(id: mResponse.data);