Merge pull request #5315 from bykoianko/release-71-to-master

release-71 to master

android/gradle.properties

@@ -4,8 +4,8 @@ propMinSdkVersion=15
 propTargetSdkVersion=22
 propCompileSdkVersion=23
 propBuildToolsVersion=22.0.1
-propVersionCode=705
-propVersionName=7.0.5
+propVersionCode=713
+propVersionName=7.1.3
 propDebugNdkFlags=V=1 NDK_DEBUG=1 DEBUG=1
 propReleaseNdkFlags=V=1 NDK_DEBUG=0 PRODUCTION=1
 org.gradle.daemon=true

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

@@ -1248,4 +1248,10 @@ Java_com_mapswithme_maps_Framework_nativeSetVisibleRect(JNIEnv * env, jclass, ji
 {
   frm()->SetVisibleViewport(m2::RectD(left, top, right, bottom));
 }
+
+JNIEXPORT jboolean JNICALL
+Java_com_mapswithme_maps_Framework_nativeIsRouteFinished(JNIEnv * env, jclass)
+{
+  return frm()->IsRouteFinished();
+}
 }  // extern "C"

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

@@ -71,9 +71,10 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info)
   if (info.IsBookmark())
   {
     // public Bookmark(@IntRange(from = 0) int categoryId, @IntRange(from = 0) int bookmarkId,
-    // String name, @NonNull Banner banner, boolean reachableByTaxi)
+    // String name, @Nullable String objectTitle, @NonNull Banner banner, boolean reachableByTaxi)
     static jmethodID const ctorId = jni::GetConstructorID(
-        env, g_bookmarkClazz, "(IILjava/lang/String;Lcom/mapswithme/maps/bookmarks/data/Banner;Z)V");
+        env, g_bookmarkClazz,
+        "(IILjava/lang/String;Ljava/lang/String;Lcom/mapswithme/maps/bookmarks/data/Banner;Z)V");
 
     auto const & bac = info.GetBookmarkAndCategory();
     BookmarkCategory * cat = g_framework->NativeFramework()->GetBmCategory(bac.m_categoryIndex);
@@ -81,10 +82,11 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info)
         static_cast<Bookmark const *>(cat->GetUserMark(bac.m_bookmarkIndex))->GetData();
 
     jni::TScopedLocalRef jName(env, jni::ToJavaString(env, data.GetName()));
+    jni::TScopedLocalRef jTitle(env, jni::ToJavaString(env, info.GetTitle()));
     jobject mapObject =
         env->NewObject(g_bookmarkClazz, ctorId, static_cast<jint>(info.m_bac.m_categoryIndex),
-                       static_cast<jint>(info.m_bac.m_bookmarkIndex), jName.get(), jbanner,
-                       info.IsReachableByTaxi());
+                       static_cast<jint>(info.m_bac.m_bookmarkIndex), jName.get(), jTitle.get(),
+                       jbanner, info.IsReachableByTaxi());
     if (info.IsFeature())
       InjectMetadata(env, g_mapObjectClazz, mapObject, info.GetMetadata());
     return mapObject;

android/res/anim/search_fade_in.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<alpha
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:interpolator="@android:interpolator/decelerate_quad"
+  android:fromAlpha="0.0"
+  android:toAlpha="1.0"
+  android:duration="@integer/search_fade_in_anim_time"/>

android/res/anim/search_fade_out.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<alpha
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:interpolator="@android:interpolator/accelerate_quad"
+  android:fromAlpha="1.0"
+  android:toAlpha="0.0"
+  android:duration="@integer/search_fade_out_anim_time"/>

android/res/drawable-v21/bg_active_icon.xml

@@ -6,7 +6,7 @@
     <shape
       xmlns:android="http://schemas.android.com/apk/res/android"
       android:shape="oval">
-      <solid android:color="?activeIconBackground"/>
+      <solid android:color="@color/base_accent"/>
       <size
         android:height="40dp"
         android:width="40dp"/>

android/res/drawable-v21/bg_active_icon_night.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:color="?attr/colorControlHighlight">
+  <item>
+    <shape
+      xmlns:android="http://schemas.android.com/apk/res/android"
+      android:shape="oval">
+      <solid android:color="@color/base_accent_night"/>
+      <size
+        android:height="40dp"
+        android:width="40dp"/>
+    </shape>
+  </item>
+</ripple>

android/res/drawable-v21/bg_steady_icon.xml

@@ -6,7 +6,7 @@
     <shape
       xmlns:android="http://schemas.android.com/apk/res/android"
       android:shape="oval">
-      <solid android:color="?steadyIconBackground"/>
+      <solid android:color="@color/black_8"/>
       <size
         android:height="40dp"
         android:width="40dp"/>

android/res/drawable-v21/bg_steady_icon_night.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:color="?attr/colorControlHighlight">
+  <item>
+    <shape
+      xmlns:android="http://schemas.android.com/apk/res/android"
+      android:shape="oval">
+      <solid android:color="@color/white_8"/>
+      <size
+        android:height="40dp"
+        android:width="40dp"/>
+    </shape>
+  </item>
+</ripple>

android/res/drawable/bg_active_icon.xml

@@ -1,6 +1,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="oval">
-  <solid android:color="?activeIconBackground"/>
+  <solid android:color="@color/base_accent"/>
   <size
     android:height="40dp"
     android:width="40dp"/>

android/res/drawable/bg_active_icon_night.xml

@@ -0,0 +1,7 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="oval">
+  <solid android:color="@color/base_accent_night"/>
+  <size
+    android:height="40dp"
+    android:width="40dp"/>
+</shape>

android/res/drawable/bg_steady_icon.xml

@@ -1,6 +1,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="oval">
-  <solid android:color="?steadyIconBackground"/>
+  <solid android:color="@color/black_8"/>
   <size
     android:height="40dp"
     android:width="40dp"/>

android/res/drawable/bg_steady_icon_night.xml

@@ -0,0 +1,7 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="oval">
+  <solid android:color="@color/white_8"/>
+  <size
+    android:height="40dp"
+    android:width="40dp"/>
+</shape>

android/res/layout-land/activity_map.xml

@@ -63,6 +63,12 @@
     android:layout_height="wrap_content"
     android:layout_alignParentBottom="true"/>
 
+  <include
+    layout="@layout/search_filter_panel"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/height_block_base"
+    android:layout_alignParentBottom="true"/>
+
   <com.mapswithme.maps.widget.placepage.PlacePageView
     android:id="@+id/info_box"
     style="@style/MwmWidget.Floating.Panel"
@@ -74,15 +80,10 @@
     placePage:docked="true"
     tools:ignore="UnknownIdInLayout"/>
 
-  <include
-    layout="@layout/search_filter_panel"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/height_block_base"
-    android:layout_alignParentBottom="true"/>
-
   <com.mapswithme.maps.search.HotelsFilterView
     android:id="@+id/hotels_filter"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:layout_below="@id/toolbar"
     tools:visibility="gone"/>
 </RelativeLayout>

android/res/layout-land/place_page_preview.xml

@@ -48,6 +48,7 @@
     android:layout_toStartOf="@+id/direction_frame"
     android:lines="1"
     android:textAppearance="@style/MwmTextAppearance.Body1.Secondary"
+    android:ellipsize="end"
     tools:background="#300000F0"
     tools:text="Subtitle, very very very very very very very long"/>
 

android/res/layout/activity_map.xml

@@ -60,6 +60,12 @@
     android:layout_height="wrap_content"
     android:layout_alignParentBottom="true"/>
 
+  <include
+    layout="@layout/search_filter_panel"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/height_block_base"
+    android:layout_alignParentBottom="true"/>
+
   <com.mapswithme.maps.widget.placepage.PlacePageView
     android:id="@+id/info_box"
     android:layout_width="match_parent"
@@ -67,15 +73,10 @@
     android:layout_alignParentBottom="true"
     placePage:animationType="bottom"/>
 
-  <include
-    layout="@layout/search_filter_panel"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/height_block_base"
-    android:layout_alignParentBottom="true"/>
-
   <com.mapswithme.maps.search.HotelsFilterView
     android:id="@+id/hotels_filter"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:layout_below="@id/toolbar"
     tools:visibility="gone"/>
 </RelativeLayout>

android/res/layout/fragment_news_single.xml

@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.mapswithme.maps.widget.HeightLimitedFrameLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="wrap_content"
-  android:layout_height="wrap_content">
-  <LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-    <TextView
-      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_marginLeft="@dimen/margin_base"
-      android:layout_marginRight="@dimen/margin_base"
-      android:text="@string/whatsnew_update_editor_title"
-      android:textAppearance="@style/MwmTextAppearance.Title"
-      android:layout_gravity="center_horizontal"
-      android:gravity="center_horizontal"
-      android:fontFamily="@string/robotoMedium"/>
-
-    <ImageView
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginBottom="@dimen/margin_base"
-      android:layout_gravity="center_horizontal"
-      android:src="@drawable/img_whatsnew_booking_improved"
-      android:tag="@string/tag_height_limited"/>
-
-    <TextView
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginLeft="@dimen/margin_base"
-      android:layout_marginRight="@dimen/margin_base"
-      android:text="@string/whatsnew_update_editor_message"
-      android:textAppearance="@style/MwmTextAppearance.Body1"
-      android:layout_gravity="center_horizontal"
-      android:gravity="center_horizontal"/>
-
-    <TextView
-      android:id="@+id/migrate_message"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginTop="@dimen/margin_base_plus"
-      android:layout_marginLeft="@dimen/margin_base"
-      android:layout_marginRight="@dimen/margin_base"
-      android:text="@string/whatsnew_update_editor_message_update"
-      android:textAppearance="@style/MwmTextAppearance.Body1"
-      android:layout_gravity="center_horizontal"
-      android:gravity="center_horizontal"/>
-
-    <Space
-      android:layout_width="0dp"
-      android:layout_height="0dp"
-      android:layout_weight="1"/>
-
-    <LinearLayout
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:orientation="vertical"
-      android:layout_marginTop="@dimen/margin_base">
-      <TextView
-        android:id="@+id/done"
-        android:layout_width="wrap_content"
-        style="@style/MwmWidget.Button"
-        android:paddingLeft="@dimen/margin_base"
-        android:paddingRight="@dimen/margin_base"
-        android:layout_gravity="right|bottom"
-        android:gravity="center"
-        android:text="@string/done"
-        android:textAppearance="@style/MwmTextAppearance.Button"
-        android:textColor="?colorAccent"/>
-
-      <LinearLayout
-        android:id="@+id/migrate_buttons"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="@dimen/margin_base"
-        android:clipToPadding="false"
-        android:orientation="horizontal">
-        <TextView
-          android:id="@+id/close"
-          android:layout_width="0dp"
-          android:layout_weight="3"
-          style="@style/MwmWidget.Button"
-          android:gravity="center"
-          android:text="@string/not_now"
-          android:textAppearance="@style/MwmTextAppearance.Button"
-          android:textColor="?colorAccent"/>
-
-        <Button
-          android:id="@+id/migrate"
-          android:layout_width="0dp"
-          android:layout_weight="5"
-          style="@style/MwmWidget.Button.Accent"
-          android:layout_marginLeft="@dimen/margin_base"
-          android:text="@string/migration_update_all_button"
-          android:textAppearance="@style/MwmTextAppearance.Button"
-          android:textColor="?android:textColorPrimaryInverse"/>
-      </LinearLayout>
-    </LinearLayout>
-  </LinearLayout>
-</com.mapswithme.maps.widget.HeightLimitedFrameLayout>

