From 3923df80de91e562bd2413011d37ab0983159e80 Mon Sep 17 00:00:00 2001 From: canxin Date: Thu, 18 Jul 2024 15:14:22 +0800 Subject: [PATCH] [Fix] add more missing .useSystemChineseFont() --- lib/comps/chores/badge.dart | 3 +- .../music_container_image_card.dart | 2 + .../music_container_pulldown_menu.dart | 5 +- .../musiclist_comp/musiclist_image_card.dart | 5 +- .../musiclist_comp/musiclist_list_item.dart | 5 +- lib/comps/play_display_comp/lyric.dart | 2 +- .../play_display_comp/music_control_bar.dart | 4 +- lib/dialogs/confirm_dialog.dart | 7 +- lib/dialogs/extern_api_update_dialog.dart | 10 +- lib/dialogs/input_extern_api_link_dialog.dart | 11 +- .../input_musiclist_sharelink_dialog.dart | 13 ++- lib/dialogs/music_fuzz_filter_dialog.dart | 9 +- lib/dialogs/quality_select_dialog.dart | 13 ++- lib/dialogs/user_aggrement_dialog.dart | 47 +++++--- lib/dialogs/version_update_dialog.dart | 17 ++- lib/dialogs/wait_dialog.dart | 3 +- lib/pages/local_music_list_gridview_page.dart | 13 ++- lib/pages/more_page.dart | 104 +++++++++++------- ...select_local_music_list_gridview_page.dart | 4 +- ..._select_music_container_listview_page.dart | 7 +- ...elect_online_music_list_gridview_page.dart | 6 +- .../reorder_local_music_list_grid_page.dart | 5 +- .../reorder_local_music_list_page.dart | 5 +- .../search_music_aggregator_page.dart | 34 +++--- .../search_page/search_music_list_page.dart | 14 ++- 25 files changed, 217 insertions(+), 131 deletions(-) diff --git a/lib/comps/chores/badge.dart b/lib/comps/chores/badge.dart index 93087ef..d0159e7 100644 --- 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 index 9ba7550..4dcedc2 100644 --- 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 index 02d0322..d5d82c8 100644 --- 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 { 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 index e48e5ea..d30112e 100644 --- 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 index 7259af6..da8772c 100644 --- 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 index 9fbb69a..c60497d 100644 --- a/lib/comps/play_display_comp/lyric.dart +++ b/lib/comps/play_display_comp/lyric.dart @@ -51,7 +51,7 @@ class LyricDisplayState extends State { 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 index d9c9c7b..4c261c1 100644 --- 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 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 index d85edf9..a366ea4 100644 --- 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 showConfirmationDialog(BuildContext context, String body) async { @@ -12,7 +13,7 @@ Future showConfirmationDialog(BuildContext context, String body) async { body, style: TextStyle( color: isDarkMode ? CupertinoColors.white : CupertinoColors.black, - ), + ).useSystemChineseFont(), ), actions: [ CupertinoActionSheetAction( @@ -24,7 +25,7 @@ Future showConfirmationDialog(BuildContext context, String body) async { style: TextStyle( color: isDarkMode ? CupertinoColors.white : CupertinoColors.black, - ), + ).useSystemChineseFont(), ), ), CupertinoActionSheetAction( @@ -37,7 +38,7 @@ Future 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 index c153a44..5b8b72a 100644 --- a/lib/dialogs/extern_api_update_dialog.dart +++ b/lib/dialogs/extern_api_update_dialog.dart @@ -29,13 +29,19 @@ Future 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 index a645ee6..80722cb 100644 --- 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 showInputExternApiLinkDialog(BuildContext context) async { @@ -26,7 +27,7 @@ Future showInputExternApiLinkDialog(BuildContext context) async { color: isDarkMode ? CupertinoColors.systemGrey4 : CupertinoColors.black, - ), + ).useSystemChineseFont(), ), const SizedBox(height: 10), Text( @@ -35,7 +36,7 @@ Future 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 showInputExternApiLinkDialog(BuildContext context) async { color: isDarkMode ? CupertinoColors.systemGrey2 : CupertinoColors.systemGrey, - ), + ).useSystemChineseFont(), ), const SizedBox(height: 10), CupertinoTextField( @@ -77,7 +78,7 @@ Future showInputExternApiLinkDialog(BuildContext context) async { color: isDarkMode ? CupertinoColors.systemGrey2 : CupertinoColors.activeBlue, - ), + ).useSystemChineseFont(), ), onPressed: () { Navigator.of(context).pop(); @@ -90,7 +91,7 @@ Future 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 index 9bcaf4c..8686e10 100644 --- 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 showInputPlaylistShareLinkDialog(BuildContext context) async { @@ -15,7 +16,7 @@ Future showInputPlaylistShareLinkDialog(BuildContext context) async { '打开歌单', style: TextStyle( color: isDarkMode ? CupertinoColors.white : CupertinoColors.black, - ), + ).useSystemChineseFont(), ), content: Column( children: [ @@ -26,7 +27,7 @@ Future showInputPlaylistShareLinkDialog(BuildContext context) async { color: isDarkMode ? CupertinoColors.systemGrey4 : CupertinoColors.black, - ), + ).useSystemChineseFont(), ), const SizedBox(height: 10), Text( @@ -35,7 +36,7 @@ Future 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 showInputPlaylistShareLinkDialog(BuildContext context) async { color: isDarkMode ? CupertinoColors.systemGrey2 : CupertinoColors.systemGrey, - ), + ).useSystemChineseFont(), ), const SizedBox(height: 10), CupertinoTextField( @@ -77,7 +78,7 @@ Future showInputPlaylistShareLinkDialog(BuildContext context) async { color: isDarkMode ? CupertinoColors.systemGrey2 : CupertinoColors.activeBlue, - ), + ).useSystemChineseFont(), ), onPressed: () { Navigator.of(context).pop(); @@ -90,7 +91,7 @@ Future 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 index eed0845..9aac2ef 100644 --- 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 showMusicFuzzFilterDialog(BuildContext context, @@ -58,7 +59,7 @@ class MusicFuzzFilterDialogState extends State { title, style: TextStyle( color: isDarkMode ? CupertinoColors.white : CupertinoColors.black, - ), + ).useSystemChineseFont(), ), content: Column( mainAxisSize: MainAxisSize.min, @@ -145,7 +146,7 @@ class MusicFuzzFilterDialogState extends State { color: isDarkMode ? CupertinoColors.systemGrey2 : CupertinoColors.activeBlue, - ), + ).useSystemChineseFont(), ), onPressed: () { Navigator.of(context).pop(); @@ -172,7 +173,7 @@ class MusicFuzzFilterDialogState extends State { color: isDarkMode ? CupertinoColors.systemGrey2 : CupertinoColors.activeBlue, - ), + ).useSystemChineseFont(), ), ), if (widget.readonly) @@ -187,7 +188,7 @@ class MusicFuzzFilterDialogState extends State { color: isDarkMode ? CupertinoColors.systemGrey2 : CupertinoColors.activeBlue, - ), + ).useSystemChineseFont(), ), ), ], diff --git a/lib/dialogs/quality_select_dialog.dart b/lib/dialogs/quality_select_dialog.dart index 62b8722..3193938 100644 --- 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 showQualityOptionDialog(BuildContext context) async { @@ -13,7 +14,7 @@ Future showQualityOptionDialog(BuildContext context) async { '选择音质选项', style: TextStyle( color: isDarkMode ? CupertinoColors.white : CupertinoColors.black, - ), + ).useSystemChineseFont(), ), actions: [ CupertinoActionSheetAction( @@ -25,7 +26,7 @@ Future showQualityOptionDialog(BuildContext context) async { style: TextStyle( color: isDarkMode ? CupertinoColors.white : CupertinoColors.black, - ), + ).useSystemChineseFont(), ), ), CupertinoActionSheetAction( @@ -37,7 +38,7 @@ Future showQualityOptionDialog(BuildContext context) async { style: TextStyle( color: isDarkMode ? CupertinoColors.white : CupertinoColors.black, - ), + ).useSystemChineseFont(), ), ), CupertinoActionSheetAction( @@ -49,7 +50,7 @@ Future showQualityOptionDialog(BuildContext context) async { style: TextStyle( color: isDarkMode ? CupertinoColors.white : CupertinoColors.black, - ), + ).useSystemChineseFont(), ), ), CupertinoActionSheetAction( @@ -61,7 +62,7 @@ Future showQualityOptionDialog(BuildContext context) async { style: TextStyle( color: isDarkMode ? CupertinoColors.white : CupertinoColors.black, - ), + ).useSystemChineseFont(), ), ), ], @@ -75,7 +76,7 @@ Future showQualityOptionDialog(BuildContext context) async { color: isDarkMode ? CupertinoColors.systemGrey2 : CupertinoColors.activeBlue, - ), + ).useSystemChineseFont(), ), ), ); diff --git a/lib/dialogs/user_aggrement_dialog.dart b/lib/dialogs/user_aggrement_dialog.dart index 427994c..5ad056e 100644 --- a/lib/dialogs/user_aggrement_dialog.dart +++ b/lib/dialogs/user_aggrement_dialog.dart @@ -29,44 +29,53 @@ class UserAgreementDialog extends StatelessWidget { children: [ RichText( text: TextSpan( - style: DefaultTextStyle.of(context).style.copyWith( + style: DefaultTextStyle.of(context) + .style + .copyWith( color: isDarkMode ? CupertinoColors.white : CupertinoColors.black, - ), + ) + .useSystemChineseFont(), children: [ - const TextSpan( - text: '欢迎使用AppRhyme。在您使用本应用之前，请仔细阅读以下用户协议。\n\n'), + TextSpan( + text: '欢迎使用AppRhyme。在您使用本应用之前，请仔细阅读以下用户协议。\n\n', + style: const TextStyle().useSystemChineseFont()), TextSpan( text: '1. 接受协议\n', style: const TextStyle(fontWeight: FontWeight.bold) .useSystemChineseFont()), - const TextSpan( + TextSpan( text: - '通过访问和/或使用本应用，您确认您已阅读、理解并同意受本协议的约束。如果您不同意本协议的任何条款，请不要使用本应用。\n\n'), + '通过访问和/或使用本应用，您确认您已阅读、理解并同意受本协议的约束。如果您不同意本协议的任何条款，请不要使用本应用。\n\n', + style: const TextStyle().useSystemChineseFont()), TextSpan( text: '2. 数据来源和版权\n', style: const TextStyle(fontWeight: FontWeight.bold) .useSystemChineseFont()), - const TextSpan( + TextSpan( text: - '本应用提供的官方音乐数据来源于各官方音乐平台的公开数据库。本应用中可能出现的版权数据，包括但不限于图像、音频、名称等，其所有权归属于相应的官方音乐平台。用户必须在24小时内删除本应用中的任何版权数据，以避免侵权行为。\n\n'), + '本应用提供的官方音乐数据来源于各官方音乐平台的公开数据库。本应用中可能出现的版权数据，包括但不限于图像、音频、名称等，其所有权归属于相应的官方音乐平台。用户必须在24小时内删除本应用中的任何版权数据，以避免侵权行为。\n\n', + style: const TextStyle().useSystemChineseFont()), TextSpan( text: '3. 用户责任\n', style: const TextStyle(fontWeight: FontWeight.bold) .useSystemChineseFont()), - const TextSpan( - text: - '用户应自行负责制作和使用音源链接自己的音乐库。用户应确保其使用本应用的行为符合当地法律法规。用户应自行承担因使用本应用而可能产生的任何形式的损害赔偿责任。\n\n'), + TextSpan( + text: + '用户应自行负责制作和使用音源链接自己的音乐库。用户应确保其使用本应用的行为符合当地法律法规。用户应自行承担因使用本应用而可能产生的任何形式的损害赔偿责任。\n\n', + style: const TextStyle().useSystemChineseFont(), + ), TextSpan( text: '4. 免责声明\n', style: const TextStyle(fontWeight: FontWeight.bold) .useSystemChineseFont()), - const TextSpan( + TextSpan( + style: const TextStyle().useSystemChineseFont(), text: '本应用开发者不对用户使用本应用产生的直接、间接、特殊、偶然或结果性损害负责。本应用开发者不承担由于用户违反本协议或当地法律法规而产生的任何责任。\n\n'), TextSpan( @@ -74,7 +83,8 @@ class UserAgreementDialog extends StatelessWidget { style: const TextStyle(fontWeight: FontWeight.bold) .useSystemChineseFont()), - const TextSpan( + TextSpan( + style: const TextStyle().useSystemChineseFont(), text: '本应用完全开源且免费，不向用户收取任何费用。用户使用本应用时，必须遵守本协议和免责声明。\n\n'), TextSpan( @@ -82,7 +92,8 @@ class UserAgreementDialog extends StatelessWidget { style: const TextStyle(fontWeight: FontWeight.bold) .useSystemChineseFont()), - const TextSpan( + TextSpan( + style: const TextStyle().useSystemChineseFont(), text: '本应用不接受任何形式的商业合作或捐赠。欢迎用户对本应用进行开源代码和UI设计的贡献，但贡献内容必须符合法律法规和本协议要求。\n\n'), TextSpan( @@ -90,8 +101,12 @@ class UserAgreementDialog extends StatelessWidget { style: const TextStyle(fontWeight: FontWeight.bold) .useSystemChineseFont()), - const TextSpan(text: '本应用遵循MIT或Apache-2.0开源协议。\n\n'), - const TextSpan(text: '通过使用本应用，您表示您理解并同意上述条款。\n'), + TextSpan( + style: const TextStyle().useSystemChineseFont(), + text: '本应用遵循MIT或Apache-2.0开源协议。\n\n'), + TextSpan( + style: const TextStyle().useSystemChineseFont(), + text: '通过使用本应用，您表示您理解并同意上述条款。\n'), ], ), ), diff --git a/lib/dialogs/version_update_dialog.dart b/lib/dialogs/version_update_dialog.dart index 8ae990c..8f34fb7 100644 --- a/lib/dialogs/version_update_dialog.dart +++ b/lib/dialogs/version_update_dialog.dart @@ -21,11 +21,18 @@ void showVersionUpdateDialog(BuildContext context, Release release) { ), content: Column( children: [ - Text('作者: ${release.author.login}'), - Text('名称: ${release.name}'), - Text('版本: ${release.tagName}'), - Text('时间: ${release.createdAt}'), - Text('内容: ${release.body}'), + Text( + '作者: ${release.author.login}', + style: const TextStyle().useSystemChineseFont(), + ), + Text('名称: ${release.name}', + style: const TextStyle().useSystemChineseFont()), + Text('版本: ${release.tagName}', + style: const TextStyle().useSystemChineseFont()), + Text('时间: ${release.createdAt}', + style: const TextStyle().useSystemChineseFont()), + Text('内容: ${release.body}', + style: const TextStyle().useSystemChineseFont()), ], ), actions: [ diff --git a/lib/dialogs/wait_dialog.dart b/lib/dialogs/wait_dialog.dart index f4d2074..86bd48f 100644 --- a/lib/dialogs/wait_dialog.dart +++ b/lib/dialogs/wait_dialog.dart @@ -1,3 +1,4 @@ +import 'package:chinese_font_library/chinese_font_library.dart'; import 'package:flutter/cupertino.dart'; Future showWaitDialog(BuildContext context, String body) async { @@ -12,7 +13,7 @@ Future showWaitDialog(BuildContext context, String body) async { children: [ const CupertinoActivityIndicator(radius: 15.0), const SizedBox(height: 10), - Text(body), + Text(body, style: const TextStyle().useSystemChineseFont()), ], ), ), diff --git a/lib/pages/local_music_list_gridview_page.dart b/lib/pages/local_music_list_gridview_page.dart index ce35055..bfb9644 100644 --- a/lib/pages/local_music_list_gridview_page.dart +++ b/lib/pages/local_music_list_gridview_page.dart @@ -82,9 +82,10 @@ class LocalMusicListGridPageState extends State child: Text( '资料库', style: TextStyle( - fontWeight: FontWeight.bold, - fontSize: 24, - color: textColor), + fontWeight: FontWeight.bold, + fontSize: 24, + color: textColor) + .useSystemChineseFont(), ), ), ), @@ -94,12 +95,14 @@ class LocalMusicListGridPageState extends State onPressed: showMenu, child: Text( '选项', - style: TextStyle(color: activeIconRed), + style: TextStyle(color: activeIconRed).useSystemChineseFont(), )), ), ), child: musicLists.isEmpty - ? Center(child: Text("没有歌单", style: TextStyle(color: textColor))) + ? Center( + child: Text("没有歌单", + style: TextStyle(color: textColor).useSystemChineseFont())) : CustomScrollView( slivers: [ SliverToBoxAdapter( diff --git a/lib/pages/more_page.dart b/lib/pages/more_page.dart index 0b5841e..e804263 100644 --- a/lib/pages/more_page.dart +++ b/lib/pages/more_page.dart @@ -80,7 +80,7 @@ class MorePageState extends State with WidgetsBindingObserver { fontWeight: FontWeight.bold, fontSize: 24, color: textColor, - ), + ).useSystemChineseFont(), ), ), ), @@ -88,7 +88,8 @@ class MorePageState extends State with WidgetsBindingObserver { child: ListView( children: [ CupertinoFormSection.insetGrouped( - header: Text('应用信息', style: TextStyle(color: textColor)), + header: Text('应用信息', + style: TextStyle(color: textColor).useSystemChineseFont()), children: [ CupertinoFormRow( prefix: SizedBox( @@ -106,7 +107,7 @@ class MorePageState extends State with WidgetsBindingObserver { style: TextStyle( color: textColor, fontSize: 20.0, - ), + ).useSystemChineseFont(), ), ))), CupertinoFormRow( @@ -114,7 +115,8 @@ class MorePageState extends State with WidgetsBindingObserver { padding: const EdgeInsets.only(right: 20), child: Text( '版本号', - style: TextStyle(color: textColor), + style: + TextStyle(color: textColor).useSystemChineseFont(), )), child: Container( padding: const EdgeInsets.only(right: 10), @@ -122,12 +124,13 @@ class MorePageState extends State with WidgetsBindingObserver { height: 40, child: Text( globalPackageInfo.version, - style: TextStyle(color: textColor), + style: + TextStyle(color: textColor).useSystemChineseFont(), ))), CupertinoFormRow( prefix: Text( '检查更新', - style: TextStyle(color: textColor), + style: TextStyle(color: textColor).useSystemChineseFont(), ), child: CupertinoButton( onPressed: () async { @@ -141,7 +144,7 @@ class MorePageState extends State with WidgetsBindingObserver { padding: const EdgeInsets.only(right: 20), child: Text( '自动检查更新', - style: TextStyle(color: textColor), + style: TextStyle(color: textColor).useSystemChineseFont(), )), child: CupertinoSwitch( value: globalConfig.versionAutoUpdate, @@ -156,23 +159,26 @@ class MorePageState extends State with WidgetsBindingObserver { CupertinoFormRow( prefix: Text( '项目链接', - style: TextStyle(color: textColor), + style: TextStyle(color: textColor).useSystemChineseFont(), ), child: CupertinoButton( onPressed: openProjectLink, child: Text( 'github.com/canxin121/app_rhyme', - style: TextStyle(color: textColor), + style: TextStyle(color: textColor).useSystemChineseFont(), ), ), ), ], ), CupertinoFormSection.insetGrouped( - header: Text("音频设置", style: TextStyle(color: textColor)), + header: Text("音频设置", + style: TextStyle(color: textColor).useSystemChineseFont()), children: [ CupertinoFormRow( - prefix: Text("清空待播清单", style: TextStyle(color: textColor)), + prefix: Text("清空待播清单", + style: + TextStyle(color: textColor).useSystemChineseFont()), child: CupertinoButton( child: Icon( CupertinoIcons.clear, @@ -191,14 +197,15 @@ class MorePageState extends State with WidgetsBindingObserver { if (!Platform.isIOS) _buildExportCacheRoot(context, refresh, textColor, iconColor), CupertinoFormSection.insetGrouped( - header: Text('储存设置', style: TextStyle(color: textColor)), + header: Text('储存设置', + style: TextStyle(color: textColor).useSystemChineseFont()), children: [ CupertinoFormRow( prefix: Padding( padding: const EdgeInsets.only(right: 20), child: Text( '保存歌曲时缓存歌曲封面', - style: TextStyle(color: textColor), + style: TextStyle(color: textColor).useSystemChineseFont(), )), child: CupertinoSwitch( value: globalConfig.savePicWhenAddMusicList, @@ -215,7 +222,7 @@ class MorePageState extends State with WidgetsBindingObserver { padding: const EdgeInsets.only(right: 20), child: Text( '保存歌单时缓存歌曲歌词', - style: TextStyle(color: textColor), + style: TextStyle(color: textColor).useSystemChineseFont(), )), child: CupertinoSwitch( value: globalConfig.saveLyricWhenAddMusicList, @@ -228,7 +235,9 @@ class MorePageState extends State with WidgetsBindingObserver { }), ), CupertinoFormRow( - prefix: Text("清除冗余歌曲数据", style: TextStyle(color: textColor)), + prefix: Text("清除冗余歌曲数据", + style: + TextStyle(color: textColor).useSystemChineseFont()), child: CupertinoButton( onPressed: () async { try { @@ -249,10 +258,13 @@ class MorePageState extends State with WidgetsBindingObserver { ], ), CupertinoFormSection.insetGrouped( - header: Text('其他', style: TextStyle(color: textColor)), + header: Text('其他', + style: TextStyle(color: textColor).useSystemChineseFont()), children: [ CupertinoFormRow( - prefix: Text("运行日志", style: TextStyle(color: textColor)), + prefix: Text("运行日志", + style: + TextStyle(color: textColor).useSystemChineseFont()), child: CupertinoButton( child: const Icon( CupertinoIcons.book, @@ -282,15 +294,16 @@ class MorePageState extends State with WidgetsBindingObserver { padding: const EdgeInsets.only(right: 20), child: Text( '音源状态', - style: TextStyle(color: textColor), + style: TextStyle(color: textColor).useSystemChineseFont(), )), child: Container( padding: const EdgeInsets.only(right: 10), alignment: Alignment.centerRight, height: 50, - child: const Text( + child: Text( "正常", - style: TextStyle(color: CupertinoColors.activeGreen), + style: TextStyle(color: CupertinoColors.activeGreen) + .useSystemChineseFont(), )))); } else { children.add(CupertinoFormRow( @@ -298,7 +311,7 @@ class MorePageState extends State with WidgetsBindingObserver { padding: const EdgeInsets.only(right: 20), child: Text( '音源状态', - style: TextStyle(color: textColor), + style: TextStyle(color: textColor).useSystemChineseFont(), )), child: Container( padding: const EdgeInsets.only(right: 10), @@ -306,7 +319,7 @@ class MorePageState extends State with WidgetsBindingObserver { height: 50, child: Text( "未导入", - style: TextStyle(color: activeIconRed), + style: TextStyle(color: activeIconRed).useSystemChineseFont(), )))); } if (hasExternApi) { @@ -316,12 +329,12 @@ class MorePageState extends State with WidgetsBindingObserver { padding: const EdgeInsets.only(right: 20), child: Text( '音源链接', - style: TextStyle(color: textColor), + style: TextStyle(color: textColor).useSystemChineseFont(), )), child: CupertinoButton( child: Text( globalConfig.externApi!.url!, - style: TextStyle(color: textColor), + style: TextStyle(color: textColor).useSystemChineseFont(), ), onPressed: () async { try { @@ -337,7 +350,8 @@ class MorePageState extends State with WidgetsBindingObserver { ))); children.add( CupertinoFormRow( - prefix: Text('检查更新', style: TextStyle(color: textColor)), + prefix: Text('检查更新', + style: TextStyle(color: textColor).useSystemChineseFont()), child: CupertinoButton( onPressed: () async { await checkExternApiUpdate(context, true); @@ -352,7 +366,7 @@ class MorePageState extends State with WidgetsBindingObserver { padding: const EdgeInsets.only(right: 20), child: Text( '自动检查更新', - style: TextStyle(color: textColor), + style: TextStyle(color: textColor).useSystemChineseFont(), )), child: CupertinoSwitch( value: globalConfig.externApiAutoUpdate, @@ -372,7 +386,7 @@ class MorePageState extends State with WidgetsBindingObserver { padding: const EdgeInsets.only(right: 20), child: Text( '删除音源', - style: TextStyle(color: textColor), + style: TextStyle(color: textColor).useSystemChineseFont(), )), child: CupertinoButton( onPressed: () { @@ -392,7 +406,7 @@ class MorePageState extends State with WidgetsBindingObserver { padding: const EdgeInsets.only(right: 20), child: Text( '导入音源', - style: TextStyle(color: textColor), + style: TextStyle(color: textColor).useSystemChineseFont(), )), child: ImportExternApiMenu( builder: (context, showMenu) => CupertinoButton( @@ -401,7 +415,8 @@ class MorePageState extends State with WidgetsBindingObserver { Icon(CupertinoIcons.music_note_2, color: iconColor))))); } return CupertinoFormSection.insetGrouped( - header: Text("自定义音源", style: TextStyle(color: textColor)), + header: Text("自定义音源", + style: TextStyle(color: textColor).useSystemChineseFont()), children: children); } } @@ -479,7 +494,8 @@ CupertinoFormSection _buildQualitySelectSection( if (Platform.isAndroid || Platform.isIOS) { children.add(CupertinoFormRow( - prefix: Text("Wifi下音质选择", style: TextStyle(color: textColor)), + prefix: Text("Wifi下音质选择", + style: TextStyle(color: textColor).useSystemChineseFont()), child: CupertinoButton( onPressed: () async { QualityOption? selectedOption = @@ -494,7 +510,8 @@ CupertinoFormSection _buildQualitySelectSection( child: Text(globalConfig.wifiAutoQuality, style: TextStyle(color: textColor))))); children.add(CupertinoFormRow( - prefix: Text("数据网络下音质选择", style: TextStyle(color: textColor)), + prefix: Text("数据网络下音质选择", + style: TextStyle(color: textColor).useSystemChineseFont()), child: CupertinoButton( onPressed: () async { QualityOption? selectedOption = @@ -507,10 +524,11 @@ CupertinoFormSection _buildQualitySelectSection( refresh(); }, child: Text(globalConfig.mobileAutoQuality, - style: TextStyle(color: textColor))))); + style: TextStyle(color: textColor).useSystemChineseFont())))); } else { children.add(CupertinoFormRow( - prefix: Text("音质选择", style: TextStyle(color: textColor)), + prefix: Text("音质选择", + style: TextStyle(color: textColor).useSystemChineseFont()), child: CupertinoButton( onPressed: () async { QualityOption? selectedOption = @@ -523,10 +541,11 @@ CupertinoFormSection _buildQualitySelectSection( refresh(); }, child: Text(globalConfig.wifiAutoQuality, - style: TextStyle(color: textColor))))); + style: TextStyle(color: textColor).useSystemChineseFont())))); } return CupertinoFormSection.insetGrouped( - header: Text('音质选择', style: TextStyle(color: textColor)), + header: + Text('音质选择', style: TextStyle(color: textColor).useSystemChineseFont()), children: children, ); } @@ -602,7 +621,7 @@ CupertinoFormSection _buildExportCacheRoot(BuildContext context, padding: const EdgeInsets.only(right: 20), child: Text( '当前数据状态', - style: TextStyle(color: textColor), + style: TextStyle(color: textColor).useSystemChineseFont(), )), child: Container( padding: const EdgeInsets.only(right: 10), @@ -610,7 +629,7 @@ CupertinoFormSection _buildExportCacheRoot(BuildContext context, height: 50, child: Text( "应用内部数据", - style: TextStyle(color: textColor), + style: TextStyle(color: textColor).useSystemChineseFont(), )))); } else { children.add(CupertinoFormRow( @@ -618,7 +637,7 @@ CupertinoFormSection _buildExportCacheRoot(BuildContext context, padding: const EdgeInsets.only(right: 20), child: Text( '当前数据文件夹', - style: TextStyle(color: textColor), + style: TextStyle(color: textColor).useSystemChineseFont(), )), child: Container( padding: const EdgeInsets.only(right: 10), @@ -626,14 +645,14 @@ CupertinoFormSection _buildExportCacheRoot(BuildContext context, height: 50, child: Text( globalConfig.exportCacheRoot!, - style: TextStyle(color: textColor), + style: TextStyle(color: textColor).useSystemChineseFont(), )))); } children.add( CupertinoFormRow( prefix: Text( '迁移数据文件夹', - style: TextStyle(color: textColor), + style: TextStyle(color: textColor).useSystemChineseFont(), ), child: CupertinoButton( onPressed: () async { @@ -657,7 +676,7 @@ CupertinoFormSection _buildExportCacheRoot(BuildContext context, CupertinoFormRow( prefix: Text( '使用数据文件夹', - style: TextStyle(color: textColor), + style: TextStyle(color: textColor).useSystemChineseFont(), ), child: CupertinoButton( onPressed: () async { @@ -678,7 +697,8 @@ CupertinoFormSection _buildExportCacheRoot(BuildContext context, ), ); return CupertinoFormSection.insetGrouped( - header: Text('数据设定', style: TextStyle(color: textColor)), + header: + Text('数据设定', style: TextStyle(color: textColor).useSystemChineseFont()), children: children, ); } diff --git a/lib/pages/muti_select_pages/muti_select_local_music_list_gridview_page.dart b/lib/pages/muti_select_pages/muti_select_local_music_list_gridview_page.dart index 45f1d70..cf73a81 100644 --- a/lib/pages/muti_select_pages/muti_select_local_music_list_gridview_page.dart +++ b/lib/pages/muti_select_pages/muti_select_local_music_list_gridview_page.dart @@ -141,7 +141,7 @@ class MutiSelectLocalMusicListGridPageState onPressed: showMenu, child: Text( "选项", - style: TextStyle(color: activeIconRed), + style: TextStyle(color: activeIconRed).useSystemChineseFont(), ), ), deleteMusicList: deleteMusicList, @@ -152,7 +152,7 @@ class MutiSelectLocalMusicListGridPageState ), widget.musicLists.isEmpty ? Center( - child: Text("没有歌单", style: TextStyle(color: textColor)), + child: Text("没有歌单", style: TextStyle(color: textColor).useSystemChineseFont()), ) : Expanded( child: Align( diff --git a/lib/pages/muti_select_pages/muti_select_music_container_listview_page.dart b/lib/pages/muti_select_pages/muti_select_music_container_listview_page.dart index d2e8be5..02b21b1 100644 --- a/lib/pages/muti_select_pages/muti_select_music_container_listview_page.dart +++ b/lib/pages/muti_select_pages/muti_select_music_container_listview_page.dart @@ -149,9 +149,10 @@ class MutiSelectMusicContainerListPageState child: Text( "没有音乐", style: TextStyle( - color: isDarkMode - ? CupertinoColors.white - : CupertinoColors.black), + color: isDarkMode + ? CupertinoColors.white + : CupertinoColors.black) + .useSystemChineseFont(), ), ) : Align( diff --git a/lib/pages/muti_select_pages/muti_select_online_music_list_gridview_page.dart b/lib/pages/muti_select_pages/muti_select_online_music_list_gridview_page.dart index ef52d71..faebaa0 100644 --- a/lib/pages/muti_select_pages/muti_select_online_music_list_gridview_page.dart +++ b/lib/pages/muti_select_pages/muti_select_online_music_list_gridview_page.dart @@ -216,7 +216,7 @@ class _MutiSelectOnlineMusicListGridPageState onPressed: showMenu, child: Text( "选项", - style: TextStyle(color: activeIconRed), + style: TextStyle(color: activeIconRed).useSystemChineseFont(), ), ), selectAll: handleSelectAll, @@ -227,7 +227,9 @@ class _MutiSelectOnlineMusicListGridPageState ), widget.musicLists.isEmpty ? Center( - child: Text("没有歌单", style: TextStyle(color: textColor)), + child: Text("没有歌单", + style: + TextStyle(color: textColor).useSystemChineseFont()), ) : Expanded( child: Align( diff --git a/lib/pages/reorder_pages/reorder_local_music_list_grid_page.dart b/lib/pages/reorder_pages/reorder_local_music_list_grid_page.dart index c2bd13d..f95184f 100644 --- a/lib/pages/reorder_pages/reorder_local_music_list_grid_page.dart +++ b/lib/pages/reorder_pages/reorder_local_music_list_grid_page.dart @@ -1,6 +1,7 @@ import 'package:app_rhyme/pages/local_music_list_gridview_page.dart'; import 'package:app_rhyme/src/rust/api/bind/factory_bind.dart'; import 'package:app_rhyme/utils/log_toast.dart'; +import 'package:chinese_font_library/chinese_font_library.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart'; import 'package:reorderables/reorderables.dart'; @@ -87,7 +88,9 @@ class ReorderLocalMusicListGridPageState Expanded( child: widget.musicLists.isEmpty ? Center( - child: Text("没有歌单", style: TextStyle(color: textColor)), + child: Text("没有歌单", + style: TextStyle(color: textColor) + .useSystemChineseFont()), ) : Align( alignment: Alignment.topCenter, diff --git a/lib/pages/reorder_pages/reorder_local_music_list_page.dart b/lib/pages/reorder_pages/reorder_local_music_list_page.dart index cb3e0bf..87b867e 100644 --- a/lib/pages/reorder_pages/reorder_local_music_list_page.dart +++ b/lib/pages/reorder_pages/reorder_local_music_list_page.dart @@ -3,6 +3,7 @@ import 'package:app_rhyme/pages/local_music_container_listview_page.dart'; import 'package:app_rhyme/src/rust/api/bind/factory_bind.dart'; import 'package:app_rhyme/types/music_container.dart'; import 'package:app_rhyme/utils/log_toast.dart'; +import 'package:chinese_font_library/chinese_font_library.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart'; import 'package:reorderables/reorderables.dart'; @@ -89,7 +90,9 @@ class ReorderLocalMusicListPageState extends State Expanded( child: widget.musicContainers.isEmpty ? Center( - child: Text("没有歌曲", style: TextStyle(color: textColor)), + child: Text("没有歌曲", + style: TextStyle(color: textColor) + .useSystemChineseFont()), ) : Align( alignment: Alignment.topCenter, diff --git a/lib/pages/search_page/search_music_aggregator_page.dart b/lib/pages/search_page/search_music_aggregator_page.dart index 325908d..b5bd999 100644 --- a/lib/pages/search_page/search_music_aggregator_page.dart +++ b/lib/pages/search_page/search_music_aggregator_page.dart @@ -164,7 +164,7 @@ class _SearchMusicAggregatorPageState extends State color: isDarkMode ? CupertinoColors.white : CupertinoColors.black, - ), + ).useSystemChineseFont(), ), ), ), @@ -175,7 +175,8 @@ class _SearchMusicAggregatorPageState extends State return GestureDetector( child: Text( '选项', - style: TextStyle(color: activeIconRed), + style: TextStyle(color: activeIconRed) + .useSystemChineseFont(), ), onTapDown: (details) { showMenu(); @@ -221,12 +222,15 @@ class _SearchMusicAggregatorPageState extends State // 编辑 MusicFuzzFilter 的 Section if (_isFilterSectionVisible) CupertinoFormSection.insetGrouped( - header: Text('筛选条件', style: TextStyle(color: textColor)), + header: Text('筛选条件', + style: TextStyle(color: textColor).useSystemChineseFont()), children: [ CupertinoFormRow( prefix: Padding( padding: const EdgeInsets.only(right: 10.0), - child: Text('歌曲名', style: TextStyle(color: textColor)), + child: Text('歌曲名', + style: + TextStyle(color: textColor).useSystemChineseFont()), ), child: CupertinoTextField( controller: _nameController, @@ -236,7 +240,9 @@ class _SearchMusicAggregatorPageState extends State CupertinoFormRow( prefix: Padding( padding: const EdgeInsets.only(right: 10.0), - child: Text('演唱者', style: TextStyle(color: textColor)), + child: Text('演唱者', + style: + TextStyle(color: textColor).useSystemChineseFont()), ), child: CupertinoTextField( controller: _artistController, @@ -246,7 +252,9 @@ class _SearchMusicAggregatorPageState extends State CupertinoFormRow( prefix: Padding( padding: const EdgeInsets.only(right: 10.0), - child: Text('专辑名', style: TextStyle(color: textColor)), + child: Text('专辑名', + style: + TextStyle(color: textColor).useSystemChineseFont()), ), child: CupertinoTextField( controller: _albumController, @@ -272,11 +280,11 @@ class _SearchMusicAggregatorPageState extends State ), borderRadius: BorderRadius.circular(8.0), ), - child: const Text( + child: Text( '应用筛选条件', style: TextStyle( color: CupertinoColors.activeBlue, - ), + ).useSystemChineseFont(), ), ), ), @@ -294,11 +302,11 @@ class _SearchMusicAggregatorPageState extends State ), borderRadius: BorderRadius.circular(8.0), ), - child: const Text( + child: Text( '清空筛选条件', style: TextStyle( color: CupertinoColors.systemRed, - ), + ).useSystemChineseFont(), ), ), ), @@ -331,7 +339,7 @@ class _SearchMusicAggregatorPageState extends State color: isDarkMode ? CupertinoColors.systemGrey2 : CupertinoColors.black, - ), + ).useSystemChineseFont(), ), Text( '点击右上角图标切换搜索歌单', @@ -340,7 +348,7 @@ class _SearchMusicAggregatorPageState extends State color: isDarkMode ? CupertinoColors.systemGrey2 : CupertinoColors.black, - ), + ).useSystemChineseFont(), ), Text( '点击输入框右侧按钮进行设置筛选条件', @@ -349,7 +357,7 @@ class _SearchMusicAggregatorPageState extends State color: isDarkMode ? CupertinoColors.systemGrey2 : CupertinoColors.black, - ), + ).useSystemChineseFont(), ), ], ), diff --git a/lib/pages/search_page/search_music_list_page.dart b/lib/pages/search_page/search_music_list_page.dart index 857c5ca..e478e62 100644 --- a/lib/pages/search_page/search_music_list_page.dart +++ b/lib/pages/search_page/search_music_list_page.dart @@ -97,7 +97,7 @@ class _SearchMusicListState extends State color: isDarkMode ? CupertinoColors.white : CupertinoColors.black, - ), + ).useSystemChineseFont(), ), ), ), @@ -107,7 +107,8 @@ class _SearchMusicListState extends State return GestureDetector( child: Text( '选项', - style: TextStyle(color: activeIconRed), + style: + TextStyle(color: activeIconRed).useSystemChineseFont(), ), onTapDown: (details) { showMenu(); @@ -166,15 +167,16 @@ class _SearchMusicListState extends State color: isDarkMode ? CupertinoColors.systemGrey2 : CupertinoColors.black, - ), + ).useSystemChineseFont(), ), Text( '点击右上角图标切换搜索单曲', textAlign: TextAlign.center, style: TextStyle( - color: isDarkMode - ? CupertinoColors.systemGrey2 - : CupertinoColors.black), + color: isDarkMode + ? CupertinoColors.systemGrey2 + : CupertinoColors.black) + .useSystemChineseFont(), ), ], ),