Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 3816 - commented camerawesome #3824

Merged
merged 1 commit into from
Mar 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
172 changes: 87 additions & 85 deletions packages/smooth_app/ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
PODS:
- "app_settings (3.0.0+1)":
- Flutter
- audioplayers_darwin (0.0.1):
- Flutter
- camera (0.0.1):
- camera_avfoundation (0.0.1):
- Flutter
- data_importer (0.0.1):
- Flutter
Expand All @@ -17,31 +19,22 @@ PODS:
- Mantle
- SDWebImage
- SDWebImageWebPCoder
- flutter_isolate (0.0.1):
- Flutter
- flutter_native_splash (0.0.1):
- Flutter
- flutter_secure_storage (3.3.1):
- Flutter
- FMDB (2.7.5):
- FMDB/standard (= 2.7.5)
- FMDB/standard (2.7.5)
- google_mlkit_barcode_scanning (0.3.0):
- Flutter
- google_mlkit_commons
- GoogleMLKit/BarcodeScanning (~> 2.6.0)
- google_mlkit_commons (0.2.0):
- Flutter
- MLKitVision
- GoogleDataTransport (9.2.0):
- GoogleDataTransport (9.2.1):
- GoogleUtilities/Environment (~> 7.7)
- nanopb (< 2.30910.0, >= 2.30908.0)
- PromisesObjC (< 3.0, >= 1.2)
- GoogleMLKit/BarcodeScanning (2.6.0):
- GoogleMLKit/BarcodeScanning (3.2.0):
- GoogleMLKit/MLKitCore
- MLKitBarcodeScanning (~> 1.7.0)
- GoogleMLKit/MLKitCore (2.6.0):
- MLKitCommon (~> 5.0.0)
- MLKitBarcodeScanning (~> 2.2.0)
- GoogleMLKit/MLKitCore (3.2.0):
- MLKitCommon (~> 8.0.0)
- GoogleToolboxForMac/DebugUtils (2.3.2):
- GoogleToolboxForMac/Defines (= 2.3.2)
- GoogleToolboxForMac/Defines (2.3.2)
Expand All @@ -54,11 +47,11 @@ PODS:
- GoogleToolboxForMac/Defines (= 2.3.2)
- "GoogleToolboxForMac/NSString+URLArguments (= 2.3.2)"
- "GoogleToolboxForMac/NSString+URLArguments (2.3.2)"
- GoogleUtilities/Environment (7.8.0):
- GoogleUtilities/Environment (7.11.0):
- PromisesObjC (< 3.0, >= 1.2)
- GoogleUtilities/Logger (7.8.0):
- GoogleUtilities/Logger (7.11.0):
- GoogleUtilities/Environment
- GoogleUtilities/UserDefaults (7.8.0):
- GoogleUtilities/UserDefaults (7.11.0):
- GoogleUtilities/Logger
- GoogleUtilitiesComponents (1.1.0):
- GoogleUtilities/Logger
Expand All @@ -84,11 +77,11 @@ PODS:
- Mantle (2.2.0):
- Mantle/extobjc (= 2.2.0)
- Mantle/extobjc (2.2.0)
- MLImage (1.0.0-beta2)
- MLKitBarcodeScanning (1.7.0):
- MLKitCommon (~> 5.0)
- MLKitVision (~> 3.0)
- MLKitCommon (5.0.0):
- MLImage (1.0.0-beta3)
- MLKitBarcodeScanning (2.2.0):
- MLKitCommon (~> 8.0)
- MLKitVision (~> 4.2)
- MLKitCommon (8.0.0):
- GoogleDataTransport (~> 9.0)
- GoogleToolboxForMac/Logger (~> 2.1)
- "GoogleToolboxForMac/NSData+zlib (~> 2.1)"
Expand All @@ -97,48 +90,55 @@ PODS:
- GoogleUtilitiesComponents (~> 1.0)
- GTMSessionFetcher/Core (~> 1.1)
- Protobuf (~> 3.12)
- MLKitVision (3.0.0):
- MLKitVision (4.2.0):
- GoogleToolboxForMac/Logger (~> 2.1)
- "GoogleToolboxForMac/NSData+zlib (~> 2.1)"
- GTMSessionFetcher/Core (~> 1.1)
- MLImage (= 1.0.0-beta2)
- MLKitCommon (~> 5.0)
- MLImage (= 1.0.0-beta3)
- MLKitCommon (~> 8.0)
- Protobuf (~> 3.12)
- mobile_scanner (3.0.0):
- Flutter
- GoogleMLKit/BarcodeScanning (~> 3.2.0)
- MTBBarcodeScanner (5.0.11)
- nanopb (2.30909.0):
- nanopb/decode (= 2.30909.0)
- nanopb/encode (= 2.30909.0)
- nanopb/decode (2.30909.0)
- nanopb/encode (2.30909.0)
- package_info_plus (0.4.5):
- Flutter
- path_provider_ios (0.0.1):
- path_provider_foundation (0.0.1):
- Flutter
- FlutterMacOS
- permission_handler_apple (9.0.4):
- Flutter
- PromisesObjC (2.1.1)
- Protobuf (3.21.7)
- Realm (10.31.0):
- Realm/Headers (= 10.31.0)
- Realm/Headers (10.31.0)
- RealmSwift (10.31.0):
- Realm (= 10.31.0)
- SDWebImage (5.15.0):
- SDWebImage/Core (= 5.15.0)
- SDWebImage/Core (5.15.0)
- SDWebImageWebPCoder (0.10.0):
- PromisesObjC (2.2.0)
- Protobuf (3.22.1)
- qr_code_scanner (0.2.0):
- Flutter
- MTBBarcodeScanner
- Realm (10.37.0):
- Realm/Headers (= 10.37.0)
- Realm/Headers (10.37.0)
- RealmSwift (10.37.0):
- Realm (= 10.37.0)
- SDWebImage (5.15.5):
- SDWebImage/Core (= 5.15.5)
- SDWebImage/Core (5.15.5)
- SDWebImageWebPCoder (0.11.0):
- libwebp (~> 1.0)
- SDWebImage/Core (~> 5.15)
- Sentry (7.25.1):
- Sentry/Core (= 7.25.1)
- Sentry/Core (7.25.1)
- Sentry/HybridSDK (7.31.5)
- sentry_flutter (0.0.1):
- Flutter
- FlutterMacOS
- Sentry (~> 7.25.1)
- Sentry/HybridSDK (= 7.31.5)
- share_plus (0.0.1):
- Flutter
- shared_preferences_ios (0.0.1):
- shared_preferences_foundation (0.0.1):
- Flutter
- FlutterMacOS
- sqflite (0.0.2):
- Flutter
- FMDB (>= 2.7.5)
Expand All @@ -148,28 +148,28 @@ PODS:
- Flutter

