forked from organicmaps/organicmaps
[android] Fixed PP for landscape
Removed landscape pp layours at all. Now, vertical PP will be used in landscape mode.
This commit is contained in:
Александр Зацепин
Arsentiy Milchakov
parent
44d83090be
commit
41b48dd2ee
5 changed files with 11 additions and 334 deletions
|
|
@ -1,24 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merge xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<include
|
||||
android:id="@+id/pp__preview"
|
||||
layout="@layout/place_page_preview"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"/>
|
||||
|
||||
<include
|
||||
android:id="@+id/pp__details_frame"
|
||||
layout="@layout/place_page_details"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/pp__preview"/>
|
||||
|
||||
<include
|
||||
android:id="@+id/pp__buttons"
|
||||
layout="@layout/place_page_button_frame"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignBottom="@id/pp__details_frame"/>
|
||||
|
||||
</merge>
|
||||
|
|
@ -1,134 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<FrameLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<com.mapswithme.maps.widget.ObservableScrollView
|
||||
android:id="@+id/pp__details"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:overScrollMode="never">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
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/place_page_sponsored_gallery"/>
|
||||
|
||||
<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/place_page_bookmark_details"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="@dimen/margin_half"
|
||||
tools:visibility="gone"/>
|
||||
|
||||
<include layout="@layout/place_page_hotel_gallery"/>
|
||||
|
||||
<include layout="@layout/place_page_hotel_description"/>
|
||||
|
||||
<include layout="@layout/place_page_hotel_facilities"/>
|
||||
|
||||
<include layout="@layout/place_page_hotel_nearby"/>
|
||||
|
||||
<include layout="@layout/place_page_hotel_rating"/>
|
||||
|
||||
<include layout="@layout/place_page_placename"/>
|
||||
|
||||
<include layout="@layout/place_page_opening_hours"/>
|
||||
|
||||
<include layout="@layout/place_page_entrance"/>
|
||||
|
||||
<include layout="@layout/place_page_phone"/>
|
||||
|
||||
<include layout="@layout/place_page_website"/>
|
||||
|
||||
<include layout="@layout/place_page_wiki"/>
|
||||
|
||||
<include layout="@layout/place_page_email"/>
|
||||
|
||||
<include layout="@layout/place_page_wifi"/>
|
||||
|
||||
<include layout="@layout/place_page_operator"/>
|
||||
|
||||
<include layout="@layout/place_page_cuisine"/>
|
||||
|
||||
<include layout="@layout/place_page_latlon"/>
|
||||
|
||||
<include layout="@layout/divider_horizontal"/>
|
||||
|
||||
<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"/>
|
||||
|
||||
<include layout="@layout/place_page_ugc"/>
|
||||
|
||||
<FrameLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
<android.support.v4.widget.Space
|
||||
android:id="@+id/edit_top_space"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/margin_base"/>
|
||||
<ImageView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/shadow_card"
|
||||
android:scaleType="fitXY"/>
|
||||
</FrameLayout>
|
||||
|
||||
<include layout="@layout/place_page_editor"/>
|
||||
|
||||
<include layout="@layout/place_page_add_business"/>
|
||||
|
||||
<include layout="@layout/place_page_add"/>
|
||||
|
||||
<android.support.v4.widget.Space
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/margin_base"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</com.mapswithme.maps.widget.ObservableScrollView>
|
||||
|
||||
<include layout="@layout/shadow_top"/>
|
||||
|
||||
<include layout="@layout/shadow_bottom"/>
|
||||
</FrameLayout>
|
||||
|
|
@ -1,157 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal"
|
||||
android:padding="@dimen/margin_base">
|
||||
|
||||
<include
|
||||
android:id="@+id/downloader_status_frame"
|
||||
layout="@layout/downloader_status"
|
||||
android:layout_width="@dimen/downloader_status_size"
|
||||
android:layout_height="@dimen/downloader_status_size"
|
||||
android:layout_marginEnd="@dimen/margin_base"
|
||||
android:layout_marginRight="@dimen/margin_base"
|
||||
android:layout_marginTop="@dimen/margin_half"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv__title"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignWithParentIfMissing="true"
|
||||
android:layout_marginTop="@dimen/margin_quarter"
|
||||
android:layout_toEndOf="@id/downloader_status_frame"
|
||||
android:layout_toRightOf="@id/downloader_status_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: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_alignWithParentIfMissing="true"
|
||||
android:layout_below="@id/tv__secondary_title"
|
||||
android:layout_marginTop="@dimen/margin_quarter"
|
||||
android:layout_toEndOf="@id/downloader_status_frame"
|
||||
android:layout_toLeftOf="@+id/direction_frame"
|
||||
android:layout_toRightOf="@id/downloader_status_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"/>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/direction_frame"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="@dimen/direction_frame_min_height"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignWithParentIfMissing="true"
|
||||
android:layout_below="@id/tv__secondary_title"
|
||||
android:background="?selectableItemBackground"
|
||||
android:gravity="center_vertical"
|
||||
android:minHeight="@dimen/direction_frame_min_height"
|
||||
android:orientation="horizontal"
|
||||
tools:background="#111111F0">
|
||||
|
||||
<com.mapswithme.maps.widget.ArrowView
|
||||
android:id="@+id/av__direction"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="@dimen/margin_half"
|
||||
android:layout_marginRight="@dimen/margin_half"
|
||||
android:tint="?colorAccent"
|
||||
android:scaleType="center"
|
||||
android:src="@drawable/ic_direction_pagepreview"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv__straight_distance"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="@style/MwmTextAppearance.PlacePage.Accent"
|
||||
android:textSize="@dimen/text_size_body_3"
|
||||
tools:text="2000 km"/>
|
||||
</LinearLayout>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv__downloader_details"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignWithParentIfMissing="true"
|
||||
android:layout_below="@id/tv__subtitle"
|
||||
android:layout_marginTop="@dimen/margin_quarter"
|
||||
android:layout_toEndOf="@id/downloader_status_frame"
|
||||
android:layout_toRightOf="@id/downloader_status_frame"
|
||||
android:textAppearance="@style/MwmTextAppearance.Body1.Secondary"
|
||||
android:visibility="gone"
|
||||
tools:background="#8000F000"
|
||||
tools:text="2.4 GB • Maps: 1"
|
||||
tools:visibility="visible"/>
|
||||
|
||||
<!-- TODO set correct color when that block will be handled (now its hidden always) -->
|
||||
<TextView
|
||||
android:id="@+id/tv__opened_till"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignWithParentIfMissing="true"
|
||||
android:layout_below="@id/tv__downloader_details"
|
||||
android:layout_marginTop="@dimen/margin_quarter"
|
||||
android:textAppearance="@style/MwmTextAppearance.Body1.Secondary"
|
||||
android:visibility="gone"
|
||||
tools:background="#80FFF000"
|
||||
tools:text="Till 9 PM"
|
||||
tools:visibility="visible"/>
|
||||
|
||||
<include
|
||||
android:id="@+id/preview_rating_info"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignWithParentIfMissing="true"
|
||||
android:layout_below="@id/tv__opened_till"
|
||||
android:layout_marginTop="@dimen/margin_quarter_plus"
|
||||
tools:background="#8000FFFF"
|
||||
tools:showIn="@layout/place_page_preview"
|
||||
layout="@layout/place_page_preview_rating"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv__address"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignWithParentIfMissing="true"
|
||||
android:layout_below="@id/preview_rating_info"
|
||||
android:layout_marginTop="@dimen/margin_quarter"
|
||||
android:textAppearance="@style/MwmTextAppearance.Body3"
|
||||
tools:background="#60000000"
|
||||
tools:text="Lenina str, 10"/>
|
||||
</RelativeLayout>
|
||||
|
|
@ -5,7 +5,6 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal"
|
||||
android:paddingTop="@dimen/margin_base">
|
||||
|
||||
<include
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout
|
||||
<LinearLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
tools:background="#8000FFFF"
|
||||
tools:showIn="@layout/place_page_preview">
|
||||
<com.mapswithme.maps.widget.RatingView
|
||||
android:id="@+id/rating_view"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="@dimen/rating_view_height_small"
|
||||
android:layout_centerVertical="true"
|
||||
android:paddingLeft="@dimen/margin_quarter_plus"
|
||||
android:paddingStart="@dimen/margin_quarter_plus"
|
||||
android:paddingRight="@dimen/margin_quarter_plus"
|
||||
|
|
@ -19,32 +19,26 @@
|
|||
android:paddingBottom="@dimen/margin_quarter"
|
||||
android:layout_marginRight="@dimen/margin_half"
|
||||
android:layout_marginEnd="@dimen/margin_half"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:textSize="@dimen/text_size_body_4"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentStart="true"
|
||||
tools:visibility="visible"/>
|
||||
<TextView
|
||||
android:id="@+id/tv__review_count"
|
||||
android:layout_toRightOf="@id/rating_view"
|
||||
android:layout_toEndOf="@id/rating_view"
|
||||
android:layout_alignWithParentIfMissing="true"
|
||||
android:layout_marginRight="@dimen/margin_half"
|
||||
android:layout_marginEnd="@dimen/margin_half"
|
||||
android:layout_toLeftOf="@+id/tv__hotel_price"
|
||||
android:layout_toStartOf="@+id/tv__hotel_price"
|
||||
android:ellipsize="end"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="0dp"
|
||||
android:layout_weight="1"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerVertical="true"
|
||||
android:textAppearance="@style/MwmTextAppearance.Body4"
|
||||
tools:text="1309 reviews"/>
|
||||
<TextView
|
||||
android:id="@id/tv__hotel_price"
|
||||
android:id="@+id/tv__hotel_price"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="end|center_vertical"
|
||||
android:textAppearance="@style/MwmTextAppearance.Body3"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:textStyle="bold"
|
||||
tools:text="$$$"/>
|
||||
<Button
|
||||
|
|
@ -52,14 +46,13 @@
|
|||
style="@style/MwmWidget.Button.LeaveReview"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:paddingBottom="@dimen/margin_eighth"
|
||||
android:paddingTop="@dimen/margin_eighth"
|
||||
android:paddingStart="@dimen/margin_half"
|
||||
android:paddingLeft="@dimen/margin_half"
|
||||
android:paddingEnd="@dimen/margin_half"
|
||||
android:paddingRight="@dimen/margin_half"
|
||||
android:layout_gravity="center"
|
||||
android:layout_gravity="end|center_vertical"
|
||||
android:visibility="gone"
|
||||
android:text="@string/leave_a_review"/>
|
||||
</RelativeLayout>
|
||||
</LinearLayout>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue