New layouts

This commit is contained in:
Dmitry Yunitsky 2015-02-12 16:16:14 +03:00 committed by Alex Zolotarev
parent 65edd29b13
commit 8ef463e170
18 changed files with 553 additions and 33 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 937 B

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 633 B

After

Width:  |  Height:  |  Size: 837 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

View file

@ -5,7 +5,7 @@
<stroke
android:width="1dp"
android:color="@color/text_info_box_share" />
android:color="@color/text_place_page_buttons" />
<solid android:color="@android:color/transparent" />
</shape>

View file

@ -5,7 +5,7 @@
<stroke
android:width="1dp"
android:color="@color/text_info_box_share" />
android:color="@color/text_place_page_buttons" />
<solid android:color="@android:color/transparent" />
</shape>

View file

@ -53,8 +53,8 @@
<ImageView
android:id="@+id/iv__start_routing"
android:layout_width="@dimen/ppp_button_size"
android:layout_height="@dimen/ppp_button_size_small"
android:layout_width="@dimen/place_page_button_size"
android:layout_height="@dimen/place_page_button_size_small"
android:layout_gravity="center"
android:background="?attr/clickableBackground"
android:scaleType="center"
@ -73,7 +73,7 @@
android:id="@+id/info_box_is_bookmarked"
style="@style/BookmarkToggleButton"
android:layout_weight="0"
android:layout_height="@dimen/ppp_button_size_small"/>
android:layout_height="@dimen/place_page_button_size_small"/>
</LinearLayout>

View file

@ -55,19 +55,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"

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -7,4 +7,7 @@
<attr name="clickableBackground" format="reference"/>
</declare-styleable>
<bool name="isTablet">false</bool>
</resources>

View file

@ -43,9 +43,10 @@
<color name="bg_search_suggestion_pressed">#68BEA8</color>
<!-- place page -->
<color name="text_info_box">@android:color/black</color>
<color name="text_info_box_subtitle">#4C4C4C</color>
<color name="text_info_box_share">#179E4D</color>
<color name="text_place_page">#212121</color>
<color name="text_place_page_subtitle">#9E9E9E</color>
<color name="text_place_page_buttons">#189E4E</color>
<color name="text_place_page_blue">#0288D1</color>
<color name="bg_top_panels">#ffffffff</color>
<color name="bg_azimut_arrow">#1D414651</color>
<color name="fg_azimut_arrow">@android:color/white</color>

View file

@ -50,12 +50,13 @@
<dimen name="search_item_height">56dp</dimen>
<dimen name="search_box_height">56dp</dimen>
<dimen name="pp_height">51dp</dimen>
<dimen name="pp_button_height">55dp</dimen>
<dimen name="ppp_title_text_size">18sp</dimen>
<dimen name="ppp_subtitle_text_size">13sp</dimen>
<dimen name="ppp_button_size">47dp</dimen>
<dimen name="ppp_button_size_small">42dp</dimen>
<dimen name="place_page_height">51dp</dimen>
<dimen name="place_page_button_height">55dp</dimen>
<dimen name="place_page_title">20sp</dimen>
<dimen name="place_page_subtitle">14sp</dimen>
<dimen name="place_page_sub_subtitle">12sp</dimen>
<dimen name="place_page_button_size">47dp</dimen>
<dimen name="place_page_button_size_small">42dp</dimen>
<dimen name="bottom_panel_height">46dp</dimen>
<dimen name="bottom_button_width">113dp</dimen>
@ -75,6 +76,4 @@
<dimen name="routing_progress_size">32dp</dimen>
<dimen name="panel_width">400dp</dimen>
<bool name="isTablet">false</bool>
</resources>

View file

@ -66,8 +66,8 @@
</style>
<style name="InfoItem" parent="TextAppearance.AppCompat.Large">
<item name="android:textSize">@dimen/ppp_title_text_size</item>
<item name="android:textColor">@color/text_info_box</item>
<item name="android:textSize">@dimen/place_page_title</item>
<item name="android:textColor">@color/text_place_page</item>
<item name="android:fontFamily" tools:targetApi="jelly_bean">sans-serif</item>
</style>
@ -114,8 +114,8 @@
<style name="BookmarkToggleButton" parent="Widget.AppCompat.CompoundButton.Switch">
<item name="android:paddingTop">14dp</item>
<item name="android:drawableTop">@drawable/ic_bookmarks_selector</item>
<item name="android:layout_width">@dimen/ppp_button_size</item>
<item name="android:layout_height">@dimen/ppp_button_size</item>
<item name="android:layout_width">@dimen/place_page_button_size</item>
<item name="android:layout_height">@dimen/place_page_button_size</item>
<item name="android:buttonStyleToggle">@style/Widget.Button.Toggle</item>
<item name="android:textOn"/>
<item name="android:textOff"/>