Merge pull request #260 from trashkalmar/marchuk_1327_settings

[android] New application settings

android/AndroidManifest.xml

@@ -170,7 +170,7 @@
     <activity
         android:name="com.mapswithme.maps.MwmActivity"
         android:launchMode="singleTask"
-        android:theme="@style/MwmTheme.Map"
+        android:theme="@style/MwmTheme.MainActivity"
         android:windowSoftInputMode="stateAlwaysHidden|adjustPan">
     </activity>
 
@@ -200,7 +200,7 @@
     <activity
         android:name="com.mapswithme.maps.settings.SettingsActivity"
         android:configChanges="orientation|screenLayout|screenSize"
-        android:label="@string/settings_and_more"
+        android:label="@string/settings"
         android:parentActivityName="com.mapswithme.maps.MwmActivity">
       <!-- The meta-data element is needed for versions lower than 4.1 -->
       <meta-data
@@ -222,7 +222,7 @@
     <activity
         android:name="com.mapswithme.maps.bookmarks.BookmarkCategoriesActivity"
         android:configChanges="orientation|screenLayout|screenSize"
-        android:label="@string/bookmarks"
+        android:label="@string/bookmark_sets"
         android:parentActivityName="com.mapswithme.maps.MwmActivity">
       <!-- The meta-data element is needed for versions lower than 4.1 -->
       <meta-data
@@ -258,8 +258,7 @@
 
     <service
         android:name="com.mapswithme.maps.background.WorkerService"
-        android:exported="false">
-    </service>
+        android:exported="false"/>
 
     <!-- our custom receiver, that will call Aloha & other handlers -->
     <receiver
@@ -314,24 +313,13 @@
       </intent-filter>
     </receiver>
 
-    <!-- Catches app upgraded intent.
-         Different receivers are used due to MY_PACKAGE_REPLACED was added in Honeycomb_MR1-->
-    <receiver android:name=".background.UpgradeReceiver"
-              android:enabled="@bool/isNewerThanHoneycombMr1">
+    <!-- Catches app upgraded intent -->
+    <receiver android:name=".background.UpgradeReceiver">
       <intent-filter>
         <action android:name="android.intent.action.MY_PACKAGE_REPLACED"/>
       </intent-filter>
     </receiver>
 
-    <receiver android:name=".background.UpgradeReceiverCompat"
-              android:enabled="@bool/isOlderThanHoneycombMr1">
-      <intent-filter>
-        <action android:name="android.intent.action.PACKAGE_REPLACED"/>
-
-        <data android:scheme="package"/>
-      </intent-filter>
-    </receiver>
-
   </application>
 
 </manifest>

android/build.gradle

@@ -62,6 +62,7 @@ android {
     buildConfigField 'String', 'SUPPORT_MAIL', '"android@maps.me"'
     buildConfigField 'String', 'REVIEW_URL', '"market://details?id=com.mapswithme.maps.pro"'
     buildConfigField 'int', 'RATING_THRESHOLD', '5'
+    buildConfigField 'boolean', 'ALLOW_PREF_MAP_STYLE', 'false'
   }
 
   sourceSets.main {
@@ -224,6 +225,7 @@ android {
       zipAlignEnabled true
       signingConfig signingConfigs.mapswithmeDebug
       android.sourceSets.debug.setRoot('flavors/debug')
+      buildConfigField 'boolean', 'ALLOW_PREF_MAP_STYLE', 'true'
     }
 
     release {
@@ -238,6 +240,7 @@ android {
       versionNameSuffix '-beta'
       signingConfig signingConfigs.mapswithme
       android.sourceSets.beta.setRoot('flavors/beta')
+      buildConfigField 'boolean', 'ALLOW_PREF_MAP_STYLE', 'true'
     }
   }
 

android/jni/Android.mk

@@ -98,7 +98,8 @@ LOCAL_SRC_FILES := \
 	com/mapswithme/platform/HttpThread.cpp \
 	com/mapswithme/platform/Language.cpp \
 	com/mapswithme/platform/PThreadImpl.cpp \
-	com/mapswithme/utils/StringUtils.cpp \
+	com/mapswithme/util/StringUtils.cpp \
+	com/mapswithme/util/Config.cpp \
 	nv_thread/nv_thread.cpp \
 	nv_event/nv_event_queue.cpp \
 	nv_event/nv_event.cpp \

android/jni/com/mapswithme/maps/Framework.cpp

@@ -235,6 +235,11 @@ namespace android
     }
   }
 
+  MapStyle Framework::GetMapStyle() const
+  {
+    return m_work.GetMapStyle();
+  }
+
   Storage & Framework::Storage()
   {
     return m_work.Storage();
@@ -1459,6 +1464,12 @@ extern "C"
     android::Platform::RunOnGuiThreadImpl(bind(&android::Framework::SetMapStyle, g_framework, val));
   }
 
+  JNIEXPORT jint JNICALL
+  Java_com_mapswithme_maps_Framework_getMapStyle(JNIEnv * env, jclass thiz)
+  {
+    return static_cast<jint>(g_framework->GetMapStyle());
+  }
+
   JNIEXPORT void JNICALL
   Java_com_mapswithme_maps_Framework_setRouter(JNIEnv * env, jclass thiz, jint routerType)
   {

android/jni/com/mapswithme/maps/Framework.hpp

@@ -103,6 +103,7 @@ namespace android
     void DeleteRenderPolicy();
 
     void SetMapStyle(MapStyle mapStyle);
+    MapStyle GetMapStyle() const;
 
     void SetRouter(routing::RouterType type) { m_work.SetRouter(type); }
     routing::RouterType GetRouter() const { return m_work.GetRouter(); }

android/jni/com/mapswithme/maps/MwmApplication.cpp

@@ -7,8 +7,6 @@
 #include "map/information_display.hpp"
 #include "map/location_state.hpp"
 
-#include "platform/settings.hpp"
-
 
 extern "C"
 {
@@ -35,27 +33,6 @@ extern "C"
     return static_cast<jboolean>(g_framework->NativeFramework()->IsBenchmarking());
   }
 
-  JNIEXPORT jboolean JNICALL
-  Java_com_mapswithme_maps_MwmApplication_nativeGetBoolean(JNIEnv * env,
-                                                           jobject thiz,
-                                                           jstring name,
-                                                           jboolean defaultVal)
-  {
-    bool val = defaultVal;
-    Settings::Get(jni::ToNativeString(env, name), val);
-    return val;
-  }
-
-  JNIEXPORT void JNICALL
-  Java_com_mapswithme_maps_MwmApplication_nativeSetBoolean(JNIEnv * env,
-                                                           jobject thiz,
-                                                           jstring name,
-                                                           jboolean val)
-  {
-    bool flag = val;
-    (void)Settings::Set(jni::ToNativeString(env, name), flag);
-  }
-
   JNIEXPORT jboolean JNICALL
   Java_com_mapswithme_maps_MwmApplication_hasFreeSpace(JNIEnv * env, jobject thiz, jlong size)
   {
@@ -68,68 +45,4 @@ extern "C"
     g_framework->AddString(jni::ToNativeString(env, name),
                            jni::ToNativeString(env, value));
   }
-
-  JNIEXPORT jint JNICALL
-  Java_com_mapswithme_maps_MwmApplication_nativeGetInt(JNIEnv * env, jobject thiz, jstring name, jint defaultValue)
-  {
-    jint value;
-    if (Settings::Get(jni::ToNativeString(env, name), value))
-      return value;
-
-    return defaultValue;
-  }
-
-  JNIEXPORT void JNICALL
-  Java_com_mapswithme_maps_MwmApplication_nativeSetInt(JNIEnv * env, jobject thiz, jstring name, jint value)
-  {
-    (void)Settings::Set(jni::ToNativeString(env, name), value);
-  }
-
-  JNIEXPORT jlong JNICALL
-  Java_com_mapswithme_maps_MwmApplication_nativeGetLong(JNIEnv * env, jobject thiz, jstring name, jlong defaultValue)
-  {
-    jlong value;
-    if (Settings::Get(jni::ToNativeString(env, name), value))
-      return value;
-
-    return defaultValue;
-  }
-
-  JNIEXPORT void JNICALL
-  Java_com_mapswithme_maps_MwmApplication_nativeSetLong(JNIEnv * env, jobject thiz, jstring name, jlong value)
-  {
-    (void)Settings::Set(jni::ToNativeString(env, name), value);
-  }
-
-  JNIEXPORT jdouble JNICALL
-  Java_com_mapswithme_maps_MwmApplication_nativeGetDouble(JNIEnv * env, jobject thiz, jstring name, jdouble defaultValue)
-  {
-    jdouble value;
-    if (Settings::Get(jni::ToNativeString(env, name), value))
-      return value;
-
-    return defaultValue;
-  }
-
-  JNIEXPORT void JNICALL
-  Java_com_mapswithme_maps_MwmApplication_nativeSetDouble(JNIEnv * env, jobject thiz, jstring name, jdouble value)
-  {
-    (void)Settings::Set(jni::ToNativeString(env, name), value);
-  }
-
-  JNIEXPORT void JNICALL
-  Java_com_mapswithme_maps_MwmApplication_nativeSetString(JNIEnv * env, jobject thiz, jstring name, jstring value)
-  {
-    (void)Settings::Set(jni::ToNativeString(env, name), jni::ToNativeString(env, value));
-  }
-
-  JNIEXPORT jstring JNICALL
-  Java_com_mapswithme_maps_MwmApplication_nativeGetString(JNIEnv * env, jobject thiz, jstring name, jstring defaultValue)
-  {
-    string value;
-    if (Settings::Get(jni::ToNativeString(env, name), value))
-      return jni::ToJavaString(env, value);
-
-    return defaultValue;
-  }
 }

