From c777e0922500cad8545da9eff798f38188d4c8ae Mon Sep 17 00:00:00 2001 From: Allan Clempe Date: Tue, 12 Jul 2022 20:50:57 +1000 Subject: [PATCH] updated pod and added back navbar on the qrcode scan page --- ios/Podfile.lock | 119 +++++++++++++++++++----------------- ios/Runner/Info.plist | 2 + lib/qrcode_reader_page.dart | 3 + 3 files changed, 67 insertions(+), 57 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 1bbc1f9..7798687 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,74 +1,77 @@ PODS: - - Firebase/Analytics (8.11.0): + - Firebase/Analytics (9.2.0): - Firebase/Core - - Firebase/Core (8.11.0): + - Firebase/Core (9.2.0): - Firebase/CoreOnly - - FirebaseAnalytics (~> 8.11.0) - - Firebase/CoreOnly (8.11.0): - - FirebaseCore (= 8.11.0) - - firebase_analytics (9.1.0): - - Firebase/Analytics (= 8.11.0) + - FirebaseAnalytics (~> 9.2.0) + - Firebase/CoreOnly (9.2.0): + - FirebaseCore (= 9.2.0) + - firebase_analytics (9.1.12): + - Firebase/Analytics (= 9.2.0) - firebase_core - Flutter - - firebase_core (1.12.0): - - Firebase/CoreOnly (= 8.11.0) + - firebase_core (1.19.1): + - Firebase/CoreOnly (= 9.2.0) - Flutter - - FirebaseAnalytics (8.11.0): - - FirebaseAnalytics/AdIdSupport (= 8.11.0) - - FirebaseCore (~> 8.0) - - FirebaseInstallations (~> 8.0) + - FirebaseAnalytics (9.2.0): + - FirebaseAnalytics/AdIdSupport (= 9.2.0) + - FirebaseCore (~> 9.0) + - FirebaseInstallations (~> 9.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - GoogleUtilities/MethodSwizzler (~> 7.7) - GoogleUtilities/Network (~> 7.7) - "GoogleUtilities/NSData+zlib (~> 7.7)" - - nanopb (~> 2.30908.0) - - FirebaseAnalytics/AdIdSupport (8.11.0): - - FirebaseCore (~> 8.0) - - FirebaseInstallations (~> 8.0) - - GoogleAppMeasurement (= 8.11.0) + - nanopb (< 2.30910.0, >= 2.30908.0) + - FirebaseAnalytics/AdIdSupport (9.2.0): + - FirebaseCore (~> 9.0) + - FirebaseInstallations (~> 9.0) + - GoogleAppMeasurement (= 9.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - GoogleUtilities/MethodSwizzler (~> 7.7) - GoogleUtilities/Network (~> 7.7) - "GoogleUtilities/NSData+zlib (~> 7.7)" - - nanopb (~> 2.30908.0) - - FirebaseCore (8.11.0): - - FirebaseCoreDiagnostics (~> 8.0) + - nanopb (< 2.30910.0, >= 2.30908.0) + - FirebaseCore (9.2.0): + - FirebaseCoreDiagnostics (~> 9.0) + - FirebaseCoreInternal (~> 9.0) - GoogleUtilities/Environment (~> 7.7) - GoogleUtilities/Logger (~> 7.7) - - FirebaseCoreDiagnostics (8.11.0): - - GoogleDataTransport (~> 9.1) + - FirebaseCoreDiagnostics (9.2.0): + - GoogleDataTransport (< 10.0.0, >= 9.1.4) - GoogleUtilities/Environment (~> 7.7) - GoogleUtilities/Logger (~> 7.7) - - nanopb (~> 2.30908.0) - - FirebaseInstallations (8.11.0): - - FirebaseCore (~> 8.0) + - nanopb (< 2.30910.0, >= 2.30908.0) + - FirebaseCoreInternal (9.2.0): + - "GoogleUtilities/NSData+zlib (~> 7.7)" + - FirebaseInstallations (9.2.0): + - FirebaseCore (~> 9.0) - GoogleUtilities/Environment (~> 7.7) - GoogleUtilities/UserDefaults (~> 7.7) - - PromisesObjC (< 3.0, >= 1.2) + - PromisesObjC (~> 2.1) - Flutter (1.0.0) - - GoogleAppMeasurement (8.11.0): - - GoogleAppMeasurement/AdIdSupport (= 8.11.0) + - GoogleAppMeasurement (9.2.0): + - GoogleAppMeasurement/AdIdSupport (= 9.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - GoogleUtilities/MethodSwizzler (~> 7.7) - GoogleUtilities/Network (~> 7.7) - "GoogleUtilities/NSData+zlib (~> 7.7)" - - nanopb (~> 2.30908.0) - - GoogleAppMeasurement/AdIdSupport (8.11.0): - - GoogleAppMeasurement/WithoutAdIdSupport (= 8.11.0) + - nanopb (< 2.30910.0, >= 2.30908.0) + - GoogleAppMeasurement/AdIdSupport (9.2.0): + - GoogleAppMeasurement/WithoutAdIdSupport (= 9.2.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - GoogleUtilities/MethodSwizzler (~> 7.7) - GoogleUtilities/Network (~> 7.7) - "GoogleUtilities/NSData+zlib (~> 7.7)" - - nanopb (~> 2.30908.0) - - GoogleAppMeasurement/WithoutAdIdSupport (8.11.0): + - nanopb (< 2.30910.0, >= 2.30908.0) + - GoogleAppMeasurement/WithoutAdIdSupport (9.2.0): - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - GoogleUtilities/MethodSwizzler (~> 7.7) - GoogleUtilities/Network (~> 7.7) - "GoogleUtilities/NSData+zlib (~> 7.7)" - - nanopb (~> 2.30908.0) - - GoogleDataTransport (9.1.2): - - GoogleUtilities/Environment (~> 7.2) - - nanopb (~> 2.30908.0) + - nanopb (< 2.30910.0, >= 2.30908.0) + - GoogleDataTransport (9.1.4): + - GoogleUtilities/Environment (~> 7.7) + - nanopb (< 2.30910.0, >= 2.30908.0) - PromisesObjC (< 3.0, >= 1.2) - GoogleUtilities/AppDelegateSwizzler (7.7.0): - GoogleUtilities/Environment @@ -90,12 +93,12 @@ PODS: - GoogleUtilities/UserDefaults (7.7.0): - GoogleUtilities/Logger - MTBBarcodeScanner (5.0.11) - - nanopb (2.30908.0): - - nanopb/decode (= 2.30908.0) - - nanopb/encode (= 2.30908.0) - - nanopb/decode (2.30908.0) - - nanopb/encode (2.30908.0) - - PromisesObjC (2.0.0) + - nanopb (2.30909.0): + - nanopb/decode (= 2.30909.0) + - nanopb/encode (= 2.30909.0) + - nanopb/decode (2.30909.0) + - nanopb/encode (2.30909.0) + - PromisesObjC (2.1.1) - qr_code_scanner (0.2.0): - Flutter - MTBBarcodeScanner @@ -118,6 +121,7 @@ SPEC REPOS: - FirebaseAnalytics - FirebaseCore - FirebaseCoreDiagnostics + - FirebaseCoreInternal - FirebaseInstallations - GoogleAppMeasurement - GoogleDataTransport @@ -141,23 +145,24 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/url_launcher_ios/ios" SPEC CHECKSUMS: - Firebase: 44dd9724c84df18b486639e874f31436eaa9a20c - firebase_analytics: b267e923ba3cdc892bdcadc01efab50f3b8b7441 - firebase_core: 443bccfd6aa6b42f07be365b500773dc69db2d87 - FirebaseAnalytics: 4e4b13031034e6561ed3bd1d47b6fdabbd6487c6 - FirebaseCore: 2f4f85b453cc8fea4bb2b37e370007d2bcafe3f0 - FirebaseCoreDiagnostics: 64d9709d804a6c25bd77841371c1fcfd909d5601 - FirebaseInstallations: 044eede8a049bce71c4541ee68d6e4364fcbe774 + Firebase: 4ba896cb8e5105d4b9e247e1c1b6222b548df55a + firebase_analytics: 62f21c400c1fe65369985fa8ba68b5ac1d939bb8 + firebase_core: 9e09bbfbf5467e459822850732f5fb648f5b1927 + FirebaseAnalytics: af5a03a8dff7648c7b8486f6a78b1368e0268dd3 + FirebaseCore: 0e27f2a15d8f7b7ef11e7d93e23b1cbab55d748c + FirebaseCoreDiagnostics: ad3f6c68b7c5b63b7cf15b0785d7137f05f32268 + FirebaseCoreInternal: cb966328b6985dbd6f535e1461291063e1c4a00f + FirebaseInstallations: 21186f0ca7849f90f4a3219fa31a5eca2e30f113 Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a - GoogleAppMeasurement: aa3cb422fab2b05d2efac543a5720d1a85b9dea5 - GoogleDataTransport: 629c20a4d363167143f30ea78320d5a7eb8bd940 + GoogleAppMeasurement: 7a33224321f975d58c166657260526775d9c6b1a + GoogleDataTransport: 5fffe35792f8b96ec8d6775f5eccd83c998d5a3b GoogleUtilities: e0913149f6b0625b553d70dae12b49fc62914fd1 MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb - nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96 - PromisesObjC: 68159ce6952d93e17b2dfe273b8c40907db5ba58 + nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431 + PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e - shared_preferences_ios: aef470a42dc4675a1cdd50e3158b42e3d1232b32 - url_launcher_ios: 02f1989d4e14e998335b02b67a7590fa34f971af + shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad + url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de PODFILE CHECKSUM: 0f8acf5e5a14e328f44e16d2814879d3c60acc03 diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 60037f0..74274f2 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -50,5 +50,7 @@ UIViewControllerBasedStatusBarAppearance + CADisableMinimumFrameDurationOnPhone + diff --git a/lib/qrcode_reader_page.dart b/lib/qrcode_reader_page.dart index b1092c9..9d24c31 100644 --- a/lib/qrcode_reader_page.dart +++ b/lib/qrcode_reader_page.dart @@ -50,6 +50,9 @@ class _QRCodeReaderPageState extends State { : 300.0; return Scaffold( + appBar: AppBar( + title: Text(widget.title), + ), body: Column( children: [ Expanded(