DEPENDENCIES:
- app_settings (from `.symlinks/plugins/app_settings/ios`)
- audioplayers_darwin (from `.symlinks/plugins/audioplayers_darwin/ios`)
- camera (from `.symlinks/plugins/camera/ios`)
- camera_avfoundation (from `.symlinks/plugins/camera_avfoundation/ios`)
- data_importer (from `.symlinks/plugins/data_importer/ios`)
- device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
- Flutter (from `Flutter`)
- flutter_email_sender (from `.symlinks/plugins/flutter_email_sender/ios`)
- flutter_image_compress (from `.symlinks/plugins/flutter_image_compress/ios`)
- flutter_isolate (from `.symlinks/plugins/flutter_isolate/ios`)
- flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
- flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
- google_mlkit_barcode_scanning (from `.symlinks/plugins/google_mlkit_barcode_scanning/ios`)
- google_mlkit_commons (from `.symlinks/plugins/google_mlkit_commons/ios`)
- image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
- in_app_review (from `.symlinks/plugins/in_app_review/ios`)
- integration_test (from `.symlinks/plugins/integration_test/ios`)
- iso_countries (from `.symlinks/plugins/iso_countries/ios`)
- mobile_scanner (from `.symlinks/plugins/mobile_scanner/ios`)
- package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
- path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/ios`)
- permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
- qr_code_scanner (from `.symlinks/plugins/qr_code_scanner/ios`)
- sentry_flutter (from `.symlinks/plugins/sentry_flutter/ios`)
- share_plus (from `.symlinks/plugins/share_plus/ios`)
- shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`)
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/ios`)
- sqflite (from `.symlinks/plugins/sqflite/ios`)
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
- webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`)
Expand All @@ -190,6 +190,7 @@ SPEC REPOS:
- MLKitBarcodeScanning
- MLKitCommon
- MLKitVision
- MTBBarcodeScanner
- nanopb
- PromisesObjC
- Protobuf
Expand All @@ -200,10 +201,12 @@ SPEC REPOS:
- Sentry

