Add Arial and Consolas as backup fonts on Linux and mention font name…

… when one fails to load.
JetBrains · Jan 16, 2024 · c21736b · c21736b
1 parent fd52489
commit c21736b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/font/FontFamilyResolver.kt b/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/font/FontFamilyResolver.kt
@@ -66,7 +66,7 @@ internal class FontFamilyResolverImpl(
                 platformFontLoader = platformFontLoader,
                 onAsyncCompletion = { /* nothing */ },
                 createDefaultTypeface = createDefaultTypeface
-            ) ?: throw IllegalStateException("Could not load font")
+            ) ?: throw FontLoadFailedException(typeRequest.fontFamily)
         }
     }
 
@@ -100,7 +100,7 @@ internal class FontFamilyResolverImpl(
                 platformFontLoader,
                 onAsyncCompletion,
                 createDefaultTypeface
-            ) ?: throw IllegalStateException("Could not load font")
+            ) ?: throw FontLoadFailedException(typefaceRequest.fontFamily)
         }
         return result
     }
@@ -197,7 +197,7 @@ internal class TypefaceRequestCache {
                 }
             }
         } catch (cause: Exception) {
-            throw IllegalStateException("Could not load font", cause)
+            throw FontLoadFailedException(typefaceRequest.fontFamily, cause)
         }
         synchronized(lock) {
             // async result may have completed prior to this block entering, do not overwrite
@@ -222,7 +222,7 @@ internal class TypefaceRequestCache {
             val next = try {
                 resolveTypeface(typeRequest)
             } catch (cause: Exception) {
-                throw IllegalStateException("Could not load font", cause)
+                throw FontLoadFailedException(typeRequest.fontFamily, cause)
             }
 
             // only cache immutable, should not reach as FontListFontFamilyTypefaceAdapter already
@@ -245,4 +245,12 @@ internal class TypefaceRequestCache {
         get() = synchronized(lock) {
             resultCache.size
         }
-}
+}
+
+internal class FontLoadFailedException(
+    fontFamily: FontFamily?,
+    cause: Throwable? = null,
+) : IllegalStateException(
+    message = "Failed to load font $fontFamily. Is it installed on the system?",
+    cause = cause,
+)
diff --git a/...e/ui/ui-text/src/skikoMain/kotlin/androidx/compose/ui/text/platform/PlatformFont.skiko.kt b/...e/ui/ui-text/src/skikoMain/kotlin/androidx/compose/ui/text/platform/PlatformFont.skiko.kt
@@ -278,9 +278,9 @@ private val GenericFontFamiliesMapping: Map<String, List<String>> by lazy {
     when (currentPlatform()) {
         Platform.Linux ->
             mapOf(
-                FontFamily.SansSerif.name to listOf("Noto Sans", "DejaVu Sans"),
+                FontFamily.SansSerif.name to listOf("Noto Sans", "DejaVu Sans", "Arial"),
                 FontFamily.Serif.name to listOf("Noto Serif", "DejaVu Serif", "Times New Roman"),
-                FontFamily.Monospace.name to listOf("Noto Sans Mono", "DejaVu Sans Mono"),
+                FontFamily.Monospace.name to listOf("Noto Sans Mono", "DejaVu Sans Mono", "Consolas"),
                 // better alternative?
                 FontFamily.Cursive.name to listOf("Comic Sans MS")
             )