android/jni/com/mapswithme/util/Config.cpp

@@ -0,0 +1,86 @@
+#include "../core/jni_helper.hpp"
+#include "platform/settings.hpp"
+
+
+extern "C"
+{
+  JNIEXPORT jboolean JNICALL
+  Java_com_mapswithme_util_Config_nativeGetBoolean(JNIEnv * env, jclass thiz, jstring name, jboolean defaultVal)
+  {
+    bool val;
+    if (Settings::Get(jni::ToNativeString(env, name), val))
+      return static_cast<jboolean>(val);
+
+    return defaultVal;
+  }
+
+  JNIEXPORT void JNICALL
+  Java_com_mapswithme_util_Config_nativeSetBoolean(JNIEnv * env, jclass thiz, jstring name, jboolean val)
+  {
+    (void)Settings::Set(jni::ToNativeString(env, name), static_cast<bool>(val));
+  }
+
+  JNIEXPORT jint JNICALL
+  Java_com_mapswithme_util_Config_nativeGetInt(JNIEnv * env, jclass thiz, jstring name, jint defaultValue)
+  {
+    int32_t value;
+    if (Settings::Get(jni::ToNativeString(env, name), value))
+      return static_cast<jint>(value);
+
+    return defaultValue;
+  }
+
+  JNIEXPORT void JNICALL
+  Java_com_mapswithme_util_Config_nativeSetInt(JNIEnv * env, jclass thiz, jstring name, jint value)
+  {
+    (void)Settings::Set(jni::ToNativeString(env, name), static_cast<int32_t>(value));
+  }
+
+  JNIEXPORT jlong JNICALL
+  Java_com_mapswithme_util_Config_nativeGetLong(JNIEnv * env, jclass thiz, jstring name, jlong defaultValue)
+  {
+    int64_t value;
+    if (Settings::Get(jni::ToNativeString(env, name), value))
+      return static_cast<jlong>(value);
+
+    return defaultValue;
+  }
+
+  JNIEXPORT void JNICALL
+  Java_com_mapswithme_util_Config_nativeSetLong(JNIEnv * env, jclass thiz, jstring name, jlong value)
+  {
+    (void)Settings::Set(jni::ToNativeString(env, name), static_cast<int64_t>(value));
+  }
+
+  JNIEXPORT jdouble JNICALL
+  Java_com_mapswithme_util_Config_nativeGetDouble(JNIEnv * env, jclass thiz, jstring name, jdouble defaultValue)
+  {
+    double value;
+    if (Settings::Get(jni::ToNativeString(env, name), value))
+      return static_cast<jdouble>(value);
+
+    return defaultValue;
+  }
+
+  JNIEXPORT void JNICALL
+  Java_com_mapswithme_util_Config_nativeSetDouble(JNIEnv * env, jclass thiz, jstring name, jdouble value)
+  {
+    (void)Settings::Set(jni::ToNativeString(env, name), static_cast<double>(value));
+  }
+
+  JNIEXPORT jstring JNICALL
+  Java_com_mapswithme_util_Config_nativeGetString(JNIEnv * env, jclass thiz, jstring name, jstring defaultValue)
+  {
+    string value;
+    if (Settings::Get(jni::ToNativeString(env, name), value))
+      return jni::ToJavaString(env, value);
+
+    return defaultValue;
+  }
+
+    JNIEXPORT void JNICALL
+    Java_com_mapswithme_util_Config_nativeSetString(JNIEnv * env, jclass thiz, jstring name, jstring value)
+    {
+      (void)Settings::Set(jni::ToNativeString(env, name), jni::ToNativeString(env, value));
+    }
+} // extern "C"

android/res/layout-w600dp-port/place_page_details.xml

@@ -87,8 +87,5 @@
 
   <include layout="@layout/shadow_top"/>
 
-  <include layout="@layout/shadow_bottom"
-           android:layout_width="match_parent"
-           android:layout_height="wrap_content"
-           android:layout_gravity="bottom"/>
+  <include layout="@layout/shadow_bottom"/>
 </FrameLayout>

android/res/layout/about.xml

@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             xmlns:tools="http://schemas.android.com/tools"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent">
+  <com.mapswithme.maps.widget.ObservableScrollView
+      android:id="@+id/content_frame"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent">
+    <LinearLayout android:orientation="vertical"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content">
+      <ImageView android:layout_width="wrap_content"
+                 android:layout_height="wrap_content"
+                 android:layout_marginTop="@dimen/margin_base_plus"
+                 android:layout_marginBottom="@dimen/margin_base"
+                 android:layout_gravity="center_horizontal"
+                 android:src="@drawable/about_logo"/>
+
+      <TextView android:id="@+id/version"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:textAppearance="@style/MwmTextAppearance.Body1"
+                tools:text="Version: 5.0.0"/>
+
+      <TextView android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:layout_marginTop="@dimen/margin_base_plus"
+                android:layout_marginBottom="@dimen/margin_base_plus"
+                android:layout_marginLeft="@dimen/margin_base"
+                android:layout_marginRight="@dimen/margin_base"
+                android:textAppearance="@style/MwmTextAppearance.Body2"
+                android:text="@string/about_description"/>
+
+      <TextView android:id="@+id/web"
+                style="@style/MwmWidget.TextView.Item"
+                android:text="@string/website"
+                android:drawableLeft="@drawable/ic_website"
+                android:drawableStart="@drawable/ic_website"/>
+
+      <TextView android:id="@+id/blog"
+                style="@style/MwmWidget.TextView.Item"
+                android:text="@string/blog"
+                android:drawableLeft="@drawable/ic_blog"
+                android:drawableStart="@drawable/ic_blog"/>
+
+      <TextView android:id="@+id/facebook"
+                style="@style/MwmWidget.TextView.Item"
+                android:text="@string/facebook"
+                android:drawableLeft="@drawable/ic_facebook"
+                android:drawableStart="@drawable/ic_facebook"/>
+
+      <TextView android:id="@+id/twitter"
+                style="@style/MwmWidget.TextView.Item"
+                android:text="@string/twitter"
+                android:drawableLeft="@drawable/ic_twitter"
+                android:drawableStart="@drawable/ic_twitter"/>
+
+      <TextView android:id="@+id/subscribe"
+                style="@style/MwmWidget.TextView.Item"
+                android:text="@string/subscribe_to_news"
+                android:drawableLeft="@drawable/ic_subscribe"
+                android:drawableStart="@drawable/ic_subscribe"/>
+
+      <View android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginTop="@dimen/margin_quarter"
+            android:layout_marginBottom="@dimen/margin_quarter"
+            android:background="?dividerHorizontal"/>
+
+      <TextView android:id="@+id/rate"
+                style="@style/MwmWidget.TextView.Item"
+                android:text="@string/rate_gp"
+                android:drawableLeft="@drawable/ic_rate"
+                android:drawableStart="@drawable/ic_rate"/>
+
+      <TextView android:id="@+id/share"
+                style="@style/MwmWidget.TextView.Item"
+                android:text="@string/tell_friends"
+                android:drawableLeft="@drawable/ic_share"
+                android:drawableStart="@drawable/ic_share"/>
+
+      <View android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginTop="@dimen/margin_quarter"
+            android:layout_marginBottom="@dimen/margin_quarter"
+            android:background="?dividerHorizontal"/>
+
+      <TextView android:id="@+id/copyright"
+                style="@style/MwmWidget.TextView.Item"
+                android:text="@string/copyright"/>
+    </LinearLayout>
+  </com.mapswithme.maps.widget.ObservableScrollView>
+
+  <include layout="@layout/shadow_top"/>
+</FrameLayout>

