cordova-plugin-mlkit-suite 0.1.0 → 0.2.0

package/src/android/java/BarcodeOverlayView.java

@@ -1,5 +1,6 @@
 package com.andreszs.plugins.mlkitsuite;
 
+import android.animation.ValueAnimator;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Color;
@@ -9,14 +10,20 @@ import android.graphics.Rect;
 import android.graphics.RectF;
 import android.util.AttributeSet;
 import android.view.View;
+import android.view.animation.DecelerateInterpolator;
 
 final class BarcodeOverlayView extends View {
     private final Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG);
     private final RectF guide = new RectF();
+    private final RectF animatedGuide = new RectF();
+    private final RectF animationStart = new RectF();
+    private final RectF animationTarget = new RectF();
     private final String instruction;
     private final Integer guideColor;
     private String message;
     private boolean candidateVisible;
+    private boolean successVisible;
+    private ValueAnimator successAnimator;
 
     BarcodeOverlayView(Context context, String instruction, Integer guideColor,
                        String initialMessage) {
@@ -49,35 +56,76 @@ final class BarcodeOverlayView extends View {
         );
     }
 
+    void showSuccess(Rect bounds, int imageWidth, int imageHeight, String text) {
+        updateGuide(getWidth(), getHeight());
+        float[] mapped = bounds == null ? null : BarcodeScanRegion.map(
+            getWidth(), getHeight(), imageWidth, imageHeight,
+            bounds.left, bounds.top, bounds.right, bounds.bottom
+        );
+        animationStart.set(guide);
+        if (mapped == null) {
+            animationTarget.set(guide);
+        } else {
+            float padding = dp(10);
+            animationTarget.set(
+                Math.max(0, mapped[0] - padding),
+                Math.max(0, mapped[1] - padding),
+                Math.min(getWidth(), mapped[2] + padding),
+                Math.min(getHeight(), mapped[3] + padding)
+            );
+        }
+        animatedGuide.set(animationStart);
+        message = text;
+        candidateVisible = true;
+        successVisible = true;
+        if (successAnimator != null) successAnimator.cancel();
+        successAnimator = ValueAnimator.ofFloat(0f, 1f);
+        successAnimator.setDuration(220L);
+        successAnimator.setInterpolator(new DecelerateInterpolator());
+        successAnimator.addUpdateListener(animation -> {
+            float progress = (float) animation.getAnimatedValue();
+            animatedGuide.set(
+                lerp(animationStart.left, animationTarget.left, progress),
+                lerp(animationStart.top, animationTarget.top, progress),
+                lerp(animationStart.right, animationTarget.right, progress),
+                lerp(animationStart.bottom, animationTarget.bottom, progress)
+            );
+            invalidate();
+        });
+        successAnimator.start();
+    }
+
     @Override
     protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
         float width = getWidth();
         float height = getHeight();
         updateGuide(width, height);
+        RectF frame = successVisible ? animatedGuide : guide;
 
         Path shade = new Path();
         shade.setFillType(Path.FillType.EVEN_ODD);
         shade.addRect(0, 0, width, height, Path.Direction.CW);
-        shade.addRoundRect(guide, dp(18), dp(18), Path.Direction.CCW);
+        shade.addRoundRect(frame, dp(18), dp(18), Path.Direction.CCW);
         paint.setStyle(Paint.Style.FILL);
         paint.setColor(0x99000000);
         canvas.drawPath(shade, paint);
 
         int color = candidateVisible ? 0xff4ade80 : Color.WHITE;
         if (candidateVisible) {
-            drawCornerFrame(canvas, color, color, color, color);
+            drawCornerFrame(canvas, frame, color, color, color, color);
         } else if (guideColor != null) {
-            drawCornerFrame(canvas, guideColor, guideColor, guideColor, guideColor);
+            drawCornerFrame(canvas, frame, guideColor, guideColor, guideColor, guideColor);
         } else {
-            drawCornerFrame(canvas, 0xff4285f4, 0xfffbbc04, 0xff34a853, 0xffea4335);
+            drawCornerFrame(canvas, frame, 0xff4285f4, 0xfffbbc04, 0xff34a853,
+                0xffea4335);
         }
 
