From 1314c10e235b5b72512de489943e4b091fb3e748 Mon Sep 17 00:00:00 2001
From: Dmitry Donskoy <donskdmitry@mail.ru>
Date: Thu, 9 Aug 2018 21:27:12 +0300
Subject: [PATCH] [android] Fixed title subtitle layout placepage

---
 android/res/layout/place_page_preview.xml | 96 +++++++++++------------
 1 file changed, 44 insertions(+), 52 deletions(-)

diff --git a/android/res/layout/place_page_preview.xml b/android/res/layout/place_page_preview.xml
index 744b4247d8..dd3044b693 100644
--- a/android/res/layout/place_page_preview.xml
+++ b/android/res/layout/place_page_preview.xml
@@ -19,10 +19,12 @@
     android:visibility="gone"
     tools:visibility="visible"/>
 
-  <TextView
-    android:id="@+id/tv__title"
-    android:layout_width="match_parent"
+
+  <LinearLayout
+    android:id="@+id/title_container"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    android:orientation="vertical"
     android:layout_alignWithParentIfMissing="true"
     android:layout_marginTop="@dimen/margin_quarter"
     android:layout_marginEnd="@dimen/margin_base"
@@ -31,55 +33,45 @@
     android:layout_marginLeft="@dimen/margin_base"
     android:layout_toEndOf="@id/downloader_status_frame"
     android:layout_toRightOf="@id/downloader_status_frame"
-    android:layout_toLeftOf="@+id/direction_frame"
-    android:layout_toStartOf="@+id/direction_frame"
-    android:ellipsize="end"
-    android:fontFamily="@string/robotoMedium"
-    android:maxLines="@integer/pp_title_lines"
-    android:textAppearance="@style/MwmTextAppearance.Title"
-    tools:background="#C0800000"
-    tools:ignore="UnusedAttribute"
-    tools:text="Title"/>
-
-  <TextView
-    android:id="@+id/tv__secondary_title"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_below="@id/tv__title"
-    android:layout_alignWithParentIfMissing="true"
-    android:layout_marginTop="@dimen/margin_quarter"
-    android:layout_marginEnd="@dimen/margin_base"
-    android:layout_marginRight="@dimen/margin_base"
-    android:layout_alignLeft="@id/tv__title"
-    android:layout_alignStart="@id/tv__title"
     android:layout_toLeftOf="@id/direction_frame"
-    android:layout_toStartOf="@id/direction_frame"
-    android:ellipsize="end"
-    android:fontFamily="@string/robotoMedium"
-    android:maxLines="@integer/pp_title_lines"
-    android:textAppearance="@style/MwmTextAppearance.Body1"
-    tools:background="#C0800000"
-    tools:ignore="UnusedAttribute"
-    tools:text="Secondary Title"/>
+    android:layout_toStartOf="@id/direction_frame">
+    <TextView
+      android:id="@+id/tv__title"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:ellipsize="end"
+      android:fontFamily="@string/robotoMedium"
+      android:maxLines="@integer/pp_title_lines"
+      android:textAppearance="@style/MwmTextAppearance.Title"
+      tools:background="#C0800000"
+      tools:ignore="UnusedAttribute"
+      tools:text="Title"/>
 
-  <TextView
-    android:id="@+id/tv__subtitle"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_alignWithParentIfMissing="true"
-    android:layout_below="@id/tv__secondary_title"
-    android:layout_marginTop="@dimen/margin_quarter"
-    android:layout_marginStart="@dimen/margin_base"
-    android:layout_marginLeft="@dimen/margin_base"
-    android:layout_toEndOf="@id/downloader_status_frame"
-    android:layout_toRightOf="@id/downloader_status_frame"
-    android:layout_toLeftOf="@id/direction_frame"
-    android:layout_toStartOf="@id/direction_frame"
-    android:lines="1"
-    android:textAppearance="@style/MwmTextAppearance.Body3"
-    android:ellipsize="end"
-    tools:background="#300000F0"
-    tools:text="Subtitle, very very very very very very very long"/>
+    <TextView
+      android:id="@+id/tv__secondary_title"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="@dimen/margin_quarter"
+      android:ellipsize="end"
+      android:fontFamily="@string/robotoMedium"
+      android:maxLines="@integer/pp_title_lines"
+      android:textAppearance="@style/MwmTextAppearance.Body1"
+      tools:background="#C0800000"
+      tools:ignore="UnusedAttribute"
+      tools:text="Secondary Title"/>
+
+
+    <TextView
+      android:id="@+id/tv__subtitle"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="@dimen/margin_quarter"
+      android:lines="1"
+      android:textAppearance="@style/MwmTextAppearance.Body3"
+      android:ellipsize="end"
+      tools:background="#300000F0"
+      tools:text="Subtitle, very very very very very very very long"/>
+  </LinearLayout>
 
   <com.mapswithme.maps.widget.RatingView
     android:id="@+id/popular_rating_view"
@@ -112,7 +104,7 @@
     android:layout_alignParentEnd="true"
     android:layout_alignParentRight="true"
     android:layout_alignWithParentIfMissing="true"
-    android:layout_alignBottom="@id/tv__subtitle"
+    android:layout_alignBottom="@id/title_container"
     android:background="?selectableItemBackground"
     android:layout_below="@id/popular_rating_view"
     android:gravity="bottom"
@@ -143,7 +135,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_alignWithParentIfMissing="true"
-    android:layout_below="@id/tv__subtitle"
+    android:layout_below="@id/title_container"
     android:layout_marginTop="@dimen/margin_quarter"
     android:layout_marginEnd="@dimen/margin_base"
     android:layout_marginRight="@dimen/margin_base"