map-per/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Place Page layout fix

Browse source
This commit is contained in:
Roman Romanov 2017-05-03 17:31:50 +04:00 • committed by r.kuznetsov
parent 5060e53ee6
commit aad55a66e1
6 changed files with 61 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
android/res/layout-land/place_page_details.xml
View file

@ -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">

23
android/res/layout/place_page_details.xml
View file

@ -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">

10
android/res/layout/place_page_local_ad.xml
View file

@ -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>

3
android/res/layout/place_page_more.xml
View file

@ -13,4 +13,7 @@
android:background="?clickableBackground"
android:gravity="center"
android:text="@string/details_on_bookingcom"/>
<include layout="@layout/divider_horizontal"/>
</LinearLayout>

3
android/res/layout/place_page_taxi.xml
View file

@ -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"

4
android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
View file

@ -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();