android/res/layout/fragment_search.xml

@@ -28,6 +28,13 @@
           android:layout_height="?attr/actionBarSize"/>
       </android.support.design.widget.CollapsingToolbarLayout>
       <include layout="@layout/search_filter_panel"/>
+      <FrameLayout
+        android:id="@+id/filter_elevation"
+        style="@style/MwmWidget.FrameLayout.Elevation"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?cardBackground"
+        android:visibility="gone"/>
     </android.support.design.widget.AppBarLayout>
 
     <FrameLayout

android/res/layout/hotels_filter.xml

@@ -12,8 +12,9 @@
     android:background="@color/bg_dialog_translucent"
     android:alpha="0"
     tools:alpha="1"/>
-  <RelativeLayout
+  <LinearLayout
     android:id="@+id/frame"
+    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?cardBackground"
@@ -26,48 +27,41 @@
       android:layout_height="?attr/actionBarSize"
       android:background="?cardBackground"
       tools:targetApi="lollipop">
-      <ImageView
-        android:id="@+id/cancel"
-        android:layout_width="?attr/actionBarSize"
-        android:layout_height="?attr/actionBarSize"
-        android:scaleType="centerInside"
-        android:src="@drawable/ic_close"
-        android:background="?clickableBackground"/>
       <TextView
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/margin_base"
         android:layout_marginLeft="@dimen/margin_base"
         android:layout_centerVertical="true"
-        android:layout_toRightOf="@id/cancel"
-        android:layout_toEndOf="@id/cancel"
-        android:layout_toStartOf="@id/done"
-        android:layout_toLeftOf="@id/done"
+        android:layout_toStartOf="@id/reset"
+        android:layout_toLeftOf="@id/reset"
         android:textAppearance="@style/MwmTextAppearance.Toolbar.Title"
         android:fontFamily="@string/robotoMedium"
         android:textColor="?android:textColorPrimary"
         android:text="@string/booking_filters"/>
-      <ImageView
-        android:id="@+id/done"
-        android:layout_width="?attr/actionBarSize"
-        android:layout_height="?attr/actionBarSize"
+      <TextView
+        android:id="@+id/reset"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:paddingRight="@dimen/margin_base"
+        android:paddingLeft="@dimen/margin_base"
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
-        android:scaleType="centerInside"
-        android:tint="?colorAccent"
-        android:src="@drawable/ic_done"
-        android:background="?clickableBackground"/>
+        android:gravity="center"
+        android:textAppearance="@style/MwmTextAppearance.Button"
+        android:fontFamily="@string/robotoMedium"
+        android:text="@string/booking_filters_reset"
+        android:background="?clickableBackground"
+        tools:targetApi="jelly_bean"/>
     </RelativeLayout>
     <FrameLayout
       style="@style/MwmWidget.FrameLayout.Elevation"
       android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_below="@id/header"/>
+      android:layout_height="wrap_content"/>
 
     <ScrollView
       android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_below="@id/header">
+      android:layout_height="wrap_content">
       <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -114,5 +108,41 @@
         <include layout="@layout/divider_horizontal"/>
       </LinearLayout>
     </ScrollView>
-  </RelativeLayout>
+    <RelativeLayout
+      android:id="@+id/buttons_frame"
+      android:layout_width="match_parent"
+      android:layout_height="@dimen/height_block_base">
+      <include layout="@layout/divider_horizontal"/>
+      <View
+        android:id="@+id/center_divider"
+        android:layout_width="1dp"
+        android:layout_height="match_parent"
+        android:layout_centerHorizontal="true"
+        android:background="?dividerHorizontal"/>
+      <TextView
+        android:id="@+id/cancel"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_toLeftOf="@id/center_divider"
+        android:layout_toStartOf="@id/center_divider"
+        android:gravity="center"
+        android:textAppearance="@style/MwmTextAppearance.Button"
+        android:fontFamily="@string/robotoMedium"
+        android:text="@string/cancel"
+        android:background="?clickableBackground"
+        tools:targetApi="jelly_bean"/>
+      <TextView
+        android:id="@+id/done"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_toRightOf="@id/center_divider"
+        android:layout_toEndOf="@id/center_divider"
+        android:gravity="center"
+        android:textAppearance="@style/MwmTextAppearance.Button"
+        android:fontFamily="@string/robotoMedium"
+        android:text="@string/done"
+        android:background="?clickableBackground"
+        tools:targetApi="jelly_bean"/>
+    </RelativeLayout>
+  </LinearLayout>
 </merge>

android/res/layout/layout_nav_bottom_numbers.xml

@@ -4,7 +4,7 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="@dimen/nav_menu_height"
-  android:orientation="horizontal"
+  android:orientation="vertical"
   android:paddingLeft="@dimen/nav_numbers_margin"
   android:paddingStart="@dimen/nav_numbers_margin"
   android:layout_marginRight="@dimen/nav_toggle"
@@ -12,59 +12,51 @@
   android:background="?clickableBackground"
   tools:background="#3000FF00"
   tools:ignore="RtlSymmetry">
-  <!-- Speed -->
+
   <LinearLayout
-    android:id="@+id/speed_frame"
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent"
-    android:minWidth="@dimen/nav_numbers_side_min_width"
-    android:orientation="vertical"
-    android:paddingLeft="@dimen/nav_numbers_margin"
-    android:paddingRight="@dimen/nav_numbers_margin"
-    android:paddingTop="@dimen/margin_eighth"
-    android:gravity="center_horizontal"
-    tools:background="#20FF0000">
-    <TextView
-      android:id="@+id/speed_value"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginBottom="@dimen/neg_margin_quarter"
-      android:singleLine="true"
-      android:includeFontPadding="false"
-      android:textAppearance="@style/MwmTextAppearance.RoutingNumber.Navigation"
-      tools:text="999"/>
-
-    <TextView
-      android:id="@+id/speed_dimen"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:singleLine="true"
-      android:textAppearance="@style/MwmTextAppearance.RoutingDimension"
-      tools:text="km/h"/>
-  </LinearLayout>
-
-  <Space android:layout_width="0dp"
-         android:layout_height="0dp"
-         android:layout_weight="1"/>
-
-  <!-- Time -->
-  <FrameLayout
-    android:id="@+id/time_frame"
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent"
-    android:minWidth="@dimen/nav_numbers_center_min_width"
-    android:paddingTop="@dimen/margin_eighth"
-    tools:background="#20FF0000">
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal"
+    android:layout_marginBottom="@dimen/neg_margin_quarter">
+    <!-- Speed -->
     <LinearLayout
-      android:layout_width="match_parent"
+      android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:orientation="horizontal"
-      android:layout_gravity="center_horizontal">
+      android:minWidth="@dimen/nav_numbers_side_min_width"
+      android:orientation="vertical"
+      android:paddingLeft="@dimen/nav_numbers_margin"
+      android:paddingRight="@dimen/nav_numbers_margin"
+      android:paddingTop="@dimen/margin_eighth"
+      android:gravity="center_horizontal"
+      tools:background="#20FF0000">
+      <TextView
+        android:id="@+id/speed_value"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/neg_margin_quarter"
+        android:lines="1"
+        android:textAppearance="@style/MwmTextAppearance.RoutingNumber.Navigation"
+        tools:text="999"/>
+    </LinearLayout>
+
+    <Space android:layout_width="0dp"
+           android:layout_height="0dp"
+           android:layout_weight="1"/>
+
+    <!-- Time -->
+    <LinearLayout
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:minWidth="@dimen/nav_numbers_center_min_width"
+      android:paddingTop="@dimen/margin_eighth"
+      android:gravity="center_horizontal"
+      tools:background="#20FF0000">
       <TextView
         android:id="@+id/time_hour_value"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:singleLine="true"
+        android:lines="1"
         android:textAppearance="@style/MwmTextAppearance.RoutingNumber.Navigation"
         tools:text="999"/>
 
@@ -74,7 +66,7 @@
         android:layout_height="wrap_content"
         android:layout_marginRight="@dimen/margin_quarter"
         android:layout_marginEnd="@dimen/margin_quarter"
-        android:singleLine="true"
+        android:lines="1"
         android:textAppearance="@style/MwmTextAppearance.RoutingDimension"
         tools:text="h"/>
 
@@ -82,7 +74,7 @@
         android:id="@+id/time_minute_value"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:singleLine="true"
