diff options
author | Dmitry Yunitsky <yunik@mapswithme.com> | 2015-02-12 16:16:14 +0300 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:37:47 +0300 |
commit | 8ef463e170d95481fdbfd74a62f550ce169fd8a7 (patch) | |
tree | 61e0ea39f0c1f267ccb22423466a1e07869490a5 /android/res/layout | |
parent | 65edd29b135f6487c7b1348863797ee9cf59c749 (diff) |
New layouts
Diffstat (limited to 'android/res/layout')
-rw-r--r-- | android/res/layout/buttons_place_page.xml | 141 | ||||
-rw-r--r-- | android/res/layout/details_place_page.xml | 281 | ||||
-rw-r--r-- | android/res/layout/info_box.xml | 10 | ||||
-rw-r--r-- | android/res/layout/info_box_bottom_buttons.xml | 6 | ||||
-rw-r--r-- | android/res/layout/place_page.xml | 29 | ||||
-rw-r--r-- | android/res/layout/preview_place_page.xml | 66 |
6 files changed, 525 insertions, 8 deletions
diff --git a/android/res/layout/buttons_place_page.xml b/android/res/layout/buttons_place_page.xml new file mode 100644 index 0000000000..bb392fbf66 --- /dev/null +++ b/android/res/layout/buttons_place_page.xml @@ -0,0 +1,141 @@ +<?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:background="@android:color/white" + android:baselineAligned="false" + android:orientation="horizontal" + android:paddingLeft="@dimen/margin_small_and_half" + android:paddingRight="@dimen/margin_small_and_half"> + + <RelativeLayout + android:id="@+id/rl__api_back" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:background="?attr/clickableBackground" + android:paddingTop="@dimen/margin_small_and_half" + android:visibility="gone"> + + <ImageView + android:id="@+id/iv__api_back" + android:layout_width="24dp" + android:layout_height="24dp" + android:layout_centerHorizontal="true" + android:contentDescription="share" + android:paddingBottom="@dimen/margin_medium" + android:paddingTop="@dimen/margin_medium" + android:scaleType="center" + android:src="@drawable/ic_back"/> + + <TextView + android:id="@+id/tv__api_back" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/iv__api_back" + android:layout_centerHorizontal="true" + android:layout_marginTop="@dimen/margin_micro" + android:text="BACK" + android:textColor="@color/text_place_page_buttons" + android:textSize="10sp"/> + + </RelativeLayout> + + <RelativeLayout + android:id="@+id/rl__share" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:background="?attr/clickableBackground" + android:paddingTop="@dimen/margin_small_and_half"> + + <ImageView + android:id="@+id/iv__share" + android:layout_width="24dp" + android:layout_height="24dp" + android:layout_centerHorizontal="true" + android:contentDescription="share" + android:paddingBottom="@dimen/margin_medium" + android:paddingTop="@dimen/margin_medium" + android:scaleType="center" + android:src="@drawable/ic_share"/> + + <TextView + android:id="@+id/tv__share" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/iv__share" + android:layout_centerHorizontal="true" + android:layout_marginTop="@dimen/margin_micro" + android:text="SHARE" + android:textColor="@color/text_place_page_buttons" + android:textSize="10sp"/> + + </RelativeLayout> + + <RelativeLayout + android:id="@+id/rl__bookmark" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:background="?attr/clickableBackground" + android:paddingTop="@dimen/margin_small_and_half"> + + <ImageView + android:id="@+id/iv__bookmark" + android:layout_width="24dp" + android:layout_height="24dp" + android:layout_centerHorizontal="true" + android:contentDescription="bookmark" + android:paddingBottom="@dimen/margin_medium" + android:paddingTop="@dimen/margin_medium" + android:scaleType="center" + android:src="@drawable/ic_bookmark_off"/> + + <TextView + android:id="@+id/tv__bookmark" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/iv__bookmark" + android:layout_centerHorizontal="true" + android:layout_marginTop="@dimen/margin_micro" + android:text="BOOKMARK" + android:textColor="@color/text_place_page_buttons" + android:textSize="10sp"/> + + </RelativeLayout> + + <RelativeLayout + android:id="@+id/rl__route" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:background="?attr/clickableBackground" + android:paddingTop="@dimen/margin_small_and_half"> + + <ImageView + android:id="@+id/iv__route" + android:layout_width="24dp" + android:layout_height="24dp" + android:layout_centerHorizontal="true" + android:contentDescription="share" + android:paddingBottom="@dimen/margin_medium" + android:paddingTop="@dimen/margin_medium" + android:scaleType="center" + android:src="@drawable/ic_route"/> + + <TextView + android:id="@+id/tv__route" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/iv__route" + android:layout_centerHorizontal="true" + android:layout_marginTop="@dimen/margin_micro" + android:text="ROUTE" + android:textColor="@color/text_place_page_buttons" + android:textSize="10sp"/> + + </RelativeLayout> + +</LinearLayout>
\ No newline at end of file diff --git a/android/res/layout/details_place_page.xml b/android/res/layout/details_place_page.xml new file mode 100644 index 0000000000..813ea1b0c5 --- /dev/null +++ b/android/res/layout/details_place_page.xml @@ -0,0 +1,281 @@ +<?xml version="1.0" encoding="utf-8"?> +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + 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"> + + <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:text="Some address" + 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_medium" + android:orientation="horizontal"> + + <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:text="9119992" + 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:layout_marginTop="@dimen/margin_medium" + android:orientation="horizontal"> + + <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:text="www.test.com" + 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:layout_marginTop="@dimen/margin_medium" + android:orientation="horizontal"> + + <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:text="Пн-Пт 10:00-23:00" + 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:layout_marginTop="@dimen/margin_medium" + android:orientation="horizontal"> + + <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:text="31.21345, 2.234 235" + 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:text="Yes" + 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="Name" + android:textColor="@color/text_place_page_subtitle" + android:textSize="@dimen/place_page_sub_subtitle"/> + + <TextView + android:id="@+id/tv__bookmark_name" + 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:lineSpacingMultiplier="1.43" + android:text="Great bookmark" + 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/tv__bookmark_name" + android:layout_marginTop="@dimen/margin_medium_and_half" + 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/tv__bookmark_name" + android:layout_marginTop="@dimen/margin_medium_and_half" + android:layout_toRightOf="@id/iv__bookmark" + android:lineSpacingMultiplier="1.67" + android:text="Group" + 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_marginTop="@dimen/margin_tiny" + 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:drawableRight="@drawable/ic_arrow_down" + android:lineSpacingMultiplier="1.43" + android:paddingRight="@dimen/margin_small" + android:text="Great group" + android:textColor="@color/text_place_page" + android:textSize="@dimen/place_page_subtitle"/> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="@dimen/margin_medium" + 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:layout_marginTop="@dimen/margin_medium_and_half" + 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="Notes" + android:textColor="@color/text_place_page_subtitle" + android:textSize="@dimen/place_page_sub_subtitle"/> + + <EditText + android:id="@+id/et__bookmark_notes" + 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:lineSpacingMultiplier="1.43" + android:text="Enter notes here" + android:textColor="@color/text_place_page" + android:textSize="@dimen/place_page_subtitle"/> + </RelativeLayout> + + </LinearLayout> + +</ScrollView>
\ No newline at end of file diff --git a/android/res/layout/info_box.xml b/android/res/layout/info_box.xml index 14c4387379..7473bd9af6 100644 --- a/android/res/layout/info_box.xml +++ b/android/res/layout/info_box.xml @@ -53,19 +53,19 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_below="@id/info_title" - android:textSize="@dimen/ppp_subtitle_text_size"/> + android:textSize="@dimen/place_page_subtitle"/> </RelativeLayout> <FrameLayout - android:layout_width="@dimen/ppp_button_size" - android:layout_height="@dimen/ppp_button_size" + android:layout_width="@dimen/place_page_button_size" + android:layout_height="@dimen/place_page_button_size" android:layout_weight="0"> <ImageView android:id="@+id/iv__start_routing" - android:layout_width="@dimen/ppp_button_size" - android:layout_height="@dimen/ppp_button_size" + android:layout_width="@dimen/place_page_button_size" + android:layout_height="@dimen/place_page_button_size" android:layout_gravity="center" android:background="?attr/clickableBackground" android:scaleType="center" diff --git a/android/res/layout/info_box_bottom_buttons.xml b/android/res/layout/info_box_bottom_buttons.xml index 6aabdec015..75f8b5ab8a 100644 --- a/android/res/layout/info_box_bottom_buttons.xml +++ b/android/res/layout/info_box_bottom_buttons.xml @@ -1,7 +1,7 @@ <?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="@dimen/pp_button_height" + android:layout_height="@dimen/place_page_button_height" android:layout_marginBottom="@dimen/margin_small" android:layout_marginTop="@dimen/margin_small" android:gravity="top" @@ -16,7 +16,7 @@ android:background="@drawable/bg_bottom_btn_selector" android:gravity="center" android:text="@string/share" - android:textColor="@color/text_info_box"/> + android:textColor="@color/text_place_page"/> <TextView android:id="@+id/info_box_back_to_caller" @@ -27,6 +27,6 @@ android:layout_weight="1" android:background="@drawable/bg_bottom_btn_selector" android:gravity="center" - android:textColor="@color/text_info_box"/> + android:textColor="@color/text_place_page"/> </LinearLayout>
\ No newline at end of file diff --git a/android/res/layout/place_page.xml b/android/res/layout/place_page.xml new file mode 100644 index 0000000000..96110738e3 --- /dev/null +++ b/android/res/layout/place_page.xml @@ -0,0 +1,29 @@ +<?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="match_parent" + android:orientation="vertical"> + + <include android:id="@+id/pp__preview" + layout="@layout/preview_place_page"/> + + <View + android:layout_width="match_parent" + android:layout_height="1px" + android:background="?android:attr/listDivider"/> + + <include + android:id="@+id/pp__details" + layout="@layout/details_place_page" + android:visibility="gone"/> + + + <View + android:layout_width="match_parent" + android:layout_height="1px" + android:background="?android:attr/listDivider"/> + + <include android:id="@+id/pp__buttons" + layout="@layout/buttons_place_page"/> + +</LinearLayout>
\ No newline at end of file diff --git a/android/res/layout/preview_place_page.xml b/android/res/layout/preview_place_page.xml new file mode 100644 index 0000000000..5af88673ca --- /dev/null +++ b/android/res/layout/preview_place_page.xml @@ -0,0 +1,66 @@ +<?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="wrap_content" + android:background="@drawable/bg_place_page_back" + 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:text="TEST TITLE" + 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:text="TEST subtitle" + 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:drawableLeft="@drawable/ic_open" + android:gravity="center_vertical" + android:text="TEST schedule" + android:textColor="@color/text_place_page_subtitle" + android:textSize="@dimen/place_page_subtitle"/> + + </RelativeLayout> + + <TextView + android:id="@+id/tv__straight_distance" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginRight="@dimen/margin_small" + android:text="TEST" + android:textSize="@dimen/place_page_subtitle"/> + + <ImageButton + android:id="@+id/iv__direction" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="?attr/clickableBackground" + android:contentDescription="direction" + android:src="@drawable/ic_direction_pagepreview"/> + +</LinearLayout> + |