EXTERNAL SOURCES:
app_settings:
:path: ".symlinks/plugins/app_settings/ios"
audioplayers_darwin:
:path: ".symlinks/plugins/audioplayers_darwin/ios"
camera:
:path: ".symlinks/plugins/camera/ios"
camera_avfoundation:
:path: ".symlinks/plugins/camera_avfoundation/ios"
data_importer:
:path: ".symlinks/plugins/data_importer/ios"
device_info_plus:
Expand All @@ -214,16 +217,10 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/flutter_email_sender/ios"
flutter_image_compress:
:path: ".symlinks/plugins/flutter_image_compress/ios"
flutter_isolate:
:path: ".symlinks/plugins/flutter_isolate/ios"
flutter_native_splash:
:path: ".symlinks/plugins/flutter_native_splash/ios"
flutter_secure_storage:
:path: ".symlinks/plugins/flutter_secure_storage/ios"
google_mlkit_barcode_scanning:
:path: ".symlinks/plugins/google_mlkit_barcode_scanning/ios"
google_mlkit_commons:
:path: ".symlinks/plugins/google_mlkit_commons/ios"
image_picker_ios:
:path: ".symlinks/plugins/image_picker_ios/ios"
in_app_review:
Expand All @@ -232,18 +229,22 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/integration_test/ios"
iso_countries:
:path: ".symlinks/plugins/iso_countries/ios"
mobile_scanner:
:path: ".symlinks/plugins/mobile_scanner/ios"
package_info_plus:
:path: ".symlinks/plugins/package_info_plus/ios"
path_provider_ios:
:path: ".symlinks/plugins/path_provider_ios/ios"
path_provider_foundation:
:path: ".symlinks/plugins/path_provider_foundation/ios"
permission_handler_apple:
:path: ".symlinks/plugins/permission_handler_apple/ios"
qr_code_scanner:
:path: ".symlinks/plugins/qr_code_scanner/ios"
sentry_flutter:
:path: ".symlinks/plugins/sentry_flutter/ios"
share_plus:
:path: ".symlinks/plugins/share_plus/ios"
shared_preferences_ios:
:path: ".symlinks/plugins/shared_preferences_ios/ios"
shared_preferences_foundation:
:path: ".symlinks/plugins/shared_preferences_foundation/ios"
sqflite:
:path: ".symlinks/plugins/sqflite/ios"
url_launcher_ios:
Expand All @@ -252,23 +253,21 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/webview_flutter_wkwebview/ios"

SPEC CHECKSUMS:
audioplayers_darwin: 387322cb364026a1782298c982693b1b6aa9fa1b
camera: 9993f92f2c793e87b65e35f3a23c70582afb05b1
app_settings: d103828c9f5d515c4df9ee754dabd443f7cedcf3
audioplayers_darwin: 877d9a4d06331c5c374595e46e16453ac7eafa40
camera_avfoundation: 3125e8cd1a4387f6f31c6c63abb8a55892a9eeeb
data_importer: ab8c74aaf553878170aed03c03626d5820c5cb1f
device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed
Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
flutter_email_sender: 02d7443217d8c41483223627972bfdc09f74276b
flutter_image_compress: 5a5e9aee05b6553048b8df1c3bc456d0afaac433
flutter_isolate: 0edf5081826d071adf21759d1eb10ff5c24503b5
flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef
flutter_secure_storage: 7953c38a04c3fdbb00571bcd87d8e3b5ceb9daec
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
google_mlkit_barcode_scanning: 56e88993b6c915ce7134f9d77cb5b2de2fca8cfa
google_mlkit_commons: e9070f57232c3a3e4bd42fdfa621bb1f4bb3e709
GoogleDataTransport: 1c8145da7117bd68bbbed00cf304edb6a24de00f
GoogleMLKit: 755661c46990a85e42278015f26400286d98ad95
GoogleDataTransport: ea169759df570f4e37bdee1623ec32a7e64e67c4
GoogleMLKit: 0017a6a8372e1a182139b9def4d89be5d87ca5a7
GoogleToolboxForMac: 8bef7c7c5cf7291c687cf5354f39f9db6399ad34
GoogleUtilities: 1d20a6ad97ef46f67bbdec158ce00563a671ebb7
GoogleUtilities: c2bdc4cf2ce786c4d2e6b3bcfd599a25ca78f06f
GoogleUtilitiesComponents: 679b2c881db3b615a2777504623df6122dd20afe
GTMSessionFetcher: 5595ec75acf5be50814f81e9189490412bad82ba
image_picker_ios: b786a5dcf033a8336a657191401bfdf12017dabb
Expand All @@ -278,28 +277,31 @@ SPEC CHECKSUMS:
KeychainAccess: c0c4f7f38f6fc7bbe58f5702e25f7bd2f65abf51
libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef
Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d
MLImage: a454f9f8ecfd537783a12f9488f5be1a68820829
MLKitBarcodeScanning: b8257854f6afc1c8443d61ec6b98c28b35625df6
MLKitCommon: 3bc17c6f7d25ce3660f030350b46ae7ec9ebca6e
MLKitVision: e87dc3f2e456a6ab32361ebd985e078dd2746143
MLImage: 489dfec109f21da8621b28d476401aaf7a0d4ff4
MLKitBarcodeScanning: d92fe1911001ec36870162c5a0eb206f612b7169
MLKitCommon: f6da6c5659618c070b50a80db01248ebe2964175
MLKitVision: 96c96571190b7f63eddf4a12068ce8a8689e0d2c
mobile_scanner: 004f7ad2fe4e2b5a3e6ed0bc4b83ca9c5b5dd975
MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431
package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
path_provider_foundation: c68054786f1b4f3343858c1e1d0caaded73f0be9
permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce
PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb
Protobuf: f4128517d7a42302e106cc3afe614ee3a7513e94
Realm: 10df7d86e1ca09d9948fdce2faa3fc623fb092c6
RealmSwift: aecc52389574be4d451bf6cb1b08824eaa17dad0
SDWebImage: 9bec4c5cdd9579e1f57104735ee0c37df274d593
SDWebImageWebPCoder: 07b5d53b3adcc3d491312a58ea103e36af1692c1
Sentry: dd29c18c32b0af9269949f079cf631d581ca76ca
sentry_flutter: 544b23de27343d0cd12d8d16b0fac71dc884f0e6
PromisesObjC: 09985d6d70fbe7878040aa746d78236e6946d2ef
Protobuf: d7f7c8329edf5eb8af65547a8ba3e9c1cee927d5
qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e
Realm: 9c5fc6f8f5cb70b299f2e3064d2b9f6cb0f1523d
RealmSwift: 7be7bb45911c16400dd1bfce3a01764ecb4cae7a
SDWebImage: fd7e1a22f00303e058058278639bf6196ee431fe
SDWebImageWebPCoder: 295a6573c512f54ad2dd58098e64e17dcf008499
Sentry: 4c9babff9034785067c896fd580b1f7de44da020
sentry_flutter: 1346a880b24c0240807b53b10cf50ddad40f504e
share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad
shared_preferences_foundation: 986fc17f3d3251412d18b0265f9c64113a8c2472
sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
url_launcher_ios: ae1517e5e344f5544fb090b079e11f399dfbe4d2
webview_flutter_wkwebview: b7e70ef1ddded7e69c796c7390ee74180182971f

