[Fix] add more missing .useSystemChineseFont()

canxin121 · Jul 18, 2024 · 3923df8 · 3923df8
1 parent c0b60c1
commit 3923df8
Show file tree

Hide file tree

Showing 25 changed files with 217 additions and 131 deletions.
diff --git a/lib/comps/chores/badge.dart b/lib/comps/chores/badge.dart
@@ -1,3 +1,4 @@
+import 'package:chinese_font_library/chinese_font_library.dart';
 import 'package:flutter/material.dart';
 
 class Badge extends StatelessWidget {
@@ -33,7 +34,7 @@ class Badge extends StatelessWidget {
             fontSize: 11,
             fontWeight: FontWeight.bold,
             color: textColor,
-          ),
+          ).useSystemChineseFont(),
         ),
       ),
     );

diff --git a/lib/comps/music_container_comp/music_container_image_card.dart b/lib/comps/music_container_comp/music_container_image_card.dart
@@ -3,6 +3,7 @@ import 'package:app_rhyme/comps/music_container_comp/music_container_pulldown_me
 import 'package:app_rhyme/utils/colors.dart';
 import 'package:app_rhyme/utils/global_vars.dart';
 import 'package:app_rhyme/utils/source_helper.dart';
+import 'package:chinese_font_library/chinese_font_library.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:app_rhyme/types/music_container.dart';
 import 'package:app_rhyme/utils/cache_helper.dart';
@@ -79,6 +80,7 @@ class MusicContainerImageCard extends StatelessWidget {
                       musicContainer.info.name,
                       textAlign: TextAlign.center,
                       overflow: TextOverflow.ellipsis,
+                      style: const TextStyle().useSystemChineseFont(),
                     ),
                   ),
                 ),

diff --git a/lib/comps/music_container_comp/music_container_pulldown_menu.dart b/lib/comps/music_container_comp/music_container_pulldown_menu.dart
@@ -67,7 +67,10 @@ class _MusicContainerMenuState extends State<MusicContainerMenu> {
         if (snapshot.connectionState == ConnectionState.waiting) {
           return const CircularProgressIndicator();
         } else if (snapshot.hasError) {
-          return Text('Error: ${snapshot.error}');
+          return Text(
+            'Error: ${snapshot.error}',
+            style: TextStyle().useSystemChineseFont(),
+          );
         } else {
           bool hasCache = snapshot.data ?? false;
 

diff --git a/lib/comps/musiclist_comp/musiclist_image_card.dart b/lib/comps/musiclist_comp/musiclist_image_card.dart
@@ -26,7 +26,8 @@ class MusicListImageCard extends StatelessWidget {
     MusicListInfo musicListInfo = musicListW.getMusiclistInfo();
     final Brightness brightness = MediaQuery.of(context).platformBrightness;
     final bool isDarkMode = brightness == Brightness.dark;
-
+    final Color textCOlor =
+        isDarkMode ? CupertinoColors.white : CupertinoColors.black;
     Widget cardContent = Column(
       mainAxisSize: MainAxisSize.min,
       crossAxisAlignment: CrossAxisAlignment.center,
@@ -72,9 +73,9 @@ class MusicListImageCard extends StatelessWidget {
           child: Center(
             child: Text(
               musicListInfo.name,
-              style: CupertinoTheme.of(context).textTheme.navTitleTextStyle,
               textAlign: TextAlign.center,
               overflow: TextOverflow.ellipsis,
+              style: TextStyle(color: textCOlor).useSystemChineseFont(),
             ),
           ),
         ),

diff --git a/lib/comps/musiclist_comp/musiclist_list_item.dart b/lib/comps/musiclist_comp/musiclist_list_item.dart
@@ -4,6 +4,7 @@ import 'package:app_rhyme/src/rust/api/bind/type_bind.dart';
 import 'package:app_rhyme/utils/cache_helper.dart';
 import 'package:app_rhyme/utils/colors.dart';
 import 'package:app_rhyme/utils/source_helper.dart';
+import 'package:chinese_font_library/chinese_font_library.dart';
 import 'package:flutter/cupertino.dart';
 
 class MusicListListItem extends StatelessWidget {
@@ -62,7 +63,7 @@ class MusicListListItem extends StatelessWidget {
                       color: isDarkMode
                           ? CupertinoColors.systemGrey5
                           : CupertinoColors.black,
-                    ),
+                    ).useSystemChineseFont(),
                   ),
                   const SizedBox(height: 2),
                   Text(
@@ -74,7 +75,7 @@ class MusicListListItem extends StatelessWidget {
                       color: isDarkMode
                           ? CupertinoColors.systemGrey4
                           : CupertinoColors.inactiveGray,
-                    ),
+                    ).useSystemChineseFont(),
                   ),
                 ],
               ),

