From e62b6b02abeee77863ba5a21a39548e13a595133 Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Fri, 7 Jul 2017 11:21:22 +0300
Subject: [PATCH] Add delay for splash screen

---
 OsmAnd/AndroidManifest-free.xml               |  2 +-
 OsmAnd/AndroidManifest-freedev.xml            |  2 +-
 OsmAnd/AndroidManifest.xml                    | 16 +++++++++----
 OsmAnd/res/values/styles.xml                  |  6 ++---
 .../plus/activities/SplashActivity.java       | 24 +++++++++++++++++++
 5 files changed, 41 insertions(+), 9 deletions(-)
 create mode 100644 OsmAnd/src/net/osmand/plus/activities/SplashActivity.java

diff --git a/OsmAnd/AndroidManifest-free.xml b/OsmAnd/AndroidManifest-free.xml
index 0b67c77855..b2dd92f468 100644
--- a/OsmAnd/AndroidManifest-free.xml
+++ b/OsmAnd/AndroidManifest-free.xml
@@ -7,7 +7,7 @@
 		android:label="@string/app_name_free"
         tools:replace="android:icon, android:label">
         <activity
-            android:name="net.osmand.plus.activities.MapActivity"
+            android:name="net.osmand.plus.activities.SplashActivity"
             android:theme="@style/SplashScreenFree"
             tools:replace="android:theme"/>
         <service
diff --git a/OsmAnd/AndroidManifest-freedev.xml b/OsmAnd/AndroidManifest-freedev.xml
index 19fc1d2ebf..7403ff3c9b 100644
--- a/OsmAnd/AndroidManifest-freedev.xml
+++ b/OsmAnd/AndroidManifest-freedev.xml
@@ -6,7 +6,7 @@
         android:icon="@mipmap/icon_nightly"
         tools:replace="android:icon">
         <activity
-            android:name="net.osmand.plus.activities.MapActivity"
+            android:name="net.osmand.plus.activities.SplashActivity"
             android:theme="@style/SplashScreenFreeDev"
             tools:replace="android:theme"/>
         <service
diff --git a/OsmAnd/AndroidManifest.xml b/OsmAnd/AndroidManifest.xml
index 72d1495689..f823347a60 100644
--- a/OsmAnd/AndroidManifest.xml
+++ b/OsmAnd/AndroidManifest.xml
@@ -73,8 +73,13 @@
                 android:resource="@xml/paths" />
         </provider>
 
-		<activity android:name="net.osmand.plus.activities.MapActivity" android:label="@string/app_name" android:theme="@style/SplashScreenPlus"
-			android:screenOrientation="unspecified" android:launchMode="singleTask" android:windowSoftInputMode="adjustResize">
+		<activity
+			android:name="net.osmand.plus.activities.SplashActivity"
+			android:theme="@style/SplashScreenPlus"
+			android:screenOrientation="unspecified"
+			android:launchMode="singleTask"
+			android:windowSoftInputMode="adjustResize">
+
 			<intent-filter>
 				<action android:name="android.intent.action.VIEW" />
 				<action android:name="android.intent.action.SEND" />
@@ -101,7 +106,7 @@
 				<category android:name="android.intent.category.CAR_DOCK" />
 				<category android:name="android.intent.category.DESK_DOCK" />
 			</intent-filter>
-			
+
 			<intent-filter>
 				<data android:scheme="https" />
 				<data android:host="osmand.net" />
@@ -114,7 +119,7 @@
 				<category android:name="android.intent.category.CAR_DOCK" />
 				<category android:name="android.intent.category.DESK_DOCK" />
 			</intent-filter>
-			
+
 
 			<!-- android matches non-greedy : http://stackoverflow.com/questions/3400072/pathpattern-to-match-file-extension-does-not-work-if-a-period-exists-elsewhere-i-->
 			<!-- mimeType&host are both needed or you will either have unwanted matching or no match when needed -->
@@ -154,7 +159,10 @@
 				<action android:name="android.intent.action.VIEW" />
 				<category android:name="android.intent.category.DEFAULT" />
 			</intent-filter>
+		</activity>
 
+		<activity android:name="net.osmand.plus.activities.MapActivity" android:label="@string/app_name"
+			android:screenOrientation="unspecified" android:launchMode="singleTask" android:windowSoftInputMode="adjustResize">
 		</activity>
 
 		<receiver android:name="net.osmand.plus.audionotes.MediaRemoteControlReceiver">
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index 88d81f2d66..6c71f7b927 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -74,15 +74,15 @@
         <item name="android:background">?attr/selectableItemBackground</item>
     </style>
 
-    <style name="SplashScreenPlus" parent="OsmandLightTheme">
+    <style name="SplashScreenPlus" parent="OsmandLightTheme.NoActionbar">
         <item name="android:windowBackground">@drawable/splash_screen_plus</item>
     </style>
 
-    <style name="SplashScreenFree" parent="OsmandLightTheme">
+    <style name="SplashScreenFree" parent="OsmandLightTheme.NoActionbar">
         <item name="android:windowBackground">@drawable/splash_screen_free</item>
     </style>
 
-    <style name="SplashScreenFreeDev" parent="OsmandLightTheme">
+    <style name="SplashScreenFreeDev" parent="OsmandLightTheme.NoActionbar">
         <item name="android:windowBackground">@drawable/splash_screen_free_dev</item>
     </style>
 
diff --git a/OsmAnd/src/net/osmand/plus/activities/SplashActivity.java b/OsmAnd/src/net/osmand/plus/activities/SplashActivity.java
new file mode 100644
index 0000000000..9869191fd9
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/activities/SplashActivity.java
@@ -0,0 +1,24 @@
+package net.osmand.plus.activities;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.support.annotation.Nullable;
+
+public class SplashActivity extends OsmandActionBarActivity {
+    private final static int SPLASH_DISPLAY_LENGTH = 3000;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        new Handler().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                Intent i = new Intent(SplashActivity.this, MapActivity.class);
+                startActivity(i);
+                finish();
+            }
+        }, SPLASH_DISPLAY_LENGTH);
+    }
+}
\ No newline at end of file