Updated version and RELEASENOTES.md for release 3.2.2

Fixed misspelling in the README
Github: close #88
2026-02-16 00:00:04 +08:00 · 2016-04-15 13:08:27 -07:00 · 2016-03-31 16:09:59 +03:00 · 2016-03-30 10:12:25 +03:00 · 2016-03-24 16:33:23 +03:00 · 2016-03-24 16:19:19 +03:00
17 changed files with 290 additions and 139 deletions
--- a/.jshintignore
+++ b/.jshintignore
@@ -0,0 +1 @@
+tests/ios
--- a/.jshintrc
+++ b/.jshintrc
@@ -0,0 +1,16 @@
+{
+    "browser": true
+  , "devel": true
+  , "bitwise": true
+  , "undef": true
+  , "trailing": true
+  , "quotmark": false
+  , "indent": 4
+  , "unused": "vars"
+  , "latedef": "nofunc"
+  , "globals": {
+        "module": false,
+        "exports": false,
+        "require": false
+    }
+}
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,8 @@
+language: objective-c
+sudo: false
+node_js:
+  - "4.2"
+env:
+  - TEST_DIR=.
+  - TEST_DIR=./tests/ios
+script: cd $TEST_DIR && npm install && npm test
--- a/README.md
+++ b/README.md
@@ -17,11 +17,13 @@
 #         under the License.
 -->

