[android] Refactored bug button background style

This commit is contained in:
Александр Зацепин 2018-03-30 14:17:56 +03:00 committed by Arsentiy Milchakov
parent 1e3771216b
commit cee4b05644
11 changed files with 27 additions and 10 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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