github/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2024-09-21 14:15:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Light and dark theme are now using different accent colors

Browse source
This commit is contained in:
len 2016-04-10 15:48:57 +02:00
parent 2fa5d0cbaf
commit 936ede9aba
6 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/res/drawable-v21/list_item_selector_dark.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ripple <ripple
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/colorAccent" android:color="@color/colorAccentDark"
> >
<item> <item>
<selector> <selector>

2
app/src/main/res/drawable-v21/list_item_selector_light.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ripple <ripple
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/colorAccent" android:color="@color/colorAccentLight"
> >
<item> <item>
<selector> <selector>

2
app/src/main/res/layout/reader_popup.xml
View file

@ -20,7 +20,7 @@
android:layout_width="32dp" android:layout_width="32dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:textColor="@color/colorAccent" android:textColor="?colorAccent"
style="@style/TextAppearance.Regular.SubHeading"/> style="@style/TextAppearance.Regular.SubHeading"/>
<TextView <TextView

15
app/src/main/res/values/colors.xml
View file

@ -4,9 +4,9 @@
<color name="colorPrimary">#54759e</color> <color name="colorPrimary">#54759e</color>
<color name="colorPrimaryDark">#435e7e</color> <color name="colorPrimaryDark">#435e7e</color>
<color name="colorPrimaryDarkTrans">#40435e7e</color> <color name="colorPrimaryDarkTrans">#40435e7e</color>
<color name="colorAccent">@color/md_blue_400</color>
<!-- Light Theme --> <!-- Light Theme -->
<color name="colorAccentLight">@color/md_blue_A400</color>
<color name="textColorPrimaryLight">@color/md_black_1000_87</color> <color name="textColorPrimaryLight">@color/md_black_1000_87</color>
<color name="textColorSecondaryLight">@color/md_black_1000_54</color> <color name="textColorSecondaryLight">@color/md_black_1000_54</color>
<color name="textColorHintLight">@color/md_black_1000_38</color> <color name="textColorHintLight">@color/md_black_1000_38</color>
@ -17,9 +17,10 @@
<color name="backgroundLight">@color/md_grey_50</color> <color name="backgroundLight">@color/md_grey_50</color>
<color name="dialogLight">@color/md_white_1000</color> <color name="dialogLight">@color/md_white_1000</color>
<color name="selectorColorLight">@color/md_blue_400_38</color> <color name="selectorColorLight">@color/md_blue_A400_38</color>
<!-- Dark Theme --> <!-- Dark Theme -->
<color name="colorAccentDark">@color/md_blue_A200</color>
<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>
@ -30,7 +31,7 @@
<color name="backgroundDark">#303030</color> <color name="backgroundDark">#303030</color>
<color name="dialogDark">@color/md_grey_800</color> <color name="dialogDark">@color/md_grey_800</color>
<color name="selectorColorDark">@color/md_blue_400_50</color> <color name="selectorColorDark">@color/md_blue_A200_50</color>
<!-- Reader Theme --> <!-- Reader Theme -->
<color name="pageNumberBackgroundLight">@color/md_grey_50_75</color> <color name="pageNumberBackgroundLight">@color/md_grey_50_75</color>
@ -58,9 +59,11 @@
<color name="md_grey_900">#212121</color> <color name="md_grey_900">#212121</color>
<color name="md_grey_900_75">#BF212121</color> <color name="md_grey_900_75">#BF212121</color>
<color name="md_blue_400">#42A5F5</color> <color name="md_blue_A200">#448AFF</color>
<color name="md_blue_400_50">#8042A5F5</color> <color name="md_blue_A200_50">#80448AFF</color>
<color name="md_blue_400_38">#6142A5F5</color>
<color name="md_blue_A400">#2979FF</color>
<color name="md_blue_A400_38">#612979FF</color>
<color name="md_blue_grey_900">#263238</color> <color name="md_blue_grey_900">#263238</color>

4
app/src/main/res/values/styles.xml
View file

@ -26,7 +26,7 @@
<style name="Theme.Widget.NavigationView.Dark"> <style name="Theme.Widget.NavigationView.Dark">
<item name="colorControlHighlight">@color/md_grey_900</item> <item name="colorControlHighlight">@color/md_grey_900</item>
<item name="colorPrimary">@color/colorAccent</item> <item name="colorPrimary">?colorAccent</item>
</style> </style>
<!--===============--> <!--===============-->
@ -168,7 +168,7 @@
<style name="FilePickerTheme" parent="NNF_BaseTheme.Light"> <style name="FilePickerTheme" parent="NNF_BaseTheme.Light">
<item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item> <item name="colorAccent">@color/colorAccentLight</item>
<item name="colorButtonNormal">@color/colorPrimary</item> <item name="colorButtonNormal">@color/colorPrimary</item>
<item name="android:textSize">14sp</item> <item name="android:textSize">14sp</item>

8
app/src/main/res/values/themes.xml
View file

@ -12,7 +12,7 @@
<style name="Theme.Base" parent="Theme.AppCompat.Light.NoActionBar"> <style name="Theme.Base" parent="Theme.AppCompat.Light.NoActionBar">
<item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item> <item name="colorAccent">@color/colorAccentLight</item>
<item name="android:textColorPrimary">@color/textColorPrimaryLight</item> <item name="android:textColorPrimary">@color/textColorPrimaryLight</item>
<item name="android:textColorSecondary">@color/textColorSecondaryLight</item> <item name="android:textColorSecondary">@color/textColorSecondaryLight</item>
<item name="android:textColorHint">@color/textColorHintLight</item> <item name="android:textColorHint">@color/textColorHintLight</item>
@ -20,7 +20,7 @@
<item name="android:textColorSecondaryInverse">@color/textColorSecondaryDark</item> <item name="android:textColorSecondaryInverse">@color/textColorSecondaryDark</item>
<item name="android:textColorHintInverse">@color/textColorHintDark</item> <item name="android:textColorHintInverse">@color/textColorHintDark</item>
<item name="android:colorBackground">@color/backgroundLight</item> <item name="android:colorBackground">@color/backgroundLight</item>
<item name="android:listSelector">@color/colorAccent</item> <item name="android:listSelector">?colorAccent</item>
<item name="android:divider">@color/dividerLight</item> <item name="android:divider">@color/dividerLight</item>
<!-- Themes --> <!-- Themes -->
@ -46,7 +46,7 @@
<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/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</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>
<item name="android:textColorHint">@color/textColorHintDark</item> <item name="android:textColorHint">@color/textColorHintDark</item>
@ -54,7 +54,7 @@
<item name="android:textColorSecondaryInverse">@color/textColorSecondaryLight</item> <item name="android:textColorSecondaryInverse">@color/textColorSecondaryLight</item>
<item name="android:textColorHintInverse">@color/textColorHintLight</item> <item name="android:textColorHintInverse">@color/textColorHintLight</item>
<item name="android:colorBackground">@color/backgroundDark</item> <item name="android:colorBackground">@color/backgroundDark</item>
<item name="android:listSelector">@color/colorAccent</item> <item name="android:listSelector">?colorAccent</item>
<item name="android:divider">@color/dividerDark</item> <item name="android:divider">@color/dividerDark</item>
<!-- Themes --> <!-- Themes -->