Merge remote-tracking branch 'origin/master'

OsmAnd/AndroidManifest-free.xml

@@ -6,7 +6,10 @@
         android:icon="@mipmap/icon_free"
 		android:label="@string/app_name_free"
         tools:replace="android:icon, android:label">
-
+        <activity
+            android:name="net.osmand.plus.activities.MapActivity"
+            android:theme="SplashScreenFree"
+            tools:replace="android:theme"/>
         <service
             android:name="net.osmand.plus.NavigationService"
             tools:replace="android:process"

OsmAnd/AndroidManifest-freedev.xml

@@ -5,6 +5,10 @@
     <application
         android:icon="@mipmap/icon_nightly"
         tools:replace="android:icon">
+        <activity
+            android:name="net.osmand.plus.activities.MapActivity"
+            android:theme="SplashScreenFreeDev"
+            tools:replace="android:theme"/>
         <service
             android:name="net.osmand.plus.NavigationService"
             android:process="net.osmand.dev"

OsmAnd/AndroidManifest.xml

@@ -73,7 +73,7 @@
                 android:resource="@xml/paths" />
         </provider>
 
-		<activity android:name="net.osmand.plus.activities.MapActivity" android:label="@string/app_name"
+		<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">
 			<intent-filter>
 				<action android:name="android.intent.action.VIEW" />

OsmAnd/res/drawable-land/splash_screen_free.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    android:opacity="opaque">
+    <item android:drawable="@color/map_background_color_light"/>
+    <item android:top="24dp">
+        <bitmap
+            android:gravity="center_horizontal|top"
+            android:src="@drawable/ic_logo_splash_osmand"/>
+    </item>
+    <item android:bottom="48dp">
+        <bitmap
+            android:gravity="center_horizontal|bottom"
+            android:src="@drawable/image_text_osmand"/>
+    </item>
+</layer-list>

OsmAnd/res/drawable-land/splash_screen_free_dev.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    android:opacity="opaque">
+    <item android:drawable="@color/map_background_color_light"/>
+    <item android:top="24dp">
+        <bitmap
+            android:gravity="center_horizontal|top"
+            android:src="@drawable/ic_logo_splash_osmand"/>
+    </item>
+    <item android:bottom="48dp">
+        <bitmap
+            android:gravity="center_horizontal|bottom"
+            android:src="@drawable/image_text_osmand"/>
+    </item>
+</layer-list>

OsmAnd/res/drawable-land/splash_screen_plus.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    android:opacity="opaque">
+    <item android:drawable="@color/map_background_color_light"/>
+    <item android:top="24dp">
+        <bitmap
+            android:gravity="center_horizontal|top"
+            android:src="@drawable/ic_logo_splash_osmand_plus"/>
+    </item>
+    <item android:bottom="48dp">
+        <bitmap
+            android:gravity="center_horizontal|bottom"
+            android:src="@drawable/image_text_osmand_plus"/>
+    </item>
+</layer-list>

OsmAnd/res/drawable/splash_screen_free.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    android:opacity="opaque">
+    <item android:drawable="@color/map_background_color_light"/>
+    <item android:top="150dp">
+        <bitmap
+            android:gravity="center_horizontal|top"
+            android:src="@drawable/ic_logo_splash_osmand"/>
+    </item>
+    <item android:bottom="128dp">
+        <bitmap
+            android:gravity="center_horizontal|bottom"
+            android:src="@drawable/image_text_osmand"/>
+    </item>
+</layer-list>

OsmAnd/res/drawable/splash_screen_free_dev.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    android:opacity="opaque">
+    <item android:drawable="@color/map_background_color_light"/>
+    <item android:top="150dp">
+        <bitmap
+            android:gravity="center_horizontal|top"
+            android:src="@drawable/ic_logo_splash_osmand"/>
+    </item>
+    <item android:bottom="128dp">
+        <bitmap
+            android:gravity="center_horizontal|bottom"
+            android:src="@drawable/image_text_osmand"/>
+    </item>
+</layer-list>

OsmAnd/res/drawable/splash_screen_plus.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    android:opacity="opaque">
+    <item android:drawable="@color/map_background_color_light"/>
+    <item android:top="150dp">
+        <bitmap
+            android:gravity="center_horizontal|top"
+            android:src="@drawable/ic_logo_splash_osmand_plus"/>
+    </item>
+    <item android:bottom="128dp">
+        <bitmap
+            android:gravity="center_horizontal|bottom"
+            android:src="@drawable/image_text_osmand_plus"/>
+    </item>
+</layer-list>

OsmAnd/res/layout/main.xml

@@ -3,7 +3,8 @@
     android:id="@+id/drawer_layout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="?attr/mapBackground">
 
     <FrameLayout
         android:layout_width="match_parent"

OsmAnd/res/values/attrs.xml

@@ -4,6 +4,7 @@
         <attr name="maxVisibleWidth" format="dimension"/>
     </declare-styleable>
     <declare-styleable name="OsmAndTheme">
+        <attr name="mapBackground" format="reference"/>
         <attr name="routeParameterTitleColor" format="color"/>
         <attr name="chart_marker_background" format="reference" />
         <!-- list colors -->

OsmAnd/res/values/colors.xml

@@ -254,4 +254,7 @@
 
 	<color name="gpx_split_segment_icon_color">#b3b3b3</color>
 
+	<color name="map_background_color_light">#fafafa</color>
+	<color name="map_background_color_dark">#101821</color>
+
 </resources>

OsmAnd/res/values/styles.xml

@@ -74,8 +74,21 @@
         <item name="android:background">?attr/selectableItemBackground</item>
     </style>
 
+    <style name="SplashScreenPlus" parent="OsmandLightTheme">
+        <item name="android:windowBackground">@drawable/splash_screen_plus</item>
+    </style>
+
+    <style name="SplashScreenFree" parent="OsmandLightTheme">
+        <item name="android:windowBackground">@drawable/splash_screen_free</item>
+    </style>
+
+    <style name="SplashScreenFreeDev" parent="OsmandLightTheme">
+        <item name="android:windowBackground">@drawable/splash_screen_free_dev</item>
+    </style>
+
     <!-- Osmand themes styles -->
     <style name="OsmandLightTheme" parent="Theme.AppCompat.Light">
+        <item name="mapBackground">@color/map_background_color_light</item>
         <item name="chart_marker_background">@drawable/chart_marker_background_light</item>
         <item name="routeParameterTitleColor">@color/color_myloc_distance</item>
         <item name="ctx_menu_info_divider">@color/ctx_menu_info_divider_light</item>
@@ -249,6 +262,7 @@
     </style>
 
     <style name="OsmandDarkTheme" parent="Theme.AppCompat">
+        <item name="mapBackground">@color/map_background_color_dark</item>
         <item name="chart_marker_background">@drawable/chart_marker_background_dark</item>
         <item name="routeParameterTitleColor">@color/osmand_orange</item>
         <item name="ctx_menu_info_divider">@color/ctx_menu_info_divider_dark</item>