@getyoti/react-native-yoti-face-capture 3.0.0 → 4.0.0

package/README.md

@@ -52,14 +52,14 @@ You may then run:
 
 The library employs the [bundled version approach](https://github.com/getyoti/yoti-face-capture-android#bundled-vs-unbundled) approach for the AI models. 
 ### iOS Configuration
-- Requres iOS 12.0+
-- Requres Swift 5.3+
+- Requires iOS 15.1+
+- Requires Swift 5.3+
 
 Make sure you've installed and are running the latest version of [Cocoapods](https://guides.cocoapods.org/using/getting-started.html).
 Add the `use_frameworks!` declaration to your Podfile and run `pod install` from the ios directory:
 
 ```bash
-platform :ios, '12.0'
+platform :ios, '15.1'
 
 target 'TargetName' do
   use_frameworks!
@@ -286,5 +286,5 @@ protected List<ReactPackage> getPackages() {
 MIT
 
 ## Support
-If you have any other questions please do not hesitate to contact clientsupport@yoti.com.
+For any questions or support please contact us here: https://support.yoti.com
 Once we have answered your question we may contact you again to discuss Yoti products and services. If you'd prefer us not to do this, please let us know when you e-mail.

package/android/build.gradle

@@ -1,61 +1,65 @@
 apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
 
 def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
 
 android {
-    compileSdkVersion safeExtGet('compileSdkVersion', 28)
-    buildToolsVersion safeExtGet('buildToolsVersion', '28.0.3')
+    namespace "com.yoti.reactnative.facecapture"
+    
+    compileSdk safeExtGet('compileSdkVersion', 35)
 
     defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', 16)
-        targetSdkVersion safeExtGet('targetSdkVersion', 28)
-        versionCode 200
-        versionName "2.0.0"
+        minSdkVersion safeExtGet('minSdkVersion', 24)
+        targetSdkVersion safeExtGet('targetSdkVersion', 35)
+        versionCode 400
+        versionName "4.0.0"
     }
     buildTypes {
-        release {
-            minifyEnabled false
+        debug {
+            matchingFallbacks = ['release']
         }
     }
-    lintOptions {
-        abortOnError false
+    packagingOptions {
+        exclude 'META-INF/*.kotlin_module'
+        exclude "**/kotlin/**"
+    }
+    compileOptions {
+        sourceCompatibility = '1.8'
+        targetCompatibility = '1.8'
     }
 }
 
+dependencies {
+    implementation "com.facebook.react:react-native:+"
+    implementation 'com.yoti.mobile.android:face-capture-bundled:4.8.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+}
+
+
 buildscript {
     ext {
-        kotlinVersion = '1.4.31'
+        kotlinVersion = '1.7.20'
     }
     repositories {
-        jcenter()
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:8.13.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${project.ext.kotlinVersion}"
     }
 }
 
-repositories {
-    jcenter()
-    google()
-    mavenCentral()
-    maven {
-        // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-        url "$rootDir/../node_modules/react-native/android"
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+        maven {
+            url "https://jitpack.io"
+        }
     }
 }
 
-dependencies {
-    //noinspection GradleDynamicVersion
-    implementation "com.facebook.react:react-native:+"  // From node_modules
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:${project.ext.kotlinVersion}"
-    implementation 'com.yoti.mobile.android:face-capture-bundled:4.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.android.material:material:1.2.1'
-}
+

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

package/android/src/main/java/com/yoti/reactnative/facecapture/YotiFaceCaptureEvent.java

@@ -0,0 +1,34 @@
+package com.yoti.reactnative.facecapture;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.uimanager.events.Event;
+
+/**
+ * Custom event class for YotiFaceCapture events.
+ * This is compatible with both the old architecture and the new Fabric architecture.
+ */
+public class YotiFaceCaptureEvent extends Event<YotiFaceCaptureEvent> {
+  private final String eventName;
+  private final WritableMap eventData;
+
+  public YotiFaceCaptureEvent(int surfaceId, int viewTag, String eventName, @Nullable WritableMap eventData) {
+    super(surfaceId, viewTag);
+    this.eventName = eventName;
+    this.eventData = eventData;
+  }
+
+  @NonNull
+  @Override
+  public String getEventName() {
+    return eventName;
+  }
+
+  @Nullable
+  @Override
+  protected WritableMap getEventData() {
+    return eventData;
+  }
+}

package/android/src/main/java/com/yoti/reactnative/facecapture/YotiFaceCaptureModule.java

@@ -1,13 +1,16 @@
 package com.yoti.reactnative.facecapture;
 
-import com.facebook.react.bridge.NativeModule;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.uimanager.NativeViewHierarchyManager;
-import com.facebook.react.uimanager.UIBlock;
-import com.facebook.react.uimanager.UIManagerModule;
+import com.facebook.react.bridge.UIManager;
+import com.facebook.react.bridge.UiThreadUtil;
+import com.facebook.react.uimanager.UIManagerHelper;
+import com.facebook.react.uimanager.common.UIManagerType;
 import com.yoti.mobile.android.capture.face.ui.models.face.ImageQuality;
 
 import java.util.Map;
@@ -18,6 +21,7 @@ public class YotiFaceCaptureModule extends ReactContextBaseJavaModule {
     super(context);
   }
 
+  @NonNull
   @Override
   public String getName() {
     return "YotiFaceCaptureModule";
@@ -32,78 +36,73 @@ public class YotiFaceCaptureModule extends ReactContextBaseJavaModule {
     return constants;
   }
 
-  @ReactMethod
-  public void startCamera(final int viewTag) {
+  @Nullable
+  private YotiFaceCaptureView resolveView(int viewTag) {
     final ReactApplicationContext context = getReactApplicationContext();
-    UIManagerModule uiManager = context.getNativeModule(UIManagerModule.class);
-    uiManager.addUIBlock(new UIBlock() {
-      @Override
-      public void execute(NativeViewHierarchyManager nativeViewHierarchyManager) {
-        final YotiFaceCaptureView faceCaptureView;
+    UIManager uiManager = UIManagerHelper.getUIManager(context, UIManagerType.FABRIC);
+    if (uiManager == null) {
+      uiManager = UIManagerHelper.getUIManager(context, UIManagerType.DEFAULT);
+    }
+    if (uiManager == null) {
+      return null;
+    }
 
-        try {
-          faceCaptureView = (YotiFaceCaptureView) nativeViewHierarchyManager.resolveView(viewTag);
-          faceCaptureView.startCamera();
-        } catch (Exception e) {
-          e.printStackTrace();
-        }
+    View view = uiManager.resolveView(viewTag);
+    if (view instanceof YotiFaceCaptureView) {
+      return (YotiFaceCaptureView) view;
+    }
+    
+    return null;
+  }
+
+  @ReactMethod
+  public void startCamera(final int viewTag) {
+    UiThreadUtil.runOnUiThread(() -> {
+      try {
+        YotiFaceCaptureView faceCaptureView = resolveView(viewTag);
+        
+        faceCaptureView.startCamera();
+      } catch (Exception e) {
+        e.printStackTrace();
       }
     });
   }
 
   @ReactMethod
   public void stopCamera(final int viewTag) {
-    final ReactApplicationContext context = getReactApplicationContext();
-    UIManagerModule uiManager = context.getNativeModule(UIManagerModule.class);
-    uiManager.addUIBlock(new UIBlock() {
-      @Override
-      public void execute(NativeViewHierarchyManager nativeViewHierarchyManager) {
-        final YotiFaceCaptureView faceCaptureView;
+    UiThreadUtil.runOnUiThread(() -> {
+      try {
+        YotiFaceCaptureView faceCaptureView = resolveView(viewTag);
 
-        try {
-          faceCaptureView = (YotiFaceCaptureView) nativeViewHierarchyManager.resolveView(viewTag);
-          faceCaptureView.stopCamera();
-        } catch (Exception e) {
-          e.printStackTrace();
-        }
+        faceCaptureView.stopCamera();
+      } catch (Exception e) {
+        e.printStackTrace();
       }
     });
   }
 
   @ReactMethod
   public void startAnalyzing(final int viewTag) {
-    final ReactApplicationContext context = getReactApplicationContext();
-    UIManagerModule uiManager = context.getNativeModule(UIManagerModule.class);
-    uiManager.addUIBlock(new UIBlock() {
-      @Override
-      public void execute(NativeViewHierarchyManager nativeViewHierarchyManager) {
-        final YotiFaceCaptureView faceCaptureView;
-
-        try {
-          faceCaptureView = (YotiFaceCaptureView) nativeViewHierarchyManager.resolveView(viewTag);
-          faceCaptureView.startAnalyzing();
-        } catch (Exception e) {
-          e.printStackTrace();
-        }
+    UiThreadUtil.runOnUiThread(() -> {
+      try {
+        YotiFaceCaptureView faceCaptureView = resolveView(viewTag);
+        
+        faceCaptureView.startAnalyzing();
+      } catch (Exception e) {
+        e.printStackTrace();
       }
     });
   }
 
   @ReactMethod
   public void stopAnalyzing(final int viewTag) {
-    final ReactApplicationContext context = getReactApplicationContext();
-    UIManagerModule uiManager = context.getNativeModule(UIManagerModule.class);
-    uiManager.addUIBlock(new UIBlock() {
-      @Override
-      public void execute(NativeViewHierarchyManager nativeViewHierarchyManager) {
-        final YotiFaceCaptureView faceCaptureView;
-
-        try {
-          faceCaptureView = (YotiFaceCaptureView) nativeViewHierarchyManager.resolveView(viewTag);
-          faceCaptureView.stopAnalyzing();
-        } catch (Exception e) {
-          e.printStackTrace();
-        }
+    UiThreadUtil.runOnUiThread(() -> {
+      try {
+        YotiFaceCaptureView faceCaptureView = resolveView(viewTag);
+        
+        faceCaptureView.stopAnalyzing();
+      } catch (Exception e) {
+        e.printStackTrace();
       }
     });
   }

package/android/src/main/java/com/yoti/reactnative/facecapture/YotiFaceCapturePackage.java

@@ -1,5 +1,6 @@
 package com.yoti.reactnative.facecapture;
 
+import androidx.annotation.NonNull;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -9,13 +10,15 @@ import java.util.Arrays;
 import java.util.List;
 
 public class YotiFaceCapturePackage implements ReactPackage {
+    @NonNull
     @Override
-    public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
+    public List<NativeModule> createNativeModules(@NonNull ReactApplicationContext reactContext) {
       return Arrays.<NativeModule>asList(new YotiFaceCaptureModule(reactContext));
     }
 
+    @NonNull
     @Override
-    public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
+    public List<ViewManager> createViewManagers(@NonNull ReactApplicationContext reactContext) {
         return Arrays.<ViewManager>asList(new YotiFaceCaptureViewManager());
     }
 }

package/android/src/main/java/com/yoti/reactnative/facecapture/YotiFaceCaptureView.java

@@ -4,8 +4,9 @@ import android.graphics.PointF;
 import android.util.Base64;
 import android.view.Choreographer;
 import android.view.View;
-import android.widget.LinearLayout;
+import android.widget.FrameLayout;
 
+import androidx.annotation.Nullable;
 import androidx.lifecycle.LifecycleOwner;
 
 import com.facebook.react.bridge.Arguments;
@@ -13,20 +14,17 @@ import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.ThemedReactContext;
-
-import com.facebook.react.uimanager.events.RCTEventEmitter;
+import com.facebook.react.uimanager.UIManagerHelper;
+import com.facebook.react.uimanager.events.EventDispatcher;
 import com.yoti.mobile.android.capture.face.ui.FaceCapture;
 import com.yoti.mobile.android.capture.face.ui.FaceCaptureListener;
-import com.yoti.mobile.android.capture.face.ui.models.camera.CameraState;
 import com.yoti.mobile.android.capture.face.ui.models.camera.CameraStateListener;
 import com.yoti.mobile.android.capture.face.ui.models.face.FaceCaptureConfiguration;
-import com.yoti.mobile.android.capture.face.ui.models.face.FaceCaptureResult;
 import com.yoti.mobile.android.capture.face.ui.models.face.FaceCaptureState;
 import com.yoti.mobile.android.capture.face.ui.models.face.ImageQuality;
+import java.util.Objects;
 
-import org.jetbrains.annotations.NotNull;
-
-public class YotiFaceCaptureView extends LinearLayout {
+public class YotiFaceCaptureView extends FrameLayout {
   private final ThemedReactContext context;
   private final FaceCapture mFaceCapture;
   private ImageQuality mImageQuality;
@@ -35,61 +33,60 @@ public class YotiFaceCaptureView extends LinearLayout {
   private boolean mRequireBrightEnvironment = true;
   private int mRequiredStableFrames;
   private ReadableArray mFaceCenter;
-  private final CameraStateListener mCameraStateListener = new CameraStateListener() {
+  private boolean isCleanedUp = false;
+  
+  private final Choreographer.FrameCallback frameCallback = new Choreographer.FrameCallback() {
     @Override
-    public void onCameraState(@NotNull CameraState cameraState) {
-      WritableMap event = Arguments.createMap();
-      event.putString("state", cameraState.getClass().getSimpleName());
-      ReactContext reactContext = (ReactContext) getContext();
-      reactContext.getJSModule(RCTEventEmitter.class).receiveEvent(
-        getId(),
-        "onCameraStateChange",
-        event);
+    public void doFrame(long frameTimeNanos) {
+      if (!isCleanedUp) {
+        manuallyLayoutChildren();
+        getViewTreeObserver().dispatchOnGlobalLayout();
+        Choreographer.getInstance().postFrameCallback(this);
+      }
     }
   };
-  private final FaceCaptureListener mFaceCaptureListener = new FaceCaptureListener() {
-    @Override
-    public void onFaceCaptureResult(@NotNull FaceCaptureResult faceCaptureResult) {
-      WritableMap event = Arguments.createMap();
-      event.putString("originalImage", Base64.encodeToString(faceCaptureResult.getOriginalImage().getData(), Base64.DEFAULT));
-      event.putString("state", faceCaptureResult.getState().getClass().getSimpleName());
-
-      FaceCaptureState s = faceCaptureResult.getState();
-      if (s instanceof FaceCaptureState.InvalidFace) {
-        event.putString("cause", ((FaceCaptureState.InvalidFace) s).getCause().getClass().getSimpleName());
-      }
-      if (s instanceof FaceCaptureState.ValidFace) {
-        int croppedFaceBoundingBoxLeft = ((FaceCaptureState.ValidFace) s).getCroppedFaceBoundingBox().left;
-        int croppedFaceBoundingBoxTop = ((FaceCaptureState.ValidFace) s).getCroppedFaceBoundingBox().top;
-        int croppedFaceBoundingBoxRight = ((FaceCaptureState.ValidFace) s).getCroppedFaceBoundingBox().right;
-        int croppedFaceBoundingBoxBottom = ((FaceCaptureState.ValidFace) s).getCroppedFaceBoundingBox().bottom;
-        WritableMap croppedFaceBoundingBox = Arguments.createMap();
-        croppedFaceBoundingBox.putInt("x", croppedFaceBoundingBoxLeft);
-        croppedFaceBoundingBox.putInt("y", croppedFaceBoundingBoxTop);
-        croppedFaceBoundingBox.putInt("width", croppedFaceBoundingBoxRight - croppedFaceBoundingBoxLeft);
-        croppedFaceBoundingBox.putInt("height", croppedFaceBoundingBoxBottom - croppedFaceBoundingBoxTop);
-
-        int faceBoundingBoxLeft = ((FaceCaptureState.ValidFace) s).getFaceBoundingBox().left;
-        int faceBoundingBoxTop = ((FaceCaptureState.ValidFace) s).getFaceBoundingBox().top;
-        int faceBoundingBoxRight = ((FaceCaptureState.ValidFace) s).getFaceBoundingBox().right;
-        int faceBoundingBoxBottom = ((FaceCaptureState.ValidFace) s).getFaceBoundingBox().bottom;
-        WritableMap faceBoundingBox = Arguments.createMap();
-        faceBoundingBox.putInt("x", faceBoundingBoxLeft);
-        faceBoundingBox.putInt("y", faceBoundingBoxTop);
-        faceBoundingBox.putInt("width", faceBoundingBoxRight - faceBoundingBoxLeft);
-        faceBoundingBox.putInt("height", faceBoundingBoxBottom - faceBoundingBoxTop);
-
-        event.putString("croppedImage", Base64.encodeToString(((FaceCaptureState.ValidFace) s).getCroppedImage(), Base64.DEFAULT));
-        event.putMap("croppedFaceBoundingBox", croppedFaceBoundingBox);
-        event.putMap("faceBoundingBox", faceBoundingBox);
-      }
-
-      ReactContext reactContext = (ReactContext) getContext();
-      reactContext.getJSModule(RCTEventEmitter.class).receiveEvent(
-        getId(),
-        "onFaceCaptureResult",
-        event);
+  
+  private final CameraStateListener mCameraStateListener = cameraState -> {
+    WritableMap event = Arguments.createMap();
+    event.putString("state", cameraState.getClass().getSimpleName());
+    sendEvent("onCameraStateChange", event);
+  };
+  private final FaceCaptureListener mFaceCaptureListener = faceCaptureResult -> {
+    WritableMap event = Arguments.createMap();
+    event.putString("originalImage", Base64.encodeToString(faceCaptureResult.getOriginalImage().getData(), Base64.DEFAULT));
+    event.putString("state", faceCaptureResult.getState().getClass().getSimpleName());
+
+    FaceCaptureState s = faceCaptureResult.getState();
+    if (s instanceof FaceCaptureState.InvalidFace) {
+      event.putString("cause", ((FaceCaptureState.InvalidFace) s).getCause().getClass().getSimpleName());
+    }
+    if (s instanceof FaceCaptureState.ValidFace) {
+      int croppedFaceBoundingBoxLeft = ((FaceCaptureState.ValidFace) s).getCroppedFaceBoundingBox().left;
+      int croppedFaceBoundingBoxTop = ((FaceCaptureState.ValidFace) s).getCroppedFaceBoundingBox().top;
+      int croppedFaceBoundingBoxRight = ((FaceCaptureState.ValidFace) s).getCroppedFaceBoundingBox().right;
+      int croppedFaceBoundingBoxBottom = ((FaceCaptureState.ValidFace) s).getCroppedFaceBoundingBox().bottom;
+      WritableMap croppedFaceBoundingBox = Arguments.createMap();
+      croppedFaceBoundingBox.putInt("x", croppedFaceBoundingBoxLeft);
+      croppedFaceBoundingBox.putInt("y", croppedFaceBoundingBoxTop);
+      croppedFaceBoundingBox.putInt("width", croppedFaceBoundingBoxRight - croppedFaceBoundingBoxLeft);
+      croppedFaceBoundingBox.putInt("height", croppedFaceBoundingBoxBottom - croppedFaceBoundingBoxTop);
+
+      int faceBoundingBoxLeft = ((FaceCaptureState.ValidFace) s).getFaceBoundingBox().left;
+      int faceBoundingBoxTop = ((FaceCaptureState.ValidFace) s).getFaceBoundingBox().top;
+      int faceBoundingBoxRight = ((FaceCaptureState.ValidFace) s).getFaceBoundingBox().right;
+      int faceBoundingBoxBottom = ((FaceCaptureState.ValidFace) s).getFaceBoundingBox().bottom;
+      WritableMap faceBoundingBox = Arguments.createMap();
+      faceBoundingBox.putInt("x", faceBoundingBoxLeft);
+      faceBoundingBox.putInt("y", faceBoundingBoxTop);
+      faceBoundingBox.putInt("width", faceBoundingBoxRight - faceBoundingBoxLeft);
+      faceBoundingBox.putInt("height", faceBoundingBoxBottom - faceBoundingBoxTop);
+
+      event.putString("croppedImage", Base64.encodeToString(((FaceCaptureState.ValidFace) s).getCroppedImage(), Base64.DEFAULT));
+      event.putMap("croppedFaceBoundingBox", croppedFaceBoundingBox);
+      event.putMap("faceBoundingBox", faceBoundingBox);
     }
+
+    sendEvent("onFaceCaptureResult", event);
   };
 
   YotiFaceCaptureView(ThemedReactContext context) {
@@ -97,14 +94,25 @@ public class YotiFaceCaptureView extends LinearLayout {
     this.context = context;
     inflate(context, R.layout.yotifacecapture, this);
     mFaceCapture = findViewById(R.id.faceCapture);
-    Choreographer.getInstance().postFrameCallback(new Choreographer.FrameCallback() {
-      @Override
-      public void doFrame(long frameTimeNanos) {
-        manuallyLayoutChildren();
-        getViewTreeObserver().dispatchOnGlobalLayout();
-        Choreographer.getInstance().postFrameCallback(this);
+    
+    // Add layout change listener to handle React Native new architecture layout
+    addOnLayoutChangeListener((v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> {
+      int width = right - left;
+      int height = bottom - top;
+      if (width > 0 && height > 0) {
+        // Force all children to match parent size
+        for (int i = 0; i < getChildCount(); i++) {
+          View child = getChildAt(i);
+          child.measure(
+            MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
+            MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
+          );
+          child.layout(0, 0, width, height);
+        }
       }
     });
+    
+    Choreographer.getInstance().postFrameCallback(frameCallback);
   }
 
   void manuallyLayoutChildren() {
@@ -119,13 +127,38 @@ public class YotiFaceCaptureView extends LinearLayout {
   @Override
   public void requestLayout() {
     super.requestLayout();
+    // This is needed to ensure layout happens properly in React Native 0.7x+
+    // Without this, the view may have 0 width/height causing black screen
+    post(measureAndLayout);
+  }
+
+  private final Runnable measureAndLayout = () -> {
+    measure(
+      MeasureSpec.makeMeasureSpec(getWidth(), MeasureSpec.EXACTLY),
+      MeasureSpec.makeMeasureSpec(getHeight(), MeasureSpec.EXACTLY));
+    layout(getLeft(), getTop(), getRight(), getBottom());
+  };
+
+  /**
+   * Send events to React Native using the modern EventDispatcher API.
+   * This is compatible with both the old architecture and the new Fabric architecture.
+   */
+  private void sendEvent(String eventName, @Nullable WritableMap event) {
+    ReactContext reactContext = (ReactContext) getContext();
+    int surfaceId = UIManagerHelper.getSurfaceId(reactContext);
+    EventDispatcher eventDispatcher = UIManagerHelper.getEventDispatcherForReactTag(reactContext, getId());
+    if (eventDispatcher != null) {
+      eventDispatcher.dispatchEvent(
+        new YotiFaceCaptureEvent(surfaceId, getId(), eventName, event)
+      );
+    }
   }
 
-  public void setFaceCenter(ReadableArray faceCenter) throws Exception {
+  public void setFaceCenter(ReadableArray faceCenter) {
     mFaceCenter = faceCenter;
   }
 
-  public void setImageQuality(String imageQuality) throws Exception {
+  public void setImageQuality(String imageQuality) {
     if (imageQuality.equals(ImageQuality.LOW.toString())) {
       mImageQuality = ImageQuality.LOW;
       return;
@@ -168,13 +201,21 @@ public class YotiFaceCaptureView extends LinearLayout {
   public void startAnalyzing() {
     PointF faceCenter = new PointF((float) mFaceCenter.getDouble(0), (float) mFaceCenter.getDouble(1));
 
+    // Configuration flags not available for FCM variant
+    final boolean isSelfCheckoutMode = false;
+    final boolean provideLandmarks = false;
+    final boolean provideSmileScore = false;
+
     FaceCaptureConfiguration configuration = new FaceCaptureConfiguration(
-      faceCenter,
-      mImageQuality,
-      mRequireValidAngle,
-      mRequireEyesOpen,
-      mRequireBrightEnvironment,
-      mRequiredStableFrames
+            faceCenter,
+            mImageQuality,
+            mRequireValidAngle,
+            mRequireEyesOpen,
+            mRequireBrightEnvironment,
+            mRequiredStableFrames,
+            provideLandmarks,
+            provideSmileScore,
+            isSelfCheckoutMode
     );
     mFaceCapture.startAnalysing(configuration, mFaceCaptureListener);
   }
@@ -182,4 +223,19 @@ public class YotiFaceCaptureView extends LinearLayout {
   public void stopAnalyzing() {
     mFaceCapture.stopAnalysing();
   }
+
+  /**
+   * Clean up resources when the view is dropped.
+   * Called from ViewManager.onDropViewInstance()
+   */
+  public void cleanup() {
+    isCleanedUp = true;
+    Choreographer.getInstance().removeFrameCallback(frameCallback);
+    try {
+      mFaceCapture.stopAnalysing();
+      mFaceCapture.stopCamera();
+    } catch (Exception e) {
+      // Ignore cleanup errors
+    }
+  }
 }

package/android/src/main/java/com/yoti/reactnative/facecapture/YotiFaceCaptureViewManager.java

@@ -1,6 +1,7 @@
 package com.yoti.reactnative.facecapture;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.common.MapBuilder;
@@ -21,10 +22,12 @@ public class YotiFaceCaptureViewManager extends SimpleViewManager<YotiFaceCaptur
 
   @Override
   @NonNull
-  public YotiFaceCaptureView createViewInstance(ThemedReactContext reactContext) {
+  public YotiFaceCaptureView createViewInstance(@NonNull ThemedReactContext reactContext) {
     return new YotiFaceCaptureView(reactContext);
   }
 
+  @Override
+  @Nullable
   public Map getExportedCustomBubblingEventTypeConstants() {
     return MapBuilder.builder()
       .put(
@@ -40,6 +43,12 @@ public class YotiFaceCaptureViewManager extends SimpleViewManager<YotiFaceCaptur
       .build();
   }
 
+  @Override
+  public void onDropViewInstance(@NonNull YotiFaceCaptureView view) {
+    view.cleanup();
+    super.onDropViewInstance(view);
+  }
+
   @ReactProp(name = "faceCenter")
   public void setFaceCenter(YotiFaceCaptureView view, ReadableArray faceCenter) throws Exception {
     try {