android/res/layout/activity_fragment_and_toolbar.xml

@@ -11,6 +11,6 @@
       android:id="@+id/fragment_container"
       style="@style/MwmWidget.FrameLayout.Elevation"
       android:layout_width="match_parent"
-      android:layout_height="wrap_content"/>
+      android:layout_height="match_parent"/>
 
 </LinearLayout>

android/res/layout/dialog_about.xml

@@ -1,21 +0,0 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="@dimen/dialog_max_height"
-    android:gravity="center"
-    android:orientation="vertical" >
-
-    <ProgressBar
-        style="@style/Widget.AppCompat.ProgressBar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"/>
-
-    <view
-        class="com.mapswithme.maps.settings.SettingsActivity$MyWebView"
-        android:id="@+id/webview_about"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/dialog_max_height"
-        android:layout_gravity="center"
-        android:visibility="invisible"/>
-
-</FrameLayout>

android/res/layout/fragment_prefs_copyright.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent">
+  <com.mapswithme.maps.widget.ObservableWebView
+      android:id="@+id/webview"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:visibility="gone"/>
+
+  <ProgressBar
+      android:id="@+id/progress"
+      style="@style/Widget.AppCompat.ProgressBar"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_gravity="center"/>
+
+  <include layout="@layout/shadow_top"/>
+</FrameLayout>

android/res/layout/fragment_prefs_help.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+  <FrameLayout
+      android:layout_width="match_parent"
+      android:layout_height="0dp"
+      android:layout_weight="1">
+    <com.mapswithme.maps.widget.ObservableWebView
+        android:id="@+id/webview"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone"/>
+
+    <ProgressBar
+        android:id="@+id/progress"
+        style="@style/Widget.AppCompat.ProgressBar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"/>
+
+    <include layout="@layout/shadow_top"/>
+    <include layout="@layout/shadow_bottom"/>
+  </FrameLayout>
+
+  <FrameLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content">
+    <TextView
+        android:id="@+id/feedback"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="@dimen/margin_base"
+        android:text="@string/feedback"
+        android:textAppearance="@style/MwmTextAppearance.Button"
+        android:background="?clickableBackground"/>
+  </FrameLayout>
+</LinearLayout>

android/res/layout/item_storage.xml

@@ -1,12 +1,6 @@
 <CheckedTextView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    style="@style/MwmWidget.TextView.Item"
     android:checkMark="?android:attr/listChoiceIndicatorSingle"
-    android:gravity="center_vertical"
-    android:minHeight="@dimen/height_item_oneline"
-    android:paddingLeft="@dimen/margin_base"
-    android:paddingRight="@dimen/margin_base"
-    android:textAppearance="@style/MwmTextAppearance.Body1"
     tools:text="/storage/mnt/"/>

android/res/layout/item_storage_title.xml

@@ -1,11 +1,3 @@
-<TextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:minHeight="@dimen/height_item_oneline"
-    android:paddingLeft="@dimen/margin_base"
-    android:paddingRight="@dimen/margin_base"
-    android:textAppearance="@style/MwmTextAppearance.Body1"
-    tools:text="/storage/mnt/"/>
+<TextView xmlns:tools="http://schemas.android.com/tools"
+          style="@style/MwmWidget.TextView.Item"
+          tools:text="/storage/mnt/"/>

android/res/layout/place_page_details.xml

@@ -53,8 +53,5 @@
 
   <include layout="@layout/shadow_top"/>
 
-  <include layout="@layout/shadow_bottom"
-           android:layout_width="match_parent"
-           android:layout_height="wrap_content"
-           android:layout_gravity="bottom"/>
+  <include layout="@layout/shadow_bottom"/>
 </FrameLayout>

android/res/layout/shadow_bottom.xml

@@ -4,6 +4,7 @@
            android:id="@+id/shadow_bottom"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
+           android:layout_gravity="bottom"
            android:src="@drawable/shadow_bottom"
            android:scaleType="fitXY"
            android:visibility="gone"

android/res/layout/toolbar_default.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v7.widget.Toolbar
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/toolbar"
     style="@style/MwmWidget.ToolbarStyle"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="?attr/actionBarSize"
     android:theme="@style/MwmWidget.ToolbarTheme"/>

android/res/layout/toolbar_elevated.xml

@@ -3,7 +3,6 @@
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
               android:orientation="vertical">
-
   <android.support.v7.widget.Toolbar
       android:id="@+id/toolbar"
       style="@style/MwmWidget.ToolbarStyle"
@@ -12,7 +11,6 @@
       android:theme="@style/MwmWidget.ToolbarTheme"/>
 
   <FrameLayout
-      android:id="@+id/fl__elevation"
       style="@style/MwmWidget.FrameLayout.Elevation"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"/>

android/res/values-ar/strings.xml

@@ -307,7 +307,6 @@
 	<!-- Length of track in cell that describes route -->
 	<string name="length">الطول</string>
 	<string name="share_my_location">مشاركة موقعي</string>
-	<string name="become_a_pro">ترقية</string>
 	<string name="menu_search">بحث</string>
 	<string name="pref_zoom_title">أزرار التكبير</string>
 	<string name="pref_zoom_summary">عرض على الشاشة</string>

android/res/values-cs/strings.xml

@@ -304,7 +304,6 @@
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Délka</string>
 	<string name="share_my_location">Sdílet mé umístění</string>
-	<string name="become_a_pro">Provést upgrade</string>
 	<string name="menu_search">Vyhledávání</string>
 	<string name="pref_zoom_title">Tlačítka přiblížení/oddálení</string>
 	<string name="pref_zoom_summary">Zobrazit na obrazovce</string>

android/res/values-da/strings.xml

@@ -305,7 +305,6 @@
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Længde</string>
 	<string name="share_my_location">Del min lokation</string>
-	<string name="become_a_pro">Opgrader</string>
 	<string name="menu_search">Søg</string>
 	<string name="pref_zoom_title">Zoom knapper</string>
 	<string name="pref_zoom_summary">Vis på skærmen</string>

android/res/values-de/strings.xml

@@ -298,7 +298,6 @@
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Länge</string>
 	<string name="share_my_location">Meinen Standort teilen</string>
-	<string name="become_a_pro">Upgrade</string>
 	<string name="menu_search">Suche</string>
 	<string name="pref_zoom_title">Zoom-Tasten</string>
 	<string name="pref_zoom_summary">Auf dem Bildschirm anzeigen</string>

android/res/values-es/strings.xml

@@ -296,7 +296,6 @@
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Longitud</string>
 	<string name="share_my_location">Compartir mi ubicación</string>
-	<string name="become_a_pro">Obtener PRO</string>
 	<string name="menu_search">Buscar</string>
 	<string name="pref_zoom_title">Botones de zoom</string>
 	<string name="pref_zoom_summary">Visualización en la pantalla</string>

android/res/values-fr/strings.xml

@@ -308,7 +308,6 @@
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Longueur</string>
 	<string name="share_my_location">Partager ma position</string>
-	<string name="become_a_pro">Mettre à niveau</string>
 	<string name="menu_search">Rechercher</string>
 	<string name="pref_zoom_title">Boutons de zoom</string>
 	<string name="pref_zoom_summary">Afficher à l\&#39;écran</string>

android/res/values-hu/strings.xml

@@ -304,7 +304,6 @@
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Hossz</string>
 	<string name="share_my_location">Helyzetem megosztása</string>
-	<string name="become_a_pro">Frissítés most</string>
 	<string name="menu_search">Keresés</string>
 	<string name="pref_zoom_title">Nagyítás/kicsinyítés gombok</string>
 	<string name="pref_zoom_summary">Mutassa a kijelzőn</string>

android/res/values-it/strings.xml

@@ -300,7 +300,6 @@
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Lunghezza</string>
 	<string name="share_my_location">Condividi la mia location</string>
