[HB-6597] Adaptive Banner Fixes (#183)

ChartBoost · Oct 7, 2023 · 17c2198 · 17c2198
1 parent 9c6d055
commit 17c2198
Show file tree

Hide file tree

Showing 6 changed files with 78 additions and 27 deletions.
diff --git a/...-mediation-android-bridge/src/main/java/com/chartboost/mediation/unity/BannerAdWrapper.kt b/...-mediation-android-bridge/src/main/java/com/chartboost/mediation/unity/BannerAdWrapper.kt
@@ -3,9 +3,11 @@ package com.chartboost.mediation.unity
 import android.app.Activity
 import android.graphics.Color
 import android.graphics.PointF
+import android.os.Build
 import android.util.DisplayMetrics
 import android.util.Log
 import android.util.Size
+import android.view.DisplayCutout
 import android.view.Gravity
 import android.view.View
 import android.view.View.OnLayoutChangeListener
@@ -353,6 +355,8 @@ class BannerAdWrapper(private val ad: HeliumBannerAd) {
         layout.gravity = bannerGravityPosition
         usesGravity = true
 
+        keepWithinSafeArea(screenLocation)
+
         // Attach the banner layout to the activity.
         val density = displayDensity
         try {
@@ -448,6 +452,55 @@ class BannerAdWrapper(private val ad: HeliumBannerAd) {
         return ViewGroup.LayoutParams((pixels * width).toInt(), (pixels * height).toInt())
     }
 
+    private fun keepWithinSafeArea(screenLocation: Int) {
+        ad.setOnApplyWindowInsetsListener { _, windowInsets ->
+            run {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                    val displayCutout: DisplayCutout? = windowInsets.displayCutout
+                    if (displayCutout != null) {
+                        var x = 0
+                        var y = 0
+                        when(screenLocation) {
+                            // Top-left
+                            0 -> {
+                                x= displayCutout.safeInsetLeft
+                                y = displayCutout.safeInsetTop
+                            }
+                            // Top-center
+                            1 -> {
+                                y = displayCutout.safeInsetTop
+                            }
+                            // Top-right
+                            2 -> {
+                                x= displayCutout.safeInsetRight
+                                y = displayCutout.safeInsetTop
+                            }
+                            // center
+                            3 -> {}
+                            // bottom-left
+                            4 -> {
+                                x= displayCutout.safeInsetLeft
+                                y = displayCutout.safeInsetBottom
+                            }
+                            // bottom-center
+                            5 -> {
+                                y = displayCutout.safeInsetBottom
+                            }
+                            // bottom-right
+                            6 -> {
+                                x= displayCutout.safeInsetRight
+                                y = displayCutout.safeInsetBottom
+                            }
+                        }
+                        ad.x = x.toFloat()
+                        ad.y = y.toFloat()
+                    }
+                }
+                windowInsets
+            }
+        }
+    }
+
     private val displayDensity: Float
         get() {
             return activity?.resources?.displayMetrics?.density ?: DisplayMetrics.DENSITY_DEFAULT.toFloat()

diff --git a/...ost-mediation-android-bridge/src/main/java/com/chartboost/mediation/unity/BannerLayout.kt b/...ost-mediation-android-bridge/src/main/java/com/chartboost/mediation/unity/BannerLayout.kt
@@ -5,12 +5,13 @@ import android.os.Build
 import android.util.DisplayMetrics
 import android.view.DisplayCutout
 import android.view.MotionEvent
+import android.view.WindowInsets
 import android.widget.RelativeLayout
 import com.chartboost.heliumsdk.ad.HeliumBannerAd
 import com.unity3d.player.UnityPlayer
 import kotlin.math.pow
 import kotlin.math.sqrt
-
+    
 class BannerLayout
     (
     context: Context,
@@ -44,26 +45,25 @@ class BannerLayout
         }
         else {
             val metrics = DisplayMetrics();
-            UnityPlayer.currentActivity.windowManager.defaultDisplay.getRealMetrics(metrics);
-            screenWidth = metrics.widthPixels;
+            UnityPlayer.currentActivity.windowManager.defaultDisplay.getRealMetrics(metrics)
+            screenWidth = metrics.widthPixels
             screenHeight = metrics.heightPixels
         }
+    }
 
+    override fun onApplyWindowInsets(insets: WindowInsets?): WindowInsets {
         // Get safe area insets
-        setOnApplyWindowInsetsListener { _, windowInsets -> run {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-                val displayCutout: DisplayCutout? = windowInsets.displayCutout
-                if (displayCutout != null) {
-                    // Get safe area insets
-                    safeAreaTop = displayCutout.safeInsetTop
-                    safeAreaLeft = displayCutout.safeInsetLeft
-                    safeAreaRight = displayCutout.safeInsetRight
-                    safeAreaBottom = displayCutout.safeInsetBottom
-                }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            val displayCutout: DisplayCutout? = insets?.displayCutout
+            if (displayCutout != null) {
+                // Get safe area insets
+                safeAreaTop = displayCutout.safeInsetTop
+                safeAreaLeft = displayCutout.safeInsetLeft
+                safeAreaRight = displayCutout.safeInsetRight
+                safeAreaBottom = displayCutout.safeInsetBottom
             }
-            windowInsets
-        }
         }
+        return super.onApplyWindowInsets(insets)
     }
 
     override fun onInterceptTouchEvent(event: MotionEvent?): Boolean {

diff --git a/com.chartboost.mediation/Runtime/Platforms/Android/ChartboostMediationAndroid.Callbacks.cs b/com.chartboost.mediation/Runtime/Platforms/Android/ChartboostMediationAndroid.Callbacks.cs
@@ -156,17 +156,9 @@ private void onAdCached(AndroidJavaObject ad, string error)
                     return;
                 }
 
-                ChartboostMediationBannerAdLoadResult loadResult;
-                if (!string.IsNullOrEmpty(error))
-                {
-                    loadResult = new ChartboostMediationBannerAdLoadResult(new ChartboostMediationError(error));
-                }
-                else
-                {
-                    loadResult = new ChartboostMediationBannerAdLoadResult(bannerView.LoadId, null, null);
-                    EventProcessor.ProcessChartboostMediationBannerEvent(ad.HashCode(),
-                        (int)EventProcessor.BannerAdEvents.Load);
-                }
+                var loadResult = !string.IsNullOrEmpty(error) 
+                    ? new ChartboostMediationBannerAdLoadResult(new ChartboostMediationError(error)) 
+                    : new ChartboostMediationBannerAdLoadResult(bannerView.LoadId, null, null);
 
                 androidBannerView.LoadRequest.Complete(loadResult);
             }

diff --git a/com.chartboost.mediation/Runtime/Plugins/Android/chartboost-mediation-android-bridge.jar b/com.chartboost.mediation/Runtime/Plugins/Android/chartboost-mediation-android-bridge.jar
diff --git a/com.chartboost.mediation/Runtime/Plugins/iOS/ChartboostMediationBannerAdWrapper.h b/com.chartboost.mediation/Runtime/Plugins/iOS/ChartboostMediationBannerAdWrapper.h
@@ -17,7 +17,7 @@
 
 typedef void (*ChartboostMediationBannerAdDragEvent)(void* uniqueId, float x, float y);
 
-@interface ChartboostMediationBannerAdWrapper : NSObject
+@interface ChartboostMediationBannerAdWrapper : NSObject<UIGestureRecognizerDelegate>
 
 @property ChartboostMediationBannerView* bannerView;
 @property ChartboostMediationBannerAdDragEvent dragListener;

diff --git a/com.chartboost.mediation/Runtime/Plugins/iOS/ChartboostMediationBannerAdWrapper.m b/com.chartboost.mediation/Runtime/Plugins/iOS/ChartboostMediationBannerAdWrapper.m
@@ -14,6 +14,8 @@ - (instancetype)initWithBannerView:(ChartboostMediationBannerView *)bannerView a
     self.bannerView = bannerView;
 
     self.panGesture = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(handlePan:)];
+    self.panGesture.delegate = self;
+
     [self.bannerView addGestureRecognizer:self.panGesture];
 
     self.dragListener = dragListener;
@@ -131,4 +133,8 @@ - (void)handlePan:(UIPanGestureRecognizer *)gr{
 
     self.dragListener((__bridge void*)self, x, y);
 }
+
+- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer{
+    return true;
+}
 @end