fix: preserve font fallbacks if they exist

saber-notes · Aug 23, 2024 · 76f97f4 · 76f97f4
1 parent d679691
commit 76f97f4
Showing 1 changed file with 26 additions and 27 deletions.
diff --git a/lib/components/theming/font_fallbacks.dart b/lib/components/theming/font_fallbacks.dart
@@ -1,7 +1,28 @@
 import 'package:flutter/material.dart';
 
 extension FallbackTextTheme on TextTheme {
+  TextTheme withFallbacks() => copyWith(
+        displayLarge: displayLarge?.withFallbacks(),
+        displayMedium: displayMedium?.withFallbacks(),
+        displaySmall: displaySmall?.withFallbacks(),
+        headlineLarge: headlineLarge?.withFallbacks(),
+        headlineMedium: headlineMedium?.withFallbacks(),
+        headlineSmall: headlineSmall?.withFallbacks(),
+        titleLarge: titleLarge?.withFallbacks(),
+        titleMedium: titleMedium?.withFallbacks(),
+        titleSmall: titleSmall?.withFallbacks(),
+        bodyLarge: bodyLarge?.withFallbacks(),
+        bodyMedium: bodyMedium?.withFallbacks(),
+        bodySmall: bodySmall?.withFallbacks(),
+        labelLarge: labelLarge?.withFallbacks(),
+        labelMedium: labelMedium?.withFallbacks(),
+        labelSmall: labelSmall?.withFallbacks(),
+      );
+}
+
+extension FallbackTextStyle on TextStyle {
   static const sansSerifFallbacks = [
+    'Inter',
     'Noto Sans',
     'Roboto',
     'Droid Sans',
@@ -15,31 +36,9 @@ extension FallbackTextTheme on TextTheme {
     'Dekko',
   ];
 
-  TextTheme withFallbacks() {
-    return copyWith(
-      displayLarge:
-          displayLarge?.copyWith(fontFamilyFallback: sansSerifFallbacks),
-      displayMedium:
-          displayMedium?.copyWith(fontFamilyFallback: sansSerifFallbacks),
-      displaySmall:
-          displaySmall?.copyWith(fontFamilyFallback: sansSerifFallbacks),
-      headlineLarge:
-          headlineLarge?.copyWith(fontFamilyFallback: sansSerifFallbacks),
-      headlineMedium:
-          headlineMedium?.copyWith(fontFamilyFallback: sansSerifFallbacks),
-      headlineSmall:
-          headlineSmall?.copyWith(fontFamilyFallback: sansSerifFallbacks),
-      titleLarge: titleLarge?.copyWith(fontFamilyFallback: sansSerifFallbacks),
-      titleMedium:
-          titleMedium?.copyWith(fontFamilyFallback: sansSerifFallbacks),
-      titleSmall: titleSmall?.copyWith(fontFamilyFallback: sansSerifFallbacks),
-      bodyLarge: bodyLarge?.copyWith(fontFamilyFallback: sansSerifFallbacks),
-      bodyMedium: bodyMedium?.copyWith(fontFamilyFallback: sansSerifFallbacks),
-      bodySmall: bodySmall?.copyWith(fontFamilyFallback: sansSerifFallbacks),
-      labelLarge: labelLarge?.copyWith(fontFamilyFallback: sansSerifFallbacks),
-      labelMedium:
-          labelMedium?.copyWith(fontFamilyFallback: sansSerifFallbacks),
-      labelSmall: labelSmall?.copyWith(fontFamilyFallback: sansSerifFallbacks),
-    );
-  }
+  TextStyle withFallbacks() => copyWith(
+        fontFamilyFallback: fontFamilyFallback == null
+            ? sansSerifFallbacks
+            : [...fontFamilyFallback!, ...sansSerifFallbacks],
+      );
 }