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

Fixed colors in dark theme

This commit is contained in:
ByteHamster 2020-07-13 12:06:34 +02:00
parent a26a41514a
commit 03f2198ed5
9 changed files with 24 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/res/color/filter_dialog_background_dark.xml
View File

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

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

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

5
core/src/main/res/color/filter_dialog_clear_dark.xml Normal file
View File

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

5
core/src/main/res/color/filter_dialog_clear_light.xml Normal file
View File

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

5
core/src/main/res/color/filter_dialog_close.xml
View File

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

6
core/src/main/res/drawable/ic_filter_close.xml
View File

@ -10,7 +10,7 @@
<shape android:shape="oval"> <shape android:shape="oval">
<stroke <stroke
android:width="4dp" android:width="4dp"
android:color="?attr/filter_dialog_close" /> android:color="?attr/filter_dialog_clear" />
</shape> </shape>
</item> </item>
@ -28,7 +28,7 @@
<shape android:shape="line"> <shape android:shape="line">
<stroke <stroke
android:width="4dp" android:width="4dp"
android:color="?attr/filter_dialog_close" /> android:color="?attr/filter_dialog_clear" />
</shape> </shape>
</rotate> </rotate>
</item> </item>
@ -46,7 +46,7 @@
<shape android:shape="line"> <shape android:shape="line">
<stroke <stroke
android:width="4dp" android:width="4dp"
android:color="?attr/filter_dialog_close" /> android:color="?attr/filter_dialog_clear" />
</shape> </shape>
</rotate> </rotate>

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

@ -58,10 +58,8 @@
<attr name="action_icon_color" format="color" /> <attr name="action_icon_color" format="color" />
<attr name="scrollbar_thumb" format="reference" /> <attr name="scrollbar_thumb" format="reference" />
<attr name="background_elevated" format="color" /> <attr name="background_elevated" format="color" />
<attr name="filter_dialog_close" format="reference" /> <attr name="filter_dialog_clear" format="reference" />
<attr name="filter_dialog_button_background" 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" />
<declare-styleable name="SquareImageView"> <declare-styleable name="SquareImageView">
<attr name="direction" format="enum"> <attr name="direction" format="enum">

18
core/src/main/res/values/colors.xml
View File

@ -29,18 +29,8 @@
<color name="master_switch_background_dark">#191919</color> <color name="master_switch_background_dark">#191919</color>
<!-- filter dialog --> <!-- filter dialog -->
<color name="dialog_filter_button_inactive_dark">#757575</color> <color name="dialog_filter_clear_inactive_light">#666666</color>
<color name="dialog_filter_button_inactive_light">#DDDDDD</color> <color name="dialog_filter_clear_inactive_dark">#bbbbbb</color>
<color name="dialog_filter_button_active_dark">#3D8BFF</color> <color name="dialog_filter_inactive_light">#eeeeee</color>
<color name="dialog_filter_button_active_light">#0078C2</color> <color name="dialog_filter_inactive_dark">#555555</color>
<color name="dialog_filter_clear_active_light">#46C6C6C6</color>
<color name="dialog_filter_clear_active_dark">#43707070</color>
<color name="dialog_filter_clear_inactive_light">#757575</color>
<color name="dialog_filter_clear_inactive_dark">#46C6C6C6</color>
<color name="dialog_filter_text_active">#FFFFFF</color>
<color name="dialog_filter_text_inactive">#000000</color>
</resources> </resources>

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

@ -73,10 +73,7 @@
<item name="ic_key">@drawable/ic_key_black</item> <item name="ic_key">@drawable/ic_key_black</item>
<item name="ic_volume_adaption">@drawable/ic_volume_adaption_black</item> <item name="ic_volume_adaption">@drawable/ic_volume_adaption_black</item>
<item name="scrollbar_thumb">@drawable/scrollbar_thumb_light</item> <item name="scrollbar_thumb">@drawable/scrollbar_thumb_light</item>
<item name="filter_dialog_clear">@color/filter_dialog_clear_light</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">@color/filter_dialog_background_light</item> <item name="filter_dialog_button_background">@color/filter_dialog_background_light</item>
</style> </style>
@ -153,11 +150,8 @@
<item name="ic_key">@drawable/ic_key_white</item> <item name="ic_key">@drawable/ic_key_white</item>
<item name="ic_volume_adaption">@drawable/ic_volume_adaption_white</item> <item name="ic_volume_adaption">@drawable/ic_volume_adaption_white</item>
<item name="scrollbar_thumb">@drawable/scrollbar_thumb_dark</item> <item name="scrollbar_thumb">@drawable/scrollbar_thumb_dark</item>
<item name="filter_dialog_clear">@color/filter_dialog_clear_dark</item>
<item name="filter_dialog_clear_active">@color/dialog_filter_clear_active_dark</item> <item name="filter_dialog_button_background">@color/filter_dialog_background_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">@color/filter_dialog_background_light</item>
</style> </style>
<style name="Theme.AntennaPod.TrueBlack" parent="Theme.Base.AntennaPod.TrueBlack"> <style name="Theme.AntennaPod.TrueBlack" parent="Theme.Base.AntennaPod.TrueBlack">