diff --git a/assets/fonts/NotoSerifHK-Black.ttf b/assets/fonts/NotoSerifHK-Black.ttf new file mode 100644 index 0000000..334e342 Binary files /dev/null and b/assets/fonts/NotoSerifHK-Black.ttf differ diff --git a/assets/fonts/NotoSerifHK-Bold.ttf b/assets/fonts/NotoSerifHK-Bold.ttf new file mode 100644 index 0000000..98c7806 Binary files /dev/null and b/assets/fonts/NotoSerifHK-Bold.ttf differ diff --git a/assets/fonts/NotoSerifHK-ExtraBold.ttf b/assets/fonts/NotoSerifHK-ExtraBold.ttf new file mode 100644 index 0000000..824c13f Binary files /dev/null and b/assets/fonts/NotoSerifHK-ExtraBold.ttf differ diff --git a/assets/fonts/NotoSerifHK-ExtraLight.ttf b/assets/fonts/NotoSerifHK-ExtraLight.ttf new file mode 100644 index 0000000..65703af Binary files /dev/null and b/assets/fonts/NotoSerifHK-ExtraLight.ttf differ diff --git a/assets/fonts/NotoSerifHK-Light.ttf b/assets/fonts/NotoSerifHK-Light.ttf new file mode 100644 index 0000000..66858da Binary files /dev/null and b/assets/fonts/NotoSerifHK-Light.ttf differ diff --git a/assets/fonts/NotoSerifHK-Medium.ttf b/assets/fonts/NotoSerifHK-Medium.ttf new file mode 100644 index 0000000..f5e81c9 Binary files /dev/null and b/assets/fonts/NotoSerifHK-Medium.ttf differ diff --git a/assets/fonts/NotoSerifHK-Regular.ttf b/assets/fonts/NotoSerifHK-Regular.ttf new file mode 100644 index 0000000..e2fdd1d Binary files /dev/null and b/assets/fonts/NotoSerifHK-Regular.ttf differ diff --git a/assets/fonts/NotoSerifHK-SemiBold.ttf b/assets/fonts/NotoSerifHK-SemiBold.ttf new file mode 100644 index 0000000..879960a Binary files /dev/null and b/assets/fonts/NotoSerifHK-SemiBold.ttf differ diff --git a/assets/fonts/NotoSerifHK-VariableFont_wght.ttf b/assets/fonts/NotoSerifHK-VariableFont_wght.ttf new file mode 100644 index 0000000..c98eef5 Binary files /dev/null and b/assets/fonts/NotoSerifHK-VariableFont_wght.ttf differ diff --git a/lib/app_widget.dart b/lib/app_widget.dart index 7ec2169..a6ebf1b 100644 --- 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 { } 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 index f8ae46e..de664d7 100644 --- a/lib/navigation.dart +++ b/lib/navigation.dart @@ -98,7 +98,11 @@ class _SideMenuState extends State { var listContent = []; 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 { 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 index 2436e74..03109f6 100644 --- 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 index 0d03acf..0e94a09 100644 --- 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