+        android:lines="1"
         android:textAppearance="@style/MwmTextAppearance.RoutingNumber.Navigation"
         tools:text="99"/>
 
@@ -90,20 +82,73 @@
         android:id="@+id/time_minute_dimen"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:singleLine="true"
+        android:lines="1"
         android:textAppearance="@style/MwmTextAppearance.RoutingNumber"
         tools:text="m"/>
     </LinearLayout>
 
+    <Space android:layout_width="0dp"
+           android:layout_height="0dp"
+           android:layout_weight="1"/>
+
+    <!-- Distance -->
+    <LinearLayout
+      android:id="@+id/distance_frame"
+      android:layout_width="wrap_content"
+      android:layout_height="match_parent"
+      android:minWidth="@dimen/nav_numbers_side_min_width"
+      android:orientation="vertical"
+      android:paddingLeft="@dimen/nav_numbers_margin"
+      android:paddingRight="@dimen/nav_numbers_margin"
+      android:paddingTop="@dimen/margin_eighth"
+      android:gravity="center_horizontal"
+      tools:background="#20FF0000">
+      <TextView
+        android:id="@+id/distance_value"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/neg_margin_quarter"
+        android:lines="1"
+        android:textAppearance="@style/MwmTextAppearance.RoutingNumber.Navigation"
+        tools:text="99999"/>
+    </LinearLayout>
+  </LinearLayout>
+
+  <LinearLayout
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical">
+
+    <!-- Speed -->
+    <TextView
+      android:id="@+id/speed_dimen"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:minWidth="@dimen/nav_numbers_side_min_width"
+      android:paddingLeft="@dimen/nav_numbers_margin"
+      android:paddingRight="@dimen/nav_numbers_margin"
+      android:gravity="center"
+      android:lines="1"
+      android:textAppearance="@style/MwmTextAppearance.RoutingDimension"
+      tools:text="km/h"
+      tools:background="#20FF0000"/>
+
+    <Space android:layout_width="0dp"
+      android:layout_height="0dp"
+      android:layout_weight="1"/>
+
+    <!-- Time -->
     <LinearLayout
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:orientation="horizontal"
+      android:minWidth="@dimen/nav_numbers_center_min_width"
       android:theme="?navigationTheme"
-      android:layout_gravity="center_horizontal"
+      android:gravity="center"
       android:layout_marginLeft="@dimen/margin_eighth"
       android:layout_marginStart="@dimen/margin_eighth"
-      android:layout_marginTop="30dp">
+      tools:background="#20FF0000">
       <ImageView
         android:id="@+id/dot_left"
         android:layout_width="wrap_content"
@@ -118,40 +163,23 @@
         android:layout_height="wrap_content"
         android:src="?newsMarker"/>
     </LinearLayout>
-  </FrameLayout>
 
-  <Space android:layout_width="0dp"
-         android:layout_height="0dp"
-         android:layout_weight="1"/>
-
-  <!-- Distance -->
-  <LinearLayout
-    android:id="@+id/distance_frame"
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent"
-    android:minWidth="@dimen/nav_numbers_side_min_width"
-    android:orientation="vertical"
-    android:paddingLeft="@dimen/nav_numbers_margin"
-    android:paddingRight="@dimen/nav_numbers_margin"
-    android:paddingTop="@dimen/margin_eighth"
-    android:gravity="center_horizontal"
-    tools:background="#20FF0000">
-    <TextView
-      android:id="@+id/distance_value"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginBottom="@dimen/neg_margin_quarter"
-      android:singleLine="true"
-      android:includeFontPadding="false"
-      android:textAppearance="@style/MwmTextAppearance.RoutingNumber.Navigation"
-      tools:text="99999"/>
+    <Space android:layout_width="0dp"
+           android:layout_height="0dp"
+           android:layout_weight="1"/>
 
+    <!-- Distance -->
     <TextView
       android:id="@+id/distance_dimen"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:singleLine="true"
+      android:minWidth="@dimen/nav_numbers_side_min_width"
+      android:paddingLeft="@dimen/nav_numbers_margin"
+      android:paddingRight="@dimen/nav_numbers_margin"
+      android:gravity="center"
+      android:lines="1"
       android:textAppearance="@style/MwmTextAppearance.RoutingDimension"
-      tools:text="km"/>
+      tools:text="km"
+      tools:background="#20FF0000"/>
   </LinearLayout>
-</LinearLayout>
+</LinearLayout>

android/res/layout/place_page_preview.xml

@@ -54,6 +54,7 @@
     android:layout_toStartOf="@+id/direction_frame"
     android:lines="1"
     android:textAppearance="@style/MwmTextAppearance.Body1.Secondary"
+    android:ellipsize="end"
     tools:background="#300000F0"
     tools:text="Subtitle, very very very very very very very long"/>
 

android/res/layout/search_filter_panel.xml

@@ -16,7 +16,8 @@
     style="@style/MwmTextAppearance.Button"
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
-    android:padding="@dimen/margin_half"
+    android:paddingLeft="@dimen/margin_half"
+    android:paddingRight="@dimen/margin_half"
     android:layout_centerVertical="true"
     android:gravity="center"
     android:background="?clickableBackground"
@@ -28,8 +29,8 @@
     android:id="@+id/filter_button"
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
-    android:paddingStart="@dimen/margin_half"
-    android:paddingEnd="@dimen/margin_half"
+    android:paddingLeft="@dimen/margin_half"
+    android:paddingRight="@dimen/margin_half"
     android:layout_alignParentEnd="true"
     android:layout_alignParentRight="true"
     android:background="?clickableBackground"

android/res/values-ar/strings.xml

@@ -386,6 +386,8 @@
 	<string name="follow_on_twitter">تابعونا على تويتر</string>
 	<!-- Text in menu -->
 	<string name="contact_us">أتصل بنا</string>
+	<!-- Settings: Send feedback button and dialog title -->
+	<string name="feedback">تعقيب</string>
 	<!-- Text in menu -->
 	<string name="subscribe_to_news">أشترك في نشرتنا الإخبارية</string>
 	<!-- Text in menu -->
@@ -1004,7 +1006,7 @@
 	<string name="mobile_data_option_ask">السؤال دوماً</string>
 	<string name="traffic_update_maps_text">لعرض البيانات المرورية، يجب تحديث الخرائط.</string>
 	<string name="traffic_outdated">البيانات المرورية قديمة.</string>
-	<string name="big_font">تسميات أكبر</string>
+	<string name="big_font">زيادة حجم الخط على الخريطة</string>
 	<string name="traffic_update_app">الرجاء تحديث MAPS.ME</string>
 	<!-- "traffic" as in road congestion -->
 	<string name="traffic_update_app_message">لعرض البيانات المرورية، يجب تحديث التطبيق.</string>
@@ -1046,4 +1048,10 @@
 	<string name="whatsnew_font_size">حجم الخط</string>
 	<!-- january -->
 	<string name="whatsnew_font_size_text">يمكن جعل التسميات على الخريطة أكبر.</string>
+	<!-- Seven points and higher -->
+	<string name="booking_filter_rating_num_good">7.0+</string>
+	<!-- Eight points and higher -->
+	<string name="booking_filter_rating_num_very_good">8.0+</string>
+	<!-- Nine points and higher -->
+	<string name="booking_filter_rating_num_excellent">9.0+</string>
 </resources>

android/res/values-cs/strings.xml

@@ -387,6 +387,8 @@
 	<string name="follow_on_twitter">Následovat na Twitteru</string>
 	<!-- Text in menu -->
 	<string name="contact_us">Kontaktovat nás</string>
+	<!-- Settings: Send feedback button and dialog title -->
+	<string name="feedback">Zpětná vazba</string>
 	<!-- Text in menu -->
 	<string name="subscribe_to_news">Přihlásit se k odběru novinek</string>
 	<!-- Text in menu -->
@@ -1005,7 +1007,7 @@
 	<string name="mobile_data_option_ask">Vždy se zeptat</string>
 	<string name="traffic_update_maps_text">Ke zobrazení údajů o provozu musí být aktualizovány mapy.</string>
 	<string name="traffic_outdated">Data o provozu jsou zastaralá.</string>
-	<string name="big_font">Větší štítky</string>
+	<string name="big_font">Zvětšit velikost písma na mapě</string>
 	<string name="traffic_update_app">Aktualizujte MAPS. ME</string>
 	<!-- "traffic" as in road congestion -->
 	<string name="traffic_update_app_message">Ke zobrazení dat o provozu je nutné aplikaci aktualizovat.</string>
@@ -1047,4 +1049,10 @@
 	<string name="whatsnew_font_size">Velikost písma</string>
 	<!-- january -->
 	<string name="whatsnew_font_size_text">Popisky na mapě lze zvětšit.</string>
+	<!-- Seven points and higher -->
+	<string name="booking_filter_rating_num_good">7,0+</string>
+	<!-- Eight points and higher -->
+	<string name="booking_filter_rating_num_very_good">8,0+</string>
+	<!-- Nine points and higher -->
+	<string name="booking_filter_rating_num_excellent">9,0+</string>
 </resources>

android/res/values-da/strings.xml

@@ -384,6 +384,8 @@
 	<string name="follow_on_twitter">Følg på Twitter</string>
 	<!-- Text in menu -->
 	<string name="contact_us">Kontakt os</string>
+	<!-- Settings: Send feedback button and dialog title -->
+	<string name="feedback">Feedback</string>
 	<!-- Text in menu -->
 	<string name="subscribe_to_news">Abonnér på vores nyheder</string>
 	<!-- Text in menu -->
@@ -1002,7 +1004,7 @@
 	<string name="mobile_data_option_ask">Spørg altid</string>
 	<string name="traffic_update_maps_text">Kortet opdateres for kunne vise trafikdata.</string>
 	<string name="traffic_outdated">Trafikdata er forældede.</string>
-	<string name="big_font">Større etiketter</string>
+	<string name="big_font">Forøg skriftstørrelsen på kortet</string>
 	<string name="traffic_update_app">Opdater MAPS.ME</string>
 	<!-- "traffic" as in road congestion -->
 	<string name="traffic_update_app_message">Appen skal opdateres for at kunne vise trafikdata.</string>