-        if (!instruction.isEmpty()) {
+        if (!successVisible && !instruction.isEmpty()) {
             drawCenteredText(canvas, instruction, Math.max(dp(72), guide.top - dp(42)),
                 dp(17), Color.WHITE);
         }
-        drawCenteredText(canvas, message, Math.min(height - dp(72), guide.bottom + dp(54)),
+        drawCenteredText(canvas, message, Math.min(height - dp(72), frame.bottom + dp(54)),
             dp(17), color);
     }
 
@@ -88,44 +136,44 @@ final class BarcodeOverlayView extends View {
             width / 2f + guideSize / 2f, centerY + guideSize / 2f);
     }
 
-    private void drawCornerFrame(Canvas canvas, int topLeft, int topRight,
+    private void drawCornerFrame(Canvas canvas, RectF frame, int topLeft, int topRight,
                                  int bottomLeft, int bottomRight) {
-        float radius = dp(22);
-        float leg = Math.min(guide.width() * 0.22f, dp(76));
+        float radius = Math.min(dp(22), Math.min(frame.width(), frame.height()) * 0.25f);
+        float leg = Math.min(Math.min(frame.width(), frame.height()) * 0.32f, dp(76));
         paint.setStyle(Paint.Style.STROKE);
         paint.setStrokeWidth(dp(4));
         paint.setStrokeCap(Paint.Cap.ROUND);
         paint.setStrokeJoin(Paint.Join.ROUND);
 
         Path path = new Path();
-        path.moveTo(guide.left, guide.top + leg);
-        path.lineTo(guide.left, guide.top + radius);
-        path.quadTo(guide.left, guide.top, guide.left + radius, guide.top);
-        path.lineTo(guide.left + leg, guide.top);
+        path.moveTo(frame.left, frame.top + leg);
+        path.lineTo(frame.left, frame.top + radius);
+        path.quadTo(frame.left, frame.top, frame.left + radius, frame.top);
+        path.lineTo(frame.left + leg, frame.top);
         paint.setColor(topLeft);
         canvas.drawPath(path, paint);
 
         path.reset();
-        path.moveTo(guide.right - leg, guide.top);
-        path.lineTo(guide.right - radius, guide.top);
-        path.quadTo(guide.right, guide.top, guide.right, guide.top + radius);
-        path.lineTo(guide.right, guide.top + leg);
+        path.moveTo(frame.right - leg, frame.top);
+        path.lineTo(frame.right - radius, frame.top);
+        path.quadTo(frame.right, frame.top, frame.right, frame.top + radius);
+        path.lineTo(frame.right, frame.top + leg);
         paint.setColor(topRight);
         canvas.drawPath(path, paint);
 
         path.reset();
-        path.moveTo(guide.left, guide.bottom - leg);
-        path.lineTo(guide.left, guide.bottom - radius);
-        path.quadTo(guide.left, guide.bottom, guide.left + radius, guide.bottom);
-        path.lineTo(guide.left + leg, guide.bottom);
+        path.moveTo(frame.left, frame.bottom - leg);
+        path.lineTo(frame.left, frame.bottom - radius);
+        path.quadTo(frame.left, frame.bottom, frame.left + radius, frame.bottom);
+        path.lineTo(frame.left + leg, frame.bottom);
         paint.setColor(bottomLeft);
         canvas.drawPath(path, paint);
 
         path.reset();
-        path.moveTo(guide.right - leg, guide.bottom);
-        path.lineTo(guide.right - radius, guide.bottom);
-        path.quadTo(guide.right, guide.bottom, guide.right, guide.bottom - radius);
-        path.lineTo(guide.right, guide.bottom - leg);
+        path.moveTo(frame.right - leg, frame.bottom);
+        path.lineTo(frame.right - radius, frame.bottom);
+        path.quadTo(frame.right, frame.bottom, frame.right, frame.bottom - radius);
+        path.lineTo(frame.right, frame.bottom - leg);
         paint.setColor(bottomRight);
         canvas.drawPath(path, paint);
         paint.setStrokeCap(Paint.Cap.BUTT);
@@ -147,4 +195,14 @@ final class BarcodeOverlayView extends View {
     private float dp(float value) {
         return value * getResources().getDisplayMetrics().density;
     }
+
+    private float lerp(float start, float end, float progress) {
+        return start + (end - start) * progress;
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        if (successAnimator != null) successAnimator.cancel();
+        super.onDetachedFromWindow();
+    }
 }

package/src/android/java/BarcodeScanActivity.java

@@ -2,7 +2,13 @@ package com.andreszs.plugins.mlkitsuite;
 
 import android.app.Activity;
 import android.content.Intent;
+import android.graphics.Bitmap;
 import android.graphics.Color;
+import android.graphics.Rect;
+import android.media.AudioAttributes;
+import android.media.AudioFormat;
+import android.media.AudioManager;
+import android.media.AudioTrack;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
@@ -13,6 +19,7 @@ import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.widget.FrameLayout;
 import android.widget.ImageButton;
+import android.widget.ImageView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -38,6 +45,8 @@ import java.util.concurrent.Executors;
 public final class BarcodeScanActivity extends Activity
     implements LifecycleOwner, BarcodeFrameAnalyzer.Listener {
 
+    private static final long SUCCESS_FEEDBACK_MS = 450L;
+
     public static final String EXTRA_OPTIONS_JSON = "mlKitSuite.barcode.options";
     public static final String EXTRA_RESULT_JSON = "mlKitSuite.barcode.result";
     public static final String EXTRA_ERROR_CODE = "mlKitSuite.barcode.errorCode";
@@ -48,13 +57,16 @@ public final class BarcodeScanActivity extends Activity
     private final ExecutorService analysisExecutor = Executors.newSingleThreadExecutor();
     private LifecycleRegistry lifecycleRegistry;
     private BarcodeScanConfig config;
+    private FrameLayout rootView;
     private PreviewView previewView;
     private BarcodeOverlayView overlayView;
+    private ImageButton closeButton;
     private ImageButton torchButton;
     private ProcessCameraProvider cameraProvider;
     private ImageAnalysis imageAnalysis;
     private BarcodeFrameAnalyzer analyzer;
     private Camera camera;
+    private AudioTrack successBeep;
     private boolean torchEnabled;
     private boolean completed;
     private Runnable timeoutRunnable;
@@ -112,6 +124,7 @@ public final class BarcodeScanActivity extends Activity
         if (imageAnalysis != null) imageAnalysis.clearAnalyzer();
         if (analyzer != null) analyzer.close();
         if (cameraProvider != null) cameraProvider.unbindAll();
+        releaseSuccessBeep();
         analysisExecutor.shutdownNow();
         lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY);
         super.onDestroy();
@@ -123,27 +136,27 @@ public final class BarcodeScanActivity extends Activity
     }
 
     private void createInterface() {
-        FrameLayout root = new FrameLayout(this);
-        root.setBackgroundColor(Color.BLACK);
+        rootView = new FrameLayout(this);
+        rootView.setBackgroundColor(Color.BLACK);
         previewView = new PreviewView(this);
         previewView.setImplementationMode(PreviewView.ImplementationMode.COMPATIBLE);
         previewView.setScaleType(PreviewView.ScaleType.FILL_CENTER);
-        root.addView(previewView, matchParent());
+        rootView.addView(previewView, matchParent());
 
         overlayView = new BarcodeOverlayView(this, config.instructionText, config.guideColor,
             config.localization.text("barcode_searching"));
-        root.addView(overlayView, matchParent());
+        rootView.addView(overlayView, matchParent());
 
         if (config.showCloseButton) {
-            ImageButton close = cameraIconButton(
+            closeButton = cameraIconButton(
                 BarcodeIconDrawable.CLOSE, config.localization.text("close_barcode"), false
             );
-            close.setOnClickListener(view -> cancelByUser());
+            closeButton.setOnClickListener(view -> cancelByUser());
             FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(dp(52), dp(52));
             params.gravity = Gravity.TOP | Gravity.START;
             params.topMargin = dp(12);
             params.leftMargin = dp(12);
-            root.addView(close, params);
+            rootView.addView(closeButton, params);
         }
 
         if (config.showTorchButton) {
@@ -156,9 +169,9 @@ public final class BarcodeScanActivity extends Activity
             params.gravity = Gravity.TOP | Gravity.END;
             params.topMargin = dp(12);
             params.rightMargin = dp(12);
-            root.addView(torchButton, params);
+            rootView.addView(torchButton, params);
         }
-        setContentView(root);
+        setContentView(rootView);
     }
 
     private ImageButton cameraIconButton(int icon, String description, boolean active) {
@@ -246,9 +259,26 @@ public final class BarcodeScanActivity extends Activity
     }
 
     @Override
-    public void onConfirmed(String text, String format) {
+    public void onConfirmed(String text, String format, Rect bounds,
+                            int imageWidth, int imageHeight) {
         if (completed) return;
         completed = true;
+        if (timeoutRunnable != null) mainHandler.removeCallbacks(timeoutRunnable);
+        if (imageAnalysis != null) imageAnalysis.clearAnalyzer();
+        Bitmap frozenFrame = previewView.getBitmap();
+        if (frozenFrame != null) {
+            ImageView frozenView = new ImageView(this);
+            frozenView.setImageBitmap(frozenFrame);
+            frozenView.setScaleType(ImageView.ScaleType.FIT_XY);
+            rootView.addView(frozenView, 1, matchParent());
+        }
+        if (cameraProvider != null) cameraProvider.unbindAll();
+        if (closeButton != null) closeButton.setVisibility(View.GONE);
+        if (torchButton != null) torchButton.setVisibility(View.GONE);
+        overlayView.showSuccess(bounds, imageWidth, imageHeight,
+            config.localization.text("barcode_success"));
+        playSuccessBeep();
+
         JSONObject result = new JSONObject();
         try {
             result.put("status", "success");
@@ -257,8 +287,10 @@ public final class BarcodeScanActivity extends Activity
         } catch (Exception ignored) { }
         Intent intent = new Intent();
         intent.putExtra(EXTRA_RESULT_JSON, result.toString());
-        setResult(RESULT_OK, intent);
-        finish();
+        mainHandler.postDelayed(() -> {
+            setResult(RESULT_OK, intent);
+            finish();
+        }, SUCCESS_FEEDBACK_MS);
     }
 
     @Override
@@ -297,6 +329,62 @@ public final class BarcodeScanActivity extends Activity
         mainHandler.postDelayed(timeoutRunnable, config.timeoutMs);
     }
 
+    private void playSuccessBeep() {
+        if (!config.beepEnabled) return;
+        AudioManager audioManager = (AudioManager) getSystemService(AUDIO_SERVICE);
+        if (audioManager != null && audioManager.getRingerMode() != AudioManager.RINGER_MODE_NORMAL) {
+            return;
+        }
+        final int sampleRate = 22050;
+        final int sampleCount = sampleRate / 10;
+        byte[] pcm = new byte[sampleCount * 2];
+        for (int index = 0; index < sampleCount; index++) {
+            double time = index / (double) sampleRate;
+            double remaining = (sampleCount - index) / (double) sampleRate;
+            double envelope = Math.min(1d, time / 0.005d) * Math.min(1d, remaining / 0.025d);
+            short sample = (short) Math.round(Math.sin(2d * Math.PI * 1800d * time)
+                * envelope * Short.MAX_VALUE * 0.55d);
+            pcm[index * 2] = (byte) (sample & 0xff);
+            pcm[index * 2 + 1] = (byte) ((sample >>> 8) & 0xff);
+        }
+        try {
+            AudioTrack track = new AudioTrack.Builder()
+                .setAudioAttributes(new AudioAttributes.Builder()
+                    .setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION)
+                    .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
+                    .build())
+                .setAudioFormat(new AudioFormat.Builder()
+                    .setEncoding(AudioFormat.ENCODING_PCM_16BIT)
+                    .setSampleRate(sampleRate)
+                    .setChannelMask(AudioFormat.CHANNEL_OUT_MONO)
+                    .build())
+                .setTransferMode(AudioTrack.MODE_STATIC)
+                .setBufferSizeInBytes(pcm.length)
+                .build();
+            if (track.write(pcm, 0, pcm.length) <= 0) {
+                track.release();
+                return;
+            }
+            releaseSuccessBeep();
+            successBeep = track;
+            track.play();
+            mainHandler.postDelayed(() -> {
+                if (successBeep == track) releaseSuccessBeep();
+            }, 250L);
+        } catch (Exception ignored) {
+            releaseSuccessBeep();
+        }
+    }
+
+    private void releaseSuccessBeep() {
+        if (successBeep == null) return;
+        try {
+            successBeep.stop();
+        } catch (Exception ignored) { }
+        successBeep.release();
+        successBeep = null;
+    }
+
     private FrameLayout.LayoutParams matchParent() {
         return new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
             ViewGroup.LayoutParams.MATCH_PARENT);

package/src/android/java/BarcodeScanConfig.java

@@ -43,6 +43,7 @@ final class BarcodeScanConfig {
     final int[] formatValues;
     final boolean showCloseButton;
     final boolean showTorchButton;
+    final boolean beepEnabled;
     final String instructionText;
     final MlKitLocalization localization;
     final Integer guideColor;
@@ -50,6 +51,7 @@ final class BarcodeScanConfig {
 
     private BarcodeScanConfig(List<String> formatNames,
                               boolean showCloseButton, boolean showTorchButton,
+                              boolean beepEnabled,
                               String instructionText, MlKitLocalization localization,
                               Integer guideColor, long timeoutMs) {
         this.formatNames = Collections.unmodifiableList(formatNames);
@@ -59,6 +61,7 @@ final class BarcodeScanConfig {
         }
         this.showCloseButton = showCloseButton;
         this.showTorchButton = showTorchButton;
+        this.beepEnabled = beepEnabled;
         this.instructionText = instructionText;
         this.localization = localization;
         this.guideColor = guideColor;
@@ -72,11 +75,12 @@ final class BarcodeScanConfig {
         List<String> formats = parseFormats(value.opt("formats"));
         boolean close = strictBoolean(value, "showCloseButton", true);
         boolean torch = strictBoolean(value, "showTorchButton", true);
+        boolean beep = strictBoolean(value, "beepEnabled", true);
         String instruction = strictString(value, "instructionText",
             localization.text("barcode_instruction"));
         Integer guideColor = strictColor(value, "guideColor");
         long timeout = strictLong(value, "timeoutMs", 0L, 0L, 600000L);
-        return new BarcodeScanConfig(formats, close, torch, instruction, localization,
+        return new BarcodeScanConfig(formats, close, torch, beep, instruction, localization,
             guideColor, timeout);
     }
 
@@ -146,6 +150,7 @@ final class BarcodeScanConfig {
             String key = keys.next();
             if (!("formats".equals(key)
                 || "showCloseButton".equals(key) || "showTorchButton".equals(key)
+                || "beepEnabled".equals(key)
                 || "instructionText".equals(key) || "guideColor".equals(key)
                 || "timeoutMs".equals(key)
                 || "moduleLoadingMessage".equals(key) || "locale".equals(key))) {

package/src/android/java/BarcodeScanRegion.java

@@ -17,17 +17,35 @@ final class BarcodeScanRegion {
         float barcodeRight,
         float barcodeBottom
     ) {
-        if (viewWidth <= 0 || viewHeight <= 0 || imageWidth <= 0 || imageHeight <= 0) {
-            return false;
+        float[] mapped = map(viewWidth, viewHeight, imageWidth, imageHeight,
+            barcodeLeft, barcodeTop, barcodeRight, barcodeBottom);
+        return mapped != null
+            && mapped[0] >= guideLeft && mapped[1] >= guideTop
+            && mapped[2] <= guideRight && mapped[3] <= guideBottom;
+    }
+
+    static float[] map(
+        float viewWidth,
+        float viewHeight,
+        int imageWidth,
+        int imageHeight,
+        float barcodeLeft,
+        float barcodeTop,
+        float barcodeRight,
+        float barcodeBottom
+    ) {
+        if (viewWidth <= 0 || viewHeight <= 0 || imageWidth <= 0 || imageHeight <= 0
+            || barcodeRight <= barcodeLeft || barcodeBottom <= barcodeTop) {
+            return null;
         }
         float scale = Math.max(viewWidth / imageWidth, viewHeight / imageHeight);
         float offsetX = (viewWidth - imageWidth * scale) / 2f;
         float offsetY = (viewHeight - imageHeight * scale) / 2f;
-        float left = barcodeLeft * scale + offsetX;
-        float top = barcodeTop * scale + offsetY;
-        float right = barcodeRight * scale + offsetX;
-        float bottom = barcodeBottom * scale + offsetY;
-        return left >= guideLeft && top >= guideTop
-            && right <= guideRight && bottom <= guideBottom;
+        return new float[] {
+            barcodeLeft * scale + offsetX,
+            barcodeTop * scale + offsetY,
+            barcodeRight * scale + offsetX,
+            barcodeBottom * scale + offsetY
+        };
     }
 }

package/src/android/java/MlKitModelsModuleInstaller.java

@@ -14,6 +14,9 @@ import com.google.mlkit.vision.barcode.BarcodeScanning;
 import com.google.mlkit.vision.face.FaceDetection;
 import com.google.mlkit.vision.face.FaceDetector;
 import com.google.mlkit.vision.face.FaceDetectorOptions;
+import com.google.mlkit.vision.label.ImageLabeler;
+import com.google.mlkit.vision.label.ImageLabeling;
+import com.google.mlkit.vision.label.defaults.ImageLabelerOptions;
 import com.google.mlkit.vision.text.TextRecognition;
 import com.google.mlkit.vision.text.TextRecognizer;
 import com.google.mlkit.vision.text.latin.TextRecognizerOptions;
@@ -38,10 +41,11 @@ final class MlKitModelsModuleInstaller {
     private MlKitModelsModuleInstaller() { }
 
     static void checkAvailability(Activity activity, boolean includeFace, boolean includeBarcode,
-                                  boolean includeText, AvailabilityCallback callback) {
+                                  boolean includeText, boolean includeImageLabeling,
+                                  AvailabilityCallback callback) {
         JSONObject result = new JSONObject();
         int requestedCount = (includeFace ? 1 : 0) + (includeBarcode ? 1 : 0)
-            + (includeText ? 1 : 0);
+            + (includeText ? 1 : 0) + (includeImageLabeling ? 1 : 0);
         if (requestedCount == 0) {
             callback.onResult(result);
             return;
@@ -64,6 +68,13 @@ final class MlKitModelsModuleInstaller {
             checkOne(client, "text", (OptionalModuleApi) text, text::close,
                 result, remaining, callback);
         }
+        if (includeImageLabeling) {
+            ImageLabeler imageLabeling = ImageLabeling.getClient(
+                ImageLabelerOptions.DEFAULT_OPTIONS
+            );
+            checkOne(client, "imageLabeling", (OptionalModuleApi) imageLabeling,
+                imageLabeling::close, result, remaining, callback);
+        }
     }
 
     private static void checkOne(ModuleInstallClient client, String name, OptionalModuleApi module,
@@ -95,36 +106,39 @@ final class MlKitModelsModuleInstaller {
     }
 
     static void prepare(Activity activity, boolean includeFace, boolean includeBarcode,
-                        boolean includeText, String loadingMessage,
+                        boolean includeText, boolean includeImageLabeling, String loadingMessage,
                         MlKitLocalization localization, Callback callback) {
         final FaceDetector face = includeFace
             ? FaceDetection.getClient(new FaceDetectorOptions.Builder().build()) : null;
         final BarcodeScanner barcode = includeBarcode ? BarcodeScanning.getClient() : null;
         final TextRecognizer text = includeText
             ? TextRecognition.getClient(TextRecognizerOptions.DEFAULT_OPTIONS) : null;
+        final ImageLabeler imageLabeling = includeImageLabeling
+            ? ImageLabeling.getClient(ImageLabelerOptions.DEFAULT_OPTIONS) : null;
         List<OptionalModuleApi> selectedModules = new ArrayList<>();
         if (face != null) selectedModules.add((OptionalModuleApi) face);
         if (barcode != null) selectedModules.add((OptionalModuleApi) barcode);
         if (text != null) selectedModules.add((OptionalModuleApi) text);
+        if (imageLabeling != null) selectedModules.add((OptionalModuleApi) imageLabeling);
         OptionalModuleApi[] modules = selectedModules.toArray(new OptionalModuleApi[0]);
         ModuleInstallClient client = ModuleInstall.getClient(activity);
 
         client.areModulesAvailable(modules)
             .addOnSuccessListener(response -> {
                 if (response.areModulesAvailable()) {
-                    close(face, barcode, text);
+                    close(face, barcode, text, imageLabeling);
                     callback.onReady(readyResult(true));
                 } else {
                     MlKitLoadingDialog loadingDialog = new MlKitLoadingDialog(
                         activity, loadingMessage
                     );
                     loadingDialog.show();
-                    install(client, modules, face, barcode, text, loadingDialog,
+                    install(client, modules, face, barcode, text, imageLabeling, loadingDialog,
                         localization, callback);
                 }
             })
             .addOnFailureListener(error -> {
-                close(face, barcode, text);
+                close(face, barcode, text, imageLabeling);
                 callback.onError(MlKitSuitePlugin.error(
                     "MODULE_DOWNLOAD_FAILED",
                     localization.text("models_check_failed"),
@@ -135,6 +149,7 @@ final class MlKitModelsModuleInstaller {
 
     private static void install(ModuleInstallClient client, OptionalModuleApi[] modules,
                                 FaceDetector face, BarcodeScanner barcode, TextRecognizer text,
+                                ImageLabeler imageLabeling,
                                 MlKitLoadingDialog loadingDialog,
                                 MlKitLocalization localization, Callback callback) {
         AtomicBoolean finished = new AtomicBoolean(false);
@@ -142,16 +157,16 @@ final class MlKitModelsModuleInstaller {
         listenerHolder[0] = update -> {
             int state = update.getInstallState();
             if (state == ModuleInstallStatusUpdate.InstallState.STATE_COMPLETED) {
-                finishSuccess(client, listenerHolder[0], face, barcode, text,
+                finishSuccess(client, listenerHolder[0], face, barcode, text, imageLabeling,
                     loadingDialog, callback, finished, false);
             } else if (state == ModuleInstallStatusUpdate.InstallState.STATE_CANCELED) {
-                finishError(client, listenerHolder[0], face, barcode, text, loadingDialog,
+                finishError(client, listenerHolder[0], face, barcode, text, imageLabeling, loadingDialog,
                     callback, finished,
                     "MODULE_DOWNLOAD_CANCELLED",
                     localization.text("models_download_cancelled"));
             } else if (state == ModuleInstallStatusUpdate.InstallState.STATE_FAILED) {
                 String status = ModuleInstallStatusCodes.getStatusCodeString(update.getErrorCode());
-                finishError(client, listenerHolder[0], face, barcode, text, loadingDialog,
+                finishError(client, listenerHolder[0], face, barcode, text, imageLabeling, loadingDialog,
                     callback, finished,
                     "MODULE_DOWNLOAD_FAILED",
                     localization.format("models_download_failed", status));
@@ -164,44 +179,48 @@ final class MlKitModelsModuleInstaller {
         client.installModules(request)
             .addOnSuccessListener(response -> {
                 if (response.areModulesAlreadyInstalled()) {
-                    finishSuccess(client, listenerHolder[0], face, barcode, text,
+                    finishSuccess(client, listenerHolder[0], face, barcode, text, imageLabeling,
                         loadingDialog, callback, finished, true);
                 }
             })
             .addOnFailureListener(error -> finishError(
-                client, listenerHolder[0], face, barcode, text, loadingDialog, callback, finished,
+                client, listenerHolder[0], face, barcode, text, imageLabeling, loadingDialog, callback, finished,
                 "MODULE_DOWNLOAD_FAILED", localization.text("models_download_start_failed")
             ));
     }
 
     private static void finishSuccess(ModuleInstallClient client, InstallStatusListener listener,
                                       FaceDetector face, BarcodeScanner barcode,
-                                      TextRecognizer text, MlKitLoadingDialog loadingDialog,
+                                      TextRecognizer text, ImageLabeler imageLabeling,
+                                      MlKitLoadingDialog loadingDialog,
                                       Callback callback,
                                       AtomicBoolean finished, boolean alreadyAvailable) {
         if (!finished.compareAndSet(false, true)) return;
         client.unregisterListener(listener);
         loadingDialog.dismiss();
-        close(face, barcode, text);
+        close(face, barcode, text, imageLabeling);
         callback.onReady(readyResult(alreadyAvailable));
     }
 
     private static void finishError(ModuleInstallClient client, InstallStatusListener listener,
                                     FaceDetector face, BarcodeScanner barcode,
-                                    TextRecognizer text, MlKitLoadingDialog loadingDialog,
+                                    TextRecognizer text, ImageLabeler imageLabeling,
+                                    MlKitLoadingDialog loadingDialog,
                                     Callback callback,
                                     AtomicBoolean finished, String code, String message) {
         if (!finished.compareAndSet(false, true)) return;
         client.unregisterListener(listener);
         loadingDialog.dismiss();
-        close(face, barcode, text);
+        close(face, barcode, text, imageLabeling);
         callback.onError(MlKitSuitePlugin.error(code, message, true));
     }
 
-    private static void close(FaceDetector face, BarcodeScanner barcode, TextRecognizer text) {
+    private static void close(FaceDetector face, BarcodeScanner barcode, TextRecognizer text,
+                              ImageLabeler imageLabeling) {
         if (face != null) face.close();
         if (barcode != null) barcode.close();
         if (text != null) text.close();
+        if (imageLabeling != null) imageLabeling.close();
     }
 
     private static JSONObject readyResult(boolean alreadyAvailable) {