@capacitor/splash-screen 4.1.2-nightly-20221109T150752.0 → 4.1.2-nightly-20221110T150813.0

package/android/src/main/java/com/capacitorjs/plugins/splashscreen/SplashScreen.java

@@ -12,6 +12,7 @@ import android.graphics.PixelFormat;
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
+import android.os.Build;
 import android.os.Handler;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -19,6 +20,8 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.view.ViewTreeObserver.OnPreDrawListener;
+import android.view.Window;
+import android.view.WindowInsetsController;
 import android.view.WindowManager;
 import android.view.animation.LinearInterpolator;
 import android.widget.FrameLayout;
@@ -26,6 +29,8 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.view.WindowCompat;
+import androidx.core.view.WindowInsetsCompat;
 import com.getcapacitor.Logger;
 
 /**
@@ -222,7 +227,7 @@ public class SplashScreen {
                 isVisible = true;
 
                 if (settings.isAutoHide()) {
-                    new Handler()
+                    new Handler(context.getMainLooper())
                         .postDelayed(
                             () -> {
                                 hideDialog(activity, isLaunchSplash);
@@ -312,7 +317,11 @@ public class SplashScreen {
                     // Stops flickers dead in their tracks
                     // https://stackoverflow.com/a/21847579/32140
                     ImageView imageView = (ImageView) splashImage;
-                    imageView.setDrawingCacheEnabled(true);
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                        imageView.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
+                    } else {
+                        legacyStopFlickers(imageView);
+                    }
                     imageView.setScaleType(config.getScaleType());
                     imageView.setImageDrawable(splash);
                 }
@@ -320,19 +329,6 @@ public class SplashScreen {
 
             splashImage.setFitsSystemWindows(true);
 
-            if (config.isImmersive()) {
-                final int flags =
-                    View.SYSTEM_UI_FLAG_LAYOUT_STABLE |
-                    View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
-                    View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN |
-                    View.SYSTEM_UI_FLAG_HIDE_NAVIGATION |
-                    View.SYSTEM_UI_FLAG_FULLSCREEN |
-                    View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
-                splashImage.setSystemUiVisibility(flags);
-            } else if (config.isFullScreen()) {
-                splashImage.setSystemUiVisibility(View.SYSTEM_UI_FLAG_FULLSCREEN);
-            }
-
             if (config.getBackgroundColor() != null) {
                 splashImage.setBackgroundColor(config.getBackgroundColor());
             }
@@ -362,6 +358,11 @@ public class SplashScreen {
         }
     }
 
+    @SuppressWarnings("deprecation")
+    private void legacyStopFlickers(ImageView imageView) {
+        imageView.setDrawingCacheEnabled(true);
+    }
+
     private Drawable getSplashDrawable() {
         int splashId = context.getResources().getIdentifier(config.getResourceName(), "drawable", context.getPackageName());
         try {
@@ -398,7 +399,7 @@ public class SplashScreen {
                 isVisible = true;
 
                 if (settings.isAutoHide()) {
-                    new Handler()
+                    new Handler(context.getMainLooper())
                         .postDelayed(
                             () -> {
                                 hide(settings.getFadeOutDuration(), isLaunchSplash);
@@ -445,6 +446,35 @@ public class SplashScreen {
                     return;
                 }
 
+                if (config.isImmersive()) {
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                        activity.runOnUiThread(
+                            () -> {
+                                Window window = activity.getWindow();
+                                WindowCompat.setDecorFitsSystemWindows(window, false);
+                                WindowInsetsController controller = splashImage.getWindowInsetsController();
+                                controller.hide(WindowInsetsCompat.Type.systemBars());
+                                controller.setSystemBarsBehavior(WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE);
+                            }
+                        );
+                    } else {
+                        legacyImmersive();
+                    }
+                } else if (config.isFullScreen()) {
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                        activity.runOnUiThread(
+                            () -> {
+                                Window window = activity.getWindow();
+                                WindowCompat.setDecorFitsSystemWindows(window, false);
+                                WindowInsetsController controller = splashImage.getWindowInsetsController();
+                                controller.hide(WindowInsetsCompat.Type.statusBars());
+                            }
+                        );
+                    } else {
+                        legacyFullscreen();
+                    }
+                }
+
                 splashImage.setAlpha(0f);
 
                 splashImage
@@ -486,6 +516,23 @@ public class SplashScreen {
         );
     }
 
+    @SuppressWarnings("deprecation")
+    private void legacyImmersive() {
+        final int flags =
+            View.SYSTEM_UI_FLAG_LAYOUT_STABLE |
+            View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
+            View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN |
+            View.SYSTEM_UI_FLAG_HIDE_NAVIGATION |
+            View.SYSTEM_UI_FLAG_FULLSCREEN |
+            View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
+        splashImage.setSystemUiVisibility(flags);
+    }
+
+    @SuppressWarnings("deprecation")
+    private void legacyFullscreen() {
+        splashImage.setSystemUiVisibility(View.SYSTEM_UI_FLAG_FULLSCREEN);
+    }
+
     private void hide(final int fadeOutDuration, boolean isLaunchSplash) {
         // Warn the user if the splash was hidden automatically, which means they could be experiencing an app
         // that feels slower than it actually is.
@@ -614,6 +661,11 @@ public class SplashScreen {
             windowManager.removeView(splashImage);
         }
 
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && config.isFullScreen() || config.isImmersive()) {
+            // Exit fullscreen mode
+            Window window = ((Activity) context).getWindow();
+            WindowCompat.setDecorFitsSystemWindows(window, true);
+        }
         isHiding = false;
         isVisible = false;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/splash-screen",
-  "version": "4.1.2-nightly-20221109T150752.0",
+  "version": "4.1.2-nightly-20221110T150813.0",
   "description": "The Splash Screen API provides methods for showing or hiding a Splash image.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -80,5 +80,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4234fcf7c35b4dfe62c1aca2b22ed68531f29ce7"
+  "gitHead": "5fa87ea03d7a24297a98cc74be391b6b66db9e21"
 }