simplify logic for getCutoutandStatusBarInsets and use immersive mode

Author: emawby

Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/activity/MainActivity.java

@@ -1,8 +1,6 @@
 package com.onesignal.sdktest.activity;
 
-import android.os.Build;
 import android.os.Bundle;
-import android.view.WindowManager;
 
 import androidx.appcompat.app.AppCompatActivity;
 

OneSignalSDK/onesignal/src/main/java/com/onesignal/InAppMessageView.java

@@ -18,6 +18,7 @@
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowInsets;
 import android.view.WindowManager;
 import android.view.animation.Animation;
 import android.webkit.WebView;
@@ -278,12 +279,15 @@ public void run() {
      * @param parentRelativeLayout root layout to attach to the pop up window
      */
     private void createPopupWindow(@NonNull RelativeLayout parentRelativeLayout) {
+
         popupWindow = new PopupWindow(
                 parentRelativeLayout,
                 hasBackground ? WindowManager.LayoutParams.MATCH_PARENT : pageWidth,
                 hasBackground ? WindowManager.LayoutParams.MATCH_PARENT : WindowManager.LayoutParams.WRAP_CONTENT,
                 true
         );
+
+        OSViewUtils.getWindowHeight(currentActivity);
         popupWindow.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
         popupWindow.setTouchable(true);
         // NOTE: This seems like the key to getting fullscreen under notches working?!

OneSignalSDK/onesignal/src/main/java/com/onesignal/OSInAppMessageController.java

@@ -2,10 +2,6 @@
 
 import android.app.AlertDialog;
 import android.content.DialogInterface;
-import android.graphics.Insets;
-import android.graphics.Rect;
-import android.view.View;
-import android.view.Window;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

OneSignalSDK/onesignal/src/main/java/com/onesignal/OSViewUtils.java

@@ -9,6 +9,7 @@
 import android.os.Build;
 import androidx.annotation.NonNull;
 import android.util.DisplayMetrics;
+import android.view.DisplayCutout;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowInsets;
@@ -75,16 +76,33 @@ void available(@NonNull Activity currentActivity) {
        return rect;
     }
 
-    static int[] getWindowInsets(@NonNull Activity activity) {
+    static int[] getCutoutAndStatusBarInsets(@NonNull Activity activity) {
         Rect frame = getWindowVisibleDisplayFrame(activity);
         View contentView = activity.getWindow().findViewById(Window.ID_ANDROID_CONTENT);
+        float rightInset = 0;
+        float leftInset = 0;
         float topInset = (frame.top - contentView.getTop()) / Resources.getSystem().getDisplayMetrics().density;
         float bottomInset = (contentView.getBottom() - frame.bottom) / Resources.getSystem().getDisplayMetrics().density;
-        float rightInset = (frame.right - contentView.getRight()) / Resources.getSystem().getDisplayMetrics().density;
-        float leftInset = (contentView.getLeft() - frame.left) / Resources.getSystem().getDisplayMetrics().density;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            DisplayCutout cutout = activity.getWindowManager().getDefaultDisplay().getCutout();
+            if (cutout != null) {
+                rightInset = cutout.getSafeInsetRight() / Resources.getSystem().getDisplayMetrics().density;
+                leftInset = cutout.getSafeInsetLeft() / Resources.getSystem().getDisplayMetrics().density;
+            }
+        }
         return new int[]{Math.round(topInset), Math.round(bottomInset), Math.round(rightInset), Math.round(leftInset)};
     }
 
+    static int getFullbleedWindowWidth (@NonNull Activity activity) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            View decorView = activity.getWindow().getDecorView();
+            return decorView.getWidth();
+        } else {
+            return getWindowWidth(activity);
+        }
+    }
+
+
     static int getWindowWidth(@NonNull Activity activity) {
         return getWindowVisibleDisplayFrame(activity).width();
     }

OneSignalSDK/onesignal/src/main/java/com/onesignal/WebViewManager.java

@@ -22,6 +22,7 @@
 import java.io.UnsupportedEncodingException;
 
 import static com.onesignal.OSViewUtils.dpToPx;
+import static com.onesignal.OSViewUtils.getFullbleedWindowWidth;
 
 // Manages WebView instances by pre-loading them, displaying them, and closing them when dismissed.
 //   Includes a static map for pre-loading, showing, and dismissed so these events can't be duplicated.
@@ -136,7 +137,7 @@ static void dismissCurrentInAppMessage() {
     private static void setContentSafeAreaInsets(OSInAppMessageContent content, @NonNull final Activity activity) {
         String html = content.getContentHtml();
         String safeAreaInsetsScript = OSJavaScriptInterface.SET_SAFE_AREA_INSETS_SCRIPT;
-        int[] insets = OSViewUtils.getWindowInsets(activity);
+        int[] insets = OSViewUtils.getCutoutAndStatusBarInsets(activity);
         String safeAreaJSObject = String.format(OSJavaScriptInterface.SAFE_AREA_JS_OBJECT, insets[0] ,insets[1],insets[2],insets[3]);
         safeAreaInsetsScript = String.format(safeAreaInsetsScript, safeAreaJSObject);
         html += safeAreaInsetsScript;
@@ -321,7 +322,7 @@ private int pageRectToViewHeight(final @NonNull Activity activity, @NonNull JSON
     }
 
     private void updateSafeAreaInsets() {
-        int[] insets = OSViewUtils.getWindowInsets(activity);
+        int[] insets = OSViewUtils.getCutoutAndStatusBarInsets(activity);
         String safeAreaInsetsObject = String.format(OSJavaScriptInterface.SAFE_AREA_JS_OBJECT, insets[0], insets[1], insets[2], insets[3]);
         String safeAreaInsetsFunction = String.format(OSJavaScriptInterface.SET_SAFE_AREA_INSETS_JS_FUNCTION, safeAreaInsetsObject);
         webView.evaluateJavascript(safeAreaInsetsFunction, null);
@@ -433,8 +434,11 @@ private void setupWebView(@NonNull final Activity currentActivity, final @NonNul
        webView.addJavascriptInterface(new OSJavaScriptInterface(), OSJavaScriptInterface.JS_OBJ_NAME);
        if (isFullScreen) {
            webView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN |
-                                         View.SYSTEM_UI_FLAG_IMMERSIVE |
-                                         View.SYSTEM_UI_FLAG_HIDE_NAVIGATION);
+                   View.SYSTEM_UI_FLAG_IMMERSIVE |
+                   View.SYSTEM_UI_FLAG_HIDE_NAVIGATION);
+           if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+               webView.setFitsSystemWindows(false);
+           }
        }
        blurryRenderingWebViewForKitKatWorkAround(webView);
 
@@ -508,7 +512,12 @@ private static void enableWebViewRemoteDebugging() {
     }
 
     private int getWebViewMaxSizeX(Activity activity) {
-        int margin = messageContent.isFullScreen() ? 0 : (MARGIN_PX_SIZE * 2);
+        if (messageContent.isFullScreen()) {
+            return getFullbleedWindowWidth(activity);
+        } else {
+
+        }
+        int margin = (MARGIN_PX_SIZE * 2);
         return OSViewUtils.getWindowWidth(activity) - margin;
     }