Merge pull request #65 from meikpiep/dynamic-colors

Add support of dynamic colors

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - Added all difficulty levels of 4x4 and 5x5 grids.
+- Added support of dynamic colors.
 
 ### Changed
 

gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/MainApplication.kt

@@ -2,6 +2,8 @@ package org.piepmeyer.gauguin
 
 import android.app.Application
 import android.content.Context
+import com.google.android.material.color.DynamicColors
+import com.google.android.material.color.DynamicColorsOptions
 import org.koin.android.ext.koin.androidContext
 import org.koin.android.ext.koin.androidLogger
 import org.koin.core.context.startKoin
@@ -14,6 +16,7 @@ import org.piepmeyer.gauguin.preferences.ApplicationPreferencesImpl
 import org.piepmeyer.gauguin.preferences.StatisticsManager
 import org.piepmeyer.gauguin.preferences.StatisticsManagerImpl
 import org.piepmeyer.gauguin.ui.ActivityUtils
+import org.piepmeyer.gauguin.ui.DynamicColorsPrecondition
 import org.piepmeyer.gauguin.ui.grid.GridCellSizeService
 
 class MainApplication : Application() {
@@ -22,6 +25,14 @@ class MainApplication : Application() {
 
         val applicationPreferences = ApplicationPreferencesImpl(this)
 
+        val options =
+            DynamicColorsOptions.Builder()
+                .setThemeOverlay(R.style.AppTheme_Overlay)
+                .setPrecondition(DynamicColorsPrecondition())
+                .build()
+
+        DynamicColors.applyToActivitiesIfAvailable(this, options)
+
         startKoin {
             androidLogger()
             androidContext(this@MainApplication)

gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/ActivityUtils.kt

@@ -30,12 +30,17 @@ class ActivityUtils : KoinComponent {
 
     fun configureNightMode() {
         val theme: Theme = applicationPreferences.theme
-        if (theme === Theme.LIGHT) {
-            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
-        } else if (theme === Theme.DARK) {
-            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
-        } else {
-            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
+        when (theme) {
+            Theme.LIGHT -> {
+                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
+            }
+            Theme.DARK -> {
+                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
+            }
+            Theme.SYSTEM_DEFAULT -> {
+                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
+            }
+            else -> {}
         }
     }
 }

gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/DynamicColorsPrecondition.kt

@@ -0,0 +1,19 @@
+package org.piepmeyer.gauguin.ui
+
+import android.app.Activity
+import com.google.android.material.color.DynamicColors.Precondition
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+import org.piepmeyer.gauguin.Theme
+import org.piepmeyer.gauguin.preferences.ApplicationPreferences
+
+class DynamicColorsPrecondition : KoinComponent, Precondition {
+    private val applicationPreferences: ApplicationPreferences by inject()
+
+    override fun shouldApplyDynamicColors(
+        activity: Activity,
+        theme: Int,
+    ): Boolean {
+        return applicationPreferences.theme == Theme.DYNAMIC_COLORS
+    }
+}

gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/main/MainActivity.kt

@@ -1,6 +1,8 @@
 package org.piepmeyer.gauguin.ui.main
 
 import android.content.Intent
+import android.content.SharedPreferences
+import android.content.SharedPreferences.OnSharedPreferenceChangeListener
 import android.os.Bundle
 import android.view.KeyEvent
 import android.view.View
@@ -47,8 +49,9 @@ class MainActivity : AppCompatActivity(), GridCreationListener {
 
     private var gameEndedSnackbar: Snackbar? = null
 
+    private lateinit var specialListener: OnSharedPreferenceChangeListener
+
     public override fun onCreate(savedInstanceState: Bundle?) {
-        setTheme(R.style.MainScreenTheme)
         super.onCreate(savedInstanceState)
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
@@ -86,6 +89,16 @@ class MainActivity : AppCompatActivity(), GridCreationListener {
         calculationService.addListener(createGridCalculationListener())
         loadApplicationPreferences()
 
+        specialListener =
+            OnSharedPreferenceChangeListener { _: SharedPreferences, key: String? ->
+                if (key == "theme") {
+                    this.recreate()
+                }
+            }
+
+        val preferences = PreferenceManager.getDefaultSharedPreferences(this.applicationContext)
+        preferences.registerOnSharedPreferenceChangeListener(specialListener)
+
         freshGridWasCreated()
 
         bottomAppBarService.updateAppBarState()

gauguin-app/src/main/res/values-de-rDE/arrays.xml

@@ -4,5 +4,6 @@
         <item>Hell</item>
         <item>Dunkel</item>
         <item>Systemeinstellung</item>
+        <item>Dynamische Farben</item>
     </string-array>
 </resources>

gauguin-app/src/main/res/values-v27/themes.xml

@@ -7,4 +7,8 @@
         <item name="android:windowTranslucentStatus">true</item>
         <item name="android:immersive">true</item>
     </style>
+
+
+    <style name="AppTheme.Overlay" parent="ThemeOverlay.Material3.DynamicColors.DayNight">
+    </style>
 </resources>

gauguin-app/src/main/res/values/arrays.xml

@@ -4,10 +4,12 @@
         <item>Light</item>
         <item>Dark</item>
         <item>System Default</item>
+        <item>Dynamic Colors</item>
     </string-array>
     <string-array name="setting_theme_values">
         <item>LIGHT</item>
         <item>DARK</item>
         <item>SYSTEM_DEFAULT</item>
+        <item>DYNAMIC_COLORS</item>
     </string-array>
 </resources>

gauguin-core/src/main/kotlin/org/piepmeyer/gauguin/Theme.kt

@@ -4,4 +4,5 @@ enum class Theme {
     LIGHT,
     DARK,
     SYSTEM_DEFAULT,
+    DYNAMIC_COLORS,
 }