Update Text Recognition for android to 17.0.0 (flutter#732)

bparrishMines · kroikie · commit f98d0d010ea3 · 2018-09-05T16:41:44.000-07:00
* Update Text Recognition for android

* Formatting
diff --git a/packages/firebase_ml_vision/android/build.gradle b/packages/firebase_ml_vision/android/build.gradle
@@ -33,7 +33,7 @@ android {
     }
     dependencies {
         api 'com.android.support:support-v4:27.1.1'
-        api 'com.google.firebase:firebase-ml-vision:16.0.0'
+        api 'com.google.firebase:firebase-ml-vision:17.0.0'
         api 'com.google.firebase:firebase-ml-vision-image-label-model:15.0.0'
     }
 }
diff --git a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FirebaseMlVisionPlugin.java b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/FirebaseMlVisionPlugin.java
@@ -61,14 +61,14 @@ public void onMethodCall(MethodCall call, Result result) {
           result.error("labelDetectorError", e.getLocalizedMessage(), null);
         }
         break;
-      case "TextDetector#detectInImage":
+      case "TextRecognizer#detectInImage":
         try {
           image = filePathToVisionImage((String) call.argument("path"));
-          TextDetector.instance.handleDetection(image, options, result);
+          TextRecognizer.instance.handleDetection(image, options, result);
         } catch (IOException e) {
-          result.error("textDetectorIOError", e.getLocalizedMessage(), null);
+          result.error("textRecognizerIOError", e.getLocalizedMessage(), null);
         } catch (Exception e) {
-          result.error("textDetectorError", e.getLocalizedMessage(), null);
+          result.error("textRecognizerError", e.getLocalizedMessage(), null);
         }
         break;
       default:
diff --git a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/TextDetector.java b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/TextDetector.java
diff --git a/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/TextRecognizer.java b/packages/firebase_ml_vision/android/src/main/java/io/flutter/plugins/firebasemlvision/TextRecognizer.java
@@ -0,0 +1,128 @@
+package io.flutter.plugins.firebasemlvision;
+
+import android.graphics.Point;
+import android.graphics.Rect;
+import android.support.annotation.NonNull;
+import com.google.android.gms.tasks.OnFailureListener;
+import com.google.android.gms.tasks.OnSuccessListener;
+import com.google.firebase.ml.vision.FirebaseVision;
+import com.google.firebase.ml.vision.common.FirebaseVisionImage;
+import com.google.firebase.ml.vision.text.FirebaseVisionText;
+import com.google.firebase.ml.vision.text.FirebaseVisionTextRecognizer;
+import com.google.firebase.ml.vision.text.RecognizedLanguage;
+import io.flutter.plugin.common.MethodChannel;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class TextRecognizer implements Detector {
+  public static final TextRecognizer instance = new TextRecognizer();
+
+  private TextRecognizer() {}
+
+  @Override
+  public void handleDetection(
+      FirebaseVisionImage image, Map<String, Object> options, final MethodChannel.Result result) {
+    FirebaseVisionTextRecognizer textRecognizer =
+        FirebaseVision.getInstance().getOnDeviceTextRecognizer();
+    textRecognizer
+        .processImage(image)
+        .addOnSuccessListener(
+            new OnSuccessListener<FirebaseVisionText>() {
+              @Override
+              public void onSuccess(FirebaseVisionText firebaseVisionText) {
+                Map<String, Object> visionTextData = new HashMap<>();
+                visionTextData.put("text", firebaseVisionText.getText());
+
+                List<Map<String, Object>> allBlockData = new ArrayList<>();
+                for (FirebaseVisionText.TextBlock block : firebaseVisionText.getTextBlocks()) {
+                  Map<String, Object> blockData = new HashMap<>();
+                  addData(
+                      blockData,
+                      block.getBoundingBox(),
+                      block.getConfidence(),
+                      block.getCornerPoints(),
+                      block.getRecognizedLanguages(),
+                      block.getText());
+
+                  List<Map<String, Object>> allLineData = new ArrayList<>();
+                  for (FirebaseVisionText.Line line : block.getLines()) {
+                    Map<String, Object> lineData = new HashMap<>();
+                    addData(
+                        lineData,
+                        line.getBoundingBox(),
+                        line.getConfidence(),
+                        line.getCornerPoints(),
+                        line.getRecognizedLanguages(),
+                        line.getText());
+
+                    List<Map<String, Object>> allElementData = new ArrayList<>();
+                    for (FirebaseVisionText.Element element : line.getElements()) {
+                      Map<String, Object> elementData = new HashMap<>();
+                      addData(
+                          elementData,
+                          element.getBoundingBox(),
+                          element.getConfidence(),
+                          element.getCornerPoints(),
+                          element.getRecognizedLanguages(),
+                          element.getText());
+
+                      allElementData.add(elementData);
+                    }
+                    lineData.put("elements", allElementData);
+                    allLineData.add(lineData);
+                  }
+                  blockData.put("lines", allLineData);
+                  allBlockData.add(blockData);
+                }
+
+                visionTextData.put("blocks", allBlockData);
+                result.success(visionTextData);
+              }
+            })
+        .addOnFailureListener(
+            new OnFailureListener() {
+              @Override
+              public void onFailure(@NonNull Exception exception) {
+                result.error("textRecognizerError", exception.getLocalizedMessage(), null);
+              }
+            });
+  }
+
+  private void addData(
+      Map<String, Object> addTo,
+      Rect boundingBox,
+      Float confidence,
+      Point[] cornerPoints,
+      List<RecognizedLanguage> languages,
+      String text) {
+
+    if (boundingBox != null) {
+      addTo.put("left", boundingBox.left);
+      addTo.put("top", boundingBox.top);
+      addTo.put("width", boundingBox.width());
+      addTo.put("height", boundingBox.height());
+    }
+
+    addTo.put("confidence", confidence == null ? null : (double) confidence);
+
+    List<int[]> points = new ArrayList<>();
+    if (cornerPoints != null) {
+      for (Point point : cornerPoints) {
+        points.add(new int[] {point.x, point.y});
+      }
+    }
+    addTo.put("points", points);
+
+    List<Map<String, Object>> allLanguageData = new ArrayList<>();
+    for (RecognizedLanguage language : languages) {
+      Map<String, Object> languageData = new HashMap<>();
+      languageData.put("languageCode", language.getLanguageCode());
+      allLanguageData.add(languageData);
+    }
+    addTo.put("recognizedLanguages", allLanguageData);
+
+    addTo.put("text", text);
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ android {`
`33`	`33`	`}`
`34`	`34`	`dependencies {`
`35`	`35`	`api 'com.android.support:support-v4:27.1.1'`
`36`		`- api 'com.google.firebase:firebase-ml-vision:16.0.0'`
	`36`	`+ api 'com.google.firebase:firebase-ml-vision:17.0.0'`
`37`	`37`	`api 'com.google.firebase:firebase-ml-vision-image-label-model:15.0.0'`
`38`	`38`	`}`
`39`	`39`	`}`