From aad55a66e172db710dc60e1e263574e7a3245c6e Mon Sep 17 00:00:00 2001
From: Roman Romanov <rromanov@65gb.net>
Date: Wed, 3 May 2017 17:31:50 +0400
Subject: [PATCH] [android] Place Page layout fix

---
 .../res/layout-land/place_page_details.xml    | 40 +++++++++++++------
 android/res/layout/place_page_details.xml     | 23 ++++++++---
 android/res/layout/place_page_local_ad.xml    | 10 ++++-
 android/res/layout/place_page_more.xml        |  3 ++
 android/res/layout/place_page_taxi.xml        |  3 +-
 .../maps/widget/placepage/PlacePageView.java  |  4 +-
 6 files changed, 61 insertions(+), 22 deletions(-)

diff --git a/android/res/layout-land/place_page_details.xml b/android/res/layout-land/place_page_details.xml
index f78e857f07..e7e2704fb3 100644
--- a/android/res/layout-land/place_page_details.xml
+++ b/android/res/layout-land/place_page_details.xml
@@ -16,23 +16,30 @@
       android:layout_height="wrap_content"
       android:background="?windowBackgroundForced"
       android:orientation="vertical">
+
+      <include
+        android:id="@+id/banner"
+        layout="@layout/place_page_banner"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/placepage_banner_height"
+        android:visibility="gone"
+        tools:visibility="visible"/>
+
+      <include
+        layout="@layout/divider_horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginBottom="@dimen/margin_half"/>
+
+      <include
+        layout="@layout/divider_horizontal"/>
+
       <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="?ppBackground"
         android:orientation="vertical">
 
-        <include
-          android:id="@+id/banner"
-          layout="@layout/place_page_banner"
-          android:layout_width="match_parent"
-          android:layout_height="@dimen/placepage_banner_height"
-          android:visibility="gone"
-          tools:visibility="visible"/>
-
-        <include
-          layout="@layout/divider_horizontal"/>
-
         <include
           layout="@layout/place_page_bookmark_details"
           android:layout_width="match_parent"
@@ -74,14 +81,21 @@
 
         <include layout="@layout/divider_horizontal"/>
 
-        <include layout="@layout/place_page_taxi"/>
-
         <include layout="@layout/place_page_more"/>
 
         <include layout="@layout/place_page_local_ad"/>
 
       </LinearLayout>
 
+      <include
+        android:id="@+id/place_page_taxi_divider"
+        layout="@layout/divider_horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginTop="@dimen/margin_half"/>
+
+      <include layout="@layout/place_page_taxi"/>
+
       <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
diff --git a/android/res/layout/place_page_details.xml b/android/res/layout/place_page_details.xml
index b0287d099e..7ae16a4539 100644
--- a/android/res/layout/place_page_details.xml
+++ b/android/res/layout/place_page_details.xml
@@ -11,15 +11,21 @@
     android:background="?windowBackgroundForced"
     android:orientation="vertical">
 
+    <include
+      layout="@layout/divider_horizontal"
+      android:layout_width="match_parent"
+      android:layout_height="1dp"
+      android:layout_marginBottom="@dimen/margin_half"/>
+
+    <include
+      layout="@layout/divider_horizontal"/>
+
     <LinearLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:background="?ppBackground"
       android:orientation="vertical">
 
-      <include
-        layout="@layout/divider_horizontal"/>
-
       <include
         layout="@layout/place_page_bookmark_details"
         android:layout_width="match_parent"
@@ -61,13 +67,20 @@
 
       <include layout="@layout/divider_horizontal"/>
 
-      <include layout="@layout/place_page_taxi"/>
-
       <include layout="@layout/place_page_more"/>
 
       <include layout="@layout/place_page_local_ad"/>
     </LinearLayout>
 
+    <include
+      android:id="@+id/place_page_taxi_divider"
+      layout="@layout/divider_horizontal"
+      android:layout_width="match_parent"
+      android:layout_height="1dp"
+      android:layout_marginTop="@dimen/margin_half"/>
+
+    <include layout="@layout/place_page_taxi"/>
+
     <FrameLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content">
diff --git a/android/res/layout/place_page_local_ad.xml b/android/res/layout/place_page_local_ad.xml
index c6fe51b834..ba63386059 100644
--- a/android/res/layout/place_page_local_ad.xml
+++ b/android/res/layout/place_page_local_ad.xml
@@ -2,12 +2,18 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
   android:id="@+id/ll__local_ad"
-  style="@style/PlacePageItemFrame"
-  tools:showIn="@layout/place_page_details"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:orientation="vertical"
   tools:visibility="visible">
   <TextView
     android:id="@+id/tv__local_ad"
     style="@style/PlacePageMetadataText.Button"
+    android:height="@dimen/height_block_base"
+    android:background="?clickableBackground"
     android:gravity="center"
     android:text="@string/placepage_add_place_button"/>
+
+  <include layout="@layout/divider_horizontal"/>
+
 </LinearLayout>
diff --git a/android/res/layout/place_page_more.xml b/android/res/layout/place_page_more.xml
index 1eaab75844..54f0bbd948 100644
--- a/android/res/layout/place_page_more.xml
+++ b/android/res/layout/place_page_more.xml
@@ -13,4 +13,7 @@
     android:background="?clickableBackground"
     android:gravity="center"
     android:text="@string/details_on_bookingcom"/>
+
+  <include layout="@layout/divider_horizontal"/>
+
 </LinearLayout>
diff --git a/android/res/layout/place_page_taxi.xml b/android/res/layout/place_page_taxi.xml
index 9015d740f2..fb9a904dc9 100644
--- a/android/res/layout/place_page_taxi.xml
+++ b/android/res/layout/place_page_taxi.xml
@@ -6,7 +6,8 @@
   style="@style/PlacePageItemFrame"
   android:paddingTop="@dimen/placepage_taxi_padding_vert"
   android:paddingBottom="@dimen/placepage_taxi_padding_vert"
-  android:clickable="false">
+  android:clickable="false"
+  android:background="?ppBackground">
 
   <ImageView
     android:id="@+id/iv__place_page_taxi"
diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
index 686f9950cd..4ffe6b85ba 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
@@ -152,6 +152,7 @@ public class PlacePageView extends RelativeLayout
   private View mWiki;
   private View mEntrance;
   private TextView mTvEntrance;
+  private View mTaxiDivider;
   private View mTaxi;
   private View mEditPlace;
   private View mAddOrganisation;
@@ -359,6 +360,7 @@ public class PlacePageView extends RelativeLayout
     mWiki.setOnClickListener(this);
     mEntrance = mDetails.findViewById(R.id.ll__place_entrance);
     mTvEntrance = (TextView) mEntrance.findViewById(R.id.tv__place_entrance);
+    mTaxiDivider = mDetails.findViewById(R.id.place_page_taxi_divider);
     mTaxi = mDetails.findViewById(R.id.ll__place_page_taxi);
     TextView orderTaxi = (TextView) mTaxi.findViewById(R.id.tv__place_page_order_taxi);
     orderTaxi.setOnClickListener(this);
@@ -1236,7 +1238,7 @@ public class PlacePageView extends RelativeLayout
                             LocationHelper.INSTANCE.getMyPosition() != null &&
                             ConnectionState.isConnected();
 
-    UiUtils.showIf(showTaxiOffer, mTaxi);
+    UiUtils.showIf(showTaxiOffer, mTaxi, mTaxiDivider);
 
     boolean inRouting = RoutingController.get().isNavigating() ||
                         RoutingController.get().isPlanning();