Merge pull request #13 from odaridavid/feat-change-settings-icon

odaridavid · web-flow · commit 5ccb3d5ecf09 · 2020-05-11T18:09:45.000+03:00
theme settings icon changing on theme changes by the system
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,7 +13,7 @@ android {
 
         def versionMajor = 1
         def versionMinor = 1
-        def versionPatch = 1
+        def versionPatch = 2
 
         applicationId "com.github.odaridavid.designpatterns"
         minSdkVersion 21
diff --git a/app/src/main/java/com/github/odaridavid/designpatterns/base/BaseActivity.kt b/app/src/main/java/com/github/odaridavid/designpatterns/base/BaseActivity.kt
@@ -13,7 +13,7 @@ import com.github.odaridavid.designpatterns.helpers.SdkUtils.versionFrom
 import com.github.odaridavid.designpatterns.helpers.SdkUtils.versionUntil
 import com.github.odaridavid.designpatterns.helpers.ThemeUtils
 
-abstract class BaseActivity : AppCompatActivity() {
+abstract class BaseActivity : AppCompatActivity(), ISystemThemeChangeListener<Any> {
 
     private val powerManager: PowerManager by lazy {
         getSystemService(Context.POWER_SERVICE) as PowerManager
@@ -39,7 +39,7 @@ abstract class BaseActivity : AppCompatActivity() {
             ThemeUtils.THEME_DARK -> setDarkSystemBars()
             ThemeUtils.THEME_SYSTEM -> {
                 if (versionUntil(Build.VERSION_CODES.P)) {
-                    onPowerSaverModeChange()
+                    onPowerSaverModeChange(powerManager)
                 } else {
                     onUiModeConfigChange()
                 }
@@ -48,22 +48,23 @@ abstract class BaseActivity : AppCompatActivity() {
     }
 
     @RequiresApi(Build.VERSION_CODES.M)
-    private fun onPowerSaverModeChange() {
-        if (powerManager.isPowerSaveMode)
+    override fun onPowerSaverModeChange(powerManager: PowerManager): Any {
+        return if (powerManager.isPowerSaveMode)
             setDarkSystemBars()
         else
             setLightSystemBars()
     }
 
     @RequiresApi(Build.VERSION_CODES.M)
-    private fun onUiModeConfigChange() {
-        when (resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) {
+    override fun onUiModeConfigChange(): Any {
+        return when (resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) {
             Configuration.UI_MODE_NIGHT_NO -> {
                 setLightSystemBars()
             }
             Configuration.UI_MODE_NIGHT_YES -> {
                 setDarkSystemBars()
             }
+            else -> throw IllegalStateException()
         }
     }
 
diff --git a/app/src/main/java/com/github/odaridavid/designpatterns/base/ISystemThemeChangeListener.kt b/app/src/main/java/com/github/odaridavid/designpatterns/base/ISystemThemeChangeListener.kt
@@ -0,0 +1,35 @@
+/**
+ *
+ * Copyright 2020 David Odari
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *            http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ *
+ **/
+package com.github.odaridavid.designpatterns.base
+
+import android.os.PowerManager
+
+/**
+ * Listener for system initiated changes that affect how the ui will be rendered.
+ * @param T expected output from system initiated change
+ */
+interface ISystemThemeChangeListener<out T> {
+    /**
+     * Called when there's a change in power saver settings
+     *
+     * @param powerManager an instance of PowerManager for power saver related operations
+     */
+    fun onPowerSaverModeChange(powerManager: PowerManager): T
+
+    /**
+     * Called when there's a change in theme initiated by the system
+     * e.g Changing theme from the notification tray on Android Q and above
+     */
+    fun onUiModeConfigChange(): T
+}
diff --git a/app/src/main/java/com/github/odaridavid/designpatterns/helpers/Extensions.kt b/app/src/main/java/com/github/odaridavid/designpatterns/helpers/Extensions.kt
@@ -17,12 +17,12 @@ import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
-import android.content.res.Configuration
 import android.os.Build
 import android.os.PowerManager
 import android.widget.Toast
 import androidx.preference.PreferenceManager
 import com.github.odaridavid.designpatterns.R
+import com.github.odaridavid.designpatterns.base.ISystemThemeChangeListener
 import com.github.odaridavid.designpatterns.helpers.SdkUtils.versionUntil
 import us.feras.mdv.MarkdownView
 
@@ -35,45 +35,37 @@ inline fun <reified T> Activity.navigateTo(noinline intentExtras: ((Intent) -> U
     startActivity(intent)
 }
 
-internal fun MarkdownView.loadWithKotlinCss(context: Context, filePath: String) {
+internal fun MarkdownView.loadWithKotlinCss(
+    context: Context,
+    filePath: String,
+    systemThemeChangeListener: ISystemThemeChangeListener<String>
+) {
     loadMarkdownFile(
         filePath,
-        getThemedCss(context)
+        getThemedCss(context, systemThemeChangeListener)
     )
 }
 
-internal fun getThemedCss(context: Context): String {
+internal fun getThemedCss(
+    context: Context,
+    systemThemeChangeListener: ISystemThemeChangeListener<String>
+): String {
     val sp = PreferenceManager.getDefaultSharedPreferences(context)
     return when (getCurrentTheme(context, sp)) {
         ThemeUtils.THEME_DARK -> DARK_KOTLIN_CSS_PATH
         ThemeUtils.THEME_LIGHT -> LIGHT_KOTLIN_CSS_PATH
         ThemeUtils.THEME_SYSTEM -> {
             if (versionUntil(Build.VERSION_CODES.P)) {
                 val powerManager = context.getSystemService(Context.POWER_SERVICE) as PowerManager
-                onPowerSaverModeChange(powerManager)
+                systemThemeChangeListener.onPowerSaverModeChange(powerManager)
             } else {
-                onUiModeConfigChange(context)
+                systemThemeChangeListener.onUiModeConfigChange()
             }
         }
         else -> LIGHT_KOTLIN_CSS_PATH
     }
 }
 
-private fun onUiModeConfigChange(context: Context): String {
-    return when (context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) {
-        Configuration.UI_MODE_NIGHT_NO -> LIGHT_KOTLIN_CSS_PATH
-        Configuration.UI_MODE_NIGHT_YES -> DARK_KOTLIN_CSS_PATH
-        else -> LIGHT_KOTLIN_CSS_PATH
-    }
-}
-
-private fun onPowerSaverModeChange(powerManager: PowerManager): String {
-    return if (powerManager.isPowerSaveMode)
-        DARK_KOTLIN_CSS_PATH
-    else
-        LIGHT_KOTLIN_CSS_PATH
-}
-
 internal fun getCurrentTheme(context: Context, sp: SharedPreferences?): String {
     return sp?.getString(context.getString(R.string.key_theme_preference), ThemeUtils.THEME_LIGHT)
         ?: "default"
diff --git a/app/src/main/java/com/github/odaridavid/designpatterns/ui/DesignPatternDetailActivity.kt b/app/src/main/java/com/github/odaridavid/designpatterns/ui/DesignPatternDetailActivity.kt
@@ -1,8 +1,15 @@
 package com.github.odaridavid.designpatterns.ui
 
+import android.content.res.Configuration
+import android.os.Build
 import android.os.Bundle
+import android.os.PowerManager
+import androidx.annotation.RequiresApi
 import com.github.odaridavid.designpatterns.base.BaseActivity
+import com.github.odaridavid.designpatterns.base.ISystemThemeChangeListener
 import com.github.odaridavid.designpatterns.databinding.ActivityDesignPatternDetailBinding
+import com.github.odaridavid.designpatterns.helpers.DARK_KOTLIN_CSS_PATH
+import com.github.odaridavid.designpatterns.helpers.LIGHT_KOTLIN_CSS_PATH
 import com.github.odaridavid.designpatterns.helpers.NavigationUtils
 import com.github.odaridavid.designpatterns.helpers.loadWithKotlinCss
 import com.github.odaridavid.designpatterns.models.DesignPattern
@@ -21,6 +28,26 @@ class DesignPatternDetailActivity : BaseActivity() {
 
         supportActionBar?.setTitle(designPattern.name)
         binding.designPatternDescriptionTextView.text = getString(designPattern.description)
-        binding.designPatternMarkdownView.loadWithKotlinCss(baseContext, designPattern.codeSample)
+        binding.designPatternMarkdownView.loadWithKotlinCss(
+            baseContext,
+            designPattern.codeSample,
+            this as ISystemThemeChangeListener<String>
+        )
+    }
+
+    @RequiresApi(Build.VERSION_CODES.M)
+    override fun onPowerSaverModeChange(powerManager: PowerManager): String {
+        super.onPowerSaverModeChange(powerManager)
+        return if (powerManager.isPowerSaveMode) DARK_KOTLIN_CSS_PATH else LIGHT_KOTLIN_CSS_PATH
+    }
+
+    @RequiresApi(Build.VERSION_CODES.M)
+    override fun onUiModeConfigChange(): String {
+        super.onUiModeConfigChange()
+        return when (resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) {
+            Configuration.UI_MODE_NIGHT_NO -> LIGHT_KOTLIN_CSS_PATH
+            Configuration.UI_MODE_NIGHT_YES -> DARK_KOTLIN_CSS_PATH
+            else -> LIGHT_KOTLIN_CSS_PATH
+        }
     }
 }
diff --git a/app/src/main/java/com/github/odaridavid/designpatterns/ui/SettingsFragment.kt b/app/src/main/java/com/github/odaridavid/designpatterns/ui/SettingsFragment.kt
@@ -1,28 +1,36 @@
 package com.github.odaridavid.designpatterns.ui
 
+import android.content.Context
 import android.content.SharedPreferences
+import android.content.res.Configuration
 import android.os.Build
 import android.os.Bundle
+import android.os.PowerManager
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import androidx.appcompat.content.res.AppCompatResources.getDrawable
 import androidx.preference.ListPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import com.github.odaridavid.designpatterns.R
+import com.github.odaridavid.designpatterns.base.ISystemThemeChangeListener
 import com.github.odaridavid.designpatterns.helpers.SdkUtils
+import com.github.odaridavid.designpatterns.helpers.SdkUtils.versionUntil
 import com.github.odaridavid.designpatterns.helpers.ThemeUtils
 import com.github.odaridavid.designpatterns.helpers.ThemeUtils.THEME_DARK
 import com.github.odaridavid.designpatterns.helpers.ThemeUtils.THEME_LIGHT
 import com.github.odaridavid.designpatterns.helpers.ThemeUtils.THEME_SYSTEM
 
 internal class SettingsFragment : PreferenceFragmentCompat(),
-    SharedPreferences.OnSharedPreferenceChangeListener {
+    SharedPreferences.OnSharedPreferenceChangeListener, ISystemThemeChangeListener<Int> {
 
     private var themePreference: ListPreference? = null
     private val themePreferenceKey: String by lazy {
         getString(R.string.key_theme_preference)
     }
+    private val powerManager: PowerManager by lazy {
+        requireContext().getSystemService(Context.POWER_SERVICE) as PowerManager
+    }
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         setPreferencesFromResource(R.xml.preferences, rootKey)
@@ -76,7 +84,13 @@ internal class SettingsFragment : PreferenceFragmentCompat(),
         return when (themeValue) {
             THEME_LIGHT -> R.drawable.ic_day_black_24dp
             THEME_DARK -> R.drawable.ic_night_black_24dp
-            THEME_SYSTEM -> R.drawable.ic_day_black_24dp
+            THEME_SYSTEM -> {
+                if (versionUntil(Build.VERSION_CODES.P)) {
+                    onPowerSaverModeChange(powerManager)
+                } else {
+                    onUiModeConfigChange()
+                }
+            }
             else -> R.drawable.ic_day_black_24dp
         }
     }
@@ -97,6 +111,20 @@ internal class SettingsFragment : PreferenceFragmentCompat(),
         }
     }
 
+    @DrawableRes
+    override fun onUiModeConfigChange(): Int {
+        return when (requireContext().resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) {
+            Configuration.UI_MODE_NIGHT_NO -> R.drawable.ic_day_black_24dp
+            Configuration.UI_MODE_NIGHT_YES -> R.drawable.ic_night_black_24dp
+            else -> R.drawable.ic_day_black_24dp
+        }
+    }
+
+    @DrawableRes
+    override fun onPowerSaverModeChange(powerManager: PowerManager): Int {
+        return if (powerManager.isPowerSaveMode) R.drawable.ic_night_black_24dp else R.drawable.ic_day_black_24dp
+    }
+
     companion object {
         const val DEFAULT_THEME_VALUE = "Light"
     }
diff --git a/whatsnew/whatsnew-en-GB b/whatsnew/whatsnew-en-GB
@@ -1,3 +1 @@
-- Fix code sample not switching to a dark theme on system-related theme change.
-- Rename System Default theme preference to Follow System on Devices running Android Q and above.
-- Minor bug fixes and improvements.
+- Enable theme settings icon changing on theme changes by the system.

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import com.github.odaridavid.designpatterns.helpers.SdkUtils.versionFrom`
`13`	`13`	`import com.github.odaridavid.designpatterns.helpers.SdkUtils.versionUntil`
`14`	`14`	`import com.github.odaridavid.designpatterns.helpers.ThemeUtils`
`15`	`15`
`16`		`-abstract class BaseActivity : AppCompatActivity() {`
	`16`	`+abstract class BaseActivity : AppCompatActivity(), ISystemThemeChangeListener<Any> {`
`17`	`17`
`18`	`18`	`private val powerManager: PowerManager by lazy {`
`19`	`19`	`getSystemService(Context.POWER_SERVICE) as PowerManager`
`@@ -39,7 +39,7 @@ abstract class BaseActivity : AppCompatActivity() {`
`39`	`39`	`ThemeUtils.THEME_DARK -> setDarkSystemBars()`
`40`	`40`	`ThemeUtils.THEME_SYSTEM -> {`
`41`	`41`	`if (versionUntil(Build.VERSION_CODES.P)) {`
`42`		`- onPowerSaverModeChange()`
	`42`	`+ onPowerSaverModeChange(powerManager)`
`43`	`43`	`} else {`
`44`	`44`	`onUiModeConfigChange()`
`45`	`45`	`}`
`@@ -48,22 +48,23 @@ abstract class BaseActivity : AppCompatActivity() {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`@RequiresApi(Build.VERSION_CODES.M)`
`51`		`- private fun onPowerSaverModeChange() {`
`52`		`- if (powerManager.isPowerSaveMode)`
	`51`	`+ override fun onPowerSaverModeChange(powerManager: PowerManager): Any {`
	`52`	`+ return if (powerManager.isPowerSaveMode)`
`53`	`53`	`setDarkSystemBars()`
`54`	`54`	`else`
`55`	`55`	`setLightSystemBars()`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`@RequiresApi(Build.VERSION_CODES.M)`
`59`		`- private fun onUiModeConfigChange() {`
`60`		`- when (resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) {`
	`59`	`+ override fun onUiModeConfigChange(): Any {`
	`60`	`+ return when (resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) {`
`61`	`61`	`Configuration.UI_MODE_NIGHT_NO -> {`
`62`	`62`	`setLightSystemBars()`
`63`	`63`	`}`
`64`	`64`	`Configuration.UI_MODE_NIGHT_YES -> {`
`65`	`65`	`setDarkSystemBars()`
`66`	`66`	`}`
	`67`	`+ else -> throw IllegalStateException()`
`67`	`68`	`}`
`68`	`69`	`}`
`69`	`70`