fix(font settings): Prevent showing multiple fonts of the same family…

… name
aniyomiorg · Nov 2, 2023 · 802b3ac · 802b3ac
1 parent 5567be6
commit 802b3ac
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/player/settings/sheets/subtitle/SubtitleFontPage.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/player/settings/sheets/subtitle/SubtitleFontPage.kt
@@ -94,10 +94,10 @@ private fun SubtitleFont(
             ).listFiles { file ->
                 file.extension.equals("ttf", true) ||
                     file.extension.equals("otf", true)
-            }?.map {
+            }?.associate {
                 TTFFile.open(it).families.values.toTypedArray()[0] to it.absolutePath
-            } ?: emptyList()
-            listOf("Sans Serif" to "") + customFonts
+            } ?: emptyMap()
+            mapOf("Sans Serif" to ("" to null)) + customFonts
         }
     }
     var selectingFont by remember { mutableStateOf(false) }
@@ -152,7 +152,7 @@ private fun SubtitleFont(
 
         DropdownMenu(expanded = selectingFont, onDismissRequest = { selectingFont = false }) {
             fontList.map {
-                val fontName = it.first
+                val fontName = it.key + (it.value.second?.let { type -> " ($type)" } ?: "")
                 DropdownMenuItem(
                     text = { Text(fontName) },
                     onClick = { updateFont(fontName) },