mnalis/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Layout fixes and optimizations.

Browse source
This commit is contained in:
Dmitry Yunitsky 2015-03-06 19:02:31 +03:00 • committed by Alex Zolotarev
parent 4350afaebd
commit d10388eb19
12 changed files with 420 additions and 625 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
android/res/layout-land/map.xml
View file

@ -22,6 +22,7 @@
android:id="@+id/info_box"
android:layout_width="450dp"
android:layout_height="match_parent"
android:background="@android:color/white"
placePage:animationType="leftFull"/>
<RelativeLayout

42
android/res/layout-land/place_page.xml
View file

@ -1,42 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@android:color/white">
<merge>
<include
android:id="@+id/pp__preview"
layout="@layout/preview_place_page"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_place_page_back"/>
<include layout="@layout/place_page_land"/>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_below="@+id/pp__preview"
android:background="?android:attr/listDivider"/>
<include
android:id="@+id/pp__details"
layout="@layout/details_place_page"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/pp__preview"
android:layout_marginBottom="56dp"
android:layout_marginTop="1px"/>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_above="@id/pp__buttons"
android:background="?android:attr/listDivider"/>
<include
android:id="@+id/pp__buttons"
layout="@layout/buttons_place_page"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"/>
</RelativeLayout>
</merge>

286
android/res/layout-sw600dp-land/details_place_page.xml
View file

@ -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:layout_weight="1"
android:background="?android:selectableItemBackground"
android:drawableRight="@drawable/ic_arrow_down"
android:lineSpacingMultiplier="1.43"
android:paddingTop="@dimen/margin_small"
android:paddingBottom="@dimen/margin_small"
android:paddingRight="@dimen/margin_small"
android:textColor="@color/text_place_page"
android:textSize="@dimen/place_page_subtitle"/>
<ImageView
android:id="@+id/iv__bookmark_color"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/margin_small"
android:padding="@dimen/margin_small"
android:background="?android:selectableItemBackground"
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>

4
android/res/layout-sw600dp-land/map.xml
View file

@ -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"
@ -18,6 +17,7 @@
android:layout_height="wrap_content"
android:layout_below="@+id/toolbar_search"
android:layout_margin="@dimen/margin_medium"
android:background="@android:color/white"
placePage:animationType="leftTop"/>
<RelativeLayout

286
android/res/layout-sw720dp/details_place_page.xml
View file

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

5
android/res/layout-sw720dp/map.xml
View file

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

6
android/res/layout-sw720dp/place_page.xml Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<merge>
<include layout="@layout/place_page_land"/>
</merge>

60
android/res/layout-sw720dp/preview_place_page.xml Normal file
View file

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

290
android/res/layout/details_huge.xml Normal file
View file

@ -0,0 +1,290 @@
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout
android:id="@+id/rl__place_details"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingLeft="@dimen/margin_medium_and_half"
android:paddingRight="@dimen/margin_medium_and_half"
android:paddingTop="@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_marginBottom="@dimen/margin_medium_and_half"
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:layout_weight="1"
android:background="?android:selectableItemBackground"
android:drawableRight="@drawable/ic_arrow_down"
android:lineSpacingMultiplier="1.43"
android:paddingBottom="@dimen/margin_small"
android:paddingRight="@dimen/margin_small"
android:paddingTop="@dimen/margin_small"
android:textColor="@color/text_place_page"
android:textSize="@dimen/place_page_subtitle"/>
<ImageView
android:id="@+id/iv__bookmark_color"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/margin_small"
android:background="?android:selectableItemBackground"
android:padding="@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>
</merge>

6
android/res/layout/place_page.xml
View file

@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<View
android:layout_width="match_parent"
@ -36,4 +34,4 @@
android:layout_above="@id/pp__buttons"
android:background="?android:attr/listDivider"/>
</RelativeLayout>
</merge>

48
android/res/layout/place_page_land.xml Normal file
View file

@ -0,0 +1,48 @@
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<RelativeLayout
android:id="@+id/rl__top"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="56dp">
<include
android:id="@+id/pp__preview"
layout="@layout/preview_place_page"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_place_page_back"/>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_below="@+id/pp__preview"
android:background="?android:attr/listDivider"/>
<include
android:id="@+id/pp__details"
layout="@layout/details_place_page"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/pp__preview"
android:layout_marginTop="1px"/>
</RelativeLayout>
<include
android:id="@+id/pp__buttons"
layout="@layout/buttons_place_page"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/rl__top"
android:layout_marginTop="-56dp"/>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_below="@id/rl__top"
android:layout_marginTop="-56dp"
android:background="?android:attr/listDivider"/>
</merge>

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

@ -53,7 +53,6 @@ import com.mapswithme.util.statistics.Statistics;
public class PlacePageView extends RelativeLayout implements View.OnClickListener, View.OnLongClickListener, TextView.OnEditorActionListener
{
private LayoutInflater mInflater;
// Preview
private TextView mTvTitle;
private TextView mTvSubtitle;
@ -116,7 +115,6 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene
mIsLatLonDms = context.getSharedPreferences(context.getString(R.string.pref_file_name),
Context.MODE_PRIVATE).getBoolean(PREF_USE_DMS, false);
mInflater = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
initViews();
initAnimationController(attrs, defStyleAttr);
@ -125,10 +123,9 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene
private void initViews()
{
View mView = mInflater.inflate(R.layout.place_page, this, true);
mView.setOnClickListener(this);
LayoutInflater.from(getContext()).inflate(R.layout.place_page, this);
ViewGroup ppPreview = (ViewGroup) mView.findViewById(R.id.pp__preview);
ViewGroup ppPreview = (ViewGroup) findViewById(R.id.pp__preview);
mTvTitle = (TextView) ppPreview.findViewById(R.id.tv__title);
mTvSubtitle = (TextView) ppPreview.findViewById(R.id.tv__subtitle);
mTvOpened = (TextView) ppPreview.findViewById(R.id.tv__opened_till);
@ -137,7 +134,7 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene
mAvDirection.setOnClickListener(this);
mAvDirection.setImageResource(R.drawable.ic_direction_pagepreview);
mPpDetails = (ViewGroup) mView.findViewById(R.id.pp__details);
mPpDetails = (ViewGroup) findViewById(R.id.pp__details);
mLlAddress = (LinearLayout) mPpDetails.findViewById(R.id.ll__place_name);
mTvAddress = (TextView) mPpDetails.findViewById(R.id.tv__place_address);
mLlPhone = (LinearLayout) mPpDetails.findViewById(R.id.ll__place_phone);
@ -165,7 +162,7 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene
mTvBookmarkGroup = (TextView) mPpDetails.findViewById(R.id.tv__bookmark_group);
mTvBookmarkGroup.setOnClickListener(this);
ViewGroup ppButtons = (ViewGroup) mView.findViewById(R.id.pp__buttons);
ViewGroup ppButtons = (ViewGroup) findViewById(R.id.pp__buttons);
mRlApiBack = (RelativeLayout) ppButtons.findViewById(R.id.rl__api_back);
mRlApiBack.setOnClickListener(this);
final ViewGroup bookmarkGroup = (ViewGroup) ppButtons.findViewById(R.id.rl__bookmark);