fix: Automatically exit Settings screen on save.

Author: feoh

lib/core/router/app_router.dart

@@ -1,3 +1,4 @@
+import 'package:flutter/foundation.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
@@ -12,13 +13,38 @@ import 'app_shell.dart';
 
 part 'app_router.g.dart';
 
+/// A [ChangeNotifier] that fires whenever [settingsNotifierProvider] changes.
+/// Used as [GoRouter.refreshListenable] so the router re-runs redirect logic
+/// without being recreated (which would destroy the navigation stack).
+class _SettingsListenable extends ChangeNotifier {
+  final ProviderSubscription<AsyncValue<AppSettings>> _sub;
+
+  _SettingsListenable(Ref ref)
+      : _sub = ref.listen(
+          settingsNotifierProvider,
+          (prev, next) {},
+          fireImmediately: false,
+        ) {
+    ref.listen(settingsNotifierProvider, (prev, next) => notifyListeners());
+  }
+
+  @override
+  void dispose() {
+    _sub.close();
+    super.dispose();
+  }
+}
+
 @Riverpod(keepAlive: true)
 GoRouter appRouter(Ref ref) {
-  final settingsAsync = ref.watch(settingsNotifierProvider);
+  final listenable = _SettingsListenable(ref);
+  ref.onDispose(listenable.dispose);
 
   return GoRouter(
     initialLocation: '/queue',
+    refreshListenable: listenable,
     redirect: (context, state) {
+      final settingsAsync = ref.read(settingsNotifierProvider);
       final configured = settingsAsync.when(
         data: (s) => s.isConfigured,
         loading: () => true, // don't redirect while loading
@@ -27,8 +53,10 @@ GoRouter appRouter(Ref ref) {
 
       final onSettings = state.matchedLocation.startsWith('/settings');
       if (!configured && !onSettings) return '/settings';
-      if (configured && onSettings && state.matchedLocation == '/settings' && !settingsAsync.isLoading) {
-        return null; // let user edit settings
+      if (configured && onSettings &&
+          state.matchedLocation == '/settings' &&
+          !settingsAsync.isLoading) {
+        return '/queue';
       }
       return null;
     },

lib/features/queue/queue_screen.dart

@@ -21,6 +21,22 @@ class QueueScreen extends ConsumerStatefulWidget {
 class _QueueScreenState extends ConsumerState<QueueScreen> {
   String _searchQuery = '';
   String? _selectedTag;
+  bool _initialFilterApplied = false;
+
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    if (!_initialFilterApplied) {
+      _initialFilterApplied = true;
+      final routeTag =
+          GoRouterState.of(context).uri.queryParameters['tag'];
+      if (routeTag != null) {
+        _selectedTag = routeTag;
+        WidgetsBinding.instance
+            .addPostFrameCallback((_) => _applyFilter());
+      }
+    }
+  }
 
   void _applyFilter() {
     ref.read(queueNotifierProvider.notifier).applyFilter(

lib/features/tags/tags_screen.dart

@@ -72,12 +72,9 @@ class TagsScreen extends ConsumerWidget {
               return ListTile(
                 leading: const Icon(Icons.label_outline),
                 title: Text(tag.name),
-                onTap: () {
-                  // Navigate to queue filtered by this tag
-                  context.go('/queue');
-                  // The filter is applied via QueueScreen's filter bar
-                  // For now, navigate to queue with tag query param
-                },
+                onTap: () => context.go(
+                  '/queue?tag=${Uri.encodeComponent(tag.name)}',
+                ),
               );
             },
           );

macos/Runner/DebugProfile.entitlements

@@ -8,5 +8,7 @@
 	<true/>
 	<key>com.apple.security.network.server</key>
 	<true/>
+	<key>com.apple.security.network.client</key>
+	<true/>
 </dict>
 </plist>

macos/Runner/Release.entitlements

@@ -4,5 +4,7 @@
 <dict>
 	<key>com.apple.security.app-sandbox</key>
 	<true/>
+	<key>com.apple.security.network.client</key>
+	<true/>
 </dict>
 </plist>