R552: add custom theme mode foundation wiring

Author: ryacub

app/src/main/java/eu/kanade/domain/ui/model/AppTheme.kt

@@ -6,6 +6,7 @@ import tachiyomi.i18n.aniyomi.AYMR
 
 enum class AppTheme(val titleRes: StringResource?) {
     DEFAULT(MR.strings.label_default),
+    CUSTOM(null),
     MONET(MR.strings.theme_monet),
     CLOUDFLARE(AYMR.strings.theme_cloudflare),
     COTTONCANDY(AYMR.strings.theme_cottoncandy),

app/src/main/java/eu/kanade/domain/ui/model/ThemeMode.kt

@@ -6,14 +6,15 @@ enum class ThemeMode {
     LIGHT,
     DARK,
     SYSTEM,
+    CUSTOM,
 }
 
 fun setAppCompatDelegateThemeMode(themeMode: ThemeMode) {
-    AppCompatDelegate.setDefaultNightMode(
-        when (themeMode) {
-            ThemeMode.LIGHT -> AppCompatDelegate.MODE_NIGHT_NO
-            ThemeMode.DARK -> AppCompatDelegate.MODE_NIGHT_YES
-            ThemeMode.SYSTEM -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
-        },
-    )
+    AppCompatDelegate.setDefaultNightMode(themeMode.toAppCompatDelegateMode())
+}
+
+fun ThemeMode.toAppCompatDelegateMode(): Int = when (this) {
+    ThemeMode.LIGHT -> AppCompatDelegate.MODE_NIGHT_NO
+    ThemeMode.DARK -> AppCompatDelegate.MODE_NIGHT_YES
+    ThemeMode.SYSTEM, ThemeMode.CUSTOM -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
 }

app/src/main/java/eu/kanade/presentation/theme/TachiyomiTheme.kt

@@ -103,6 +103,7 @@ val playerRippleConfiguration
 
 private val colorSchemes: Map<AppTheme, BaseColorScheme> = mapOf(
     AppTheme.DEFAULT to TachiyomiColorScheme,
+    AppTheme.CUSTOM to TachiyomiColorScheme,
     AppTheme.CLOUDFLARE to CloudflareColorScheme,
     AppTheme.COTTONCANDY to CottoncandyColorScheme,
     AppTheme.DOOM to DoomColorScheme,

app/src/main/java/eu/kanade/tachiyomi/ui/base/delegate/ThemingDelegate.kt

@@ -32,6 +32,7 @@ class ThemingDelegateImpl : ThemingDelegate {
 }
 
 private val themeResources: Map<AppTheme, Int> = mapOf(
+    AppTheme.CUSTOM to R.style.Theme_Tachiyomi,
     AppTheme.MONET to R.style.Theme_Tachiyomi_Monet,
     AppTheme.COTTONCANDY to R.style.Theme_Tachiyomi_CottonCandy,
     AppTheme.GREEN_APPLE to R.style.Theme_Tachiyomi_GreenApple,

app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt

@@ -123,7 +123,7 @@ fun Context.createReaderThemeContext(): Context {
     val isDarkBackground = when (readerPreferences.readerTheme().get()) {
         1, 2 -> true // Black, Gray
         3 -> when (themeMode) { // Automatic bg uses activity background by default
-            ThemeMode.SYSTEM -> applicationContext.isNightMode()
+            ThemeMode.SYSTEM, ThemeMode.CUSTOM -> applicationContext.isNightMode()
             else -> themeMode == ThemeMode.DARK
         }
         else -> false // White

app/src/test/java/eu/kanade/domain/ui/model/ThemeModeTest.kt

@@ -0,0 +1,28 @@
+package eu.kanade.domain.ui.model
+
+import androidx.appcompat.app.AppCompatDelegate
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+
+class ThemeModeTest {
+
+    @Test
+    fun `light mode maps to MODE_NIGHT_NO`() {
+        assertEquals(AppCompatDelegate.MODE_NIGHT_NO, ThemeMode.LIGHT.toAppCompatDelegateMode())
+    }
+
+    @Test
+    fun `dark mode maps to MODE_NIGHT_YES`() {
+        assertEquals(AppCompatDelegate.MODE_NIGHT_YES, ThemeMode.DARK.toAppCompatDelegateMode())
+    }
+
+    @Test
+    fun `system mode maps to MODE_NIGHT_FOLLOW_SYSTEM`() {
+        assertEquals(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM, ThemeMode.SYSTEM.toAppCompatDelegateMode())
+    }
+
+    @Test
+    fun `custom mode maps to MODE_NIGHT_FOLLOW_SYSTEM`() {
+        assertEquals(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM, ThemeMode.CUSTOM.toAppCompatDelegateMode())
+    }
+}

app/src/test/java/eu/kanade/tachiyomi/ui/base/delegate/ThemingDelegateTest.kt

@@ -0,0 +1,19 @@
+package eu.kanade.tachiyomi.ui.base.delegate
+
+import eu.kanade.domain.ui.model.AppTheme
+import eu.kanade.tachiyomi.R
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+
+class ThemingDelegateTest {
+
+    @Test
+    fun `custom app theme resolves to base tachiyomi style`() {
+        val resIds = ThemingDelegate.getThemeResIds(
+            appTheme = AppTheme.CUSTOM,
+            isAmoled = false,
+        )
+
+        assertEquals(listOf(R.style.Theme_Tachiyomi), resIds)
+    }
+}