update android project settings and some code opt (#575)

flutter-ml · Feb 1, 2024 · a5234e6 · a5234e6
1 parent 2687e38
commit a5234e6
Show file tree

Hide file tree

Showing 16 changed files with 188 additions and 114 deletions.
diff --git a/packages/example/pubspec.lock b/packages/example/pubspec.lock
diff --git a/packages/google_mlkit_barcode_scanning/android/build.gradle b/packages/google_mlkit_barcode_scanning/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.4.2'
     }
 }
 
@@ -27,7 +27,7 @@ android {
         namespace 'com.google_mlkit_barcode_scanning'
     }
 
-    compileSdkVersion 31
+    compileSdk 34
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -40,5 +40,5 @@ android {
 }
 
 dependencies {
-    implementation 'com.google.mlkit:barcode-scanning:17.1.0'
+    implementation 'com.google.mlkit:barcode-scanning:17.2.0'
 }
diff --git a/packages/google_mlkit_commons/android/build.gradle b/packages/google_mlkit_commons/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.4.2'
     }
 }
 
@@ -27,7 +27,7 @@ android {
         namespace 'com.google_mlkit_commons'
     }
 
-    compileSdkVersion 29
+    compileSdk 34
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8

diff --git a/packages/google_mlkit_digital_ink_recognition/android/build.gradle b/packages/google_mlkit_digital_ink_recognition/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.4.2'
     }
 }
 
@@ -27,7 +27,7 @@ android {
         namespace 'com.google_mlkit_digital_ink_recognition'
     }
 
-    compileSdkVersion 31
+    compileSdk 34
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8

diff --git a/packages/google_mlkit_entity_extraction/android/build.gradle b/packages/google_mlkit_entity_extraction/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.4.2'
     }
 }
 
@@ -27,7 +27,7 @@ android {
         namespace 'com.google_mlkit_entity_extraction'
     }
 
-    compileSdkVersion 31
+    compileSdk 34
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8

diff --git a/packages/google_mlkit_face_detection/android/build.gradle b/packages/google_mlkit_face_detection/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.4.2'
     }
 }
 
@@ -27,7 +27,7 @@ android {
         namespace 'com.google_mlkit_face_detection'
     }
 
-    compileSdkVersion 31
+    compileSdk 34
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8

diff --git a/packages/google_mlkit_face_mesh_detection/android/build.gradle b/packages/google_mlkit_face_mesh_detection/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.4.2'
     }
 }
 
@@ -27,7 +27,7 @@ android {
         namespace 'com.google_mlkit_face_mesh_detection'
     }
 
-    compileSdkVersion 31
+    compileSdk 34
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8

diff --git a/packages/google_mlkit_image_labeling/android/build.gradle b/packages/google_mlkit_image_labeling/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.4.2'
     }
 }
 
@@ -27,7 +27,7 @@ android {
         namespace 'com.google_mlkit_image_labeling'
     }
 
-    compileSdkVersion 31
+    compileSdk 34
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -41,6 +41,6 @@ android {
 
 dependencies {
     implementation 'com.google.mlkit:image-labeling:17.0.7'
-    implementation 'com.google.mlkit:image-labeling-custom:17.0.1'
+    implementation 'com.google.mlkit:image-labeling-custom:17.0.2'
     implementation 'com.google.mlkit:linkfirebase:17.0.0'
 }
diff --git a/packages/google_mlkit_language_id/android/build.gradle b/packages/google_mlkit_language_id/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.4.2'
     }
 }
 
@@ -27,7 +27,7 @@ android {
         namespace 'com.google_mlkit_language_id'
     }
 
-    compileSdkVersion 31
+    compileSdk 34
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8

diff --git a/packages/google_mlkit_object_detection/android/build.gradle b/packages/google_mlkit_object_detection/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.4.2'
     }
 }
 
@@ -27,7 +27,7 @@ android {
         namespace 'com.google_mlkit_object_detection'
     }
 
-    compileSdkVersion 31
+    compileSdk 34
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -41,6 +41,6 @@ android {
 
 dependencies {
     implementation 'com.google.mlkit:object-detection:17.0.0'
-    implementation 'com.google.mlkit:object-detection-custom:17.0.0'
+    implementation 'com.google.mlkit:object-detection-custom:17.0.1'
     implementation 'com.google.mlkit:linkfirebase:17.0.0'
 }
diff --git a/packages/google_mlkit_pose_detection/android/build.gradle b/packages/google_mlkit_pose_detection/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.4.2'
     }
 }
 
@@ -27,7 +27,7 @@ android {
         namespace 'com.google_mlkit_pose_detection'
     }
 
-    compileSdkVersion 31
+    compileSdk 34
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8

