diff --git a/assets/fonts/HYQiHei-60S.ttf b/assets/fonts/HYQiHei-60S.ttf new file mode 100644 index 0000000..1cbffc1 Binary files /dev/null and b/assets/fonts/HYQiHei-60S.ttf differ diff --git a/assets/fonts/HYQiHei-80S.ttf b/assets/fonts/HYQiHei-80S.ttf new file mode 100644 index 0000000..7d3b979 Binary files /dev/null and b/assets/fonts/HYQiHei-80S.ttf differ diff --git a/assets/fonts/VWHead-Bold.otf b/assets/fonts/VWHead-Bold.otf new file mode 100644 index 0000000..954f2e9 Binary files /dev/null and b/assets/fonts/VWHead-Bold.otf differ diff --git a/assets/fonts/VWHead-Regular.otf b/assets/fonts/VWHead-Regular.otf new file mode 100644 index 0000000..4548bf5 Binary files /dev/null and b/assets/fonts/VWHead-Regular.otf differ diff --git a/assets/fonts/iconfont.ttf b/assets/fonts/iconfont.ttf new file mode 100644 index 0000000..30d7cac Binary files /dev/null and b/assets/fonts/iconfont.ttf differ diff --git a/lib/themes/AppTheme.dart b/lib/themes/AppTheme.dart index 50ea204..24a4a16 100644 --- a/lib/themes/AppTheme.dart +++ b/lib/themes/AppTheme.dart @@ -1,10 +1,17 @@ +import 'package:basic_intl/intl.dart'; import 'package:flutter/material.dart'; class AppTheme { + + static String _getLocaleAwareFontFamily() { + final isChinese = Intl.getCurrentLocale().startsWith('zh'); + return isChinese ? 'HYQiHei_Regular' : 'VWHead_Regular'; + } + static final ThemeData lightTheme = ThemeData( primaryColor: const Color(0xFF6C63FF), scaffoldBackgroundColor: Colors.white, - fontFamily: 'Roboto', + fontFamily: _getLocaleAwareFontFamily(), colorScheme: ColorScheme.fromSeed( seedColor: const Color(0xFF6C63FF), brightness: Brightness.light, @@ -14,7 +21,7 @@ class AppTheme { static final ThemeData darkTheme = ThemeData( primaryColor: const Color(0xFF6C63FF), scaffoldBackgroundColor: const Color(0xFF121212), - fontFamily: 'Roboto', + fontFamily: _getLocaleAwareFontFamily(), colorScheme: ColorScheme.fromSeed( seedColor: const Color(0xFF6C63FF), brightness: Brightness.dark, diff --git a/pubspec.yaml b/pubspec.yaml index 4e4bd22..b6aba21 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -26,4 +26,17 @@ dev_dependencies: flutter: uses-material-design: true assets: - - assets/images/ \ No newline at end of file + - assets/images/ + fonts: + - family: VWHead_Bold + fonts: + - asset: assets/fonts/VWHead-Bold.otf + - family: VWHead_Regular + fonts: + - asset: assets/fonts/VWHead-Regular.otf + - family: HYQiHei_Bold + fonts: + - asset: assets/fonts/HYQiHei-80S.ttf + - family: HYQiHei_Regular + fonts: + - asset: assets/fonts/HYQiHei-60S.ttf \ No newline at end of file