diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist index 1dc6cf7..391a902 100755 --- a/ios/Flutter/AppFrameworkInfo.plist +++ b/ios/Flutter/AppFrameworkInfo.plist @@ -20,7 +20,5 @@ ???? CFBundleVersion 1.0 - MinimumOSVersion - 13.0 diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 6baab9a..a28512d 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,306 +1,87 @@ PODS: - - connectivity_plus (0.0.1): - - Flutter - - device_info_plus (0.0.1): - - Flutter - - Firebase/Auth (11.15.0): - - Firebase/CoreOnly - - FirebaseAuth (~> 11.15.0) - - Firebase/CoreOnly (11.15.0): - - FirebaseCore (~> 11.15.0) - - Firebase/Messaging (11.15.0): - - Firebase/CoreOnly - - FirebaseMessaging (~> 11.15.0) - - firebase_auth (5.7.0): - - Firebase/Auth (= 11.15.0) - - firebase_core - - Flutter - - firebase_core (3.15.2): - - Firebase/CoreOnly (= 11.15.0) - - Flutter - - firebase_messaging (15.2.10): - - Firebase/Messaging (= 11.15.0) - - firebase_core - - Flutter - - FirebaseAppCheckInterop (11.15.0) - - FirebaseAuth (11.15.0): - - FirebaseAppCheckInterop (~> 11.0) - - FirebaseAuthInterop (~> 11.0) - - FirebaseCore (~> 11.15.0) - - FirebaseCoreExtension (~> 11.15.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - - GoogleUtilities/Environment (~> 8.1) - - GTMSessionFetcher/Core (< 5.0, >= 3.4) - - RecaptchaInterop (~> 101.0) - - FirebaseAuthInterop (11.15.0) - - FirebaseCore (11.15.0): - - FirebaseCoreInternal (~> 11.15.0) - - GoogleUtilities/Environment (~> 8.1) - - GoogleUtilities/Logger (~> 8.1) - - FirebaseCoreExtension (11.15.0): - - FirebaseCore (~> 11.15.0) - - FirebaseCoreInternal (11.15.0): - - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseInstallations (11.15.0): - - FirebaseCore (~> 11.15.0) - - GoogleUtilities/Environment (~> 8.1) - - GoogleUtilities/UserDefaults (~> 8.1) - - PromisesObjC (~> 2.4) - - FirebaseMessaging (11.15.0): - - FirebaseCore (~> 11.15.0) - - FirebaseInstallations (~> 11.0) - - GoogleDataTransport (~> 10.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - - GoogleUtilities/Environment (~> 8.1) - - GoogleUtilities/Reachability (~> 8.1) - - GoogleUtilities/UserDefaults (~> 8.1) - - nanopb (~> 3.30910.0) - Flutter (1.0.0) - flutter_contacts (0.0.1): - Flutter - - flutter_local_notifications (0.0.1): - - Flutter - fluttertoast (0.0.2): - Flutter - - geocoding_ios (1.0.5): - - Flutter - - geolocator_apple (1.2.0): - - Flutter - - FlutterMacOS - Google-Maps-iOS-Utils (5.0.0): - GoogleMaps (~> 8.0) - google_maps_flutter_ios (0.0.1): - Flutter - Google-Maps-iOS-Utils (< 7.0, >= 5.0) - GoogleMaps (< 10.0, >= 8.4) - - GoogleDataTransport (10.1.0): - - nanopb (~> 3.30910.0) - - PromisesObjC (~> 2.4) - GoogleMaps (8.4.0): - GoogleMaps/Maps (= 8.4.0) - GoogleMaps/Base (8.4.0) - GoogleMaps/Maps (8.4.0): - GoogleMaps/Base - - GoogleUtilities/AppDelegateSwizzler (8.1.0): - - GoogleUtilities/Environment - - GoogleUtilities/Logger - - GoogleUtilities/Network - - GoogleUtilities/Privacy - - GoogleUtilities/Environment (8.1.0): - - GoogleUtilities/Privacy - - GoogleUtilities/Logger (8.1.0): - - GoogleUtilities/Environment - - GoogleUtilities/Privacy - - GoogleUtilities/Network (8.1.0): - - GoogleUtilities/Logger - - "GoogleUtilities/NSData+zlib" - - GoogleUtilities/Privacy - - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (8.1.0)": - - GoogleUtilities/Privacy - - GoogleUtilities/Privacy (8.1.0) - - GoogleUtilities/Reachability (8.1.0): - - GoogleUtilities/Logger - - GoogleUtilities/Privacy - - GoogleUtilities/UserDefaults (8.1.0): - - GoogleUtilities/Logger - - GoogleUtilities/Privacy - - GTMSessionFetcher/Core (4.5.0) - - image_picker_ios (0.0.1): - - Flutter - - in_app_review (2.0.0): - - Flutter - location (0.0.1): - Flutter - - mobile_scanner (7.0.0): - - Flutter - - FlutterMacOS - - nanopb (3.30910.0): - - nanopb/decode (= 3.30910.0) - - nanopb/encode (= 3.30910.0) - - nanopb/decode (3.30910.0) - - nanopb/encode (3.30910.0) - package_info_plus (0.4.5): - Flutter - - path_provider_foundation (0.0.1): - - Flutter - - FlutterMacOS - permission_handler_apple (9.3.0): - Flutter - - PromisesObjC (2.4.0) - razorpay-core-pod (1.0.6) - razorpay-pod (1.5.3): - razorpay-core-pod (= 1.0.6) - razorpay_flutter (1.1.10): - Flutter - razorpay-pod - - RecaptchaInterop (101.0.0) - - share_plus (0.0.1): - - Flutter - - shared_preferences_foundation (0.0.1): - - Flutter - - FlutterMacOS - sms_autofill (0.0.1): - Flutter - - sqflite_darwin (0.0.4): - - Flutter - - FlutterMacOS - - url_launcher_ios (0.0.1): - - Flutter - - webview_flutter_wkwebview (0.0.1): - - Flutter - - FlutterMacOS DEPENDENCIES: - - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`) - - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`) - - firebase_auth (from `.symlinks/plugins/firebase_auth/ios`) - - firebase_core (from `.symlinks/plugins/firebase_core/ios`) - - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`) - Flutter (from `Flutter`) - flutter_contacts (from `.symlinks/plugins/flutter_contacts/ios`) - - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`) - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`) - - geocoding_ios (from `.symlinks/plugins/geocoding_ios/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`) - - in_app_review (from `.symlinks/plugins/in_app_review/ios`) - location (from `.symlinks/plugins/location/ios`) - - mobile_scanner (from `.symlinks/plugins/mobile_scanner/darwin`) - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) - - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`) - razorpay_flutter (from `.symlinks/plugins/razorpay_flutter/ios`) - - share_plus (from `.symlinks/plugins/share_plus/ios`) - - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) - sms_autofill (from `.symlinks/plugins/sms_autofill/ios`) - - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`) - - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) - - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/darwin`) SPEC REPOS: trunk: - - Firebase - - FirebaseAppCheckInterop - - FirebaseAuth - - FirebaseAuthInterop - - FirebaseCore - - FirebaseCoreExtension - - FirebaseCoreInternal - - FirebaseInstallations - - FirebaseMessaging - Google-Maps-iOS-Utils - - GoogleDataTransport - GoogleMaps - - GoogleUtilities - - GTMSessionFetcher - - nanopb - - PromisesObjC - razorpay-core-pod - razorpay-pod - - RecaptchaInterop EXTERNAL SOURCES: - connectivity_plus: - :path: ".symlinks/plugins/connectivity_plus/ios" - device_info_plus: - :path: ".symlinks/plugins/device_info_plus/ios" - firebase_auth: - :path: ".symlinks/plugins/firebase_auth/ios" - firebase_core: - :path: ".symlinks/plugins/firebase_core/ios" - firebase_messaging: - :path: ".symlinks/plugins/firebase_messaging/ios" Flutter: :path: Flutter flutter_contacts: :path: ".symlinks/plugins/flutter_contacts/ios" - flutter_local_notifications: - :path: ".symlinks/plugins/flutter_local_notifications/ios" fluttertoast: :path: ".symlinks/plugins/fluttertoast/ios" - geocoding_ios: - :path: ".symlinks/plugins/geocoding_ios/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" - in_app_review: - :path: ".symlinks/plugins/in_app_review/ios" location: :path: ".symlinks/plugins/location/ios" - mobile_scanner: - :path: ".symlinks/plugins/mobile_scanner/darwin" package_info_plus: :path: ".symlinks/plugins/package_info_plus/ios" - path_provider_foundation: - :path: ".symlinks/plugins/path_provider_foundation/darwin" permission_handler_apple: :path: ".symlinks/plugins/permission_handler_apple/ios" razorpay_flutter: :path: ".symlinks/plugins/razorpay_flutter/ios" - share_plus: - :path: ".symlinks/plugins/share_plus/ios" - shared_preferences_foundation: - :path: ".symlinks/plugins/shared_preferences_foundation/darwin" sms_autofill: :path: ".symlinks/plugins/sms_autofill/ios" - sqflite_darwin: - :path: ".symlinks/plugins/sqflite_darwin/darwin" - url_launcher_ios: - :path: ".symlinks/plugins/url_launcher_ios/ios" - webview_flutter_wkwebview: - :path: ".symlinks/plugins/webview_flutter_wkwebview/darwin" SPEC CHECKSUMS: - connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd - device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe - Firebase: d99ac19b909cd2c548339c2241ecd0d1599ab02e - firebase_auth: 50af8366c87bb88c80ebeae62eb60189c7246b9b - firebase_core: 995454a784ff288be5689b796deb9e9fa3601818 - firebase_messaging: f4a41dd102ac18b840eba3f39d67e77922d3f707 - FirebaseAppCheckInterop: 06fe5a3799278ae4667e6c432edd86b1030fa3df - FirebaseAuth: a6575e5fbf46b046c58dc211a28a5fbdd8d4c83b - FirebaseAuthInterop: 7087d7a4ee4bc4de019b2d0c240974ed5d89e2fd - FirebaseCore: efb3893e5b94f32b86e331e3bd6dadf18b66568e - FirebaseCoreExtension: edbd30474b5ccf04e5f001470bdf6ea616af2435 - FirebaseCoreInternal: 9afa45b1159304c963da48addb78275ef701c6b4 - FirebaseInstallations: 317270fec08a5d418fdbc8429282238cab3ac843 - FirebaseMessaging: 3b26e2cee503815e01c3701236b020aa9b576f09 Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467 flutter_contacts: 5383945387e7ca37cf963d4be57c21f2fc15ca9f - flutter_local_notifications: a5a732f069baa862e728d839dd2ebb904737effb fluttertoast: 2c67e14dce98bbdb200df9e1acf610d7a6264ea1 - geocoding_ios: 33776c9ebb98d037b5e025bb0e7537f6dd19646e - geolocator_apple: ab36aa0e8b7d7a2d7639b3b4e48308394e8cef5e Google-Maps-iOS-Utils: 66d6de12be1ce6d3742a54661e7a79cb317a9321 google_maps_flutter_ios: 0291eb2aa252298a769b04d075e4a9d747ff7264 - GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7 GoogleMaps: 8939898920281c649150e0af74aa291c60f2e77d - GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 - GTMSessionFetcher: fc75fc972958dceedee61cb662ae1da7a83a91cf - image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a - in_app_review: 7dd1ea365263f834b8464673f9df72c80c17c937 location: 155caecf9da4f280ab5fe4a55f94ceccfab838f8 - mobile_scanner: 9157936403f5a0644ca3779a38ff8404c5434a93 - nanopb: fad817b59e0457d11a5dfbde799381cd727c1275 package_info_plus: 566e1b7a2f3900e4b0020914ad3fc051dcc95596 - path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564 permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d - PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 razorpay-core-pod: 6da5fb4ed280279d665507fdb50e213d793a5fe2 razorpay-pod: 4385cf844aa29389313b741e20c72fe668970d49 razorpay_flutter: 0e98e4fcaae27ad50e011d85f66d85e0a008754a - RecaptchaInterop: 11e0b637842dfb48308d242afc3f448062325aba - share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a - shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7 sms_autofill: b36b2147535657fea83d7f3898d7831de70bd8e4 - sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0 - url_launcher_ios: 694010445543906933d732453a59da0a173ae33d - webview_flutter_wkwebview: 1821ceac936eba6f7984d89a9f3bcb4dea99ebb2 PODFILE CHECKSUM: a901b0534ebff1a81cfb53fbf723b1bca433de9f diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 4f0ca12..99fdc20 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -13,6 +13,7 @@ 496924C4B012DE93FE3F4ECA /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 415548DB485576CB7FE174F9 /* Pods_Runner.framework */; }; 54D9B915190C58FAD7127809 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F81FF6F2D63FF725573805D7 /* Pods_RunnerTests.framework */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; @@ -52,6 +53,7 @@ 6DEB7185559E0DA885F8BBB2 /* 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 = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = ""; }; 7A48B292DCD250363BDB1844 /* 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 = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; @@ -72,6 +74,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */, 496924C4B012DE93FE3F4ECA /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -98,6 +101,7 @@ 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( + 78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */, 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, 9740EEB21CF90195004384FC /* Debug.xcconfig */, 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, @@ -205,6 +209,9 @@ dependencies = ( ); name = Runner; + packageProductDependencies = ( + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */, + ); productName = Runner; productReference = 97C146EE1CF9000F007C117D /* Runner.app */; productType = "com.apple.product-type.application"; @@ -238,6 +245,9 @@ Base, ); mainGroup = 97C146E51CF9000F007C117D; + packageReferences = ( + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */, + ); productRefGroup = 97C146EF1CF9000F007C117D /* Products */; projectDirPath = ""; projectRoot = ""; @@ -331,14 +341,10 @@ inputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - ); name = "[CP] Copy Pods Resources"; outputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist", ); - outputPaths = ( - ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; @@ -352,14 +358,10 @@ inputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - ); name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); - outputPaths = ( - ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; @@ -751,6 +753,20 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCLocalSwiftPackageReference section */ + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = { + isa = XCLocalSwiftPackageReference; + relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; + }; +/* End XCLocalSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = { + isa = XCSwiftPackageProductDependency; + productName = FlutterGeneratedPluginSwiftPackage; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 97C146E61CF9000F007C117D /* Project object */; } diff --git a/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 0000000..c10c0ef --- /dev/null +++ b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,140 @@ +{ + "pins" : [ + { + "identity" : "abseil-cpp-binary", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/abseil-cpp-binary.git", + "state" : { + "revision" : "bbe8b69694d7873315fd3a4ad41efe043e1c07c5", + "version" : "1.2024072200.0" + } + }, + { + "identity" : "app-check", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/app-check.git", + "state" : { + "revision" : "61b85103a1aeed8218f17c794687781505fbbef5", + "version" : "11.2.0" + } + }, + { + "identity" : "firebase-ios-sdk", + "kind" : "remoteSourceControl", + "location" : "https://github.com/firebase/firebase-ios-sdk", + "state" : { + "revision" : "fdc352fabaf5916e7faa1f96ad02b1957e93e5a5", + "version" : "11.15.0" + } + }, + { + "identity" : "flutterfire", + "kind" : "remoteSourceControl", + "location" : "https://github.com/firebase/flutterfire", + "state" : { + "revision" : "dadb0fd27bc9afe4dee4f23326a4a9ba238258ac", + "version" : "3.15.2-firebase-core-swift" + } + }, + { + "identity" : "google-ads-on-device-conversion-ios-sdk", + "kind" : "remoteSourceControl", + "location" : "https://github.com/googleads/google-ads-on-device-conversion-ios-sdk", + "state" : { + "revision" : "a2d0f1f1666de591eb1a811f40b1706f5c63a2ed", + "version" : "2.3.0" + } + }, + { + "identity" : "googleappmeasurement", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/GoogleAppMeasurement.git", + "state" : { + "revision" : "45ce435e9406d3c674dd249a042b932bee006f60", + "version" : "11.15.0" + } + }, + { + "identity" : "googledatatransport", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/GoogleDataTransport.git", + "state" : { + "revision" : "617af071af9aa1d6a091d59a202910ac482128f9", + "version" : "10.1.0" + } + }, + { + "identity" : "googleutilities", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/GoogleUtilities.git", + "state" : { + "revision" : "60da361632d0de02786f709bdc0c4df340f7613e", + "version" : "8.1.0" + } + }, + { + "identity" : "grpc-binary", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/grpc-binary.git", + "state" : { + "revision" : "75b31c842f664a0f46a2e590a570e370249fd8f6", + "version" : "1.69.1" + } + }, + { + "identity" : "gtm-session-fetcher", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/gtm-session-fetcher.git", + "state" : { + "revision" : "c756a29784521063b6a1202907e2cc47f41b667c", + "version" : "4.5.0" + } + }, + { + "identity" : "interop-ios-for-google-sdks", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/interop-ios-for-google-sdks.git", + "state" : { + "revision" : "040d087ac2267d2ddd4cca36c757d1c6a05fdbfe", + "version" : "101.0.0" + } + }, + { + "identity" : "leveldb", + "kind" : "remoteSourceControl", + "location" : "https://github.com/firebase/leveldb.git", + "state" : { + "revision" : "a0bc79961d7be727d258d33d5a6b2f1023270ba1", + "version" : "1.22.5" + } + }, + { + "identity" : "nanopb", + "kind" : "remoteSourceControl", + "location" : "https://github.com/firebase/nanopb.git", + "state" : { + "revision" : "b7e1104502eca3a213b46303391ca4d3bc8ddec1", + "version" : "2.30910.0" + } + }, + { + "identity" : "promises", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/promises.git", + "state" : { + "revision" : "540318ecedd63d883069ae7f1ed811a2df00b6ac", + "version" : "2.4.0" + } + }, + { + "identity" : "swift-protobuf", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-protobuf.git", + "state" : { + "revision" : "f6506eaa86ed2e01cb0ae14a75035b7fdbf0918f", + "version" : "1.38.0" + } + } + ], + "version" : 2 +} diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index e3773d4..c3fedb2 100644 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -5,6 +5,24 @@ + + + + + + + + + + Bool { - GeneratedPluginRegistrant.register(with: self) return super.application(application, didFinishLaunchingWithOptions: launchOptions) } + + func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) { + GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry) + } } diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index d60b58c..94eb8f0 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -34,6 +34,27 @@ Required for voice-based payment authentication NSPhotoLibraryUsageDescription Required to upload payment screenshots + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneClassName + UIWindowScene + UISceneConfigurationName + flutter + UISceneDelegateClassName + FlutterSceneDelegate + UISceneStoryboardFile + Main + + + + UIApplicationSupportsIndirectInputEvents UILaunchStoryboardName diff --git a/lib/main.dart b/lib/main.dart index ab2ba77..87e2cd8 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,5 +1,7 @@ import 'dart:async'; import 'dart:typed_data'; +import 'dart:io'; + import 'package:alp_animated_splashscreen/alp_animated_splashscreen.dart'; import 'package:firebase_core/firebase_core.dart'; import 'package:firebase_messaging/firebase_messaging.dart'; @@ -8,13 +10,11 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_local_notifications/flutter_local_notifications.dart'; import 'package:get/get.dart'; -import 'package:in_app_update/in_app_update.dart'; import 'package:nearledaily/constants/color_constants.dart'; import 'package:nearledaily/view/authentication/app_update_view.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:webview_flutter/webview_flutter.dart'; import 'package:webview_flutter_android/webview_flutter_android.dart'; - import 'package:package_info_plus/package_info_plus.dart'; import 'package:new_version_plus/new_version_plus.dart'; @@ -33,18 +33,28 @@ import 'service/device_info/device_info.dart'; import 'view/home_view.dart'; import 'view/splash_view/splash_view.dart'; +// ------------------------- +// FIREBASE BACKGROUND HANDLER +// ------------------------- @pragma('vm:entry-point') Future _firebaseMessagingBackgroundHandler(RemoteMessage message) async { - await Firebase.initializeApp(); + await Firebase.initializeApp( + options: DefaultFirebaseOptions.currentPlatform, + ); + + final FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin = + FlutterLocalNotificationsPlugin(); + const AndroidInitializationSettings androidSettings = AndroidInitializationSettings('@mipmap/ic_launcher'); + await flutterLocalNotificationsPlugin.initialize( const InitializationSettings(android: androidSettings), ); final androidPlugin = flutterLocalNotificationsPlugin - .resolvePlatformSpecificImplementation< - AndroidFlutterLocalNotificationsPlugin>(); + .resolvePlatformSpecificImplementation(); + await androidPlugin?.createNotificationChannel( const AndroidNotificationChannel( 'nearle_channel', @@ -57,56 +67,81 @@ Future _firebaseMessagingBackgroundHandler(RemoteMessage message) async { final title = data['title'] as String?; final body = data['body'] as String?; - if (title == null || title.isEmpty) return; - - await flutterLocalNotificationsPlugin.show( - 999, - title, - body?.isNotEmpty == true ? body : null, - NotificationDetails( - android: AndroidNotificationDetails( - 'nearle_channel', - 'Nearle Notifications', - importance: Importance.max, - priority: Priority.high, - fullScreenIntent: true, - playSound: true, - enableVibration: true, - largeIcon: const DrawableResourceAndroidBitmap('nearle_logo.jpeg'), + if (title != null && title.isNotEmpty) { + await flutterLocalNotificationsPlugin.show( + 999, + title, + body?.isNotEmpty == true ? body : null, + NotificationDetails( + android: AndroidNotificationDetails( + 'nearle_channel', + 'Nearle Notifications', + importance: Importance.max, + priority: Priority.high, + fullScreenIntent: true, + playSound: true, + enableVibration: true, + largeIcon: const DrawableResourceAndroidBitmap('nearle_logo.jpeg'), + ), ), - ), - ); + ); + } } +// ------------------------- +// LOCAL NOTIFICATIONS SETUP +// ------------------------- final FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin(); Future _setupLocalNotifications() async { + // Android settings const AndroidInitializationSettings initializationSettingsAndroid = AndroidInitializationSettings('@mipmap/ic_launcher'); - const InitializationSettings initializationSettings = - InitializationSettings(android: initializationSettingsAndroid); - await flutterLocalNotificationsPlugin.initialize(initializationSettings); - const AndroidNotificationChannel channel = AndroidNotificationChannel( - 'nearle_channel', - 'Nearle Notifications', - description: 'High priority notifications', - importance: Importance.max, - playSound: true, - enableVibration: true, + // iOS/macOS settings + const DarwinInitializationSettings initializationSettingsIOS = + DarwinInitializationSettings( + requestSoundPermission: true, + requestBadgePermission: true, + requestAlertPermission: true, ); - await flutterLocalNotificationsPlugin - .resolvePlatformSpecificImplementation< - AndroidFlutterLocalNotificationsPlugin>() - ?.createNotificationChannel(channel); + // Combine all platforms + const InitializationSettings initializationSettings = InitializationSettings( + android: initializationSettingsAndroid, + iOS: initializationSettingsIOS, + macOS: initializationSettingsIOS, + ); + + await flutterLocalNotificationsPlugin.initialize(initializationSettings); + + // Android-only notification channel + if (!kIsWeb && defaultTargetPlatform == TargetPlatform.android) { + const AndroidNotificationChannel channel = AndroidNotificationChannel( + 'nearle_channel', + 'Nearle Notifications', + description: 'High priority notifications', + importance: Importance.max, + playSound: true, + enableVibration: true, + ); + + await flutterLocalNotificationsPlugin + .resolvePlatformSpecificImplementation() + ?.createNotificationChannel(channel); + } } +// ------------------------- +// ROUTE OBSERVER +// ------------------------- final RouteObserver> routeObserver = RouteObserver>(); -// PRINT CURRENT + STORE VERSION (unchanged) +// ------------------------- +// APP VERSION CHECK +// ------------------------- Future _printAndCheckAppVersions() async { try { final PackageInfo packageInfo = await PackageInfo.fromPlatform(); @@ -124,10 +159,7 @@ Future _printAndCheckAppVersions() async { await prefs.setString('currentAppVersion', currentVersion); if (defaultTargetPlatform == TargetPlatform.android) { - final newVersion = NewVersionPlus( - androidId: "com.nearle.gear", - ); - + final newVersion = NewVersionPlus(androidId: "com.nearle.gear"); final status = await newVersion.getVersionStatus(); if (status != null) { print("PLAY STORE VERSION: ${status.storeVersion}"); @@ -147,7 +179,7 @@ Future _printAndCheckAppVersions() async { } } -// FIXED: Now correctly detects real update from Play Store +// Returns true if update available Future _checkForAppUpdate() async { if (defaultTargetPlatform != TargetPlatform.android) return false; @@ -158,18 +190,24 @@ Future _checkForAppUpdate() async { if (status != null && status.canUpdate) { print("UPDATE DETECTED! Redirecting to AppUpdateView"); print("Current: ${status.localVersion} → Store: ${status.storeVersion}"); - return true; // This will now go to AppUpdateView + return true; } } catch (e) { - print("Version check failed (continuing anyway): $e"); + print("Version check failed: $e"); } return false; } +// ------------------------- +// HANDLE NOTIFICATION TAP +// ------------------------- void _handleMessage(RemoteMessage message) { print("Notification tapped: ${message.data}"); } +// ------------------------- +// ANIMATED SPLASH +// ------------------------- class AnimatedSplashWithNavigation extends StatefulWidget { final Widget nextScreen; const AnimatedSplashWithNavigation({super.key, required this.nextScreen}); @@ -199,127 +237,158 @@ class _AnimatedSplashWithNavigationState backgroundcolor: Colors.white, foregroundcolor: ColorConstants.primaryColor, brandnamecolor: ColorConstants.primaryColor, - // companyname: 'Nearle Daily', ); } } +// ------------------------- +// MAIN ENTRY POINT +// ------------------------- Future main() async { WidgetsFlutterBinding.ensureInitialized(); - FlutterError.onError = (details) => FlutterError.dumpErrorToConsole(details); + // Firebase initialize with options (iOS/web safe) + await Firebase.initializeApp( + options: DefaultFirebaseOptions.currentPlatform, + ); - await runZonedGuarded(() async { + await _printAndCheckAppVersions(); + await _setupLocalNotifications(); - await Firebase.initializeApp(); + FirebaseMessaging.onBackgroundMessage(_firebaseMessagingBackgroundHandler); - await _printAndCheckAppVersions(); + SystemChrome.setSystemUIOverlayStyle( + SystemUiOverlayStyle(statusBarColor: Colors.grey[200]), + ); - SystemChrome.setSystemUIOverlayStyle( - SystemUiOverlayStyle(statusBarColor: Colors.grey[200]), - ); + final prefs = await SharedPreferences.getInstance(); + prefs.setBool("firstTime", true); - await _setupLocalNotifications(); - FirebaseMessaging.onBackgroundMessage(_firebaseMessagingBackgroundHandler); - - RemoteMessage? initialMessage = - await FirebaseMessaging.instance.getInitialMessage(); - if (initialMessage != null) _handleMessage(initialMessage); - - FirebaseMessaging.onMessageOpenedApp.listen(_handleMessage); - - if (!kIsWeb) { + // ------------------------- + // NOTIFICATION PERMISSIONS & FCM TOKEN + // ------------------------- + if (!kIsWeb) { + if (Platform.isIOS) { + NotificationSettings settings = await FirebaseMessaging.instance.requestPermission( alert: true, badge: true, sound: true, ); - } - SharedPreferences prefs = await SharedPreferences.getInstance(); - prefs.setBool("firstTime", true); - FirebaseMessaging.onMessage.listen((RemoteMessage message) async { - final data = message.data; - final title = data['title'] ?? message.notification?.title ?? 'Nearle'; - final body = data['body'] ?? message.notification?.body ?? ''; + if (settings.authorizationStatus == AuthorizationStatus.authorized) { + print('User granted permission'); - final ByteData jpegData = - await rootBundle.load('assets/images/nearledaily.png'); - final Uint8List jpegBytes = jpegData.buffer.asUint8List(); + // Listen for token refresh (APNs ready) + FirebaseMessaging.instance.onTokenRefresh.listen((newToken) async { + print('FCM Token (iOS APNs ready): $newToken'); + await prefs.setString('fcmToken', newToken); + }); - await flutterLocalNotificationsPlugin.show( - DateTime.now().millisecondsSinceEpoch ~/ 1000, - title, - body, - NotificationDetails( - android: AndroidNotificationDetails( - 'nearle_channel', - 'Nearle Notifications', - importance: Importance.max, - priority: Priority.high, - fullScreenIntent: true, - playSound: true, - enableVibration: true, - largeIcon: ByteArrayAndroidBitmap(jpegBytes), - ), - ), - ); - }); - - String? fcmToken = await FirebaseMessaging.instance.getToken(); - await prefs.setString('fcmToken', fcmToken ?? ''); - - if (defaultTargetPlatform == TargetPlatform.android) { - final params = PlatformWebViewControllerCreationParams(); - AndroidWebViewController(params); - } - - ApiConstants.tenantCustomers = ApiConstants.tenantCustomerLive; - ApiConstants.orderedtenantCustomers = ApiConstants.orderedtenantCustomerLive; - ApiConstants.login = ApiConstants.loginLive; - - Get.put(TenantController(), permanent: true); - Get.lazyPut(() => AuthController(), fenix: true); - Get.lazyPut(() => DashboardController(), fenix: true); - Get.lazyPut(() => CartController(), fenix: true); - Get.lazyPut(() => BottomNavController(), fenix: true); - Get.lazyPut(() => OrderedTenantController(), fenix: true); - Get.lazyPut(() => OrderController(), fenix: true); - Get.lazyPut(() => FaqController(), fenix: true); - Get.lazyPut(() => IntroScreenController(), fenix: true); - - DeviceInfo deviceInfo = DeviceInfo(); - await deviceInfo.getDeviceInfo(); - - await SystemChrome.setPreferredOrientations([ - DeviceOrientation.portraitUp, - DeviceOrientation.portraitDown, - ]); - - final int? customerId = prefs.getInt('customerId'); - final String? contactNo = prefs.getString('contactno'); - bool updateAvailable = await _checkForAppUpdate(); // Now works correctly! - - Widget nextScreen; - if (updateAvailable) { - nextScreen = const AppUpdateView(); - } else if (customerId != null && contactNo != null && contactNo.isNotEmpty) { - nextScreen = BottomNavigation(); + // Optional: small delay initial attempt + Future.delayed(const Duration(seconds: 2), () async { + String? token = await FirebaseMessaging.instance.getToken(); + print('FCM Token initial attempt (iOS): $token'); + if (token != null) await prefs.setString('fcmToken', token); + }); + } else { + print('User declined notification permission'); + } } else { - nextScreen = const SplashScreenView(); + // Android: get token immediately + String? token = await FirebaseMessaging.instance.getToken(); + print('FCM Token (Android): $token'); + if (token != null) await prefs.setString('fcmToken', token); } - SystemChrome.setSystemUIOverlayStyle( - const SystemUiOverlayStyle( - statusBarColor: Colors.white, // or transparent - statusBarIconBrightness: Brightness.dark, // Android - statusBarBrightness: Brightness.light, // iOS + } + + // Foreground notifications + FirebaseMessaging.onMessage.listen((RemoteMessage message) async { + final data = message.data; + final title = data['title'] ?? message.notification?.title ?? 'Nearle'; + final body = data['body'] ?? message.notification?.body ?? ''; + + final ByteData jpegData = + await rootBundle.load('assets/images/nearledaily.png'); + final Uint8List jpegBytes = jpegData.buffer.asUint8List(); + + await flutterLocalNotificationsPlugin.show( + DateTime.now().millisecondsSinceEpoch ~/ 1000, + title, + body, + NotificationDetails( + android: AndroidNotificationDetails( + 'nearle_channel', + 'Nearle Notifications', + importance: Importance.max, + priority: Priority.high, + fullScreenIntent: true, + playSound: true, + enableVibration: true, + largeIcon: ByteArrayAndroidBitmap(jpegBytes), + ), + iOS: const DarwinNotificationDetails(), ), ); + }); - runApp(MyApp(startScreen: nextScreen)); - }, (error, stack) => print('Error: $error')); + // Android WebView Controller + if (defaultTargetPlatform == TargetPlatform.android) { + final params = PlatformWebViewControllerCreationParams(); + AndroidWebViewController(params); + } + + // API constants + ApiConstants.tenantCustomers = ApiConstants.tenantCustomerLive; + ApiConstants.orderedtenantCustomers = ApiConstants.orderedtenantCustomerLive; + ApiConstants.login = ApiConstants.loginLive; + + // Controllers + Get.put(TenantController(), permanent: true); + Get.lazyPut(() => AuthController(), fenix: true); + Get.lazyPut(() => DashboardController(), fenix: true); + Get.lazyPut(() => CartController(), fenix: true); + Get.lazyPut(() => BottomNavController(), fenix: true); + Get.lazyPut(() => OrderedTenantController(), fenix: true); + Get.lazyPut(() => OrderController(), fenix: true); + Get.lazyPut(() => FaqController(), fenix: true); + Get.lazyPut(() => IntroScreenController(), fenix: true); + + DeviceInfo deviceInfo = DeviceInfo(); + await deviceInfo.getDeviceInfo(); + + await SystemChrome.setPreferredOrientations([ + DeviceOrientation.portraitUp, + DeviceOrientation.portraitDown, + ]); + + final int? customerId = prefs.getInt('customerId'); + final String? contactNo = prefs.getString('contactno'); + bool updateAvailable = await _checkForAppUpdate(); + + Widget nextScreen; + if (updateAvailable) { + nextScreen = const AppUpdateView(); + } else if (customerId != null && contactNo != null && contactNo.isNotEmpty) { + nextScreen = BottomNavigation(); + } else { + nextScreen = const SplashScreenView(); + } + + SystemChrome.setSystemUIOverlayStyle( + const SystemUiOverlayStyle( + statusBarColor: Colors.white, + statusBarIconBrightness: Brightness.dark, + statusBarBrightness: Brightness.light, + ), + ); + + runApp(MyApp(startScreen: nextScreen)); } +// ------------------------- +// MAIN APP +// ------------------------- class MyApp extends StatelessWidget { final Widget startScreen; const MyApp({super.key, required this.startScreen});