github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-01-31 17:32:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
jcesarmobile 2022-10-27 23:38:30 +02:00 committed by GitHub
parent 80f232aa79
commit 56d4b8312b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
framework/src/org/apache/cordova/SplashScreenPlugin.java
View File

@ -137,6 +137,7 @@ public class SplashScreenPlugin extends CordovaPlugin {
// If auto hide is disabled (false), the hiding of the splash screen must be determined & // 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. // triggered by the front-end code with the `navigator.splashscreen.hide()` method.
if (isFadeEnabled) {
// Setup the fade // Setup the fade
splashScreen.setOnExitAnimationListener(new SplashScreen.OnExitAnimationListener() { splashScreen.setOnExitAnimationListener(new SplashScreen.OnExitAnimationListener() {
@Override @Override
@ -146,8 +147,8 @@ public class SplashScreenPlugin extends CordovaPlugin {
splashScreenView splashScreenView
.animate() .animate()
.alpha(0.0f) .alpha(0.0f)
.setDuration(isFadeEnabled ? fadeDuration : 0) .setDuration(fadeDuration)
.setStartDelay(isFadeEnabled ? 0 : fadeDuration) .setStartDelay(0)
.setInterpolator(new AccelerateInterpolator()) .setInterpolator(new AccelerateInterpolator())
.setListener(new AnimatorListenerAdapter() { .setListener(new AnimatorListenerAdapter() {
@Override @Override
@ -159,6 +160,7 @@ public class SplashScreenPlugin extends CordovaPlugin {
} }
}); });
} }
}
private void attemptCloseOnPageFinished() { private void attemptCloseOnPageFinished() {
if (autoHide && delayTime == DEFAULT_DELAY_TIME) { if (autoHide && delayTime == DEFAULT_DELAY_TIME) {