From e711ee3f1298632599b239ad612a64e07f6443a6 Mon Sep 17 00:00:00 2001
From: Dmitry Yunitsky <yunik@mapswithme.com>
Date: Thu, 17 Mar 2016 18:43:09 +0300
Subject: [PATCH] [android] Adaptation of menu on tablets.

---
 android/res/layout-w600dp-port/place_page_details.xml |  4 ++++
 android/res/layout-w840dp/menu_buttons_line.xml       |  7 ++++++-
 android/res/layout/menu_buttons_line.xml              |  2 +-
 android/res/layout/menu_content_grid.xml              |  2 --
 android/res/layout/place_page_opening_hours.xml       | 10 ++--------
 android/res/layout/place_page_report_problem.xml      |  1 +
 6 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/android/res/layout-w600dp-port/place_page_details.xml b/android/res/layout-w600dp-port/place_page_details.xml
index 0168dfa4b4..4e37a27ecc 100644
--- a/android/res/layout-w600dp-port/place_page_details.xml
+++ b/android/res/layout-w600dp-port/place_page_details.xml
@@ -42,6 +42,7 @@
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:layout_toLeftOf="@id/anchor_center"
+          android:layout_toStartOf="@id/anchor_center"
           android:orientation="vertical">
           <include layout="@layout/place_page_placename"/>
 
@@ -54,12 +55,15 @@
           <include layout="@layout/place_page_wiki"/>
 
           <include layout="@layout/place_page_editor"/>
+
+          <include layout="@layout/place_page_report_problem"/>
         </LinearLayout>
 
         <LinearLayout
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:layout_toRightOf="@id/anchor_center"
+          android:layout_toEndOf="@id/anchor_center"
           android:orientation="vertical">
           <include layout="@layout/place_page_email"/>
 
diff --git a/android/res/layout-w840dp/menu_buttons_line.xml b/android/res/layout-w840dp/menu_buttons_line.xml
index d307e32955..293ebed500 100644
--- a/android/res/layout-w840dp/menu_buttons_line.xml
+++ b/android/res/layout-w840dp/menu_buttons_line.xml
@@ -11,7 +11,7 @@
   <!-- Fake view to make layout symmetrical -->
   <Space
     android:id="@+id/symmetrical_gap"
-    android:layout_width="@dimen/menu_line_button_width"
+    android:layout_width="160dp"
     android:layout_height="match_parent"/>
 
   <!-- Anchor ID. Disables menu toggle button if present. -->
@@ -51,6 +51,11 @@
     android:layout_height="match_parent"
     android:layout_weight="1"/>
 
+  <ImageView
+    android:id="@+id/add_place"
+    style="@style/MwmTheme.Menu.Line.Button"
+    android:src="@drawable/ic_plus"/>
+
   <FrameLayout
     android:layout_width="wrap_content"
     android:layout_height="match_parent">
diff --git a/android/res/layout/menu_buttons_line.xml b/android/res/layout/menu_buttons_line.xml
index 7c02e12348..5c478ab592 100644
--- a/android/res/layout/menu_buttons_line.xml
+++ b/android/res/layout/menu_buttons_line.xml
@@ -61,7 +61,7 @@
   <FrameLayout
     android:layout_width="@dimen/menu_line_button_width_edge"
     android:layout_height="match_parent"
-    android:layout_gravity="right">
+    android:layout_gravity="end">
     <include layout="@layout/menu_news_marker"/>
   </FrameLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/android/res/layout/menu_content_grid.xml b/android/res/layout/menu_content_grid.xml
index 2d3f7111bd..eb9ad6c701 100644
--- a/android/res/layout/menu_content_grid.xml
+++ b/android/res/layout/menu_content_grid.xml
@@ -7,7 +7,6 @@
   android:orientation="horizontal"
   tools:background="#200000F0">
 
-  <!-- TODO check if button fits on narrow screens (eg nexus 7)-->
   <TextView
     android:id="@+id/add_place"
     style="@style/MwmTheme.Menu.Content.GridItem.Text"
@@ -66,7 +65,6 @@
     android:text="@string/share_my_location"
     tools:background="#200000FF"/>
 
-  <!-- TODO check if button fits on narrow screens (eg nexus 7)-->
   <TextView
     android:id="@+id/showcase"
     style="@style/MwmTheme.Menu.Content.GridItem.Text"
diff --git a/android/res/layout/place_page_opening_hours.xml b/android/res/layout/place_page_opening_hours.xml
index ee97ad1144..a57bd0fb24 100644
--- a/android/res/layout/place_page_opening_hours.xml
+++ b/android/res/layout/place_page_opening_hours.xml
@@ -3,14 +3,8 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
   android:id="@+id/ll__place_schedule"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:background="?clickableBackground"
-  android:minHeight="@dimen/height_block_base"
-  android:paddingTop="@dimen/margin_half"
-  android:tag="schedule"
-  android:visibility="gone"
-  tools:visibility="visible">
+  style="@style/PlacePageItemFrame"
+  android:tag="schedule">
 
   <ImageView
     android:id="@+id/icon"
diff --git a/android/res/layout/place_page_report_problem.xml b/android/res/layout/place_page_report_problem.xml
index a1013faa82..1b63063bd9 100644
--- a/android/res/layout/place_page_report_problem.xml
+++ b/android/res/layout/place_page_report_problem.xml
@@ -4,6 +4,7 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:id="@+id/ll__report_problem"
   style="@style/PlacePageItemFrame"
+  android:visibility="visible"
   tools:visibility="visible">
 
   <ImageView