|
|
@@ -4,7 +4,7 @@ import android.app.Activity
|
|
|
import android.content.Context
|
|
|
import android.content.res.Configuration
|
|
|
import io.legado.app.ui.config.themeConfig.ThemeConfig
|
|
|
-import io.legado.app.utils.sysConfiguration
|
|
|
+import io.legado.app.ui.theme.resolveAppFontScale
|
|
|
|
|
|
|
|
|
@Suppress("unused")
|
|
|
@@ -21,12 +21,7 @@ object AppContextWrapper {
|
|
|
activity.resources.updateConfiguration(newConfig, activity.resources.displayMetrics)
|
|
|
}
|
|
|
|
|
|
- fun getFontScale(context: Context): Float {
|
|
|
- var fontScale = ThemeConfig.fontScale / 10f
|
|
|
- if (fontScale !in 0.8f..1.6f) {
|
|
|
- fontScale = sysConfiguration.fontScale
|
|
|
- }
|
|
|
- return fontScale
|
|
|
- }
|
|
|
+ fun getFontScale(context: Context): Float =
|
|
|
+ resolveAppFontScale(ThemeConfig.fontScale)
|
|
|
|
|
|
}
|