diff --git a/lib/comps/play_display_comp/lyric.dart b/lib/comps/play_display_comp/lyric.dart
@@ -51,7 +51,7 @@ class LyricDisplayState extends State<LyricDisplay> {
           emptyBuilder: () => Center(
             child: Text(
               "No lyrics",
-              style: lyricUI.getOtherMainTextStyle(),
+              style: lyricUI.getOtherMainTextStyle().useSystemChineseFont(),
             ),
           ),
           model: lyricModel,

diff --git a/lib/comps/play_display_comp/music_control_bar.dart b/lib/comps/play_display_comp/music_control_bar.dart
@@ -1,3 +1,4 @@
+import 'package:chinese_font_library/chinese_font_library.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:get/get.dart';
 import 'package:app_rhyme/pages/play_display_page.dart';
@@ -71,7 +72,8 @@ class _MusicControlBarState extends State<MusicControlBar>
                 child: Obx(
                   () => Text(
                     globalAudioHandler.playingMusic.value?.info.name ?? "Music",
-                    style: TextStyle(fontSize: 15.0, color: textColor),
+                    style: TextStyle(fontSize: 15.0, color: textColor)
+                        .useSystemChineseFont(),
                     textAlign: TextAlign.left,
                     overflow: TextOverflow.ellipsis,
                     maxLines: 1,

diff --git a/lib/dialogs/confirm_dialog.dart b/lib/dialogs/confirm_dialog.dart
@@ -1,3 +1,4 @@
+import 'package:chinese_font_library/chinese_font_library.dart';
 import 'package:flutter/cupertino.dart';
 
 Future<bool?> showConfirmationDialog(BuildContext context, String body) async {
@@ -12,7 +13,7 @@ Future<bool?> showConfirmationDialog(BuildContext context, String body) async {
           body,
           style: TextStyle(
             color: isDarkMode ? CupertinoColors.white : CupertinoColors.black,
-          ),
+          ).useSystemChineseFont(),
         ),
         actions: <Widget>[
           CupertinoActionSheetAction(
@@ -24,7 +25,7 @@ Future<bool?> showConfirmationDialog(BuildContext context, String body) async {
               style: TextStyle(
                 color:
                     isDarkMode ? CupertinoColors.white : CupertinoColors.black,
-              ),
+              ).useSystemChineseFont(),
             ),
           ),
           CupertinoActionSheetAction(
@@ -37,7 +38,7 @@ Future<bool?> showConfirmationDialog(BuildContext context, String body) async {
                 color: isDarkMode
                     ? CupertinoColors.systemGrey2
                     : CupertinoColors.activeBlue,
-              ),
+              ).useSystemChineseFont(),
             ),
           )
         ],

