Merge pull request #8 from OutSystems/fix/android15-edge-to-edge

Fix ::: Android 15 Edge-to-Edge

Author: alexgerardojacinto

CHANGELOG.md

@@ -4,7 +4,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [1.1.2]
+### Fixes
+- Android 15 - Fix cropping of Card IO screens due to Edge-to-Edge
 
 ## [1.1.1]
 ### Fixes

package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.os.mobile.cardio",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Plugin Read Card ID and to Scan Documents",
   "cordova": {
     "id": "com.os.mobile.cardio",

plugin.xml

@@ -2,7 +2,7 @@
 
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
            id="com.os.mobile.cardio"
-      version="1.1.1">
+      version="1.1.2">
     <name>Card.io Cordova Plugin</name>
     <description>Plugin Read Card ID and to Scan Documents</description>
     <author>OutSystems</author>
@@ -28,6 +28,7 @@
             </feature>
         </config-file>
         <source-file src="src/android/CardIoPlugin.java" target-dir="src/com/os/mobile/cardioplugin" />
+        <source-file src="src/android/CardIoActivityLifecycleCallbacks.java" target-dir="src/com/os/mobile/cardioplugin" />
         <framework src="src/android/cardio.gradle" custom="true" type="gradleReference" />
     </platform> <!-- /Android -->
 

src/android/CardIoActivityLifecycleCallbacks.java

@@ -0,0 +1,67 @@
+package com.os.mobile.cardioplugin;
+
+import android.app.Activity;
+import android.app.Application;
+import android.os.Bundle;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
+
+import io.card.payment.CardIOActivity;
+import io.card.payment.DataEntryActivity;
+
+/**
+ * Listener for Card IO Activities lifecycle.
+ * The main goal being to fix the insets on Android 15 (since edge-to-edge is enforced with targetSdk=35).
+ * Checks when an activity is in foreground (onResume), and applying the proper insets to the root layout.
+ * This way, there is no need to provide a custom implementation/fork of Card IO.
+ */
+public class CardIoActivityLifecycleCallbacks implements Application.ActivityLifecycleCallbacks {
+    @Override
+    public void onActivityCreated(@NonNull Activity activity, @Nullable Bundle bundle) {}
+
+    @Override
+    public void onActivityStarted(@NonNull Activity activity) {}
+
+
+    @Override
+    public void onActivityResumed(@NonNull Activity activity) {
+        if (!(activity instanceof CardIOActivity || activity instanceof DataEntryActivity)) {
+            return;
+        }
+        View activityLayoutRootView =
+                ((ViewGroup) activity.getWindow().getDecorView().getRootView()).getChildAt(0);
+        if (activityLayoutRootView != null) {
+            ViewCompat.setOnApplyWindowInsetsListener(
+                    activityLayoutRootView,
+                    (v, insets) -> {
+                        Insets systemBarInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars());
+                        v.setPadding(
+                                systemBarInsets.left,
+                                systemBarInsets.top,
+                                systemBarInsets.right,
+                                systemBarInsets.bottom
+                        );
+                        return insets;
+                    }
+            );
+        }
+    }
+
+    @Override
+    public void onActivityPaused(@NonNull Activity activity) {}
+
+    @Override
+    public void onActivityStopped(@NonNull Activity activity) {}
+
+    @Override
+    public void onActivitySaveInstanceState(@NonNull Activity activity, @NonNull Bundle bundle) {}
+
+    @Override
+    public void onActivityDestroyed(@NonNull Activity activity) {}
+}

src/android/CardIoPlugin.java

@@ -33,6 +33,8 @@ public class CardIoPlugin extends CordovaPlugin {
 
     private CallbackContext callbackContext;
 
+    private CardIoActivityLifecycleCallbacks mCurrentActivityCallback = null;
+
     @Override
     public boolean execute(String action, JSONArray args, CallbackContext callbackContext) throws JSONException {
         this.callbackContext = callbackContext;
@@ -83,6 +85,7 @@ private boolean scanCardLogic(JSONArray args) {
                 scanIntent.putExtra(CardIOActivity.EXTRA_REQUIRE_POSTAL_CODE, requirePostalCode); // default: false
                 // scanIntent.putExtra(CardIOActivity.EXTRA_SUPPRESS_MANUAL_ENTRY, true);
                 // scanIntent.putExtra(CardIOActivity.EXTRA_KEEP_APPLICATION_THEME, true);
+                observeActivityLifecycle();
                 this.cordova.startActivityForResult(this, scanIntent, CARDIO_PLUGIN_SCAN_CARD_REQUEST_CODE);
                 return true;
             } catch (JSONException e) {
@@ -95,6 +98,18 @@ private boolean scanCardLogic(JSONArray args) {
         }
     }
 
+    private void observeActivityLifecycle() {
+        if (mCurrentActivityCallback != null) {
+            this.cordova.getActivity().getApplication().unregisterActivityLifecycleCallbacks(
+                    mCurrentActivityCallback
+            );
+        }
+        mCurrentActivityCallback = new CardIoActivityLifecycleCallbacks();
+        this.cordova.getActivity().getApplication().registerActivityLifecycleCallbacks(
+                mCurrentActivityCallback
+        );
+    }
+
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent intent) {
         super.onActivityResult(requestCode, resultCode, intent);

src/android/cardio.gradle

@@ -1,7 +1,9 @@
 repositories {
+    google()
     mavenCentral()
 }
 
 dependencies {
     implementation 'io.card:android-sdk:5.1.2'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
 }