-	<string name="become_a_pro">Aggiorna</string>
 	<string name="menu_search">Cerca</string>
 	<string name="pref_zoom_title">Pulsanti per lo zoom</string>
 	<string name="pref_zoom_summary">Condividi la mia location</string>

android/res/values-ja/strings.xml

@@ -294,7 +294,6 @@
 	<!-- Length of track in cell that describes route -->
 	<string name="length">距離</string>
 	<string name="share_my_location">位置情報を共有する</string>
-	<string name="become_a_pro">アップグレード</string>
 	<string name="menu_search">検索</string>
 	<string name="pref_zoom_title">ズームボタン</string>
 	<string name="pref_zoom_summary">画面上に表示</string>

android/res/values-ko/strings.xml

@@ -293,7 +293,6 @@
 	<!-- Length of track in cell that describes route -->
 	<string name="length">길이</string>
 	<string name="share_my_location">내 위치 공유</string>
-	<string name="become_a_pro">업그레이드</string>
 	<string name="menu_search">검색</string>
 	<string name="pref_zoom_title">확대/축소 버튼</string>
 	<string name="pref_zoom_summary">화면에 표시</string>

android/res/values-nl/strings.xml

@@ -295,7 +295,6 @@
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Lengte</string>
 	<string name="share_my_location">Deel mijn locatie</string>
-	<string name="become_a_pro">Upgrade</string>
 	<string name="menu_search">Zoek</string>
 	<string name="pref_zoom_title">Zoomknoppen</string>
 	<string name="pref_zoom_summary">Weergave op het scherm</string>

android/res/values-pl/strings.xml

@@ -304,7 +304,6 @@
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Długość</string>
 	<string name="share_my_location">Udostępnij moją lokalizację</string>
-	<string name="become_a_pro">Uaktualnij</string>
 	<string name="menu_search">Szukaj</string>
 	<string name="pref_zoom_title">Przyciski powiększania</string>
 	<string name="pref_zoom_summary">Wyświetl na ekranie</string>

android/res/values-pt/strings.xml

@@ -300,7 +300,6 @@
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Comprimento</string>
 	<string name="share_my_location">Partilhar a minha localização</string>
-	<string name="become_a_pro">Obter PRO</string>
 	<string name="menu_search">Pesquisar</string>
 	<string name="pref_zoom_title">Botões de zoom</string>
 	<string name="pref_zoom_summary">Mostrar no ecrã</string>

android/res/values-ru/strings.xml

@@ -308,10 +308,25 @@
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Длина</string>
 	<string name="share_my_location">Поделиться местоположением</string>
-	<string name="become_a_pro">Загрузить PRO</string>
 	<string name="menu_search">Поиск</string>
+	<!-- Settings screen: "Map" category title -->
+	<string name="prefs_group_map">Карта</string>
+	<!-- Settings screen: "Route" category title -->
+	<string name="prefs_group_route">Маршрут</string>
+	<!-- Settings screen: "Miscellaneous" category title -->
+	<string name="prefs_group_misc">Прочее</string>
 	<string name="pref_zoom_title">Кнопки масштаба</string>
 	<string name="pref_zoom_summary">Показать на карте</string>
+	<!-- Settings «Map» category: «Map style» title -->
+	<string name="pref_map_style_title">Стиль карты</string>
+	<!-- Settings «Map» category: «Map style» summary -->
+	<string name="pref_map_style_summary">Стиль отображения карты</string>
+	<!-- «Map style» entry value -->
+	<string name="pref_map_style_classic_light">Классическая светлая</string>
+	<!-- «Map style» entry value -->
+	<string name="pref_map_style_classic_dark">Классическая тёмная</string>
+	<!-- «Map style» entry value -->
+	<string name="pref_map_style_modern_light">Современная светлая</string>
 	<string name="placepage_distance">Расстояние</string>
 	<string name="placepage_coordinates">Координаты</string>
 	<string name="placepage_unsorted">Без категории</string>
@@ -359,6 +374,10 @@
 	<!-- Text in menu -->
 	<string name="settings_and_more">Настройки и другое</string>
 	<!-- Text in menu -->
+	<string name="website">Сайт</string>
+	<!-- Text in menu -->
+	<string name="blog">Блог</string>
+	<!-- Text in menu -->
 	<string name="maps_me_community">Сообщество MAPS.ME</string>
 	<!-- Text in menu -->
 	<string name="like_on_facebook">MAPS.ME в Facebook</string>
@@ -366,10 +385,20 @@
 	<string name="follow_on_twitter">MAPS.ME в Twitter</string>
 	<!-- Text in menu -->
 	<string name="contact_us">Свяжитесь с нами</string>
+	<!-- Settings: Send feedback button and dialog title -->
+	<string name="feedback">Связаться с нами</string>
+	<!-- Settings: "Send general feedback" button -->
+	<string name="feedback_general">Отправить отзыв</string>
 	<!-- Text in menu -->
 	<string name="subscribe_to_news">Подписаться на новости</string>
 	<!-- Text in menu -->
 	<string name="rate_the_app">Оценить приложение</string>
+	<!-- Rate in Google Play (Android only) -->
+	<string name="rate_gp">Оценить в Google Play</string>
+	<!-- Share with friends: menu item title -->
+	<string name="tell_friends">Рассказать друзьям</string>
+	<!-- Share with friends: sharing text -->
+	<string name="tell_friends_text">Привет! Установи Maps.me!</string>
 	<!-- Text in menu -->
 	<string name="help">Помощь</string>
 	<!-- Text in menu -->
@@ -380,6 +409,8 @@
 	<string name="subscribe_me_subject">Подпишите меня на email-рассылку MAPS.ME</string>
 	<!-- Email body -->
 	<string name="subscribe_me_body">Я хочу первым узнавать обо всех новостях, обновлениях приложения и акциях. Я могу отписаться от рассылки в любой момент.</string>
+	<!-- About short text (below logo) -->
+	<string name="about_description">Объединив усилия Mail.Ru Group и данные OpenStreetMap, мы создаем незаменимое приложение для путешествий.</string>
 	<!-- About text -->
 	<string name="about_text">MAPS.ME предлагает карты всех городов, всех стран мира, которые работают без подключения к интернету. Путешествуйте с уверенностью: где бы вы ни находились, MAPS.ME помогут решить любую вашу проблему - помогут определить ваше местоположение, найти ресторан, отель, заправку, банк, туалет и т.д.\n\nМы постоянно работаем над добавлением новых функций, поэтому если у вас есть идеи или предложения по улучшению MAPS.ME, пишите нам. Если у вас возникла проблема с приложением, сообщите нам, пожалуйста, о ней. Наш емэйл support@maps.me. Мы отвечаем на все письма! Если вам нравится приложение и вы хотите поддержать нас, есть несколько простых и абсолютно бесплатных способов:\n\n- оставьте отзыв в вашем магазине приложений\n- подпишитесь на наши новости на Facebook странице http://www.facebook.com/mapswithme\n- или просто расскажите о MAPS.ME своей маме, друзьям и коллегам :)\n\nСпасибо за вашу поддержку!\n\nP.S. В приложении мы используем картографические данные проекта OpenStreetMap, который работает по принципу Википедии, давая возможность пользователям со всего мира создавать и редактировать карты. Если вы заметили, что на карте что-то не соответствует действительности либо отсутствует, вы можете откорректировать это прямо на сайте http://openstreetmap.org, и эти исправления появятся во время следующего обновления MAPS.ME.</string>
 	<!-- Alert text -->

android/res/values-sk/strings.xml

@@ -302,7 +302,6 @@
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Diaľka</string>
 	<string name="share_my_location">Zdielať moje umiestnenie</string>
-	<string name="become_a_pro">Vykonať upgrade</string>
 	<string name="menu_search">Vyhľadávanie</string>
 	<string name="pref_zoom_title">Tlačítka priblíženia/oddialenia</string>
 	<string name="pref_zoom_summary">Zobraziť na obrazovke</string>

android/res/values-sv/strings.xml

@@ -303,7 +303,6 @@
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Längd</string>
 	<string name="share_my_location">Dela Min Plats</string>
-	<string name="become_a_pro">Uppgradera</string>
 	<string name="menu_search">Sök</string>
 	<string name="pref_zoom_title">Zoom-knappar</string>
 	<string name="pref_zoom_summary">Visa på skärmen</string>

android/res/values-th/strings.xml