diff --git a/lib/dialogs/extern_api_update_dialog.dart b/lib/dialogs/extern_api_update_dialog.dart
@@ -29,13 +29,19 @@ Future<bool> showExternApiUpdateDialog(BuildContext context) async {
         ),
         actions: [
           CupertinoDialogAction(
-            child: const Text('更新'),
+            child: Text(
+              '更新',
+              style: const TextStyle().useSystemChineseFont(),
+            ),
             onPressed: () async {
               Navigator.of(context).pop(true);
             },
           ),
           CupertinoDialogAction(
-            child: const Text('关闭'),
+            child: Text(
+              '关闭',
+              style: const TextStyle().useSystemChineseFont(),
+            ),
             onPressed: () {
               Navigator.of(context).pop(false);
             },

diff --git a/lib/dialogs/input_extern_api_link_dialog.dart b/lib/dialogs/input_extern_api_link_dialog.dart
@@ -1,3 +1,4 @@
+import 'package:chinese_font_library/chinese_font_library.dart';
 import 'package:flutter/cupertino.dart';
 
 Future<String?> showInputExternApiLinkDialog(BuildContext context) async {
@@ -26,7 +27,7 @@ Future<String?> showInputExternApiLinkDialog(BuildContext context) async {
                 color: isDarkMode
                     ? CupertinoColors.systemGrey4
                     : CupertinoColors.black,
-              ),
+              ).useSystemChineseFont(),
             ),
             const SizedBox(height: 10),
             Text(
@@ -35,7 +36,7 @@ Future<String?> showInputExternApiLinkDialog(BuildContext context) async {
                 color: isDarkMode
                     ? CupertinoColors.systemGrey4
                     : CupertinoColors.black,
-              ),
+              ).useSystemChineseFont(),
             ),
             Text(
               '1. https://github.com/user/project/releases/download/release/extern_api.evc\n'
@@ -45,7 +46,7 @@ Future<String?> showInputExternApiLinkDialog(BuildContext context) async {
                 color: isDarkMode
                     ? CupertinoColors.systemGrey2
                     : CupertinoColors.systemGrey,
-              ),
+              ).useSystemChineseFont(),
             ),
             const SizedBox(height: 10),
             CupertinoTextField(
@@ -77,7 +78,7 @@ Future<String?> showInputExternApiLinkDialog(BuildContext context) async {
                 color: isDarkMode
                     ? CupertinoColors.systemGrey2
                     : CupertinoColors.activeBlue,
-              ),
+              ).useSystemChineseFont(),
             ),
             onPressed: () {
               Navigator.of(context).pop();
@@ -90,7 +91,7 @@ Future<String?> showInputExternApiLinkDialog(BuildContext context) async {
                 color: isDarkMode
                     ? CupertinoColors.systemGrey2
                     : CupertinoColors.activeBlue,
-              ),
+              ).useSystemChineseFont(),
             ),
             onPressed: () {
               Navigator.of(context).pop(textEditingController.text);

diff --git a/lib/dialogs/input_musiclist_sharelink_dialog.dart b/lib/dialogs/input_musiclist_sharelink_dialog.dart
@@ -1,3 +1,4 @@
+import 'package:chinese_font_library/chinese_font_library.dart';
 import 'package:flutter/cupertino.dart';
 
 Future<String?> showInputPlaylistShareLinkDialog(BuildContext context) async {
@@ -15,7 +16,7 @@ Future<String?> showInputPlaylistShareLinkDialog(BuildContext context) async {
           '打开歌单',
           style: TextStyle(
             color: isDarkMode ? CupertinoColors.white : CupertinoColors.black,
-          ),
+          ).useSystemChineseFont(),
         ),
         content: Column(
           children: [
@@ -26,7 +27,7 @@ Future<String?> showInputPlaylistShareLinkDialog(BuildContext context) async {
                 color: isDarkMode
                     ? CupertinoColors.systemGrey4
                     : CupertinoColors.black,
-              ),
+              ).useSystemChineseFont(),
             ),
             const SizedBox(height: 10),
             Text(
@@ -35,7 +36,7 @@ Future<String?> showInputPlaylistShareLinkDialog(BuildContext context) async {
                 color: isDarkMode
                     ? CupertinoColors.systemGrey4
                     : CupertinoColors.black,
-              ),
+              ).useSystemChineseFont(),
             ),
             Text(
               '1. https://y.music.163.com/m/playlist?app_version=8.9.20&id=123456789\n'
@@ -45,7 +46,7 @@ Future<String?> showInputPlaylistShareLinkDialog(BuildContext context) async {
                 color: isDarkMode
                     ? CupertinoColors.systemGrey2
                     : CupertinoColors.systemGrey,
-              ),
+              ).useSystemChineseFont(),
             ),
             const SizedBox(height: 10),
             CupertinoTextField(
@@ -77,7 +78,7 @@ Future<String?> showInputPlaylistShareLinkDialog(BuildContext context) async {
                 color: isDarkMode
                     ? CupertinoColors.systemGrey2
                     : CupertinoColors.activeBlue,
-              ),
+              ).useSystemChineseFont(),
             ),
             onPressed: () {
               Navigator.of(context).pop();
@@ -90,7 +91,7 @@ Future<String?> showInputPlaylistShareLinkDialog(BuildContext context) async {
                 color: isDarkMode
                     ? CupertinoColors.systemGrey2
                     : CupertinoColors.activeBlue,
-              ),
+              ).useSystemChineseFont(),
             ),
             onPressed: () {
               Navigator.of(context).pop(textEditingController.text);

diff --git a/lib/dialogs/music_fuzz_filter_dialog.dart b/lib/dialogs/music_fuzz_filter_dialog.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 
 import 'package:app_rhyme/src/rust/api/bind/mirrors.dart';
+import 'package:chinese_font_library/chinese_font_library.dart';
 import 'package:flutter/cupertino.dart';
 
 Future<MusicFuzzFilter?> showMusicFuzzFilterDialog(BuildContext context,
@@ -58,7 +59,7 @@ class MusicFuzzFilterDialogState extends State<MusicFuzzFilterDialog> {
         title,
         style: TextStyle(
           color: isDarkMode ? CupertinoColors.white : CupertinoColors.black,
-        ),
+        ).useSystemChineseFont(),
       ),
       content: Column(
         mainAxisSize: MainAxisSize.min,
@@ -145,7 +146,7 @@ class MusicFuzzFilterDialogState extends State<MusicFuzzFilterDialog> {
                 color: isDarkMode
                     ? CupertinoColors.systemGrey2
                     : CupertinoColors.activeBlue,
-              ),
+              ).useSystemChineseFont(),
             ),
             onPressed: () {
               Navigator.of(context).pop();
@@ -172,7 +173,7 @@ class MusicFuzzFilterDialogState extends State<MusicFuzzFilterDialog> {
                 color: isDarkMode
                     ? CupertinoColors.systemGrey2
                     : CupertinoColors.activeBlue,
-              ),
+              ).useSystemChineseFont(),
             ),
           ),
         if (widget.readonly)