diff --git a/packages/google_mlkit_selfie_segmentation/android/build.gradle b/packages/google_mlkit_selfie_segmentation/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.4.2'
     }
 }
 
@@ -27,7 +27,7 @@ android {
         namespace 'com.google_mlkit_selfie_segmentation'
     }
 
-    compileSdkVersion 31
+    compileSdk 34
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8

diff --git a/packages/google_mlkit_smart_reply/android/build.gradle b/packages/google_mlkit_smart_reply/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.4.2'
     }
 }
 
@@ -26,8 +26,8 @@ android {
     if (project.android.hasProperty("namespace")) {
         namespace 'com.google_mlki_smart_reply'
     }
-    
-    compileSdkVersion 31
+
+    compileSdk 34
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8

diff --git a/packages/google_mlkit_text_recognition/android/build.gradle b/packages/google_mlkit_text_recognition/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.4.2'
     }
 }
 
@@ -27,7 +27,7 @@ android {
         namespace 'com.google_mlkit_text_recognition'
     }
 
-    compileSdkVersion 31
+    compileSdk 34
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8

diff --git a/...t_recognition/android/src/main/java/com/google_mlkit_text_recognition/TextRecognizer.java b/...t_recognition/android/src/main/java/com/google_mlkit_text_recognition/TextRecognizer.java
@@ -53,7 +53,10 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull MethodChannel.Result
     }
 
     private com.google.mlkit.vision.text.TextRecognizer initialize(MethodCall call) {
-        int script = (int) call.argument("script");
+        Integer script = call.argument("script");
+        if (script == null) {
+            return null;
+        }
         switch (script) {
             case 0:
                 return TextRecognition.getClient(TextRecognizerOptions.DEFAULT_OPTIONS);
@@ -71,7 +74,10 @@ private com.google.mlkit.vision.text.TextRecognizer initialize(MethodCall call)
     }
 
     private void handleDetection(MethodCall call, final MethodChannel.Result result) {
-        Map<String, Object> imageData = (Map<String, Object>) call.argument("imageData");
+        Map<String, Object> imageData = call.argument("imageData");
+        if (imageData == null) {
+            return;
+        }
         InputImage inputImage = InputImageConverter.getInputImageFromData(imageData, context, result);
         if (inputImage == null) return;
 
@@ -81,7 +87,10 @@ private void handleDetection(MethodCall call, final MethodChannel.Result result)
             textRecognizer = initialize(call);
             instances.put(id, textRecognizer);
         }
-
+        if (textRecognizer == null) {
+            result.error("TextRecognizerError", "TextRecognizer is not initialized", null);
+            return;
+        }
         textRecognizer.process(inputImage)
                 .addOnSuccessListener(text -> {
                     Map<String, Object> textResult = new HashMap<>();
@@ -96,8 +105,8 @@ private void handleDetection(MethodCall call, final MethodChannel.Result result)
                                 block.getText(),
                                 block.getBoundingBox(),
                                 block.getCornerPoints(),
-                                block.getRecognizedLanguage(), 
-                                null, 
+                                block.getRecognizedLanguage(),
+                                null,
                                 null);
 
                         List<Map<String, Object>> textLines = new ArrayList<>();
@@ -108,8 +117,8 @@ private void handleDetection(MethodCall call, final MethodChannel.Result result)
                                     line.getText(),
                                     line.getBoundingBox(),
                                     line.getCornerPoints(),
-                                    line.getRecognizedLanguage(), 
-                                    line.getConfidence(), 
+                                    line.getRecognizedLanguage(),
+                                    line.getConfidence(),
                                     line.getAngle());
 
                             List<Map<String, Object>> elementsData = new ArrayList<>();
@@ -157,10 +166,10 @@ private void addData(Map<String, Object> addTo,
                          String text,
                          Rect rect,
                          Point[] cornerPoints,
-                         String recognizedLanguage, 
+                         String recognizedLanguage,
                          Float confidence,
                          Float angle
-                         ) {
+    ) {
         List<String> recognizedLanguages = new ArrayList<>();
         recognizedLanguages.add(recognizedLanguage);
         List<Map<String, Integer>> points = new ArrayList<>();

diff --git a/packages/google_mlkit_translation/android/build.gradle b/packages/google_mlkit_translation/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.4.2'
     }
 }
 
@@ -27,7 +27,7 @@ android {
         namespace 'com.google_mlkit_translation'
     }
 
-    compileSdkVersion 31
+    compileSdk 34
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -40,5 +40,5 @@ android {
 }
 
 dependencies {
-    implementation 'com.google.mlkit:translate:17.0.1'
+    implementation 'com.google.mlkit:translate:17.0.2'
 }