Fix dark mode (#105)

* Delete duplicated test * test * test * test * Cleanup * Bring back EMGLocale
EmergeTools · Nov 2, 2023 · 5e491e7 · 5e491e7
1 parent e172796
commit 5e491e7
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 57 deletions.
diff --git a/...sample/app/src/androidTest/kotlin/com/emergetools/snapshots/sample/MediaPickerDemoTest.kt b/...sample/app/src/androidTest/kotlin/com/emergetools/snapshots/sample/MediaPickerDemoTest.kt
diff --git a/...ts/snapshots/src/main/kotlin/com/emergetools/snapshots/compose/SnapshotVariantProvider.kt b/...ts/snapshots/src/main/kotlin/com/emergetools/snapshots/compose/SnapshotVariantProvider.kt
@@ -7,6 +7,7 @@ import android.content.res.Configuration.UI_MODE_NIGHT_MASK
 import android.content.res.Resources
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.Density
@@ -22,16 +23,22 @@ fun SnapshotVariantProvider(
   val fontScale = config.fontScale ?: 1.0f
   val fontScaleDensity = Density(fontScale = fontScale, density = LocalDensity.current.density)
 
+  val locale = config.locale?.let { EMGLocale.forLanguageCode(it) } ?: Locale.getDefault()
+
   val wrappedContext = SnapshotVariantContextWrapper(
     LocalContext.current,
-    config.locale?.let {
-      EMGLocale.forLanguageCode(it)
-    } ?: Locale.getDefault(),
-    config.uiMode,
+    newLocale = locale,
+    newUiMode = config.uiMode,
   )
 
+  val localConfiguration = Configuration(LocalConfiguration.current).apply {
+    config.uiMode?.let { uiMode = it }
+    setLocale(locale)
+  }
+
   val providedValues = arrayOf(
     LocalContext provides wrappedContext,
+    LocalConfiguration provides localConfiguration,
     config.fontScale?.let { LocalDensity provides fontScaleDensity }
   )
   CompositionLocalProvider(
@@ -48,28 +55,39 @@ class SnapshotVariantContextWrapper(
   private val newLocale: Locale?,
   private val newUiMode: Int?
 ) : ContextWrapper(base) {
-  private var customResources: Resources? = null
+
+  private var wrappedContext: Context? = null
 
   override fun getResources(): Resources {
-    if (customResources == null) {
-      val res = super.getResources()
-      val newConfig = Configuration(res.configuration)
-      newLocale?.let {
-        newConfig.setLocale(it)
-      }
-      newUiMode?.let {
-        newConfig.uiMode = it or (newConfig.uiMode and UI_MODE_NIGHT_MASK.inv())
-      }
-      customResources = super.createConfigurationContext(newConfig).resources
+    if (wrappedContext == null) {
+      wrappedContext = updateContext()
     }
-    return customResources!!
+    return wrappedContext!!.resources
   }
 
   override fun createConfigurationContext(overrideConfiguration: Configuration): Context {
-    return SnapshotVariantContextWrapper(
-      super.createConfigurationContext(overrideConfiguration),
-      newLocale,
-      newUiMode
-    )
+    val context = super.createConfigurationContext(overrideConfiguration)
+    newLocale?.let {
+      overrideConfiguration.setLocale(it)
+    }
+    newUiMode?.let {
+      overrideConfiguration.uiMode = it or (overrideConfiguration.uiMode and UI_MODE_NIGHT_MASK.inv())
+    }
+    return context
+  }
+
+  private fun updateContext(): Context {
+    val res = super.getResources()
+    val config = Configuration(res.configuration)
+
+    newLocale?.let {
+      config.setLocale(it)
+    }
+
+    newUiMode?.let {
+      config.uiMode = it or (config.uiMode and UI_MODE_NIGHT_MASK.inv())
+    }
+
+    return createConfigurationContext(config)
   }
 }