Merge pull request #10 from odaridavid/fix-code-sample-system-theme

fix code sample to follow system theme

Author: odaridavid

app/build.gradle

@@ -13,7 +13,7 @@ android {
 
         def versionMajor = 1
         def versionMinor = 1
-        def versionPatch = 0
+        def versionPatch = 1
 
         applicationId "com.github.odaridavid.designpatterns"
         minSdkVersion 21
@@ -31,6 +31,8 @@ android {
             manifestPlaceholders = [crashlyticsEnabled: true]
         }
         debug {
+            applicationIdSuffix ".debug"
+            versionNameSuffix "-debug"
             manifestPlaceholders = [crashlyticsEnabled: false]
         }
     }

app/src/main/java/com/github/odaridavid/designpatterns/helpers/Extensions.kt

@@ -17,9 +17,13 @@ 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.helpers.SdkUtils.versionUntil
 import us.feras.mdv.MarkdownView
 
 
@@ -43,11 +47,33 @@ internal fun getThemedCss(context: Context): String {
     return when (getCurrentTheme(context, sp)) {
         ThemeUtils.THEME_DARK -> DARK_KOTLIN_CSS_PATH
         ThemeUtils.THEME_LIGHT -> LIGHT_KOTLIN_CSS_PATH
-        ThemeUtils.THEME_SYSTEM -> LIGHT_KOTLIN_CSS_PATH
+        ThemeUtils.THEME_SYSTEM -> {
+            if (versionUntil(Build.VERSION_CODES.P)) {
+                val powerManager = context.getSystemService(Context.POWER_SERVICE) as PowerManager
+                onPowerSaverModeChange(powerManager)
+            } else {
+                onUiModeConfigChange(context)
+            }
+        }
         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"

whatsnew/whatsnew-en-GB.txt

@@ -1,2 +1,2 @@
-- Immediate In App Update Available
-- Adds a Dark theme variant
+- Fix code sample not switching to a dark theme on system-related theme change.
+- Minor bug fixes and improvements.