upload, edit postcard image with filter

# Conflicts:
#	android/app/src/main/res/drawable-hdpi/android12splash.png
#	android/app/src/main/res/drawable-mdpi/android12splash.png
#	android/app/src/main/res/drawable-night-hdpi/android12splash.png
#	android/app/src/main/res/drawable-night-mdpi/android12splash.png
#	android/app/src/main/res/drawable-night-xhdpi/android12splash.png
#	android/app/src/main/res/drawable-night-xxhdpi/android12splash.png
#	android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png
#	android/app/src/main/res/drawable-v21/launch_background.xml
#	android/app/src/main/res/drawable-xhdpi/android12splash.png
#	android/app/src/main/res/drawable-xxhdpi/android12splash.png
#	android/app/src/main/res/drawable-xxxhdpi/android12splash.png
#	android/app/src/main/res/drawable/launch_background.xml
#	android/app/src/main/res/values-night-v31/styles.xml
#	android/app/src/main/res/values-v31/styles.xml
#	lib/core/route_constants.dart
#	pubspec.yaml

README.md

@@ -12,7 +12,7 @@ A few resources to get you started if this is your first Flutter project:
 - [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook)
 
 For help getting started with Flutter development, view the
-[online documentation](https://docs.flutter.dev/), which offers tutorials,
+[online documentation](https://docs.flutter.dev/),which offers tutorials,
 samples, guidance on mobile development, and a full API reference.
 
 <h1>Figma Link</h1>

android/app/build.gradle.kts

@@ -21,7 +21,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId = "com.citycards_customer.citycards_customer"
+        applicationId = "com.citycard.customer"
         // You can update the following values to match your application needs.
         // For more information, see: https://flutter.dev/to/review-gradle-config.
         minSdk = flutter.minSdkVersion
@@ -35,10 +35,16 @@ android {
             // TODO: Add your own signing config for the release build.
             // Signing with the debug keys for now, so `flutter run --release` works.
             signingConfig = signingConfigs.getByName("debug")
+            isMinifyEnabled = true
+            isShrinkResources = true
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
         }
     }
 }
 
 flutter {
     source = "../.."
-}
+}

android/app/proguard-rules.pro

@@ -0,0 +1,15 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /usr/local/Cellar/android-sdk/24.3.3/tools/proguard/proguard-android.txt
+
+# Keep Stripe Push Provisioning classes
+-keep class com.stripe.android.pushProvisioning.** { *; }
+-dontwarn com.stripe.android.pushProvisioning.**
+
+# Keep Stripe SDK
+-keep class com.stripe.android.** { *; }
+-dontwarn com.stripe.android.**
+
+# Keep React Native Stripe SDK
+-keep class com.reactnativestripesdk.** { *; }
+-dontwarn com.reactnativestripesdk.**

android/app/src/main/AndroidManifest.xml

@@ -1,15 +1,19 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+
+
 
     <application
-        android:label="citycards_customer"
+        android:label="CityCard Customer"
         android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/launcher_icon">
         <activity
             android:name=".MainActivity"
             android:exported="true"
             android:launchMode="singleTop"
             android:taskAffinity=""
-            android:theme="@style/LaunchTheme"
+            android:theme="@style/NormalTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize">

android/app/src/main/kotlin/com/citycards_customer/citycards_customer/MainActivity.kt

@@ -1,5 +1,5 @@
 package com.citycards_customer.citycards_customer
 
-import io.flutter.embedding.android.FlutterActivity
+import io.flutter.embedding.android.FlutterFragmentActivity
 
-class MainActivity : FlutterActivity()
+class MainActivity : FlutterFragmentActivity()

android/app/src/main/res/drawable-v21/launch_background.xml

@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="?android:colorBackground" />
-
-    <!-- You can insert your own image assets here -->
-    <!-- <item>
-        <bitmap
-            android:gravity="center"
-            android:src="@mipmap/launch_image" />
-    </item> -->
+    <item>
+        <bitmap android:gravity="fill" android:src="@drawable/background"/>
+    </item>
 </layer-list>

android/app/src/main/res/drawable/launch_background.xml

@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@android:color/white" />
-
-    <!-- You can insert your own image assets here -->
-    <!-- <item>
-        <bitmap
-            android:gravity="center"
-            android:src="@mipmap/launch_image" />
-    </item> -->
+    <item>
+        <bitmap android:gravity="fill" android:src="@drawable/background"/>
+    </item>
 </layer-list>

android/app/src/main/res/values-night-v31/styles.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+        <item name="android:windowSplashScreenBackground">#F95F62</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+         
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>

android/app/src/main/res/values-night/styles.xml

@@ -5,6 +5,10 @@
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your

android/app/src/main/res/values-v31/styles.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+        <item name="android:windowSplashScreenBackground">#F95F62</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+         
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>

android/app/src/main/res/values/styles.xml

@@ -2,9 +2,12 @@
 <resources>
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
     <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
-        <!-- Show a splash screen on the activity. Automatically removed when
-             the Flutter engine draws its first frame -->
+        <!-- Use a plain background instead of a splash drawable -->
         <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your

devtools_options.yaml

@@ -0,0 +1,3 @@
+description: This file stores settings for Dart & Flutter DevTools.
+documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
+extensions:

flutter_launcher_icons.yaml

@@ -0,0 +1,19 @@
+# flutter pub run flutter_launcher_icons
+flutter_launcher_icons:
+  image_path: "assets/logo/logo_city_cards.png"
+
+  android: "launcher_icon"
+  # image_path_android: "assets/icon/icon.png"
+  min_sdk_android: 21 # android min sdk min:16, default 21
+  # adaptive_icon_background: "assets/icon/background.png"
+  # adaptive_icon_foreground: "assets/icon/foreground.png"
+  # adaptive_icon_foreground_inset: 16
+  # adaptive_icon_monochrome: "assets/icon/monochrome.png"
+
+  ios: true
+  # image_path_ios: "assets/icon/icon.png"
+  remove_alpha_ios: true
+  # image_path_ios_dark_transparent: "assets/icon/icon_dark.png"
+  # image_path_ios_tinted_grayscale: "assets/icon/icon_tinted.png"
+  # desaturate_tinted_to_grayscale_ios: true
+  # background_color_ios: "#ffffff"

ios/Podfile

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '13.0'
+platform :ios, '16.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

ios/Podfile.lock