+[![Build Status](https://travis-ci.org/apache/cordova-plugin-splashscreen.svg?branch=master)](https://travis-ci.org/apache/cordova-plugin-splashscreen)
+
 # cordova-plugin-splashscreen

-This plugin displays and hides a splash screen during application launch.
+This plugin is required to work with splash screens. This plugin displays and hides a splash screen during application launch.

-:warning: Report issues on the [Apache Cordova issue tracker](https://issues.apache.org/jira/issues/?jql=project%20%3D%20CB%20AND%20status%20in%20%28Open%2C%20%22In%20Progress%22%2C%20Reopened%29%20AND%20resolution%20%3D%20Unresolved%20AND%20component%20%3D%20%22Plugin%20Splashscreen%22%20ORDER%20BY%20priority%20DESC%2C%20summary%20ASC%2C%20updatedDate%20DESC)
+Report issues with this plugin on the [Apache Cordova issue tracker][Apache Cordova issue tracker].

 ## Installation

@@ -42,34 +44,81 @@ This plugin displays and hides a splash screen during application launch.
 - Windows
 - Browser

+## Example Configuration
+In the top-level `config.xml` file (not the one in `platforms`), add configuration elements like those specified here.
+
+Please notice that the value of the "src" attribute is relative to the project directory and not to the www directory. You can name the source image whatever you like. The internal name in the app is determined by Cordova.
+
+```xml
+<platform name="android">
+    <!-- you can use any density that exists in the Android project -->
+    <splash src="res/screen/android/splash-land-hdpi.png" density="land-hdpi"/>
+    <splash src="res/screen/android/splash-land-ldpi.png" density="land-ldpi"/>
+    <splash src="res/screen/android/splash-land-mdpi.png" density="land-mdpi"/>
+    <splash src="res/screen/android/splash-land-xhdpi.png" density="land-xhdpi"/>
+
+    <splash src="res/screen/android/splash-port-hdpi.png" density="port-hdpi"/>
+    <splash src="res/screen/android/splash-port-ldpi.png" density="port-ldpi"/>
+    <splash src="res/screen/android/splash-port-mdpi.png" density="port-mdpi"/>
+    <splash src="res/screen/android/splash-port-xhdpi.png" density="port-xhdpi"/>
+</platform>
+
+<platform name="ios">
+    <!-- images are determined by width and height. The following are supported -->
+    <splash src="res/screen/ios/Default~iphone.png" width="320" height="480"/>
+    <splash src="res/screen/ios/Default@2x~iphone.png" width="640" height="960"/>
+    <splash src="res/screen/ios/Default-Portrait~ipad.png" width="768" height="1024"/>
+    <splash src="res/screen/ios/Default-Portrait@2x~ipad.png" width="1536" height="2048"/>
+    <splash src="res/screen/ios/Default-Landscape~ipad.png" width="1024" height="768"/>
+    <splash src="res/screen/ios/Default-Landscape@2x~ipad.png" width="2048" height="1536"/>
+    <splash src="res/screen/ios/Default-568h@2x~iphone.png" width="640" height="1136"/>
+    <splash src="res/screen/ios/Default-667h.png" width="750" height="1334"/>
+    <splash src="res/screen/ios/Default-736h.png" width="1242" height="2208"/>
+    <splash src="res/screen/ios/Default-Landscape-736h.png" width="2208" height="1242"/>
+</platform>
+
+<platform name="windows">
+    <!-- images are determined by width and height. The following are supported -->
+    <splash src="res/screen/windows/splashscreen.png" width="620" height="300"/>
+    <splash src="res/screen/windows/splashscreenphone.png" width="1152" height="1920"/>
+</platform>
+
+<platform name="blackberry10">
+    <!-- Add a rim:splash element for each resolution and locale you wish -->
+    <!-- http://developer.blackberry.com/html5/documentation/rim_splash_element.html -->
+    <rim:splash src="res/screen/blackberry/splashscreen.png"/>
+</platform>
+
+<preference name="SplashScreenDelay" value="10000" />
+```
+
 ## Preferences

 #### config.xml

-  __SplashScreen__ (string). The resource name which is used for the displaying splash screen. Different platforms use values for this.
+-  __AutoHideSplashScreen__ (boolean, default to `true`). Indicates whether to hide splash screen automatically or not. Splash screen hidden after amount of time specified in the `SplashScreenDelay` preference.

-        <preference name="SplashScreen" value="resourcename" />
-
-  __AutoHideSplashScreen__ (boolean, default to `true`). Indicates wherether hide splash screen automatically or not. Splash screen hidden after amount of time specified in the `SplashScreenDelay` preference.
-
-        <preference name="AutoHideSplashScreen" value="true" />
+```xml
+    <preference name="AutoHideSplashScreen" value="true" />
+```

 -  __SplashScreenDelay__ (number, default to 3000). Amount of time in milliseconds to wait before automatically hide splash screen.

-        <preference name="SplashScreenDelay" value="3000" />
-
+```xml
+    <preference name="SplashScreenDelay" value="3000" />
+```

 ### Android Quirks

 In your `config.xml`, you need to add the following preferences:

-    <preference name="SplashScreen" value="foo" />
-    <preference name="SplashScreenDelay" value="3000" />
-    <preference name="SplashMaintainAspectRatio" value="true|false" />
-    <preference name="SplashShowOnlyFirstTime" value="true|false" />
+```xml
+<preference name="SplashScreenDelay" value="3000" />
+<preference name="SplashMaintainAspectRatio" value="true|false" />
+<preference name="SplashShowOnlyFirstTime" value="true|false" />
+```

-Where foo is the name of the splashscreen file, preferably a 9 patch file. Make sure to add your splashcreen files to your res/xml directory under the appropriate folders. The second parameter represents how long the splashscreen will appear in milliseconds. It defaults to 3000 ms. See [Icons and Splash Screens](http://cordova.apache.org/docs/en/edge/config_ref_images.md.html)
-for more information.
+The first parameter represents how long the splashscreen will appear in milliseconds. It defaults to 3000 ms.

 "SplashMaintainAspectRatio" preference is optional. If set to true, splash screen drawable is not stretched to fit screen, but instead simply "covers" the screen, like CSS "background-size:cover". This is very useful when splash screen images cannot be distorted in any way, for example when they contain scenery or text. This setting works best with images that have large margins (safe areas) that can be safely cropped on screens with different aspect ratios.

@@ -81,28 +130,37 @@ The plugin reloads splash drawable whenever orientation changes, so you can spec

 You can use the following preferences in your `config.xml`:

-    <platform name="browser">
-        <preference name="SplashScreen" value="images/browser/splashscreen.jpg" /> <!-- defaults to "img/logo.png" -->
-        <preference name="SplashScreenDelay" value="3000" /> <!-- defaults to "3000" -->
-        <preference name="SplashScreenBackgroundColor" value="green" /> <!-- defaults to "#464646" -->
-        <preference name="ShowSplashScreen" value="false" /> <!-- defaults to "true" -->
-        <preference name="SplashScreenWidth" value="600" /> <!-- defaults to "170" -->
-        <preference name="SplashScreenHeight" value="300" /> <!-- defaults to "200" -->
-    </platform>
+```xml
+<platform name="browser">
+    <preference name="SplashScreen" value="/images/browser/splashscreen.jpg" /> <!-- defaults to "/img/logo.png" -->
+    <preference name="SplashScreenDelay" value="3000" /> <!-- defaults to "3000" -->
+    <preference name="SplashScreenBackgroundColor" value="green" /> <!-- defaults to "#464646" -->
+    <preference name="ShowSplashScreen" value="false" /> <!-- defaults to "true" -->
+    <preference name="SplashScreenWidth" value="600" /> <!-- defaults to "170" -->
+    <preference name="SplashScreenHeight" value="300" /> <!-- defaults to "200" -->
+</platform>
+```

+__Note__: `SplashScreen` value should be absolute in order to work in a sub-page. The `SplashScreen` value is used only for the browser platform. The value will be ignored for other platforms.

-### Android and iOS Quirks
+### Android and iOS Quirks
+
+- In iOS, the splashscreen images are called launch images. These images are mandatory on iOS.

 - `FadeSplashScreen` (boolean, defaults to `true`): Set to `false` to
  prevent the splash screen from fading in and out when its display
  state changes.

-        <preference name="FadeSplashScreen" value="false"/>
+```xml
+    <preference name="FadeSplashScreen" value="false"/>
+```

 - `FadeSplashScreenDuration` (float, defaults to `3000`): Specifies the
  number of milliseconds for the splash screen fade effect to execute.

-        <preference name="FadeSplashScreenDuration" value="3000"/>
+```xml
+    <preference name="FadeSplashScreenDuration" value="3000"/>
+```

 Note also that this value used to be seconds, and not milliseconds, so values less than 30 will still be treated as seconds. ( Consider this a deprecated patch that will disapear in some future version. )

@@ -123,12 +181,12 @@ window.setTimeout(function () {
 }, splashDuration - fadeDuration);
 ```

-### iOS Quirks
-
 - `ShowSplashScreenSpinner` (boolean, defaults to `true`): Set to `false`
  to hide the splash-screen spinner.

-        <preference name="ShowSplashScreenSpinner" value="false"/>
+```xml
+    <preference name="ShowSplashScreenSpinner" value="false"/>
+```

 ## Methods

@@ -139,7 +197,9 @@ window.setTimeout(function () {

 Dismiss the splash screen.

-    navigator.splashscreen.hide();
+```js
+navigator.splashscreen.hide();
+```


 ### BlackBerry 10, WP8, iOS Quirk
@@ -148,16 +208,19 @@ The `config.xml` file's `AutoHideSplashScreen` setting must be
 `false`. To delay hiding the splash screen for two seconds, add a
 timer such as the following in the `deviceready` event handler:

-        setTimeout(function() {
-            navigator.splashscreen.hide();
-        }, 2000);
+```js
+setTimeout(function() {
+    navigator.splashscreen.hide();
+}, 2000);
+```

 ## splashscreen.show

 Displays the splash screen.

-    navigator.splashscreen.show();
-
+```js
+navigator.splashscreen.show();
+```

 Your application cannot call `navigator.splashscreen.show()` until the app has
 started and the `deviceready` event has fired. But since typically the splash
@@ -165,7 +228,7 @@ screen is meant to be visible before your app has started, that would seem to
 defeat the purpose of the splash screen.  Providing some configuration in
 `config.xml` will automatically `show` the splash screen immediately after your
 app launch and before it has fully started and received the `deviceready`
-event. See [Icons and Splash Screens](http://cordova.apache.org/docs/en/edge/config_ref_images.md.html)
-for more information on doing this configuration. For this reason, it is
-unlikely you need to call `navigator.splashscreen.show()` to make the splash
+event. For this reason, it is unlikely you need to call `navigator.splashscreen.show()` to make the splash
 screen visible for app startup.
+
+[Apache Cordova issue tracker]: https://issues.apache.org/jira/issues/?jql=project%20%3D%20CB%20AND%20status%20in%20%28Open%2C%20%22In%20Progress%22%2C%20Reopened%29%20AND%20resolution%20%3D%20Unresolved%20AND%20component%20%3D%20%22Plugin%20Splashscreen%22%20ORDER%20BY%20priority%20DESC%2C%20summary%20ASC%2C%20updatedDate%20DESC
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -20,6 +20,27 @@
 -->
 # Release Notes

+### 3.2.2 (Apr 15, 2016)
+* CB-10979 Fix splashscreen **iOS** native tests. Added `jshintignore` for tests/ios
+* CB-10895 Transparent Splashscreen view sometimes remains
+* CB-10562 `hide()` not working in latest splashscreen plug in 3.1.0 in **iOS**
+* CB-10688 Plugin Splashscreen Readme must have examples.
+* CB-10864 Run **iOS** native tests on Travis
+
+### 3.2.1 (Mar 09, 2016)
+* [CB-10764](https://issues.apache.org/jira/browse/CB-10764) Remove emoji in cordova-plugin-splashscreen
+* [CB-10650](https://issues.apache.org/jira/browse/CB-10650) Non-index content.src causes Splashscreen to be not displayed on **Browser**
+* [CB-10636](https://issues.apache.org/jira/browse/CB-10636) Add JSHint for plugins
+* [CB-10606](https://issues.apache.org/jira/browse/CB-10606) fix deprecation warning for interfaceOrientation on **iOS**
+* chore: edit package.json license to match SPDX id
+
+### 3.2.0 (Feb 09, 2016)
+* [CB-10422](https://issues.apache.org/jira/browse/CB-10422) Splashscreen displays black screen with no image on Android
+* [CB-10412](https://issues.apache.org/jira/browse/CB-10412) AutoHideSplashScreen "false" isn't taken in account on iOS
+* [CB-9516](https://issues.apache.org/jira/browse/CB-9516) Android SplashScreen - Spinner Does Not Display
+* [CB-9094](https://issues.apache.org/jira/browse/CB-9094) Smarter autohide logic on Android
+* [CB-8396](https://issues.apache.org/jira/browse/CB-8396) Add AutoHideSplashScreen logic to Android's Splashscreen
+
 ### 3.1.0 (Jan 15, 2016)
 * CB-9538 Implementing `FadeSplashScreen` feature for **Android**
 * CB-9240 Cordova splash screen plugin **iPad** landscape mode issue
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "cordova-plugin-splashscreen",
-  "version": "3.1.0",
+  "version": "3.2.2",
  "description": "Cordova Splashscreen Plugin",
  "cordova": {
    "id": "cordova-plugin-splashscreen",
@@ -34,6 +34,10 @@
    "cordova-windows",
    "cordova-tizen"
  ],
+  "scripts": {
+    "test": "npm run jshint",
+    "jshint": "node node_modules/jshint/bin/jshint www && node node_modules/jshint/bin/jshint src && node node_modules/jshint/bin/jshint tests"
+  },
  "engines": [
    {
      "name": "cordova-android",
@@ -41,5 +45,8 @@
    }
  ],
  "author": "Apache Software Foundation",
-  "license": "Apache 2.0"
+  "license": "Apache-2.0",
+  "devDependencies": {
+    "jshint": "^2.6.0"
+  }
 }
--- a/plugin.xml
+++ b/plugin.xml
@@ -20,7 +20,7 @@

 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
           id="cordova-plugin-splashscreen"
-      version="3.1.0">
+      version="3.2.2">
    <name>Splashscreen</name>
    <description>Cordova Splashscreen Plugin</description>
    <license>Apache 2.0</license>
--- a/src/android/SplashScreen.java
+++ b/src/android/SplashScreen.java
@@ -25,8 +25,10 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.res.Configuration;
 import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
 import android.os.Handler;
 import android.view.Display;
+import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup.LayoutParams;
 import android.view.WindowManager;
@@ -35,6 +37,8 @@ import android.view.animation.AlphaAnimation;
 import android.view.animation.DecelerateInterpolator;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.ProgressBar;
+import android.widget.RelativeLayout;

 import org.apache.cordova.CallbackContext;
 import org.apache.cordova.CordovaPlugin;
@@ -51,6 +55,7 @@ public class SplashScreen extends CordovaPlugin {
    private static Dialog splashDialog;
    private static ProgressDialog spinnerDialog;
    private static boolean firstShow = true;
+    private static boolean lastHideAfterDelay; // https://issues.apache.org/jira/browse/CB-9094

    /**
     * Displays the splash drawable.
@@ -73,7 +78,7 @@ public class SplashScreen extends CordovaPlugin {

    @Override
    protected void pluginInitialize() {
-        if (HAS_BUILT_IN_SPLASH_SCREEN || !firstShow) {
+        if (HAS_BUILT_IN_SPLASH_SCREEN) {
            return;
        }
        // Make WebView invisible while loading URL
@@ -93,12 +98,14 @@ public class SplashScreen extends CordovaPlugin {
        // Save initial orientation.
        orientation = cordova.getActivity().getResources().getConfiguration().orientation;

+        if (firstShow) {
+            boolean autoHide = preferences.getBoolean("AutoHideSplashScreen", true);
+            showSplashScreen(autoHide);
+        }
+
        if (preferences.getBoolean("SplashShowOnlyFirstTime", true)) {
            firstShow = false;
        }
-
-        loadSpinner();
-        showSplashScreen(true);
    }

    /**
@@ -109,7 +116,7 @@ public class SplashScreen extends CordovaPlugin {
    }

    private int getFadeDuration () {
-        int fadeSplashScreenDuration = preferences.getBoolean("FadeSplashScreen", true) == true ?
+        int fadeSplashScreenDuration = preferences.getBoolean("FadeSplashScreen", true) ?
            preferences.getInteger("FadeSplashScreenDuration", DEFAULT_SPLASHSCREEN_DURATION) : 0;

        if (fadeSplashScreenDuration < 30) {
@@ -127,7 +134,7 @@ public class SplashScreen extends CordovaPlugin {
            return;
        }
        // hide the splash screen to avoid leaking a window
-        this.removeSplashScreen();
+        this.removeSplashScreen(true);
    }

    @Override
@@ -136,7 +143,7 @@ public class SplashScreen extends CordovaPlugin {
            return;
        }
        // hide the splash screen to avoid leaking a window
-        this.removeSplashScreen();
+        this.removeSplashScreen(true);
        // If we set this to true onDestroy, we lose track when we go from page to page!
        //firstShow = true;
    }
@@ -155,16 +162,6 @@ public class SplashScreen extends CordovaPlugin {
                    webView.postMessage("splashscreen", "show");
                }
            });
-        } else if (action.equals("spinnerStart")) {
-            if (!HAS_BUILT_IN_SPLASH_SCREEN) {
-                final String title = args.getString(0);
-                final String message = args.getString(1);
-                cordova.getActivity().runOnUiThread(new Runnable() {
-                    public void run() {
-                        spinnerStart(title, message);
-                    }
-                });
-            }
        } else {
            return false;
        }
@@ -180,17 +177,16 @@ public class SplashScreen extends CordovaPlugin {
        }
        if ("splashscreen".equals(id)) {
            if ("hide".equals(data.toString())) {
-                this.removeSplashScreen();
+                this.removeSplashScreen(false);
            } else {
                this.showSplashScreen(false);
            }
        } else if ("spinner".equals(id)) {
            if ("stop".equals(data.toString())) {
-                this.spinnerStop();
                getView().setVisibility(View.VISIBLE);
            }
        } else if ("onReceivedError".equals(id)) {
-            spinnerStop();
+            this.spinnerStop();
        }
        return null;
    }
@@ -210,12 +206,13 @@ public class SplashScreen extends CordovaPlugin {
        }
    }

-    private void removeSplashScreen() {
+    private void removeSplashScreen(final boolean forceHideImmediately) {
        cordova.getActivity().runOnUiThread(new Runnable() {
            public void run() {
                if (splashDialog != null && splashDialog.isShowing()) {
                    final int fadeSplashScreenDuration = getFadeDuration();
-                    if (fadeSplashScreenDuration > 0) {
+                    // CB-10692 If the plugin is being paused/destroyed, skip the fading and hide it immediately
+                    if (fadeSplashScreenDuration > 0 && forceHideImmediately == false) {
                        AlphaAnimation fadeOut = new AlphaAnimation(1, 0);
                        fadeOut.setInterpolator(new DecelerateInterpolator());
                        fadeOut.setDuration(fadeSplashScreenDuration);
@@ -226,6 +223,7 @@ public class SplashScreen extends CordovaPlugin {
                        fadeOut.setAnimationListener(new Animation.AnimationListener() {
                            @Override
                            public void onAnimationStart(Animation animation) {
+                                spinnerStop();
                            }

                            @Override
@@ -242,6 +240,7 @@ public class SplashScreen extends CordovaPlugin {
                            }
                        });
                    } else {
+                        spinnerStop();
                        splashDialog.dismiss();
                        splashDialog = null;
                        splashImageView = null;
@@ -260,13 +259,15 @@ public class SplashScreen extends CordovaPlugin {
        final int drawableId = preferences.getInteger("SplashDrawableId", 0);

        final int fadeSplashScreenDuration = getFadeDuration();
-        final int effectiveSplashDuration = splashscreenTime - fadeSplashScreenDuration;
+        final int effectiveSplashDuration = Math.max(0, splashscreenTime - fadeSplashScreenDuration);
+
+        lastHideAfterDelay = hideAfterDelay;

        // If the splash dialog is showing don't try to show it again
        if (splashDialog != null && splashDialog.isShowing()) {
            return;
        }
-        if (drawableId == 0 || (effectiveSplashDuration <= 0 && hideAfterDelay)) {
+        if (drawableId == 0 || (splashscreenTime <= 0 && hideAfterDelay)) {
            return;
        }

@@ -309,12 +310,18 @@ public class SplashScreen extends CordovaPlugin {
                splashDialog.setCancelable(false);
                splashDialog.show();

+                if (preferences.getBoolean("ShowSplashScreenSpinner", true)) {
+                    spinnerStart();
+                }
+
                // Set Runnable to remove splash screen just in case
                if (hideAfterDelay) {
                    final Handler handler = new Handler();
                    handler.postDelayed(new Runnable() {
                        public void run() {
-                            removeSplashScreen();
+                            if (lastHideAfterDelay) {
+                                removeSplashScreen(false);
+                            }
                        }
                    }, effectiveSplashDuration);
                }
@@ -322,47 +329,38 @@ public class SplashScreen extends CordovaPlugin {
        });
    }

-    /*
-     * Load the spinner
-     */
-    private void loadSpinner() {
-        // If loadingDialog property, then show the App loading dialog for first page of app
-        String loading = null;
-        if (webView.canGoBack()) {
-            loading = preferences.getString("LoadingDialog", null);
-        }
-        else {
-            loading = preferences.getString("LoadingPageDialog", null);
-        }
-        if (loading != null) {
-            String title = "";
-            String message = "Loading Application...";
-
-            if (loading.length() > 0) {
-                int comma = loading.indexOf(',');
-                if (comma > 0) {
-                    title = loading.substring(0, comma);
-                    message = loading.substring(comma + 1);
-                }
-                else {
-                    title = "";
-                    message = loading;
-                }
-            }
-            spinnerStart(title, message);
-        }
-    }
-
-    private void spinnerStart(final String title, final String message) {
+    // Show only spinner in the center of the screen
+    private void spinnerStart() {
        cordova.getActivity().runOnUiThread(new Runnable() {
            public void run() {
                spinnerStop();
-                spinnerDialog = ProgressDialog.show(webView.getContext(), title, message, true, true,
-                        new DialogInterface.OnCancelListener() {
-                            public void onCancel(DialogInterface dialog) {
-                                spinnerDialog = null;
-                            }
-                        });
+
+                spinnerDialog = new ProgressDialog(webView.getContext());
+                spinnerDialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
+                    public void onCancel(DialogInterface dialog) {
+                        spinnerDialog = null;
+                    }
+                });
+
+                spinnerDialog.setCancelable(false);
+                spinnerDialog.setIndeterminate(true);
+
+                RelativeLayout centeredLayout = new RelativeLayout(cordova.getActivity());
+                centeredLayout.setGravity(Gravity.CENTER);
+                centeredLayout.setLayoutParams(new RelativeLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
+
+                ProgressBar progressBar = new ProgressBar(webView.getContext());
+                RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
+                layoutParams.addRule(RelativeLayout.CENTER_IN_PARENT, RelativeLayout.TRUE);
+                progressBar.setLayoutParams(layoutParams);
+
+                centeredLayout.addView(progressBar);
+
+                spinnerDialog.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
+                spinnerDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+
+                spinnerDialog.show();
+                spinnerDialog.setContentView(centeredLayout);
            }
        });
    }
--- a/src/blackberry10/index.js
+++ b/src/blackberry10/index.js
@@ -14,6 +14,8 @@
 * limitations under the License.
 */

+/* global PluginResult */
+
 module.exports = {
    show: function (success, fail, args, env) {
        var result = new PluginResult(args, env);
--- a/src/browser/SplashScreenProxy.js
+++ b/src/browser/SplashScreenProxy.js
@@ -18,17 +18,18 @@
 * under the License.
 *
 */
+
 // Default parameter values including image size can be changed in `config.xml`
 var splashImageWidth = 170;
 var splashImageHeight = 200;
 var position = { x: 0, y: 0, width: splashImageWidth, height: splashImageHeight }; 
-var splash = null; //
 var localSplash; // the image to display
 var localSplashImage;
 var bgColor = "#464646";
-var imageSrc = 'img/logo.png';
+var imageSrc = '/img/logo.png';
 var splashScreenDelay = 3000; // in milliseconds
 var showSplashScreen = true; // show splashcreen by default
+var cordova = require('cordova');
 var configHelper = cordova.require('cordova/confighelper');

 function updateImageLocation() {
@@ -103,7 +104,6 @@ function readPreferencesFromCfg(cfg) {
    } catch(e) {
        var msg = '[Browser][SplashScreen] Error occured on loading preferences from config.xml: ' + JSON.stringify(e);
        console.error(msg);
-        error(msg);
    }
 }

--- a/src/ios/CDVSplashScreen.h
+++ b/src/ios/CDVSplashScreen.h
@@ -36,6 +36,7 @@ typedef struct {
    UIImageView* _imageView;
    NSString* _curImageName;
    BOOL _visible;
+    BOOL _destroyed;
 }

 - (void)show:(CDVInvokedUrlCommand*)command;
--- a/src/ios/CDVSplashScreen.m
+++ b/src/ios/CDVSplashScreen.m
@@ -41,7 +41,7 @@

 - (void)hide:(CDVInvokedUrlCommand*)command
 {
-    [self setVisible:NO];
+    [self setVisible:NO andForce:YES];
 }

 - (void)pageDidLoad
@@ -120,6 +120,7 @@
    [parentView addObserver:self forKeyPath:@"bounds" options:0 context:nil];

    [self updateImage];
+    _destroyed = NO;
 }

 - (void)hideViews
@@ -130,6 +131,7 @@

 - (void)destroyViews
 {
+    _destroyed = YES;
    [(CDVViewController *)self.viewController setEnabledAutorotation:[(CDVViewController *)self.viewController shouldAutorotateDefaultValue]];

    [_imageView removeFromSuperview];
@@ -327,7 +329,7 @@
    CGRect imgBounds = (img) ? CGRectMake(0, 0, img.size.width, img.size.height) : CGRectZero;

    CGSize screenSize = [self.viewController.view convertRect:[UIScreen mainScreen].bounds fromView:nil].size;
-    UIInterfaceOrientation orientation = self.viewController.interfaceOrientation;
+    UIInterfaceOrientation orientation = [UIApplication sharedApplication].statusBarOrientation;
    CGAffineTransform imgTransform = CGAffineTransformIdentity;

    /* If and only if an iPhone application is landscape-only as per
@@ -376,7 +378,12 @@

 - (void)setVisible:(BOOL)visible
 {
-    if (visible != _visible)
+    [self setVisible:visible andForce:NO];
+}
+
+- (void)setVisible:(BOOL)visible andForce:(BOOL)force
+{
+    if (visible != _visible || force)
    {
        _visible = visible;

@@ -388,6 +395,19 @@
        id splashDurationString = [self.commandDelegate.settings objectForKey: [@"SplashScreenDelay" lowercaseString]];
        float splashDuration = splashDurationString == nil ? kSplashScreenDurationDefault : [splashDurationString floatValue];

+        id autoHideSplashScreenValue = [self.commandDelegate.settings objectForKey:[@"AutoHideSplashScreen" lowercaseString]];
+        BOOL autoHideSplashScreen = true;
+
+        if (autoHideSplashScreenValue != nil) {
+            autoHideSplashScreen = [autoHideSplashScreenValue boolValue];
+        }
+
+        if (!autoHideSplashScreen) {
+            // CB-10412 SplashScreenDelay does not make sense if the splashscreen is hidden manually
+            splashDuration = 0;
+        }
+
+
        if (fadeSplashScreenValue == nil)
        {
            fadeSplashScreenValue = @"true";
@@ -418,21 +438,34 @@
        else
        {
            __weak __typeof(self) weakSelf = self;
-            float effectiveSplashDuration = (splashDuration - fadeDuration) / 1000;
+            float effectiveSplashDuration;
+
+            // [CB-10562] AutoHideSplashScreen may be "true" but we should still be able to hide the splashscreen manually.
+            if (!autoHideSplashScreen || force) {
+                effectiveSplashDuration = (fadeDuration) / 1000;
+            } else {
+                effectiveSplashDuration = (splashDuration - fadeDuration) / 1000;
+            }
+
            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (uint64_t) effectiveSplashDuration * NSEC_PER_SEC), dispatch_get_main_queue(), CFBridgingRelease(CFBridgingRetain(^(void) {
-                   [UIView transitionWithView:self.viewController.view
-                                   duration:(fadeDuration / 1000)
-                                   options:UIViewAnimationOptionTransitionNone
-                                   animations:^(void) {
-                                       [weakSelf hideViews];
-                                   }
-                                   completion:^(BOOL finished) {
-                                       if (finished) {
-                                           [weakSelf destroyViews];
-                                           // TODO: It might also be nice to have a js event happen here -jm
-                                       }
-                                     }
+                if (!_destroyed) {
+                    [UIView transitionWithView:self.viewController.view
+                                    duration:(fadeDuration / 1000)
+                                    options:UIViewAnimationOptionTransitionNone
+                                    animations:^(void) {
+                                        [weakSelf hideViews];
+                                    }
+                                    completion:^(BOOL finished) {
+                                        // Always destroy views, otherwise you could have an 
+                                        // invisible splashscreen that is overlayed over your active views
+                                        // which causes that no touch events are passed
+                                        if (!_destroyed) {
+                                            [weakSelf destroyViews];
+                                            // TODO: It might also be nice to have a js event happen here -jm
+                                        }
+                                    }
                    ];
+                }
            })));
        }
    }
--- a/src/tizen/SplashScreenProxy.js
+++ b/src/tizen/SplashScreenProxy.js
@@ -21,7 +21,7 @@

 ( function() {

-win = null;
+var win = null;

 module.exports = {
    show: function() {
--- a/tests/ios/package.json
+++ b/tests/ios/package.json
@@ -5,9 +5,9 @@
    "author": "Apache Software Foundation",
    "license": "Apache Version 2.0",
    "dependencies": {
-        "cordova-ios": "^3.6.0"
+        "cordova-ios": "*"
    },
    "scripts": {
-        "test": "xcodebuild test -workspace CDVSplashScreenTest.xcworkspace -scheme CDVSplashScreenLibTests -destination 'platform=iOS Simulator,name=iPhone 5' CONFIGURATION_BUILD_DIR='/tmp'"
-    }    
-}
+        "test": "xcodebuild test -workspace CDVSplashScreenTest.xcworkspace -scheme CDVSplashScreenLibTests -destination 'platform=iOS Simulator,name=iPhone 5' CONFIGURATION_BUILD_DIR='/tmp' HEADER_SEARCH_PATHS='$(OBJROOT)/UninstalledProducts/$(PLATFORM_NAME)/include'"
+    }
+}
--- a/tests/plugin.xml
+++ b/tests/plugin.xml
@@ -20,7 +20,7 @@

 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
    id="cordova-plugin-splashscreen-tests"
-    version="3.1.0">
+    version="3.2.2">
    <name>Cordova Splashscreen Plugin Tests</name>
    <license>Apache 2.0</license>

--- a/tests/tests.js
+++ b/tests/tests.js
@@ -19,18 +19,20 @@
 *
 */

-exports.defineAutoTest = function () {
+/* jshint jasmine: true */
+
+exports.defineAutoTests = function () {
    describe('Splashscreen (cordova)', function () {
        it("splashscreen.spec.1 should exist", function () {
            expect(navigator.splashscreen).toBeDefined();
        });

-        it("splashscreen.spec.2 exec method should exist", function () {
+        it("splashscreen.spec.2 show method should exist", function () {
            expect(navigator.splashscreen.show).toBeDefined();
            expect(typeof navigator.splashscreen.show).toBe('function');
        });

-        it("splashscreen.spec.3 exec method should exist", function () {
+        it("splashscreen.spec.3 hide method should exist", function () {
            expect(navigator.splashscreen.hide).toBeDefined();
            expect(typeof navigator.splashscreen.hide).toBe('function');
        });
--- a/www/windows/SplashScreenProxy.js
+++ b/www/windows/SplashScreenProxy.js
@@ -20,17 +20,16 @@
 */

 /*jslint sloppy:true */
-/*global Windows:true, require, module, window, document, WinJS */
+/*global WinJS */

-var cordova = require('cordova'),
-    channel = require('cordova/channel');
+var cordova = require('cordova');

 var isPhone = (cordova.platformId == "windows") && WinJS.Utilities.isPhone;
 var isHosted = window.location.protocol.indexOf('http') === 0;
-var localSplash = null;
+var localSplash = null, localSplashImage = null;
 var bgColor = "#464646"; // default backgrond color; TDOO - read it from .appxmanifest
-var splashImageSrc = (isHosted ? "ms-appx-web" : "ms-appx") + ":///images/"
-    + (isPhone ? "splashscreenphone.png" : "splashscreen.png");
+var splashImageSrc = (isHosted ? "ms-appx-web" : "ms-appx") + ":///images/" +
+    (isPhone ? "splashscreenphone.png" : "splashscreen.png");

 var SplashScreen = {
    setBGColor: function (cssBGColor) {
Author	SHA1	Message	Date
Steve Gill	14061d1999	Updated version and RELEASENOTES.md for release 3.2.2	2016-04-15 13:08:27 -07:00
weexpectedTHIS	6863886d74	Fixed misspelling in the README Github: close #88	2016-03-31 16:09:59 +03:00
daserge	9832d2e165	CB-10979 Fix splashscreen ios native tests Added jshintignore for tests/ios	2016-03-30 10:12:25 +03:00
Jeroen Verhoest	bea0a4e408	CB-10895 Transparent Splashscreen view sometimes remains github: close#92	2016-03-24 16:33:23 +03:00
daserge	41d9ae94ff	CB-10562 hide() not working in latest splashscreen plug in 3.1.0 in iOS	2016-03-24 16:19:19 +03:00
Sarangan Rajamanickam	9ca15db91a	CB-10688:Plugin Splashscreen Readme must have examples. This closes #90	2016-03-21 15:04:56 -07:00
daserge	f8311aaca8	CB-10864 Run ios native tests on Travis Updated cordova-ios tests dependency version to latest published	2016-03-14 20:30:52 +03:00
Carlos Santana	abbb07e5ee	clean up release notes	2016-03-10 13:56:59 -05:00
Carlos Santana	2012ba9ab6	CB-10820 Incremented plugin version.	2016-03-09 22:34:18 -05:00
Carlos Santana	e877722bac	CB-10820 Updated version and RELEASENOTES.md for release 3.2.1	2016-03-09 22:14:25 -05:00
Dan Polivy	617ad81090	CB-10692 Don't fade when plugin is forced to close The fading logic exposed a race condition in an edge case when the plugin was repeatedly reinitialized, e.g. when the WebView tries to load a new URL. To address this, we add a flag to removeSplashScreen() that allows the fade logic to be bypassed in certain circumstances -- specifically, when hiding the splashscreen due to onPause or onDestroy events. By hiding it immediately in this scenario, we can avoid any race conditions due to the fade delay. github: close #86	2016-03-09 23:13:19 +03:00
Sarangan Rajamanickam	03ea0a4e80	CB-10764: Remove emoji in cordova-plugin-splashscreen Removing warning emoji	2016-03-02 17:36:23 -08:00
daserge	850159490c	CB-10650 Non-index content.src causes Splashscreen to be not displayed on browser	2016-02-19 16:10:17 +03:00
daserge	5ea854d8c3	CB-10636 Add JSHint for plugins Fixed autotests	2016-02-19 12:18:29 +03:00
Edna Morales	e401a4de0f	CB-10606 fix deprecation warning for interfaceOrientation This closes #82	2016-02-15 19:34:38 -05:00
t1st3	2e1ec32916	chore: edit package.json license to match SPDX id See [NPM package.json spec for licenses](https://docs.npmjs.com/files/package.json#license) and [SPDX license IDs](https://spdx.org/licenses/) X-ref: https://github.com/apache/cordova-plugin-device/pull/48 This closes #79	2016-02-10 13:21:19 +10:00
Vladimir Kotikov	4bc552848f	CB-10557 Incremented plugin version.	2016-02-09 13:13:37 +03:00
Vladimir Kotikov	5af0016c67	CB-10557 Updated version and RELEASENOTES.md for release 3.2.0	2016-02-09 13:13:27 +03:00
daserge	617960ee3e	CB-10422 Splashscreen displays black screen with no image on Android	2016-01-27 18:58:56 +03:00
daserge	109c82b29b	CB-10412 AutoHideSplashScreen "false" isn't taken in account on iOS	2016-01-27 18:53:23 +03:00
daserge	799b0a1737	CB-9516 Android SplashScreen - Spinner Does Not Display Removes spinnerStop call from onMessage("spinner", "stop") as it is called when webview is shown and we are hiding spinner manually along with the splashscreen dialog. Changed the spinner to be noncancellable. Changed the ProgressDialog to custom only-spinner mode (on transparent background, without title/message and dimming). Removed unused spinnerStart action handler. Updated the docs.	2016-01-22 14:21:34 +03:00
Dan Polivy	5b3c2c8b14	CB-9094: Smarter autohide logic on Android When the plugin is initialized, the splash screen is shown with an auto-hide delay. If a subsequent call to show() comes in while the splashscreen is visible, it will still be automatically hidden, even though the user expectation is that it wouldn't be. This fix tracks the "hideAfterDelay" setting of the most recent call to show() -- and when the auto hide timer goes off, if the most recent call to show() did not set hideAfterDelay, then the splashscreen will not be automatically hidden. This provides a more consistent -- and expected -- behavior based on user action. https://issues.apache.org/jira/browse/CB-9094 Github: close #49	2016-01-22 13:22:37 +03:00
daserge	7a12204ba9	CB-8396 Add AutoHideSplashScreen logic to Android's Splashscreen Also initializing the splashscreen image irrespective of firstShow because the splashscreen could be shown manually via navigator.splashscreen.show(); after exiting the app using BackButton or via navigator.app.exitApp();	2016-01-18 11:36:21 +03:00
daserge	eada9a6ac1	Closing stale: close #14 , close #17 , close #23 , close #33 , close #63	2016-01-18 10:37:43 +03:00
Steve Gill	12dcd57d51	CB-10368 Incremented plugin version.	2016-01-15 16:58:32 -08:00