Use Material theme as base

Also should fix the problem of too dark text.
sal0max · Feb 25, 2019 · 145a187 · 145a187
1 parent d1b6a34
commit 145a187
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/muzei-nationalgeographic/build.gradle b/muzei-nationalgeographic/build.gradle
@@ -43,7 +43,7 @@ android {
       // SemVer
       def major = 2
       def minor = 1
-      def patch = 0
+      def patch = 1
       versionCode = (major * 10000) + (minor * 100) + patch
       versionName = "$major ($major.$minor.$patch)"
       //

diff --git a/muzei-nationalgeographic/src/main/res/values/colors.xml b/muzei-nationalgeographic/src/main/res/values/colors.xml
@@ -2,5 +2,6 @@
 <resources>
    <color name="iconForeground">#fff</color>
    <color name="iconBackground">#ffd300</color>
+   <color name="windowForeground">#ccc</color>
    <color name="windowBackground">#111</color>
 </resources>
diff --git a/muzei-nationalgeographic/src/main/res/values/styles.xml b/muzei-nationalgeographic/src/main/res/values/styles.xml
@@ -19,7 +19,7 @@
 
 <resources>
 
-   <style name="Theme.Muzei" parent="android:Theme.DeviceDefault">
+   <style name="Theme.Muzei" parent="android:Theme.Material">
       <item name="android:windowBackground">@color/windowBackground</item>
       <item name="android:actionBarStyle">@style/Widget.Muzei.ActionBar</item>
       <item name="android:windowContentOverlay">@null</item>
@@ -31,11 +31,16 @@
    <style name="Widget.Muzei.ActionBar" parent="android:Widget.DeviceDefault.ActionBar">
       <item name="android:background">@null</item>
       <item name="android:displayOptions">homeAsUp|showTitle</item>
+      <item name="android:titleTextStyle">@style/TextAppearance.Muzei.ActionBar</item>
    </style>
 
-
    <style name="TextAppearance.Muzei.Medium" parent="android:TextAppearance.DeviceDefault.Medium">
       <item name="android:fontFamily">sans-serif-condensed</item>
+      <item name="android:textColor">@color/windowForeground</item>
+   </style>
+
+   <style name="TextAppearance.Muzei.ActionBar" parent="android:TextAppearance.DeviceDefault.Widget.ActionBar.Title">
+      <item name="android:textColor">@android:color/white</item>
    </style>
 
 </resources>