@ququplay/admob 8.0.3 → 8.0.5

package/android/src/main/java/com/getcapacitor/community/admob/banner/BannerExecutor.java

@@ -13,6 +13,8 @@ import android.widget.RelativeLayout;
 import androidx.annotation.NonNull;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.core.util.Supplier;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
 import com.getcapacitor.JSObject;
 import com.getcapacitor.PluginCall;
 import com.getcapacitor.community.admob.helpers.AdViewIdHelper;
@@ -26,8 +28,6 @@ import com.google.android.gms.ads.AdSize;
 import com.google.android.gms.ads.AdView;
 import com.google.android.gms.ads.LoadAdError;
 import com.google.android.gms.common.util.BiConsumer;
-import android.view.Window;
-import androidx.core.view.WindowCompat;
 
 public class BannerExecutor extends Executor {
 
@@ -35,6 +35,7 @@ public class BannerExecutor extends Executor {
     private RelativeLayout mAdViewLayout;
     private AdView mAdView;
     private ViewGroup mViewGroup;
+    private CoordinatorLayout.LayoutParams mAdViewLayoutParams;
 
     public BannerExecutor(
         Supplier<Context> contextSupplier,
@@ -87,7 +88,7 @@ public class BannerExecutor extends Executor {
             mAdViewLayout.setHorizontalGravity(Gravity.CENTER_HORIZONTAL);
             mAdViewLayout.setVerticalGravity(Gravity.BOTTOM);
 
-            final CoordinatorLayout.LayoutParams mAdViewLayoutParams = new CoordinatorLayout.LayoutParams(
+            mAdViewLayoutParams = new CoordinatorLayout.LayoutParams(
                 CoordinatorLayout.LayoutParams.WRAP_CONTENT,
                 CoordinatorLayout.LayoutParams.WRAP_CONTENT
             );
@@ -105,47 +106,37 @@ public class BannerExecutor extends Executor {
                     break;
             }
 
-            // set Safe Area only for Android 15+
-            Window window = activitySupplier.get().getWindow();
-            boolean isEdgeToEdge = !WindowCompat.isDecorFitsSystemWindows(window);
-            if (isEdgeToEdge) {
-                View rootView = activitySupplier.get().getWindow().getDecorView();
-                rootView.setOnApplyWindowInsetsListener((v, insets) -> {
-                    int bottomInset = insets.getSystemWindowInsetBottom();
-                    int topInset = insets.getSystemWindowInsetTop();
-
-                    if ("TOP_CENTER".equals(adOptions.position)) {
-                        mAdViewLayoutParams.setMargins(0, topInset, 0, 0);
-                    } else {
-                        mAdViewLayoutParams.setMargins(0, 0, 0, bottomInset);
-                    }
-
-                    mAdViewLayout.setLayoutParams(mAdViewLayoutParams);
-                    return insets;
-                });
-            }
-
-            mAdViewLayout.setLayoutParams(mAdViewLayoutParams);
-
             int densityMargin = (int) (adOptions.margin * density);
 
             // Center Banner Ads
             int adWidth = (int) (adOptions.adSize.getSize().getWidth() * density);
 
+            final int baseSideMargin;
             if (adWidth <= 0 || adOptions.adSize.toString().equals("ADAPTIVE_BANNER")) {
                 int margin = 0;
                 if (fullscreen) {
                     margin = (realWidthPixels - defaultWidthPixels) / 2;
                 }
-                mAdViewLayoutParams.setMargins(margin, densityMargin, margin, densityMargin);
+                baseSideMargin = margin;
             } else {
                 int sideMargin = ((int) defaultWidthPixels - adWidth) / 2;
                 if (fullscreen) {
                     sideMargin = (realWidthPixels - adWidth) / 2;
                 }
-                mAdViewLayoutParams.setMargins(sideMargin, densityMargin, sideMargin, densityMargin);
+                baseSideMargin = sideMargin;
+            }
+
+            applyBannerMargins(adOptions, baseSideMargin, densityMargin);
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+                ViewCompat.setOnApplyWindowInsetsListener(mAdViewLayout, (v, insets) -> {
+                    applyBannerMargins(adOptions, baseSideMargin, densityMargin);
+                    return insets;
+                });
             }
 
+            mAdViewLayout.setLayoutParams(mAdViewLayoutParams);
+
             createNewAdView(adOptions);
 
             call.resolve();
@@ -235,6 +226,27 @@ public class BannerExecutor extends Executor {
             });
     }
 
+    private void applyBannerMargins(AdOptions adOptions, int sideMargin, int densityMargin) {
+        int topInset = 0;
+        int bottomInset = 0;
+
+        WindowInsetsCompat insets = ViewCompat.getRootWindowInsets(mAdViewLayout != null ? mAdViewLayout : mViewGroup);
+        if (insets != null) {
+            topInset = insets.getInsets(WindowInsetsCompat.Type.systemBars()).top;
+            bottomInset = insets.getInsets(WindowInsetsCompat.Type.systemBars()).bottom;
+        }
+
+        if ("TOP_CENTER".equals(adOptions.position)) {
+            mAdViewLayoutParams.setMargins(sideMargin, densityMargin + topInset, sideMargin, 0);
+        } else {
+            mAdViewLayoutParams.setMargins(sideMargin, densityMargin, sideMargin, densityMargin + bottomInset);
+        }
+
+        if (mAdViewLayout != null) {
+            mAdViewLayout.setLayoutParams(mAdViewLayoutParams);
+        }
+    }
+
     /**
      * Follow iOS method Name:
      * https://developers.google.com/admob/ios/banner?hl=ja

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ququplay/admob",
-  "version": "8.0.3",
+  "version": "8.0.5",
   "description": "A native plugin for AdMob",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",