@@ -1044,4 +1046,10 @@
 	<string name="whatsnew_font_size">Skriftstørrelse</string>
 	<!-- january -->
 	<string name="whatsnew_font_size_text">Etiketterne på kortet kan gøres større.</string>
+	<!-- Seven points and higher -->
+	<string name="booking_filter_rating_num_good">7,0+</string>
+	<!-- Eight points and higher -->
+	<string name="booking_filter_rating_num_very_good">8,0+</string>
+	<!-- Nine points and higher -->
+	<string name="booking_filter_rating_num_excellent">9,0+</string>
 </resources>

android/res/values-de/strings.xml

@@ -395,7 +395,7 @@
 	<!-- Text in menu -->
 	<string name="contact_us">Kontaktieren Sie uns</string>
 	<!-- Settings: Send feedback button and dialog title -->
-	<string name="feedback">Rückmeldung</string>
+	<string name="feedback">Feedback</string>
 	<!-- Settings: "Send general feedback" button -->
 	<string name="feedback_general">Allgemeine Rückmeldung</string>
 	<!-- Text in menu -->
@@ -1016,7 +1016,7 @@
 	<string name="mobile_data_option_ask">Immer fragen</string>
 	<string name="traffic_update_maps_text">Um Verkehrsdaten anzuzeigen, müssen die Karten aktualisiert werden.</string>
 	<string name="traffic_outdated">Verkehrsdaten sind veraltet.</string>
-	<string name="big_font">Größere Bezeichnungen</string>
+	<string name="big_font">Schriftgröße auf der Karte erhöhen</string>
 	<string name="traffic_update_app">Bitte aktualisieren Sie MAPS.ME</string>
 	<!-- "traffic" as in road congestion -->
 	<string name="traffic_update_app_message">Um Verkehrsdaten anzuzeigen, muss die Anwendung aktualisiert werden.</string>
@@ -1058,4 +1058,10 @@
 	<string name="whatsnew_font_size">Schriftgröße</string>
 	<!-- january -->
 	<string name="whatsnew_font_size_text">Bezeichnungen auf der Karte können vergrößert werden.</string>
+	<!-- Seven points and higher -->
+	<string name="booking_filter_rating_num_good">7.0+</string>
+	<!-- Eight points and higher -->
+	<string name="booking_filter_rating_num_very_good">8.0+</string>
+	<!-- Nine points and higher -->
+	<string name="booking_filter_rating_num_excellent">9.0+</string>
 </resources>

android/res/values-el/strings.xml

@@ -287,7 +287,7 @@
 	<!-- Text in menu -->
 	<string name="contact_us">Επικοινωνήστε μαζί μας</string>
 	<!-- Settings: Send feedback button and dialog title -->
-	<string name="feedback">Σχόλιο</string>
+	<string name="feedback">Σχόλια</string>
 	<!-- Settings: "Send general feedback" button -->
 	<string name="feedback_general">Γενικάό σχόλιο</string>
 	<!-- Text in menu -->
@@ -766,7 +766,7 @@
 	<string name="mobile_data_option_ask">Να γίνεται ερώτηση πάντα</string>
 	<string name="traffic_update_maps_text">Για να εμφανίσετε πληροφορίες για την κίνηση, πρέπει να ενημερωθούν οι χάρτες.</string>
 	<string name="traffic_outdated">Οι πληροφορίες για την κίνηση είναι παλιές.</string>
-	<string name="big_font">Μεγαλύτερες ετικέτες</string>
+	<string name="big_font">Αύξηση μεγέθους γραμματοσειράς στο χάρτη</string>
 	<string name="traffic_update_app">Κάντε ενημέρωση του MAPS.ME</string>
 	<!-- "traffic" as in road congestion -->
 	<string name="traffic_update_app_message">Για να εμφανιστούν πληροφορίες για την κίνηση, πρέπει να γίνει ενημέρωση της εφαρμογής.</string>
@@ -808,4 +808,10 @@
 	<string name="whatsnew_font_size">Μέγεθος γραμματοσειράς</string>
 	<!-- january -->
 	<string name="whatsnew_font_size_text">Οι ετικέτες στον χάρτη μπορούν να μεγαλώσουν.</string>
+	<!-- Seven points and higher -->
+	<string name="booking_filter_rating_num_good">7,0+</string>
+	<!-- Eight points and higher -->
+	<string name="booking_filter_rating_num_very_good">8,0+</string>
+	<!-- Nine points and higher -->
+	<string name="booking_filter_rating_num_excellent">9,0+</string>
 </resources>

android/res/values-es/strings.xml

@@ -373,6 +373,8 @@
 	<string name="follow_on_twitter">Síguenos en Twitter</string>
 	<!-- Text in menu -->
 	<string name="contact_us">Contacta con nosotros</string>
+	<!-- Settings: Send feedback button and dialog title -->
+	<string name="feedback">Comentarios</string>
 	<!-- Text in menu -->
 	<string name="subscribe_to_news">Suscríbete a nuestras noticias</string>
 	<!-- Text in menu -->
@@ -991,7 +993,7 @@
 	<string name="mobile_data_option_ask">Preguntar siempre</string>
 	<string name="traffic_update_maps_text">Para mostrar los datos de tráfico, deben actualizarse los mapas.</string>
 	<string name="traffic_outdated">Los datos de tráfico están obsoletos.</string>
-	<string name="big_font">Etiquetas mayores</string>
+	<string name="big_font">Aumentar el tamaño de fuente en el mapa</string>
 	<string name="traffic_update_app">Por favor, actualice MAPS.ME</string>
 	<!-- "traffic" as in road congestion -->
 	<string name="traffic_update_app_message">Para mostrar los datos de tráfico, debe actualizar la aplicación.</string>
@@ -1033,4 +1035,10 @@
 	<string name="whatsnew_font_size">Tamaño de la fuente</string>
 	<!-- january -->
 	<string name="whatsnew_font_size_text">Las etiquetas del mapa pueden ampliarse.</string>
+	<!-- Seven points and higher -->
+	<string name="booking_filter_rating_num_good">7,0+</string>
+	<!-- Eight points and higher -->
+	<string name="booking_filter_rating_num_very_good">8,0+</string>
+	<!-- Nine points and higher -->
+	<string name="booking_filter_rating_num_excellent">9,0+</string>
 </resources>

android/res/values-fi/strings.xml

@@ -380,6 +380,8 @@
 	<string name="follow_on_twitter">Seuraa meitä Twitterissä</string>
 	<!-- Text in menu -->
 	<string name="contact_us">Ota yhteyttä</string>
+	<!-- Settings: Send feedback button and dialog title -->
+	<string name="feedback">Palaute</string>
 	<!-- Text in menu -->
 	<string name="subscribe_to_news">Tilaa uutiskirjeemme</string>
 	<!-- Text in menu -->
@@ -998,7 +1000,7 @@
 	<string name="mobile_data_option_ask">Kysy aina</string>
 	<string name="traffic_update_maps_text">Liikennetietojen näyttämiseksi kartat on päivitettävä.</string>
 	<string name="traffic_outdated">Liikennetiedot ovat vanhentuneet.</string>
-	<string name="big_font">Suuremmat selitykset</string>
+	<string name="big_font">Suurenna fonttikokoa kartalla</string>
 	<string name="traffic_update_app">Päivitä MAPS.ME</string>
 	<!-- "traffic" as in road congestion -->
 	<string name="traffic_update_app_message">Liikennetietojen näyttämiseksi sovellus on päivitettävä.</string>
@@ -1040,4 +1042,10 @@
 	<string name="whatsnew_font_size">Fonttikoko</string>
 	<!-- january -->
 	<string name="whatsnew_font_size_text">Kartan selityksiä voi suurentaa.</string>
+	<!-- Seven points and higher -->
+	<string name="booking_filter_rating_num_good">7.0+</string>
+	<!-- Eight points and higher -->
+	<string name="booking_filter_rating_num_very_good">8.0+</string>
+	<!-- Nine points and higher -->
+	<string name="booking_filter_rating_num_excellent">9.0+</string>
 </resources>

android/res/values-fr/strings.xml

@@ -392,7 +392,7 @@
 	<!-- Text in menu -->
 	<string name="contact_us">Contactez-nous</string>
 	<!-- Settings: Send feedback button and dialog title -->
-	<string name="feedback">Avis</string>
+	<string name="feedback">Feedback</string>
 	<!-- Settings: "Send general feedback" button -->
 	<string name="feedback_general">Avis général</string>
 	<!-- Text in menu -->
@@ -1015,7 +1015,7 @@
 	<string name="mobile_data_option_ask">Toujours demander</string>
 	<string name="traffic_update_maps_text">Pour afficher les données de circulation, les cartes doivent être actualisées.</string>
 	<string name="traffic_outdated">Les données de circulation ne sont pas actuelles.</string>
-	<string name="big_font">Étiquettes plus grandes</string>
+	<string name="big_font">Augmenter la taille de police sur la carte</string>
 	<string name="traffic_update_app">Veuillez mettre à jour MAPS.ME</string>
 	<!-- "traffic" as in road congestion -->
 	<string name="traffic_update_app_message">Pour afficher les données de circulation, l\&#39;application doit être actualisée.</string>
@@ -1057,4 +1057,10 @@
 	<string name="whatsnew_font_size">Taille de police</string>
 	<!-- january -->
 	<string name="whatsnew_font_size_text">Les étiquettes sur la carte peuvent être agrandies.</string>
+	<!-- Seven points and higher -->
+	<string name="booking_filter_rating_num_good">7.0+</string>
+	<!-- Eight points and higher -->
+	<string name="booking_filter_rating_num_very_good">8.0+</string>
+	<!-- Nine points and higher -->
+	<string name="booking_filter_rating_num_excellent">9.0+</string>
 </resources>

android/res/values-hu/strings.xml

