yutou/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

New colors + theme attrs (#1272)

Browse Source 
* New colors + theme attrs

Added new colors.xml values and modified some themes.xml fields for more customisability when switching between themes.

* Small fix for dialogs

It should look more distinguishable for the Dark theme now
This commit is contained in:
Sai 2018-03-10 14:17:26 -05:00 committed by Bram van de Kerkhof
parent 50b48ab25c
commit fcdb80830b
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/res/values-v21/themes.xml
View File

@ -17,7 +17,7 @@
<!-- Attributes specific for SDK 21 and up --> <!-- Attributes specific for SDK 21 and up -->
<item name="android:windowDrawsSystemBarBackgrounds">true</item> <item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:statusBarColor">@android:color/transparent</item> <item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:navigationBarColor">@color/colorPrimaryDark</item> <item name="android:navigationBarColor">@color/colorDarkPrimaryDark</item>
</style> </style>
<!--==============--> <!--==============-->
@ -26,6 +26,8 @@
<style name="Theme.Tachiyomi.Amoled" parent="Theme.Base.Amoled"> <style name="Theme.Tachiyomi.Amoled" parent="Theme.Base.Amoled">
<!-- Attributes specific for SDK 21 and up --> <!-- Attributes specific for SDK 21 and up -->
<item name="android:windowDrawsSystemBarBackgrounds">true</item> <item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:navigationBarColor">@color/colorAmoled</item>
</style> </style>
<!--==============--> <!--==============-->

14
app/src/main/res/values/colors.xml
View File

@ -3,6 +3,10 @@
<!-- Application Colors --> <!-- Application Colors -->
<color name="colorPrimary">#54759e</color> <color name="colorPrimary">#54759e</color>
<color name="colorPrimaryDark">#435e7e</color> <color name="colorPrimaryDark">#435e7e</color>
<!-- Dark Application Colors -->
<color name="colorDarkPrimary">#212121</color>
<color name="colorDarkPrimaryDark">#1c1c1d</color>
<color name="colorAmoled">@color/md_black_1000</color>
<!-- Light Theme --> <!-- Light Theme -->
<color name="colorAccentLight">@color/md_blue_A400</color> <color name="colorAccentLight">@color/md_blue_A400</color>
@ -27,14 +31,14 @@
<color name="textColorPrimaryDark">@color/md_white_1000</color> <color name="textColorPrimaryDark">@color/md_white_1000</color>
<color name="textColorSecondaryDark">@color/md_white_1000_70</color> <color name="textColorSecondaryDark">@color/md_white_1000_70</color>
<color name="textColorHintDark">@color/md_white_1000_50</color> <color name="textColorHintDark">@color/md_white_1000_50</color>
<color name="dividerDark">@color/md_white_1000_12</color> <color name="dividerDark">@android:color/transparent</color>
<color name="rippleColorDark">@color/md_white_1000_20</color> <color name="rippleColorDark">@color/md_white_1000_20</color>-
<color name="statusBarDark">@color/md_black_1000</color> <color name="statusBarDark">@color/md_black_1000</color>
<color name="appBarDark">@color/md_grey_900</color> <color name="appBarDark">@color/md_grey_900</color>
<color name="backgroundDark">#303030</color> <color name="backgroundDark">#1c1c1d</color>
<color name="dialogDark">@color/md_grey_800</color> <color name="dialogDark">@color/colorDarkPrimary</color>
<color name="dialog_amoled">#141414</color> <color name="dialog_amoled">@color/colorDarkPrimaryDark</color>
<color name="selectorColorDark">@color/md_blue_A200_50</color> <color name="selectorColorDark">@color/md_blue_A200_50</color>
<color name="iconColorDark">@color/md_white_1000_54</color> <color name="iconColorDark">@color/md_white_1000_54</color>

10
app/src/main/res/values/themes.xml
View File

@ -47,8 +47,8 @@
<!-- Dark Themes --> <!-- Dark Themes -->
<!--=============--> <!--=============-->
<style name="Theme.Base.Dark" parent="Theme.AppCompat.NoActionBar"> <style name="Theme.Base.Dark" parent="Theme.AppCompat.NoActionBar">
<item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimary">@color/colorDarkPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="colorPrimaryDark">@color/colorDarkPrimaryDark</item>
<item name="colorAccent">@color/colorAccentDark</item> <item name="colorAccent">@color/colorAccentDark</item>
<item name="android:textColorPrimary">@color/textColorPrimaryDark</item> <item name="android:textColorPrimary">@color/textColorPrimaryDark</item>
<item name="android:textColorSecondary">@color/textColorSecondaryDark</item> <item name="android:textColorSecondary">@color/textColorSecondaryDark</item>
@ -86,6 +86,8 @@
<!-- Amoled Theme --> <!-- Amoled Theme -->
<!--==============--> <!--==============-->
<style name="Theme.Base.Amoled" parent="Theme.Base.Dark"> <style name="Theme.Base.Amoled" parent="Theme.Base.Dark">
<item name="colorPrimary">@color/colorAmoled</item>
<item name="colorPrimaryDark">@color/colorAmoled</item>
<item name="android:colorBackground">@color/md_black_1000</item> <item name="android:colorBackground">@color/md_black_1000</item>
<!-- Custom Attributes--> <!-- Custom Attributes-->
@ -102,8 +104,8 @@
<!-- Reader Theme --> <!-- Reader Theme -->
<!--==============--> <!--==============-->
<style name="Theme.Base.Reader" parent="Theme.Base.Dark"> <style name="Theme.Base.Reader" parent="Theme.Base.Dark">
<item name="colorPrimary">@color/md_blue_grey_900</item> <item name="colorPrimary">@color/colorDarkPrimary</item>
<item name="colorPrimaryDark">#171E22</item> <item name="colorPrimaryDark">@color/colorDarkPrimaryDark</item>
</style> </style>
<style name="Theme.Reader" parent="Theme.Base.Reader"> <style name="Theme.Reader" parent="Theme.Base.Reader">