From 4111d9c552879ee9be4d72c807db95c86a6e2417 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Wed, 17 Aug 2022 18:33:23 +0300 Subject: [PATCH] Minor fixes for iOS --- ios/Podfile.lock | 28 ++++++++------ ios/Runner.xcodeproj/project.pbxproj | 5 ++- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- ios/Runner/Info-Debug.plist | 38 +++++++++---------- ios/Runner/Info-Release.plist | 16 ++++---- .../login/two_factor_authentication_page.dart | 2 +- 6 files changed, 50 insertions(+), 41 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index ebbe4d4..b6734b9 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,4 +1,6 @@ PODS: + - alt_sms_autofill (0.0.1): + - Flutter - device_info (0.0.1): - Flutter - Flutter (1.0.0) @@ -13,7 +15,7 @@ PODS: - Flutter - geolocator_apple (1.2.0): - Flutter - - image_picker (0.0.1): + - image_picker_ios (0.0.1): - Flutter - MTBBarcodeScanner (5.0.11) - OrderedSet (5.0.0) @@ -22,19 +24,20 @@ PODS: - qr_code_scanner (0.2.0): - Flutter - MTBBarcodeScanner - - url_launcher (0.0.1): + - url_launcher_ios (0.0.1): - Flutter DEPENDENCIES: + - alt_sms_autofill (from `.symlinks/plugins/alt_sms_autofill/ios`) - device_info (from `.symlinks/plugins/device_info/ios`) - Flutter (from `Flutter`) - flutter_inappwebview (from `.symlinks/plugins/flutter_inappwebview/ios`) - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`) - geolocator_apple (from `.symlinks/plugins/geolocator_apple/ios`) - - image_picker (from `.symlinks/plugins/image_picker/ios`) + - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`) - package_info (from `.symlinks/plugins/package_info/ios`) - qr_code_scanner (from `.symlinks/plugins/qr_code_scanner/ios`) - - url_launcher (from `.symlinks/plugins/url_launcher/ios`) + - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) SPEC REPOS: trunk: @@ -42,6 +45,8 @@ SPEC REPOS: - OrderedSet EXTERNAL SOURCES: + alt_sms_autofill: + :path: ".symlinks/plugins/alt_sms_autofill/ios" device_info: :path: ".symlinks/plugins/device_info/ios" Flutter: @@ -52,27 +57,28 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/flutter_secure_storage/ios" geolocator_apple: :path: ".symlinks/plugins/geolocator_apple/ios" - image_picker: - :path: ".symlinks/plugins/image_picker/ios" + image_picker_ios: + :path: ".symlinks/plugins/image_picker_ios/ios" package_info: :path: ".symlinks/plugins/package_info/ios" qr_code_scanner: :path: ".symlinks/plugins/qr_code_scanner/ios" - url_launcher: - :path: ".symlinks/plugins/url_launcher/ios" + url_launcher_ios: + :path: ".symlinks/plugins/url_launcher_ios/ios" SPEC CHECKSUMS: + alt_sms_autofill: 6c623529a8de6a2a9297358bdb7dab3d8ad693e4 device_info: d7d233b645a32c40dfdc212de5cf646ca482f175 Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a flutter_inappwebview: bfd58618f49dc62f2676de690fc6dcda1d6c3721 flutter_secure_storage: 7953c38a04c3fdbb00571bcd87d8e3b5ceb9daec - geolocator_apple: b741765c55dc21950e3e106e8b3584e55cf81ce5 - image_picker: 9aa50e1d8cdacdbed739e925b7eea16d014367e6 + geolocator_apple: cc556e6844d508c95df1e87e3ea6fa4e58c50401 + image_picker_ios: b786a5dcf033a8336a657191401bfdf12017dabb MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62 qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e - url_launcher: b6e016d912f04be9f5bf6e8e82dc599b7ba59649 + url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index d6d1d04..ca82884 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -160,7 +160,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1020; + LastUpgradeCheck = 1300; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { @@ -361,6 +361,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + DEVELOPMENT_TEAM = ""; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-Release.plist"; LD_RUNPATH_SEARCH_PATHS = ( @@ -489,6 +490,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + DEVELOPMENT_TEAM = ""; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; LD_RUNPATH_SEARCH_PATHS = ( @@ -511,6 +513,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + DEVELOPMENT_TEAM = ""; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; LD_RUNPATH_SEARCH_PATHS = ( diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index a28140c..3db53b6 100644 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ $(FLUTTER_BUILD_NUMBER) LSRequiresIPhoneOS + NSAppTransportSecurity + + NSAllowsArbitraryLoads + + + NSBonjourServices + + _dartobservatory._tcp + + NSCameraUsageDescription + Scan QrCode or take photos using your camera. + NSLocalNetworkUsageDescription + Allow flutter tools on your computer to connect and debug your application. + NSLocationAlwaysUsageDescription + Get location to place the device on a map. + NSLocationWhenInUseUsageDescription + Get location to place the device on a map. + NSPhotoLibraryUsageDescription + Access photo library to take existing photos. UILaunchStoryboardName LaunchScreen UIMainStoryboardFile @@ -41,24 +60,5 @@ UIViewControllerBasedStatusBarAppearance - NSCameraUsageDescription - Scan QrCode or take photos using your camera. - NSPhotoLibraryUsageDescription - Access photo library to take existing photos. - NSLocationWhenInUseUsageDescription - Get location to place the device on a map. - NSLocationAlwaysUsageDescription - Get location to place the device on a map. - NSAppTransportSecurity - - NSAllowsArbitraryLoads - - - NSBonjourServices - - _dartobservatory._tcp - - NSLocalNetworkUsageDescription - Allow flutter tools on your computer to connect and debug your application. diff --git a/ios/Runner/Info-Release.plist b/ios/Runner/Info-Release.plist index 7a43d13..4fe76d4 100644 --- a/ios/Runner/Info-Release.plist +++ b/ios/Runner/Info-Release.plist @@ -22,6 +22,14 @@ $(FLUTTER_BUILD_NUMBER) LSRequiresIPhoneOS + NSCameraUsageDescription + Scan QrCode or take photos using your camera. + NSLocationAlwaysUsageDescription + Get location to place the device on a map. + NSLocationWhenInUseUsageDescription + Get location to place the device on a map. + NSPhotoLibraryUsageDescription + Access photo library to take existing photos. UILaunchStoryboardName LaunchScreen UIMainStoryboardFile @@ -41,13 +49,5 @@ UIViewControllerBasedStatusBarAppearance - NSCameraUsageDescription - Scan QrCode or take photos using your camera. - NSPhotoLibraryUsageDescription - Access photo library to take existing photos. - NSLocationWhenInUseUsageDescription - Get location to place the device on a map. - NSLocationAlwaysUsageDescription - Get location to place the device on a map. diff --git a/lib/core/auth/login/two_factor_authentication_page.dart b/lib/core/auth/login/two_factor_authentication_page.dart index 94bb126..5973708 100644 --- a/lib/core/auth/login/two_factor_authentication_page.dart +++ b/lib/core/auth/login/two_factor_authentication_page.dart @@ -252,7 +252,7 @@ class _TwoFactorAuthenticationPageState }), SizedBox(height: 16), SizedBox( - height: 48, + height: 49, child: Row( mainAxisSize: MainAxisSize.max,