Skip to content

Commit 73e2505

Browse files
Merge pull request #192 from AmolGangadhare/master-stable
Master <-- Master stable merge updates
2 parents 93c8447 + fafd563 commit 73e2505

File tree

8 files changed

+69
-57
lines changed

8 files changed

+69
-57
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: 40 additions & 29 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

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

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

4141
<ImageView
4242
android:id="@+id/imgViewBarcodeCaptureUseFlash"
43-
android:layout_width="40dp"
44-
android:layout_height="40dp"
43+
android:layout_width="48dp"
44+
android:layout_height="48dp"
4545
android:layout_centerInParent="true"
4646
android:contentDescription="Flash button"
4747
android:src="@drawable/ic_barcode_flash_off" />
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/bin/sh
2+
# This is a generated file; do not edit or check into version control.
3+
export "FLUTTER_ROOT=/Volumes/MyData/Flutter_SDK/flutter"
4+
export "FLUTTER_APPLICATION_PATH=/Users/admin/Desktop/FlutterBarcodeScanner/FBSStableMaster/flutter_barcode_scanner/example"
5+
export "FLUTTER_TARGET=lib/main.dart"
6+
export "FLUTTER_BUILD_DIR=build"
7+
export "SYMROOT=${SOURCE_ROOT}/../build/ios"
8+
export "FLUTTER_BUILD_NAME=2.0.0.0"
9+
export "FLUTTER_BUILD_NUMBER=2.0.0.0"
10+
export "DART_OBFUSCATION=false"
11+
export "TRACK_WIDGET_CREATION=false"
12+
export "TREE_SHAKE_ICONS=false"
13+
export "PACKAGE_CONFIG=.packages"

example/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@
383383
"$(inherited)",
384384
"$(PROJECT_DIR)/Flutter",
385385
);
386-
PRODUCT_BUNDLE_IDENTIFIER = com.amolg.flutterBarcodeScannerExample20;
386+
PRODUCT_BUNDLE_IDENTIFIER = com.amolg.flutterBarcodeScannerExample2021;
387387
PRODUCT_NAME = "$(TARGET_NAME)";
388388
PROVISIONING_PROFILE_SPECIFIER = "";
389389
SWIFT_VERSION = 5.0;
@@ -526,7 +526,7 @@
526526
"$(inherited)",
527527
"$(PROJECT_DIR)/Flutter",
528528
);
529-
PRODUCT_BUNDLE_IDENTIFIER = com.amolg.flutterBarcodeScannerExample20;
529+
PRODUCT_BUNDLE_IDENTIFIER = com.amolg.flutterBarcodeScannerExample2021;
530530
PRODUCT_NAME = "$(TARGET_NAME)";
531531
PROVISIONING_PROFILE_SPECIFIER = "";
532532
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -559,7 +559,7 @@
559559
"$(inherited)",
560560
"$(PROJECT_DIR)/Flutter",
561561
);
562-
PRODUCT_BUNDLE_IDENTIFIER = com.amolg.flutterBarcodeScannerExample20;
562+
PRODUCT_BUNDLE_IDENTIFIER = com.amolg.flutterBarcodeScannerExample2021;
563563
PRODUCT_NAME = "$(TARGET_NAME)";
564564
PROVISIONING_PROFILE_SPECIFIER = "";
565565
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

ios/Classes/SwiftFlutterBarcodeScannerPlugin.swift

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,11 @@ class BarcodeScannerViewController: UIViewController {
232232
super.viewWillAppear(animated)
233233
self.moveVertically()
234234
}
235+
236+
override public func viewDidDisappear(_ animated: Bool){
237+
// Stop video capture
238+
captureSession.stopRunning()
239+
}
235240

236241
// Init UI components needed
237242
func initUIComponents(){

ios/flutter_barcode_scanner.podspec

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)