Override with Nanum gothic

ubuntu-kr · Sep 4, 2023 · 4db841f · 4db841f
1 parent 6a68089
commit 4db841f
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 34 deletions.
diff --git a/lib/checkInByBarcodeScreen.dart b/lib/checkInByBarcodeScreen.dart
@@ -68,7 +68,7 @@ class _CheckInByBarcodeScreenState extends State<CheckInByBarcodeScreen> {
   Widget build(BuildContext context) {
     return Scaffold(
         appBar: AppBar(
-          title: Text('QR코드로 체크인'),
+          title: Text('QR Code Check-in'),
         ),
         body: Column(
           mainAxisAlignment: MainAxisAlignment.center,

diff --git a/lib/checkInByEmailScreen.dart b/lib/checkInByEmailScreen.dart
@@ -78,7 +78,7 @@ class _CheckInByEmailScreenState extends State<CheckInByEmailScreen> {
   Widget build(BuildContext context) {
     return Scaffold(
         appBar: AppBar(
-          title: Text('E-Mail 주소로 체크인'),
+          title: Text('E-Mail Check-in'),
         ),
         body: Column(
           // mainAxisAlignment: MainAxisAlignment.center,

diff --git a/lib/main.dart b/lib/main.dart
@@ -5,6 +5,7 @@ import 'checkInByEmailScreen.dart';
 import 'checkInByBarcodeScreen.dart';
 import 'package:yaru/yaru.dart';
 import 'kioskclient.dart';
+import 'package:google_fonts/google_fonts.dart';
 
 void main() {
   runApp(const MyApp());
@@ -17,26 +18,23 @@ class MyApp extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-
-    return YaruTheme(
-        data: const YaruThemeData(
-            variant: YaruVariant.orange, useMaterial3: true),
-        builder: (context, yaru, child) {
-          ThemeData customTheme = yaru.theme!.copyWith(
-              textTheme: yaru.theme!.textTheme.apply(
-                    fontFamily: 'Ubuntu',
-                    fontFamilyFallback: ['NotoSansCJK']
-                  ),
-              primaryTextTheme: yaru.theme!.textTheme.apply(
-                    fontFamily: 'Ubuntu',
-                    fontFamilyFallback: ['NotoSansCJK']
-                  ),
-          );
-          return MaterialApp(
-                  theme: customTheme,
-                  darkTheme: yaru.darkTheme,
-                  home: const KioskMainPage());
-        });
+    var yaru = YaruThemeData(variant: YaruVariant.orange, useMaterial3: true);
+    var yaruTheme = yaru.theme!;
+    var yaruDarkTheme = yaru.darkTheme!;
+    ThemeData customTheme = yaruTheme.copyWith(
+      textTheme: GoogleFonts.nanumGothicTextTheme(),
+      primaryTextTheme: GoogleFonts.nanumGothicTextTheme(),
+    );
+    ThemeData customThemeDark = yaruDarkTheme.copyWith(
+      textTheme: GoogleFonts.nanumGothicTextTheme(),
+      primaryTextTheme: GoogleFonts.nanumGothicTextTheme(),
+    );
+    print(customTheme.textTheme);
+    print(customThemeDark.textTheme);
+    return MaterialApp(
+        theme: customTheme,
+        darkTheme: customThemeDark,
+        home: const KioskMainPage());
   }
 }
 
@@ -98,7 +96,7 @@ class _KioskMainPageState extends State<KioskMainPage> {
   Widget build(BuildContext context) {
     return Scaffold(
         appBar: AppBar(
-          title: Text('UbuCon KR 체크인 키오스크'),
+          title: Text('UbuCon Korea Check-in'),
         ),
         body: Column(
           mainAxisAlignment: MainAxisAlignment.center,

diff --git a/pubspec.lock b/pubspec.lock
@@ -61,10 +61,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
+      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.1"
+    version: "1.17.2"
   convert:
     dependency: "direct main"
     description:
@@ -160,6 +160,14 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  google_fonts:
+    dependency: "direct main"
+    description:
+      name: google_fonts
+      sha256: e20ff62b158b96f392bfc8afe29dee1503c94fbea2cbe8186fd59b756b8ae982
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.1.0"
   gtk:
     dependency: transitive
     description:
@@ -212,18 +220,18 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
+      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.15"
+    version: "0.12.16"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.0"
+    version: "0.5.0"
   meta:
     dependency: transitive
     description:
@@ -248,6 +256,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.8.3"
+  path_provider:
+    dependency: transitive
+    description:
+      name: path_provider
+      sha256: a1aa8aaa2542a6bc57e381f132af822420216c80d4781f7aa085ca3229208aaa
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.1"
+  path_provider_android:
+    dependency: transitive
+    description:
+      name: path_provider_android
+      sha256: "6b8b19bd80da4f11ce91b2d1fb931f3006911477cec227cce23d3253d80df3f1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.0"
+  path_provider_foundation:
+    dependency: transitive
+    description:
+      name: path_provider_foundation
+      sha256: "19314d595120f82aca0ba62787d58dde2cc6b5df7d2f0daf72489e38d1b57f2d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.1"
   path_provider_linux:
     dependency: transitive
     description:
@@ -393,10 +425,10 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
+      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.10.0"
   sqlite3:
     dependency: "direct main"
     description:
@@ -441,10 +473,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
+      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.1"
+    version: "0.6.0"
   typed_data:
     dependency: transitive
     description:
@@ -461,6 +493,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
+  web:
+    dependency: transitive
+    description:
+      name: web
+      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.4-beta"
   win32:
     dependency: transitive
     description:
@@ -494,5 +534,5 @@ packages:
     source: hosted
     version: "1.1.0"
 sdks:
-  dart: ">=3.0.5 <4.0.0"
+  dart: ">=3.1.0-185.0.dev <4.0.0"
   flutter: ">=3.10.0"
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -47,6 +47,7 @@ dependencies:
   sqlite3: ^2.1.0
   shared_preferences: ^2.2.1
   http: ^1.1.0
+  google_fonts: ^5.1.0
   # quick_usb:
   #   git:
   #     url: https://github.com/ubuntu-kr/quick.flutter.git