diff options
| -rw-r--r-- | Android/gen/org/mysociety/FixMyStreet/R.java | 1 | ||||
| -rw-r--r-- | Android/res/drawable-hdpi/splash.png | bin | 0 -> 12206 bytes | |||
| -rw-r--r-- | Android/res/drawable-ldpi/splash.png | bin | 0 -> 12206 bytes | |||
| -rw-r--r-- | Android/res/drawable-mdpi/splash.png | bin | 0 -> 12206 bytes | |||
| -rw-r--r-- | Android/res/drawable-xhdpi/splash.png | bin | 0 -> 12206 bytes | |||
| -rwxr-xr-x | Android/res/xml/config.xml | 2 | ||||
| -rw-r--r-- | Android/src/org/mysociety/FixMyStreet/AndroidActivity.java | 3 | ||||
| -rw-r--r-- | src/js/app.js | 3 |
8 files changed, 7 insertions, 2 deletions
diff --git a/Android/gen/org/mysociety/FixMyStreet/R.java b/Android/gen/org/mysociety/FixMyStreet/R.java index 0c8d263..88793a5 100644 --- a/Android/gen/org/mysociety/FixMyStreet/R.java +++ b/Android/gen/org/mysociety/FixMyStreet/R.java @@ -13,6 +13,7 @@ public final class R { public static final class drawable { public static final int ic_action_search=0x7f020000; public static final int ic_launcher=0x7f020001; + public static final int splash=0x7f020002; } public static final class id { public static final int menu_settings=0x7f070000; diff --git a/Android/res/drawable-hdpi/splash.png b/Android/res/drawable-hdpi/splash.png Binary files differnew file mode 100644 index 0000000..92fe138 --- /dev/null +++ b/Android/res/drawable-hdpi/splash.png diff --git a/Android/res/drawable-ldpi/splash.png b/Android/res/drawable-ldpi/splash.png Binary files differnew file mode 100644 index 0000000..92fe138 --- /dev/null +++ b/Android/res/drawable-ldpi/splash.png diff --git a/Android/res/drawable-mdpi/splash.png b/Android/res/drawable-mdpi/splash.png Binary files differnew file mode 100644 index 0000000..92fe138 --- /dev/null +++ b/Android/res/drawable-mdpi/splash.png diff --git a/Android/res/drawable-xhdpi/splash.png b/Android/res/drawable-xhdpi/splash.png Binary files differnew file mode 100644 index 0000000..92fe138 --- /dev/null +++ b/Android/res/drawable-xhdpi/splash.png diff --git a/Android/res/xml/config.xml b/Android/res/xml/config.xml index e43f649..870172e 100755 --- a/Android/res/xml/config.xml +++ b/Android/res/xml/config.xml @@ -41,8 +41,8 @@ <content src="src/index.html" /> <preference name="loglevel" value="DEBUG" /> + <preference name="splashscreen" value="splash" /> <!-- - <preference name="splashscreen" value="resourceName" /> <preference name="backgroundColor" value="0xFFF" /> <preference name="loadUrlTimeoutValue" value="20000" /> <preference name="InAppBrowserStorageEnabled" value="true" /> diff --git a/Android/src/org/mysociety/FixMyStreet/AndroidActivity.java b/Android/src/org/mysociety/FixMyStreet/AndroidActivity.java index ce58321..a8eee96 100644 --- a/Android/src/org/mysociety/FixMyStreet/AndroidActivity.java +++ b/Android/src/org/mysociety/FixMyStreet/AndroidActivity.java @@ -8,6 +8,7 @@ public class AndroidActivity extends DroidGap { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - super.loadUrl("file:///android_asset/www/src/index.html"); + super.setIntegerProperty("splashscreen", R.drawable.splash); + super.loadUrl("file:///android_asset/www/src/index.html", 30000); } }
\ No newline at end of file diff --git a/src/js/app.js b/src/js/app.js index e8b2b21..6f723ba 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -143,6 +143,9 @@ var tpl = { return this; } FMS.initialized = 1; + if ( navigator && navigator.splashscreen ) { + navigator.splashscreen.hide(); + } tpl.loadTemplates( FMS.templates, function() { if ( typeof device !== 'undefined' && device.platform === 'Android' ) { |
