Layout fixes and optimizations.

4 files changed, 69 insertions, 288 deletions

diff --git a/android/res/layout-sw720dp/details_place_page.xml b/android/res/layout-sw720dp/details_place_page.xml
index f54b3febc3..9e525f7858 100644
--- a/android/res/layout-sw720dp/details_place_page.xml
+++ b/android/res/layout-sw720dp/details_place_page.xml
@@ -5,290 +5,6 @@
             android:background="@android:color/white"
             android:orientation="vertical">
 
-  <LinearLayout
-      android:id="@+id/rl__place_details"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:orientation="vertical"
-      android:padding="@dimen/margin_medium_and_half">
-
-    <LinearLayout
-        android:id="@+id/ll__place_name"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:visibility="gone">
-
-      <ImageView
-          android:id="@+id/iv__place_name"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_marginRight="@dimen/margin_large"
-          android:src="@drawable/ic_text_adress"/>
-
-      <TextView
-          android:id="@+id/tv__place_address"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:layout_toRightOf="@id/iv__place_name"
-          android:textColor="@color/text_place_page"
-          android:textSize="@dimen/place_page_subtitle"/>
-    </LinearLayout>
-
-
-    <LinearLayout
-        android:id="@+id/ll__place_phone"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_small"
-        android:background="?attr/clickableBackground"
-        android:orientation="horizontal"
-        android:paddingBottom="@dimen/margin_small"
-        android:paddingTop="@dimen/margin_small">
-
-      <ImageView
-          android:id="@+id/iv__place_phone"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_marginRight="@dimen/margin_large"
-          android:src="@drawable/ic_text_phone"/>
-
-      <TextView
-          android:id="@+id/tv__place_phone"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:textColor="@color/text_place_page_blue"
-          android:textSize="@dimen/place_page_subtitle"/>
-    </LinearLayout>
-
-
-    <LinearLayout
-        android:id="@+id/ll__place_website"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?attr/clickableBackground"
-        android:orientation="horizontal"
-        android:paddingBottom="@dimen/margin_small"
-        android:paddingTop="@dimen/margin_small">
-
-      <ImageView
-          android:id="@+id/iv__place_website"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_marginRight="@dimen/margin_large"
-          android:src="@drawable/ic_text_link"/>
-
-      <TextView
-          android:id="@+id/tv__place_website"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:textColor="@color/text_place_page_blue"
-          android:textSize="@dimen/place_page_subtitle"/>
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/ll__place_schedule"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?attr/clickableBackground"
-        android:orientation="horizontal"
-        android:paddingBottom="@dimen/margin_small"
-        android:paddingTop="@dimen/margin_small">
-
-      <ImageView
-          android:id="@+id/iv__place_schedule"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_marginRight="@dimen/margin_large"
-          android:src="@drawable/ic_text_worktime"/>
-
-      <TextView
-          android:id="@+id/tv__place_schedule"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:textColor="@color/text_place_page"
-          android:textSize="@dimen/place_page_subtitle"/>
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/ll__place_latlon"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?attr/clickableBackground"
-        android:orientation="horizontal"
-        android:paddingBottom="@dimen/margin_small"
-        android:paddingTop="@dimen/margin_small">
-
-      <ImageView
-          android:id="@+id/iv__place_latlon"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_marginRight="@dimen/margin_large"
-          android:src="@drawable/ic_text_position"/>
-
-      <TextView
-          android:id="@+id/tv__place_latlon"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:textColor="@color/text_place_page"
-          android:textSize="@dimen/place_page_subtitle"/>
-    </LinearLayout>
-
-
-    <LinearLayout
-        android:id="@+id/ll__place_wifi"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_medium"
-        android:orientation="horizontal">
-
-      <ImageView
-          android:id="@+id/iv__place_wifi"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_marginRight="@dimen/margin_large"
-          android:src="@drawable/ic_text_wifi"/>
-
-      <TextView
-          android:id="@+id/tv__place_wifi"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:textColor="@color/text_place_page"
-          android:textSize="@dimen/place_page_subtitle"/>
-    </LinearLayout>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1px"
-        android:layout_marginTop="@dimen/margin_medium_and_half"
-        android:background="?attr/dividerHorizontal"/>
-
-    <RelativeLayout
-        android:id="@+id/rl__bookmark_details"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_medium_and_half">
-
-      <ImageView
-          android:id="@+id/iv__bookmark"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_marginRight="@dimen/margin_large"
-          android:src="@drawable/ic_text_bookmark"/>
-
-      <TextView
-          android:id="@+id/tv__bookmark_title"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:layout_alignTop="@id/iv__bookmark"
-          android:layout_toRightOf="@id/iv__bookmark"
-          android:lineSpacingMultiplier="1.67"
-          android:text="@string/name"
-          android:textColor="@color/text_place_page_subtitle"
-          android:textSize="@dimen/place_page_sub_subtitle"/>
-
-      <EditText
-          android:id="@+id/et__bookmark_name"
-          style="@style/PlaceEditableParam"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:layout_below="@id/tv__bookmark_title"
-          android:layout_marginTop="@dimen/margin_tiny"
-          android:layout_toRightOf="@id/iv__bookmark"
-          android:hint="@string/name"
-          android:inputType="textCapWords"
-          android:lineSpacingMultiplier="1.43"
-          android:singleLine="true"
-          android:textColor="@color/text_place_page"
-          android:textSize="@dimen/place_page_subtitle"/>
-
-      <View
-          android:layout_width="match_parent"
-          android:layout_height="1px"
-          android:layout_below="@id/et__bookmark_name"
-          android:layout_marginTop="@dimen/margin_small"
-          android:background="?attr/dividerHorizontal"/>
-
-      <TextView
-          android:id="@+id/tv__bookmark_group_title"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:layout_below="@id/et__bookmark_name"
-          android:layout_marginTop="@dimen/margin_medium_and_half"
-          android:layout_toRightOf="@id/iv__bookmark"
-          android:lineSpacingMultiplier="1.67"
-          android:text="@string/set"
-          android:textColor="@color/text_place_page_subtitle"
-          android:textSize="@dimen/place_page_sub_subtitle"/>
-
-      <LinearLayout
-          android:id="@+id/ll__group"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:layout_below="@id/tv__bookmark_group_title"
-          android:layout_toRightOf="@id/iv__bookmark"
-          android:gravity="center_vertical"
-          android:orientation="horizontal">
-
-        <TextView
-            android:id="@+id/tv__bookmark_group"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:paddingTop="@dimen/margin_small"
-            android:paddingBottom="@dimen/margin_small"
-            android:paddingRight="@dimen/margin_small"
-            android:layout_weight="1"
-            android:drawableRight="@drawable/ic_arrow_down"
-            android:lineSpacingMultiplier="1.43"
-            android:background="?android:selectableItemBackground"
-            android:textColor="@color/text_place_page"
-            android:textSize="@dimen/place_page_subtitle"/>
-
-        <ImageView
-            android:id="@+id/iv__bookmark_color"
-            android:background="?android:selectableItemBackground"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="@dimen/margin_small"
-            android:layout_marginLeft="@dimen/margin_small"
-            android:src="@drawable/color_picker_red_on"/>
-      </LinearLayout>
-
-      <View
-          android:layout_width="match_parent"
-          android:layout_height="1px"
-          android:layout_below="@id/ll__group"
-          android:background="?android:attr/listDivider"/>
-
-      <TextView
-          android:id="@+id/tv__bookmark_notes_title"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:layout_below="@id/ll__group"
-          android:layout_marginTop="@dimen/margin_medium"
-          android:layout_toRightOf="@id/iv__bookmark"
-          android:lineSpacingMultiplier="1.67"
-          android:text="@string/description"
-          android:textColor="@color/text_place_page_subtitle"
-          android:textSize="@dimen/place_page_sub_subtitle"/>
-
-      <EditText
-          android:id="@+id/et__bookmark_notes"
-          style="@style/PlaceEditableParam"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:layout_below="@id/tv__bookmark_notes_title"
-          android:layout_marginTop="@dimen/margin_tiny"
-          android:layout_toRightOf="@id/iv__bookmark"
-          android:background="@null"
-          android:hint="Notes"
-          android:inputType="text"
-          android:lineSpacingMultiplier="1.43"
-          android:singleLine="true"
-          android:textColor="@color/text_place_page"
-          android:textSize="@dimen/place_page_subtitle"/>
-    </RelativeLayout>
-
-  </LinearLayout>
+  <include layout="@layout/details_huge"/>
 
 </ScrollView>