@@ -381,6 +381,8 @@
 	<string name="follow_on_twitter">Kövess minket Twitteren</string>
 	<!-- Text in menu -->
 	<string name="contact_us">Kapcsolat</string>
+	<!-- Settings: Send feedback button and dialog title -->
+	<string name="feedback">Visszajelzés</string>
 	<!-- Text in menu -->
 	<string name="subscribe_to_news">Iratkozz fel hírlevelünkre</string>
 	<!-- Text in menu -->
@@ -998,7 +1000,7 @@
 	<string name="mobile_data_option_ask">Mindig kérdezze meg</string>
 	<string name="traffic_update_maps_text">Forgalmi adatok megjelenítéséhez a térképeket frissíteni kell.</string>
 	<string name="traffic_outdated">A forgalmi adatok elavultak.</string>
-	<string name="big_font">Nagyobb címkék</string>
+	<string name="big_font">Betűméret növelése a térképen</string>
 	<string name="traffic_update_app">Kérjük, frissítse a MAPS.ME alkalmazást</string>
 	<!-- "traffic" as in road congestion -->
 	<string name="traffic_update_app_message">A forgalmi adatok megjelenítéséhez frissíteni kell az alkalmazást.</string>
@@ -1040,4 +1042,10 @@
 	<string name="whatsnew_font_size">Betűméret</string>
 	<!-- january -->
 	<string name="whatsnew_font_size_text">A térképen a címkék lehetnek nagyobbak.</string>
+	<!-- Seven points and higher -->
+	<string name="booking_filter_rating_num_good">7.0+</string>
+	<!-- Eight points and higher -->
+	<string name="booking_filter_rating_num_very_good">8.0+</string>
+	<!-- Nine points and higher -->
+	<string name="booking_filter_rating_num_excellent">9,0+</string>
 </resources>

android/res/values-in/strings.xml

@@ -380,6 +380,8 @@
 	<string name="follow_on_twitter">Ikuti di Twitter</string>
 	<!-- Text in menu -->
 	<string name="contact_us">Hubungi kami</string>
+	<!-- Settings: Send feedback button and dialog title -->
+	<string name="feedback">Umpan balik</string>
 	<!-- Text in menu -->
 	<string name="subscribe_to_news">Berlangganan berita kami</string>
 	<!-- Text in menu -->
@@ -997,7 +999,7 @@
 	<string name="mobile_data_option_ask">Selalu Tanya</string>
 	<string name="traffic_update_maps_text">Untuk memperlihatkan data lalu lintas, peta harus diperbarui.</string>
 	<string name="traffic_outdated">Data lalu lintas belum diperbarui.</string>
-	<string name="big_font">Label yang lebih besar</string>
+	<string name="big_font">Perbesar ukuran huruf pada peta</string>
 	<string name="traffic_update_app">Perbarui MAPS.ME</string>
 	<!-- "traffic" as in road congestion -->
 	<string name="traffic_update_app_message">Untuk menampilkan data lalu lintas, aplikasi ini harus diperbarui.</string>
@@ -1039,4 +1041,10 @@
 	<string name="whatsnew_font_size">Ukuran Huruf</string>
 	<!-- january -->
 	<string name="whatsnew_font_size_text">Label pada peta bisa dijadikan lebih besar.</string>
+	<!-- Seven points and higher -->
+	<string name="booking_filter_rating_num_good">7,0+</string>
+	<!-- Eight points and higher -->
+	<string name="booking_filter_rating_num_very_good">8,0+</string>
+	<!-- Nine points and higher -->
+	<string name="booking_filter_rating_num_excellent">9,0+</string>
 </resources>

android/res/values-it/strings.xml

@@ -379,6 +379,8 @@
 	<string name="follow_on_twitter">Seguici su Twitter</string>
 	<!-- Text in menu -->
 	<string name="contact_us">Contattaci</string>
+	<!-- Settings: Send feedback button and dialog title -->
+	<string name="feedback">Feedback</string>
 	<!-- Text in menu -->
 	<string name="subscribe_to_news">Iscriviti alle nostre notizie</string>
 	<!-- Text in menu -->
@@ -997,7 +999,7 @@
 	<string name="mobile_data_option_ask">Chiedi sempre</string>
 	<string name="traffic_update_maps_text">Per visualizzare i dati sul traffico, le mappe devono essere aggiornate.</string>
 	<string name="traffic_outdated">Dati sul traffico non aggiornati.</string>
-	<string name="big_font">Etichette più grandi</string>
+	<string name="big_font">Aumenta dimensione carattere sulla mappa</string>
 	<string name="traffic_update_app">Aggiorna MAPS.ME</string>
 	<!-- "traffic" as in road congestion -->
 	<string name="traffic_update_app_message">Per visualizzare i dati sul traffico, l\&#39;applicazione deve essere aggiornata.</string>
@@ -1039,4 +1041,10 @@
 	<string name="whatsnew_font_size">Dimensione carattere</string>
 	<!-- january -->
 	<string name="whatsnew_font_size_text">Le etichette sulla mappa possono essere ingrandite.</string>
+	<!-- Seven points and higher -->
+	<string name="booking_filter_rating_num_good">7.0+</string>
+	<!-- Eight points and higher -->
+	<string name="booking_filter_rating_num_very_good">8.0+</string>
+	<!-- Nine points and higher -->
+	<string name="booking_filter_rating_num_excellent">9.0+</string>
 </resources>

android/res/values-ja/strings.xml

@@ -379,6 +379,8 @@
 	<string name="follow_on_twitter">Twitterでフォロー</string>
 	<!-- Text in menu -->
 	<string name="contact_us">お問い合わせ</string>
+	<!-- Settings: Send feedback button and dialog title -->
+	<string name="feedback">フィードバック</string>
 	<!-- Text in menu -->
 	<string name="subscribe_to_news">当社のニュースに登録</string>
 	<!-- Text in menu -->
@@ -997,7 +999,7 @@
 	<string name="mobile_data_option_ask">常に確認</string>
 	<string name="traffic_update_maps_text">交通データを表示するには、地図を更新する必要があります。</string>
 	<string name="traffic_outdated">交通データが古くなっています。</string>
-	<string name="big_font">大きなラベル</string>
+	<string name="big_font">地図上のフォントサイズを大きく</string>
 	<string name="traffic_update_app">MAPS.ME をアップデートしてください</string>
 	<!-- "traffic" as in road congestion -->
 	<string name="traffic_update_app_message">交通データを表示するには、アプリケーションをアップデートする必要があります。</string>
@@ -1039,4 +1041,10 @@
 	<string name="whatsnew_font_size">フォントサイズ</string>
 	<!-- january -->
 	<string name="whatsnew_font_size_text">地図上のラベルを大きくすることができます。</string>
+	<!-- Seven points and higher -->
+	<string name="booking_filter_rating_num_good">7.0+</string>
+	<!-- Eight points and higher -->
+	<string name="booking_filter_rating_num_very_good">8.0+</string>
+	<!-- Nine points and higher -->
+	<string name="booking_filter_rating_num_excellent">9.0+</string>
 </resources>

android/res/values-ko/strings.xml

@@ -376,6 +376,8 @@
 	<string name="follow_on_twitter">Twitter에서 팔로우</string>
 	<!-- Text in menu -->
 	<string name="contact_us">연락처</string>
+	<!-- Settings: Send feedback button and dialog title -->
+	<string name="feedback">피드백</string>
 	<!-- Text in menu -->
 	<string name="subscribe_to_news">우리 뉴스 구독</string>
 	<!-- Text in menu -->
@@ -994,7 +996,7 @@
 	<string name="mobile_data_option_ask">항상 표시</string>
 	<string name="traffic_update_maps_text">교통 데이터를 표시하려면 지도를 업데이트해야 합니다.</string>
 	<string name="traffic_outdated">교통 데이터가 오래되었습니다.</string>
-	<string name="big_font">더 큰 레이블</string>
+	<string name="big_font">지도에서 글꼴 크기 늘리기</string>
 	<string name="traffic_update_app">MAPS.ME를 업데이트하세요.</string>
 	<!-- "traffic" as in road congestion -->
 	<string name="traffic_update_app_message">교통 데이터를 표시하려면 응용 프로그램을 업데이트해야 합니다.</string>
@@ -1036,4 +1038,10 @@
 	<string name="whatsnew_font_size">글꼴 크기</string>
 	<!-- january -->
 	<string name="whatsnew_font_size_text">지도의 레이블을 더 크게 할 수 있습니다.</string>
+	<!-- Seven points and higher -->
+	<string name="booking_filter_rating_num_good">7.0+</string>
+	<!-- Eight points and higher -->
+	<string name="booking_filter_rating_num_very_good">8.0+</string>
+	<!-- Nine points and higher -->
+	<string name="booking_filter_rating_num_excellent">9.0+</string>
 </resources>

android/res/values-nb/strings.xml

@@ -380,6 +380,8 @@
 	<string name="follow_on_twitter">Følg på Twitter</string>
 	<!-- Text in menu -->
 	<string name="contact_us">Kontakt oss</string>
+	<!-- Settings: Send feedback button and dialog title -->
+	<string name="feedback">Tilbakemelding</string>
 	<!-- Text in menu -->
 	<string name="subscribe_to_news">Abonner på nyheter fra oss</string>
 	<!-- Text in menu -->
@@ -996,7 +998,7 @@
 	<string name="mobile_data_option_ask">Alltid spør</string>
 	<string name="traffic_update_maps_text">For å vise trafikkdata må kartene i appen være oppdaterte.</string>
 	<string name="traffic_outdated">Trafikkdata er utdatert.</string>
-	<string name="big_font">Større etiketter</string>
+	<string name="big_font">Forstørr skriften på kartet</string>
 	<string name="traffic_update_app">Vennligst oppdater MAPS.ME</string>
 	<!-- "traffic" as in road congestion -->
 	<string name="traffic_update_app_message">Du må oppdatere applikasjonen for å kunne se trafikkdata.</string>
