Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

システムのデフォルトフォントの指定の整理（KosugiMaruの完全削除を含む） #318

Merged
merged 9 commits into from
Oct 21, 2024
Merged

システムのデフォルトフォントの指定の整理（KosugiMaruの完全削除を含む） #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
223b693
システム標準フォントをプラットフォームごとに再設定
Npepperlinux Dec 25, 2023
2520d4f
resolveUnicodeEmojiStyleのnullを解消
Npepperlinux Dec 25, 2023
e72ce15
システム標準フォントの指定の再修正
Npepperlinux Dec 26, 2023
c66d415
dead codeの解消
Npepperlinux Jan 20, 2024
b9d1875
Merge branch 'develop' into fonts_fix
Npepperlinux Feb 16, 2024
55ed803
Notoフォントの言語切り替え対応
Npepperlinux Feb 16, 2024
2234c8e
Merge branch 'develop' into fonts_fix
Npepperlinux Mar 31, 2024
38cf5c6
Noto CJK SC対応
Npepperlinux Mar 31, 2024
27e37eb
Merge remote-tracking branch 'upstream/feature/miria_v2' into fonts_fix
Npepperlinux Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions lib/view/themes/app_theme.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import "package:flutter/material.dart";
import "package:miria/model/color_theme.dart";
import "package:miria/model/general_settings.dart";

