Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add "Allow black theme" feature flag

Browse source
This commit is contained in:
Timur Gilfanov 2026-04-05 12:03:50 +04:00
parent 104ae4752a
commit 5e6a6af409
16 changed files with 139 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libraries/compound/src/main/kotlin/io/element/android/compound/theme/Theme.kt
View file

@ -20,6 +20,10 @@ enum class Theme {
Light,
}
private fun Theme.coerceBlackTheme(allowBlackTheme: Boolean): Theme {
return if (this == Theme.Black && !allowBlackTheme) Theme.Dark else this
}
@Composable
fun Theme.isDark(): Boolean {
return when (this) {
@ -29,9 +33,9 @@ fun Theme.isDark(): Boolean {
}
}
fun Flow<String?>.mapToTheme(): Flow<Theme> = map {
fun Flow<String?>.mapToTheme(allowBlackTheme: Boolean = true): Flow<Theme> = map {
when (it) {
null -> Theme.System
else -> Theme.valueOf(it)
}
}.coerceBlackTheme(allowBlackTheme)
}

11
libraries/compound/src/test/kotlin/io/element/android/compound/theme/ThemeTest.kt
View file

@ -15,6 +15,7 @@ import app.cash.molecule.RecompositionMode
import app.cash.molecule.moleculeFlow
import app.cash.turbine.test
import com.google.common.truth.Truth.assertThat
import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.test.runTest
import org.junit.Test
@ -72,4 +73,14 @@ class ThemeTest {
assertThat(awaitItem()).isTrue()
}
}
@Test
fun `mapToTheme falls back to dark when black theme is disabled`() = runTest {
flowOf(Theme.Black.name)
.mapToTheme(allowBlackTheme = false)
.test {
assertThat(awaitItem()).isEqualTo(Theme.Dark)
awaitComplete()
}
}
}