Feat: Set app-wide font

KNKPA · May 25, 2024 · 84dc2ad · 84dc2ad
1 parent 65fbeb0
commit 84dc2ad
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 4 deletions.
diff --git a/assets/fonts/NotoSerifHK-Black.ttf b/assets/fonts/NotoSerifHK-Black.ttf
diff --git a/assets/fonts/NotoSerifHK-Bold.ttf b/assets/fonts/NotoSerifHK-Bold.ttf
diff --git a/assets/fonts/NotoSerifHK-ExtraBold.ttf b/assets/fonts/NotoSerifHK-ExtraBold.ttf
diff --git a/assets/fonts/NotoSerifHK-ExtraLight.ttf b/assets/fonts/NotoSerifHK-ExtraLight.ttf
diff --git a/assets/fonts/NotoSerifHK-Light.ttf b/assets/fonts/NotoSerifHK-Light.ttf
diff --git a/assets/fonts/NotoSerifHK-Medium.ttf b/assets/fonts/NotoSerifHK-Medium.ttf
diff --git a/assets/fonts/NotoSerifHK-Regular.ttf b/assets/fonts/NotoSerifHK-Regular.ttf
diff --git a/assets/fonts/NotoSerifHK-SemiBold.ttf b/assets/fonts/NotoSerifHK-SemiBold.ttf
diff --git a/assets/fonts/NotoSerifHK-VariableFont_wght.ttf b/assets/fonts/NotoSerifHK-VariableFont_wght.ttf
diff --git a/lib/app_widget.dart b/lib/app_widget.dart
@@ -2,6 +2,7 @@ import 'dart:io';
 import 'package:adaptive_theme/adaptive_theme.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_modular/flutter_modular.dart';
+import 'package:google_fonts/google_fonts.dart';
 import 'package:knkpanime/navigation.dart';
 import 'package:knkpanime/utils/utils.dart';
 import 'package:flutter_displaymode/flutter_displaymode.dart';
@@ -29,8 +30,10 @@ class _AppWidgetState extends State<AppWidget> {
       } catch (_) {}
     }
     return AdaptiveTheme(
-        light: ThemeData.light(useMaterial3: true),
-        dark: ThemeData.dark(useMaterial3: true),
+        light: ThemeData.light(useMaterial3: true)
+            .copyWith(textTheme: GoogleFonts.notoSerifHkTextTheme()),
+        dark: ThemeData.dark(useMaterial3: true)
+            .copyWith(textTheme: GoogleFonts.notoSerifHkTextTheme()),
         initial: AdaptiveThemeMode.light,
         builder: (theme, darkTheme) => MaterialApp.router(
             title: "KNKP Anime",

diff --git a/lib/navigation.dart b/lib/navigation.dart
@@ -98,7 +98,11 @@ class _SideMenuState extends State<SideMenu> {
     var listContent = <Widget>[];
     listContent
         .addAll(routes.where((e) => !(e['bottom'] as bool)).map((e) => ListTile(
-              title: Text(e['name'] as String),
+              title: Text(e['name'] as String,
+                  style: Theme.of(context)
+                      .textTheme
+                      .bodyLarge
+                      ?.copyWith(color: Colors.white)),
               leading: e['icon'] as Widget,
               onTap: () {
                 _onItemTapped(routes.indexOf(e));
@@ -109,7 +113,11 @@ class _SideMenuState extends State<SideMenu> {
     listContent.add(const Spacer());
     listContent
         .addAll(routes.where((e) => e['bottom'] as bool).map((e) => ListTile(
-              title: Text(e['name'] as String),
+              title: Text(e['name'] as String,
+                  style: Theme.of(context)
+                      .textTheme
+                      .bodyLarge
+                      ?.copyWith(color: Colors.white)),
               leading: e['icon'] as Widget,
               onTap: () {
                 _onItemTapped(routes.indexOf(e));

diff --git a/pubspec.lock b/pubspec.lock
@@ -455,6 +455,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.2"
+  google_fonts:
+    dependency: "direct main"
+    description:
+      name: google_fonts
+      sha256: b1ac0fe2832c9cc95e5e88b57d627c5e68c223b9657f4b96e1487aa9098c7b82
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.2.1"
   graphs:
     dependency: transitive
     description:

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -55,6 +55,7 @@ dependencies:
   media_kit: ^1.1.10
   media_kit_video: ^1.2.4
   media_kit_libs_video: ^1.0.4
+  google_fonts: ^6.2.1
   flutter_inappwebview: 
     git:
       url: https://github.com/songbirdzz/flutter_inappwebview
@@ -124,6 +125,7 @@ flutter:
   assets:
     - assets/
     - assets/images/
+    - assets/fonts/
 
   # The following line ensures that the Material Icons font is
   # included with your application, so that you can use the icons in