refactor: use lambda functions and listOf() on mlkit snippets (firebase#142)

thatfiredev · samtstern · commit 387a6f7f267b · 2019-10-16T17:00:46.000-07:00
diff --git a/mlkit/app/src/main/java/com/google/firebase/example/mlkit/kotlin/CustomModelActivity.kt b/mlkit/app/src/main/java/com/google/firebase/example/mlkit/kotlin/CustomModelActivity.kt
@@ -126,13 +126,10 @@ class CustomModelActivity : AppCompatActivity() {
                     // [END mlkit_read_result]
                     // [END_EXCLUDE]
                 }
-                .addOnFailureListener(
-                        object : OnFailureListener {
-                            override fun onFailure(e: Exception) {
-                                // Task failed with an exception
-                                // ...
-                            }
-                        })
+                .addOnFailureListener { e ->
+                    // Task failed with an exception
+                    // ...
+                }
         // [END mlkit_run_inference]
     }
 
diff --git a/mlkit/app/src/main/java/com/google/firebase/example/mlkit/kotlin/FaceDetectionActivity.kt b/mlkit/app/src/main/java/com/google/firebase/example/mlkit/kotlin/FaceDetectionActivity.kt
@@ -61,13 +61,10 @@ class FaceDetectionActivity : AppCompatActivity() {
                     // [END get_face_info]
                     // [END_EXCLUDE]
                 }
-                .addOnFailureListener(
-                        object : OnFailureListener {
-                            override fun onFailure(e: Exception) {
-                                // Task failed with an exception
-                                // ...
-                            }
-                        })
+                .addOnFailureListener { e ->
+                    // Task failed with an exception
+                    // ...
+                }
         // [END run_detector]
     }
 
diff --git a/mlkit/app/src/main/java/com/google/firebase/example/mlkit/kotlin/ImageLabelingActivity.kt b/mlkit/app/src/main/java/com/google/firebase/example/mlkit/kotlin/ImageLabelingActivity.kt
@@ -45,13 +45,10 @@ class ImageLabelingActivity : AppCompatActivity() {
                     // [END get_labels]
                     // [END_EXCLUDE]
                 }
-                .addOnFailureListener(
-                        object : OnFailureListener {
-                            override fun onFailure(e: Exception) {
-                                // Task failed with an exception
-                                // ...
-                            }
-                        })
+                .addOnFailureListener { e ->
+                    // Task failed with an exception
+                    // ...
+                }
         // [END run_detector]
     }
 
@@ -73,28 +70,22 @@ class ImageLabelingActivity : AppCompatActivity() {
 
         // [START run_detector_cloud]
         val result = detector.processImage(image)
-                .addOnSuccessListener(
-                        object : OnSuccessListener<List<FirebaseVisionImageLabel>> {
-                            override fun onSuccess(labels: List<FirebaseVisionImageLabel>) {
-                                // Task completed successfully
-                                // [START_EXCLUDE]
-                                // [START get_labels_cloud]
-                                for (label in labels) {
-                                    val text = label.text
-                                    val entityId = label.entityId
-                                    val confidence = label.confidence
-                                }
-                                // [END get_labels_cloud]
-                                // [END_EXCLUDE]
-                            }
-                        })
-                .addOnFailureListener(
-                        object : OnFailureListener {
-                            override fun onFailure(e: Exception) {
-                                // Task failed with an exception
-                                // ...
-                            }
-                        })
+                .addOnSuccessListener { labels ->
+                    // Task completed successfully
+                    // [START_EXCLUDE]
+                    // [START get_labels_cloud]
+                    for (label in labels) {
+                        val text = label.text
+                        val entityId = label.entityId
+                        val confidence = label.confidence
+                    }
+                    // [END get_labels_cloud]
+                    // [END_EXCLUDE]
+                }
+                .addOnFailureListener { e ->
+                    // Task failed with an exception
+                    // ...
+                }
         // [END run_detector_cloud]
     }
 }
diff --git a/mlkit/app/src/main/java/com/google/firebase/example/mlkit/kotlin/LandmarkRecognitionActivity.kt b/mlkit/app/src/main/java/com/google/firebase/example/mlkit/kotlin/LandmarkRecognitionActivity.kt
@@ -46,7 +46,7 @@ class LandmarkRecognitionActivity : AppCompatActivity() {
                     // [END get_landmarks_cloud]
                     // [END_EXCLUDE]
                 }
-                .addOnFailureListener {
+                .addOnFailureListener { e ->
                     // Task failed with an exception
                     // ...
                 }
diff --git a/mlkit/app/src/main/java/com/google/firebase/example/mlkit/kotlin/TextRecognitionActivity.kt b/mlkit/app/src/main/java/com/google/firebase/example/mlkit/kotlin/TextRecognitionActivity.kt
@@ -41,7 +41,7 @@ class TextRecognitionActivity : AppCompatActivity() {
                     // [END get_text]
                     // [END_EXCLUDE]
                 }
-                .addOnFailureListener {
+                .addOnFailureListener { e ->
                     // Task failed with an exception
                     // ...
                 }
@@ -51,7 +51,7 @@ class TextRecognitionActivity : AppCompatActivity() {
     private fun recognizeTextCloud(image: FirebaseVisionImage) {
         // [START set_detector_options_cloud]
         val options = FirebaseVisionCloudTextRecognizerOptions.Builder()
-                .setLanguageHints(Arrays.asList("en", "hi"))
+                .setLanguageHints(listOf("en", "hi"))
                 .build()
         // [END set_detector_options_cloud]
 
@@ -82,7 +82,7 @@ class TextRecognitionActivity : AppCompatActivity() {
                     // [END get_text_cloud]
                     // [END_EXCLUDE]
                 }
-                .addOnFailureListener {
+                .addOnFailureListener { e ->
                     // Task failed with an exception
                     // ...
                 }
@@ -130,7 +130,7 @@ class TextRecognitionActivity : AppCompatActivity() {
         // Or, to provide language hints to assist with language detection:
         // See https://cloud.google.com/vision/docs/languages for supported languages
         val options = FirebaseVisionCloudDocumentRecognizerOptions.Builder()
-                .setLanguageHints(Arrays.asList("en", "hi"))
+                .setLanguageHints(listOf("en", "hi"))
                 .build()
         val detector = FirebaseVision.getInstance()
                 .getCloudDocumentTextRecognizer(options)
@@ -147,11 +147,11 @@ class TextRecognitionActivity : AppCompatActivity() {
 
         // [START mlkit_process_doc_image]
         detector.processImage(myImage)
-                .addOnSuccessListener {
+                .addOnSuccessListener { firebaseVisionDocumentText ->
                     // Task completed successfully
                     // ...
                 }
-                .addOnFailureListener {
+                .addOnFailureListener { e ->
                     // Task failed with an exception
                     // ...
                 }

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ class LandmarkRecognitionActivity : AppCompatActivity() {`
`46`	`46`	`// [END get_landmarks_cloud]`
`47`	`47`	`// [END_EXCLUDE]`
`48`	`48`	`}`
`49`		`- .addOnFailureListener {`
	`49`	`+ .addOnFailureListener { e ->`
`50`	`50`	`// Task failed with an exception`
`51`	`51`	`// ...`
`52`	`52`	`}`