center/cordova-plugin-splashscreen2
center/cordova-plugin-splashscreen2
13
0
Fork 0
forked from public/cordova-plugin-splashscreen
Code Pull Requests Activity

CB-8280 android: Don't apply SplashScreenDelay when .show() is called explicitly

Browse Source
This commit is contained in:
Andrew Grieve 2015-01-19 13:39:55 -05:00
parent ddec7008cb
commit e86a9cc7a4
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/android/SplashScreen.java
View File

@ -76,7 +76,7 @@ public class SplashScreen extends CordovaPlugin {
firstShow = false;
loadSpinner();
showSplashScreen();
showSplashScreen(true);
}
@Override
@ -139,7 +139,7 @@ public class SplashScreen extends CordovaPlugin {
if ("hide".equals(data.toString())) {
this.removeSplashScreen();
} else {
this.showSplashScreen();
this.showSplashScreen(false);
}
} else if ("spinner".equals(id)) {
if ("stop".equals(data.toString())) {
@ -167,7 +167,7 @@ public class SplashScreen extends CordovaPlugin {
* Shows the splash screen over the full Activity
*/
@SuppressWarnings("deprecation")
private void showSplashScreen() {
private void showSplashScreen(final boolean hideAfterDelay) {
final int splashscreenTime = preferences.getInteger("SplashScreenDelay", 3000);
final int drawableId = preferences.getInteger("SplashDrawableId", 0);
@ -175,7 +175,7 @@ public class SplashScreen extends CordovaPlugin {
if (this.splashDialog != null && splashDialog.isShowing()) {
return;
}
if (drawableId == 0 || splashscreenTime <= 0) {
if (drawableId == 0 || (splashscreenTime <= 0 && hideAfterDelay)) {
return;
}
@ -211,12 +211,14 @@ public class SplashScreen extends CordovaPlugin {
splashDialog.show();
// Set Runnable to remove splash screen just in case
final Handler handler = new Handler();
handler.postDelayed(new Runnable() {
public void run() {
removeSplashScreen();
}
}, splashscreenTime);
if (hideAfterDelay) {
final Handler handler = new Handler();
handler.postDelayed(new Runnable() {
public void run() {
removeSplashScreen();
}
}, splashscreenTime);
}
}
});
}