class AppTheme extends InheritedWidget {
final AppThemeData themeData;
Expand Down Expand Up @@ -46,6 +47,7 @@ class AppThemeData {
final List<double> renoteDashPattern;
final Color currentDisplayTabColor;
final Color buttonBackground;
final Languages languages;

const AppThemeData({
required this.colorTheme,
Expand All @@ -69,5 +71,6 @@ class AppThemeData {
required this.renoteDashPattern,
required this.currentDisplayTabColor,
required this.buttonBackground,
required this.languages,
});
}
160 changes: 105 additions & 55 deletions lib/view/themes/app_theme_scope.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ class AppThemeScopeState extends ConsumerState<AppThemeScope> {
required String monospaceFontName,
required String cursiveFontName,
required String fantasyFontName,
required Languages languages,
}) {
return AppThemeData(
colorTheme: theme,
Expand All @@ -43,8 +44,8 @@ class AppThemeScopeState extends ConsumerState<AppThemeScope> {
linkStyle: TextStyle(color: theme.link),
hashtagStyle: TextStyle(color: theme.hashtag),
mentionStyle: TextStyle(color: theme.mention),
serifStyle: resolveFontFamilySerif(serifFontName),
monospaceStyle: resolveFontFamilyMonospace(monospaceFontName),
serifStyle: resolveFontFamilySerif(serifFontName, languages),
monospaceStyle: resolveFontFamilyMonospace(monospaceFontName, languages),
cursiveStyle: cursiveFontName.isNotEmpty
? (fromGoogleFont(cursiveFontName) ?? const TextStyle())
: const TextStyle(),
Expand All @@ -62,76 +63,126 @@ class AppThemeScopeState extends ConsumerState<AppThemeScope> {
currentDisplayTabColor:
theme.isDarkTheme ? theme.primaryDarken : theme.primaryLighten,
unicodeEmojiStyle: resolveUnicodeEmojiStyle(),
languages: languages,
);
}

String resolveFontFamilyName(String defaultFontName) {
dynamic resolveFontFamilyName(String defaultFontName, Languages languages) {
if (defaultFontName.isNotEmpty) {
return defaultFontName;
}
if (defaultTargetPlatform == TargetPlatform.iOS ||
defaultTargetPlatform == TargetPlatform.macOS) {
return "SF Pro Text";
} else if (defaultTargetPlatform == TargetPlatform.android ||
defaultTargetPlatform == TargetPlatform.windows) {
if (languages == Languages.jaJP || languages == Languages.jaOJ) {
return "Noto Sans JP";
} else if (languages == Languages.zhCN) {
return "Noto Sans SC";
} else {
return "Noto Sans";
}
} else {
if (languages == Languages.jaJP || languages == Languages.jaOJ) {
return "Noto Sans CJK JP";
} else if (languages == Languages.zhCN) {
return "Noto Sans CJK SC";
} else {
return "Noto Sans";
}
}
if (defaultTargetPlatform == TargetPlatform.linux) {
return "Noto Sans CJK JP";
}

return "KosugiMaru";
}

List<String> resolveFontFamilyFallback(String defaultFontName) {
if (defaultTargetPlatform == TargetPlatform.windows ||
defaultTargetPlatform == TargetPlatform.linux) {
return [
if (defaultFontName.isNotEmpty) resolveFontFamilyName(""),
"Noto Sans CJK JP",
"KosugiMaru",
"BIZ UDPGothic",
];
}
List<String> resolveFontFamilyFallback(String defaultFontName, Languages languages) {
if (defaultTargetPlatform == TargetPlatform.iOS ||
defaultTargetPlatform == TargetPlatform.macOS) {
return [
if (defaultFontName.isNotEmpty) resolveFontFamilyName(""),
if (defaultFontName.isNotEmpty) resolveFontFamilyName("", languages),
"Hiragino Maru Gothic ProN",
"Apple Color Emoji",
];
} else {
return [
if (defaultFontName.isNotEmpty) resolveFontFamilyName("", languages),
"Noto Color Emoji",
];
}
return [];
}

TextStyle resolveFontFamilySerif(String defaultFontName) {
TextStyle resolveFontFamilySerif(String serifFontName, Languages languages) {
final String? fontName;
final fallback = <String>[];

if (defaultTargetPlatform == TargetPlatform.iOS ||
defaultTargetPlatform == TargetPlatform.macOS) {
fallback.addAll(["Hiragino Mincho ProN", "Apple Color Emoji"]);
fontName = "Hiragino Mincho ProN";
fallback.addAll(const [
"Apple Color Emoji",
]);
} else {
fallback.addAll(["Noto Serif CJK JP", "Noto Serif", "Droid Serif"]);
if (defaultTargetPlatform == TargetPlatform.android ||
defaultTargetPlatform == TargetPlatform.windows) {
if (languages == Languages.jaJP || languages == Languages.jaOJ) {
fontName = "Noto Serif JP";
} else if (languages == Languages.zhCN) {
fontName = "Noto Serif SC";
} else {
fontName = "Noto Serif";
}
} else {
if (languages == Languages.jaJP || languages == Languages.jaOJ) {
fontName = "Noto Serif CJK JP";
} else if (languages == Languages.zhCN) {
fontName = "Noto Serif CJK SC";
} else {
fontName = "Noto Serif";
}
}
fallback.addAll(const [
"Noto Color Emoji",
]);
}
return (defaultFontName.isEmpty
? const TextStyle()
: (fromGoogleFont(defaultFontName) ?? const TextStyle()))
return (serifFontName.isNotEmpty
? (fromGoogleFont(serifFontName) ??
TextStyle(fontFamily: fontName))
: TextStyle(fontFamily: fontName))
.copyWith(fontFamilyFallback: fallback);
}

TextStyle resolveFontFamilyMonospace(String monospaceFontName) {
TextStyle resolveFontFamilyMonospace(String monospaceFontName, Languages languages) {
final String? fontName;
final fallback = <String>[];

if (defaultTargetPlatform == TargetPlatform.iOS ||
defaultTargetPlatform == TargetPlatform.macOS) {
fontName = "Monaco";
fallback.addAll(const ["Apple Color Emoji", "Hiragino Maru Gothic ProN"]);
} else if (defaultTargetPlatform == TargetPlatform.windows) {
fontName = "Consolas";
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"]);
if (defaultTargetPlatform == TargetPlatform.iOS) {
fontName = "Menlo";
} else {
fontName = "Monaco";
}
fallback.addAll(const [
"Apple Color Emoji",
"Hiragino Maru Gothic ProN",
]);
} else {
fontName = null;
if (defaultTargetPlatform == TargetPlatform.android) {
fontName = "Droid Sans Mono";
} else if (defaultTargetPlatform == TargetPlatform.windows) {
fontName = "Consolas";
} else {
if (languages == Languages.jaJP || languages == Languages.jaOJ) {
fontName = "Noto Sans Mono CJK JP";
} else if (languages == Languages.zhCN) {
fontName = "Noto Sans Mono CJK SC";
} else {
fontName = "Noto Sans";
}
}
fallback.addAll(const [
"Noto Color Emoji",
"Noto Mono",
]);
}
return (monospaceFontName.isNotEmpty
? (fromGoogleFont(monospaceFontName) ??
Expand All @@ -144,27 +195,19 @@ class AppThemeScopeState extends ConsumerState<AppThemeScope> {
if (defaultTargetPlatform == TargetPlatform.iOS ||
defaultTargetPlatform == TargetPlatform.macOS) {
return const TextStyle(
fontFamily: "Apple Color Emoji",
fontFamilyFallback: [
"Apple Color Emoji",
"Hiragino Maru Gothic ProN",
],
);
}
if (defaultTargetPlatform == TargetPlatform.windows) {
return const TextStyle(
fontFamily: "Segoe UI Emoji",
fontFamilyFallback: ["Segoe UI Emoji", "Noto Color Emoji", "Meiryo"],
);
}
if (defaultTargetPlatform == TargetPlatform.android ||
defaultTargetPlatform == TargetPlatform.linux) {
fontFamily: "Apple Color Emoji",
fontFamilyFallback: [
"Hiragino Maru Gothic ProN",
],
);
} else {
return const TextStyle(
fontFamily: "Noto Color Emoji",
fontFamilyFallback: ["Noto Color Emoji", "Noto Sans JP"],
fontFamilyFallback: [
"Noto Sans",
],
);
}
return const TextStyle();
}

TextTheme applyGoogleFont(TextTheme textTheme, String? fontName) {
Expand All @@ -185,15 +228,16 @@ class AppThemeScopeState extends ConsumerState<AppThemeScope> {
required BuildContext context,
required ColorTheme theme,
required String defaultFontName,
required Languages languages,
}) {
final textThemePre = applyGoogleFont(
Theme.of(context).textTheme.merge(
(theme.isDarkTheme ? ThemeData.dark() : ThemeData.light())
.textTheme
.apply(
fontFamily: resolveFontFamilyName(defaultFontName),
fontFamily: resolveFontFamilyName(defaultFontName, languages),
fontFamilyFallback:
resolveFontFamilyFallback(defaultFontName),
resolveFontFamilyFallback(defaultFontName, languages),
bodyColor: theme.foreground,
),
),
Expand Down Expand Up @@ -390,6 +434,10 @@ class AppThemeScopeState extends ConsumerState<AppThemeScope> {
generalSettingsRepositoryProvider
.select((value) => value.settings.fantasyFontName),
);
final languages = ref.watch(
generalSettingsRepositoryProvider
.select((value) => value.settings.languages),
);

final bool isDark;
if (colorSystem == ThemeColorSystem.system) {
Expand All @@ -414,6 +462,7 @@ class AppThemeScopeState extends ConsumerState<AppThemeScope> {
context: context,
theme: foundColorTheme,
defaultFontName: defaultFontName,
languages: languages,
),
child: AppTheme(
themeData: buildDarkAppThemeData(
Expand All @@ -423,6 +472,7 @@ class AppThemeScopeState extends ConsumerState<AppThemeScope> {
monospaceFontName: monospaceFontName,
cursiveFontName: cursiveFontName,
fantasyFontName: fantasyFontName,
languages: languages,
),
child: MediaQuery(
data: MediaQuery.of(context).copyWith(
Expand Down
Loading