android: send updates to play store, tweak map downloading

android/app/build.gradle

@@ -119,8 +119,8 @@ android {
   defaultConfig {
     // Default package name is taken from the manifest and should be app.organicmaps
     def ver = getVersion()
-    versionCode = 3
-    versionName = "1.0.0"
+    versionCode = 4
+    versionName = "1.0.1"
 //    println('Version: ' + versionName)
 //    println('VersionCode: ' + versionCode)
     minSdk propMinSdkVersion.toInteger()

android/app/src/main/res/layout/activity_map.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
+<FrameLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
   android:id="@+id/coordinator"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
+
   <RelativeLayout
     android:id="@+id/map_container"
     android:layout_width="match_parent"
@@ -13,12 +14,6 @@
       android:id="@+id/map_fragment_container"
       android:layout_width="match_parent"
       android:layout_height="match_parent" />
-    <include
-      android:id="@+id/onmap_downloader"
-      layout="@layout/onmap_downloader"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_centerInParent="true" />
     <androidx.fragment.app.FragmentContainerView
       android:id="@+id/map_buttons"
       android:layout_width="match_parent"
@@ -55,4 +50,10 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:name="app.organicmaps.widget.placepage.PlacePageController" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+  <include
+      android:id="@+id/onmap_downloader"
+      layout="@layout/onmap_downloader"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"/>
+</FrameLayout>

android/app/src/main/res/layout/onmap_downloader.xml

@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
+<FrameLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="wrap_content"
-  android:layout_height="wrap_content"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
   android:visibility="gone"
+  android:background="@drawable/onmap_downloader_background"
   tools:visibility="visible">
   <LinearLayout
-    android:layout_width="300dp"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:padding="@dimen/margin_base"
     android:clipToPadding="false"
     android:clipChildren="false"
-    android:layout_gravity="center"
+    android:layout_gravity="bottom"
     android:gravity="center_horizontal"
-    android:backgroundTint="?menuBackground"
-    android:background="@drawable/onmap_downloader_background"
     tools:ignore="UselessParent">
 
     <TextView
@@ -62,4 +61,4 @@
         tools:visibility="visible"/>
     </FrameLayout>
   </LinearLayout>
-</ScrollView>
+</FrameLayout>

android/app/src/main/res/values-ru/strings.xml

@@ -2163,7 +2163,7 @@
   <string name="type.shop.collector">Коллекции</string>
   <string name="organization_name"> Комитет по развитию туризма при Правительстве Республики Таджикистан </string>
   <string name="smth_went_wrong">Упс, что-то пошло не так</string>
-  <string name="wait_tjk_map_downloading">Пожалуйста, подождите, идет загрузка карты Таджикистана.</string>
+  <string name="wait_tjk_map_downloading">Пожалуйста, подождите, идет загрузка карты Таджикистана. Не выходите из приложения</string>
   <string name="welcome_to_tjk">Добро пожаловать в Таджикистан</string>
   <string name="developed_by_label">Developed by Rebus LLC</string>
   <string name="sign_in">Войти</string>

android/app/src/main/res/values/strings.xml

@@ -2205,7 +2205,7 @@
   //todo
   <string name="organization_name"> Committee for Tourism Development under the Government of the Republic of Tajikistan </string>
   <string name="smth_went_wrong">Error </string>
-  <string name="wait_tjk_map_downloading">Please wait, the map of Tajikistan is loading</string>
+  <string name="wait_tjk_map_downloading">Please wait, the map of Tajikistan is loading. Don\'t leave the app</string>
   <string name="welcome_to_tjk">Welcome to Tajikistan</string>
   <string name="developed_by_label">Developed by Rebus LLC</string>
   <string name="sign_in">Log in</string>