@@ -305,7 +305,6 @@
 	<!-- Length of track in cell that describes route -->
 	<string name="length">ระยะเวลา</string>
 	<string name="share_my_location">แชร์ตำแหน่งที่ตั้งของฉัน</string>
-	<string name="become_a_pro">อัปเกรด</string>
 	<string name="menu_search">ค้นหา</string>
 	<string name="pref_zoom_title">ปุ่มซูม</string>
 	<string name="pref_zoom_summary">แสดงบนหน้าจอ</string>

android/res/values-tr/strings.xml

@@ -307,7 +307,6 @@
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Uzunluk</string>
 	<string name="share_my_location">Yerimi paylaş</string>
-	<string name="become_a_pro">Yükselt</string>
 	<string name="menu_search">Ara</string>
 	<string name="pref_zoom_title">Yakınlaştırma butonları</string>
 	<string name="pref_zoom_summary">Ekranda göster</string>

android/res/values-uk/strings.xml

@@ -308,7 +308,6 @@
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Довжина</string>
 	<string name="share_my_location">Поділитися моїм місцезнаходженням</string>
-	<string name="become_a_pro">Купити PRO</string>
 	<string name="menu_search">Пошук</string>
 	<string name="pref_zoom_title">Кнопки трансфокації</string>
 	<string name="pref_zoom_summary">Відображення на екрані</string>

android/res/values-v12/version-checks.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <bool name="isNewerThanHoneycombMr1">true</bool>
-  <bool name="isOlderThanHoneycombMr1">false</bool>
-</resources>

android/res/values-v21/styles.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <style name="MwmWidget.FrameLayout.Elevation"/>
-
-  <style name="MwmWidget.Floating">
-    <item name="android:elevation">@dimen/appbar_elevation</item>
-  </style>
-</resources>

android/res/values-zh-rTW/strings.xml

@@ -287,7 +287,6 @@
 	<!-- Length of track in cell that describes route -->
 	<string name="length">長度</string>
 	<string name="share_my_location">分享我的位置</string>
-	<string name="become_a_pro">升級</string>
 	<string name="menu_search">搜尋</string>
 	<string name="pref_zoom_title">縮放按鈕</string>
 	<string name="pref_zoom_summary">在螢幕上顯示</string>

android/res/values-zh/strings.xml

@@ -303,7 +303,6 @@
 	<!-- Length of track in cell that describes route -->
 	<string name="length">长度</string>
 	<string name="share_my_location">共享我的位置</string>
-	<string name="become_a_pro">升级</string>
 	<string name="menu_search">搜索</string>
 	<string name="pref_zoom_title">缩放按钮</string>
 	<string name="pref_zoom_summary">在屏幕上显示</string>

android/res/values/donottranslate.xml

@@ -5,6 +5,10 @@
   <!-- FB -->
   <string name="fb_app_id" translatable="false">185237551520383</string>
 
+  <!-- App names -->
+  <string name="facebook" translatable="false">Facebook</string>
+  <string name="twitter" translatable="false">Twitter</string>
+
   <!-- Font names -->
   <string name="robotoLight" translatable="false">sans-serif-light</string>
   <string name="robotoRegular" translatable="false">sans-serif</string>
@@ -15,11 +19,11 @@
   <string name="robotoMedium" translatable="false">sans-serif-medium</string>
 
   <!--  Prefs -->
-  <string name="pref_allow_stat" translatable="false">AllowStat</string>
+  <string name="pref_send_statistics" translatable="false">AllowStat</string>
   <string name="pref_munits" translatable="false">MeasurementUnits</string>
-  <string name="pref_storage_activity" translatable="false">StorageActivity</string>
+  <string name="pref_storage" translatable="false">Storage</string>
   <string name="pref_yota" translatable="false">Yota</string>
-  <string name="pref_zoom_btns_enabled" translatable="false">ZoomButtonsEnabled</string>
+  <string name="pref_show_zoom_buttons" translatable="false">ZoomButtonsEnabled</string>
   <string name="pref_play_services" translatable="false">PlayServicesEnabled</string>
   <string name="pref_about" translatable="false">AboutMapsWithMe</string>
   <string name="pref_rate_app" translatable="false">RateApp</string>
@@ -33,6 +37,7 @@
   <string name="pref_subscribe" translatable="false">Subscribe</string>
   <string name="pref_settings" translatable="false">Settings</string>
   <string name="pref_file_name" translatable="false">MapsMePrefs</string>
+  <string name="pref_map_style" translatable="false">MapStyle</string>
 
   <string name="notification_ticker_ltr" translatable="false">%1$s: %2$s</string>
   <string name="notification_ticker_rtl" translatable="false">%2$s :%1$s</string>

android/res/values/string-arrays.xml

@@ -1,13 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
   <string-array name="measument_units">
     <item>@string/kilometres</item>
     <item>@string/miles</item>
   </string-array>
-  <string-array name="measument_units_values" translatable="false">
+
+  <string-array name="measument_units_values"
+                translatable="false">
     <item>0</item>
     <item>1</item>
   </string-array>
 
+  <string-array name="map_style">
+    <item>@string/pref_map_style_classic_light</item>
+    <item>@string/pref_map_style_classic_dark</item>
+    <item>@string/pref_map_style_modern_light</item>
+  </string-array>
+
+  <string-array name="map_style_values"
+                translatable="false">
+    <item>0</item>
+    <item>1</item>
+    <item>2</item>
+  </string-array>
 </resources>

android/res/values/strings.xml

@@ -310,10 +310,25 @@
 	<!-- Length of track in cell that describes route -->
 	<string name="length">Length</string>
 	<string name="share_my_location">Share My Location</string>
-	<string name="become_a_pro">Upgrade</string>
 	<string name="menu_search">Search</string>
+	<!-- Settings screen: "Map" category title -->
+	<string name="prefs_group_map">Map</string>
+	<!-- Settings screen: "Route" category title -->
+	<string name="prefs_group_route">Route</string>
+	<!-- Settings screen: "Miscellaneous" category title -->
+	<string name="prefs_group_misc">Miscellaneous</string>
 	<string name="pref_zoom_title">Zoom buttons</string>
 	<string name="pref_zoom_summary">Display on the screen</string>
+	<!-- Settings «Map» category: «Map style» title -->
+	<string name="pref_map_style_title">Map style</string>
+	<!-- Settings «Map» category: «Map style» summary -->
+	<string name="pref_map_style_summary">Change map presentation</string>
+	<!-- «Map style» entry value -->
+	<string name="pref_map_style_classic_light">Classic light</string>
+	<!-- «Map style» entry value -->
+	<string name="pref_map_style_classic_dark">Classic dark</string>
+	<!-- «Map style» entry value -->
+	<string name="pref_map_style_modern_light">Modern light</string>
 	<string name="placepage_distance">Distance</string>
 	<string name="placepage_coordinates">Coordinates</string>
 	<string name="placepage_unsorted">Unsorted</string>
@@ -361,6 +376,10 @@
 	<!-- Text in menu -->
 	<string name="settings_and_more">Settings &amp; More</string>
 	<!-- Text in menu -->
+	<string name="website">Website</string>
+	<!-- Text in menu -->
+	<string name="blog">Blog</string>
+	<!-- Text in menu -->
 	<string name="maps_me_community">MAPS.ME Community</string>
 	<!-- Text in menu -->
 	<string name="like_on_facebook">Like on Facebook</string>
@@ -368,10 +387,20 @@
 	<string name="follow_on_twitter">Follow on Twitter</string>
 	<!-- Text in menu -->
 	<string name="contact_us">Contact us</string>
+	<!-- Settings: Send feedback button and dialog title -->
+	<string name="feedback">Feedback</string>
+	<!-- Settings: "Send general feedback" button -->
+	<string name="feedback_general">General feedback</string>
 	<!-- Text in menu -->
 	<string name="subscribe_to_news">Subscribe to our news</string>
 	<!-- Text in menu -->
 	<string name="rate_the_app">Rate the app</string>
+	<!-- Rate in Google Play (Android only) -->
+	<string name="rate_gp">Rate on Google Play</string>
+	<!-- Share with friends: menu item title -->
+	<string name="tell_friends">Tell a Friend</string>
+	<!-- Share with friends: sharing text -->
+	<string name="tell_friends_text">Hi! Install Maps.me!</string>
 	<!-- Text in menu -->
 	<string name="help">Help</string>
 	<!-- Text in menu -->
