fix: only do fadeout animation if FadeSplashScreen is true (#1506)

apache · Oct 27, 2022 · 56d4b83 · 56d4b83
1 parent 80f232a
commit 56d4b83
Showing 1 changed file with 23 additions and 21 deletions.
diff --git a/framework/src/org/apache/cordova/SplashScreenPlugin.java b/framework/src/org/apache/cordova/SplashScreenPlugin.java
@@ -137,27 +137,29 @@ private void setupSplashScreen(SplashScreen splashScreen) {
         // If auto hide is disabled (false), the hiding of the splash screen must be determined &
         // triggered by the front-end code with the `navigator.splashscreen.hide()` method.
 
-        // Setup the fade
-        splashScreen.setOnExitAnimationListener(new SplashScreen.OnExitAnimationListener() {
-            @Override
-            public void onSplashScreenExit(@NonNull SplashScreenViewProvider splashScreenViewProvider) {
-                View splashScreenView = splashScreenViewProvider.getView();
-
-                splashScreenView
-                    .animate()
-                    .alpha(0.0f)
-                    .setDuration(isFadeEnabled ? fadeDuration : 0)
-                    .setStartDelay(isFadeEnabled ? 0 : fadeDuration)
-                    .setInterpolator(new AccelerateInterpolator())
-                    .setListener(new AnimatorListenerAdapter() {
-                        @Override
-                        public void onAnimationEnd(Animator animation) {
-                            super.onAnimationEnd(animation);
-                            splashScreenViewProvider.remove();
-                        }
-                    }).start();
-            }
-        });
+        if (isFadeEnabled) {
+            // Setup the fade
+            splashScreen.setOnExitAnimationListener(new SplashScreen.OnExitAnimationListener() {
+                @Override
+                public void onSplashScreenExit(@NonNull SplashScreenViewProvider splashScreenViewProvider) {
+                    View splashScreenView = splashScreenViewProvider.getView();
+
+                    splashScreenView
+                            .animate()
+                            .alpha(0.0f)
+                            .setDuration(fadeDuration)
+                            .setStartDelay(0)
+                            .setInterpolator(new AccelerateInterpolator())
+                            .setListener(new AnimatorListenerAdapter() {
+                                @Override
+                                public void onAnimationEnd(Animator animation) {
+                                    super.onAnimationEnd(animation);
+                                    splashScreenViewProvider.remove();
+                                }
+                            }).start();
+                }
+            });
+        }
     }
 
     private void attemptCloseOnPageFinished() {