PODFILE CHECKSUM: aa97d8b016d7264ad0a1ef5c44765133ae787bc4

COCOAPODS: 1.11.3
COCOAPODS: 1.12.0
4 changes: 3 additions & 1 deletion packages/smooth_app/ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 51;
objectVersion = 54;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -199,6 +199,7 @@
/* Begin PBXShellScriptBuildPhase section */
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
Expand Down Expand Up @@ -230,6 +231,7 @@
};
9740EEB61CF901F6004384FC /* Run Script */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
Expand Down
2 changes: 2 additions & 0 deletions packages/smooth_app/ios/Runner/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,7 @@
</array>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
<key>UIApplicationSupportsIndirectInputEvents</key>
<true/>
</dict>
</plist>
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/*
import 'package:camerawesome/camerawesome_plugin.dart';
import 'package:flutter/material.dart';
import 'package:smooth_app/helpers/haptic_feedback_helper.dart';
Expand Down Expand Up @@ -60,3 +61,4 @@ class SmoothAwesomeFlashButton extends StatelessWidget {
);
}
}
*/
5 changes: 3 additions & 2 deletions packages/smooth_app/lib/pages/scan/camera_scan_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import 'package:smooth_app/data_models/user_preferences.dart';
import 'package:smooth_app/helpers/app_helper.dart';
import 'package:smooth_app/helpers/camera_helper.dart';
import 'package:smooth_app/helpers/haptic_feedback_helper.dart';
import 'package:smooth_app/pages/scan/smooth_barcode_scanner_awesome.dart';
//import 'package:smooth_app/pages/scan/smooth_barcode_scanner_awesome.dart';
import 'package:smooth_app/pages/scan/smooth_barcode_scanner_mlkit.dart';
import 'package:smooth_app/pages/scan/smooth_barcode_scanner_mockup.dart';
import 'package:smooth_app/pages/scan/smooth_barcode_scanner_type.dart';
Expand Down Expand Up @@ -79,7 +79,8 @@ class CameraScannerPageState extends State<CameraScannerPage>
case SmoothBarcodeScannerType.mockup:
return const SmoothBarcodeScannerMocked();
case SmoothBarcodeScannerType.awesome:
return SmoothBarcodeScannerAwesome(_onNewBarcodeDetected);
return const SmoothBarcodeScannerMocked();
// return SmoothBarcodeScannerAwesome(_onNewBarcodeDetected);
}
}

Expand Down
Loading