@@ -0,0 +1,99 @@
+PODS:
+  - Flutter (1.0.0)
+  - flutter_angle (0.3.8):
+    - Flutter
+    - FlutterAngle (~> 0.0.8)
+    - FlutterMacOS
+  - flutter_native_splash (2.4.3):
+    - Flutter
+  - FlutterAngle (0.0.8)
+  - geolocator_apple (1.2.0):
+    - Flutter
+    - FlutterMacOS
+  - Google-Maps-iOS-Utils (6.1.0):
+    - GoogleMaps (~> 9.0)
+  - google_maps_flutter_ios (0.0.1):
+    - Flutter
+    - Google-Maps-iOS-Utils (< 7.0, >= 5.0)
+    - GoogleMaps (< 10.0, >= 8.4)
+  - GoogleMaps (9.4.0):
+    - GoogleMaps/Maps (= 9.4.0)
+  - GoogleMaps/Maps (9.4.0)
+  - image_picker_ios (0.0.1):
+    - Flutter
+  - package_info_plus (0.4.5):
+    - Flutter
+  - path_provider_foundation (0.0.1):
+    - Flutter
+    - FlutterMacOS
+  - shared_preferences_foundation (0.0.1):
+    - Flutter
+    - FlutterMacOS
+  - three_js_sensors (0.1.2):
+    - Flutter
+  - video_player_avfoundation (0.0.1):
+    - Flutter
+    - FlutterMacOS
+
+DEPENDENCIES:
+  - Flutter (from `Flutter`)
+  - flutter_angle (from `.symlinks/plugins/flutter_angle/darwin`)
+  - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
+  - geolocator_apple (from `.symlinks/plugins/geolocator_apple/darwin`)
+  - google_maps_flutter_ios (from `.symlinks/plugins/google_maps_flutter_ios/ios`)
+  - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
+  - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
+  - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
+  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
+  - three_js_sensors (from `.symlinks/plugins/three_js_sensors/ios`)
+  - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/darwin`)
+
+SPEC REPOS:
+  trunk:
+    - FlutterAngle
+    - Google-Maps-iOS-Utils
+    - GoogleMaps
+
+EXTERNAL SOURCES:
+  Flutter:
+    :path: Flutter
+  flutter_angle:
+    :path: ".symlinks/plugins/flutter_angle/darwin"
+  flutter_native_splash:
+    :path: ".symlinks/plugins/flutter_native_splash/ios"
+  geolocator_apple:
+    :path: ".symlinks/plugins/geolocator_apple/darwin"
+  google_maps_flutter_ios:
+    :path: ".symlinks/plugins/google_maps_flutter_ios/ios"
+  image_picker_ios:
+    :path: ".symlinks/plugins/image_picker_ios/ios"
+  package_info_plus:
+    :path: ".symlinks/plugins/package_info_plus/ios"
+  path_provider_foundation:
+    :path: ".symlinks/plugins/path_provider_foundation/darwin"
+  shared_preferences_foundation:
+    :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
+  three_js_sensors:
+    :path: ".symlinks/plugins/three_js_sensors/ios"
+  video_player_avfoundation:
+    :path: ".symlinks/plugins/video_player_avfoundation/darwin"
+
+SPEC CHECKSUMS:
+  Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
+  flutter_angle: 7b1a2b3e733221bf2e0325e42fc3edf95b5d44c4
+  flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf
+  FlutterAngle: c810891af800750361b1d0e7cc944f2338d5ae18
+  geolocator_apple: ab36aa0e8b7d7a2d7639b3b4e48308394e8cef5e
+  Google-Maps-iOS-Utils: 0a484b05ed21d88c9f9ebbacb007956edd508a96
+  google_maps_flutter_ios: 0291eb2aa252298a769b04d075e4a9d747ff7264
+  GoogleMaps: 0608099d4870cac8754bdba9b6953db543432438
+  image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a
+  package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
+  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
+  shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb
+  three_js_sensors: f516b092803411e05b1e3dc7625efa36acd8f455
+  video_player_avfoundation: dd410b52df6d2466a42d28550e33e4146928280a
+
+PODFILE CHECKSUM: 1857a7cdb7dfafe45f2b0e9a9af44644190f7506
+
+COCOAPODS: 1.16.2

ios/Runner.xcodeproj/project.pbxproj

@@ -7,10 +7,12 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		00C1AB7B0C8F1922F3F1AE65 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 54C8901E9D1856D980DFFE46 /* Pods_Runner.framework */; };
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
 		331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
+		81D638B66EB4658C8192CA0D /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 445696AB37183A7C63CB7E98 /* Pods_RunnerTests.framework */; };
 		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 */; };
@@ -45,6 +47,10 @@
 		331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
 		331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
+		445696AB37183A7C63CB7E98 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		4FD33ADDA221C4BBA29FA3D6 /* 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>"; };
+		54C8901E9D1856D980DFFE46 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		626B072D1717B50A277DA3C7 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
 		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>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
@@ -55,6 +61,10 @@
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		B691822B373AD22ECA93B798 /* 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>"; };
+		C1FCB3EF88270ED76DFA3FBD /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
+		D56ABB8F306EF9F6809C0C1E /* 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>"; };
+		E2E6DC2B6718F55E3BF165E7 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -62,6 +72,15 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				00C1AB7B0C8F1922F3F1AE65 /* Pods_Runner.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		CF8A29BE993C0C902CB143AF /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				81D638B66EB4658C8192CA0D /* Pods_RunnerTests.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -76,6 +95,28 @@
 			path = RunnerTests;
 			sourceTree = "<group>";
 		};
+		5D45FB84C63476582408C414 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				54C8901E9D1856D980DFFE46 /* Pods_Runner.framework */,
+				445696AB37183A7C63CB7E98 /* Pods_RunnerTests.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		6D4A73F1E55857ADBD000C6A /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				B691822B373AD22ECA93B798 /* Pods-Runner.debug.xcconfig */,
+				4FD33ADDA221C4BBA29FA3D6 /* Pods-Runner.release.xcconfig */,
+				D56ABB8F306EF9F6809C0C1E /* Pods-Runner.profile.xcconfig */,
+				E2E6DC2B6718F55E3BF165E7 /* Pods-RunnerTests.debug.xcconfig */,
+				626B072D1717B50A277DA3C7 /* Pods-RunnerTests.release.xcconfig */,
+				C1FCB3EF88270ED76DFA3FBD /* Pods-RunnerTests.profile.xcconfig */,
+			);
+			path = Pods;
+			sourceTree = "<group>";
+		};
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
@@ -94,6 +135,8 @@
 				97C146F01CF9000F007C117D /* Runner */,
 				97C146EF1CF9000F007C117D /* Products */,
 				331C8082294A63A400263BE5 /* RunnerTests */,
+				6D4A73F1E55857ADBD000C6A /* Pods */,
+				5D45FB84C63476582408C414 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -128,8 +171,10 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
 			buildPhases = (
+				BC66FA7BADCD3982DC87655E /* [CP] Check Pods Manifest.lock */,
 				331C807D294A63A400263BE5 /* Sources */,
 				331C807F294A63A400263BE5 /* Resources */,
+				CF8A29BE993C0C902CB143AF /* Frameworks */,
 			);
 			buildRules = (
 			);
@@ -145,12 +190,15 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
+				3825EC0F330C0B58EA2A8981 /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
+				41FC0A605EBADE26C841287E /* [CP] Embed Pods Frameworks */,
+				D10E98BB568B7005161E1ABD /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -222,6 +270,28 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
+		3825EC0F330C0B58EA2A8981 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@@ -238,6 +308,23 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
+		41FC0A605EBADE26C841287E /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@@ -253,6 +340,45 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
 		};
+		BC66FA7BADCD3982DC87655E /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
+		D10E98BB568B7005161E1ABD /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -361,24 +487,35 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = A89AY6VY4F;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = "CityCard Customer";
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.citycardscustomer.citycardsCustomer;
+				PRODUCT_BUNDLE_IDENTIFIER = com.citycard.customer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = 1;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Profile;
 		};
 		331C8088294A63A400263BE5 /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = E2E6DC2B6718F55E3BF165E7 /* Pods-RunnerTests.debug.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
@@ -396,6 +533,7 @@
 		};
 		331C8089294A63A400263BE5 /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 626B072D1717B50A277DA3C7 /* Pods-RunnerTests.release.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
@@ -411,6 +549,7 @@
 		};
 		331C808A294A63A400263BE5 /* Profile */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = C1FCB3EF88270ED76DFA3FBD /* Pods-RunnerTests.profile.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
@@ -428,7 +567,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -475,7 +614,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
-				ONLY_ACTIVE_ARCH = YES;
+				ONLY_ACTIVE_ARCH = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -485,7 +624,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -526,6 +665,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
+				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -541,19 +681,29 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = A89AY6VY4F;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = "CityCard Customer";
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.citycardscustomer.citycardsCustomer;
+				PRODUCT_BUNDLE_IDENTIFIER = com.citycard.customer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = 1;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Debug;
@@ -564,18 +714,28 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = A89AY6VY4F;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = "CityCard Customer";
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.citycardscustomer.citycardsCustomer;
+				PRODUCT_BUNDLE_IDENTIFIER = com.citycard.customer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = 1;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Release;

ios/Runner.xcworkspace/contents.xcworkspacedata

@@ -4,4 +4,7 @@
    <FileRef
       location = "group:Runner.xcodeproj">
    </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
 </Workspace>

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

@@ -1,122 +1 @@
-{
-  "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" : "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" : "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":[{"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"}}

ios/Runner/Assets.xcassets/LaunchBackground.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "background.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json

@@ -1,23 +1,23 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
       "filename" : "LaunchImage.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "LaunchImage@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
       "filename" : "LaunchImage@3x.png",
+      "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
 }

ios/Runner/Base.lproj/LaunchScreen.storyboard

@@ -16,13 +16,19 @@
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4">
-                            </imageView>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" image="LaunchBackground" translatesAutoresizingMaskIntoConstraints="NO" id="tWc-Dq-wcI"/>
+                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4"></imageView>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="1a2-6s-vTC"/>
-                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="4X2-HB-R7a"/>
+                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="3T2-ad-Qdv"/>
+                            <constraint firstItem="tWc-Dq-wcI" firstAttribute="bottom" secondItem="Ze5-6b-2t3" secondAttribute="bottom" id="RPx-PI-7Xg"/>
+                            <constraint firstItem="tWc-Dq-wcI" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="SdS-ul-q2q"/>
+                            <constraint firstAttribute="trailing" secondItem="tWc-Dq-wcI" secondAttribute="trailing" id="Swv-Gf-Rwn"/>
+                            <constraint firstAttribute="trailing" secondItem="YRO-k0-Ey4" secondAttribute="trailing" id="TQA-XW-tRk"/>
+                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="bottom" secondItem="Ze5-6b-2t3" secondAttribute="bottom" id="duK-uY-Gun"/>
+                            <constraint firstItem="tWc-Dq-wcI" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="kV7-tw-vXt"/>
+                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="xPn-NY-SIU"/>
                         </constraints>
                     </view>
                 </viewController>
@@ -33,5 +39,6 @@
     </scenes>
     <resources>
         <image name="LaunchImage" width="168" height="185"/>
+        <image name="LaunchBackground" width="1" height="1"/>
     </resources>
 </document>

ios/Runner/Info.plist

@@ -1,49 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleDisplayName</key>
-	<string>Citycards Customer</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>citycards_customer</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>$(FLUTTER_BUILD_NAME)</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>$(FLUTTER_BUILD_NUMBER)</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIMainStoryboardFile</key>
-	<string>Main</string>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>CADisableMinimumFrameDurationOnPhone</key>
-	<true/>
-	<key>UIApplicationSupportsIndirectInputEvents</key>
-	<true/>
-</dict>
+	<dict>
+		<key>CADisableMinimumFrameDurationOnPhone</key>
+		<true/>
+		<key>CFBundleDevelopmentRegion</key>
+		<string>$(DEVELOPMENT_LANGUAGE)</string>
+		<key>CFBundleDisplayName</key>
+		<string>Citycards Customer</string>
+		<key>CFBundleExecutable</key>
+		<string>$(EXECUTABLE_NAME)</string>
+		<key>CFBundleIdentifier</key>
+		<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+		<key>CFBundleInfoDictionaryVersion</key>
+		<string>6.0</string>
+		<key>CFBundleName</key>
+		<string>citycards_customer</string>
+		<key>CFBundlePackageType</key>
+		<string>APPL</string>
+		<key>CFBundleShortVersionString</key>
+		<string>1.0.0</string>
+		<key>CFBundleSignature</key>
+		<string>????</string>
+		<key>CFBundleVersion</key>
+		<string>3</string>
+		<key>LSRequiresIPhoneOS</key>
+		<true/>
+		<key>NSCameraUsageDescription</key>
+		<string>We need access to your camera for taking photos for profile and to build a postcard.</string>
+		<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+		<string>Citycard customer needs your location to find the closest place you can visit.</string>
+		<key>NSLocationWhenInUseUsageDescription</key>
+		<string>Citycard customer needs your location to find the closest place you can visit.</string>
+		<key>NSPhotoLibraryUsageDescription</key>
+		<string>We need access to your camera for taking photos for profile and to build a postcard.</string>
+		<key>UIApplicationSupportsIndirectInputEvents</key>
+		<true/>
+		<key>UILaunchStoryboardName</key>
+		<string>LaunchScreen</string>
+		<key>UIMainStoryboardFile</key>
+		<string>Main</string>
+		<key>UIStatusBarHidden</key>
+		<false/>
+		<key>UISupportedInterfaceOrientations</key>
+		<array>
+			<string>UIInterfaceOrientationPortrait</string>
+			<string>UIInterfaceOrientationLandscapeLeft</string>
+			<string>UIInterfaceOrientationLandscapeRight</string>
+		</array>
+		<key>UISupportedInterfaceOrientations~ipad</key>
+		<array>
+			<string>UIInterfaceOrientationPortrait</string>
+			<string>UIInterfaceOrientationPortraitUpsideDown</string>
+			<string>UIInterfaceOrientationLandscapeLeft</string>
+			<string>UIInterfaceOrientationLandscapeRight</string>
+		</array>
+	</dict>
 </plist>

lib/StripePayment/bloc/stripe_payment_bloc.dart

@@ -0,0 +1,234 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_stripe/flutter_stripe.dart';
+
+import '../repository/stripe_service.dart';
+import 'stripe_payment_event.dart';
+import 'stripe_payment_state.dart';
+
+class StripePaymentBloc extends Bloc<StripePaymentEvent, StripePaymentState> {
+  final StripeService _stripeService;
+
+  // 🔒 Flag to prevent re-initialization after success
+  bool _paymentCompleted = false;
+
+  StripePaymentBloc({
+    StripeService? stripeService,
+  })  : _stripeService = stripeService ?? StripeService(),
+        super(const StripePaymentInitial()) {
+    on<InitiatePayment>(_onInitiatePayment);
+    on<InitiatePaymentWithClientSecret>(_onInitiatePaymentWithClientSecret);
+    on<CancelPaymentEvent>(_onCancelPayment);
+    on<ResetPaymentState>(_onResetPaymentState);
+    on<RetryPaymentEvent>(_onRetryPayment);
+  }
+
+  Future<void> _onInitiatePayment(
+      InitiatePayment event,
+      Emitter<StripePaymentState> emit,
+      ) async {
+    // 🛑 Prevent re-initialization if payment already completed
+    if (_paymentCompleted) {
+      debugPrint('⚠️ Payment already completed. Ignoring re-initialization.');
+      return;
+    }
+
+    try {
+      emit(const StripePaymentLoading(
+        message: 'Creating payment intent...',
+      ));
+
+      /// Stripe expects smallest currency unit
+      /// USD → cents, INR → paise
+      final int stripeAmount = (event.amount * 100).toInt();
+
+      // 1️⃣ Create PaymentIntent from backend
+      final clientSecret = await _stripeService.createPaymentIntent(
+        amount: stripeAmount,
+        currency: event.currency,
+      );
+
+      emit(const StripePaymentLoading(
+        message: 'Initializing payment sheet...',
+      ));
+
+      // 2️⃣ Init Payment Sheet
+      await Stripe.instance.initPaymentSheet(
+        paymentSheetParameters: SetupPaymentSheetParameters(
+          paymentIntentClientSecret: clientSecret,
+          merchantDisplayName: "CityCards",
+          style: ThemeMode.light,
+        ),
+      );
+
+      emit(const StripePaymentSheetReady());
+
+      emit(const StripePaymentLoading(
+        message: 'Processing payment...',
+      ));
+
+      // 3️⃣ Show Payment Sheet
+      await Stripe.instance.presentPaymentSheet();
+
+      // ✅ SUCCESS - Mark as completed
+      _paymentCompleted = true;
+      emit(const StripePaymentSuccess());
+    } on StripeException catch (e) {
+      _handleStripeException(e, emit);
+    } catch (e) {
+      emit(StripePaymentFailure(
+        error: 'An unexpected error occurred: ${e.toString()}',
+        isRetryable: true,
+      ));
+    }
+  }
+
+  /// Handle payment with clientSecret directly from backend
+  Future<void> _onInitiatePaymentWithClientSecret(
+      InitiatePaymentWithClientSecret event,
+      Emitter<StripePaymentState> emit,
+      ) async {
+    // 🛑 Prevent re-initialization if payment already completed
+    if (_paymentCompleted) {
+      debugPrint('⚠️ Payment already completed. Ignoring re-initialization.');
+      return;
+    }
+
+    try {
+      emit(const StripePaymentLoading(
+        message: 'Initializing payment...',
+      ));
+
+      // 1️⃣ Init Payment Sheet with clientSecret from backend
+      await Stripe.instance.initPaymentSheet(
+        paymentSheetParameters: SetupPaymentSheetParameters(
+          paymentIntentClientSecret: event.clientSecret,
+          merchantDisplayName: "CityCards",
+          style: ThemeMode.light,
+        ),
+      );
+
+      emit(const StripePaymentSheetReady());
+
+      emit(const StripePaymentLoading(
+        message: 'Processing payment...',
+      ));
+
+      // 2️⃣ Show Payment Sheet
+      await Stripe.instance.presentPaymentSheet();
+
+      // ✅ SUCCESS - Mark as completed
+      _paymentCompleted = true;
+      emit(const StripePaymentSuccess());
+    } on StripeException catch (e) {
+      _handleStripeException(e, emit);
+    } catch (e) {
+      emit(StripePaymentFailure(
+        error: 'An unexpected error occurred: ${e.toString()}',
+        isRetryable: true,
+      ));
+    }
+  }
+
+  /// Handle payment cancellation
+  void _onCancelPayment(
+      CancelPaymentEvent event,
+      Emitter<StripePaymentState> emit,
+      ) {
+    // Only emit cancelled if not already completed
+    if (!_paymentCompleted) {
+      emit(const StripePaymentCancelled(
+        message: 'Payment cancelled by user',
+      ));
+    }
+  }
+
+  /// Handle payment retry
+  Future<void> _onRetryPayment(
+      RetryPaymentEvent event,
+      Emitter<StripePaymentState> emit,
+      ) async {
+    // 🔄 Reset completion flag for retry
+    _paymentCompleted = false;
+
+    // Reset state first
+    emit(const StripePaymentInitial());
+
+    // Then initiate payment again
+    add(InitiatePaymentWithClientSecret(
+      clientSecret: event.clientSecret,
+    ));
+  }
+
+  /// Reset payment state back to initial
+  void _onResetPaymentState(
+      ResetPaymentState event,
+      Emitter<StripePaymentState> emit,
+      ) {
+    // 🔄 Reset completion flag
+    _paymentCompleted = false;
+    emit(const StripePaymentInitial());
+  }
+
+  /// Centralized Stripe exception handling
+  void _handleStripeException(
+      StripeException e,
+      Emitter<StripePaymentState> emit,
+      ) {
+    final errorCode = e.error.code;
+    final errorMessage = e.error.localizedMessage ?? 'Payment failed';
+
+    // Handle cancellation separately
+    if (errorCode == FailureCode.Canceled) {
+      emit(StripePaymentCancelled(
+        message: errorMessage,
+      ));
+      return;
+    }
+
+    // Handle different error types
+    switch (errorCode) {
+      case FailureCode.Failed:
+        emit(StripePaymentFailure(
+          error: errorMessage,
+          errorCode: errorCode.toString(),
+          isRetryable: true,
+        ));
+        break;
+
+      case FailureCode.Timeout:
+        emit(const StripePaymentFailure(
+          error: 'Payment timed out. Please try again.',
+          errorCode: 'timeout',
+          isRetryable: true,
+        ));
+        break;
+
+      default:
+        emit(StripePaymentFailure(
+          error: errorMessage,
+          errorCode: errorCode?.toString(),
+          isRetryable: _isRetryableError(errorCode),
+        ));
+    }
+  }
+
+  /// Determine if an error is retryable
+  bool _isRetryableError(FailureCode? errorCode) {
+    if (errorCode == null) return true;
+
+    // Non-retryable errors
+    const nonRetryableErrors = [
+      // Add specific non-retryable error codes here if needed
+    ];
+
+    return !nonRetryableErrors.contains(errorCode);
+  }
+
+  @override
+  Future<void> close() {
+    // Reset flag on bloc disposal
+    _paymentCompleted = false;
+    return super.close();
+  }
+}

lib/StripePayment/bloc/stripe_payment_event.dart

@@ -0,0 +1,55 @@
+import 'package:equatable/equatable.dart';
+
+abstract class StripePaymentEvent extends Equatable {
+  const StripePaymentEvent();
+
+  @override
+  List<Object?> get props => [];
+}
+
+class InitiatePayment extends StripePaymentEvent {
+  final double amount;
+  final String currency;
+
+  const InitiatePayment({
+    required this.amount,
+    required this.currency,
+  });
+
+  @override
+  List<Object?> get props => [amount, currency];
+}
+
+/// Event to initiate payment with clientSecret from backend
+class InitiatePaymentWithClientSecret extends StripePaymentEvent {
+  final String clientSecret;
+
+  const InitiatePaymentWithClientSecret({
+    required this.clientSecret,
+  });
+
+  @override
+  List<Object?> get props => [clientSecret];
+}
+
+/// Event to cancel ongoing payment
+class CancelPaymentEvent extends StripePaymentEvent {
+  const CancelPaymentEvent();
+}
+
+/// Event to reset payment state back to initial
+class ResetPaymentState extends StripePaymentEvent {
+  const ResetPaymentState();
+}
+
+/// Event to retry failed payment
+class RetryPaymentEvent extends StripePaymentEvent {
+  final String clientSecret;
+
+  const RetryPaymentEvent({
+    required this.clientSecret,
+  });
+
+  @override
+  List<Object?> get props => [clientSecret];
+}

lib/StripePayment/bloc/stripe_payment_state.dart

@@ -0,0 +1,96 @@
+import 'package:equatable/equatable.dart';
+
+abstract class StripePaymentState extends Equatable {
+  const StripePaymentState();
+
+  @override
+  List<Object?> get props => [];
+}
+
+/// Initial state before any payment action
+class StripePaymentInitial extends StripePaymentState {
+  const StripePaymentInitial();
+}
+
+/// Payment is being processed
+class StripePaymentLoading extends StripePaymentState {
+  final String? message;
+
+  const StripePaymentLoading({
+    this.message,
+  });
+
+  @override
+  List<Object?> get props => [message];
+}
+
+/// Payment sheet is initialized and ready to be presented
+class StripePaymentSheetReady extends StripePaymentState {
+  const StripePaymentSheetReady();
+}
+
+/// Payment was successful
+class StripePaymentSuccess extends StripePaymentState {
+  final String message;
+  final String? paymentIntentId;
+
+  const StripePaymentSuccess({
+    this.message = 'Payment Successful',
+    this.paymentIntentId,
+  });
+
+  @override
+  List<Object?> get props => [message, paymentIntentId];
+}
+
+/// Payment failed
+class StripePaymentFailure extends StripePaymentState {
+  final String error;
+  final String? errorCode;
+  final bool isRetryable;
+
+  const StripePaymentFailure({
+    required this.error,
+    this.errorCode,
+    this.isRetryable = true,
+  });
+
+  @override
+  List<Object?> get props => [error, errorCode, isRetryable];
+}
+
+/// Payment was cancelled by user
+class StripePaymentCancelled extends StripePaymentState {
+  final String message;
+
+  const StripePaymentCancelled({
+    this.message = 'Payment Cancelled',
+  });
+
+  @override
+  List<Object?> get props => [message];
+}
+
+/// Payment requires additional authentication (3D Secure, etc.)
+class StripePaymentRequiresAction extends StripePaymentState {
+  final String message;
+
+  const StripePaymentRequiresAction({
+    this.message = 'Additional authentication required',
+  });
+
+  @override
+  List<Object?> get props => [message];
+}
+
+/// Payment is processing on the backend
+class StripePaymentProcessing extends StripePaymentState {
+  final String message;
+
+  const StripePaymentProcessing({
+    this.message = 'Payment is being processed...',
+  });
+
+  @override
+  List<Object?> get props => [message];
+}

lib/StripePayment/repository/stripe_service.dart

@@ -0,0 +1,97 @@
+import 'package:dio/dio.dart';
+
+class StripeService {
+  final Dio _dio = Dio(
+    BaseOptions(
+      headers: {
+        "Content-Type": "application/json",
+      },
+    ),
+  );
+
+  // ⚠️ TEMPORARY FALLBACK - Use secret key directly
+  // TODO: Remove this and use backend when ready!
+  final String _stripeSecretKey = ''; // ← ADD YOUR SECRET KEY
+
+  Future<String> createPaymentIntent({
+    required int amount,
+    required String currency,
+  }) async {
+    try {
+      // 🔥 DIRECT STRIPE API CALL (Temporary fallback)
+      final response = await _dio.post(
+        'https://api.stripe.com/v1/payment_intents',
+        data: {
+          'amount': amount.toString(),
+          'currency': currency,
+          'automatic_payment_methods[enabled]': 'true',
+        },
+        options: Options(
+          headers: {
+            'Authorization': 'Bearer $_stripeSecretKey',
+            'Content-Type': 'application/x-www-form-urlencoded',
+          },
+          contentType: Headers.formUrlEncodedContentType,
+        ),
+      );
+
+      if (response.data == null || response.data['client_secret'] == null) {
+        throw Exception('Invalid response from Stripe');
+      }
+
+      return response.data['client_secret'];
+    } on DioException catch (e) {
+      if (e.response != null) {
+        print('Stripe API Error: ${e.response?.data}');
+        throw Exception('Stripe error: ${e.response?.data['error']?['message'] ?? e.message}');
+      }
+      throw Exception('Network error: ${e.message}');
+    } catch (e) {
+      print('Payment Intent Error: $e');
+      throw Exception('Failed to create payment intent: $e');
+    }
+  }
+}
+
+/*
+🔒 PRODUCTION VERSION (Use this when backend is ready):
+
+import 'package:citycards_customer/networkApiServices/api_urls.dart';
+import 'package:dio/dio.dart';
+
+class StripeService {
+  final Dio _dio = Dio(
+    BaseOptions(
+      baseUrl: ApiUrls.baseUrl,
+      headers: {
+        "Content-Type": "application/json",
+      },
+    ),
+  );
+
+  Future<String> createPaymentIntent({
+    required int amount,
+    required String currency,
+  }) async {
+    try {
+      final response = await _dio.post(
+        "/create-payment-intent",
+        data: {
+          "amount": amount,
+          "currency": currency,
+        },
+      );
+
+      if (response.data == null || response.data['clientSecret'] == null) {
+        throw Exception('Invalid response from server');
+      }
+
+      return response.data['clientSecret'];
+    } on DioException catch (e) {
+      throw Exception('Network error: ${e.message}');
+    } catch (e) {
+      throw Exception('Failed to create payment intent: $e');
+    }
+  }
+}
+*/

lib/StripePayment/view/stripe_payment.dart

@@ -0,0 +1,475 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+import '../bloc/stripe_payment_bloc.dart';
+import '../bloc/stripe_payment_event.dart';
+import '../bloc/stripe_payment_state.dart';
+import '../repository/stripe_service.dart';
+
+/// 🎯 Reusable Stripe Payment Screen
+///
+/// This widget handles Stripe payment flow and can be used across different features
+/// like postcards, subscriptions, bookings, etc.
+class StripePaymentScreen extends StatelessWidget {
+  /// Client secret from your backend payment intent
+  final String clientSecret;
+
+  /// Amount to display (optional)
+  final double? amount;
+
+  /// Currency symbol (default: \$)
+  final String currencySymbol;
+
+  /// Custom title for the payment screen
+  final String? title;
+
+  /// Custom loading message
+  final String loadingMessage;
+
+  /// Custom success message
+  final String successMessage;
+
+  /// Custom failure message prefix
+  final String failureMessage;
+
+  /// Callback when payment succeeds
+  final VoidCallback? onPaymentSuccess;
+
+  /// Callback when payment fails
+  final void Function(String error)? onPaymentFailure;
+
+  /// Callback when payment is cancelled
+  final VoidCallback? onPaymentCancelled;
+
+  /// Primary color for the UI
+  final Color primaryColor;
+
+  /// Success icon color
+  final Color successColor;
+
+  /// Error icon color
+  final Color errorColor;
+
+  /// Custom height ratio (0.0 to 1.0)
+  final double heightRatio;
+
+  /// Whether to show close button during loading
+  final bool showCloseButtonDuringLoading;
+
+  /// Custom widget to show above the status (optional)
+  final Widget? headerWidget;
+
+  /// Custom widget to show below the status (optional)
+  final Widget? footerWidget;
+
+  const StripePaymentScreen({
+    super.key,
+    required this.clientSecret,
+    this.amount,
+    this.currencySymbol = '\$',
+    this.title,
+    this.loadingMessage = 'Processing payment...',
+    this.successMessage = 'Payment Successful!',
+    this.failureMessage = 'Payment Failed',
+    this.onPaymentSuccess,
+    this.onPaymentFailure,
+    this.onPaymentCancelled,
+    this.primaryColor = const Color(0xFFF95F62),
+    this.successColor = Colors.green,
+    this.errorColor = Colors.red,
+    this.heightRatio = 0.5,
+    this.showCloseButtonDuringLoading = false,
+    this.headerWidget,
+    this.footerWidget,
+  });
+
+  /// 🚀 Static method to show as bottom sheet
+  static Future<bool?> showAsBottomSheet({
+    required BuildContext context,
+    required String clientSecret,
+    double? amount,
+    String currencySymbol = '\$',
+    String? title,
+    String loadingMessage = 'Processing payment...',
+    String successMessage = 'Payment Successful!',
+    String failureMessage = 'Payment Failed',
+    VoidCallback? onPaymentSuccess,
+    void Function(String error)? onPaymentFailure,
+    VoidCallback? onPaymentCancelled,
+    Color primaryColor = const Color(0xFFF95F62),
+    Color successColor = Colors.green,
+    Color errorColor = Colors.red,
+    double heightRatio = 0.5,
+    bool isDismissible = false,
+    bool enableDrag = false,
+    bool showCloseButtonDuringLoading = false,
+    Widget? headerWidget,
+    Widget? footerWidget,
+  }) async {
+    return await showModalBottomSheet<bool>(
+      context: context,
+      isDismissible: isDismissible,
+      enableDrag: enableDrag,
+      isScrollControlled: true,
+      backgroundColor: Colors.transparent,
+      builder: (bottomSheetContext) {
+        return BlocProvider(
+          create: (_) => StripePaymentBloc(stripeService: StripeService())
+            ..add(InitiatePaymentWithClientSecret(clientSecret: clientSecret)),
+          child: StripePaymentScreen(
+            clientSecret: clientSecret,
+            amount: amount,
+            currencySymbol: currencySymbol,
+            title: title,
+            loadingMessage: loadingMessage,
+            successMessage: successMessage,
+            failureMessage: failureMessage,
+            onPaymentSuccess: onPaymentSuccess,
+            onPaymentFailure: onPaymentFailure,
+            onPaymentCancelled: onPaymentCancelled,
+            primaryColor: primaryColor,
+            successColor: successColor,
+            errorColor: errorColor,
+            heightRatio: heightRatio,
+            showCloseButtonDuringLoading: showCloseButtonDuringLoading,
+            headerWidget: headerWidget,
+            footerWidget: footerWidget,
+          ),
+        );
+      },
+    );
+  }
+
+  /// 🚀 Static method to show as full screen dialog
+  static Future<bool?> showAsDialog({
+    required BuildContext context,
+    required String clientSecret,
+    double? amount,
+    String currencySymbol = '\$',
+    String? title,
+    String loadingMessage = 'Processing payment...',
+    String successMessage = 'Payment Successful!',
+    String failureMessage = 'Payment Failed',
+    VoidCallback? onPaymentSuccess,
+    void Function(String error)? onPaymentFailure,
+    VoidCallback? onPaymentCancelled,
+    Color primaryColor = const Color(0xFFF95F62),
+    Color successColor = Colors.green,
+    Color errorColor = Colors.red,
+    bool barrierDismissible = false,
+    bool showCloseButtonDuringLoading = false,
+    Widget? headerWidget,
+    Widget? footerWidget,
+  }) async {
+    return await showDialog<bool>(
+      context: context,
+      barrierDismissible: barrierDismissible,
+      builder: (dialogContext) {
+        return BlocProvider(
+          create: (_) => StripePaymentBloc(stripeService: StripeService())
+            ..add(InitiatePaymentWithClientSecret(clientSecret: clientSecret)),
+          child: Dialog(
+            backgroundColor: Colors.transparent,
+            child: StripePaymentScreen(
+              clientSecret: clientSecret,
+              amount: amount,
+              currencySymbol: currencySymbol,
+              title: title,
+              loadingMessage: loadingMessage,
+              successMessage: successMessage,
+              failureMessage: failureMessage,
+              onPaymentSuccess: onPaymentSuccess,
+              onPaymentFailure: onPaymentFailure,
+              onPaymentCancelled: onPaymentCancelled,
+              primaryColor: primaryColor,
+              successColor: successColor,
+              errorColor: errorColor,
+              heightRatio: 1.0,
+              showCloseButtonDuringLoading: showCloseButtonDuringLoading,
+              headerWidget: headerWidget,
+              footerWidget: footerWidget,
+            ),
+          ),
+        );
+      },
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocConsumer<StripePaymentBloc, StripePaymentState>(
+      // 🔒 CRITICAL: Only listen when state actually changes to prevent duplicate triggers
+      listenWhen: (previous, current) {
+        // Don't re-trigger if both states are the same success state
+        if (previous is StripePaymentSuccess && current is StripePaymentSuccess) {
+          debugPrint('⚠️ Preventing duplicate success listener');
+          return false;
+        }
+        return true;
+      },
+      listener: (context, state) {
+        if (state is StripePaymentSuccess) {
+          debugPrint('✅ Payment Success - Calling callback');
+          // ✅ Call the callback first
+          onPaymentSuccess?.call();
+          // ✅ Then auto-close and return true after 1.5 seconds
+          Future.delayed(const Duration(milliseconds: 1500), () {
+            if (context.mounted) {
+              Navigator.of(context).pop(true);
+            }
+          });
+        } else if (state is StripePaymentFailure) {
+          debugPrint('❌ Payment Failure - ${state.error}');
+          onPaymentFailure?.call(state.error);
+          // Auto-close after 2 seconds on failure
+          Future.delayed(const Duration(seconds: 2), () {
+            if (context.mounted) {
+              Navigator.of(context).pop(false);
+            }
+          });
+        } else if (state is StripePaymentCancelled) {
+          debugPrint('🚫 Payment Cancelled');
+          onPaymentCancelled?.call();
+          Navigator.of(context).pop(false);
+        }
+      },
+      buildWhen: (previous, current) {
+        // 🔒 Prevent unnecessary rebuilds on duplicate success states
+        if (previous is StripePaymentSuccess && current is StripePaymentSuccess) {
+          return false;
+        }
+        return true;
+      },
+      builder: (context, state) {
+        return Container(
+          height: heightRatio == 1.0
+              ? MediaQuery.of(context).size.height
+              : MediaQuery.of(context).size.height * heightRatio,
+          decoration: BoxDecoration(
+            color: Colors.white,
+            borderRadius: heightRatio == 1.0
+                ? null
+                : const BorderRadius.only(
+              topLeft: Radius.circular(20),
+              topRight: Radius.circular(20),
+            ),
+          ),
+          child: Stack(
+            children: [
+              // Main content
+              Center(
+                child: Padding(
+                  padding: const EdgeInsets.all(24.0),
+                  child: Column(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: [
+                      // Custom header widget
+                      if (headerWidget != null) ...[
+                        headerWidget!,
+                        const SizedBox(height: 16),
+                      ],
+
+                      // Title
+                      if (title != null) ...[
+                        Text(
+                          title!,
+                          style: TextStyle(
+                            fontSize: 20.sp,
+                            fontWeight: FontWeight.w600,
+                            color: const Color(0xFF333333),
+                          ),
+                          textAlign: TextAlign.center,
+                        ),
+                        const SizedBox(height: 8),
+                      ],
+
+                      // Amount display
+                      if (amount != null) ...[
+                        Text(
+                          '$currencySymbol${amount!.toStringAsFixed(2)}',
+                          style: TextStyle(
+                            fontSize: 32.sp,
+                            fontWeight: FontWeight.w700,
+                            color: primaryColor,
+                          ),
+                        ),
+                        const SizedBox(height: 24),
+                      ],
+
+                      // Payment status
+                      _buildPaymentStatus(context, state),
+
+                      // Custom footer widget
+                      if (footerWidget != null) ...[
+                        const SizedBox(height: 16),
+                        footerWidget!,
+                      ],
+                    ],
+                  ),
+                ),
+              ),
+
+              // Close button (only show when allowed)
+              if (_shouldShowCloseButton(state))
+                Positioned(
+                  top: 16,
+                  right: 16,
+                  child: IconButton(
+                    onPressed: () {
+                      if (state is StripePaymentLoading) {
+                        // Cancel payment if loading
+                        context
+                            .read<StripePaymentBloc>()
+                            .add(CancelPaymentEvent());
+                      } else {
+                        Navigator.of(context).pop(false);
+                      }
+                    },
+                    icon: Icon(
+                      Icons.close,
+                      color: Colors.grey[600],
+                      size: 24,
+                    ),
+                  ),
+                ),
+            ],
+          ),
+        );
+      },
+    );
+  }
+
+  /// Build payment status widget based on state
+  Widget _buildPaymentStatus(BuildContext context, StripePaymentState state) {
+    if (state is StripePaymentLoading) {
+      return Column(
+        children: [
+          CircularProgressIndicator(
+            strokeWidth: 3,
+            valueColor: AlwaysStoppedAnimation<Color>(primaryColor),
+          ),
+          const SizedBox(height: 24),
+          Text(
+            loadingMessage,
+            style: const TextStyle(
+              fontSize: 16,
+              fontWeight: FontWeight.w500,
+              color: Color(0xFF333333),
+            ),
+            textAlign: TextAlign.center,
+          ),
+        ],
+      );
+    } else if (state is StripePaymentSuccess) {
+      return Column(
+        children: [
+          Icon(
+            Icons.check_circle,
+            color: successColor,
+            size: 64,
+          ),
+          const SizedBox(height: 16),
+          Text(
+            successMessage,
+            style: const TextStyle(
+              fontSize: 18,
+              fontWeight: FontWeight.w600,
+              color: Color(0xFF333333),
+            ),
+            textAlign: TextAlign.center,
+          ),
+        ],
+      );
+    } else if (state is StripePaymentFailure) {
+      return Column(
+        children: [
+          Icon(
+            Icons.error,
+            color: errorColor,
+            size: 64,
+          ),
+          const SizedBox(height: 16),
+          Text(
+            failureMessage,
+            style: const TextStyle(
+              fontSize: 18,
+              fontWeight: FontWeight.w600,
+              color: Color(0xFF333333),
+            ),
+            textAlign: TextAlign.center,
+          ),
+          const SizedBox(height: 8),
+          Text(
+            state.error,
+            textAlign: TextAlign.center,
+            style: TextStyle(
+              fontSize: 14,
+              color: Colors.grey[600],
+            ),
+          ),
+          const SizedBox(height: 24),
+          ElevatedButton(
+            onPressed: () {
+              // Retry payment
+              context.read<StripePaymentBloc>().add(
+                RetryPaymentEvent(
+                  clientSecret: clientSecret,
+                ),
+              );
+            },
+            style: ElevatedButton.styleFrom(
+              backgroundColor: primaryColor,
+              padding: const EdgeInsets.symmetric(
+                horizontal: 32,
+                vertical: 12,
+              ),
+              shape: RoundedRectangleBorder(
+                borderRadius: BorderRadius.circular(8),
+              ),
+            ),
+            child: const Text(
+              'Retry Payment',
+              style: TextStyle(
+                color: Colors.white,
+                fontSize: 14,
+                fontWeight: FontWeight.w600,
+              ),
+            ),
+          ),
+        ],
+      );
+    } else if (state is StripePaymentCancelled) {
+      return Column(
+        children: [
+          Icon(
+            Icons.cancel,
+            color: Colors.orange,
+            size: 64,
+          ),
+          const SizedBox(height: 16),
+          const Text(
+            'Payment Cancelled',
+            style: TextStyle(
+              fontSize: 18,
+              fontWeight: FontWeight.w600,
+              color: Color(0xFF333333),
+            ),
+            textAlign: TextAlign.center,
+          ),
+        ],
+      );
+    }
+
+    return const SizedBox.shrink();
+  }
+
+  /// Determine if close button should be shown
+  bool _shouldShowCloseButton(StripePaymentState state) {
+    if (state is StripePaymentLoading) {
+      return showCloseButtonDuringLoading;
+    }
+    // Show for failure and cancelled states
+    return state is StripePaymentFailure || state is StripePaymentCancelled;
+  }
+}

lib/add_details/add_details_view.dart

@@ -2,183 +2,270 @@ import 'package:citycards_customer/common_packages/app_bar.dart';
 import 'package:citycards_customer/common_packages/custom_filled_button.dart';
 import 'package:citycards_customer/common_packages/custom_text.dart';
 import 'package:citycards_customer/common_packages/custom_textfield.dart';
-import 'package:citycards_customer/core/route_constants.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 
-class AddDetailsView extends StatelessWidget {
-  AddDetailsView({super.key});
+import '../checkout/bloc/pass_purchase_details_bloc.dart';
+import '../checkout/bloc/pass_purchase_details_event.dart';
+import '../checkout/bloc/pass_purchase_details_state.dart';
 
+class AddDetailsView extends StatefulWidget {
+  final int bookingId;
+
+  const AddDetailsView({super.key, required this.bookingId});
+
+  @override
+  State<AddDetailsView> createState() => _AddDetailsViewState();
+}
+
+class _AddDetailsViewState extends State<AddDetailsView> {
   final TextEditingController firstNameController = TextEditingController();
   final TextEditingController lastNameController = TextEditingController();
   final TextEditingController emailController = TextEditingController();
   final TextEditingController phoneController = TextEditingController();
-  final TextEditingController addressController = TextEditingController();
+  final TextEditingController cityController = TextEditingController();
+  String? selectedCountry;
 
   @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      backgroundColor: Colors.white,
-      body: SafeArea(
-        child: Padding(
-          padding: EdgeInsets.symmetric(horizontal: 20.w),
-          child: Column(
-            children: [
-              CommonAppBar(
-                isWhiteLogo: false,
-                isProfilePage: false,
-                showCart: false,
-              ),
-              Row(
-                children: [
-                  GestureDetector(
-                    onTap: () {
-                      Navigator.pop(context);
-                    },
-                    child: Icon(Icons.arrow_back, size: 24.sp),
-                  ),
-                  SizedBox(width: 8.w),
-                  Text(
-                    "Add details",
-                    style: TextStyle(
-                      fontSize: 12.sp,
-                      fontWeight: FontWeight.w500,
-                    ),
-                  ),
-                ],
-              ),
-              SizedBox(height: 42.h),
-              Align(
-                alignment: Alignment.centerLeft,
-                child: CustomText(
-                  text: "Tell us about yourself",
-                  size: 18.sp,
-                  weight: FontWeight.w500,
-                ),
-              ),
-              SizedBox(height: 12.h),
+  void dispose() {
+    firstNameController.dispose();
+    lastNameController.dispose();
+    emailController.dispose();
+    phoneController.dispose();
+    cityController.dispose();
+    super.dispose();
+  }
 
-              Padding(
-                padding: EdgeInsets.symmetric(horizontal: 12.w),
-                child: CustomTextField(
-                  label: "First Name",
-                  hint: "Enter your first name",
-                  controller: firstNameController,
-                ),
-              ),
-              Padding(
-                padding: EdgeInsets.symmetric(horizontal: 12.w),
-                child: CustomTextField(
-                  label: "Last Name",
-                  hint: "Enter your last name",
-                  controller: lastNameController,
-                ),
-              ),
-              Padding(
-                padding: EdgeInsets.symmetric(horizontal: 12.w),
-                child: CustomTextField(
-                  label: "Email",
-                  hint: "Enter your email address",
-                  controller: emailController,
-                ),
-              ),
-              Padding(
-                padding: EdgeInsets.symmetric(horizontal: 12.w),
-                child: CustomTextField(
-                  label: "Phone Number",
-                  hint: "Enter your phone number",
-                  controller: phoneController,
-                ),
-              ),
+  void _handleSubmit(BuildContext context, bool isSubmitting) {
+    // If already submitting, do nothing
+    if (isSubmitting) return;
 
-              Padding(
-                padding: EdgeInsets.symmetric(horizontal: 12.w),
-                child: CustomTextField(
-                  label: "City",
-                  hint: "Enter the name of your city",
-                  controller: phoneController,
-                ),
-              ),
-
-              Padding(
-                padding: EdgeInsets.only(bottom: 12.h, left: 12.w, right: 12.w),
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    CustomText(text: "Country", size: 14.sp),
-                    SizedBox(height: 6.h),
-                    Container(
-                      height: 42.h,
-                      padding: EdgeInsets.symmetric(horizontal: 24.w),
-                      decoration: BoxDecoration(
-                        color: const Color(0xFFFFF5F5),
-                        borderRadius: BorderRadius.circular(8.r),
-                        border: Border.all(
-                          color: const Color(0xBBC83B61).withOpacity(0.4),
-                          width: 0.4.w,
-                        ),
-                      ),
-                      child: DropdownButtonHideUnderline(
-                        child: StatefulBuilder(
-                          builder: (context, setState) {
-                            String? selectedCountry;
-                            return DropdownButton<String>(
-                              value: selectedCountry,
-                              isExpanded: true,
-                              icon: const Icon(
-                                Icons.keyboard_arrow_down,
-                                color: Color(0xFF8E8E8E),
-                              ),
-                              hint: Text(
-                                "Select your country",
-                                style: TextStyle(
-                                  fontSize: 12.sp,
-                                  color: Color(0xFF8E8E8E),
-                                ),
-                              ),
-                              style: TextStyle(
-                                fontSize: 14.sp,
-                                color: const Color(0xFF2D3134),
-                              ),
-                              onChanged: (value) {
-                                setState(() {
-                                  selectedCountry = value;
-                                });
-                              },
-                              items: ["India", "USA", "UK", "Canada"].map((
-                                value,
-                              ) {
-                                return DropdownMenuItem<String>(
-                                  value: value,
-                                  child: Text(
-                                    value,
-                                    style: TextStyle(fontSize: 14.sp),
-                                  ),
-                                );
-                              }).toList(),
-                            );
-                          },
-                        ),
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-
-              const Spacer(),
-
-              CustomFilledButton(
-                onTap: () {
-
-                },
-                label: "Continue",
-                width: double.infinity,
-              ),
-              SizedBox(height: 50.h),
-            ],
-          ),
+    // Validate inputs
+    if (firstNameController.text.isEmpty ||
+        lastNameController.text.isEmpty ||
+        emailController.text.isEmpty ||
+        phoneController.text.isEmpty ||
+        cityController.text.isEmpty ||
+        selectedCountry == null) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(
+          content: Text('Please fill all fields'),
+          backgroundColor: Colors.red,
         ),
+      );
+      return;
+    }
+
+    // Submit gift details
+    context.read<PurchaseDetailsBloc>().add(
+      SubmitUserDetailsEvent(
+        bookingId: widget.bookingId,
+        isForSelf: false,
+        recipientFirstName: firstNameController.text,
+        recipientLastName: lastNameController.text,
+        recipientEmail: emailController.text,
+        recipientPhone: phoneController.text,
+        city: cityController.text,
+        country: selectedCountry!,
       ),
     );
   }
-}
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocProvider(
+      create: (_) => PurchaseDetailsBloc(),
+      child: BlocConsumer<PurchaseDetailsBloc, PurchaseDetailsState>(
+        listener: (context, state) {
+          // Handle API submission success
+          if (state is PurchaseDetailsSubmitted) {
+            // Show success message
+            // ScaffoldMessenger.of(context).showSnackBar(
+            //   const SnackBar(
+            //     content: Text('Gift details submitted successfully!'),
+            //     backgroundColor: Color(0xffF95F62),
+            //   ),
+            // );
+
+            // Navigate back
+            Navigator.of(context).pop('success');
+          }
+
+          // Handle API submission error
+          if (state is PurchaseDetailsError) {
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(
+                content: Text(state.errorMessage ?? 'Failed to submit details'),
+                backgroundColor: Colors.red,
+              ),
+            );
+          }
+        },
+        builder: (context, state) {
+          final isSubmitting = state.isSubmittingDetails;
+
+          return Scaffold(
+            backgroundColor: Colors.white,
+            body: SafeArea(
+              child: SingleChildScrollView(
+                child: Padding(
+                  padding: EdgeInsets.symmetric(horizontal: 20.w),
+                  child: Column(
+                    children: [
+                      CommonAppBar(
+                        isWhiteLogo: false,
+                        isProfilePage: false,
+                        showCart: false,
+                        showDivider: true,
+                      ),
+                      Row(
+                        children: [
+                          GestureDetector(
+                            onTap: () {
+                              Navigator.pop(context);
+                            },
+                            child: Icon(Icons.arrow_back, size: 24.sp),
+                          ),
+                          SizedBox(width: 8.w),
+                          Text(
+                            "Add details",
+                            style: TextStyle(
+                              fontSize: 12.sp,
+                              fontWeight: FontWeight.w500,
+                            ),
+                          ),
+                        ],
+                      ),
+                      SizedBox(height: 42.h),
+                      Align(
+                        alignment: Alignment.centerLeft,
+                        child: CustomText(
+                          text: "Tell us about the recipient",
+                          size: 18.sp,
+                          weight: FontWeight.w500,
+                        ),
+                      ),
+                      SizedBox(height: 12.h),
+
+                      Padding(
+                        padding: EdgeInsets.symmetric(horizontal: 12.w),
+                        child: CustomTextField(
+                          label: "First Name",
+                          hint: "Enter recipient's first name",
+                          controller: firstNameController,
+                        ),
+                      ),
+                      Padding(
+                        padding: EdgeInsets.symmetric(horizontal: 12.w),
+                        child: CustomTextField(
+                          label: "Last Name",
+                          hint: "Enter recipient's last name",
+                          controller: lastNameController,
+                        ),
+                      ),
+                      Padding(
+                        padding: EdgeInsets.symmetric(horizontal: 12.w),
+                        child: CustomTextField(
+                          label: "Email",
+                          hint: "Enter recipient's email address",
+                          controller: emailController,
+                        ),
+                      ),
+                      Padding(
+                        padding: EdgeInsets.symmetric(horizontal: 12.w),
+                        child: CustomTextField(
+                          label: "Phone Number",
+                          hint: "Enter recipient's phone number",
+                          controller: phoneController,
+                        ),
+                      ),
+                      Padding(
+                        padding: EdgeInsets.symmetric(horizontal: 12.w),
+                        child: CustomTextField(
+                          label: "City",
+                          hint: "Enter the name of the city",
+                          controller: cityController,
+                        ),
+                      ),
+
+                      Padding(
+                        padding: EdgeInsets.only(bottom: 12.h, left: 12.w, right: 12.w),
+                        child: Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            CustomText(text: "Country", size: 14.sp),
+                            SizedBox(height: 6.h),
+                            Container(
+                              height: 42.h,
+                              padding: EdgeInsets.symmetric(horizontal: 24.w),
+                              decoration: BoxDecoration(
+                                color: const Color(0xFFFFF5F5),
+                                borderRadius: BorderRadius.circular(8.r),
+                                border: Border.all(
+                                  color: const Color(0xBBC83B61).withOpacity(0.4),
+                                  width: 0.4.w,
+                                ),
+                              ),
+                              child: DropdownButtonHideUnderline(
+                                child: DropdownButton<String>(
+                                  value: selectedCountry,
+                                  isExpanded: true,
+                                  icon: const Icon(
+                                    Icons.keyboard_arrow_down,
+                                    color: Color(0xFF8E8E8E),
+                                  ),
+                                  hint: Text(
+                                    "Select country",
+                                    style: TextStyle(
+                                      fontSize: 12.sp,
+                                      color: const Color(0xFF8E8E8E),
+                                    ),
+                                  ),
+                                  style: TextStyle(
+                                    fontSize: 14.sp,
+                                    color: const Color(0xFF2D3134),
+                                  ),
+                                  onChanged: (value) {
+                                    setState(() {
+                                      selectedCountry = value;
+                                    });
+                                  },
+                                  items: ["Australia"]
+                                      .map((value) {
+                                    return DropdownMenuItem<String>(
+                                      value: value,
+                                      child: Text(
+                                        value,
+                                        style: TextStyle(fontSize: 14.sp),
+                                      ),
+                                    );
+                                  }).toList(),
+                                ),
+                              ),
+                            ),
+                          ],
+                        ),
+                      ),
+
+                      SizedBox(height: 24.h),
+
+                      // Option 1: Pass empty function when disabled (doesn't change button appearance)
+                      CustomFilledButton(
+                        onTap: () => _handleSubmit(context, isSubmitting),
+                        label: isSubmitting ? "Submitting..." : "Continue",
+                        width: double.infinity,
+                      ),
+
+                      SizedBox(height: 50.h),
+                    ],
+                  ),
+                ),
+              ),
+            ),
+          );
+        },
+      ),
+    );
+  }
+}