Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Redesign filter dialog

This commit is contained in:
bws9000 2020-07-11 12:07:39 -04:00
parent d90ca124c0
commit 722bc2616e
6 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/res/layout/filter_dialog.xml
View File

@ -3,9 +3,9 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingLeft="20dp"
android:paddingTop="25dp"
android:paddingRight="20dp"
android:paddingBottom="0dp">
android:paddingLeft="24dp"
android:paddingTop="24dp"
android:paddingRight="24dp"
android:paddingBottom="8dp">
</LinearLayout>

2
app/src/main/res/layout/filter_dialog_row.xml
View File

@ -8,7 +8,7 @@
<androidx.cardview.widget.CardView
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_marginBottom="10dp"
android:layout_marginBottom="8dp"
android:layout_weight="1"
android:clipChildren="true"
app:cardCornerRadius="24dp"

4
core/src/main/res/color/filter_dialog_button_text.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/filter_dialog_text_active" android:state_checked="true" />
<item android:color="?attr/filter_dialog_text_inactive" />
<item android:color="?attr/colorOnSecondary" android:state_checked="true" />
<item android:color="?android:textColorPrimary" />
</selector>

4
core/src/main/res/drawable/filter_dialog_button_background_dark.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/dialog_filter_button_active_dark" android:state_checked="true" />
<item android:drawable="@color/dialog_filter_button_inactive_dark" />
<item android:color="@color/dialog_filter_button_active_dark" android:state_checked="true" />
<item android:color="@color/dialog_filter_button_inactive_dark" />
</selector>

2
core/src/main/res/values/attrs.xml
View File

@ -1,8 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<attr name="filter_dialog_close" format="reference" />
<attr name="filter_dialog_text_active" format="reference" />
<attr name="filter_dialog_text_inactive" format="reference" />
<attr name="filter_dialog_button_background" format="reference" />
<attr name="filter_dialog_clear_active" format="reference" />
<attr name="filter_dialog_clear_inactive" format="reference" />

11
core/src/main/res/values/styles.xml
View File

@ -6,9 +6,6 @@
</style>
<style name="Theme.Base.AntennaPod.Light" parent="Theme.MaterialComponents.Light">
<item name="filter_dialog_button_background">
@drawable/filter_dialog_button_background_light
</item>
<item name="colorPrimary">@color/accent_light</item>
<item name="colorAccent">@color/accent_light</item>
<item name="colorSecondary">@color/accent_light</item>
@ -77,11 +74,10 @@
<item name="ic_volume_adaption">@drawable/ic_volume_adaption_black</item>
<item name="scrollbar_thumb">@drawable/scrollbar_thumb_light</item>
<item name="filter_dialog_text_active">@color/dialog_filter_text_active</item>
<item name="filter_dialog_text_inactive">@color/dialog_filter_text_inactive</item>
<item name="filter_dialog_clear_active">@color/dialog_filter_clear_active_light</item>
<item name="filter_dialog_clear_inactive">@color/dialog_filter_clear_inactive_light</item>
<item name="filter_dialog_close">@color/filter_dialog_close</item>
<item name="filter_dialog_button_background">@drawable/filter_dialog_button_background_light</item>
</style>
<style name="Theme.AntennaPod.Dark" parent="Theme.Base.AntennaPod.Dark">
@ -158,12 +154,11 @@
<item name="ic_volume_adaption">@drawable/ic_volume_adaption_white</item>
<item name="scrollbar_thumb">@drawable/scrollbar_thumb_dark</item>
<item name="filter_dialog_button_background">
@drawable/filter_dialog_button_background_dark
</item>
<item name="filter_dialog_clear_active">@color/dialog_filter_clear_active_dark</item>
<item name="filter_dialog_clear_inactive">@color/dialog_filter_clear_inactive_dark</item>
<item name="filter_dialog_close">@color/filter_dialog_close</item>
<item name="filter_dialog_button_background">@drawable/filter_dialog_button_background_dark</item>
</style>
<style name="Theme.AntennaPod.TrueBlack" parent="Theme.Base.AntennaPod.TrueBlack">