Merge "List of included changes: - Enable auto zoom feature for MLKit code scanner."

Author: Yun Liu

android/codescanner/app/build.gradle

@@ -43,7 +43,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.google.android.material:material:1.5.0'
 
-    implementation 'com.google.android.gms:play-services-code-scanner:16.0.0-beta3'
+    implementation 'com.google.android.gms:play-services-code-scanner:16.1.0'
 
     androidTestImplementation 'androidx.test:rules:1.4.0'
     androidTestImplementation 'androidx.test:runner:1.4.0'

android/codescanner/app/src/main/java/com/google/mlkit/samples/codescanner/java/MainActivity.java

@@ -34,8 +34,10 @@
 public class MainActivity extends AppCompatActivity {
 
   private static final String KEY_ALLOW_MANUAL_INPUT = "allow_manual_input";
+  private static final String KEY_ENABLE_AUTO_ZOOM = "enable_auto_zoom";
 
   private boolean allowManualInput;
+  private boolean enableAutoZoom;
   private TextView barcodeResultView;
 
   @Override
@@ -50,11 +52,18 @@ public void onAllowManualInputCheckboxClicked(View view) {
     allowManualInput = ((CheckBox) view).isChecked();
   }
 
+  public void onEnableAutoZoomCheckboxClicked(View view) {
+    enableAutoZoom = ((CheckBox) view).isChecked();
+  }
+
   public void onScanButtonClicked(View view) {
     GmsBarcodeScannerOptions.Builder optionsBuilder = new GmsBarcodeScannerOptions.Builder();
     if (allowManualInput) {
       optionsBuilder.allowManualInput();
     }
+    if (enableAutoZoom) {
+      optionsBuilder.enableAutoZoom();
+    }
     GmsBarcodeScanner gmsBarcodeScanner =
         GmsBarcodeScanning.getClient(this, optionsBuilder.build());
     gmsBarcodeScanner
@@ -69,13 +78,15 @@ public void onScanButtonClicked(View view) {
   @Override
   protected void onSaveInstanceState(Bundle savedInstanceState) {
     savedInstanceState.putBoolean(KEY_ALLOW_MANUAL_INPUT, allowManualInput);
+    savedInstanceState.putBoolean(KEY_ENABLE_AUTO_ZOOM, enableAutoZoom);
     super.onSaveInstanceState(savedInstanceState);
   }
 
   @Override
   protected void onRestoreInstanceState(Bundle savedInstanceState) {
     super.onRestoreInstanceState(savedInstanceState);
     allowManualInput = savedInstanceState.getBoolean(KEY_ALLOW_MANUAL_INPUT);
+    enableAutoZoom = savedInstanceState.getBoolean(KEY_ENABLE_AUTO_ZOOM);
   }
 
   private String getSuccessfulMessage(Barcode barcode) {

android/codescanner/app/src/main/java/com/google/mlkit/samples/codescanner/kotlin/MainActivity.kt

@@ -32,6 +32,7 @@ import java.util.Locale
 class MainActivity : AppCompatActivity() {
 
   private var allowManualInput = false
+  private var enableAutoZoom = false
   private var barcodeResultView: TextView? = null
 
   override fun onCreate(savedInstanceState: Bundle?) {
@@ -44,11 +45,18 @@ class MainActivity : AppCompatActivity() {
     allowManualInput = (view as CheckBox).isChecked
   }
 
+  fun onEnableAutoZoomCheckboxClicked(view: View) {
+    enableAutoZoom = (view as CheckBox).isChecked
+  }
+
   fun onScanButtonClicked(view: View) {
     val optionsBuilder = GmsBarcodeScannerOptions.Builder()
     if (allowManualInput) {
       optionsBuilder.allowManualInput()
     }
+    if (enableAutoZoom) {
+      optionsBuilder.enableAutoZoom()
+    }
     val gmsBarcodeScanner = GmsBarcodeScanning.getClient(this, optionsBuilder.build())
     gmsBarcodeScanner
       .startScan()
@@ -63,12 +71,14 @@ class MainActivity : AppCompatActivity() {
 
   override fun onSaveInstanceState(savedInstanceState: Bundle) {
     savedInstanceState.putBoolean(KEY_ALLOW_MANUAL_INPUT, allowManualInput)
+    savedInstanceState.putBoolean(KEY_ENABLE_AUTO_ZOOM, enableAutoZoom)
     super.onSaveInstanceState(savedInstanceState)
   }
 
   override fun onRestoreInstanceState(savedInstanceState: Bundle) {
     super.onRestoreInstanceState(savedInstanceState)
     allowManualInput = savedInstanceState.getBoolean(KEY_ALLOW_MANUAL_INPUT)
+    enableAutoZoom = savedInstanceState.getBoolean(KEY_ENABLE_AUTO_ZOOM)
   }
 
   private fun getSuccessfulMessage(barcode: Barcode): String {
@@ -100,5 +110,6 @@ class MainActivity : AppCompatActivity() {
 
   companion object {
     private const val KEY_ALLOW_MANUAL_INPUT = "allow_manual_input"
+    private const val KEY_ENABLE_AUTO_ZOOM = "enable_auto_zoom"
   }
 }

android/codescanner/app/src/main/res/layout/activity_main.xml

@@ -11,6 +11,12 @@
       android:layout_height="wrap_content"
       android:onClick="onAllowManualInputCheckboxClicked"
       android:text="@string/allow_manual_input" />
+  <CheckBox
+      android:id="@+id/enable_auto_zoom"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:onClick="onEnableAutoZoomCheckboxClicked"
+      android:text="@string/enable_auto_zoom" />
   <Button
       android:id="@+id/scan_barcode_button"
       android:layout_width="wrap_content"

android/codescanner/app/src/main/res/values/strings.xml

@@ -1,6 +1,7 @@
 <resources>
   <string name="app_name" translatable="false">Code Scanner Demo</string>
   <string name="allow_manual_input" translatable="false">Allow input code manually</string>
+  <string name="enable_auto_zoom" translatable="false">Enable auto-zoom feature</string>
   <string name="scan_barcode_button" translatable="false">Scan Barcode</string>
   <string name="barcode_result" translatable="false">Barcode detected.\n%1$s</string>
   <string name="error_scanner_cancelled" translatable="false">Code scanner is cancelled.</string>