Merge pull request #13 from shadow578/feature/material-you

feature: Material3 / Material You
shadow578 · Oct 1, 2022 · b2b60bb · b2b60bb
2 parents dd927c2 + e9d1277
commit b2b60bb
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/app/src/main/kotlin/io/github/shadow578/yodel/YodelApp.kt b/app/src/main/kotlin/io/github/shadow578/yodel/YodelApp.kt
@@ -2,6 +2,7 @@ package io.github.shadow578.yodel
 
 import android.app.Application
 import androidx.preference.PreferenceManager
+import com.google.android.material.color.DynamicColors
 import io.github.shadow578.yodel.db.TracksDB
 import io.github.shadow578.yodel.util.*
 import io.github.shadow578.yodel.util.preferences.PreferenceWrapper
@@ -18,6 +19,9 @@ class YodelApp : Application() {
         if (BuildConfig.DEBUG)
             Timber.plant(Timber.DebugTree())
 
+        // apply material3 dynamic colors
+        DynamicColors.applyToActivitiesIfAvailable(this)
+
         // initialize stuff
         PreferenceWrapper.init(PreferenceManager.getDefaultSharedPreferences(this))
         NotificationChannels.registerAll(this)

diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
@@ -1,5 +1,5 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <style name="Theme.Yodel" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+<resources>
+    <style name="Theme.Yodel" parent="Theme.Material3.DayNight.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_200</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>
@@ -15,7 +15,7 @@
         <item name="colorOnError">#ffffff</item>
 
         <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
 
         <!-- splash screen -->
         <item name="splashIconColor">@color/white</item>

diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -1,5 +1,5 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <style name="Theme.Yodel" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+<resources>
+    <style name="Theme.Yodel" parent="Theme.Material3.DayNight.NoActionBar">
         <!-- Primary brand color -->
         <item name="colorPrimary">@color/purple_500</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>
@@ -15,7 +15,7 @@
         <item name="colorOnError">#FFFFFF</item>
 
         <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
 
         <!-- splash screen -->
         <item name="splashIconColor">@color/black</item>