From 0ffc08c624513539b724147f681dc0270b7d973d Mon Sep 17 00:00:00 2001 From: lifegpc Date: Thu, 14 Sep 2023 19:35:12 +0800 Subject: [PATCH] Android: Try to fix can not set title --- lib/galleries.dart | 3 ++- lib/gallery.dart | 3 ++- lib/globals.dart | 4 ++-- lib/home.dart | 2 +- lib/main.dart | 3 ++- lib/settings.dart | 3 ++- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/lib/galleries.dart b/lib/galleries.dart index a7e26a3..b9fb2a2 100644 --- a/lib/galleries.dart +++ b/lib/galleries.dart @@ -92,7 +92,8 @@ class _GalleriesPage extends State with ThemeModeWidget { ], leadingIcon: const Icon(Icons.sort), ); - setCurrentTitle(AppLocalizations.of(context)!.galleries); + setCurrentTitle(AppLocalizations.of(context)!.galleries, + Theme.of(context).primaryColor.value); return Scaffold( appBar: AppBar( leading: IconButton( diff --git a/lib/gallery.dart b/lib/gallery.dart index ee0cc4c..a2bb011 100644 --- a/lib/gallery.dart +++ b/lib/gallery.dart @@ -69,7 +69,8 @@ class _GalleryPage extends State with ThemeModeWidget { : _data != null ? _data!.meta.preferredTitle : i18n.gallery; - setCurrentTitle(title, includePrefix: false); + setCurrentTitle(title, Theme.of(context).primaryColor.value, + includePrefix: false); return Scaffold( appBar: _data == null ? AppBar( diff --git a/lib/globals.dart b/lib/globals.dart index 5f924c0..da9157a 100644 --- a/lib/globals.dart +++ b/lib/globals.dart @@ -287,7 +287,7 @@ String? _currentTitle; String? _prefix; final _titleLog = Logger("Title"); -void setCurrentTitle(String title, +void setCurrentTitle(String title, int primaryColor, {bool isPrefix = false, bool includePrefix = true, bool usePrefix = false}) { @@ -307,7 +307,7 @@ void setCurrentTitle(String title, }); } else { SystemChrome.setApplicationSwitcherDescription( - ApplicationSwitcherDescription(label: title)) + ApplicationSwitcherDescription(label: title, primaryColor: primaryColor)) .then((_) { _currentTitle = title; if (isPrefix) _prefix = title; diff --git a/lib/home.dart b/lib/home.dart index eb6e51b..7b5e40a 100644 --- a/lib/home.dart +++ b/lib/home.dart @@ -17,7 +17,7 @@ class HomePage extends HookWidget { Widget build(BuildContext context) { tryInitApi(context); var mode = useState(MainApp.of(context).themeMode); - setCurrentTitle("", usePrefix: true); + setCurrentTitle("", Theme.of(context).primaryColor.value, usePrefix: true); return Scaffold( appBar: AppBar( title: Text(AppLocalizations.of(context)!.titleBar), diff --git a/lib/main.dart b/lib/main.dart index af29640..89137e1 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -169,7 +169,8 @@ class _MainApp extends State { routerConfig: _router, onGenerateTitle: (context) { final title = AppLocalizations.of(context)!.title; - setCurrentTitle(title, isPrefix: true); + setCurrentTitle(title, Theme.of(context).primaryColor.value, + isPrefix: true); return title; }, locale: _lang.toLocale(), diff --git a/lib/settings.dart b/lib/settings.dart index 94ddc0b..a006270 100644 --- a/lib/settings.dart +++ b/lib/settings.dart @@ -135,7 +135,8 @@ class _SettingsPage extends State with ThemeModeWidget { @override Widget build(BuildContext context) { - setCurrentTitle(AppLocalizations.of(context)!.settings); + setCurrentTitle(AppLocalizations.of(context)!.settings, + Theme.of(context).primaryColor.value); return Scaffold( appBar: AppBar( leading: IconButton(