From 9e8181100e745d68ebcf89797647f6d4d31e3b27 Mon Sep 17 00:00:00 2001 From: Khoren Markosyan Date: Tue, 9 May 2023 00:42:26 +0400 Subject: [PATCH] minor improvements --- example/ios/Podfile.lock | 2 +- example/ios/Runner/Info.plist | 6 ++++ example/pubspec.lock | 56 +++++++++++++++++------------------ lib/src/ui/reader_widget.dart | 5 ++++ src/zxing | 2 +- 5 files changed, 41 insertions(+), 30 deletions(-) diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index 599f3ef..34497cf 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -31,4 +31,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3 -COCOAPODS: 1.11.3 +COCOAPODS: 1.12.0 diff --git a/example/ios/Runner/Info.plist b/example/ios/Runner/Info.plist index c285f9e..b2ab090 100644 --- a/example/ios/Runner/Info.plist +++ b/example/ios/Runner/Info.plist @@ -51,5 +51,11 @@ UIApplicationSupportsIndirectInputEvents + NSBonjourServices + + _dartobservatory._tcp + + NSLocalNetworkUsageDescription + Allow Flutter tools on your computer to connect and debug your application diff --git a/example/pubspec.lock b/example/pubspec.lock index 6fb26d8..e33b787 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -21,10 +21,10 @@ packages: dependency: transitive description: name: args - sha256: "4cab82a83ffef80b262ddedf47a0a8e56ee6fbf7fe21e6e768b02792034dd440" + sha256: c372bb384f273f0c2a8aaaa226dad84dc27c8519a691b888725dec59518ad53a url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.4.1" async: dependency: transitive description: @@ -45,18 +45,18 @@ packages: dependency: transitive description: name: camera - sha256: "7afc256902062cab191540c09908b98bc71e93d5e20b6486dbee51aa7731e9b2" + sha256: "309b823e61f15ff6b5b2e4c0ff2e1512ea661cad5355f71fc581e510ae5b26bb" url: "https://pub.dev" source: hosted - version: "0.10.4" + version: "0.10.5" camera_android: dependency: transitive description: name: camera_android - sha256: "772c111c78f31f868b98dbf6dbeda8d6ff77acea773a92ea5705ee2f7949ebfb" + sha256: e0f9b7eea2d1f4d4f5460f178522f0d02c095d2ae00b01a77419ce61c4184bfe url: "https://pub.dev" source: hosted - version: "0.10.5" + version: "0.10.7" camera_avfoundation: dependency: transitive description: @@ -157,10 +157,10 @@ packages: dependency: transitive description: name: crypto - sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67 + sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.0.3" fake_async: dependency: transitive description: @@ -202,10 +202,10 @@ packages: dependency: transitive description: name: flutter_plugin_android_lifecycle - sha256: c224ac897bed083dabf11f238dd11a239809b446740be0c2044608c50029ffdf + sha256: "96af49aa6b57c10a312106ad6f71deed5a754029c24789bbf620ba784f0bd0b0" url: "https://pub.dev" source: hosted - version: "2.0.9" + version: "2.0.14" flutter_test: dependency: "direct dev" description: flutter @@ -243,10 +243,10 @@ packages: dependency: transitive description: name: http - sha256: "6aa2946395183537c8b880962d935877325d6a09a2867c3970c05c0fed6ac482" + sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2" url: "https://pub.dev" source: hosted - version: "0.13.5" + version: "0.13.6" http_parser: dependency: transitive description: @@ -259,26 +259,26 @@ packages: dependency: transitive description: name: image - sha256: "483a389d6ccb292b570c31b3a193779b1b0178e7eb571986d9a49904b6861227" + sha256: a72242c9a0ffb65d03de1b7113bc4e189686fc07c7147b8b41811d0dd0e0d9bf url: "https://pub.dev" source: hosted - version: "4.0.15" + version: "4.0.17" image_picker: dependency: transitive description: name: image_picker - sha256: "8b0efbf350ba4f2be1531d629396a994983d0c02f4a82a128aed84d954b90cfa" + sha256: "3da954c3b8906d82ecb50fd5e2b5401758f06d5678904eed6cbc06172283a263" url: "https://pub.dev" source: hosted - version: "0.8.7+2" + version: "0.8.7+4" image_picker_android: dependency: transitive description: name: image_picker_android - sha256: dfb5b0f28b8786fcc662b7ed42bfb4b82a6cbbd74da1958384b10d40bdf212a7 + sha256: "271e0448e82268b3fa1cb2a48e4a911cbc2135587123d7df8e7ca703c5b10da2" url: "https://pub.dev" source: hosted - version: "0.8.6+6" + version: "0.8.6+11" image_picker_for_web: dependency: transitive description: @@ -323,10 +323,10 @@ packages: dependency: transitive description: name: json_annotation - sha256: c33da08e136c3df0190bd5bbe51ae1df4a7d96e7954d1d7249fea2968a72d317 + sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467 url: "https://pub.dev" source: hosted - version: "4.8.0" + version: "4.8.1" lints: dependency: transitive description: @@ -411,10 +411,10 @@ packages: dependency: transitive description: name: pointycastle - sha256: c3120a968135aead39699267f4c74bc9a08e4e909e86bc1b0af5bfd78691123c + sha256: "7c1e5f0d23c9016c5bbd8b1473d0d3fb3fc851b876046039509e18e0c7485f2c" url: "https://pub.dev" source: hosted - version: "3.7.2" + version: "3.7.3" pool: dependency: transitive description: @@ -443,10 +443,10 @@ packages: dependency: transitive description: name: pub_semver - sha256: "307de764d305289ff24ad257ad5c5793ce56d04947599ad68b3baa124105fc17" + sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c" url: "https://pub.dev" source: hosted - version: "2.1.3" + version: "2.1.4" pub_updater: dependency: transitive description: @@ -568,18 +568,18 @@ packages: dependency: transitive description: name: yaml - sha256: "23812a9b125b48d4007117254bca50abb6c712352927eece9e155207b1db2370" + sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.1.2" yaml_edit: dependency: transitive description: name: yaml_edit - sha256: "0b968021754d8fbd3e9c83563b538ee417d88b2cc587606da5615546b7ee033b" + sha256: "1579d4a0340a83cf9e4d580ea51a16329c916973bffd5bd4b45e911b25d46bfd" url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" sdks: dart: ">=2.19.0 <3.0.0" flutter: ">=3.3.0" diff --git a/lib/src/ui/reader_widget.dart b/lib/src/ui/reader_widget.dart index a1267f3..67c36a0 100644 --- a/lib/src/ui/reader_widget.dart +++ b/lib/src/ui/reader_widget.dart @@ -25,6 +25,7 @@ class ReaderWidget extends StatefulWidget { this.codeFormat = Format.any, this.tryHarder = false, this.tryInverted = false, + this.tryRotate = true, this.showScannerOverlay = true, this.scannerOverlay, this.actionButtonsAlignment = Alignment.bottomLeft, @@ -79,6 +80,9 @@ class ReaderWidget extends StatefulWidget { /// Try to detect inverted code final bool tryInverted; + /// Try to rotate the image + final bool tryRotate; + /// Show cropping rect final bool showScannerOverlay; @@ -277,6 +281,7 @@ class _ReaderWidgetState extends State cropWidth: cropSize, cropHeight: cropSize, tryHarder: widget.tryHarder, + tryRotate: widget.tryRotate, tryInverted: widget.tryInverted, isMultiScan: widget.isMultiScan, ); diff --git a/src/zxing b/src/zxing index cee1d0e..eaafe9f 160000 --- a/src/zxing +++ b/src/zxing @@ -1 +1 @@ -Subproject commit cee1d0e0d4424937c368f683dc3ee2478290ad39 +Subproject commit eaafe9fc5111f663f4033853677a549956a65fe8