Browse Source

minor bug fixes

pull/30/head
Khoren Markosyan 2 years ago
parent
commit
2162520b57
  1. 2
      example/ios/Flutter/AppFrameworkInfo.plist
  2. 2
      example/ios/Podfile
  3. 4
      example/ios/Podfile.lock
  4. 6
      example/ios/Runner.xcodeproj/project.pbxproj
  5. 2
      example/lib/main.dart
  6. 1
      example/pubspec.yaml
  7. 1
      lib/src/logic/zxing.dart
  8. 4
      lib/src/ui/scanner_overlay.dart
  9. 2
      zxscanner/ios/Flutter/AppFrameworkInfo.plist
  10. 3
      zxscanner/pubspec.yaml

2
example/ios/Flutter/AppFrameworkInfo.plist

@ -21,6 +21,6 @@
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1.0</string> <string>1.0</string>
<key>MinimumOSVersion</key> <key>MinimumOSVersion</key>
<string>9.0</string> <string>11.0</string>
</dict> </dict>
</plist> </plist>

2
example/ios/Podfile

@ -1,5 +1,5 @@
# Uncomment this line to define a global platform for your project # 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. # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true' ENV['COCOAPODS_DISABLE_STATS'] = 'true'

4
example/ios/Podfile.lock

@ -25,10 +25,10 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS: SPEC CHECKSUMS:
camera_avfoundation: 07c77549ea54ad95d8581be86617c094a46280d9 camera_avfoundation: 07c77549ea54ad95d8581be86617c094a46280d9
Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
flutter_zxing: 19a866d17c8a87ee1026d68521c69d2f008635f6 flutter_zxing: 19a866d17c8a87ee1026d68521c69d2f008635f6
image_picker_ios: b786a5dcf033a8336a657191401bfdf12017dabb image_picker_ios: b786a5dcf033a8336a657191401bfdf12017dabb
PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
COCOAPODS: 1.11.3 COCOAPODS: 1.11.3

6
example/ios/Runner.xcodeproj/project.pbxproj

@ -339,7 +339,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0; IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = NO; MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos; SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos; SUPPORTED_PLATFORMS = iphoneos;
@ -418,7 +418,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0; IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = YES; MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos; SDKROOT = iphoneos;
@ -467,7 +467,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0; IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MTL_ENABLE_DEBUG_INFO = NO; MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos; SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos; SUPPORTED_PLATFORMS = iphoneos;

2
example/lib/main.dart

@ -1,5 +1,3 @@
import 'dart:typed_data';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_zxing/flutter_zxing.dart'; import 'package:flutter_zxing/flutter_zxing.dart';

1
example/pubspec.yaml

@ -11,7 +11,6 @@ dependencies:
sdk: flutter sdk: flutter
flutter_zxing: flutter_zxing:
path: ../ path: ../
version: ^0.7.4
font_awesome_flutter: ^10.1.0 font_awesome_flutter: ^10.1.0
image: ^3.2.0 image: ^3.2.0
image_picker: ^0.8.5 image_picker: ^0.8.5

1
lib/src/logic/zxing.dart

@ -1,7 +1,6 @@
import 'dart:ffi'; import 'dart:ffi';
import 'dart:io'; import 'dart:io';
import 'dart:isolate'; import 'dart:isolate';
import 'dart:typed_data';
import 'package:camera/camera.dart'; import 'package:camera/camera.dart';
import 'package:ffi/ffi.dart'; import 'package:ffi/ffi.dart';

4
lib/src/ui/scanner_overlay.dart

@ -30,14 +30,14 @@ class ScannerOverlay extends ShapeBorder {
@override @override
Path getOuterPath(Rect rect, {TextDirection? textDirection}) { Path getOuterPath(Rect rect, {TextDirection? textDirection}) {
Path _getLeftTopPath(Rect rect) { Path getLeftTopPath(Rect rect) {
return Path() return Path()
..moveTo(rect.left, rect.bottom) ..moveTo(rect.left, rect.bottom)
..lineTo(rect.left, rect.top) ..lineTo(rect.left, rect.top)
..lineTo(rect.right, rect.top); ..lineTo(rect.right, rect.top);
} }
return _getLeftTopPath(rect) return getLeftTopPath(rect)
..lineTo( ..lineTo(
rect.right, rect.right,
rect.bottom, rect.bottom,

2
zxscanner/ios/Flutter/AppFrameworkInfo.plist

@ -21,6 +21,6 @@
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1.0</string> <string>1.0</string>
<key>MinimumOSVersion</key> <key>MinimumOSVersion</key>
<string>9.0</string> <string>11.0</string>
</dict> </dict>
</plist> </plist>

3
zxscanner/pubspec.yaml

@ -5,7 +5,7 @@ publish_to: "none"
version: 1.0.1+6 version: 1.0.1+6
environment: environment:
sdk: ">=2.17.0 <3.0.0" sdk: ">=2.18.0 <3.0.0"
dependencies: dependencies:
convex_bottom_bar: ^3.0.0 convex_bottom_bar: ^3.0.0
@ -19,7 +19,6 @@ dependencies:
flutter_mobx: ^2.0.6 flutter_mobx: ^2.0.6
flutter_zxing: flutter_zxing:
path: ../ path: ../
version: ^0.7.4
font_awesome_flutter: ^10.1.0 font_awesome_flutter: ^10.1.0
hive: ^2.2.3 hive: ^2.2.3
hive_flutter: ^1.1.0 hive_flutter: ^1.1.0

Loading…
Cancel
Save