diff --git a/app/src/main/java/me/ash/reader/data/model/preference/ReadingFontsPreference.kt b/app/src/main/java/me/ash/reader/data/model/preference/ReadingFontsPreference.kt index b6b2dd19..b82550d6 100644 --- a/app/src/main/java/me/ash/reader/data/model/preference/ReadingFontsPreference.kt +++ b/app/src/main/java/me/ash/reader/data/model/preference/ReadingFontsPreference.kt @@ -9,11 +9,9 @@ import me.ash.reader.R import me.ash.reader.ui.ext.DataStoreKeys import me.ash.reader.ui.ext.dataStore import me.ash.reader.ui.ext.put -import me.ash.reader.ui.theme.googleSansDisplay -import me.ash.reader.ui.theme.googleSansText sealed class ReadingFontsPreference(val value: Int) : Preference() { - object GoogleSans : ReadingFontsPreference(0) + object System : ReadingFontsPreference(0) object Serif : ReadingFontsPreference(1) object SansSerif : ReadingFontsPreference(2) object Monospace : ReadingFontsPreference(3) @@ -28,7 +26,7 @@ sealed class ReadingFontsPreference(val value: Int) : Preference() { fun toDesc(context: Context): String = when (this) { - GoogleSans -> "Google Sans" + System -> context.getString(R.string.system_default) Serif -> "Serif" SansSerif -> "Sans-Serif" Monospace -> "Monospace" @@ -36,9 +34,9 @@ sealed class ReadingFontsPreference(val value: Int) : Preference() { External -> context.getString(R.string.external_fonts) } - fun asFontFamily(isDisplay: Boolean = false): FontFamily = + fun asFontFamily(): FontFamily = when (this) { - GoogleSans -> if (isDisplay) googleSansDisplay else googleSansText + System -> FontFamily.Default Serif -> FontFamily.Serif SansSerif -> FontFamily.SansSerif Monospace -> FontFamily.Monospace @@ -48,12 +46,12 @@ sealed class ReadingFontsPreference(val value: Int) : Preference() { companion object { - val default = GoogleSans - val values = listOf(GoogleSans, Serif, SansSerif, Monospace, Cursive, External) + val default = System + val values = listOf(System, Serif, SansSerif, Monospace, Cursive, External) fun fromPreferences(preferences: Preferences): ReadingFontsPreference = when (preferences[DataStoreKeys.ReadingFonts.key]) { - 0 -> GoogleSans + 0 -> System 1 -> Serif 2 -> SansSerif 3 -> Monospace diff --git a/app/src/main/java/me/ash/reader/ui/component/base/WebView.kt b/app/src/main/java/me/ash/reader/ui/component/base/WebView.kt index 860accba..869e6103 100644 --- a/app/src/main/java/me/ash/reader/ui/component/base/WebView.kt +++ b/app/src/main/java/me/ash/reader/ui/component/base/WebView.kt @@ -139,6 +139,7 @@ fun WebView( @Stable fun argbToCssColor(argb: Int): String = String.format("#%06X", 0xFFFFFF and argb) +// TODO: Google sans is deprecated @Stable fun getStyle(argb: Int): String = """