Skip to content

Commit 30ae4f0

Browse files
CoreNionCoreNion
committed
[UI] フォントをNoto Sans JPに統一
1 parent 852156a commit 30ae4f0

7 files changed

Lines changed: 123 additions & 16 deletions

File tree

original_media/FileTrucker.svg renamed to assets/FileTrucker.svg

File renamed without changes.

original_media/FileTrucker_without_backgroud.svg renamed to assets/FileTrucker_without_backgroud.svg

File renamed without changes.

‎assets/fonts/NotoSansJP-Bold.otf‎

4.47 MB
Binary file not shown.

‎assets/fonts/NotoSansJP-Regular.otf‎

4.34 MB
Binary file not shown.

‎assets/fonts/OFL.txt‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
Copyright 2012 Google Inc. All Rights Reserved.
2+
3+
This Font Software is licensed under the SIL Open Font License, Version 1.1.
4+
This license is copied below, and is also available with a FAQ at:
5+
http://scripts.sil.org/OFL
6+
7+
8+
-----------------------------------------------------------
9+
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
10+
-----------------------------------------------------------
11+
12+
PREAMBLE
13+
The goals of the Open Font License (OFL) are to stimulate worldwide
14+
development of collaborative font projects, to support the font creation
15+
efforts of academic and linguistic communities, and to provide a free and
16+
open framework in which fonts may be shared and improved in partnership
17+
with others.
18+
19+
The OFL allows the licensed fonts to be used, studied, modified and
20+
redistributed freely as long as they are not sold by themselves. The
21+
fonts, including any derivative works, can be bundled, embedded,
22+
redistributed and/or sold with any software provided that any reserved
23+
names are not used by derivative works. The fonts and derivatives,
24+
however, cannot be released under any other type of license. The
25+
requirement for fonts to remain under this license does not apply
26+
to any document created using the fonts or their derivatives.
27+
28+
DEFINITIONS
29+
"Font Software" refers to the set of files released by the Copyright
30+
Holder(s) under this license and clearly marked as such. This may
31+
include source files, build scripts and documentation.
32+
33+
"Reserved Font Name" refers to any names specified as such after the
34+
copyright statement(s).
35+
36+
"Original Version" refers to the collection of Font Software components as
37+
distributed by the Copyright Holder(s).
38+
39+
"Modified Version" refers to any derivative made by adding to, deleting,
40+
or substituting -- in part or in whole -- any of the components of the
41+
Original Version, by changing formats or by porting the Font Software to a
42+
new environment.
43+
44+
"Author" refers to any designer, engineer, programmer, technical
45+
writer or other person who contributed to the Font Software.
46+
47+
PERMISSION & CONDITIONS
48+
Permission is hereby granted, free of charge, to any person obtaining
49+
a copy of the Font Software, to use, study, copy, merge, embed, modify,
50+
redistribute, and sell modified and unmodified copies of the Font
51+
Software, subject to the following conditions:
52+
53+
1) Neither the Font Software nor any of its individual components,
54+
in Original or Modified Versions, may be sold by itself.
55+
56+
2) Original or Modified Versions of the Font Software may be bundled,
57+
redistributed and/or sold with any software, provided that each copy
58+
contains the above copyright notice and this license. These can be
59+
included either as stand-alone text files, human-readable headers or
60+
in the appropriate machine-readable metadata fields within text or
61+
binary files as long as those fields can be easily viewed by the user.
62+
63+
3) No Modified Version of the Font Software may use the Reserved Font
64+
Name(s) unless explicit written permission is granted by the corresponding
65+
Copyright Holder. This restriction only applies to the primary font name as
66+
presented to the users.
67+
68+
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
69+
Software shall not be used to promote, endorse or advertise any
70+
Modified Version, except to acknowledge the contribution(s) of the
71+
Copyright Holder(s) and the Author(s) or with their explicit written
72+
permission.
73+
74+
5) The Font Software, modified or unmodified, in part or in whole,
75+
must be distributed entirely under this license, and must not be
76+
distributed under any other license. The requirement for fonts to
77+
remain under this license does not apply to any document created
78+
using the Font Software.
79+
80+
TERMINATION
81+
This license becomes null and void if any of the above conditions are
82+
not met.
83+
84+
DISCLAIMER
85+
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
86+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
87+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
88+
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
89+
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
90+
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
91+
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
92+
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
93+
OTHER DEALINGS IN THE FONT SOFTWARE.

