gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Added corner radius to start button background

Browse source
This commit is contained in:
Александр Зацепин 2017-10-03 20:18:47 +03:00 • committed by Roman Kuznetsov
parent fd1e2d77ba
commit 76ddb1ca8f
14 changed files with 114 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
android/res/drawable-v21/button_start.xml Normal file
View file

@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple
xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/colorControlHighlight">
<item>
<selector>
<item android:state_pressed="true">
<shape android:shape="rectangle">
<corners android:radius="@dimen/button_small_corner_radius"/>
<solid android:color="@color/button_accent_pressed"/>
</shape>
</item>
<item android:state_enabled="true">
<shape android:shape="rectangle">
<corners android:radius="@dimen/button_small_corner_radius"/>
<solid android:color="@color/button_accent"/>
</shape>
</item>
<item>
<shape android:shape="rectangle">
<corners android:radius="@dimen/button_small_corner_radius"/>
<solid android:color="@color/button_accent_disabled"/>
</shape>
</item>
</selector>
</item>
</ripple>

29
android/res/drawable-v21/button_start_night.xml Normal file
View file

@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple
xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/colorControlHighlight">
<item>
<selector>
<item android:state_pressed="true">
<shape android:shape="rectangle">
<corners android:radius="@dimen/button_small_corner_radius"/>
<solid android:color="@color/button_accent_pressed_night"/>
</shape>
</item>
<item android:state_enabled="true">
<shape android:shape="rectangle">
<corners android:radius="@dimen/button_small_corner_radius"/>
<solid android:color="@color/button_accent_night"/>
</shape>
</item>
<item>
<shape android:shape="rectangle">
<corners android:radius="@dimen/button_small_corner_radius"/>
<solid android:color="@color/button_accent_disabled_night"/>
</shape>
</item>
</selector>
</item>
</ripple>

25
android/res/drawable/button_start.xml
View file

@ -1,10 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/button_start_pressed"
android:state_pressed="true"/>
<item android:state_pressed="true">
<shape android:shape="rectangle">
<corners android:radius="@dimen/button_small_corner_radius"/>
<solid android:color="@color/button_accent_pressed"/>
</shape>
</item>
<item android:drawable="@drawable/button_start_normal"
android:state_enabled="true"/>
<item android:state_enabled="true">
<shape android:shape="rectangle">
<corners android:radius="@dimen/button_small_corner_radius"/>
<solid android:color="@color/button_accent"/>
</shape>
</item>
<item android:drawable="@drawable/button_start_disabled"/>
</selector>
<item>
<shape android:shape="rectangle">
<corners android:radius="@dimen/button_small_corner_radius"/>
<solid android:color="@color/button_accent_disabled"/>
</shape>
</item>
</selector>

5
android/res/drawable/button_start_disabled.xml
View file

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/button_accent_disabled"/>
</shape>

5
android/res/drawable/button_start_disabled_night.xml
View file

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/button_accent_disabled_night"/>
</shape>

25
android/res/drawable/button_start_night.xml
View file

@ -1,10 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/button_start_pressed_night"
android:state_pressed="true"/>
<item android:state_pressed="true">
<shape android:shape="rectangle">
<corners android:radius="@dimen/button_small_corner_radius"/>
<solid android:color="@color/button_accent_pressed_night"/>
</shape>
</item>
<item android:drawable="@drawable/button_start_normal_night"
android:state_enabled="true"/>
<item android:state_enabled="true">
<shape android:shape="rectangle">
<corners android:radius="@dimen/button_small_corner_radius"/>
<solid android:color="@color/button_accent_night"/>
</shape>
</item>
<item android:drawable="@drawable/button_start_disabled_night"/>
</selector>
<item>
<shape android:shape="rectangle">
<corners android:radius="@dimen/button_small_corner_radius"/>
<solid android:color="@color/button_accent_disabled_night"/>
</shape>
</item>
</selector>

5
android/res/drawable/button_start_normal.xml
View file

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/button_accent"/>
</shape>

5
android/res/drawable/button_start_normal_night.xml
View file

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/button_accent_night"/>
</shape>

5
android/res/drawable/button_start_pressed.xml
View file

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/button_accent_pressed"/>
</shape>

5
android/res/drawable/button_start_pressed_night.xml
View file

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/button_accent_pressed_night"/>
</shape>

8
android/res/layout/menu_route_plan_line.xml
View file

@ -11,7 +11,13 @@
<include layout="@layout/taxi_panel"/>
<include layout="@layout/start_button"/>
<include
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/margin_base"
android:layout_marginEnd="@dimen/margin_base"
android:layout_gravity="center_vertical"
layout="@layout/start_button"/>
<TextView
android:id="@+id/error"

12
android/res/layout/start_button.xml
View file

@ -3,12 +3,16 @@
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"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="@dimen/start_button_width"
android:padding="@dimen/margin_half"
android:layout_height="match_parent"
android:paddingBottom="@dimen/margin_quarter_plus"
android:paddingTop="@dimen/margin_quarter_plus"
android:paddingStart="@dimen/margin_half"
android:paddingLeft="@dimen/margin_half"
android:paddingEnd="@dimen/margin_half"
android:paddingRight="@dimen/margin_half"
android:layout_gravity="center"
android:text="@string/p2p_start"
style="@style/MwmWidget.Button.Start"
android:textAppearance="@style/MwmTextAppearance.Body1"
tools:showIn="@layout/menu_route_plan_line"/>

1
android/res/values/dimens.xml
View file

@ -66,6 +66,7 @@
<dimen name="margin_ruler_left">10dp</dimen>
<dimen name="margin_ruler_bottom">58dp</dimen>
<dimen name="compass_height">40dp</dimen>
<dimen name="button_big_corner_radius">20dp</dimen>
<!-- routing layout -->
<dimen name="routing_info_height">48dp</dimen>

2
android/res/values/styles.xml
View file

@ -70,6 +70,8 @@
<style name="MwmWidget.Button.Start">
<item name="android:background">?startButtonBackground</item>
<item name="android:minWidth">0dp</item>
<item name="android:minHeight">0dp</item>
<item name="android:textColor">?accentButtonTextColor</item>
<item name="android:textSize">14sp</item>
</style>