Skip to content

Commit 892a13f

Browse files
Release 1.0.2
1 parent fd66956 commit 892a13f

File tree

11 files changed

+51
-43
lines changed

11 files changed

+51
-43
lines changed

.idea/libraries/Flutter_Plugins.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/workspace.xml

Lines changed: 25 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 1.0.2
2+
3+
* Android: Fixes #137 and #132
4+
* iOS: Fixes #97
5+
16
## 1.0.1
27

38
* Merge PR #90

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ After making the changes in Android ans iOS add flutter_barcode_scanner to `pubs
6262
```
6363
dependencies:
6464
...
65-
flutter_barcode_scanner: ^1.0.1
65+
flutter_barcode_scanner: ^1.0.2
6666
```
6767

6868
### One time scan

android/src/main/java/com/amolg/flutterbarcodescanner/camera/CameraSource.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -964,9 +964,11 @@ private class FrameProcessingRunnable implements Runnable {
964964

965965
@SuppressLint("Assert")
966966
void release() {
967-
assert (mProcessingThread.getState() == State.TERMINATED);
968-
mDetector.release();
969-
mDetector = null;
967+
assert (mProcessingThread == null || mProcessingThread.getState() == State.TERMINATED);
968+
if (mDetector != null) {
969+
mDetector.release();
970+
mDetector = null;
971+
}
970972
}
971973

972974
void setActive(boolean active) {

android/src/main/res/layout/barcode_capture.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828

2929
<ImageView
3030
android:id="@+id/imgViewBarcodeCaptureUseFlash"
31-
android:layout_width="40dp"
32-
android:layout_height="40dp"
31+
android:layout_width="48dp"
32+
android:layout_height="48dp"
3333
android:layout_centerInParent="true"
3434
android:contentDescription="Flash button"
3535
android:src="@drawable/ic_barcode_flash_off" />
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_barcode_scanner","path":"/Volumes/MyData/Projects/flutter_barcode_scanner/","dependencies":[]}],"android":[{"name":"flutter_barcode_scanner","path":"/Volumes/MyData/Projects/flutter_barcode_scanner/","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"flutter_plugin_android_lifecycle","path":"/Volumes/MyData/Flutter_SDK/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_plugin_android_lifecycle-1.0.7/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"flutter_barcode_scanner","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"flutter_plugin_android_lifecycle","dependencies":[]}],"date_created":"2020-05-15 21:46:36.882926","version":"1.17.1"}
1+
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_barcode_scanner","path":"/Volumes/MyData/Projects/flutter_barcode_scanner_stable/flutter_barcode_scanner/","dependencies":[]}],"android":[{"name":"flutter_plugin_android_lifecycle","path":"/Volumes/MyData/Flutter_SDK/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_plugin_android_lifecycle-1.0.11/","dependencies":[]},{"name":"flutter_barcode_scanner","path":"/Volumes/MyData/Projects/flutter_barcode_scanner_stable/flutter_barcode_scanner/","dependencies":["flutter_plugin_android_lifecycle"]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"flutter_barcode_scanner","dependencies":["flutter_plugin_android_lifecycle"]}],"date_created":"2021-01-06 01:40:53.149426","version":"1.24.0-10.2.pre"}
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
#!/bin/sh
22
# This is a generated file; do not edit or check into version control.
33
export "FLUTTER_ROOT=/Volumes/MyData/Flutter_SDK/flutter"
4-
export "FLUTTER_APPLICATION_PATH=/Volumes/MyData/Projects/flutter_barcode_scanner/example"
5-
export "FLUTTER_TARGET=/Volumes/MyData/Projects/flutter_barcode_scanner/example/lib/main.dart"
4+
export "FLUTTER_APPLICATION_PATH=/Volumes/MyData/Projects/flutter_barcode_scanner_stable/flutter_barcode_scanner/example"
5+
export "FLUTTER_TARGET=lib/main.dart"
66
export "FLUTTER_BUILD_DIR=build"
77
export "SYMROOT=${SOURCE_ROOT}/../build/ios"
88
export "OTHER_LDFLAGS=$(inherited) -framework Flutter"
99
export "FLUTTER_FRAMEWORK_DIR=/Volumes/MyData/Flutter_SDK/flutter/bin/cache/artifacts/engine/ios"
1010
export "FLUTTER_BUILD_NAME=1.0.1"
1111
export "FLUTTER_BUILD_NUMBER=1.0.1"
12-
export "TRACK_WIDGET_CREATION=true"
12+
export "DART_OBFUSCATION=false"
13+
export "TRACK_WIDGET_CREATION=false"
14+
export "TREE_SHAKE_ICONS=false"
15+
export "PACKAGE_CONFIG=.packages"

example/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@
381381
"$(inherited)",
382382
"$(PROJECT_DIR)/Flutter",
383383
);
384-
PRODUCT_BUNDLE_IDENTIFIER = com.amolg.flutterBarcodeScannerExample20;
384+
PRODUCT_BUNDLE_IDENTIFIER = com.amolg.flutterBarcodeScannerExample2021;
385385
PRODUCT_NAME = "$(TARGET_NAME)";
386386
PROVISIONING_PROFILE_SPECIFIER = "";
387387
SWIFT_VERSION = 5.0;
@@ -524,7 +524,7 @@
524524
"$(inherited)",
525525
"$(PROJECT_DIR)/Flutter",
526526
);
527-
PRODUCT_BUNDLE_IDENTIFIER = com.amolg.flutterBarcodeScannerExample20;
527+
PRODUCT_BUNDLE_IDENTIFIER = com.amolg.flutterBarcodeScannerExample2021;
528528
PRODUCT_NAME = "$(TARGET_NAME)";
529529
PROVISIONING_PROFILE_SPECIFIER = "";
530530
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -557,7 +557,7 @@
557557
"$(inherited)",
558558
"$(PROJECT_DIR)/Flutter",
559559
);
560-
PRODUCT_BUNDLE_IDENTIFIER = com.amolg.flutterBarcodeScannerExample20;
560+
PRODUCT_BUNDLE_IDENTIFIER = com.amolg.flutterBarcodeScannerExample2021;
561561
PRODUCT_NAME = "$(TARGET_NAME)";
562562
PROVISIONING_PROFILE_SPECIFIER = "";
563563
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

ios/flutter_barcode_scanner.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
Pod::Spec.new do |s|
55
s.name = 'flutter_barcode_scanner'
6-
s.version = '1.0.1'
6+
s.version = '1.0.2'
77
s.summary = 'A new Flutter plugin supports barcode scanning on both Android and iOS.'
88
s.description = <<-DESC
99
A new Flutter plugin supports barcode scanning on both Android and iOS.

0 commit comments

Comments
 (0)