‎lib/main.dart‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import 'package:flutter/foundation.dart';
2+
import 'package:flutter/services.dart' show rootBundle;
13
import 'package:flutter/material.dart';
24
import 'package:flutter/scheduler.dart';
35
import 'package:flutter_svg/flutter_svg.dart';
@@ -29,9 +31,16 @@ class _MyAppState extends State<MyApp> {
2931
return MaterialApp(
3032
title: 'Open FileTrucker',
3133
theme: ThemeData(
34+
fontFamily: 'Noto Sans JP',
3235
primarySwatch: Colors.green,
3336
),
3437
darkTheme: ThemeData.dark().copyWith(
38+
textTheme: ThemeData.dark().textTheme.apply(
39+
fontFamily: 'Noto Sans JP',
40+
),
41+
primaryTextTheme: ThemeData.dark().textTheme.apply(
42+
fontFamily: 'Noto Sans JP',
43+
),
3544
colorScheme: ColorScheme.fromSwatch(
3645
primarySwatch: Colors.lightGreen,
3746
brightness: Brightness.dark,
@@ -58,15 +67,25 @@ class _MyAppState extends State<MyApp> {
5867
IconButton(
5968
icon: const Icon(Icons.info),
6069
onPressed: () async {
70+
final ofl = await rootBundle
71+
.loadString("assets/fonts/OFL.txt");
72+
LicenseRegistry.addLicense(() {
73+
return Stream<LicenseEntry>.fromIterable(<
74+
LicenseEntry>[
75+
LicenseEntryWithLineBreaks(
76+
<String>['Noto Sans JP'], ofl)
77+
]);
78+
});
6179
PackageInfo packageInfo =
6280
await PackageInfo.fromPlatform();
81+
6382
showAboutDialog(
6483
context: context,
6584
applicationIcon: ClipRRect(
6685
borderRadius: const BorderRadius.all(
6786
Radius.circular(12)),
6887
child: SvgPicture.asset(
69-
'original_media/FileTrucker.svg',
88+
'assets/FileTrucker.svg',
7089
width: 80,
7190
height: 80,
7291
)),

‎pubspec.yaml‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ flutter:
7474
# - images/a_dot_burr.jpeg
7575
# - images/a_dot_ham.jpeg
7676
assets:
77-
- original_media/FileTrucker.svg
77+
- assets/FileTrucker.svg
78+
- assets/fonts/OFL.txt
7879

7980
# An image asset can refer to one or more resolution-specific "variants", see
8081
# https://flutter.dev/assets-and-images/#resolution-aware.
@@ -85,19 +86,13 @@ flutter:
8586
# To add custom fonts to your application, add a fonts section here,
8687
# in this "flutter" section. Each entry in this list should have a
8788
# "family" key with the font family name, and a "fonts" key with a
88-
# list giving the asset and other descriptors for the font. For
89-
# example:
90-
# fonts:
91-
# - family: Schyler
92-
# fonts:
93-
# - asset: fonts/Schyler-Regular.ttf
94-
# - asset: fonts/Schyler-Italic.ttf
95-
# style: italic
96-
# - family: Trajan Pro
97-
# fonts:
98-
# - asset: fonts/TrajanPro.ttf
99-
# - asset: fonts/TrajanPro_Bold.ttf
100-
# weight: 700
101-
#
89+
# list giving the asset and other descriptors for the font.
10290
# For details regarding fonts from package dependencies,
10391
# see https://flutter.dev/custom-fonts/#from-packages
92+
93+
fonts:
94+
- family: Noto Sans JP
95+
fonts:
96+
- asset: assets/fonts/NotoSansJP-Regular.otf
97+
- asset: assets/fonts/NotoSansJP-Bold.otf
98+
weight: 700

0 commit comments

Comments
 (0)