diff --git a/lib/view/themes/app_theme_scope.dart b/lib/view/themes/app_theme_scope.dart index 23acfab4a..7aed4483d 100644 --- a/lib/view/themes/app_theme_scope.dart +++ b/lib/view/themes/app_theme_scope.dart @@ -78,21 +78,18 @@ class AppThemeScopeState extends ConsumerState { defaultTargetPlatform == TargetPlatform.macOS) { return "SF Pro Text"; } - if (defaultTargetPlatform == TargetPlatform.linux) { + if (defaultTargetPlatform == TargetPlatform.linux || + defaultTargetPlatform == TargetPlatform.android) { return "Noto Sans CJK JP"; } - - return "KosugiMaru"; + return "Noto Sans"; } List resolveFontFamilyFallback(String defaultFontName) { - if (defaultTargetPlatform == TargetPlatform.windows || - defaultTargetPlatform == TargetPlatform.linux) { + if (defaultTargetPlatform == TargetPlatform.windows) { return [ if (defaultFontName.isNotEmpty) resolveFontFamilyName(""), - "Noto Sans CJK JP", - "KosugiMaru", - "BIZ UDPGothic" + "Noto Sans JP", ]; } if (defaultTargetPlatform == TargetPlatform.iOS || @@ -103,6 +100,13 @@ class AppThemeScopeState extends ConsumerState { "Apple Color Emoji", ]; } + if (defaultTargetPlatform == TargetPlatform.android || + defaultTargetPlatform == TargetPlatform.linux) { + return [ + if (defaultFontName.isNotEmpty) resolveFontFamilyName(""), + "Noto Sans CJK JP", + ]; + } return []; } @@ -134,7 +138,7 @@ class AppThemeScopeState extends ConsumerState { fallback.addAll(const ["Segoe UI Emoji", "Noto Color Emoji", "Meiryo"]); } else if (defaultTargetPlatform == TargetPlatform.android) { fontName = "Droid Sans Mono"; - fallback.addAll(const ["Noto Color Emoji", "Noto Sans JP"]); + fallback.addAll(const ["Noto Color Emoji", "Noto Sans"]); } else { fontName = null; } @@ -164,7 +168,7 @@ class AppThemeScopeState extends ConsumerState { defaultTargetPlatform == TargetPlatform.linux) { return const TextStyle( fontFamily: "Noto Color Emoji", - fontFamilyFallback: ["Noto Color Emoji", "Noto Sans JP"]); + fontFamilyFallback: ["Noto Color Emoji", "Noto Sans"]); } return const TextStyle(); }