lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix crash when device headline font family is blank

Browse Source
This commit is contained in:
MM20 2022-07-11 23:17:35 +02:00
parent a6d13425fa
commit c35387a9fb
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
1 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui/src/main/java/de/mm20/launcher2/ui/theme/typography/fontfamily/DeviceDefault.kt
View File

@ -11,7 +11,11 @@ fun getDeviceHeadlineFontFamily(context: Context): FontFamily {
if (configResId != 0) { if (configResId != 0) {
val fontFamily = context.resources.getString(configResId) val fontFamily = context.resources.getString(configResId)
return FontFamily(
if (fontFamily.isBlank()) return FontFamily.SansSerif
return try {
FontFamily(
Font(DeviceFontFamilyName(fontFamily), weight = FontWeight.Thin, style = FontStyle.Normal), Font(DeviceFontFamilyName(fontFamily), weight = FontWeight.Thin, style = FontStyle.Normal),
Font(DeviceFontFamilyName(fontFamily), weight = FontWeight.ExtraLight, style = FontStyle.Normal), Font(DeviceFontFamilyName(fontFamily), weight = FontWeight.ExtraLight, style = FontStyle.Normal),
Font(DeviceFontFamilyName(fontFamily), weight = FontWeight.Light, style = FontStyle.Normal), Font(DeviceFontFamilyName(fontFamily), weight = FontWeight.Light, style = FontStyle.Normal),
@ -31,6 +35,9 @@ fun getDeviceHeadlineFontFamily(context: Context): FontFamily {
Font(DeviceFontFamilyName(fontFamily), weight = FontWeight.ExtraBold, style = FontStyle.Italic), Font(DeviceFontFamilyName(fontFamily), weight = FontWeight.ExtraBold, style = FontStyle.Italic),
Font(DeviceFontFamilyName(fontFamily), weight = FontWeight.Black, style = FontStyle.Italic), Font(DeviceFontFamilyName(fontFamily), weight = FontWeight.Black, style = FontStyle.Italic),
) )
} catch (e: IllegalArgumentException) {
FontFamily.SansSerif
}
} }
return FontFamily.SansSerif return FontFamily.SansSerif