@@ -382,6 +411,8 @@
 	<string name="subscribe_me_subject">Please subscribe me to the MAPS.ME newsletter</string>
 	<!-- Email body -->
 	<string name="subscribe_me_body">I want to be the first to learn about latest news updates and promotions. I can cancel my subscription at any time.</string>
+	<!-- About short text (below logo) -->
+	<string name="about_description">Joined efforts of Mail.Ru Group and OpenStreetMap make the most useful application for travelers!</string>
 	<!-- About text -->
 	<string name="about_text">MAPS.ME offers the fastest offline maps of all the cities, all countries of the world. Travel with full confidence: wherever you are, MAPS.ME helps to locate yourself on the map, find the nearest restaurant, hotel, bank, gas station etc. It doesn’t require internet connection.\n\nWe are always working on new features and would love to hear from you on how you think we could improve MAPS.ME. If you have any problems with the app, don\&#39;t hesitate to contact us at support@maps.me. We respond to every request!\n\nDo you like MAPS.ME and want to support us? There are some simple and absolutely free ways:\n\n- post a review at your App Market\n- like our Facebook page http://www.facebook.com/mapswithme\n- or just tell about MAPS.ME to your mom, friends and colleagues :)\n\nThank you for being with us. We appreciate your support very much!\n\nP.S. We take map data from OpenStreetMap, a mapping project similar to Wikipedia, which allows users to create and edit maps. If you see something is missing or wrong on the map, you can correct the maps directly at http://openstreetmap.org, and your changes will appear in MAPS.ME app with the next version release.</string>
 	<!-- Alert text -->

android/res/values/styles-text.xml

@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <style name="MwmTextAppearance">
+    <item name="android:textStyle">normal</item>
+    <item name="android:fontFamily" tools:ignore="NewApi">@string/robotoRegular</item>
+  </style>
+
+  <style name="MwmTextAppearance.Display1">
+    <item name="android:textSize">@dimen/text_size_display_1</item>
+    <item name="android:textColor">@color/text_dark</item>
+  </style>
+
+  <style name="MwmTextAppearance.Display1.Plus">
+    <item name="android:textSize">@dimen/text_size_display_1_plus</item>
+  </style>
+
+  <style name="MwmTextAppearance.Display2">
+    <item name="android:textSize">@dimen/text_size_display_2</item>
+    <item name="android:textColor">@color/text_dark</item>
+    <item name="android:textStyle">bold</item>
+  </style>
+
+  <style name="MwmTextAppearance.Display3">
+    <item name="android:textSize">@dimen/text_size_display_3</item>
+    <item name="android:textColor">@color/text_dark</item>
+  </style>
+
+  <style name="MwmTextAppearance.Headline">
+    <item name="android:textSize">@dimen/text_size_headline</item>
+    <item name="android:textColor">@color/text_dark</item>
+  </style>
+
+  <style name="MwmTextAppearance.Toolbar">
+    <item name="android:textSize">@dimen/text_size_toolbar</item>
+    <item name="android:textColor">@color/text_light</item>
+    <item name="android:textColorHint">@color/text_light_hint</item>
+  </style>
+
+  <style name="MwmTextAppearance.Title">
+    <item name="android:textSize">@dimen/text_size_title</item>
+    <item name="android:textColor">@color/text_dark</item>
+  </style>
+
+  <style name="MwmTextAppearance.Title.Light">
+    <item name="android:textSize">@dimen/text_size_title</item>
+    <item name="android:textColor">@color/text_light</item>
+  </style>
+
+  <style name="MwmTextAppearance.Body1">
+    <item name="android:textSize">@dimen/text_size_body_1</item>
+    <item name="android:textColor">@color/text_dark</item>
+  </style>
+
+  <style name="MwmTextAppearance.Body1.Light">
+    <item name="android:textColor">@color/text_light</item>
+  </style>
+
+  <style name="MwmTextAppearance.Body2">
+    <item name="android:textSize">@dimen/text_size_body_2</item>
+    <item name="android:textColor">@color/text_dark_subtitle</item>
+  </style>
+
+  <style name="MwmTextAppearance.Caption">
+    <item name="android:textSize">@dimen/text_size_caption</item>
+    <item name="android:textColor">@color/text_dark_subtitle</item>
+  </style>
+
+  <style name="MwmTextAppearance.Body3">
+    <item name="android:textSize">@dimen/text_size_body_3</item>
+    <item name="android:textColor">@color/text_dark_subtitle</item>
+  </style>
+
+  <style name="MwmTextAppearance.Body3.Light">
+    <item name="android:textSize">@dimen/text_size_body_3</item>
+    <item name="android:textColor">@color/text_light</item>
+  </style>
+
+  <style name="MwmTextAppearance.Body4">
+    <item name="android:textSize">@dimen/text_size_body_4</item>
+    <item name="android:textColor">@color/text_dark_subtitle</item>
+  </style>
+
+  <style name="MwmTextAppearance.Body4.Light">
+    <item name="android:textColor">@color/text_light</item>
+  </style>
+
+  <style name="MwmTextAppearance.IconTitle">
+    <item name="android:textSize">@dimen/text_size_icon_title</item>
+    <item name="android:textColor">@color/text_green</item>
+  </style>
+
+  <style name="MwmTextAppearance.Button">
+    <item name="android:textSize">@dimen/text_size_button</item>
+    <item name="android:textColor">@color/text_green</item>
+    <item name="android:textAllCaps">true</item>
+  </style>
+
+  <style name="MwmTextAppearance.Toolbar.Button" parent="MwmTextAppearance.Body3.Light">
+    <item name="android:textAllCaps">true</item>
+  </style>
+
+  <style name="MwmTextAppearance.Hint.InputLayout" parent="TextAppearance.AppCompat">
+    <item name="android:textColorHint">?attr/colorAccent</item>
+  </style>
+
+  <style name="MwmTextAppearance.Toolbar.Title" parent="@style/TextAppearance.Widget.AppCompat.Toolbar.Title">
+    <item name="android:textSize">@dimen/text_size_toolbar</item>
+  </style>
+
+  <style name="MwmTextAppearance.Counter">
+    <item name="android:layout_width">wrap_content</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:minWidth">20dp</item>
+    <item name="android:minHeight">20dp</item>
+    <item name="android:paddingLeft">2dp</item>
+    <item name="android:paddingRight">2dp</item>
+    <item name="android:gravity">center</item>
+    <item name="android:background">@drawable/counter</item>
+    <item name="android:textAppearance">@style/MwmTextAppearance.Body3.Light</item>
+  </style>
+
+  <style name="MwmTextAppearance.RoutingNumber">
+    <item name="android:textSize">@dimen/text_size_routing_number</item>
+    <item name="android:textColor">@color/text_dark_subtitle</item>
+  </style>
+</resources>

android/res/values/styles.xml

@@ -1,29 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
            xmlns:tools="http://schemas.android.com/tools">
+  <style name="MwmWidget"/>
+  <style name="MwmWidget.Button"/>
+  <style name="MwmWidget.FrameLayout"/>
 
-  <!-- Themes -->
-
-  <style name="MwmTheme" parent="Theme.AppCompat.Light.NoActionBar">
-    <item name="colorPrimary">@color/base_green</item>
-    <item name="colorPrimaryDark">@color/base_green_darker</item>
-    <item name="clickableBackground">?attr/selectableItemBackground</item>
-    <item name="colorControlNormal">@color/text_dark_hint</item>
-    <item name="colorAccent">?attr/colorPrimary</item>
-    <item name="android:listViewStyle">@style/MwmWidget.ListView</item>
-    <item name="android:textViewStyle">@style/MwmWidget.TextView</item>
-    <item name="alertDialogTheme">@style/MwmMain.DialogFragment</item>
-    <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
-    <item name="android:windowBackground">@android:color/white</item>
-    <item name="android:colorBackgroundCacheHint">@null</item>
-    <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/robotoRegular</item>
-    <item name="dividerHorizontal">@color/text_dark_hint</item>
-  </style>
-
-  <style name="MwmTheme.BottomSheet.Dialog" parent="BottomSheet.Dialog">
-    <item name="bs_listItemTitleTextAppearance">@style/MwmTextAppearance.Body1</item>
-    <item name="bs_gridItemTitleTextAppearance">@style/MwmTextAppearance.Body3</item>
-  </style>
 
   <style name="BottomSheet.Icon">
     <item name="android:layout_width">0dp</item>
@@ -31,67 +12,6 @@
     <item name="android:layout_marginLeft">0dp</item>
   </style>
 