@@ -1038,4 +1040,10 @@
 	<string name="whatsnew_font_size">Skriftstørrelse</string>
 	<!-- january -->
 	<string name="whatsnew_font_size_text">Etiketter på kartet kan gjøres større.</string>
+	<!-- Seven points and higher -->
+	<string name="booking_filter_rating_num_good">7,0+</string>
+	<!-- Eight points and higher -->
+	<string name="booking_filter_rating_num_very_good">8,0+</string>
+	<!-- Nine points and higher -->
+	<string name="booking_filter_rating_num_excellent">9,0+</string>
 </resources>

android/res/values-nl/strings.xml

@@ -380,6 +380,8 @@
 	<string name="follow_on_twitter">Ons volgen op Twitter</string>
 	<!-- Text in menu -->
 	<string name="contact_us">Contact met ons opnemen</string>
+	<!-- Settings: Send feedback button and dialog title -->
+	<string name="feedback">Feedback</string>
 	<!-- Text in menu -->
 	<string name="subscribe_to_news">Aanmelden voor onze nieuwtjes</string>
 	<!-- Text in menu -->
@@ -998,7 +1000,7 @@
 	<string name="mobile_data_option_ask">Altijd Vragen</string>
 	<string name="traffic_update_maps_text">Om verkeersgegevens weer te geven, moeten de kaarten bijgewerkt worden.</string>
 	<string name="traffic_outdated">Verkeersgegevens zijn verouderd.</string>
-	<string name="big_font">Grotere labels</string>
+	<string name="big_font">Lettergrootte op de kaart vergroten</string>
 	<string name="traffic_update_app">Gelieve MAPS.ME bij te werken</string>
 	<!-- "traffic" as in road congestion -->
 	<string name="traffic_update_app_message">Om de verkeersgegevens weer te geven, moet de applicatie bijgewerkt worden.</string>
@@ -1040,4 +1042,10 @@
 	<string name="whatsnew_font_size">Lettergrootte</string>
 	<!-- january -->
 	<string name="whatsnew_font_size_text">Labels op de map kunnen groter gemaakt worden.</string>
+	<!-- Seven points and higher -->
+	<string name="booking_filter_rating_num_good">7.0+</string>
+	<!-- Eight points and higher -->
+	<string name="booking_filter_rating_num_very_good">8.0+</string>
+	<!-- Nine points and higher -->
+	<string name="booking_filter_rating_num_excellent">9.0+</string>
 </resources>

android/res/values-pl/strings.xml

@@ -384,7 +384,7 @@
 	<!-- Text in menu -->
 	<string name="contact_us">Skontaktuj się z nami</string>
 	<!-- Settings: Send feedback button and dialog title -->
-	<string name="feedback">Zgłoś opinię</string>
+	<string name="feedback">Opinia</string>
 	<!-- Settings: "Send general feedback" button -->
 	<string name="feedback_general">Ogólne opinie</string>
 	<!-- Text in menu -->
@@ -1005,7 +1005,7 @@
 	<string name="mobile_data_option_ask">Zawsze pytaj</string>
 	<string name="traffic_update_maps_text">Aby wyświetlić dane o ruchu, muszą zostać zaktualizowane mapy.</string>
 	<string name="traffic_outdated">Dane o ruchu są przestarzałe.</string>
-	<string name="big_font">Większe etykiety</string>
+	<string name="big_font">Powiększ rozmiar czcionki na mapie</string>
 	<string name="traffic_update_app">Zaktualizuj MAPS.ME</string>
 	<!-- "traffic" as in road congestion -->
 	<string name="traffic_update_app_message">Aby wyświetlić dane o ruchu, należy zaktualizować aplikację.</string>
@@ -1047,4 +1047,10 @@
 	<string name="whatsnew_font_size">Rozmiar czcionki</string>
 	<!-- january -->
 	<string name="whatsnew_font_size_text">Etykiety na mapie dają się powiększyć.</string>
+	<!-- Seven points and higher -->
+	<string name="booking_filter_rating_num_good">7,0+</string>
+	<!-- Eight points and higher -->
+	<string name="booking_filter_rating_num_very_good">8,0+</string>
+	<!-- Nine points and higher -->
+	<string name="booking_filter_rating_num_excellent">9,0+</string>
 </resources>

android/res/values-pt/strings.xml

@@ -379,6 +379,8 @@
 	<string name="follow_on_twitter">Seguir no Twitter</string>
 	<!-- Text in menu -->
 	<string name="contact_us">Contacte-nos</string>
+	<!-- Settings: Send feedback button and dialog title -->
+	<string name="feedback">Comentários</string>
 	<!-- Text in menu -->
 	<string name="subscribe_to_news">Subscreva as nossas notícias</string>
 	<!-- Text in menu -->
@@ -997,7 +999,7 @@
 	<string name="mobile_data_option_ask">Perguntar Sempre</string>
 	<string name="traffic_update_maps_text">Para ver os dados de tráfego, os mapas devem ser atualizados.</string>
 	<string name="traffic_outdated">Os dados sobre o tráfego estão desatualizados.</string>
-	<string name="big_font">Etiquetas maiores</string>
+	<string name="big_font">Aumentar tamanho da fonte no mapa</string>
 	<string name="traffic_update_app">Atualize o MAPS. ME</string>
 	<!-- "traffic" as in road congestion -->
 	<string name="traffic_update_app_message">Para mostrar os dados de tráfego, a aplicação deve ser atualizada.</string>
@@ -1039,4 +1041,10 @@
 	<string name="whatsnew_font_size">Tamanho da Fonte</string>
 	<!-- january -->
 	<string name="whatsnew_font_size_text">É possível aumentar o tamanho das letras do mapa.</string>
+	<!-- Seven points and higher -->
+	<string name="booking_filter_rating_num_good">7.0+</string>
+	<!-- Eight points and higher -->
+	<string name="booking_filter_rating_num_very_good">8.0+</string>
+	<!-- Nine points and higher -->
+	<string name="booking_filter_rating_num_excellent">9.0+</string>
 </resources>

android/res/values-ro/strings.xml

@@ -378,6 +378,8 @@
 	<string name="follow_on_twitter">Urmăriți-ne pe Twitter</string>
 	<!-- Text in menu -->
 	<string name="contact_us">Contactați-ne</string>
+	<!-- Settings: Send feedback button and dialog title -->
+	<string name="feedback">Feedback</string>
 	<!-- Text in menu -->
 	<string name="subscribe_to_news">Abonați-vă la știrile noastre</string>
 	<!-- Text in menu -->
@@ -994,7 +996,7 @@
 	<string name="mobile_data_option_ask">Întrebați întotdeauna</string>
 	<string name="traffic_update_maps_text">Pentru a afişa datele privind traficul, hărțile trebuie actualizate.</string>
 	<string name="traffic_outdated">Datele privind traficul sunt învechite.</string>
-	<string name="big_font">Etichete mai mari</string>
+	<string name="big_font">Măriți dimensiunea fontului pe hartă</string>
 	<string name="traffic_update_app">Vă rugăm să actualizaţi MAPS.ME</string>
 	<!-- "traffic" as in road congestion -->
 	<string name="traffic_update_app_message">Pentru a afişa datele privind traficul, aplicația trebuie actualizată.</string>
@@ -1036,4 +1038,10 @@
 	<string name="whatsnew_font_size">Dimensiunea fontului</string>
 	<!-- january -->
 	<string name="whatsnew_font_size_text">Etichetele de pe hartă pot fi făcute mai mari.</string>
+	<!-- Seven points and higher -->
+	<string name="booking_filter_rating_num_good">7.0+</string>
+	<!-- Eight points and higher -->
+	<string name="booking_filter_rating_num_very_good">8.0+</string>
+	<!-- Nine points and higher -->
+	<string name="booking_filter_rating_num_excellent">9.0+</string>
 </resources>

android/res/values-ru/strings.xml

@@ -1017,7 +1017,7 @@
 	<string name="mobile_data_option_ask">Всегда спрашивать</string>
 	<string name="traffic_update_maps_text">Для отображения пробок необходимо обновить карты.</string>
 	<string name="traffic_outdated">Данные о пробках устарели.</string>
-	<string name="big_font">Увеличенные подписи</string>
+	<string name="big_font">Увеличить шрифт на карте</string>
 	<string name="traffic_update_app">Обновите MAPS.ME</string>
 	<!-- "traffic" as in road congestion -->
 	<string name="traffic_update_app_message">Для отображения пробок необходимо обновить приложение.</string>
@@ -1059,4 +1059,10 @@
 	<string name="whatsnew_font_size">Размер шрифта</string>
 	<!-- january -->
 	<string name="whatsnew_font_size_text">Названия объектов на карте теперь можно сделать крупнее.</string>
+	<!-- Seven points and higher -->
+	<string name="booking_filter_rating_num_good">7.0+</string>
+	<!-- Eight points and higher -->
+	<string name="booking_filter_rating_num_very_good">8.0+</string>
+	<!-- Nine points and higher -->
+	<string name="booking_filter_rating_num_excellent">9.0+</string>
 </resources>

android/res/values-sk/strings.xml

@@ -385,6 +385,8 @@
 	<string name="follow_on_twitter">Sledovať na Twitteri</string>
 	<!-- Text in menu -->
 	<string name="contact_us">Kontaktovať nás</string>
+	<!-- Settings: Send feedback button and dialog title -->
+	<string name="feedback">Spätná väzba</string>
 	<!-- Text in menu -->
 	<string name="subscribe_to_news">Prihlásiť sa k našim novinkám</string>
 	<!-- Text in menu -->
@@ -1001,7 +1003,7 @@
 	<string name="mobile_data_option_ask">Vždy sa opýtať</string>
 	<string name="traffic_update_maps_text">Na zobrazenie dopravných informácií je potrebné aktualizovať mapy.</string>
 	<string name="traffic_outdated">Dopravné informácie sú neaktuálne.</string>