@@ -187,7 +188,7 @@ class MusicFuzzFilterDialogState extends State<MusicFuzzFilterDialog> {
                 color: isDarkMode
                     ? CupertinoColors.systemGrey2
                     : CupertinoColors.activeBlue,
-              ),
+              ).useSystemChineseFont(),
             ),
           ),
       ],

diff --git a/lib/dialogs/quality_select_dialog.dart b/lib/dialogs/quality_select_dialog.dart
@@ -1,4 +1,5 @@
 import 'package:app_rhyme/utils/quality_picker.dart';
+import 'package:chinese_font_library/chinese_font_library.dart';
 import 'package:flutter/cupertino.dart';
 
 Future<QualityOption?> showQualityOptionDialog(BuildContext context) async {
@@ -13,7 +14,7 @@ Future<QualityOption?> showQualityOptionDialog(BuildContext context) async {
           '选择音质选项',
           style: TextStyle(
             color: isDarkMode ? CupertinoColors.white : CupertinoColors.black,
-          ),
+          ).useSystemChineseFont(),
         ),
         actions: <Widget>[
           CupertinoActionSheetAction(
@@ -25,7 +26,7 @@ Future<QualityOption?> showQualityOptionDialog(BuildContext context) async {
               style: TextStyle(
                 color:
                     isDarkMode ? CupertinoColors.white : CupertinoColors.black,
-              ),
+              ).useSystemChineseFont(),
             ),
           ),
           CupertinoActionSheetAction(
@@ -37,7 +38,7 @@ Future<QualityOption?> showQualityOptionDialog(BuildContext context) async {
               style: TextStyle(
                 color:
                     isDarkMode ? CupertinoColors.white : CupertinoColors.black,
-              ),
+              ).useSystemChineseFont(),
             ),
           ),
           CupertinoActionSheetAction(
@@ -49,7 +50,7 @@ Future<QualityOption?> showQualityOptionDialog(BuildContext context) async {
               style: TextStyle(
                 color:
                     isDarkMode ? CupertinoColors.white : CupertinoColors.black,
-              ),
+              ).useSystemChineseFont(),
             ),
           ),
           CupertinoActionSheetAction(
@@ -61,7 +62,7 @@ Future<QualityOption?> showQualityOptionDialog(BuildContext context) async {
               style: TextStyle(
                 color:
                     isDarkMode ? CupertinoColors.white : CupertinoColors.black,
-              ),
+              ).useSystemChineseFont(),
             ),
           ),
         ],
@@ -75,7 +76,7 @@ Future<QualityOption?> showQualityOptionDialog(BuildContext context) async {
               color: isDarkMode
                   ? CupertinoColors.systemGrey2
                   : CupertinoColors.activeBlue,
-            ),
+            ).useSystemChineseFont(),
           ),
         ),
       );