diff options
author | Александр Зацепин <az@mapswithme.com> | 2018-03-30 14:17:56 +0300 |
---|---|---|
committer | Arsentiy Milchakov <milcars@mapswithme.com> | 2018-04-04 13:09:20 +0300 |
commit | cee4b05644c904d33a71c3d2a59724c4c57e841d (patch) | |
tree | e11920afe7a46b05af699d73c1c1a50ee2450778 /android/res | |
parent | 1e3771216bda379c0815cea5304faac9369b9383 (diff) |
[android] Refactored bug button background style
Diffstat (limited to 'android/res')
-rw-r--r-- | android/res/drawable-v21/button_primary.xml (renamed from android/res/drawable-v21/button_start.xml) | 0 | ||||
-rw-r--r-- | android/res/drawable-v21/button_primary_night.xml (renamed from android/res/drawable-v21/button_start_night.xml) | 0 | ||||
-rw-r--r-- | android/res/drawable/button_primary.xml (renamed from android/res/drawable/button_start.xml) | 0 | ||||
-rw-r--r-- | android/res/drawable/button_primary_night.xml (renamed from android/res/drawable/button_start_night.xml) | 0 | ||||
-rw-r--r-- | android/res/layout/item_bookmark_backup.xml | 2 | ||||
-rw-r--r-- | android/res/layout/place_page_preview.xml | 15 | ||||
-rw-r--r-- | android/res/layout/start_button.xml | 2 | ||||
-rw-r--r-- | android/res/values/dimens.xml | 7 | ||||
-rw-r--r-- | android/res/values/styles.xml | 5 | ||||
-rw-r--r-- | android/res/values/themes-attrs.xml | 2 | ||||
-rw-r--r-- | android/res/values/themes-base.xml | 4 |
11 files changed, 27 insertions, 10 deletions
diff --git a/android/res/drawable-v21/button_start.xml b/android/res/drawable-v21/button_primary.xml index cce279d055..cce279d055 100644 --- a/android/res/drawable-v21/button_start.xml +++ b/android/res/drawable-v21/button_primary.xml diff --git a/android/res/drawable-v21/button_start_night.xml b/android/res/drawable-v21/button_primary_night.xml index 2e1feab4f7..2e1feab4f7 100644 --- a/android/res/drawable-v21/button_start_night.xml +++ b/android/res/drawable-v21/button_primary_night.xml diff --git a/android/res/drawable/button_start.xml b/android/res/drawable/button_primary.xml index 24ea19bbf6..24ea19bbf6 100644 --- a/android/res/drawable/button_start.xml +++ b/android/res/drawable/button_primary.xml diff --git a/android/res/drawable/button_start_night.xml b/android/res/drawable/button_primary_night.xml index 9db85b51b5..9db85b51b5 100644 --- a/android/res/drawable/button_start_night.xml +++ b/android/res/drawable/button_primary_night.xml diff --git a/android/res/layout/item_bookmark_backup.xml b/android/res/layout/item_bookmark_backup.xml index 5ab1b58337..a538ce87a0 100644 --- a/android/res/layout/item_bookmark_backup.xml +++ b/android/res/layout/item_bookmark_backup.xml @@ -48,7 +48,7 @@ android:layout_gravity="center"> <Button android:id="@+id/button" - style="@style/MwmWidget.Button.Start" + style="@style/MwmWidget.Button.Primary" android:layout_width="match_parent" android:layout_height="match_parent" android:minHeight="@dimen/nav_button_height" diff --git a/android/res/layout/place_page_preview.xml b/android/res/layout/place_page_preview.xml index 766d6a7e69..bd39366bf4 100644 --- a/android/res/layout/place_page_preview.xml +++ b/android/res/layout/place_page_preview.xml @@ -182,6 +182,21 @@ tools:background="#60000000" tools:text="Lenina str, 10"/> + <Button + android:id="@+id/search_hotels_btn" + android:layout_below="@id/tv__address" + style="@style/MwmWidget.Button.Primary" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="@dimen/nav_button_height" + android:layout_marginTop="@dimen/margin_half_plus" + android:layout_marginStart="@dimen/margin_base" + android:layout_marginLeft="@dimen/margin_base" + android:layout_marginEnd="@dimen/margin_base" + android:layout_marginRight="@dimen/margin_base" + android:text="@string/place_page_search_similar_hotel" + tools:text="@string/authorization_button_sign_in"/> + <include android:id="@+id/banner" layout="@layout/place_page_banner" diff --git a/android/res/layout/start_button.xml b/android/res/layout/start_button.xml index 7d0a02a3e4..e2fa8a20c6 100644 --- a/android/res/layout/start_button.xml +++ b/android/res/layout/start_button.xml @@ -3,7 +3,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/start" - style="@style/MwmWidget.Button.Start" + style="@style/MwmWidget.Button.Primary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:minWidth="@dimen/start_button_width" diff --git a/android/res/values/dimens.xml b/android/res/values/dimens.xml index 2b13036530..1fe1686860 100644 --- a/android/res/values/dimens.xml +++ b/android/res/values/dimens.xml @@ -34,6 +34,7 @@ <dimen name="height_item_oneline">56dp</dimen> <dimen name="height_item_multiline">72dp</dimen> <dimen name="height_item_edit_bookmark">72dp</dimen> + <dimen name="height_primary_button">36dp</dimen> <dimen name="dialog_max_height">320dp</dimen> <dimen name="search_item_height">56dp</dimen> @@ -115,7 +116,7 @@ <dimen name="nav_toggle">40dp</dimen> <dimen name="nav_toggle_margin">8dp</dimen> <dimen name="nav_button_width">200dp</dimen> - <dimen name="nav_button_height">36dp</dimen> + <dimen name="nav_button_height">@dimen/height_primary_button</dimen> <dimen name="nav_icon_size">48dp</dimen> <dimen name="nav_bottom_gap">12dp</dimen> <dimen name="nav_menu_top_offset">0dp</dimen> @@ -146,7 +147,7 @@ <dimen name="editor_height_field">64dp</dimen> <dimen name="editor_margin_left">56dp</dimen> <dimen name="editor_margin_left_plus">72dp</dimen> - <dimen name="editor_auth_btn_height">36dp</dimen> + <dimen name="editor_auth_btn_height">@dimen/height_primary_button</dimen> <dimen name="editor_margin_timetable_left">50dp</dimen> <!-- Altitude chart --> @@ -182,7 +183,7 @@ <!-- Banner--> <dimen name="placepage_banner_height">64dp</dimen> <dimen name="placepage_banner_icon_size">40dp</dimen> - <dimen name="placepage_banner_button_height">36dp</dimen> + <dimen name="placepage_banner_button_height">@dimen/height_primary_button</dimen> <dimen name="placepage_banner_button_margin_top">5dp</dimen> <dimen name="placepage_banner_small_action_corner">20dp</dimen> diff --git a/android/res/values/styles.xml b/android/res/values/styles.xml index a6fda744fb..af662f2012 100644 --- a/android/res/values/styles.xml +++ b/android/res/values/styles.xml @@ -70,12 +70,13 @@ <item name="android:textAppearance">@style/MwmTextAppearance.Body3</item> </style> - <style name="MwmWidget.Button.Start"> - <item name="android:background">?startButtonBackground</item> + <style name="MwmWidget.Button.Primary"> + <item name="android:background">?primaryButtonBackground</item> <item name="android:minWidth">0dp</item> <item name="android:minHeight">0dp</item> <item name="android:textColor">?accentButtonTextColor</item> <item name="android:textSize">@dimen/text_size_body_3</item> + <item name="textAllCaps">true</item> </style> <style name="MwmWidget.Button.LeaveReview"> diff --git a/android/res/values/themes-attrs.xml b/android/res/values/themes-attrs.xml index 079ce471e5..b76405fd01 100644 --- a/android/res/values/themes-attrs.xml +++ b/android/res/values/themes-attrs.xml @@ -45,7 +45,7 @@ <attr name="redButtonTextColor" format="color"/> <attr name="redButtonTextColorDisabled" format="color"/> - <attr name="startButtonBackground" format="reference"/> + <attr name="primaryButtonBackground" format="reference"/> <attr name="circleAccent" format="reference"/> diff --git a/android/res/values/themes-base.xml b/android/res/values/themes-base.xml index bd29f588a5..73d9dcc111 100644 --- a/android/res/values/themes-base.xml +++ b/android/res/values/themes-base.xml @@ -56,7 +56,7 @@ <item name="redButtonTextColor">@color/button_red_text</item> <item name="redButtonTextColorDisabled">@color/button_red_text_disabled</item> - <item name="startButtonBackground">@drawable/button_start</item> + <item name="primaryButtonBackground">@drawable/button_primary</item> <item name="reviewButtonBackground">@drawable/button_leave_review</item> <item name="circleAccent">@drawable/circle_accent</item> @@ -177,7 +177,7 @@ <item name="redButtonTextColor">@color/button_red_text</item> <item name="redButtonTextColorDisabled">@color/button_red_text_disabled</item> - <item name="startButtonBackground">@drawable/button_start_night</item> + <item name="primaryButtonBackground">@drawable/button_primary_night</item> <item name="reviewButtonBackground">@drawable/button_leave_review_night</item> <item name="circleAccent">@drawable/circle_accent_night</item> |