From e59c4728a045a5b5d661686174719ea4dbc67b02 Mon Sep 17 00:00:00 2001 From: otsmr Date: Fri, 5 Jun 2026 12:25:59 +0200 Subject: [PATCH] update flutter for ios --- analysis_options.yaml | 1 + .../NotificationService.swift | 30 +- ios/Podfile | 11 +- ios/Podfile.lock | 355 +----------------- ios/Runner.xcodeproj/project.pbxproj | 22 ++ .../xcshareddata/swiftpm/Package.resolved | 194 ++++++++++ .../xcshareddata/xcschemes/Runner.xcscheme | 18 + .../xcshareddata/swiftpm/Package.resolved | 194 ++++++++++ .../message_send_state_icon.dart | 2 +- .../views/onboarding/setup/profile.setup.dart | 8 +- pubspec.yaml | 3 + 11 files changed, 457 insertions(+), 381 deletions(-) create mode 100644 ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved create mode 100644 ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/analysis_options.yaml b/analysis_options.yaml index 229bcedc..4f5e5b81 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -19,6 +19,7 @@ analyzer: - "lib/core/**" - "lib/src/localization/**" - "rust_builder/" + - "build/" - "dependencies/**" - "pubspec.yaml" - "**.arb" diff --git a/ios/NotificationService/NotificationService.swift b/ios/NotificationService/NotificationService.swift index 124932a9..ebf7b038 100644 --- a/ios/NotificationService/NotificationService.swift +++ b/ios/NotificationService/NotificationService.swift @@ -193,6 +193,7 @@ func readFromKeychain(key: String) -> String? { let query: [String: Any] = [ kSecClass as String: kSecClassGenericPassword, kSecAttrAccount as String: key, + kSecAttrService as String: "flutter_secure_storage_service", kSecReturnData as String: kCFBooleanTrue!, kSecMatchLimit as String: kSecMatchLimitOne, kSecAttrAccessGroup as String: "CN332ZUGRP.eu.twonly.shared", // Use your access group @@ -220,28 +221,23 @@ func writeToKeychain(key: String, value: String) { let query: [String: Any] = [ kSecClass as String: kSecClassGenericPassword, kSecAttrAccount as String: key, - kSecAttrAccessGroup as String: "CN332ZUGRP.eu.twonly.shared", + kSecAttrService as String: "flutter_secure_storage_service", + kSecAttrAccessGroup as String: "CN332ZUGRP.eu.twonly.shared" ] - let attributesToUpdate: [String: Any] = [ - kSecValueData as String: data - ] + // Delete existing item first to ensure a clean overwrite + SecItemDelete(query as CFDictionary) - let status = SecItemUpdate(query as CFDictionary, attributesToUpdate as CFDictionary) + // Add the new item with background-compatible accessibility + var addQuery = query + addQuery[kSecValueData as String] = data + addQuery[kSecAttrAccessible as String] = kSecAttrAccessibleAfterFirstUnlock - if status == errSecItemNotFound { - var addQuery = query - addQuery[kSecValueData as String] = data - let addStatus = SecItemAdd(addQuery as CFDictionary, nil) - if addStatus != errSecSuccess { - NSLog("Failed to add keychain item: \(addStatus)") - } else { - NSLog("Successfully added keychain item for key: \(key)") - } - } else if status != errSecSuccess { - NSLog("Failed to update keychain item: \(status)") + let status = SecItemAdd(addQuery as CFDictionary, nil) + if status != errSecSuccess { + NSLog("Failed to write keychain item for key \(key): \(status)") } else { - NSLog("Successfully updated keychain item for key: \(key)") + NSLog("Successfully wrote keychain item for key: \(key)") } } diff --git a/ios/Podfile b/ios/Podfile index f30e30fc..1ce516d2 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -28,17 +28,9 @@ require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelpe flutter_ios_podfile_setup -pod 'Firebase', :modular_headers => true -pod 'FirebaseMessaging', :modular_headers => true -pod 'FirebaseCoreInternal', :modular_headers => true -pod 'GoogleUtilities', :modular_headers => true -pod 'FirebaseCore', :modular_headers => true -pod 'SwiftProtobuf' -# pod 'sqlite3', :modular_headers => true - - target 'Runner' do + pod 'SwiftProtobuf' flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) target 'RunnerTests' do inherit! :search_paths @@ -83,5 +75,6 @@ post_install do |installer| end target 'NotificationService' do + pod 'SwiftProtobuf' # pod 'Firebase/Messaging' end diff --git a/ios/Podfile.lock b/ios/Podfile.lock index d0110fad..7fa3eac4 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,136 +1,18 @@ PODS: - - app_links (7.0.0): - - Flutter - audio_waveforms (0.0.1): - Flutter - - background_downloader (0.0.1): - - Flutter - - camera_avfoundation (0.0.1): - - Flutter - - connectivity_plus (0.0.1): - - Flutter - cryptography_flutter_plus (0.2.0): - Flutter - - device_info_plus (0.0.1): - - Flutter - - DKImagePickerController/Core (4.3.9): - - DKImagePickerController/ImageDataManager - - DKImagePickerController/Resource - - DKImagePickerController/ImageDataManager (4.3.9) - - DKImagePickerController/PhotoGallery (4.3.9): - - DKImagePickerController/Core - - DKPhotoGallery - - DKImagePickerController/Resource (4.3.9) - - DKPhotoGallery (0.0.19): - - DKPhotoGallery/Core (= 0.0.19) - - DKPhotoGallery/Model (= 0.0.19) - - DKPhotoGallery/Preview (= 0.0.19) - - DKPhotoGallery/Resource (= 0.0.19) - - SDWebImage - - SwiftyGif - - DKPhotoGallery/Core (0.0.19): - - DKPhotoGallery/Model - - DKPhotoGallery/Preview - - SDWebImage - - SwiftyGif - - DKPhotoGallery/Model (0.0.19): - - SDWebImage - - SwiftyGif - - DKPhotoGallery/Preview (0.0.19): - - DKPhotoGallery/Model - - DKPhotoGallery/Resource - - SDWebImage - - SwiftyGif - - DKPhotoGallery/Resource (0.0.19): - - SDWebImage - - SwiftyGif - - emoji_picker_flutter (0.0.1): - - Flutter - - file_picker (0.0.1): - - DKImagePickerController/PhotoGallery - - Flutter - - Firebase (12.9.0): - - Firebase/Core (= 12.9.0) - - Firebase/Core (12.9.0): - - Firebase/CoreOnly - - FirebaseAnalytics (~> 12.9.0) - - Firebase/CoreOnly (12.9.0): - - FirebaseCore (~> 12.9.0) - - Firebase/Installations (12.9.0): - - Firebase/CoreOnly - - FirebaseInstallations (~> 12.9.0) - - Firebase/Messaging (12.9.0): - - Firebase/CoreOnly - - FirebaseMessaging (~> 12.9.0) - - firebase_app_installations (0.4.1): - - Firebase/Installations (= 12.9.0) - - firebase_core - - Flutter - - firebase_core (4.6.0): - - Firebase/CoreOnly (= 12.9.0) - - Flutter - - firebase_messaging (16.1.3): - - Firebase/Messaging (= 12.9.0) - - firebase_core - - Flutter - - FirebaseAnalytics (12.9.0): - - FirebaseAnalytics/Default (= 12.9.0) - - FirebaseCore (~> 12.9.0) - - FirebaseInstallations (~> 12.9.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - - GoogleUtilities/MethodSwizzler (~> 8.1) - - GoogleUtilities/Network (~> 8.1) - - "GoogleUtilities/NSData+zlib (~> 8.1)" - - nanopb (~> 3.30910.0) - - FirebaseAnalytics/Default (12.9.0): - - FirebaseCore (~> 12.9.0) - - FirebaseInstallations (~> 12.9.0) - - GoogleAppMeasurement/Default (= 12.9.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - - GoogleUtilities/MethodSwizzler (~> 8.1) - - GoogleUtilities/Network (~> 8.1) - - "GoogleUtilities/NSData+zlib (~> 8.1)" - - nanopb (~> 3.30910.0) - - FirebaseCore (12.9.0): - - FirebaseCoreInternal (~> 12.9.0) - - GoogleUtilities/Environment (~> 8.1) - - GoogleUtilities/Logger (~> 8.1) - - FirebaseCoreInternal (12.9.0): - - "GoogleUtilities/NSData+zlib (~> 8.1)" - - FirebaseInstallations (12.9.0): - - FirebaseCore (~> 12.9.0) - - GoogleUtilities/Environment (~> 8.1) - - GoogleUtilities/UserDefaults (~> 8.1) - - PromisesObjC (~> 2.4) - - FirebaseMessaging (12.9.0): - - FirebaseCore (~> 12.9.0) - - FirebaseInstallations (~> 12.9.0) - - GoogleDataTransport (~> 10.1) - - 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_image_compress_common (1.0.0): - Flutter - Mantle - SDWebImage - SDWebImageWebPCoder - - flutter_keyboard_visibility_temp_fork (0.0.1): - - Flutter - - flutter_local_notifications (0.0.1): - - Flutter - - flutter_secure_storage_darwin (10.0.0): - - Flutter - - FlutterMacOS - flutter_sharing_intent (1.0.1): - Flutter - flutter_volume_controller (0.0.1): - Flutter - - gal (1.0.0): - - Flutter - - FlutterMacOS - google_mlkit_barcode_scanning (0.14.2): - Flutter - google_mlkit_commons @@ -142,33 +24,6 @@ PODS: - Flutter - google_mlkit_commons - GoogleMLKit/FaceDetection (~> 9.0.0) - - GoogleAdsOnDeviceConversion (3.2.0): - - GoogleUtilities/Environment (~> 8.1) - - GoogleUtilities/Logger (~> 8.1) - - GoogleUtilities/Network (~> 8.1) - - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Core (12.9.0): - - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - - GoogleUtilities/MethodSwizzler (~> 8.1) - - GoogleUtilities/Network (~> 8.1) - - "GoogleUtilities/NSData+zlib (~> 8.1)" - - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/Default (12.9.0): - - GoogleAdsOnDeviceConversion (~> 3.2.0) - - GoogleAppMeasurement/Core (= 12.9.0) - - GoogleAppMeasurement/IdentitySupport (= 12.9.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - - GoogleUtilities/MethodSwizzler (~> 8.1) - - GoogleUtilities/Network (~> 8.1) - - "GoogleUtilities/NSData+zlib (~> 8.1)" - - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/IdentitySupport (12.9.0): - - GoogleAppMeasurement/Core (= 12.9.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - - GoogleUtilities/MethodSwizzler (~> 8.1) - - GoogleUtilities/Network (~> 8.1) - - "GoogleUtilities/NSData+zlib (~> 8.1)" - - nanopb (~> 3.30910.0) - GoogleDataTransport (10.1.0): - nanopb (~> 3.30910.0) - PromisesObjC (~> 2.4) @@ -185,54 +40,16 @@ PODS: - GoogleToolboxForMac/Defines (= 4.2.1) - "GoogleToolboxForMac/NSData+zlib (4.2.1)": - GoogleToolboxForMac/Defines (= 4.2.1) - - GoogleUtilities (8.1.0): - - GoogleUtilities/AppDelegateSwizzler (= 8.1.0) - - GoogleUtilities/Environment (= 8.1.0) - - GoogleUtilities/Logger (= 8.1.0) - - GoogleUtilities/MethodSwizzler (= 8.1.0) - - GoogleUtilities/Network (= 8.1.0) - - "GoogleUtilities/NSData+zlib (= 8.1.0)" - - GoogleUtilities/Privacy (= 8.1.0) - - GoogleUtilities/Reachability (= 8.1.0) - - GoogleUtilities/SwizzlerTestHelpers (= 8.1.0) - - GoogleUtilities/UserDefaults (= 8.1.0) - - 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/MethodSwizzler (8.1.0): - - GoogleUtilities/Logger - - 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/SwizzlerTestHelpers (8.1.0): - - GoogleUtilities/MethodSwizzler - GoogleUtilities/UserDefaults (8.1.0): - GoogleUtilities/Logger - GoogleUtilities/Privacy - GTMSessionFetcher/Core (3.5.0) - - image_picker_ios (0.0.1): - - Flutter - - in_app_purchase_storekit (0.0.1): - - Flutter - - FlutterMacOS - - integration_test (0.0.1): - - Flutter - libwebp (1.5.0): - libwebp/demux (= 1.5.0) - libwebp/mux (= 1.5.0) @@ -245,9 +62,6 @@ PODS: - libwebp/sharpyuv (1.5.0) - libwebp/webp (1.5.0): - libwebp/sharpyuv - - local_auth_darwin (0.0.1): - - Flutter - - FlutterMacOS - Mantle (2.2.0): - Mantle/extobjc (= 2.2.0) - Mantle/extobjc (2.2.0) @@ -276,18 +90,11 @@ PODS: - nanopb/encode (= 3.30910.0) - nanopb/decode (3.30910.0) - nanopb/encode (3.30910.0) - - package_info_plus (0.4.5): - - Flutter - permission_handler_apple (9.3.0): - Flutter - - photo_manager (3.9.0): - - Flutter - - FlutterMacOS - pro_video_editor (0.0.1): - Flutter - PromisesObjC (2.4.0) - - restart_app (1.7.3): - - Flutter - rust_lib_twonly (0.0.1): - Flutter - screen_protector (1.5.1): @@ -300,90 +107,29 @@ PODS: - SDWebImageWebPCoder (0.15.0): - libwebp (~> 1.0) - SDWebImage/Core (~> 5.17) - - Sentry/HybridSDK (8.58.0) - - sentry_flutter (9.16.0): - - Flutter - - FlutterMacOS - - Sentry/HybridSDK (= 8.58.0) - - share_plus (0.0.1): - - Flutter - - shared_preferences_foundation (0.0.1): - - Flutter - - FlutterMacOS - - sqflite_darwin (0.0.4): - - Flutter - - FlutterMacOS - - SwiftProtobuf (1.36.1) - - SwiftyGif (5.4.5) - - url_launcher_ios (0.0.1): - - Flutter - - video_player_avfoundation (0.0.1): - - Flutter - - FlutterMacOS + - SwiftProtobuf (1.38.0) - workmanager_apple (0.0.1): - Flutter DEPENDENCIES: - - app_links (from `.symlinks/plugins/app_links/ios`) - audio_waveforms (from `.symlinks/plugins/audio_waveforms/ios`) - - background_downloader (from `.symlinks/plugins/background_downloader/ios`) - - camera_avfoundation (from `.symlinks/plugins/camera_avfoundation/ios`) - - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`) - cryptography_flutter_plus (from `.symlinks/plugins/cryptography_flutter_plus/ios`) - - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`) - - emoji_picker_flutter (from `.symlinks/plugins/emoji_picker_flutter/ios`) - - file_picker (from `.symlinks/plugins/file_picker/ios`) - - Firebase - - firebase_app_installations (from `.symlinks/plugins/firebase_app_installations/ios`) - - firebase_core (from `.symlinks/plugins/firebase_core/ios`) - - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`) - - FirebaseCore - - FirebaseCoreInternal - - FirebaseMessaging - Flutter (from `Flutter`) - flutter_image_compress_common (from `.symlinks/plugins/flutter_image_compress_common/ios`) - - flutter_keyboard_visibility_temp_fork (from `.symlinks/plugins/flutter_keyboard_visibility_temp_fork/ios`) - - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`) - - flutter_secure_storage_darwin (from `.symlinks/plugins/flutter_secure_storage_darwin/darwin`) - flutter_sharing_intent (from `.symlinks/plugins/flutter_sharing_intent/ios`) - flutter_volume_controller (from `.symlinks/plugins/flutter_volume_controller/ios`) - - gal (from `.symlinks/plugins/gal/darwin`) - google_mlkit_barcode_scanning (from `.symlinks/plugins/google_mlkit_barcode_scanning/ios`) - google_mlkit_commons (from `.symlinks/plugins/google_mlkit_commons/ios`) - google_mlkit_face_detection (from `.symlinks/plugins/google_mlkit_face_detection/ios`) - - GoogleUtilities - - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`) - - in_app_purchase_storekit (from `.symlinks/plugins/in_app_purchase_storekit/darwin`) - - integration_test (from `.symlinks/plugins/integration_test/ios`) - - local_auth_darwin (from `.symlinks/plugins/local_auth_darwin/darwin`) - - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`) - - photo_manager (from `.symlinks/plugins/photo_manager/darwin`) - pro_video_editor (from `.symlinks/plugins/pro_video_editor/ios`) - - restart_app (from `.symlinks/plugins/restart_app/ios`) - rust_lib_twonly (from `.symlinks/plugins/rust_lib_twonly/ios`) - screen_protector (from `.symlinks/plugins/screen_protector/ios`) - - sentry_flutter (from `.symlinks/plugins/sentry_flutter/ios`) - - share_plus (from `.symlinks/plugins/share_plus/ios`) - - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) - - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`) - SwiftProtobuf - - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) - - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/darwin`) - workmanager_apple (from `.symlinks/plugins/workmanager_apple/ios`) SPEC REPOS: trunk: - - DKImagePickerController - - DKPhotoGallery - - Firebase - - FirebaseAnalytics - - FirebaseCore - - FirebaseCoreInternal - - FirebaseInstallations - - FirebaseMessaging - - GoogleAdsOnDeviceConversion - - GoogleAppMeasurement - GoogleDataTransport - GoogleMLKit - GoogleToolboxForMac @@ -401,138 +147,54 @@ SPEC REPOS: - ScreenProtectorKit - SDWebImage - SDWebImageWebPCoder - - Sentry - SwiftProtobuf - - SwiftyGif EXTERNAL SOURCES: - app_links: - :path: ".symlinks/plugins/app_links/ios" audio_waveforms: :path: ".symlinks/plugins/audio_waveforms/ios" - background_downloader: - :path: ".symlinks/plugins/background_downloader/ios" - camera_avfoundation: - :path: ".symlinks/plugins/camera_avfoundation/ios" - connectivity_plus: - :path: ".symlinks/plugins/connectivity_plus/ios" cryptography_flutter_plus: :path: ".symlinks/plugins/cryptography_flutter_plus/ios" - device_info_plus: - :path: ".symlinks/plugins/device_info_plus/ios" - emoji_picker_flutter: - :path: ".symlinks/plugins/emoji_picker_flutter/ios" - file_picker: - :path: ".symlinks/plugins/file_picker/ios" - firebase_app_installations: - :path: ".symlinks/plugins/firebase_app_installations/ios" - firebase_core: - :path: ".symlinks/plugins/firebase_core/ios" - firebase_messaging: - :path: ".symlinks/plugins/firebase_messaging/ios" Flutter: :path: Flutter flutter_image_compress_common: :path: ".symlinks/plugins/flutter_image_compress_common/ios" - flutter_keyboard_visibility_temp_fork: - :path: ".symlinks/plugins/flutter_keyboard_visibility_temp_fork/ios" - flutter_local_notifications: - :path: ".symlinks/plugins/flutter_local_notifications/ios" - flutter_secure_storage_darwin: - :path: ".symlinks/plugins/flutter_secure_storage_darwin/darwin" flutter_sharing_intent: :path: ".symlinks/plugins/flutter_sharing_intent/ios" flutter_volume_controller: :path: ".symlinks/plugins/flutter_volume_controller/ios" - gal: - :path: ".symlinks/plugins/gal/darwin" google_mlkit_barcode_scanning: :path: ".symlinks/plugins/google_mlkit_barcode_scanning/ios" google_mlkit_commons: :path: ".symlinks/plugins/google_mlkit_commons/ios" google_mlkit_face_detection: :path: ".symlinks/plugins/google_mlkit_face_detection/ios" - image_picker_ios: - :path: ".symlinks/plugins/image_picker_ios/ios" - in_app_purchase_storekit: - :path: ".symlinks/plugins/in_app_purchase_storekit/darwin" - integration_test: - :path: ".symlinks/plugins/integration_test/ios" - local_auth_darwin: - :path: ".symlinks/plugins/local_auth_darwin/darwin" - package_info_plus: - :path: ".symlinks/plugins/package_info_plus/ios" permission_handler_apple: :path: ".symlinks/plugins/permission_handler_apple/ios" - photo_manager: - :path: ".symlinks/plugins/photo_manager/darwin" pro_video_editor: :path: ".symlinks/plugins/pro_video_editor/ios" - restart_app: - :path: ".symlinks/plugins/restart_app/ios" rust_lib_twonly: :path: ".symlinks/plugins/rust_lib_twonly/ios" screen_protector: :path: ".symlinks/plugins/screen_protector/ios" - sentry_flutter: - :path: ".symlinks/plugins/sentry_flutter/ios" - share_plus: - :path: ".symlinks/plugins/share_plus/ios" - shared_preferences_foundation: - :path: ".symlinks/plugins/shared_preferences_foundation/darwin" - sqflite_darwin: - :path: ".symlinks/plugins/sqflite_darwin/darwin" - url_launcher_ios: - :path: ".symlinks/plugins/url_launcher_ios/ios" - video_player_avfoundation: - :path: ".symlinks/plugins/video_player_avfoundation/darwin" workmanager_apple: :path: ".symlinks/plugins/workmanager_apple/ios" SPEC CHECKSUMS: - app_links: a754cbec3c255bd4bbb4d236ecc06f28cd9a7ce8 audio_waveforms: a6dde7fe7c0ea05f06ffbdb0f7c1b2b2ba6cedcf - background_downloader: 50e91d979067b82081aba359d7d916b3ba5fadad - camera_avfoundation: 968a9a5323c79a99c166ad9d7866bfd2047b5a9b - connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd cryptography_flutter_plus: 44f4e9e4079395fcbb3e7809c0ac2c6ae2d9576f - device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe - DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c - DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60 - emoji_picker_flutter: ece213fc274bdddefb77d502d33080dc54e616cc - file_picker: a0560bc09d61de87f12d246fc47d2119e6ef37be - Firebase: 065f2bb395062046623036d8e6dc857bc2521d56 - firebase_app_installations: 1abd8d071ea2022d7888f7a9713710c37136ff91 - firebase_core: 8e6f58412ca227827c366b92e7cee047a2148c60 - firebase_messaging: c3aa897e0d40109cfb7927c40dc0dea799863f3b - FirebaseAnalytics: cd7d01d352f3c237c9a0e31552c257cd0b0c0352 - FirebaseCore: 428912f751178b06bef0a1793effeb4a5e09a9b8 - FirebaseCoreInternal: b321eafae5362113bc182956fafc9922cfc77b72 - FirebaseInstallations: 7b64ffd006032b2b019a59b803858df5112d9eaa - FirebaseMessaging: 7d6cdbff969127c4151c824fe432f0e301210f15 Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467 flutter_image_compress_common: 1697a328fd72bfb335507c6bca1a65fa5ad87df1 - flutter_keyboard_visibility_temp_fork: 95b2d534bacf6ac62e7fcbe5c2a9e2c2a17ce06f - flutter_local_notifications: a5a732f069baa862e728d839dd2ebb904737effb - flutter_secure_storage_darwin: acdb3f316ed05a3e68f856e0353b133eec373a23 flutter_sharing_intent: 0c1e53949f09fa8df8ac2268505687bde8ff264c flutter_volume_controller: c2be490cb0487e8b88d0d9fc2b7e1c139a4ebccb - gal: baecd024ebfd13c441269ca7404792a7152fde89 google_mlkit_barcode_scanning: 12d8422d8f7b00726dedf9cac00188a2b98750c2 google_mlkit_commons: a5e4ffae5bc59ea4c7b9025dc72cb6cb79dc1166 google_mlkit_face_detection: ee4b72cfae062b4c972204be955d83055a4bfd36 - GoogleAdsOnDeviceConversion: d68c69dd9581a0f5da02617b6f377e5be483970f - GoogleAppMeasurement: fce7c1c90640d2f9f5c56771f71deacb2ba3f98c GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7 GoogleMLKit: b1eee21a41c57704fe72483b15c85cb2c0cd7444 GoogleToolboxForMac: d1a2cbf009c453f4d6ded37c105e2f67a32206d8 GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6 - image_picker_ios: e0ece4aa2a75771a7de3fa735d26d90817041326 - in_app_purchase_storekit: 22cca7d08eebca9babdf4d07d0baccb73325d3c8 - integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8 - local_auth_darwin: c3ee6cce0a8d56be34c8ccb66ba31f7f180aaebb Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d MLImage: 0de5c6c2bf9e93b80ef752e2797f0836f03b58c0 MLKitBarcodeScanning: 39de223e7b1b8a8fbf10816a536dd292d8a39343 @@ -540,28 +202,17 @@ SPEC CHECKSUMS: MLKitFaceDetection: 32549f1e70e6e7731261bf9cea2b74095e2531cb MLKitVision: 39a5a812db83c4a0794445088e567f3631c11961 nanopb: fad817b59e0457d11a5dfbde799381cd727c1275 - package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499 permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d - photo_manager: 25fd77df14f4f0ba5ef99e2c61814dde77e2bceb pro_video_editor: 44ef9a6d48dbd757ed428cf35396dd05f35c7830 PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 - restart_app: 0714144901e260eae68f7afc2fc4aacc1a323ad2 rust_lib_twonly: 73165b05d0cda50db45852db63f49caa7f319520 screen_protector: 18c6aca2dc5d2a832f6787a5318f97f03e9d3150 ScreenProtectorKit: 6ceb3e0808341a9bc15d175bff40dfdd4b32da71 SDWebImage: e9fc87c1aab89a8ab1bbd74eba378c6f53be8abf SDWebImageWebPCoder: 0e06e365080397465cc73a7a9b472d8a3bd0f377 - Sentry: d587a8fe91ca13503ecd69a1905f3e8a0fcf61be - sentry_flutter: 31101687061fb85211ebab09ce6eb8db4e9ba74f - share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a - shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb - sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0 - SwiftProtobuf: 9e106a71456f4d3f6a3b0c8fd87ef0be085efc38 - SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4 - url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b - video_player_avfoundation: dd410b52df6d2466a42d28550e33e4146928280a + SwiftProtobuf: d724b5145bfc609d9a49c1e3e3a3dabb07273ffb workmanager_apple: 904529ae31e97fc5be632cf628507652294a0778 -PODFILE CHECKSUM: ae041999f13ba7b2285ff9ad9bc688ed647bbcb7 +PODFILE CHECKSUM: 5bc5189c9ac5776fa63783a6a4fade6f2bc4c3f4 COCOAPODS: 1.16.2 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 8f7e3a91..02744fea 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -23,6 +23,7 @@ D25D4D7A2EFF41DB0029F805 /* ShareExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = D25D4D702EFF41DB0029F805 /* ShareExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; D2B2E0FF2F63819600E729C1 /* VideoCompressionChannel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2B2E0FE2F63819600E729C1 /* VideoCompressionChannel.swift */; }; F3C66D726A2EB28484DF0B10 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 16FBC6F5B58E1C6646F5D447 /* GoogleService-Info.plist */; }; + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -114,6 +115,7 @@ E96A5ACA32A7118204F050A5 /* 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 = ""; }; EE2CCFEE4ABECF33852F7735 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; F02F7A1D63544AA9F23A1085 /* Pods-NotificationService.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NotificationService.profile.xcconfig"; path = "Target Support Files/Pods-NotificationService/Pods-NotificationService.profile.xcconfig"; sourceTree = ""; }; + 78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */ @@ -165,6 +167,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */, CA4FDF5DD8F229C30DE512AF /* Pods_Runner.framework in Frameworks */, D25D4D1E2EF626E30029F805 /* StoreKit.framework in Frameworks */, ); @@ -200,6 +203,7 @@ 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( + 78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */, 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, 9740EEB21CF90195004384FC /* Debug.xcconfig */, 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, @@ -307,6 +311,9 @@ productType = "com.apple.product-type.bundle.unit-test"; }; 97C146ED1CF9000F007C117D /* Runner */ = { + packageProductDependencies = ( + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */, + ); isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( @@ -378,6 +385,9 @@ /* Begin PBXProject section */ 97C146E61CF9000F007C117D /* Project object */ = { + packageReferences = ( + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */, + ); isa = PBXProject; attributes = { BuildIndependentTargetsInParallel = YES; @@ -1309,6 +1319,18 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ +/* Begin XCLocalSwiftPackageReference section */ + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/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 00000000..d2e98753 --- /dev/null +++ b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,194 @@ +{ + "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" : "dkcamera", + "kind" : "remoteSourceControl", + "location" : "https://github.com/zhangao0086/DKCamera", + "state" : { + "branch" : "master", + "revision" : "5c691d11014b910aff69f960475d70e65d9dcc96" + } + }, + { + "identity" : "dkimagepickercontroller", + "kind" : "remoteSourceControl", + "location" : "https://github.com/zhangao0086/DKImagePickerController", + "state" : { + "branch" : "4.3.9", + "revision" : "0bdfeacefa308545adde07bef86e349186335915" + } + }, + { + "identity" : "dkphotogallery", + "kind" : "remoteSourceControl", + "location" : "https://github.com/zhangao0086/DKPhotoGallery", + "state" : { + "branch" : "master", + "revision" : "311c1bc7a94f1538f82773a79c84374b12a2ef3d" + } + }, + { + "identity" : "firebase-ios-sdk", + "kind" : "remoteSourceControl", + "location" : "https://github.com/firebase/firebase-ios-sdk", + "state" : { + "revision" : "8d5b4189f1f482df8d5c58c9985ea70491ef5382", + "version" : "12.14.0" + } + }, + { + "identity" : "flutterfire", + "kind" : "remoteSourceControl", + "location" : "https://github.com/firebase/flutterfire", + "state" : { + "revision" : "a10a4148e769fadb01b1ff8d6bb76e9137f35b81", + "version" : "4.6.0-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" : "9bfcc6cf435b2e7c5562c1900b8680c594fa9a64", + "version" : "3.6.0" + } + }, + { + "identity" : "googleappmeasurement", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/GoogleAppMeasurement.git", + "state" : { + "revision" : "219e564a8510e983e675c94f77f7f7c50049f22d", + "version" : "12.14.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" : "c0ac7575d70050c2973ba2318bd5af47f8e8153a", + "version" : "5.3.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" : "sdwebimage", + "kind" : "remoteSourceControl", + "location" : "https://github.com/SDWebImage/SDWebImage", + "state" : { + "revision" : "2de3a496eaf6df9a1312862adcfd54acd73c39c0", + "version" : "5.21.7" + } + }, + { + "identity" : "sentry-cocoa", + "kind" : "remoteSourceControl", + "location" : "https://github.com/getsentry/sentry-cocoa", + "state" : { + "revision" : "16cd512711375fa73f25ae5e373f596bdf4251ae", + "version" : "8.58.0" + } + }, + { + "identity" : "swiftygif", + "kind" : "remoteSourceControl", + "location" : "https://github.com/kirualex/SwiftyGif.git", + "state" : { + "revision" : "4430cbc148baa3907651d40562d96325426f409a", + "version" : "5.4.5" + } + }, + { + "identity" : "tocropviewcontroller", + "kind" : "remoteSourceControl", + "location" : "https://github.com/TimOliver/TOCropViewController", + "state" : { + "revision" : "d4a6d8100f4b886fdbc8ae399bf144ff3e9afb7e", + "version" : "2.8.0" + } + } + ], + "version" : 2 +} diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index e3773d42..c3fedb29 100644 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -5,6 +5,24 @@ + + + + + + + + + + { SizedBox( width: 10, height: 10, - child: CircularProgressIndicator.adaptive(strokeWidth: 1, valueColor: AlwaysStoppedAnimation(color)), + child: CircularProgressIndicator(strokeWidth: 1, color: color), ), const SizedBox(width: 2), ], diff --git a/lib/src/visual/views/onboarding/setup/profile.setup.dart b/lib/src/visual/views/onboarding/setup/profile.setup.dart index 0f695e11..d5802760 100644 --- a/lib/src/visual/views/onboarding/setup/profile.setup.dart +++ b/lib/src/visual/views/onboarding/setup/profile.setup.dart @@ -8,6 +8,7 @@ import 'package:twonly/src/visual/components/avatar_icon.comp.dart' show AvatarIcon; import 'package:twonly/src/visual/elements/my_button.element.dart'; import 'package:twonly/src/visual/elements/my_input.element.dart'; +import 'package:twonly/src/visual/themes/light.dart'; import 'package:twonly/src/visual/views/onboarding/setup/components/next_button.comp.dart'; class ProfileSetupPage extends StatefulWidget { @@ -60,10 +61,13 @@ class _ProfileSetupPageState extends State { return Container( padding: const EdgeInsets.all(4), clipBehavior: Clip.antiAlias, - decoration: BoxDecoration( + decoration: const BoxDecoration( + shape: BoxShape.circle, + ), + foregroundDecoration: BoxDecoration( shape: BoxShape.circle, border: Border.all( - color: context.color.primary.withValues(alpha: 0.2), + color: primaryColor, width: 4, ), ), diff --git a/pubspec.yaml b/pubspec.yaml index 8153f1c6..3c2b2fca 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -206,6 +206,9 @@ flutter_launcher_icons: flutter: uses-material-design: true + # config: + # enable-swift-package-manager: false + # Enable generation of localized Strings from arb files. generate: true