Updating SDK and demo app to use API 30

also testing fullscreen windowManager flags in the demo app

Author: emawby

Examples/OneSignalDemo/app/build.gradle

@@ -2,10 +2,10 @@ apply plugin: 'com.onesignal.androidsdk.onesignal-gradle-plugin'
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
         multiDexEnabled true

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

@@ -1,6 +1,8 @@
 package com.onesignal.sdktest.activity;
 
+import android.os.Build;
 import android.os.Bundle;
+import android.view.WindowManager;
 
 import androidx.appcompat.app.AppCompatActivity;
 
@@ -16,6 +18,10 @@ public class MainActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.main_activity_layout);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            //getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+            getWindow().getAttributes().layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
+        }
 
         viewModel = new MainActivityViewModel();
         OneSignal.addPermissionObserver(viewModel);

OneSignalSDK/build.gradle

@@ -4,8 +4,8 @@ buildscript {
 
     ext {
         buildVersions = [
-                compileSdkVersion: 29,
-                targetSdkVersion: 28
+                compileSdkVersion: 30,
+                targetSdkVersion: 30
         ]
         androidGradlePluginVersion = '3.6.2'
         androidConcurrentFutures = '1.1.0'

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

@@ -76,6 +76,9 @@ void available(@NonNull Activity currentActivity) {
     }
 
     static int[] getWindowInsets(@NonNull Activity activity) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+
+        }
         Rect frame = getWindowVisibleDisplayFrame(activity);
         View contentView = activity.getWindow().findViewById(Window.ID_ANDROID_CONTENT);
         int topInset = frame.top - contentView.getTop();
@@ -88,11 +91,12 @@ static int[] getWindowInsets(@NonNull Activity activity) {
     Not using this method for now because the bottom value is not correct (we don't cover the bottom buttons)
      */
     // Requirement: Ensure DecorView is ready by using OSViewUtils.decorViewReady
-    @TargetApi(Build.VERSION_CODES.M)
-    private static int[] getWindowInsetsAPI23Plus(@NonNull Activity activity) {
+    @TargetApi(Build.VERSION_CODES.P)
+    private static int[] getWindowInsetsAPI28Plus(@NonNull Activity activity) {
         View decorView = activity.getWindow().getDecorView();
         // Use use stable heights as SystemWindowInset subtracts the keyboard
         WindowInsets windowInsets = decorView.getRootWindowInsets();
+        //if windowInsets.getDisplayCutout().
         return new int[] {windowInsets.getStableInsetTop(), windowInsets.getStableInsetBottom(),
                 windowInsets.getStableInsetRight(), windowInsets.getStableInsetLeft()};
     }

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

@@ -12,6 +12,8 @@
 import android.util.Base64;
 import android.view.View;
 import android.view.Window;
+import android.view.WindowInsets;
+import android.view.WindowManager;
 import android.webkit.JavascriptInterface;
 import android.webkit.ValueCallback;
 import android.webkit.WebView;