[pull] master from googlesamples:master

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,36 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: "[Bug report] Title for the bug"
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Example Steps to reproduce the behavior in sample app:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+If applicable, please include `code snippet` and `sample input(image, video, text, etc)` 
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**SDK Info:**
+ - SDK Name & Version [e.g. com.google.mlkit:face-detection:16.1.3]
+
+**Smartphone:**
+ - Device/Simulator: [e.g. iPhone6, Pixel 5]
+ - Device/Simulator OS: [e.g. iOS8.1, Android API 30]
+
+**Development Environment:**
+*(For Android issue feel free to skip this section)*
+- IDE Eversion: [e.g. Xcode 13.1, Android Studio 4.2]
+- Laptop/Desktop: [e.g. iMac Pro (2017), HP Z840 Workstation]
+- Laptop/Desktop OS/version: [e.g. macOS 12.0.1]

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: "[Feature request] Title for the request"
+labels: ''
+assignees: ''
+
+---
+
+**What's your feature request? Please describe.**
+A clear and concise description of what the request is. Ex. I would like to have X language support in text recognition[...]
+
+**Mobile environment**
+Android, IOS or both
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

android/android-snippets/app/build.gradle

@@ -3,12 +3,12 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
 
     defaultConfig {
         applicationId "com.google.example.mlkit"
-        minSdkVersion 16
-        targetSdkVersion 29
+        minSdkVersion 19
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -28,9 +28,9 @@ android {
 
 dependencies {
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.exifinterface:exifinterface:1.2.0'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72"
+    implementation 'androidx.appcompat:appcompat:1.4.2'
+    implementation 'androidx.exifinterface:exifinterface:1.3.3'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     // Add this dependency and multiDexEnabled = true in your defaultConfig to solve the error:
     // Cannot fit requested classes in a single dex file
@@ -39,24 +39,24 @@ dependencies {
     // ML Kit related dependencies
 
     // Barcode model
-    implementation 'com.google.mlkit:barcode-scanning:16.0.3'
+    implementation 'com.google.mlkit:barcode-scanning:17.0.2'
 
     // Object detection and tracking features
-    implementation 'com.google.mlkit:object-detection:16.2.1'
-    implementation 'com.google.mlkit:object-detection-custom:16.2.1'
+    implementation 'com.google.mlkit:object-detection:17.0.0'
+    implementation 'com.google.mlkit:object-detection-custom:17.0.0'
 
     // Face features
-    implementation 'com.google.android.gms:play-services-mlkit-face-detection:16.1.1'
+    implementation 'com.google.android.gms:play-services-mlkit-face-detection:17.0.1'
 
     // Text features
-    implementation 'com.google.android.gms:play-services-mlkit-text-recognition:16.1.1'
+    implementation 'com.google.android.gms:play-services-mlkit-text-recognition:18.0.0'
 
     // Image labeling
-    implementation 'com.google.mlkit:image-labeling:17.0.0'
+    implementation 'com.google.mlkit:image-labeling:17.0.7'
 
     // Language Identification
-    implementation 'com.google.mlkit:language-id:16.1.1'
+    implementation 'com.google.mlkit:language-id:17.0.3'
 
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0'
+    implementation 'androidx.appcompat:appcompat:1.4.2'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 }

android/android-snippets/app/src/main/AndroidManifest.xml

@@ -1,22 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     package="com.google.example.mlkit">
 
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+  <application
+      android:allowBackup="true"
+      android:icon="@mipmap/ic_launcher"
+      android:label="@string/app_name"
+      android:supportsRtl="true"
+      android:theme="@style/AppTheme">
+    <activity
+        android:name=".MainActivity"
+        android:exported="true">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity android:name=".kotlin.MainActivity" />
-    </application>
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+    </activity>
+    <activity android:name=".kotlin.MainActivity" />
+  </application>
 
 </manifest>

android/android-snippets/app/src/main/java/com/google/example/mlkit/BarcodeScanningActivity.java

@@ -25,7 +25,7 @@
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.android.gms.tasks.Task;
-import com.google.mlkit.vision.barcode.Barcode;
+import com.google.mlkit.vision.barcode.common.Barcode;
 import com.google.mlkit.vision.barcode.BarcodeScanner;
 import com.google.mlkit.vision.barcode.BarcodeScannerOptions;
 import com.google.mlkit.vision.barcode.BarcodeScanning;

android/android-snippets/app/src/main/java/com/google/example/mlkit/TextRecognitionActivity.java

@@ -29,7 +29,7 @@
 import com.google.mlkit.vision.text.Text;
 import com.google.mlkit.vision.text.TextRecognition;
 import com.google.mlkit.vision.text.TextRecognizer;
-import com.google.mlkit.vision.text.TextRecognizerOptions;
+import com.google.mlkit.vision.text.latin.TextRecognizerOptions;
 
 public class TextRecognitionActivity extends AppCompatActivity {
 
@@ -62,6 +62,9 @@ public void onSuccess(Text visionText) {
                                         // ...
                                         for (Text.Element element: line.getElements()) {
                                             // ...
+                                            for (Text.Symbol symbol: element.getSymbols()) {
+                                                // ...
+                                            }
                                         }
                                     }
                                 }
@@ -95,6 +98,11 @@ private void processTextBlock(Text result) {
                     String elementText = element.getText();
                     Point[] elementCornerPoints = element.getCornerPoints();
                     Rect elementFrame = element.getBoundingBox();
+                    for (Text.Symbol symbol : element.getSymbols()) {
+                        String symbolText = symbol.getText();
+                        Point[] symbolCornerPoints = symbol.getCornerPoints();
+                        Rect symbolFrame = symbol.getBoundingBox();
+                    }
                 }
             }
         }

android/android-snippets/app/src/main/java/com/google/example/mlkit/kotlin/BarcodeScanningActivity.kt

@@ -17,10 +17,9 @@
 package com.google.example.mlkit.kotlin
 
 import androidx.appcompat.app.AppCompatActivity
-import com.google.mlkit.vision.barcode.Barcode
-import com.google.mlkit.vision.barcode.BarcodeScanner
 import com.google.mlkit.vision.barcode.BarcodeScannerOptions
 import com.google.mlkit.vision.barcode.BarcodeScanning
+import com.google.mlkit.vision.barcode.common.Barcode
 import com.google.mlkit.vision.common.InputImage
 
 class BarcodeScanningActivity : AppCompatActivity() {

android/android-snippets/app/src/main/java/com/google/example/mlkit/kotlin/TextRecognitionActivity.kt

@@ -21,7 +21,7 @@ import com.google.mlkit.vision.common.InputImage
 import com.google.mlkit.vision.text.Text
 import com.google.mlkit.vision.text.TextRecognition
 import com.google.mlkit.vision.text.TextRecognizer
-import com.google.mlkit.vision.text.TextRecognizerOptions
+import com.google.mlkit.vision.text.latin.TextRecognizerOptions
 
 class TextRecognitionActivity : AppCompatActivity() {
 

android/android-snippets/build.gradle

@@ -1,14 +1,15 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+    ext.kotlin_version = '1.4.31'
     repositories {
         mavenLocal()
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72"
+        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 

android/android-snippets/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip

android/automl/app/build.gradle

@@ -1,17 +1,16 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 34
 
     defaultConfig {
         applicationId "com.google.mlkit.vision.automl.demo"
-        minSdkVersion 16
+        minSdkVersion 21
         multiDexEnabled true
-        targetSdkVersion 30
+        targetSdkVersion 34
         // Version code for next release (version 9 is now in Play Store)
         versionCode 11
         versionName "1.11"
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         setProperty("archivesBaseName", "vision-automl-remote-model-quickstart")
     }
@@ -51,35 +50,26 @@ android {
 }
 
 repositories {
-    maven { url 'https://google.bintray.com/tensorflow' }
     // Depending on AndroidX Snapshot Builds to get the latest CameraX libs.
     maven { url 'https://androidx.dev/snapshots/builds/6787662/artifacts/repository/' }
 }
 
 dependencies {
     // Image labeling with AutoML model support
-    implementation 'com.google.mlkit:image-labeling-custom:16.3.1'
-    implementation 'com.google.mlkit:object-detection-custom:16.3.1'
-    implementation 'com.google.mlkit:linkfirebase:16.1.1'
+    implementation 'com.google.mlkit:image-labeling-custom:17.0.3'
+    // Or comment the dependency above and uncomment the dependency below to
+    // use unbundled model that depends on Google Play Services
+    // implementation 'com.google.android.gms:play-services-mlkit-image-labeling-custom:16.0.0-beta5'
+
+    implementation 'com.google.mlkit:object-detection-custom:17.0.2'
+    implementation 'com.google.mlkit:linkfirebase:17.0.0'
 
     implementation 'androidx.multidex:multidex:2.0.1'
     // -------------------------------------------------------
 
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.google.guava:guava:27.1-android'
 
-    // For how to setup gradle dependencies in Android X, see:
-    // https://developer.android.com/training/testing/set-up-project#gradle-dependencies
-    // Core library
-    androidTestImplementation 'androidx.test:core:1.3.0'
-
-    // AndroidJUnitRunner and JUnit Rules
-    androidTestImplementation 'androidx.test:runner:1.3.0'
-    androidTestImplementation 'androidx.test:rules:1.3.0'
-
-    // Assertions
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-
     // ViewModel and LiveData
     implementation "androidx.lifecycle:lifecycle-livedata:2.3.1"
     implementation "androidx.lifecycle:lifecycle-viewmodel:2.3.1"

android/automl/app/src/main/AndroidManifest.xml

@@ -6,7 +6,7 @@
     android:installLocation="auto">
 
   <!-- CameraX libraries require minSdkVersion 21, while this quickstart app
-  supports low to 16. Needs to use overrideLibrary to make the merger tool
+  supports low to 19. Needs to use overrideLibrary to make the merger tool
   ignore this conflict and import the libraries while keeping the app's lower
   minSdkVersion value. In code, will check SDK version, before calling CameraX
   APIs. -->
@@ -31,6 +31,9 @@
     <meta-data
         android:name="com.google.android.gms.version"
         android:value="@integer/google_play_services_version"/>
+    <meta-data
+        android:name="com.google.mlkit.vision.DEPENDENCIES"
+        android:value="custom_ica"/>
 
     <activity
         android:name=".ChooserActivity"

android/automl/app/src/main/java/com/google/mlkit/vision/automl/demo/BitmapUtils.java

@@ -18,7 +18,6 @@
 
 import static java.lang.Math.min;
 
-import android.annotation.TargetApi;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -71,18 +70,19 @@ public static Bitmap getBitmap(ByteBuffer data, FrameMetadata metadata) {
   }
 
   /** Converts a YUV_420_888 image from CameraX API to a bitmap. */
-  @RequiresApi(VERSION_CODES.KITKAT)
+  @RequiresApi(VERSION_CODES.LOLLIPOP)
   @Nullable
   @ExperimentalGetImage
   public static Bitmap getBitmap(ImageProxy image) {
-    FrameMetadata frameMetadata = new FrameMetadata.Builder()
-        .setWidth(image.getWidth())
-        .setHeight(image.getHeight())
-        .setRotation(image.getImageInfo().getRotationDegrees())
-        .build();
-
-    ByteBuffer nv21Buffer = yuv420ThreePlanesToNV21(
-        image.getImage().getPlanes(), image.getWidth(), image.getHeight());
+    FrameMetadata frameMetadata =
+        new FrameMetadata.Builder()
+            .setWidth(image.getWidth())
+            .setHeight(image.getHeight())
+            .setRotation(image.getImageInfo().getRotationDegrees())
+            .build();
+
+    ByteBuffer nv21Buffer =
+        yuv420ThreePlanesToNV21(image.getImage().getPlanes(), image.getWidth(), image.getHeight());
     return getBitmap(nv21Buffer, frameMetadata);
   }
 
@@ -304,7 +304,6 @@ private static byte[] nv21Toyv12(byte[] nv21Bytes) {
    * before the U buffer and the planes have a pixelStride of 2. If this is case, we can just copy
    * them to the NV21 array.
    */
-  @RequiresApi(VERSION_CODES.KITKAT)
   private static ByteBuffer yuv420ThreePlanesToNV21(
       Plane[] yuv420888planes, int width, int height) {
     int imageSize = width * height;
@@ -334,7 +333,6 @@ private static ByteBuffer yuv420ThreePlanesToNV21(
   }
 
   /** Checks if the UV plane buffers of a YUV_420_888 image are in the NV21 format. */
-  @RequiresApi(VERSION_CODES.KITKAT)
   private static boolean areUVPlanesNV21(Plane[] planes, int width, int height) {
     int imageSize = width * height;
 
@@ -367,7 +365,6 @@ private static boolean areUVPlanesNV21(Plane[] planes, int width, int height) {
    * <p>The input plane data will be copied in 'out', starting at 'offset' and every pixel will be
    * spaced by 'pixelStride'. Note that there is no row padding on the output.
    */
-  @TargetApi(VERSION_CODES.KITKAT)
   private static void unpackPlane(
       Plane plane, int width, int height, byte[] out, int offset, int pixelStride) {
     ByteBuffer buffer = plane.getBuffer();