owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Organize button styles more neatly

Browse Source
This commit is contained in:
Grishka
2022-02-16 01:46:13 +03:00
parent 1e911c2245
commit f7ddac6ae6
22 changed files with 115 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mastodon/src/main/res/drawable/bg_button.xml → mastodon/src/main/res/drawable/bg_button_primary_dark_on_light.xml
View File

@@ -4,9 +4,8 @@
<ripple android:color="@color/highlight_over_dark">
<item>
<shape>
<solid android:color="@color/button_bg"/>
<solid android:color="@color/button_bg_primary_dark_on_light"/>
<corners android:radius="10dp"/>
<padding android:left="16dp" android:right="16dp" android:top="8dp" android:bottom="8dp"/>
</shape>
</item>
</ripple>

3
mastodon/src/main/res/drawable/bg_button_secondary.xml → mastodon/src/main/res/drawable/bg_button_primary_light_on_dark.xml
View File

@@ -4,9 +4,8 @@
<ripple android:color="@color/highlight_over_dark">
<item>
<shape>
<solid android:color="@color/button_bg_secondary"/>
<solid android:color="@color/button_bg_primary_dark_on_light"/>
<corners android:radius="10dp"/>
<padding android:left="16dp" android:right="16dp" android:top="8dp" android:bottom="8dp"/>
</shape>
</item>
</ripple>

13
mastodon/src/main/res/drawable/bg_button_secondary_dark_on_light.xml Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<ripple android:color="@color/highlight_over_dark">
<item>
<shape>
<solid android:color="@color/button_bg_secondary_dark_on_light"/>
<corners android:radius="10dp"/>
</shape>
</item>
</ripple>
</item>
</selector>

13
mastodon/src/main/res/drawable/bg_button_secondary_light_on_dark.xml Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<ripple android:color="@color/highlight_over_dark">
<item>
<shape>
<solid android:color="@color/button_bg_secondary_light_on_dark"/>
<corners android:radius="10dp"/>
</shape>
</item>
</ripple>
</item>
</selector>