-  <style name="MwmTheme.Map">
-    <item name="android:colorPrimaryDark">@android:color/black</item>
-    <item name="android:windowBackground">@null</item>
-  </style>
-
-  <style name="MwmTheme.Light">
-    <item name="android:windowFrame">@null</item>
-    <item name="android:windowTitleStyle">@style/TextAppearance.AppCompat.Title</item>
-    <item name="android:windowIsFloating">true</item>
-    <item name="android:windowContentOverlay">@null</item>
-    <item name="android:windowActionModeOverlay">true</item>
-    <item name="android:windowCloseOnTouchOutside">false</item>
-    <item name="android:buttonBarStyle">@style/Theme.AppCompat.Dialog</item>
-    <item name="listPreferredItemPaddingLeft">16dip</item>
-    <item name="listPreferredItemPaddingRight">16dip</item>
-  </style>
-
-  <style name="MwmMain.DialogFragment" parent="Theme.AppCompat.Light.Dialog.Alert">
-    <item name="colorPrimary">@color/base_green</item>
-    <item name="colorPrimaryDark">@color/base_green_darker</item>
-    <item name="android:windowIsFloating">true</item>
-    <item name="clickableBackground">?attr/selectableItemBackground</item>
-    <item name="colorControlNormal">@color/text_dark_hint</item>
-    <item name="android:listViewStyle">@style/MwmWidget.ListView</item>
-    <item name="android:textViewStyle">@style/MwmWidget.TextView</item>
-    <item name="android:windowTitleStyle">@style/MwmMain.DialogFragment.TitleStyle</item>
-    <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/robotoRegular</item>
-  </style>
-
-  <style name="MwmMain.DialogFragment.TitleStyle" parent="Base.DialogWindowTitle.AppCompat">
-    <item name="android:textAppearance">@style/MwmTextAppearance.Title</item>
-    <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/robotoMedium</item>
-  </style>
-
-  <style name="MwmMain.DialogFragment.Fullscreen" parent="Theme.AppCompat">
-    <item name="colorPrimary">@color/base_green</item>
-    <item name="colorPrimaryDark">@color/base_green_darker</item>
-    <item name="clickableBackground">?attr/selectableItemBackground</item>
-    <item name="colorControlNormal">@color/text_dark_hint</item>
-    <item name="colorAccent">?attr/colorPrimary</item>
-    <item name="android:windowIsTranslucent">true</item>
-    <item name="android:windowIsFloating">false</item>
-    <item name="android:windowBackground">@android:color/white</item>
-    <item name="android:textColorHint">@color/text_dark_hint</item>
-    <item name="android:textViewStyle">@style/MwmWidget.TextView</item>
-    <item name="android:colorBackgroundCacheHint">@null</item>
-    <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/robotoRegular</item>
-  </style>
-
-  <style name="MwmMain.DialogFragment.Fullscreen.SemiTransparent">
-    <item name="android:windowBackground">@color/semitransparent_black</item>
-  </style>
-
-  <!-- Themes -->
-
-  <!-- -->
-
-  <!-- Widgets -->
-
-  <style name="MwmWidget"/>
-
   <style name="MwmWidget.MapButton"
          parent="android:Widget.ImageButton">
     <item name="android:scaleType">center</item>
@@ -100,8 +20,6 @@
     <item name="android:background">@null</item>
   </style>
 
-  <style name="MwmWidget.Button"/>
-
   <style name="MwmWidget.Button.Green">
     <item name="android:background">@drawable/bg_btn_green</item>
   </style>
@@ -110,7 +28,9 @@
     <item name="android:background">@drawable/ripple_blue</item>
   </style>
 
-  <style name="MwmWidget.Floating"/>
+  <style name="MwmWidget.Floating">
+    <item name="android:elevation" tools:ignore="NewApi">@dimen/appbar_elevation</item>
+  </style>
 
   <style name="MwmWidget.Floating.Panel">
     <item name="android:background">@color/bg_top_panels</item>
@@ -122,19 +42,19 @@
     <item name="android:textColorHint">@color/text_dark_hint</item>
     <item name="android:textCursorDrawable">@null</item>
     <item name="android:textSize">@dimen/text_size_body_1</item>
-    <item name="android:fontFamily">@string/robotoRegular</item>
+    <item name="android:fontFamily" tools:ignore="NewApi">@string/robotoRegular</item>
   </style>
 
   <style name="MwmWidget.ToolbarStyle" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
     <item name="android:background">?attr/colorPrimary</item>
-    <item name="android:elevation">@dimen/appbar_elevation</item>
+    <item name="android:elevation" tools:ignore="NewApi">@dimen/appbar_elevation</item>
     <item name="android:displayOptions">homeAsUp|showTitle</item>
     <item name="contentInsetStart">72dp</item>
-    <item name="android:titleTextAppearance">@style/MwmTextAppearance.Toolbar.Title</item>
+    <item name="android:titleTextAppearance" tools:ignore="NewApi">@style/MwmTextAppearance.Toolbar.Title</item>
     <item name="titleTextAppearance">@style/MwmTextAppearance.Toolbar.Title</item>
     <item name="contentInsetLeft">72dp</item>
-    <item name="android:contentInsetStart">72dp</item>
-    <item name="android:contentInsetLeft">72dp</item>
+    <item name="android:contentInsetStart" tools:ignore="NewApi">72dp</item>
+    <item name="android:contentInsetLeft" tools:ignore="NewApi">72dp</item>
   </style>
 
   <style name="MwmWidget.ToolbarTheme" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
@@ -156,6 +76,17 @@
     <item name="android:background">@android:color/transparent</item>
   </style>
 
+  <style name="MwmWidget.TextView.Item">
+    <item name="android:layout_width">match_parent</item>
+    <item name="android:layout_height">@dimen/height_item_oneline</item>
+    <item name="android:gravity">center_vertical</item>
+    <item name="android:paddingLeft">@dimen/margin_base_plus</item>
+    <item name="android:paddingRight">@dimen/margin_base_plus</item>
+    <item name="android:background">?clickableBackground</item>
+    <item name="android:drawablePadding">@dimen/margin_base_plus</item>
+    <item name="android:textAppearance">@style/MwmTextAppearance.Body1</item>
+  </style>
+
   <style name="MwmWidget.TextView.Search">
     <item name="android:layout_width">match_parent</item>
     <item name="android:layout_height">@dimen/search_item_height</item>
@@ -186,7 +117,14 @@
     <item name="android:textAllCaps">true</item>
   </style>
 
-  <style name="MwmWidget.FrameLayout"/>
+  <style name="MwmWidget.TextView.OutOfDateMapsMarker">
+    <item name="android:layout_width">26dp</item>
+    <item name="android:layout_height">26dp</item>
+    <item name="android:background">@drawable/bg_circle_outdated_maps_marker</item>
+    <item name="android:gravity">center</item>
+    <item name="android:textAppearance">@style/MwmTextAppearance.Body3</item>
+    <item name="android:textColor">@android:color/white</item>
+  </style>
 
   <style name="MwmWidget.FrameLayout.Elevation">
     <item name="android:foreground">@drawable/shadow_top</item>
@@ -197,144 +135,4 @@
     <item name="android:indeterminateDrawable">@drawable/rating_bar</item>
   </style>
 