-	<string name="big_font">Väčšie nápisy</string>
+	<string name="big_font">Zväčšiť veľkosť písma na mape</string>
 	<string name="traffic_update_app">Aktualizujte si aplikáciu MAPS.ME</string>
 	<!-- "traffic" as in road congestion -->
 	<string name="traffic_update_app_message">Ak chcete zobraziť dopravné informácie, musíte si aktualizovať aplikáciu.</string>
@@ -1043,4 +1045,10 @@
 	<string name="whatsnew_font_size">Veľkosť písma</string>
 	<!-- january -->
 	<string name="whatsnew_font_size_text">Nápisy na mape je možné zväčšiť.</string>
+	<!-- Seven points and higher -->
+	<string name="booking_filter_rating_num_good">7,0 a viac</string>
+	<!-- Eight points and higher -->
+	<string name="booking_filter_rating_num_very_good">8,0 a viac</string>
+	<!-- Nine points and higher -->
+	<string name="booking_filter_rating_num_excellent">9,0 a viac</string>
 </resources>

android/res/values-sv/strings.xml

@@ -386,6 +386,8 @@
 	<string name="follow_on_twitter">Följ på Twitter</string>
 	<!-- Text in menu -->
 	<string name="contact_us">Kontakta oss</string>
+	<!-- Settings: Send feedback button and dialog title -->
+	<string name="feedback">Feedback</string>
 	<!-- Text in menu -->
 	<string name="subscribe_to_news">Prenumerera på våra nyheter</string>
 	<!-- Text in menu -->
@@ -1002,7 +1004,7 @@
 	<string name="mobile_data_option_ask">Fråga alltid</string>
 	<string name="traffic_update_maps_text">Kartor måste uppdateras för att visa trafikdata.</string>
 	<string name="traffic_outdated">Trafikdata är inaktuellt.</string>
-	<string name="big_font">Större etiketter</string>
+	<string name="big_font">Öka teckenstorlek på kartan</string>
 	<string name="traffic_update_app">Uppdatera MAPS.ME</string>
 	<!-- "traffic" as in road congestion -->
 	<string name="traffic_update_app_message">Applikationen måste uppdateras för att trafikdata ska kunna visas.</string>
@@ -1044,4 +1046,10 @@
 	<string name="whatsnew_font_size">Teckenstorlek</string>
 	<!-- january -->
 	<string name="whatsnew_font_size_text">Etiketter på kartan kan göras större.</string>
+	<!-- Seven points and higher -->
+	<string name="booking_filter_rating_num_good">7,0+</string>
+	<!-- Eight points and higher -->
+	<string name="booking_filter_rating_num_very_good">8,0+</string>
+	<!-- Nine points and higher -->
+	<string name="booking_filter_rating_num_excellent">9,0+</string>
 </resources>

android/res/values-th/strings.xml

@@ -386,6 +386,8 @@
 	<string name="follow_on_twitter">ติดตามบน Twitter</string>
 	<!-- Text in menu -->
 	<string name="contact_us">ติดต่อเรา</string>
+	<!-- Settings: Send feedback button and dialog title -->
+	<string name="feedback">ข้อเสนอแนะ</string>
 	<!-- Text in menu -->
 	<string name="subscribe_to_news">สมัครรับข่าวของเรา</string>
 	<!-- Text in menu -->
@@ -1004,7 +1006,7 @@
 	<string name="mobile_data_option_ask">ถามก่อนเสมอ</string>
 	<string name="traffic_update_maps_text">ต้องอัปเดตแผนที่เพื่อแสดงข้อมูลการจราจร</string>
 	<string name="traffic_outdated">ข้อมูลการจราจรเก่าเกินไปแล้ว</string>
-	<string name="big_font">ป้ายใหญ่ขึ้น</string>
+	<string name="big_font">เพิ่มขนาดฟอนต์บนแผนที่</string>
 	<string name="traffic_update_app">กรุณาอัปเดต MAPS.ME</string>
 	<!-- "traffic" as in road congestion -->
 	<string name="traffic_update_app_message">ในการแสดงข้อมูลการจราจร แอปพลิเคชั่นจะต้องอัปเดตก่อน</string>
@@ -1046,4 +1048,10 @@
 	<string name="whatsnew_font_size">ขนาดฟอนต์</string>
 	<!-- january -->
 	<string name="whatsnew_font_size_text">ป้ายบนแผนที่สามารถทำให้ใหญ่ขึ้นได้</string>
+	<!-- Seven points and higher -->
+	<string name="booking_filter_rating_num_good">7.0+</string>
+	<!-- Eight points and higher -->
+	<string name="booking_filter_rating_num_very_good">8.0+</string>
+	<!-- Nine points and higher -->
+	<string name="booking_filter_rating_num_excellent">9.0+</string>
 </resources>

android/res/values-tr/strings.xml

@@ -386,6 +386,8 @@
 	<string name="follow_on_twitter">Twitter\&#39;da takip et</string>
 	<!-- Text in menu -->
 	<string name="contact_us">İletişim</string>
+	<!-- Settings: Send feedback button and dialog title -->
+	<string name="feedback">Geri Bildirim</string>
 	<!-- Text in menu -->
 	<string name="subscribe_to_news">Haberlerimize abone ol</string>
 	<!-- Text in menu -->
@@ -1004,7 +1006,7 @@
 	<string name="mobile_data_option_ask">Her Zaman Sor</string>
 	<string name="traffic_update_maps_text">Trafik verilerini görüntülemek için haritaların güncellenmesi gerekiyor.</string>
 	<string name="traffic_outdated">Trafik verileri güncel değil.</string>
-	<string name="big_font">Daha büyük etiketler</string>
+	<string name="big_font">Harita üzerindeki yazı tipi boyutunu artır</string>
 	<string name="traffic_update_app">Lütfen MAPS.ME uygulamasını güncelleyin</string>
 	<!-- "traffic" as in road congestion -->
 	<string name="traffic_update_app_message">Trafik verilerini görüntülemek için uygulamanın güncellenmesi gerekiyor.</string>
@@ -1046,4 +1048,10 @@
 	<string name="whatsnew_font_size">Yazı Tipi Boyutu</string>
 	<!-- january -->
 	<string name="whatsnew_font_size_text">Harita üzerindeki etiketler daha büyük hale getirilebilir.</string>
+	<!-- Seven points and higher -->
+	<string name="booking_filter_rating_num_good">7.0+</string>
+	<!-- Eight points and higher -->
+	<string name="booking_filter_rating_num_very_good">8.0+</string>
+	<!-- Nine points and higher -->
+	<string name="booking_filter_rating_num_excellent">9.0+</string>
 </resources>

android/res/values-uk/strings.xml

@@ -384,6 +384,8 @@
 	<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>
 	<!-- Text in menu -->
 	<string name="subscribe_to_news">Email-бюлетень</string>
 	<!-- Text in menu -->
@@ -1002,7 +1004,7 @@
 	<string name="mobile_data_option_ask">Завжди питати</string>
 	<string name="traffic_update_maps_text">Для відображення інформації про трафік необхідно оновити карти.</string>
 	<string name="traffic_outdated">Дані про трафік застаріли.</string>
-	<string name="big_font">Більші написи</string>
+	<string name="big_font">Збільшити розмір шрифту на карті</string>
 	<string name="traffic_update_app">Будь ласка, встановіть оновлення MAPS.ME</string>
 	<!-- "traffic" as in road congestion -->
 	<string name="traffic_update_app_message">Для відображення даних про трафік оновіть додаток.</string>
@@ -1044,4 +1046,10 @@
 	<string name="whatsnew_font_size">Розмір шрифту</string>
 	<!-- january -->
 	<string name="whatsnew_font_size_text">Можливість збільшення розміру написів на карті.</string>
+	<!-- Seven points and higher -->
+	<string name="booking_filter_rating_num_good">7,0+</string>
+	<!-- Eight points and higher -->
+	<string name="booking_filter_rating_num_very_good">8,0+</string>
+	<!-- Nine points and higher -->
+	<string name="booking_filter_rating_num_excellent">9,0+</string>
 </resources>

android/res/values-vi/strings.xml

@@ -380,6 +380,8 @@
 	<string name="follow_on_twitter">Theo dõi trên Twitter</string>
 	<!-- Text in menu -->
 	<string name="contact_us">Liên hệ với chúng tôi</string>
+	<!-- Settings: Send feedback button and dialog title -->
+	<string name="feedback">Phản hồi</string>
 	<!-- Text in menu -->
 	<string name="subscribe_to_news">Đăng ký nhận tin tức của chúng tôi</string>
 	<!-- Text in menu -->
@@ -998,7 +1000,7 @@
 	<string name="mobile_data_option_ask">Luôn Hỏi</string>
 	<string name="traffic_update_maps_text">Để hiển thị dữ liệu giao thông, cần cập nhật bản đồ.</string>
 	<string name="traffic_outdated">Dữ liệu giao thông đã lỗi thời.</string>
-	<string name="big_font">Nhãn mác to hơn</string>
+	<string name="big_font">Tăng kích cỡ phông chữ trên bản đồ</string>
 	<string name="traffic_update_app">Vui lòng cập nhật MAPS.ME</string>
 	<!-- "traffic" as in road congestion -->
 	<string name="traffic_update_app_message">Để hiển thị dữ liệu giao thông, ứng dụng cần phải được cập nhật.</string>
@@ -1040,4 +1042,10 @@
 	<string name="whatsnew_font_size">Kích cỡ Phông chữ</string>
 	<!-- january -->
 	<string name="whatsnew_font_size_text">Các nhãn mác trên bản đồ có thể được phóng to hơn.</string>
+	<!-- Seven points and higher -->
+	<string name="booking_filter_rating_num_good">7.0+</string>
+	<!-- Eight points and higher -->
+	<string name="booking_filter_rating_num_very_good">8.0+</string>
+	<!-- Nine points and higher -->
+	<string name="booking_filter_rating_num_excellent">9.0+</string>
 </resources>

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

@@ -390,6 +390,8 @@
 	<string name="follow_on_twitter">在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 -->
