Merge pull request #192 from AmolGangadhare/master-stable

Master <-- Master stable merge updates
AmolGangadhare · Apr 19, 2021 · 73e2505 · 73e2505
2 parents 93c8447 + fafd563
commit 73e2505
Show file tree

Hide file tree

Showing 8 changed files with 69 additions and 57 deletions.
diff --git a/.idea/libraries/Flutter_Plugins.xml b/.idea/libraries/Flutter_Plugins.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 1.0.2
+
+* Android: Fixes #137 and #132
+* iOS: Fixes #97
+
 ## 1.0.1
 
 * Merge PR #90

diff --git a/android/src/main/res/layout/barcode_capture.xml b/android/src/main/res/layout/barcode_capture.xml
@@ -40,8 +40,8 @@
 
         <ImageView
             android:id="@+id/imgViewBarcodeCaptureUseFlash"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
             android:layout_centerInParent="true"
             android:contentDescription="Flash button"
             android:src="@drawable/ic_barcode_flash_off" />

diff --git a/example/ios/Flutter/flutter_export_environment.sh b/example/ios/Flutter/flutter_export_environment.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+# This is a generated file; do not edit or check into version control.
+export "FLUTTER_ROOT=/Volumes/MyData/Flutter_SDK/flutter"
+export "FLUTTER_APPLICATION_PATH=/Users/admin/Desktop/FlutterBarcodeScanner/FBSStableMaster/flutter_barcode_scanner/example"
+export "FLUTTER_TARGET=lib/main.dart"
+export "FLUTTER_BUILD_DIR=build"
+export "SYMROOT=${SOURCE_ROOT}/../build/ios"
+export "FLUTTER_BUILD_NAME=2.0.0.0"
+export "FLUTTER_BUILD_NUMBER=2.0.0.0"
+export "DART_OBFUSCATION=false"
+export "TRACK_WIDGET_CREATION=false"
+export "TREE_SHAKE_ICONS=false"
+export "PACKAGE_CONFIG=.packages"
diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj
@@ -383,7 +383,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.amolg.flutterBarcodeScannerExample20;
+				PRODUCT_BUNDLE_IDENTIFIER = com.amolg.flutterBarcodeScannerExample2021;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 5.0;
@@ -526,7 +526,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.amolg.flutterBarcodeScannerExample20;
+				PRODUCT_BUNDLE_IDENTIFIER = com.amolg.flutterBarcodeScannerExample2021;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -559,7 +559,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.amolg.flutterBarcodeScannerExample20;
+				PRODUCT_BUNDLE_IDENTIFIER = com.amolg.flutterBarcodeScannerExample2021;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

diff --git a/ios/Classes/SwiftFlutterBarcodeScannerPlugin.swift b/ios/Classes/SwiftFlutterBarcodeScannerPlugin.swift
@@ -232,6 +232,11 @@ class BarcodeScannerViewController: UIViewController {
         super.viewWillAppear(animated)
         self.moveVertically()
     }
+
+    override public func viewDidDisappear(_ animated: Bool){
+        // Stop video capture
+        captureSession.stopRunning()
+    }
 
     // Init UI components needed
     func initUIComponents(){

diff --git a/ios/flutter_barcode_scanner.podspec b/ios/flutter_barcode_scanner.podspec