-  <style name="MwmWidget.TextView.OutOfDateMapsMarker">
-    <item name="android:layout_width">26dp</item>
-    <item name="android:layout_height">26dp</item>
-    <item name="android:background">@drawable/bg_circle_outdated_maps_marker</item>
-    <item name="android:gravity">center</item>
-    <item name="android:textAppearance">@style/MwmTextAppearance.Body3</item>
-    <item name="android:textColor">@android:color/white</item>
-  </style>
-
-  <!-- Widgets -->
-
-  <!-- -->
-
-  <!-- Text appearance -->
-
-  <style name="MwmTextAppearance">
-    <item name="android:textStyle">normal</item>
-    <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/robotoRegular</item>
-  </style>
-
-  <style name="MwmTextAppearance.Display3">
-    <item name="android:textSize">@dimen/text_size_display_3</item>
-    <item name="android:textColor">@color/text_dark</item>
-  </style>
-
-  <style name="MwmTextAppearance.Display2">
-    <item name="android:textSize">@dimen/text_size_display_2</item>
-    <item name="android:textColor">@color/text_dark</item>
-    <item name="android:textStyle">bold</item>
-  </style>
-
-  <style name="MwmTextAppearance.Display1">
-    <item name="android:textSize">@dimen/text_size_display_1</item>
-    <item name="android:textColor">@color/text_dark</item>
-  </style>
-
-  <style name="MwmTextAppearance.Display1.Plus">
-    <item name="android:textSize">@dimen/text_size_display_1_plus</item>
-  </style>
-
-  <style name="MwmTextAppearance.Headline">
-    <item name="android:textSize">@dimen/text_size_headline</item>
-    <item name="android:textColor">@color/text_dark</item>
-  </style>
-
-  <style name="MwmTextAppearance.Toolbar">
-    <item name="android:textSize">@dimen/text_size_toolbar</item>
-    <item name="android:textColor">@color/text_light</item>
-    <item name="android:textColorHint">@color/text_light_hint</item>
-  </style>
-
-  <style name="MwmTextAppearance.Title">
-    <item name="android:textSize">@dimen/text_size_title</item>
-    <item name="android:textColor">@color/text_dark</item>
-  </style>
-
-  <style name="MwmTextAppearance.Title.Light">
-    <item name="android:textSize">@dimen/text_size_title</item>
-    <item name="android:textColor">@color/text_light</item>
-  </style>
-
-  <style name="MwmTextAppearance.Body1">
-    <item name="android:textSize">@dimen/text_size_body_1</item>
-    <item name="android:textColor">@color/text_dark</item>
-  </style>
-
-  <style name="MwmTextAppearance.Body1.Light">
-    <item name="android:textColor">@color/text_light</item>
-  </style>
-
-  <style name="MwmTextAppearance.Body2">
-    <item name="android:textSize">@dimen/text_size_body_2</item>
-    <item name="android:textColor">@color/text_dark_subtitle</item>
-  </style>
-
-  <style name="MwmTextAppearance.Caption">
-    <item name="android:textSize">@dimen/text_size_caption</item>
-    <item name="android:textColor">@color/text_dark_subtitle</item>
-  </style>
-
-  <style name="MwmTextAppearance.Body3">
-    <item name="android:textSize">@dimen/text_size_body_3</item>
-    <item name="android:textColor">@color/text_dark_subtitle</item>
-  </style>
-
-  <style name="MwmTextAppearance.Body3.Light">
-    <item name="android:textColor">@color/text_light</item>
-  </style>
-
-  <style name="MwmTextAppearance.Body4">
-    <item name="android:textSize">@dimen/text_size_body_4</item>
-    <item name="android:textColor">@color/text_dark_subtitle</item>
-  </style>
-
-  <style name="MwmTextAppearance.Body4.Light">
-    <item name="android:textColor">@color/text_light</item>
-  </style>
-
-  <style name="MwmTextAppearance.IconTitle">
-    <item name="android:textSize">@dimen/text_size_icon_title</item>
-    <item name="android:textColor">@color/text_green</item>
-  </style>
-
-  <style name="MwmTextAppearance.Button">
-    <item name="android:textSize">@dimen/text_size_button</item>
-    <item name="android:textColor">@color/text_green</item>
-    <item name="android:textAllCaps">true</item>
-  </style>
-
-  <style name="MwmTextAppearance.RoutingNumber">
-    <item name="android:textSize">@dimen/text_size_routing_number</item>
-    <item name="android:textColor">@color/text_dark_subtitle</item>
-  </style>
-
-  <style name="MwmTextAppearance.Toolbar.Button" parent="MwmTextAppearance.Body3.Light">
-    <item name="android:textAllCaps">true</item>
-  </style>
-
-  <style name="MwmTextAppearance.Hint.InputLayout" parent="TextAppearance.AppCompat">
-    <item name="android:textColorHint">?attr/colorAccent</item>
-  </style>
-
-  <style name="MwmTextAppearance.Toolbar.Title" parent="@style/TextAppearance.Widget.AppCompat.Toolbar.Title">
-    <item name="android:textSize">@dimen/text_size_toolbar</item>
-  </style>
-
-  <style name="MwmTextAppearance.Counter">
-    <item name="android:layout_width">wrap_content</item>
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:minWidth">20dp</item>
-    <item name="android:minHeight">20dp</item>
-    <item name="android:paddingLeft">2dp</item>
-    <item name="android:paddingRight">2dp</item>
-    <item name="android:gravity">center</item>
-    <item name="android:background">@drawable/counter</item>
-    <item name="android:textAppearance">@style/MwmTextAppearance.Body3.Light</item>
-  </style>
-
-  <!-- Text appearance -->
-
-</resources>
+</resources>

android/res/values/themes.xml

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <style name="MwmTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <item name="colorPrimary">@color/base_green</item>
+    <item name="colorPrimaryDark">@color/base_green_darker</item>
+    <item name="clickableBackground">?attr/selectableItemBackground</item>
+    <item name="colorControlNormal">@color/text_dark_hint</item>
+    <item name="colorAccent">?attr/colorPrimary</item>
+    <item name="android:listViewStyle">@style/MwmWidget.ListView</item>
+    <item name="android:textViewStyle">@style/MwmWidget.TextView</item>
+    <item name="alertDialogTheme">@style/MwmMain.DialogFragment</item>
+    <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
+    <item name="android:windowBackground">@android:color/white</item>
+    <item name="android:colorBackgroundCacheHint">@null</item>
+    <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/robotoRegular</item>
+    <item name="dividerHorizontal">@color/text_dark_hint</item>
+  </style>
+
+  <style name="MwmTheme.MainActivity">
+    <item name="android:colorPrimaryDark" tools:ignore="NewApi">@android:color/black</item>
+    <item name="android:windowBackground">@null</item>
+  </style>
+
+  <style name="MwmTheme.Light">
+    <item name="android:windowFrame">@null</item>
+    <item name="android:windowTitleStyle">@style/TextAppearance.AppCompat.Title</item>
+    <item name="android:windowIsFloating">true</item>
+    <item name="android:windowContentOverlay">@null</item>
+    <item name="android:windowActionModeOverlay">true</item>
+    <item name="android:windowCloseOnTouchOutside">false</item>
+    <item name="android:buttonBarStyle">@style/Theme.AppCompat.Dialog</item>
+    <item name="listPreferredItemPaddingLeft">16dip</item>
+    <item name="listPreferredItemPaddingRight">16dip</item>
+  </style>
+
+  <style name="MwmMain.DialogFragment" parent="android:Theme.Holo.Light.Dialog.NoActionBar">
+    <item name="colorPrimary">@color/base_green</item>
+    <item name="colorPrimaryDark">@color/base_green_darker</item>
+    <item name="android:windowIsFloating">true</item>
+    <item name="clickableBackground">?attr/selectableItemBackground</item>
+    <item name="colorControlNormal">@color/text_dark_hint</item>
+    <item name="android:listViewStyle">@style/MwmWidget.ListView</item>
+    <item name="android:textViewStyle">@style/MwmWidget.TextView</item>
+    <item name="android:windowTitleStyle">@style/MwmMain.DialogFragment.TitleStyle</item>
+    <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/robotoRegular</item>
+  </style>
+
+  <style name="MwmMain.DialogFragment.TitleStyle" parent="Base.DialogWindowTitle.AppCompat">
+    <item name="android:textAppearance">@style/MwmTextAppearance.Title</item>
+    <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/robotoMedium</item>
+  </style>
+
+  <style name="MwmMain.DialogFragment.Fullscreen" parent="Theme.AppCompat">
+    <item name="colorPrimary">@color/base_green</item>
+    <item name="colorPrimaryDark">@color/base_green_darker</item>
+    <item name="clickableBackground">?attr/selectableItemBackground</item>
+    <item name="colorControlNormal">@color/text_dark_hint</item>
+    <item name="colorAccent">?attr/colorPrimary</item>
+    <item name="android:windowIsTranslucent">true</item>
+    <item name="android:windowIsFloating">false</item>
+    <item name="android:windowBackground">@android:color/white</item>
+    <item name="android:textColorHint">@color/text_dark_hint</item>
+    <item name="android:textViewStyle">@style/MwmWidget.TextView</item>
+    <item name="android:colorBackgroundCacheHint">@null</item>
+    <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/robotoRegular</item>
+  </style>
+
+  <style name="MwmMain.DialogFragment.Fullscreen.SemiTransparent">
+    <item name="android:windowBackground">@color/semitransparent_black</item>
+  </style>
+</resources>