A cross platform Audiobookshelf client for Android and iOS
Dart
Actually ask when a tab hold is set to ask next time
Barnabas7dfdf6d865f6
diff --git a/lib/screens/app_shell.dart b/lib/screens/app_shell.dartindex 54b42d26..69fa9fff 100644--- a/lib/screens/app_shell.dart+++ b/lib/screens/app_shell.dart@@ -914,7 +914,7 @@ class _AppShellState extends State<AppShell>Future<void> _runNavHold(String tab) async {final key = navHoldPrefKey(tab);- var id = await ScopedPrefs.getString(key) ?? navHoldDefaults[tab];+ var id = navHoldResolve(await ScopedPrefs.getString(key), tab);if (!mounted) return;final isAdmin = context.read<AuthProvider>().isAdmin;await _loadRmabAvailability();diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dartindex 896f714c..13ef167c 100644--- a/lib/screens/settings_screen.dart+++ b/lib/screens/settings_screen.dart@@ -492,9 +492,11 @@ class _SettingsScreenState extends State<SettingsScreen> {],onChanged: (v) {setDialogState(() => chosen[tab] = v);- v == null- ? ScopedPrefs.remove(navHoldPrefKey(tab))- : ScopedPrefs.setString(navHoldPrefKey(tab), v);+ // Store the ask marker rather than clearing the key:+ // a cleared key reads as "never chose" and runs the+ // tab's default instead of asking.+ ScopedPrefs.setString(+ navHoldPrefKey(tab), v ?? navHoldAskValue);},),if (tab != tabs.last) const SizedBox(height: 12),diff --git a/lib/widgets/nav_hold_options.dart b/lib/widgets/nav_hold_options.dartindex e46b1309..5dfc054a 100644--- a/lib/widgets/nav_hold_options.dart+++ b/lib/widgets/nav_hold_options.dart@@ -192,8 +192,20 @@ const navHoldTabs = ['home', 'library', 'podcasts', 'absorbing', 'stats', 'setti/// configurable; keep that as its starting point instead of asking.const navHoldDefaults = {'absorbing': 'playPause'};+/// Stored when the user picks "Ask next time". Absent means "never chose",+/// which is what [navHoldDefaults] answers - so the two can't be the same+/// value, or asking to be asked would silently run Absorbing's default.+const navHoldAskValue = 'ask';+String navHoldPrefKey(String tab) => 'navHold_$tab';+/// What holding [tab] should do, given what is stored for it. Null means ask+/// the user. The three states are deliberately distinct: [navHoldAskValue] was+/// chosen and must always ask, absent means never chosen and lets a tab+/// default answer, anything else is the saved action.+String? navHoldResolve(String? saved, String tab) =>+ saved == navHoldAskValue ? null : (saved ?? navHoldDefaults[tab]);+String navHoldTabLabel(String tab, AppLocalizations l) => switch (tab) {'home' => l.appShellHomeTab,'library' => l.appShellLibraryTab,