Skip to content

Commit 6a53d1a

Browse files
committed
feat(fonts): replace Noto Sans Symbols 2 with Noto Emoji
1 parent 120d0f6 commit 6a53d1a

9 files changed

Lines changed: 22 additions & 25 deletions
-5.45 KB
Binary file not shown.

fonts/tools/originals/NewTegomin-Regular.original.ttf renamed to fonts/tools/_originals/NewTegomin-Regular.original.ttf

File renamed without changes.
1.91 MB
Binary file not shown.
File renamed without changes.
File renamed without changes.

fonts/tools/fonts_subsetting.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
noto_sans_JP = "".join(unique_characters_list) # Contains all the characters used in the dataset
6767
noto_serif_JP = "あ"
6868
new_tegomin = "あ字言葉準備中."
69-
noto_sans_symbols_2 = "\u2663\u2660\u2666" # ♣, ♠ and ♦
69+
noto_emoji = "\u2663\u2660\u2666" # ♣, ♠ and ♦
7070

7171

7272
# ---------------------------------------------------------------------------- #
@@ -114,22 +114,22 @@ def make_subset(file_source: str, file_dest: str, subset_str: str):
114114

115115

116116
make_subset(
117-
"fonts/tools/originals/NotoSansJP.original.ttf",
117+
"fonts/tools/_originals/NotoSansJP.original.ttf",
118118
"fonts/NotoSansJP.subset.ttf",
119119
noto_sans_JP,
120120
)
121121
make_subset(
122-
"fonts/tools/originals/NotoSerifJP.original.ttf",
122+
"fonts/tools/_originals/NotoSerifJP.original.ttf",
123123
"fonts/NotoSerifJP.subset.ttf",
124124
noto_serif_JP,
125125
)
126126
make_subset(
127-
"fonts/tools/originals/NewTegomin-Regular.original.ttf",
127+
"fonts/tools/_originals/NewTegomin-Regular.original.ttf",
128128
"fonts/NewTegomin-Regular.subset.ttf",
129129
new_tegomin,
130130
)
131131
make_subset(
132-
"fonts/tools/originals/NotoSansSymbols2-Regular.original.ttf",
133-
"fonts/NotoSansSymbols2-Regular.subset.ttf",
134-
noto_sans_symbols_2,
132+
"fonts/tools/_originals/NotoEmoji-VariableFont_wght.original.ttf",
133+
"fonts/NotoEmoji.subset.ttf",
134+
noto_emoji,
135135
)
-1.17 MB
Binary file not shown.

lib/pages/credits.dart

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ final Uri _notoSansDisplay = Uri.parse("https://fonts.google.com/noto/specimen/N
1414
final Uri _notoSansJP = Uri.parse("https://fonts.google.com/noto/specimen/Noto+Sans+JP");
1515
final Uri _notoSerifJP = Uri.parse("https://fonts.google.com/noto/specimen/Noto+Serif+JP");
1616
final Uri _newTegomin = Uri.parse("https://fonts.google.com/specimen/New+Tegomin");
17-
final Uri _notoSansSymbols2 = Uri.parse("https://fonts.google.com/noto/specimen/Noto+Sans+Symbols+2");
17+
final Uri _notoEmoji = Uri.parse("https://fonts.google.com/noto/specimen/Noto+Emoji");
1818
final Uri _minnaNoFlashcards = Uri.parse("https://play.google.com/store/apps/details?id=com.factory201.minnanoflashcards");
1919
// I know `Minna No Flashcards` has been pulled from the play store, but I can't find any other relevant link, so I'll leave it like this
2020

@@ -303,25 +303,22 @@ class Credits extends StatelessWidget {
303303
},
304304
),
305305
SettingsTile.navigation(
306-
leading: const Padding(
307-
padding: EdgeInsets.only(left: 3.0, bottom: 2.0, right: .0),
308-
child: SizedBox(
309-
height: 21.0,
310-
width: 21.0,
311-
child: Text(
312-
"\u2663",
313-
style: TextStyle(
314-
color: LightTheme.textColorDim,
315-
fontSize: 19,
316-
fontFamily: "NotoSansSymbols2",
317-
),
306+
leading: const SizedBox(
307+
height: 23.5,
308+
width: 23.5,
309+
child: Text(
310+
"\u2663",
311+
style: TextStyle(
312+
color: LightTheme.textColorDim,
313+
fontSize: 16,
314+
fontFamily: "NotoEmoji",
318315
),
319316
),
320317
),
321-
title: const Text("Noto Sans Symbols 2", style: cmonApplyTheFontPlease),
318+
title: const Text("Noto Emoji", style: cmonApplyTheFontPlease),
322319
onPressed: (context) async {
323-
if (await canLaunchUrl(_notoSansSymbols2)) {
324-
await launchUrl(_notoSansSymbols2);
320+
if (await canLaunchUrl(_notoEmoji)) {
321+
await launchUrl(_notoEmoji);
325322
}
326323
},
327324
),

pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,9 @@ flutter:
119119
- family: NewTegomin
120120
fonts:
121121
- asset: fonts/NewTegomin-Regular.subset.ttf
122-
- family: NotoSansSymbols2
122+
- family: NotoEmoji
123123
fonts:
124-
- asset: fonts/NotoSansSymbols2-Regular.subset.ttf
124+
- asset: fonts/NotoEmoji.subset.ttf
125125

126126
flutter_launcher_icons:
127127
image_path: "assets/icon.png"

0 commit comments

Comments
 (0)