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/values | |
parent | 65edd29b135f6487c7b1348863797ee9cf59c749 (diff) |
New layouts
Diffstat (limited to 'android/res/values')
-rw-r--r-- | android/res/values/attrs.xml | 3 | ||||
-rw-r--r-- | android/res/values/colors.xml | 7 | ||||
-rw-r--r-- | android/res/values/dimens.xml | 15 | ||||
-rw-r--r-- | android/res/values/styles.xml | 8 |
4 files changed, 18 insertions, 15 deletions
diff --git a/android/res/values/attrs.xml b/android/res/values/attrs.xml index 5407870d92..83c2872b92 100644 --- a/android/res/values/attrs.xml +++ b/android/res/values/attrs.xml @@ -7,4 +7,7 @@ <attr name="clickableBackground" format="reference"/> </declare-styleable> + + <bool name="isTablet">false</bool> + </resources>
\ No newline at end of file diff --git a/android/res/values/colors.xml b/android/res/values/colors.xml index 7a8bd22c05..a17c0bbb2c 100644 --- a/android/res/values/colors.xml +++ b/android/res/values/colors.xml @@ -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> diff --git a/android/res/values/dimens.xml b/android/res/values/dimens.xml index c05ea76c38..3112013078 100644 --- a/android/res/values/dimens.xml +++ b/android/res/values/dimens.xml @@ -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> diff --git a/android/res/values/styles.xml b/android/res/values/styles.xml index 435e11277d..46f0cda1cf 100644 --- a/android/res/values/styles.xml +++ b/android/res/values/styles.xml @@ -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"/> |