\ No newline at end of file
diff --git a/android/res/layout-sw720dp/map.xml b/android/res/layout-sw720dp/map.xml
index 97d5d6d107..c1609c592e 100644
--- a/android/res/layout-sw720dp/map.xml
+++ b/android/res/layout-sw720dp/map.xml
@@ -2,8 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 xmlns:placePage="http://schemas.android.com/apk/res-auto"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="bottom">
+                android:layout_height="match_parent">
 
   <android.view.SurfaceView
       android:id="@+id/map_surfaceview"
@@ -16,7 +15,7 @@
       android:id="@+id/info_box"
       android:layout_width="@dimen/panel_width"
       android:layout_height="wrap_content"
-      android:layout_below="@+id/toolbar_search"
+      android:background="@android:color/white"
       android:layout_margin="@dimen/margin_medium"
       placePage:animationType="leftTop"/>
 
diff --git a/android/res/layout-sw720dp/place_page.xml b/android/res/layout-sw720dp/place_page.xml
new file mode 100644
index 0000000000..9343f72fbd
--- /dev/null
+++ b/android/res/layout-sw720dp/place_page.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge>
+
+  <include layout="@layout/place_page_land"/>
+
+</merge>
\ No newline at end of file
diff --git a/android/res/layout-sw720dp/preview_place_page.xml b/android/res/layout-sw720dp/preview_place_page.xml
new file mode 100644
index 0000000000..4e14a347ec
--- /dev/null
+++ b/android/res/layout-sw720dp/preview_place_page.xml
@@ -0,0 +1,60 @@
+<?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="56dp"
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
+    android:paddingBottom="@dimen/margin_small_and_half"
+    android:paddingLeft="@dimen/margin_medium"
+    android:paddingRight="@dimen/margin_medium"
+    android:paddingTop="@dimen/margin_medium_and_half">
+
+  <RelativeLayout
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:layout_weight="1">
+
+    <TextView
+        android:id="@+id/tv__title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textColor="@color/text_place_page"
+        android:textSize="@dimen/place_page_title"/>
+
+    <TextView
+        android:id="@+id/tv__subtitle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/tv__title"
+        android:textColor="@color/text_place_page_subtitle"
+        android:textSize="@dimen/place_page_subtitle"/>
+
+    <TextView
+        android:id="@+id/tv__opened_till"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/tv__subtitle"
+        android:gravity="center_vertical"
+        android:textColor="@color/text_place_page_subtitle"
+        android:textSize="@dimen/place_page_subtitle"
+        android:visibility="gone"/>
+
+  </RelativeLayout>
+
+  <TextView
+      android:id="@+id/tv__straight_distance"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:textSize="@dimen/place_page_subtitle"/>
+
+  <com.mapswithme.maps.widget.ArrowView
+      android:id="@+id/av__direction"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:background="?attr/clickableBackground"
+      android:clickable="true"
+      android:padding="@dimen/margin_small"/>
+
+</LinearLayout>
+