From 2162520b57586bab4d1d097bce29d11ea0b70efd Mon Sep 17 00:00:00 2001 From: Khoren Markosyan Date: Fri, 2 Sep 2022 19:19:15 +0400 Subject: [PATCH] minor bug fixes --- example/ios/Flutter/AppFrameworkInfo.plist | 2 +- example/ios/Podfile | 2 +- example/ios/Podfile.lock | 4 ++-- example/ios/Runner.xcodeproj/project.pbxproj | 6 +++--- example/lib/main.dart | 2 -- example/pubspec.yaml | 1 - lib/src/logic/zxing.dart | 1 - lib/src/ui/scanner_overlay.dart | 4 ++-- zxscanner/ios/Flutter/AppFrameworkInfo.plist | 2 +- zxscanner/pubspec.yaml | 3 +-- 10 files changed, 11 insertions(+), 16 deletions(-) diff --git a/example/ios/Flutter/AppFrameworkInfo.plist b/example/ios/Flutter/AppFrameworkInfo.plist index 8d4492f..9625e10 100644 --- a/example/ios/Flutter/AppFrameworkInfo.plist +++ b/example/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 9.0 + 11.0 diff --git a/example/ios/Podfile b/example/ios/Podfile index 1e8c3c9..88359b2 100644 --- a/example/ios/Podfile +++ b/example/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -# platform :ios, '9.0' +# platform :ios, '11.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index 17463bf..df97eac 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -25,10 +25,10 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: camera_avfoundation: 07c77549ea54ad95d8581be86617c094a46280d9 - Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a + Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 flutter_zxing: 19a866d17c8a87ee1026d68521c69d2f008635f6 image_picker_ios: b786a5dcf033a8336a657191401bfdf12017dabb -PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c +PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3 COCOAPODS: 1.11.3 diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index 60217f8..ea41eec 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/example/ios/Runner.xcodeproj/project.pbxproj @@ -339,7 +339,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -418,7 +418,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -467,7 +467,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; diff --git a/example/lib/main.dart b/example/lib/main.dart index 870179f..6f6663a 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -1,5 +1,3 @@ -import 'dart:typed_data'; - import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_zxing/flutter_zxing.dart'; diff --git a/example/pubspec.yaml b/example/pubspec.yaml index e5c5bd5..858c4ff 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -11,7 +11,6 @@ dependencies: sdk: flutter flutter_zxing: path: ../ - version: ^0.7.4 font_awesome_flutter: ^10.1.0 image: ^3.2.0 image_picker: ^0.8.5 diff --git a/lib/src/logic/zxing.dart b/lib/src/logic/zxing.dart index b3cb2b8..ee422aa 100644 --- a/lib/src/logic/zxing.dart +++ b/lib/src/logic/zxing.dart @@ -1,7 +1,6 @@ import 'dart:ffi'; import 'dart:io'; import 'dart:isolate'; -import 'dart:typed_data'; import 'package:camera/camera.dart'; import 'package:ffi/ffi.dart'; diff --git a/lib/src/ui/scanner_overlay.dart b/lib/src/ui/scanner_overlay.dart index dc7869d..76f752e 100644 --- a/lib/src/ui/scanner_overlay.dart +++ b/lib/src/ui/scanner_overlay.dart @@ -30,14 +30,14 @@ class ScannerOverlay extends ShapeBorder { @override Path getOuterPath(Rect rect, {TextDirection? textDirection}) { - Path _getLeftTopPath(Rect rect) { + Path getLeftTopPath(Rect rect) { return Path() ..moveTo(rect.left, rect.bottom) ..lineTo(rect.left, rect.top) ..lineTo(rect.right, rect.top); } - return _getLeftTopPath(rect) + return getLeftTopPath(rect) ..lineTo( rect.right, rect.bottom, diff --git a/zxscanner/ios/Flutter/AppFrameworkInfo.plist b/zxscanner/ios/Flutter/AppFrameworkInfo.plist index 8d4492f..9625e10 100644 --- a/zxscanner/ios/Flutter/AppFrameworkInfo.plist +++ b/zxscanner/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 9.0 + 11.0 diff --git a/zxscanner/pubspec.yaml b/zxscanner/pubspec.yaml index 875c2a1..1224142 100644 --- a/zxscanner/pubspec.yaml +++ b/zxscanner/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: "none" version: 1.0.1+6 environment: - sdk: ">=2.17.0 <3.0.0" + sdk: ">=2.18.0 <3.0.0" dependencies: convex_bottom_bar: ^3.0.0 @@ -19,7 +19,6 @@ dependencies: flutter_mobx: ^2.0.6 flutter_zxing: path: ../ - version: ^0.7.4 font_awesome_flutter: ^10.1.0 hive: ^2.2.3 hive_flutter: ^1.1.0