@@ -1010,7 +1012,7 @@
 	<string name="mobile_data_option_ask">一律詢問</string>
 	<string name="traffic_update_maps_text">若要顯示交通資料，必須更新地圖。</string>
 	<string name="traffic_outdated">交通資料已過時。</string>
-	<string name="big_font">更大的標籤</string>
+	<string name="big_font">增加地圖上的字體大小</string>
 	<string name="traffic_update_app">請更新 MAPS.ME</string>
 	<!-- "traffic" as in road congestion -->
 	<string name="traffic_update_app_message">若要顯示交通資訊，必須更新應用程式。</string>
@@ -1052,4 +1054,10 @@
 	<string name="whatsnew_font_size">字型大小</string>
 	<!-- january -->
 	<string name="whatsnew_font_size_text">可將地圖上的標籤變大。</string>
+	<!-- Seven points and higher -->
+	<string name="booking_filter_rating_num_good">7.0+</string>
+	<!-- Eight points and higher -->
+	<string name="booking_filter_rating_num_very_good">8.0+</string>
+	<!-- Nine points and higher -->
+	<string name="booking_filter_rating_num_excellent">9.0+</string>
 </resources>

android/res/values-zh/strings.xml

@@ -388,6 +388,8 @@
 	<string name="follow_on_twitter">在Twitter 上关注</string>
 	<!-- Text in menu -->
 	<string name="contact_us">联系我们</string>
+	<!-- Settings: Send feedback button and dialog title -->
+	<string name="feedback">反馈</string>
 	<!-- Text in menu -->
 	<string name="subscribe_to_news">订阅我们的新闻</string>
 	<!-- Text in menu -->
@@ -1004,7 +1006,7 @@
 	<string name="mobile_data_option_ask">总是询问</string>
 	<string name="traffic_update_maps_text">要显示交通数据，必须更新地图。</string>
 	<string name="traffic_outdated">交通数据已过时。</string>
-	<string name="big_font">更大的标签</string>
+	<string name="big_font">增大地图上的字体大小</string>
 	<string name="traffic_update_app">请更新 MAPS.ME</string>
 	<!-- "traffic" as in road congestion -->
 	<string name="traffic_update_app_message">要显示交通数据，必须更新应用。</string>
@@ -1046,4 +1048,10 @@
 	<string name="whatsnew_font_size">字体大小</string>
 	<!-- january -->
 	<string name="whatsnew_font_size_text">可以增大地图上的标签。</string>
+	<!-- Seven points and higher -->
+	<string name="booking_filter_rating_num_good">7.0+</string>
+	<!-- Eight points and higher -->
+	<string name="booking_filter_rating_num_very_good">8.0+</string>
+	<!-- Nine points and higher -->
+	<string name="booking_filter_rating_num_excellent">9.0+</string>
 </resources>

android/res/values/arrays.xml

@@ -29,38 +29,32 @@
 
   <!-- What's new -->
   <integer-array name="news_images">
-    <item>@drawable/img_whatsnew_traffic</item>
-    <item>@drawable/img_whatsnew_traffic_roaming</item>
-    <item>@drawable/img_whatsnew_update_uber</item>
+    <item>@drawable/ic_whatsnew_filter</item>
+    <item>@drawable/ic_whatsnew_label</item>
   </integer-array>
 
   <string-array name="news_titles">
-    <item>@string/whatsnew_traffic</item>
-    <item>@string/whatsnew_traffic_roaming</item>
-    <item>@string/whatsnew_order_taxi</item>
+    <item>@string/whatsnew_filters_in_search</item>
+    <item>@string/whatsnew_font_size</item>
   </string-array>
 
   <string-array name="news_messages_1">
-    <item>@string/whatsnew_traffic_text</item>
-    <item>@string/whatsnew_traffic_roaming_text</item>
-    <item>@string/whatsnew_order_taxi_text</item>
+    <item>@string/whatsnew_filters_in_search_text</item>
+    <item>@string/whatsnew_font_size_text</item>
   </string-array>
 
   <string-array name="news_messages_2">
     <item/>
     <item/>
-    <item/>
   </string-array>
 
   <string-array name="news_switch_titles">
     <item/>
     <item/>
-    <item/>
   </string-array>
 
   <string-array name="news_switch_subtitles">
     <item/>
     <item/>
-    <item/>
   </string-array>
 </resources>

android/res/values/integer.xml

@@ -5,4 +5,7 @@
   <integer name="pp_hotel_description_lines">5</integer>
 
   <integer name="sharing_initial_rows">2</integer>
+
+  <integer name="search_fade_in_anim_time">200</integer>
+  <integer name="search_fade_out_anim_time">150</integer>
 </resources>

android/res/values/strings.xml

@@ -1021,7 +1021,7 @@
 	<string name="mobile_data_option_ask">Always Ask</string>
 	<string name="traffic_update_maps_text">To display traffic data, maps must be updated.</string>
 	<string name="traffic_outdated">Traffic data is outdated.</string>
-	<string name="big_font">Bigger labels</string>
+	<string name="big_font">Increase font size on the map</string>
 	<string name="traffic_update_app">Please update MAPS.ME</string>
 	<!-- "traffic" as in road congestion -->
 	<string name="traffic_update_app_message">To display traffic data, the application must be updated.</string>
@@ -1065,8 +1065,11 @@
 	<string name="whatsnew_font_size_text">Labels on the map can be made bigger.</string>
 	<!-- "Translation is no needed, because it's a company name" -->
 	<string name="uber">Uber</string>
+	<!-- Seven points and higher -->
 	<string name="booking_filter_rating_num_good">7.0+</string>
+	<!-- Eight points and higher -->
 	<string name="booking_filter_rating_num_very_good">8.0+</string>
+	<!-- Nine points and higher -->
 	<string name="booking_filter_rating_num_excellent">9.0+</string>
 	<string name="booking_filter_price_low">$</string>
 	<string name="booking_filter_price_medium">$$</string>

android/res/values/themes-attrs.xml

@@ -71,9 +71,9 @@
     <attr name="bannerBackground" format="color"/>
 
     <attr name="steadyIconTint" format="color"/>
-    <attr name="steadyIconBackground" format="color"/>
+    <attr name="steadyIconBackground" format="reference"/>
     <attr name="activeIconTint" format="color"/>
-    <attr name="activeIconBackground" format="color"/>
+    <attr name="activeIconBackground" format="reference"/>
   </declare-styleable>
 
   <declare-styleable name="ThemeAttrs.NavButtons">

android/res/values/themes-base.xml

@@ -87,9 +87,9 @@
     <item name="bannerBackground">@color/bg_banner_color</item>
 
     <item name="steadyIconTint">@color/black_secondary</item>
-    <item name="steadyIconBackground">@color/black_8</item>
+    <item name="steadyIconBackground">@drawable/bg_steady_icon</item>
     <item name="activeIconTint">@color/bg_cards</item>
-    <item name="activeIconBackground">?colorAccent</item>
+    <item name="activeIconBackground">@drawable/bg_active_icon</item>
   </style>
 
   <!-- Night theme -->
@@ -180,7 +180,8 @@
     <item name="bannerBackground">@color/bg_banner_color_night</item>
 
     <item name="steadyIconTint">@color/white_secondary</item>
-    <item name="steadyIconBackground">@color/white_8</item>
+    <item name="steadyIconBackground">@drawable/bg_steady_icon_night</item>
     <item name="activeIconTint">@color/bg_cards_night</item>
+    <item name="activeIconBackground">@drawable/bg_active_icon_night</item>
   </style>
 </resources>

android/res/xml-v21/prefs_map.xml

@@ -37,17 +37,25 @@
     android:switchTextOff=""
     android:order="5"/>
 
+  <SwitchPreference
+    android:key="@string/pref_large_fonts_size"
+    android:title="@string/big_font"
+    android:defaultValue="false"
+    android:switchTextOff=""
+    android:switchTextOn=""
+    android:order="6"/>
+
   <SwitchPreference
     android:key="@string/pref_3d_buildings"
     android:title="@string/pref_map_3d_buildings_title"
     android:switchTextOn=""
     android:switchTextOff=""
-    android:order="6"/>
+    android:order="7"/>
 
   <ListPreference
     android:key="@string/pref_track_record"
     android:title="@string/pref_track_record_title"
     android:entries="@array/track_length"
     android:entryValues="@array/track_length_values"
-    android:order="7"/>
+    android:order="8"/>
 </PreferenceScreen>

android/res/xml-v21/prefs_misc.xml

@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen
   xmlns:android="http://schemas.android.com/apk/res/android">
-  <SwitchPreference
-    android:key="@string/pref_large_fonts_size"
-    android:title="@string/big_font"
-    android:defaultValue="false"
-    android:switchTextOff=""
-    android:switchTextOn=""/>
 
   <SwitchPreference
     android:key="@string/pref_showcase_switched_on"

android/res/xml/prefs_map.xml

@@ -33,15 +33,21 @@
     android:title="@string/autodownload"
     android:order="5"/>
 
+  <CheckBoxPreference
+    android:key="@string/pref_large_fonts_size"
+    android:title="@string/big_font"
+    android:defaultValue="false"
+    android:order="6"/>
+
   <CheckBoxPreference
     android:key="@string/pref_3d_buildings"
     android:title="@string/pref_map_3d_buildings_title"
-    android:order="6"/>
+    android:order="7"/>
 
   <ListPreference
     android:key="@string/pref_track_record"
     android:title="@string/pref_track_record_title"
     android:entries="@array/track_length"
     android:entryValues="@array/track_length_values"
-    android:order="7"/>
+    android:order="8"/>
 </PreferenceScreen>

android/res/xml/prefs_misc.xml

@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen
   xmlns:android="http://schemas.android.com/apk/res/android">
-  <CheckBoxPreference
-    android:key="@string/pref_large_fonts_size"
-    android:title="@string/big_font"
-    android:defaultValue="false"/>
 
   <CheckBoxPreference
     android:key="@string/pref_showcase_switched_on"