Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: set launchShowDuration to 0 on new projects only #2876

Merged
merged 1 commit into from
May 7, 2020
Merged

fix: set launchShowDuration to 0 on new projects only #2876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion android/capacitor/src/main/java/com/getcapacitor/Splash.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public interface SplashListener {

public static final String CONFIG_KEY_PREFIX = "plugins.SplashScreen.";

public static final int DEFAULT_LAUNCH_SHOW_DURATION = 0;
public static final int DEFAULT_LAUNCH_SHOW_DURATION = 3000;
public static final int DEFAULT_FADE_IN_DURATION = 200;
public static final int DEFAULT_FADE_OUT_DURATION = 200;
public static final int DEFAULT_SHOW_DURATION = 3000;
Expand Down
7 changes: 6 additions & 1 deletion cli/src/common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,12 @@ export async function getOrCreateConfig(config: Config) {
appName: config.app.appName,
bundledWebRuntime: config.app.bundledWebRuntime,
npmClient: config.cli.npmClient,
webDir: basename(resolve(config.app.rootDir, config.app.webDir))
webDir: basename(resolve(config.app.rootDir, config.app.webDir)),
plugins: {
SplashScreen : {
launchShowDuration: 0
}
}
});

// Store our newly created or found external config as the default
Expand Down
2 changes: 1 addition & 1 deletion ios/Capacitor/Capacitor/Plugins/SplashScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class CAPSplashScreenPlugin: CAPPlugin {
var hideTask: Any?
var isVisible: Bool = false

let launchShowDuration = 0
let launchShowDuration = 3000
let launchAutoHide = true

let defaultFadeInDuration = 200
Expand Down