From 2a6866fb263d15fe7227e7a3ff249e1ff40ac777 Mon Sep 17 00:00:00 2001 From: lifegpc Date: Sun, 5 Jan 2025 10:13:51 +0800 Subject: [PATCH] refactor: Remove primaryColor parameter from setCurrentTitle function --- lib/globals.dart | 5 ++--- lib/main.dart | 3 +-- lib/pages/galleries.dart | 2 +- lib/pages/gallery.dart | 6 ++---- lib/pages/home.dart | 3 +-- lib/pages/login.dart | 2 +- lib/pages/sessions.dart | 3 +-- lib/pages/settings.dart | 2 +- lib/pages/settings/cache.dart | 3 +-- lib/pages/settings/display.dart | 3 +-- lib/pages/settings/search.dart | 3 +-- lib/pages/settings/server.dart | 7 ++++--- lib/pages/settings/server_url.dart | 3 +-- lib/pages/settings/user.dart | 3 +-- lib/pages/task_manager.dart | 2 +- lib/pages/users.dart | 3 +-- lib/viewer/single.dart | 3 +-- 17 files changed, 22 insertions(+), 34 deletions(-) diff --git a/lib/globals.dart b/lib/globals.dart index 4a20991..3a48939 100644 --- a/lib/globals.dart +++ b/lib/globals.dart @@ -494,7 +494,7 @@ String? _currentTitle; String? _prefix; final _titleLog = Logger("Title"); -void setCurrentTitle(String title, int primaryColor, +void setCurrentTitle(String title, {bool isPrefix = false, bool includePrefix = true, bool usePrefix = false}) { @@ -519,8 +519,7 @@ void setCurrentTitle(String title, int primaryColor, if (isPrefix) _prefix = title; } else { SystemChrome.setApplicationSwitcherDescription( - ApplicationSwitcherDescription( - label: title, primaryColor: primaryColor)) + ApplicationSwitcherDescription(label: title)) .then((_) { _currentTitle = title; if (isPrefix) _prefix = title; diff --git a/lib/main.dart b/lib/main.dart index e9e12fc..2f6a782 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -477,8 +477,7 @@ class _MainApp extends State with WidgetsBindingObserver { routerConfig: _router, onGenerateTitle: (context) { final title = AppLocalizations.of(context)!.title; - setCurrentTitle(title, Theme.of(context).primaryColor.value, - isPrefix: true); + setCurrentTitle(title, isPrefix: true); return title; }, locale: _lang.toLocale(), diff --git a/lib/pages/galleries.dart b/lib/pages/galleries.dart index 5d846bc..d8b30d8 100644 --- a/lib/pages/galleries.dart +++ b/lib/pages/galleries.dart @@ -180,7 +180,7 @@ class _GalleriesPage extends State ? i18n.categoryGalleries(widget.category!) : i18n.galleries; if (isTop(context)) { - setCurrentTitle(title, Theme.of(context).primaryColor.value); + setCurrentTitle(title); } if (auth.canManageTasks == true && !widget.hasExtra && diff --git a/lib/pages/gallery.dart b/lib/pages/gallery.dart index c0af836..b17f546 100644 --- a/lib/pages/gallery.dart +++ b/lib/pages/gallery.dart @@ -140,13 +140,11 @@ class _GalleryPage extends State : i18n.gallery; if (isTop(context)) { if (!kIsWeb || (_data != null && kIsWeb)) { - setCurrentTitle(title, Theme.of(context).primaryColor.value, - includePrefix: false); + setCurrentTitle(title, includePrefix: false); } else if (kIsWeb && widget.title != null) { // 设置预加载标题 // Chrome 和 Firefox 必须尽快设置标题以确保在历史记录菜单显示正确的标题 - setCurrentTitle(widget.title!, Theme.of(context).primaryColor.value, - includePrefix: false); + setCurrentTitle(widget.title!, includePrefix: false); } } return Scaffold( diff --git a/lib/pages/home.dart b/lib/pages/home.dart index 2dedb59..b02a054 100644 --- a/lib/pages/home.dart +++ b/lib/pages/home.dart @@ -94,8 +94,7 @@ class _HomePage extends State with ThemeModeWidget, IsTopWidget2 { Widget build(BuildContext context) { tryInitApi(context); if (isTop(context)) { - setCurrentTitle("", Theme.of(context).primaryColor.value, - usePrefix: true); + setCurrentTitle("", usePrefix: true); } return Scaffold( appBar: AppBar( diff --git a/lib/pages/login.dart b/lib/pages/login.dart index d61b5c0..bd65910 100644 --- a/lib/pages/login.dart +++ b/lib/pages/login.dart @@ -134,7 +134,7 @@ class _LoginPageState extends State } final i18n = AppLocalizations.of(context)!; if (isTop(context)) { - setCurrentTitle(i18n.login, Theme.of(context).primaryColor.value); + setCurrentTitle(i18n.login); } return Scaffold( appBar: AppBar( diff --git a/lib/pages/sessions.dart b/lib/pages/sessions.dart index 112ff73..cb275f1 100644 --- a/lib/pages/sessions.dart +++ b/lib/pages/sessions.dart @@ -113,9 +113,8 @@ class _SessionsPage extends State final isLoading = _tokens == null && _error == null; if (isLoading && !_isLoading) _fetchData(); final i18n = AppLocalizations.of(context)!; - final th = Theme.of(context); if (isTop(context)) { - setCurrentTitle(i18n.sessionManagemant, th.primaryColor.value); + setCurrentTitle(i18n.sessionManagemant); } return Scaffold( appBar: _tokens == null && (auth.isAdmin != true || _users == null) diff --git a/lib/pages/settings.dart b/lib/pages/settings.dart index 4e32c9c..da0dc4a 100644 --- a/lib/pages/settings.dart +++ b/lib/pages/settings.dart @@ -35,7 +35,7 @@ class _SettingsPage extends State tryInitApi(context); final i18n = AppLocalizations.of(context)!; if (isTop(context)) { - setCurrentTitle(i18n.settings, Theme.of(context).primaryColor.value); + setCurrentTitle(i18n.settings); } return Scaffold( appBar: AppBar( diff --git a/lib/pages/settings/cache.dart b/lib/pages/settings/cache.dart index b8fbdbb..120a759 100644 --- a/lib/pages/settings/cache.dart +++ b/lib/pages/settings/cache.dart @@ -105,8 +105,7 @@ class _CacheSettingsPage extends State Widget build(BuildContext context) { final i18n = AppLocalizations.of(context)!; if (isTop(context)) { - setCurrentTitle("${i18n.settings} - ${i18n.cache}", - Theme.of(context).primaryColor.value); + setCurrentTitle("${i18n.settings} - ${i18n.cache}"); } return Scaffold( appBar: AppBar( diff --git a/lib/pages/settings/display.dart b/lib/pages/settings/display.dart index eb10d30..7c870a4 100644 --- a/lib/pages/settings/display.dart +++ b/lib/pages/settings/display.dart @@ -247,8 +247,7 @@ class _DisplaySettingsPage extends State Widget build(BuildContext context) { final i18n = AppLocalizations.of(context)!; if (isTop(context)) { - setCurrentTitle("${i18n.settings} - ${i18n.display}", - Theme.of(context).primaryColor.value); + setCurrentTitle("${i18n.settings} - ${i18n.display}"); } return Scaffold( appBar: AppBar( diff --git a/lib/pages/settings/search.dart b/lib/pages/settings/search.dart index aa32678..84aa16f 100644 --- a/lib/pages/settings/search.dart +++ b/lib/pages/settings/search.dart @@ -60,8 +60,7 @@ class _SearchSettingsPage extends State Widget build(BuildContext context) { final i18n = AppLocalizations.of(context)!; if (isTop(context)) { - setCurrentTitle("${i18n.settings} - ${i18n.search}", - Theme.of(context).primaryColor.value); + setCurrentTitle("${i18n.settings} - ${i18n.search}"); } return Scaffold( appBar: AppBar( diff --git a/lib/pages/settings/server.dart b/lib/pages/settings/server.dart index db01cbf..193f0e2 100644 --- a/lib/pages/settings/server.dart +++ b/lib/pages/settings/server.dart @@ -119,9 +119,8 @@ class _ServerSettingsPage extends State final isLoading = _config == null && _error == null; if (isLoading && !_isLoading) _fetchData(); final i18n = AppLocalizations.of(context)!; - final cs = Theme.of(context).colorScheme; if (isTop(context)) { - setCurrentTitle("${i18n.settings} - ${i18n.server}", cs.primary.value); + setCurrentTitle("${i18n.settings} - ${i18n.server}"); } return Scaffold( appBar: isLoading @@ -167,7 +166,9 @@ class _ServerSettingsPage extends State u.userInfo.isNotEmpty || u.hasFragment || !u.hasEmptyPath || - !u.hasScheme) return i18n.invalidURLOrigin; + !u.hasScheme) { + return i18n.invalidURLOrigin; + } if (u.scheme != "http" && u.scheme != "https") { return i18n.httpHttpsNeeded; } diff --git a/lib/pages/settings/server_url.dart b/lib/pages/settings/server_url.dart index 0de11c1..92087ad 100644 --- a/lib/pages/settings/server_url.dart +++ b/lib/pages/settings/server_url.dart @@ -79,8 +79,7 @@ class _ServerUrlSettingsPage extends State ]; if (hasBaseUrl) actions.add(buildMoreVertSettingsButon(context)); if (isTop(context)) { - setCurrentTitle("${i18n.settings} - ${i18n.setServerUrl}", - Theme.of(context).primaryColor.value); + setCurrentTitle("${i18n.settings} - ${i18n.setServerUrl}"); } return Scaffold( appBar: AppBar( diff --git a/lib/pages/settings/user.dart b/lib/pages/settings/user.dart index 87aaf02..b204846 100644 --- a/lib/pages/settings/user.dart +++ b/lib/pages/settings/user.dart @@ -312,8 +312,7 @@ class _UserSettingsPage extends State Widget build(BuildContext context) { final i18n = AppLocalizations.of(context)!; if (isTop(context)) { - setCurrentTitle("${i18n.settings} - ${i18n.user}", - Theme.of(context).primaryColor.value); + setCurrentTitle("${i18n.settings} - ${i18n.user}"); } return Scaffold( appBar: AppBar( diff --git a/lib/pages/task_manager.dart b/lib/pages/task_manager.dart index 76b07a3..b096a3f 100644 --- a/lib/pages/task_manager.dart +++ b/lib/pages/task_manager.dart @@ -276,7 +276,7 @@ class _TaskManagerPage extends State } final i18n = AppLocalizations.of(context)!; if (isTop(context)) { - setCurrentTitle(i18n.taskManager, Theme.of(context).primaryColor.value); + setCurrentTitle(i18n.taskManager); } final size = MediaQuery.of(context).size; return Scaffold( diff --git a/lib/pages/users.dart b/lib/pages/users.dart index 69354b4..66d5ab5 100644 --- a/lib/pages/users.dart +++ b/lib/pages/users.dart @@ -68,9 +68,8 @@ class _UsersPage extends State with ThemeModeWidget, IsTopWidget2 { final isLoading = _users == null && _error == null; if (isLoading && !_isLoading) _fetchData(); final i18n = AppLocalizations.of(context)!; - final th = Theme.of(context); if (isTop(context)) { - setCurrentTitle(i18n.userManagemant, th.primaryColor.value); + setCurrentTitle(i18n.userManagemant); } return Scaffold( appBar: _users == null diff --git a/lib/viewer/single.dart b/lib/viewer/single.dart index 84e8a79..63421a2 100644 --- a/lib/viewer/single.dart +++ b/lib/viewer/single.dart @@ -299,8 +299,7 @@ class _SinglePageViewer extends State : AppLocalizations.of(context)!.loading; if (isTop(context)) { if (!kIsWeb || (_data != null && kIsWeb)) { - setCurrentTitle(title, Theme.of(context).primaryColor.value, - includePrefix: false); + setCurrentTitle(title, includePrefix: false); } } if (_data == null || _files == null) {