From b6f4f046de9528fed73d9919abb70d8de84cb5d1 Mon Sep 17 00:00:00 2001
From: rohan90 <rohan.mathai@agrostar.in>
Date: Mon, 10 Oct 2016 17:22:38 +0530
Subject: [PATCH] [fix, flash disabled for devices without flash
 capability][play services 9.0.0]

---
 .gitignore                                     | 10 ++++++----
 .idea/gradle.xml                               |  1 +
 .idea/misc.xml                                 |  2 +-
 .idea/runConfigurations.xml                    | 12 ------------
 .../MainActivity.java                          |  1 +
 materialbarcodescanner/build.gradle            |  2 +-
 .../MaterialBarcodeScannerActivity.java        |  3 +++
 .../MaterialBarcodeScannerBuilder.java         | 18 ++++++++++++++++++
 8 files changed, 31 insertions(+), 18 deletions(-)
 delete mode 100644 .idea/runConfigurations.xml

diff --git a/.gitignore b/.gitignore
index c6cbe56..b440021 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,10 @@
-*.iml
 .gradle
 /local.properties
-/.idea/workspace.xml
-/.idea/libraries
+/.idea
 .DS_Store
 /build
-/captures
+/app/build
+#/gradle
+#gradlew.bat
+#gradlew
+*.iml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index f7df76a..0330b66 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -14,6 +14,7 @@
             <option value="$PROJECT_DIR$/materialbarcodescanner" />
           </set>
         </option>
+        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 0771d4f..5ce934b 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -40,7 +40,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/src/main/java/com/edwardvanraak/materialbarcodescannerexample/MainActivity.java b/app/src/main/java/com/edwardvanraak/materialbarcodescannerexample/MainActivity.java
index e3fc3c6..86e9513 100644
--- a/app/src/main/java/com/edwardvanraak/materialbarcodescannerexample/MainActivity.java
+++ b/app/src/main/java/com/edwardvanraak/materialbarcodescannerexample/MainActivity.java
@@ -69,6 +69,7 @@ public void onResult(Barcode barcode) {
                         result.setText(barcode.rawValue);
                     }
                 })
+                .withFlashModeVisible(false)
                 .build();
         materialBarcodeScanner.startScan();
     }
diff --git a/materialbarcodescanner/build.gradle b/materialbarcodescanner/build.gradle
index de62655..0025b03 100644
--- a/materialbarcodescanner/build.gradle
+++ b/materialbarcodescanner/build.gradle
@@ -42,6 +42,6 @@ dependencies {
     testCompile 'junit:junit:4.12'
     compile 'org.greenrobot:eventbus:3.0.0'
     compile 'com.android.support:appcompat-v7:23.2.1'
-    compile 'com.google.android.gms:play-services-vision:8.4.0'
+    compile 'com.google.android.gms:play-services-vision:9.0.0'
     compile 'com.android.support:design:23.0.1'
 }
diff --git a/materialbarcodescanner/src/main/java/com/edwardvanraak/materialbarcodescanner/MaterialBarcodeScannerActivity.java b/materialbarcodescanner/src/main/java/com/edwardvanraak/materialbarcodescanner/MaterialBarcodeScannerActivity.java
index de0737f..2338d68 100644
--- a/materialbarcodescanner/src/main/java/com/edwardvanraak/materialbarcodescanner/MaterialBarcodeScannerActivity.java
+++ b/materialbarcodescanner/src/main/java/com/edwardvanraak/materialbarcodescanner/MaterialBarcodeScannerActivity.java
@@ -120,6 +120,9 @@ public void onClick(View v) {
         if(mMaterialBarcodeScannerBuilder.isFlashEnabledByDefault()){
             flashToggleIcon.setBackgroundResource(R.drawable.ic_flash_off_white_24dp);
         }
+        if(!mMaterialBarcodeScannerBuilder.isFlashModeEnabled()){//for hiding flash
+            flashOnButton.setVisibility(View.GONE);
+        }
     }
 
     /**
diff --git a/materialbarcodescanner/src/main/java/com/edwardvanraak/materialbarcodescanner/MaterialBarcodeScannerBuilder.java b/materialbarcodescanner/src/main/java/com/edwardvanraak/materialbarcodescanner/MaterialBarcodeScannerBuilder.java
index 7a71697..62f04c5 100644
--- a/materialbarcodescanner/src/main/java/com/edwardvanraak/materialbarcodescanner/MaterialBarcodeScannerBuilder.java
+++ b/materialbarcodescanner/src/main/java/com/edwardvanraak/materialbarcodescanner/MaterialBarcodeScannerBuilder.java
@@ -42,6 +42,8 @@ public class MaterialBarcodeScannerBuilder {
     protected int mTrackerResourceID = R.drawable.material_barcode_square_512;
     protected int mTrackerDetectedResourceID = R.drawable.material_barcode_square_512_green;
 
+    private boolean mFlashModeEnabled = true;
+
     /**
      * Default constructor
      */
@@ -326,4 +328,20 @@ public int getScannerMode() {
     public void clean() {
         mActivity = null;
     }
+
+    /**
+     * used for hiding or showing flash button on the camera
+     */
+    public MaterialBarcodeScannerBuilder withFlashModeVisible(boolean enabled){
+        mFlashModeEnabled = enabled;
+        return this;
+    }
+
+    /**
+     * Get the flash enabled by default value associated with this builder
+     * @return
+     */
+    public boolean isFlashModeEnabled() {
+        return mFlashModeEnabled;
+    }
 }