feat: persist last active tab and preserve per-tab navigation state

README.md

@@ -14,7 +14,7 @@
 </p>
 
 <p align="center">
-  <a href="https://github.com/RarDog/Prisma/releases"><img src="https://img.shields.io/badge/Version-3.5.3-8A2BE2?style=for-the-badge&logo=semver&logoColor=white" alt="Version 3.5.3" /></a>
+  <a href="https://github.com/RarDog/Prisma/releases"><img src="https://img.shields.io/badge/Version-3.5.5-8A2BE2?style=for-the-badge&logo=semver&logoColor=white" alt="Version 3.5.5" /></a>
   <img src="https://img.shields.io/badge/Flutter-3.47+-02569B?style=for-the-badge&logo=flutter&logoColor=white" alt="Flutter" />
   <img src="https://img.shields.io/badge/Platform-Android%20%7C%20Linux%20%7C%20Windows%20%7C%20macOS-00C853?style=for-the-badge" alt="Platforms" />
   <a href="https://github.com/RarDog/Prisma/wiki"><img src="https://img.shields.io/badge/Wiki-Documentation-FF6F00?style=for-the-badge&logo=gitbook&logoColor=white" alt="Wiki" /></a>

README_RU.md

@@ -14,7 +14,7 @@
 </p>
 
 <p align="center">
-  <a href="https://github.com/RarDog/Prisma/releases"><img src="https://img.shields.io/badge/Version-3.5.3-8A2BE2?style=for-the-badge&logo=semver&logoColor=white" alt="Version 3.5.3" /></a>
+  <a href="https://github.com/RarDog/Prisma/releases"><img src="https://img.shields.io/badge/Version-3.5.5-8A2BE2?style=for-the-badge&logo=semver&logoColor=white" alt="Version 3.5.5" /></a>
   <img src="https://img.shields.io/badge/Flutter-3.47+-02569B?style=for-the-badge&logo=flutter&logoColor=white" alt="Flutter" />
   <img src="https://img.shields.io/badge/Platform-Android%20%7C%20Linux%20%7C%20Windows%20%7C%20macOS-00C853?style=for-the-badge" alt="Platforms" />
   <a href="https://github.com/RarDog/Prisma/wiki"><img src="https://img.shields.io/badge/Wiki-Documentation-FF6F00?style=for-the-badge&logo=gitbook&logoColor=white" alt="Wiki" /></a>

lib/app/app_navigator.dart

@@ -0,0 +1,41 @@
+import 'package:flutter/material.dart';
+
+import '../backend/models/post.dart';
+import '../features/post/presentation/post_details_screen.dart';
+import '../features/post/presentation/similar_posts_screen.dart';
+
+class AppNavigator {
+  const AppNavigator._();
+
+  static void openPost(
+    BuildContext context, {
+    required Post post,
+    List<Post>? postsList,
+  }) {
+    Navigator.of(context).push(
+      MaterialPageRoute<void>(
+        builder: (ctx) => PostDetailsScreen(
+          providerId: post.providerId,
+          postId: post.id,
+          initialPost: post,
+          postsList: postsList,
+        ),
+      ),
+    );
+  }
+
+  static void openSimilarPosts(
+    BuildContext context, {
+    required Post post,
+  }) {
+    Navigator.of(context).push(
+      MaterialPageRoute<void>(
+        builder: (ctx) => SimilarPostsScreen(
+          providerId: post.providerId,
+          postId: post.id,
+          initialPost: post,
+        ),
+      ),
+    );
+  }
+}

lib/app/app_version.dart

@@ -1,3 +1,3 @@
-const appDisplayVersion = '3.5.3';
-const appBuildNumber = 79;
+const appDisplayVersion = '3.5.5';
+const appBuildNumber = 81;
 const appReleaseChannel = 'Stable';

lib/app/changelog.dart

@@ -1,4 +1,22 @@
 const prismaChangelog = [
+  PrismaChange(
+    version: '3.5.5',
+    title: 'Сохранение последней вкладки и состояния навигации между разделами',
+    bullets: [
+      'Сохранение последней вкладки: приложение запоминает активный раздел при выходе или закрытии и автоматически открывает его при следующем запуске.',
+      'Независимая история и сохранение места: при переключении между вкладками состояние каждого раздела полностью сохраняется. Например, если открыть публикацию или карточку у артиста и переключиться в поиск или ленту, при возврате обратно вы останетесь ровно на том же посте.',
+      'Бесшовные переходы между ветками навигации: улучшена обработка системной кнопки «Назад», переход по разделам стал еще быстрее и плавнее.',
+    ],
+  ),
+  PrismaChange(
+    version: '3.5.4',
+    title: 'Исправление распознавания MP4-видео и отключение устаревших сервисов Kemono/Coomer',
+    bullets: [
+      'Устранена ошибка классификации видео: файлы MP4, содержащие слово «audio» в имени файла или параметрах запроса, больше не распознаются как аудио и корректно воспроизводятся как полноценное видео.',
+      'Точное определение расширений: внедрён строгий парсинг расширений файлов, исключающий ложные срабатывания при определении типа медиа.',
+      'Удаление устаревших провайдеров Kemono и Coomer: окончательно удалены неработающие сервисы Kemono и Coomer из списка провайдеров и настроек (основным источником артистов является Pawchive).',
+    ],
+  ),
   PrismaChange(
     version: '3.5.3',
     title: 'Поддержка аудиозаписей (MP3/WAV/FLAC) и исправление загрузки медиа у авторов',

lib/app/router.dart

@@ -21,116 +21,171 @@ import '../features/settings/presentation/settings_screen.dart';
 import '../features/viewed/presentation/viewed_screen.dart';
 import '../shared/widgets/app_shell.dart';
 
+final branchNavKeys = List.generate(8, (_) => GlobalKey<NavigatorState>());
+
 final appRouterProvider = Provider<GoRouter>((ref) {
   return GoRouter(
     initialLocation: '/',
     routes: [
-      ShellRoute(
-        builder: (context, state, child) => AppShell(child: child),
+      StatefulShellRoute.indexedStack(
+        builder: (context, state, navigationShell) => AppShell(
+          navigationShell: navigationShell,
+          child: navigationShell,
+        ),
+        branches: [
+          StatefulShellBranch(
+            navigatorKey: branchNavKeys[0],
+            routes: [
+              GoRoute(
+                path: '/',
+                pageBuilder: (context, state) => _transitionPage(
+                  state,
+                  child: FeedScreen(initialQuery: state.uri.queryParameters['q']),
+                ),
+              ),
+            ],
+          ),
+          StatefulShellBranch(
+            navigatorKey: branchNavKeys[1],
+            routes: [
+              GoRoute(
+                path: '/search',
+                builder: (context, state) => const SearchScreen(),
+              ),
+            ],
+          ),
+          StatefulShellBranch(
+            navigatorKey: branchNavKeys[2],
+            routes: [
+              GoRoute(
+                path: '/favorites',
+                builder: (context, state) => const FavoritesScreen(),
+              ),
+            ],
+          ),
+          StatefulShellBranch(
+            navigatorKey: branchNavKeys[3],
+            routes: [
+              GoRoute(
+                path: '/viewed',
+                builder: (context, state) => const ViewedScreen(),
+              ),
+            ],
+          ),
+          StatefulShellBranch(
+            navigatorKey: branchNavKeys[4],
+            routes: [
+              GoRoute(
+                path: '/collections',
+                builder: (context, state) => const CollectionsScreen(),
+                routes: [
+                  GoRoute(
+                    path: ':collectionId',
+                    builder: (context, state) => CollectionDetailsScreen(
+                      collectionId: state.pathParameters['collectionId']!,
+                    ),
+                  ),
+                ],
+              ),
+            ],
+          ),
+          StatefulShellBranch(
+            navigatorKey: branchNavKeys[5],
+            routes: [
+              GoRoute(
+                path: '/artists',
+                builder: (context, state) => const ArtistsScreen(),
+                routes: [
+                  GoRoute(
+                    path: ':providerId/:service/:artistId',
+                    builder: (context, state) => ArtistPostsScreen(
+                      providerId: state.pathParameters['providerId']!,
+                      service: state.pathParameters['service']!,
+                      artistId: state.pathParameters['artistId']!,
+                      artistName: state.uri.queryParameters['name'] ??
+                          state.pathParameters['artistId']!,
+                    ),
+                  ),
+                ],
+              ),
+            ],
+          ),
+          StatefulShellBranch(
+            navigatorKey: branchNavKeys[6],
+            routes: [
+              GoRoute(
+                path: '/providers',
+                builder: (context, state) => const ProvidersScreen(),
+                routes: [
+                  GoRoute(
+                    path: 'new',
+                    builder: (context, state) => ProviderFormScreen(
+                      initialConfig: state.extra is ContentProviderConfig
+                          ? state.extra! as ContentProviderConfig
+                          : null,
+                    ),
+                  ),
+                  GoRoute(
+                    path: 'check',
+                    builder: (context, state) => const ProviderCheckScreen(),
+                  ),
+                ],
+              ),
+            ],
+          ),
+          StatefulShellBranch(
+            navigatorKey: branchNavKeys[7],
+            routes: [
+              GoRoute(
+                path: '/settings',
+                builder: (context, state) => const SettingsScreen(),
+                routes: [
+                  GoRoute(
+                    path: 'hidden',
+                    builder: (context, state) => const HiddenPostsScreen(),
+                  ),
+                  GoRoute(
+                    path: 'cache',
+                    builder: (context, state) => const CacheManagerScreen(),
+                  ),
+                ],
+              ),
+            ],
+          ),
+        ],
+      ),
+      GoRoute(
+        path: '/post/:providerId/:postId',
+        builder: (context, state) {
+          final extra = state.extra;
+          final Post? initialPost;
+          final List<Post>? postsList;
+          if (extra is PostNavigationContext) {
+            initialPost = extra.currentPost;
+            postsList = extra.posts;
+          } else if (extra is Post) {
+            initialPost = extra;
+            postsList = null;
+          } else {
+            initialPost = null;
+            postsList = null;
+          }
+          return PostDetailsScreen(
+            providerId: state.pathParameters['providerId']!,
+            postId: state.pathParameters['postId']!,
+            initialPost: initialPost,
+            postsList: postsList,
+          );
+        },
         routes: [
           GoRoute(
-            path: '/',
-            pageBuilder: (context, state) => _transitionPage(
-              state,
-              child: FeedScreen(initialQuery: state.uri.queryParameters['q']),
-            ),
-          ),
-          GoRoute(
-            path: '/search',
-            builder: (context, state) => const SearchScreen(),
-          ),
-          GoRoute(
-            path: '/post/:providerId/:postId',
-            builder: (context, state) {
-              final extra = state.extra;
-              final Post? initialPost;
-              final List<Post>? postsList;
-              if (extra is PostNavigationContext) {
-                initialPost = extra.currentPost;
-                postsList = extra.posts;
-              } else if (extra is Post) {
-                initialPost = extra;
-                postsList = null;
-              } else {
-                initialPost = null;
-                postsList = null;
-              }
-              return PostDetailsScreen(
-                providerId: state.pathParameters['providerId']!,
-                postId: state.pathParameters['postId']!,
-                initialPost: initialPost,
-                postsList: postsList,
-              );
-            },
-          ),
-          GoRoute(
-            path: '/post/:providerId/:postId/similar',
+            path: 'similar',
             builder: (context, state) => SimilarPostsScreen(
               providerId: state.pathParameters['providerId']!,
               postId: state.pathParameters['postId']!,
               initialPost: state.extra is Post ? state.extra! as Post : null,
             ),
           ),
-          GoRoute(
-            path: '/favorites',
-            builder: (context, state) => const FavoritesScreen(),
-          ),
-          GoRoute(
-            path: '/viewed',
-            builder: (context, state) => const ViewedScreen(),
-          ),
-          GoRoute(
-            path: '/collections',
-            builder: (context, state) => const CollectionsScreen(),
-          ),
-          GoRoute(
-            path: '/collections/:collectionId',
-            builder: (context, state) => CollectionDetailsScreen(
-              collectionId: state.pathParameters['collectionId']!,
-            ),
-          ),
-          GoRoute(
-            path: '/artists',
-            builder: (context, state) => const ArtistsScreen(),
-          ),
-          GoRoute(
-            path: '/artists/:providerId/:service/:artistId',
-            builder: (context, state) => ArtistPostsScreen(
-              providerId: state.pathParameters['providerId']!,
-              service: state.pathParameters['service']!,
-              artistId: state.pathParameters['artistId']!,
-              artistName: state.uri.queryParameters['name'] ??
-                  state.pathParameters['artistId']!,
-            ),
-          ),
-          GoRoute(
-            path: '/providers',
-            builder: (context, state) => const ProvidersScreen(),
-          ),
-          GoRoute(
-            path: '/providers/new',
-            builder: (context, state) => ProviderFormScreen(
-              initialConfig: state.extra is ContentProviderConfig
-                  ? state.extra! as ContentProviderConfig
-                  : null,
-            ),
-          ),
-          GoRoute(
-            path: '/providers/check',
-            builder: (context, state) => const ProviderCheckScreen(),
-          ),
-          GoRoute(
-            path: '/settings',
-            builder: (context, state) => const SettingsScreen(),
-          ),
-          GoRoute(
-            path: '/settings/hidden',
-            builder: (context, state) => const HiddenPostsScreen(),
-          ),
-          GoRoute(
-            path: '/settings/cache',
-            builder: (context, state) => const CacheManagerScreen(),
-          ),
         ],
       ),
     ],

lib/backend/providers/kemono_provider.dart

@@ -1,658 +0,0 @@
-import 'package:dio/dio.dart';
-
-import '../../core/http/dio_client.dart';
-import '../models/artist_announcement.dart';
-import '../models/artist_link.dart';
-import '../models/artist_profile.dart';
-import '../models/artist_tag.dart';
-import '../models/artist_work_query.dart';
-import '../models/post.dart';
-import '../models/post_comment.dart';
-import '../models/provider_health.dart';
-import '../models/top_period_filter.dart';
-import '../services/cloud_link_extractor.dart';
-import 'content_provider.dart';
-
-class KemonoProvider
-    implements ContentProvider, ArtistProvider, CommentProvider {
-  KemonoProvider({
-    required this.id,
-    required this.name,
-    required this.baseUrl,
-    required DioClient dioClient,
-    Map<String, String> queryParameters = const {},
-  })  : _dio = dioClient.dio,
-        _creatorDio = Dio(
-          BaseOptions(
-            baseUrl: queryParameters['creator_api_base'] ??
-                'https://kemono-api.mbaharip.com',
-            connectTimeout: const Duration(seconds: 15),
-            receiveTimeout: const Duration(seconds: 20),
-            headers: const {
-              'Accept': 'application/json',
-              'User-Agent': 'Prisma/2.0.1 Flutter local booru browser',
-            },
-          ),
-        );
-
-  @override
-  final String id;
-
-  @override
-  final String name;
-
-  @override
-  final String baseUrl;
-
-  final Dio _dio;
-  final Dio _creatorDio;
-
-  bool get _isCoomer =>
-      id.toLowerCase().contains('coomer') ||
-      baseUrl.toLowerCase().contains('coomer');
-
-  @override
-  Future<List<Post>> searchPosts({
-    required List<String> tags,
-    required int page,
-    int limit = 50,
-    String? rating,
-    TopPeriodFilter topPeriod = TopPeriodFilter.none,
-  }) async {
-    return const [];
-  }
-
-  @override
-  Future<Post?> getPost(String id) async => null;
-
-  @override
-  Future<ProviderHealth> checkHealth() async {
-    final startedAt = DateTime.now();
-    try {
-      await _creatorDio.get<dynamic>(
-        _creatorPath(),
-        queryParameters: {'page': 1, 'itemsPerPage': 1},
-      );
-      return ProviderHealth(
-        providerId: id,
-        status: ProviderStatus.online,
-        pingMs: DateTime.now().difference(startedAt).inMilliseconds,
-        lastCheckedAt: DateTime.now(),
-        apiVersion: _isCoomer ? 'coomer-artists' : 'kemono-artists',
-      );
-    } catch (error) {
-      return ProviderHealth(
-        providerId: id,
-        status: ProviderStatus.offline,
-        pingMs: DateTime.now().difference(startedAt).inMilliseconds,
-        lastCheckedAt: DateTime.now(),
-        errorMessage: error.toString(),
-        apiVersion: _isCoomer ? 'coomer-artists' : 'kemono-artists',
-      );
-    }
-  }
-
-  @override
-  Future<List<ArtistProfile>> listArtists({
-    String? service,
-    List<String>? services,
-    String? query,
-    int page = 1,
-    int limit = 30,
-  }) async {
-    final effectiveService =
-        services != null && services.length == 1 ? services.first : service;
-    List<ArtistProfile> list;
-    try {
-      final response = await _creatorDio.get<dynamic>(
-        effectiveService == null || effectiveService.isEmpty
-            ? _creatorPath()
-            : '${_creatorPath()}/$effectiveService',
-        queryParameters: {
-          'page': page,
-          'itemsPerPage': limit.clamp(1, 100),
-          if (query != null && query.trim().isNotEmpty) 'keyword': query.trim(),
-        },
-      );
-      list = _rankArtists(_artistsFromResponse(response.data), query ?? '');
-    } catch (_) {
-      list = await _listArtistsFromPublicApi(
-        service: effectiveService,
-        query: query,
-        page: page,
-        limit: limit,
-      );
-    }
-    if (services != null && services.isNotEmpty) {
-      final sSet = services.map((s) => s.toLowerCase()).toSet();
-      list = list.where((a) => sSet.contains(a.service.toLowerCase())).toList();
-    }
-    return list;
-  }
-
-  @override
-  Future<List<ArtistProfile>> searchArtists(
-    String query, {
-    String? service,
-    List<String>? services,
-    int page = 1,
-    int limit = 30,
-  }) {
-    return listArtists(
-      service: service,
-      services: services,
-      query: query,
-      page: page,
-      limit: limit,
-    );
-  }
-
-  @override
-  Future<List<Post>> getArtistPosts({
-    required ArtistWorkQuery query,
-    int page = 0,
-    int limit = 50,
-  }) async {
-    Object? lastError;
-    final paths = [
-      '/api/v1/${query.service}/user/${query.artistId}/posts',
-      '/api/v1/${query.service}/user/${query.artistId}',
-    ];
-    for (final apiBase in _apiBaseCandidates()) {
-      for (final path in paths) {
-        try {
-          final response = await _getFromApiBase<dynamic>(
-            apiBase,
-            path,
-            queryParameters: {'o': page * limit},
-          );
-          final posts = _postItems(response.data);
-          final mapped = <Post>[];
-          for (final post in posts.whereType<Map>()) {
-            mapped.addAll(_postsFromArtistPost(
-              Map<String, dynamic>.from(post),
-              query: query,
-              mediaBaseUrl: apiBase,
-            ));
-          }
-          if (mapped.isNotEmpty || posts.isEmpty) {
-            mapped.sort((a, b) => b.createdAt.compareTo(a.createdAt));
-            return mapped.take(limit).toList(growable: false);
-          }
-        } catch (error) {
-          lastError = error;
-        }
-      }
-    }
-    throw StateError(
-      '$name artist works are unavailable right now. Try again later. '
-      '${_shortError(lastError)}',
-    );
-  }
-
-  @override
-  Future<List<PostComment>> getArtistPostComments(
-    String service,
-    String artistId,
-    String postId,
-  ) async {
-    Object? lastError;
-    final path = '/api/v1/$service/user/$artistId/post/$postId/comments';
-    for (final apiBase in _apiBaseCandidates()) {
-      try {
-        final response = await _getFromApiBase<dynamic>(apiBase, path);
-        return _commentsFromResponse(response.data, postId);
-      } catch (error) {
-        lastError = error;
-      }
-    }
-    throw StateError(
-      '$name comments are unavailable right now. ${_shortError(lastError)}',
-    );
-  }
-
-  @override
-  Future<List<PostComment>> getComments(String postId) async {
-    final parts = postId.split(':');
-    if (parts.length < 4) return const [];
-    return getArtistPostComments(parts[0], parts[1], parts[2]);
-  }
-
-  @override
-  Future<List<ArtistTag>> getArtistTags(
-          String service, String artistId) async =>
-      const [];
-
-  @override
-  Future<List<ArtistLink>> getArtistLinks(
-          String service, String artistId) async =>
-      const [];
-
-  @override
-  Future<List<ArtistAnnouncement>> getArtistAnnouncements(
-      String service, String artistId) async {
-    final path = '/api/v1/$service/user/$artistId/announcements';
-    for (final apiBase in _apiBaseCandidates()) {
-      try {
-        final response = await _getFromApiBase<dynamic>(apiBase, path);
-        final items = response.data;
-        if (items is List) {
-          return items
-              .whereType<Map>()
-              .map((item) =>
-                  ArtistAnnouncement.fromJson(Map<String, dynamic>.from(item)))
-              .toList(growable: false);
-        }
-      } catch (_) {}
-    }
-    return const [];
-  }
-
-  String _creatorPath() => _isCoomer ? '/coomer' : '/kemono';
-
-  List<ArtistProfile> _artistsFromResponse(dynamic data) {
-    final items = data is Map ? data['data'] : data;
-    if (items is! List) return const [];
-    return items
-        .whereType<Map>()
-        .map((item) {
-          final json = Map<String, dynamic>.from(item);
-          final service = (json['service'] ?? '').toString();
-          final artistId =
-              (json['id'] ?? json['creator_id'] ?? json['user_id'] ?? '')
-                  .toString();
-          final name = (json['name'] ??
-                  json['display_name'] ??
-                  json['username'] ??
-                  artistId)
-              .toString();
-          final rawAvatar = (json['avatar'] ??
-                  json['icon'] ??
-                  json['image'] ??
-                  json['avatar_url'] ??
-                  '')
-              .toString();
-          return ArtistProfile(
-            id: artistId,
-            providerId: id,
-            service: service,
-            name: name,
-            displayName: name,
-            avatarUrl: _absoluteUrl(rawAvatar) ?? _iconUrl(service, artistId),
-            updatedAt: _dateFromAny(json['updated']),
-            postCount: (json['post_count'] as num?)?.toInt(),
-            url: '$baseUrl/$service/user/$artistId',
-          );
-        })
-        .where((artist) => artist.id.isNotEmpty)
-        .toList(growable: false);
-  }
-
-  Future<List<ArtistProfile>> _listArtistsFromPublicApi({
-    String? service,
-    String? query,
-    required int page,
-    required int limit,
-  }) async {
-    Object? lastError;
-    dynamic data;
-    for (final apiBase in _apiBaseCandidates()) {
-      try {
-        final response =
-            await _getFromApiBase<dynamic>(apiBase, '/api/v1/creators.txt');
-        data = response.data;
-        break;
-      } catch (error) {
-        lastError = error;
-      }
-    }
-    if (data == null) {
-      throw StateError(
-        '$name artist index is unavailable right now. ${_shortError(lastError)}',
-      );
-    }
-    final queryText = (query ?? '').trim().toLowerCase();
-    final offset = (page - 1).clamp(0, 999999) * limit;
-    final items = _artistsFromResponse({'data': data})
-        .where((artist) =>
-            (service == null || service.isEmpty || artist.service == service) &&
-            (queryText.isEmpty ||
-                artist.displayName.toLowerCase().contains(queryText) ||
-                artist.id.toLowerCase().contains(queryText)))
-        .toList(growable: false);
-    final ranked = _rankArtists(items, queryText);
-    return ranked.skip(offset).take(limit).toList(growable: false);
-  }
-
-  List<ArtistProfile> _rankArtists(List<ArtistProfile> artists, String query) {
-    final queryText = query.trim().toLowerCase();
-    final ranked = [...artists];
-    ranked.sort((a, b) {
-      final scoreA = _artistSearchScore(a, queryText);
-      final scoreB = _artistSearchScore(b, queryText);
-      if (scoreA != scoreB) return scoreB.compareTo(scoreA);
-      final updatedA = a.updatedAt ?? DateTime.fromMillisecondsSinceEpoch(0);
-      final updatedB = b.updatedAt ?? DateTime.fromMillisecondsSinceEpoch(0);
-      final updated = updatedB.compareTo(updatedA);
-      if (updated != 0) return updated;
-      final count = (b.postCount ?? 0).compareTo(a.postCount ?? 0);
-      if (count != 0) return count;
-      return a.displayName.compareTo(b.displayName);
-    });
-    return ranked;
-  }
-
-  int _artistSearchScore(ArtistProfile artist, String query) {
-    if (query.isEmpty) return 0;
-    final name = artist.displayName.toLowerCase();
-    final id = artist.id.toLowerCase();
-    if (name == query || id == query) return 100;
-    if (name.startsWith(query) || id.startsWith(query)) return 70;
-    if (name.contains(query) || id.contains(query)) return 40;
-    return 0;
-  }
-
-  List<dynamic> _postItems(dynamic data) {
-    if (data is List) return data;
-    if (data is Map) {
-      final results = data['results'];
-      if (results is List) return results;
-      final posts = data['posts'];
-      if (posts is List) return posts;
-      if (posts is Map) return _postItems(posts);
-      final dataItems = data['data'];
-      if (dataItems is List) return dataItems;
-    }
-    return const [];
-  }
-
-  List<Post> _postsFromArtistPost(
-    Map<String, dynamic> json, {
-    required ArtistWorkQuery query,
-    required String mediaBaseUrl,
-  }) {
-    final postId = (json['id'] ?? json['post_id'] ?? '').toString();
-    final title = (json['title'] ?? '').toString();
-    final published = _dateFromAny(json['published']) ??
-        _dateFromAny(json['added']) ??
-        _dateFromAny(json['edited']) ??
-        DateTime.fromMillisecondsSinceEpoch(0);
-    final postSource =
-        '$baseUrl/${query.service}/user/${query.artistId}/post/$postId';
-    final rawContent = (json['content'] ?? '').toString();
-    final embed = json['embed'] is Map ? Map<String, dynamic>.from(json['embed']) : null;
-    final cloudLinks = CloudLinkExtractor.extractLinks(
-      content: rawContent,
-      source: postSource,
-      embed: embed,
-    );
-    final cloudLinksJson = cloudLinks.map((e) => e.encode()).toList(growable: false);
-    final cleanDesc = CloudLinkExtractor.cleanCommentary(rawContent);
-
-    final files = <Map<String, dynamic>>[];
-    final file = json['file'];
-    if (file is Map && file.isNotEmpty) {
-      files.add(Map<String, dynamic>.from(file));
-    }
-    final attachments = json['attachments'];
-    if (attachments is List) {
-      files.addAll(attachments.whereType<Map>().map(Map<String, dynamic>.from));
-    }
-
-    // Support link-only posts where author uploaded files to cloud drives (MEGA, GDrive, etc.)
-    // or text-only posts where author wrote an announcement, status or note
-    if (files.isEmpty &&
-        (cloudLinks.isNotEmpty ||
-            cleanDesc.isNotEmpty ||
-            rawContent.trim().isNotEmpty ||
-            title.trim().isNotEmpty)) {
-      final stableId = '${query.service}:${query.artistId}:$postId:0';
-      final firstStreamable =
-          cloudLinks.where((l) => l.isStreamable).firstOrNull;
-      final firstLink = cloudLinks.isNotEmpty ? cloudLinks.first : null;
-      final fileUrl = firstStreamable?.directStreamUrl ?? firstLink?.url ?? '';
-      final isTextOnly = cloudLinks.isEmpty;
-      final tags = [
-        query.service,
-        query.artistName,
-        if (title.trim().isNotEmpty) title.trim(),
-        if (!isTextOnly) 'cloud_mirror' else 'text_post',
-      ];
-      return [
-        Post(
-          id: stableId,
-          providerId: id,
-          providerName: name,
-          previewUrl: '',
-          sampleUrl: '',
-          fileUrl: fileUrl,
-          tags: tags,
-          rating: 'unknown',
-          width: 0,
-          height: 0,
-          source: postSource,
-          createdAt: published,
-          fileType: firstStreamable != null
-              ? 'video'
-              : (isTextOnly ? 'text' : 'link'),
-          score: 0,
-          tagGroups: {
-            'artist': [query.artistName],
-            'meta': [query.service],
-            if (title.trim().isNotEmpty) 'copyright': [title.trim()],
-            if (cloudLinksJson.isNotEmpty) 'cloud_links': cloudLinksJson,
-            if (cleanDesc.isNotEmpty)
-              'description': [cleanDesc]
-            else if (rawContent.trim().isNotEmpty)
-              'description': [rawContent.trim()],
-          },
-        ),
-      ];
-    }
-
-    var index = 0;
-    return files
-        .map((file) {
-          final url = _mediaUrl(file, mediaBaseUrl: mediaBaseUrl);
-          final fileName =
-              (file['name'] ?? Uri.tryParse(url)?.pathSegments.last ?? '')
-                  .toString();
-          final type = _fileType('$fileName $url');
-          final stableId =
-              '${query.service}:${query.artistId}:$postId:${index++}';
-          final tags = [
-            query.service,
-            query.artistName,
-            if (title.trim().isNotEmpty) title.trim(),
-          ];
-          return Post(
-            id: stableId,
-            providerId: id,
-            providerName: name,
-            previewUrl: url,
-            sampleUrl: url,
-            fileUrl: url,
-            tags: tags,
-            rating: 'unknown',
-            width: 0,
-            height: 0,
-            source: postSource,
-            createdAt: published,
-            fileType: type,
-            score: 0,
-            tagGroups: {
-              'artist': [query.artistName],
-              'meta': [query.service],
-              if (title.trim().isNotEmpty) 'copyright': [title.trim()],
-              if (cloudLinksJson.isNotEmpty) 'cloud_links': cloudLinksJson,
-              if (cleanDesc.isNotEmpty) 'description': [cleanDesc],
-            },
-          );
-        })
-        .where((post) => post.fileUrl.isNotEmpty)
-        .toList(growable: false);
-  }
-
-  List<PostComment> _commentsFromResponse(dynamic data, String postId) {
-    final items = data is Map ? (data['comments'] ?? data['data']) : data;
-    if (items is! List) return const [];
-    return items
-        .whereType<Map>()
-        .map((item) {
-          final json = Map<String, dynamic>.from(item);
-          return PostComment(
-            id: (json['id'] ?? json['comment_id'] ?? '').toString(),
-            postId: postId,
-            providerId: id,
-            authorName: (json['author'] ??
-                    json['username'] ??
-                    json['user'] ??
-                    json['creator_name'] ??
-                    'user')
-                .toString(),
-            body: (json['content'] ?? json['body'] ?? json['comment'] ?? '')
-                .toString(),
-            createdAt: _dateFromAny(json['added']) ??
-                _dateFromAny(json['created_at']) ??
-                DateTime.fromMillisecondsSinceEpoch(0),
-          );
-        })
-        .where((comment) => comment.body.trim().isNotEmpty)
-        .toList(growable: false);
-  }
-
-  String _mediaUrl(
-    Map<String, dynamic> file, {
-    required String mediaBaseUrl,
-  }) {
-    final path = (file['path'] ?? file['url'] ?? '').toString();
-    if (path.isEmpty) return '';
-    final uri = Uri.tryParse(path);
-    if (uri != null && uri.hasScheme) return path;
-    if (path.startsWith('/data/')) {
-      return '$mediaBaseUrl$path';
-    }
-    if (path.startsWith('/')) {
-      return '$mediaBaseUrl/data$path';
-    }
-    return '$mediaBaseUrl/data/$path';
-  }
-
-  String? _iconUrl(String service, String artistId) {
-    if (service.isEmpty || artistId.isEmpty) return null;
-    final host = _isCoomer ? 'https://img.coomer.su' : 'https://img.kemono.su';
-    return '$host/icons/$service/$artistId';
-  }
-
-  String? _absoluteUrl(String value) {
-    final trimmed = value.trim();
-    if (trimmed.isEmpty) return null;
-    final uri = Uri.tryParse(trimmed);
-    if (uri != null && uri.hasScheme) return trimmed;
-    if (trimmed.startsWith('/')) return '$baseUrl$trimmed';
-    return '$baseUrl/$trimmed';
-  }
-
-  List<String> _apiBaseCandidates() {
-    final candidates = <String>[
-      baseUrl,
-      if (_isCoomer) ...[
-        'https://coomer.st',
-        'https://coomer.su',
-      ] else ...[
-        'https://kemono.cr',
-        'https://kemono.su',
-      ],
-    ];
-    return candidates.map(_trimTrailingSlash).toSet().toList(growable: false);
-  }
-
-  Future<Response<T>> _getFromApiBase<T>(
-    String apiBase,
-    String path, {
-    Map<String, Object?> queryParameters = const {},
-  }) {
-    if (_trimTrailingSlash(apiBase) == _trimTrailingSlash(baseUrl)) {
-      return _dio.get<T>(path, queryParameters: queryParameters);
-    }
-    final dio = Dio(
-      BaseOptions(
-        baseUrl: apiBase,
-        connectTimeout: const Duration(seconds: 15),
-        receiveTimeout: const Duration(seconds: 25),
-        headers: const {
-          'Accept': 'application/json',
-          'User-Agent': 'Prisma/2.0.1 Flutter local booru browser',
-        },
-      ),
-    );
-    return dio.get<T>(path, queryParameters: queryParameters);
-  }
-
-  String _trimTrailingSlash(String value) =>
-      value.endsWith('/') ? value.substring(0, value.length - 1) : value;
-
-  String _shortError(Object? error) {
-    if (error == null) return '';
-    final message = error.toString();
-    if (message.length <= 160) return message;
-    return '${message.substring(0, 160)}...';
-  }
-
-  String _fileType(String value) {
-    final lower = value.toLowerCase().split('?').first.trim();
-    if (lower.endsWith('.webm') ||
-        lower.endsWith('.mp4') ||
-        lower.endsWith('.mov') ||
-        lower.endsWith('.mkv') ||
-        lower.endsWith('.avi') ||
-        lower.endsWith('.flv') ||
-        lower.endsWith('.wmv') ||
-        lower.endsWith('.m4v') ||
-        lower.endsWith('.ts')) {
-      return 'video';
-    }
-    if (lower.endsWith('.mp3') ||
-        lower.endsWith('.m4a') ||
-        lower.endsWith('.wav') ||
-        lower.endsWith('.ogg') ||
-        lower.endsWith('.flac') ||
-        lower.endsWith('.aac') ||
-        lower.endsWith('.opus') ||
-        lower.endsWith('.wma')) {
-      return 'audio';
-    }
-    if (lower.endsWith('.gif')) return 'gif';
-    if (lower.endsWith('.swf')) return 'swf';
-    if (lower.endsWith('.zip') ||
-        lower.endsWith('.rar') ||
-        lower.endsWith('.7z') ||
-        lower.endsWith('.tar') ||
-        lower.endsWith('.gz') ||
-        lower.endsWith('.pdf') ||
-        lower.endsWith('.txt')) {
-      return 'archive';
-    }
-    if (lower.endsWith('.png') ||
-        lower.endsWith('.jpg') ||
-        lower.endsWith('.jpeg') ||
-        lower.endsWith('.webp') ||
-        lower.endsWith('.avif') ||
-        lower.endsWith('.bmp') ||
-        lower.endsWith('.heic') ||
-        lower.endsWith('.tiff')) {
-      return 'photo';
-    }
-    return 'unknown';
-  }
-
-  DateTime? _dateFromAny(dynamic value) {
-    if (value == null) return null;
-    if (value is num) {
-      final raw = value.toInt();
-      if (raw > 9999999999) return DateTime.fromMillisecondsSinceEpoch(raw);
-      return DateTime.fromMillisecondsSinceEpoch(raw * 1000);
-    }
-    return DateTime.tryParse(value.toString());
-  }
-}

lib/backend/providers/pawchive_provider.dart

@@ -481,7 +481,7 @@ class PawchiveProvider
     for (final f in files) {
       final p = (f['path'] ?? '').toString();
       final n = (f['name'] ?? '').toString();
-      if (_isPhotoType('$n $p') && p.isNotEmpty) {
+      if (_isPhotoType(p, n) && p.isNotEmpty) {
         postCoverUrl = _thumbnailUrl(p);
         break;
       }
@@ -494,8 +494,8 @@ class PawchiveProvider
           final fileName = (fileMap['name'] ?? '').toString();
           final previewOnly = fileMap['preview_only'] == true;
 
-          final type = _fileType('$fileName $rawPath');
-          final isPhoto = _isPhotoType('$fileName $rawPath');
+          final type = _fileTypeFor(rawPath, fileName);
+          final isPhoto = type == 'photo' || type == 'gif';
 
           // img.pawchive.pw/thumbnail only generates thumbnails for images/gifs.
           // Non-image files (audio, video, archive) return 404 from thumbnail server.
@@ -626,55 +626,81 @@ class PawchiveProvider
     return '${message.substring(0, 160)}...';
   }
 
+  String _extractExtension(String value) {
+    if (value.isEmpty) return '';
+    final clean = value.split('?').first.split('#').first.trim();
+    final dot = clean.lastIndexOf('.');
+    if (dot != -1 && dot < clean.length - 1) {
+      final ext = clean.substring(dot).toLowerCase();
+      if (ext.length <= 6) return ext;
+    }
+    return '';
+  }
+
   String _fileType(String value) {
-    final lower = value.toLowerCase().split('?').first.trim();
-    if (lower.endsWith('.webm') ||
-        lower.endsWith('.mp4') ||
-        lower.endsWith('.mov') ||
-        lower.endsWith('.mkv') ||
-        lower.endsWith('.avi') ||
-        lower.endsWith('.flv') ||
-        lower.endsWith('.wmv') ||
-        lower.endsWith('.m4v') ||
-        lower.endsWith('.ts')) {
+    final ext = _extractExtension(value);
+    if (const {
+      '.webm',
+      '.mp4',
+      '.mov',
+      '.mkv',
+      '.avi',
+      '.flv',
+      '.wmv',
+      '.m4v',
+      '.ts',
+    }.contains(ext)) {
       return 'video';
     }
-    if (lower.endsWith('.mp3') ||
-        lower.endsWith('.m4a') ||
-        lower.endsWith('.wav') ||
-        lower.endsWith('.ogg') ||
-        lower.endsWith('.flac') ||
-        lower.endsWith('.aac') ||
-        lower.endsWith('.opus') ||
-        lower.endsWith('.wma')) {
+    if (const {
+      '.mp3',
+      '.m4a',
+      '.wav',
+      '.ogg',
+      '.flac',
+      '.aac',
+      '.opus',
+      '.wma',
+    }.contains(ext)) {
       return 'audio';
     }
-    if (lower.endsWith('.gif')) return 'gif';
-    if (lower.endsWith('.swf')) return 'swf';
-    if (lower.endsWith('.zip') ||
-        lower.endsWith('.rar') ||
-        lower.endsWith('.7z') ||
-        lower.endsWith('.tar') ||
-        lower.endsWith('.gz') ||
-        lower.endsWith('.pdf') ||
-        lower.endsWith('.txt')) {
+    if (ext == '.gif') return 'gif';
+    if (ext == '.swf') return 'swf';
+    if (const {
+      '.zip',
+      '.rar',
+      '.7z',
+      '.tar',
+      '.gz',
+      '.pdf',
+      '.txt',
+    }.contains(ext)) {
       return 'archive';
     }
-    if (lower.endsWith('.png') ||
-        lower.endsWith('.jpg') ||
-        lower.endsWith('.jpeg') ||
-        lower.endsWith('.webp') ||
-        lower.endsWith('.avif') ||
-        lower.endsWith('.bmp') ||
-        lower.endsWith('.heic') ||
-        lower.endsWith('.tiff')) {
+    if (const {
+      '.png',
+      '.jpg',
+      '.jpeg',
+      '.webp',
+      '.avif',
+      '.bmp',
+      '.heic',
+      '.tiff',
+    }.contains(ext)) {
       return 'photo';
     }
     return 'unknown';
   }
 
-  bool _isPhotoType(String value) {
-    final type = _fileType(value);
+  String _fileTypeFor(String path, String fileName) {
+    final extName = _extractExtension(fileName);
+    final extPath = _extractExtension(path);
+    final ext = extName.isNotEmpty ? extName : extPath;
+    return _fileType(ext);
+  }
+
+  bool _isPhotoType(String path, [String fileName = '']) {
+    final type = _fileTypeFor(path, fileName);
     return type == 'photo' || type == 'gif';
   }
 

lib/backend/providers/provider_factory.dart

@@ -5,7 +5,6 @@ import 'custom_provider.dart';
 import 'danbooru_provider.dart';
 import 'e621_provider.dart';
 import 'gelbooru_provider.dart';
-import 'kemono_provider.dart';
 import 'moebooru_provider.dart';
 import 'pawchive_provider.dart';
 import 'realbooru_html_provider.dart';
@@ -82,15 +81,6 @@ class ProviderFactory {
           dioClient: client,
           queryParameters: queryParameters,
         );
-      case 'kemono':
-      case 'coomer':
-        return KemonoProvider(
-          id: config.id,
-          name: config.name,
-          baseUrl: config.baseUrl,
-          dioClient: client,
-          queryParameters: queryParameters,
-        );
       case 'pawchive':
         return PawchiveProvider(
           id: config.id,

lib/backend/providers/provider_manager.dart

@@ -730,18 +730,23 @@ class ProviderManager {
 
   static bool _isArtistConfig(ContentProviderConfig config) {
     final type = config.apiType.toLowerCase();
-    return type == 'kemono' || type == 'coomer' || type == 'pawchive';
+    return type == 'pawchive';
   }
 
   static bool _isFeedConfig(ContentProviderConfig config) {
     final type = config.apiType.toLowerCase();
-    return type != 'kemono' && type != 'coomer';
+    return type != 'pawchive';
   }
 
   static bool _isLegacyRemovedConfig(ContentProviderConfig config) {
     final id = config.id.toLowerCase();
     final type = config.apiType.toLowerCase();
-    return id == 'cosbooru' || type == 'realbooru';
+    return id == 'cosbooru' ||
+        type == 'realbooru' ||
+        type == 'kemono' ||
+        type == 'coomer' ||
+        id == 'kemono' ||
+        id == 'coomer';
   }
 }
 

lib/backend/services/settings_service.dart

@@ -64,8 +64,10 @@ class AppSettings {
     this.downloadPathTemplate = '{Artist}/{ID}',
     this.searchHistoryLimit = 500,
     this.tagCacheLimit = 5000,
+    this.lastActiveLocation = '/',
   });
 
+  final String lastActiveLocation;
   final List<String> favoriteArtists;
   final List<String> pawchiveAccounts;
   final bool pawchiveBidirectionalSync;
@@ -165,6 +167,7 @@ class AppSettings {
     lastFeedRating: null,
     searchHistoryLimit: 500,
     tagCacheLimit: 5000,
+    lastActiveLocation: '/',
   );
 
   AppSettings copyWith({
@@ -220,8 +223,10 @@ class AppSettings {
     String? downloadPathTemplate,
     int? searchHistoryLimit,
     int? tagCacheLimit,
+    String? lastActiveLocation,
   }) {
     return AppSettings(
+      lastActiveLocation: lastActiveLocation ?? this.lastActiveLocation,
       favoriteArtists: favoriteArtists ?? this.favoriteArtists,
       pawchiveAccounts: pawchiveAccounts ?? this.pawchiveAccounts,
       pawchiveBidirectionalSync:
@@ -336,6 +341,7 @@ class AppSettings {
         'downloadPathTemplate': downloadPathTemplate,
         'searchHistoryLimit': searchHistoryLimit,
         'tagCacheLimit': tagCacheLimit,
+        'lastActiveLocation': lastActiveLocation,
       };
 
   factory AppSettings.fromJson(Map<String, dynamic> json) => AppSettings(
@@ -455,6 +461,8 @@ class AppSettings {
             defaults.searchHistoryLimit,
         tagCacheLimit: (json['tagCacheLimit'] as num?)?.toInt() ??
             defaults.tagCacheLimit,
+        lastActiveLocation: (json['lastActiveLocation'] as String?) ??
+            defaults.lastActiveLocation,
       );
 
   List<PawchiveAccount> get parsedPawchiveAccounts {
@@ -545,6 +553,14 @@ class SettingsService {
     return updateSettings(settings.copyWith(nsfwEnabled: enabled));
   }
 
+  Future<Result<void>> saveLastActiveLocation(String location) async {
+    final result = await getSettings();
+    if (result is Error<AppSettings>) return Error(result.failure);
+    final settings = (result as Success<AppSettings>).data;
+    if (settings.lastActiveLocation == location) return const Success(null);
+    return updateSettings(settings.copyWith(lastActiveLocation: location));
+  }
+
   Future<Result<void>> saveCacheSettings({
     required int ttlHours,
     required int maxItems,

lib/backend/utils/media_quality.dart

@@ -100,61 +100,115 @@ class MediaUrlSelector {
         .toList(growable: false);
   }
 
+  static const _videoExtensions = {
+    '.mp4',
+    '.webm',
+    '.mov',
+    '.mkv',
+    '.avi',
+    '.flv',
+    '.wmv',
+    '.m4v',
+    '.ts',
+  };
+
+  static const _audioExtensions = {
+    '.mp3',
+    '.m4a',
+    '.wav',
+    '.ogg',
+    '.flac',
+    '.aac',
+    '.opus',
+    '.wma',
+  };
+
+  static String _extractExtension(String url) {
+    if (url.isEmpty) return '';
+    try {
+      final uri = Uri.parse(url);
+      final filenameParam =
+          uri.queryParameters['f'] ?? uri.queryParameters['filename'];
+      if (filenameParam != null && filenameParam.isNotEmpty) {
+        final cleanParam = filenameParam.split('?').first.split('#').first;
+        final dot = cleanParam.lastIndexOf('.');
+        if (dot != -1 && dot < cleanParam.length - 1) {
+          final ext = cleanParam.substring(dot).toLowerCase();
+          if (ext.length <= 6) return ext;
+        }
+      }
+      final path = uri.path;
+      final dot = path.lastIndexOf('.');
+      if (dot != -1 && dot < path.length - 1) {
+        final ext = path.substring(dot).toLowerCase();
+        if (ext.length <= 6) return ext;
+      }
+    } catch (_) {
+      // Uri parsing failed, fallback below
+    }
+
+    final clean = url.split('?').first.split('#').first;
+    final dot = clean.lastIndexOf('.');
+    if (dot != -1 && dot < clean.length - 1) {
+      final ext = clean.substring(dot).toLowerCase();
+      if (ext.length <= 6) return ext;
+    }
+    return '';
+  }
+
   static bool _isAudio(Post post) {
-    final value = '${post.fileType} ${post.fileUrl}'.toLowerCase();
-    return value.contains('audio') ||
-        value.contains('.mp3') ||
-        value.contains('.m4a') ||
-        value.contains('.wav') ||
-        value.contains('.ogg') ||
-        value.contains('.flac') ||
-        value.contains('.aac') ||
-        value.contains('.opus') ||
-        value.contains('.wma');
+    final type = post.fileType.toLowerCase().trim();
+    if (type == 'audio') return true;
+    if (type == 'video' || type == 'photo' || type == 'archive' || type == 'gif') {
+      return false;
+    }
+
+    final fileExt = _extractExtension(post.fileUrl);
+    if (_audioExtensions.contains(fileExt)) return true;
+    if (_videoExtensions.contains(fileExt)) return false;
+
+    final sampleExt = _extractExtension(post.sampleUrl);
+    if (_audioExtensions.contains(sampleExt)) return true;
+    if (_videoExtensions.contains(sampleExt)) return false;
+
+    return false;
   }
 
   static bool _isVideo(Post post) {
-    if (_isAudio(post)) return false;
-    final value = '${post.fileType} ${post.fileUrl}'.toLowerCase();
-    return value.contains('video') ||
-        value.contains('.webm') ||
-        value.contains('.mp4') ||
-        value.contains('.mov') ||
-        value.contains('.mkv') ||
-        value.contains('.avi') ||
-        value.contains('.flv') ||
-        value.contains('.wmv') ||
-        value.contains('.m4v') ||
-        value.contains('.ts');
+    final type = post.fileType.toLowerCase().trim();
+    if (type == 'video') return true;
+    if (type == 'audio' || type == 'photo' || type == 'archive' || type == 'gif') {
+      return false;
+    }
+
+    final fileExt = _extractExtension(post.fileUrl);
+    if (_videoExtensions.contains(fileExt)) return true;
+    if (_audioExtensions.contains(fileExt)) return false;
+
+    final sampleExt = _extractExtension(post.sampleUrl);
+    if (_videoExtensions.contains(sampleExt)) return true;
+    if (_audioExtensions.contains(sampleExt)) return false;
+
+    return false;
   }
 
   static bool _isGif(Post post) {
-    final value = '${post.fileType} ${post.fileUrl}'.toLowerCase();
-    return value.contains('gif') || value.contains('.gif');
+    final type = post.fileType.toLowerCase().trim();
+    if (type == 'gif') return true;
+    final fileExt = _extractExtension(post.fileUrl);
+    if (fileExt == '.gif') return true;
+    final sampleExt = _extractExtension(post.sampleUrl);
+    return sampleExt == '.gif';
   }
 
   static bool _looksLikeVideoUrl(String url) {
-    final value = url.toLowerCase();
-    return value.contains('.webm') ||
-        value.contains('.mp4') ||
-        value.contains('.mov') ||
-        value.contains('.mkv') ||
-        value.contains('.avi') ||
-        value.contains('.flv') ||
-        value.contains('.wmv') ||
-        value.contains('.m4v') ||
-        value.contains('.ts');
+    final ext = _extractExtension(url);
+    return _videoExtensions.contains(ext);
   }
 
   static bool _looksLikeAudioUrl(String url) {
-    final value = url.toLowerCase();
-    return value.contains('.mp3') ||
-        value.contains('.m4a') ||
-        value.contains('.wav') ||
-        value.contains('.ogg') ||
-        value.contains('.flac') ||
-        value.contains('.aac') ||
-        value.contains('.opus') ||
-        value.contains('.wma');
+    final ext = _extractExtension(url);
+    return _audioExtensions.contains(ext);
   }
 }
+

lib/features/artists/presentation/artist_posts_screen.dart

@@ -3,10 +3,10 @@ import 'dart:convert';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:go_router/go_router.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 import '../../../app/app.dart';
+import '../../../app/app_navigator.dart';
 import '../../../app/responsive.dart';
 import '../../../backend/backend.dart';
 import '../../../core/utils/result.dart';
@@ -791,12 +791,10 @@ class _ArtistPostsScreenState extends ConsumerState<ArtistPostsScreen> {
                                       settings.mediaQualityMode),
                                   favoriteKeys: favoriteKeys,
                                   viewedKeys: viewedKeys,
-                                  onOpen: (post) => context.push(
-                                    '/post/${post.providerId}/${post.id}',
-                                    extra: PostNavigationContext(
-                                      currentPost: post,
-                                      posts: displayedPosts,
-                                    ),
+                                  onOpen: (post) => AppNavigator.openPost(
+                                    context,
+                                    post: post,
+                                    postsList: displayedPosts,
                                   ),
                                   onFavorite: (post) async {
                                     if (favoriteKeys.contains(post.cacheKey)) {

lib/features/artists/presentation/artists_screen.dart

@@ -7,6 +7,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
 
 import '../../../app/app.dart';
+import '../../../app/app_navigator.dart';
 import '../../../app/responsive.dart';
 import '../../../backend/backend.dart';
 import '../../../core/utils/result.dart';
@@ -1574,12 +1575,10 @@ class _FavoriteArtistMediaStrip extends ConsumerWidget {
                 final isVideo = MediaUrlSelector.isVideo(post);
                 return InkWell(
                   borderRadius: BorderRadius.circular(14),
-                  onTap: () => context.push(
-                    '/post/${post.providerId}/${post.id}',
-                    extra: PostNavigationContext(
-                      currentPost: post,
-                      posts: posts,
-                    ),
+                  onTap: () => AppNavigator.openPost(
+                    context,
+                    post: post,
+                    postsList: posts,
                   ),
                   child: Container(
                     decoration: BoxDecoration(

lib/features/collections/presentation/collection_details_screen.dart

@@ -3,6 +3,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
 
 import '../../../app/app.dart';
+import '../../../app/app_navigator.dart';
 import '../../../app/responsive.dart';
 import '../../../backend/backend.dart';
 import '../../../shared/widgets/adaptive_scaffold.dart';
@@ -167,12 +168,10 @@ class CollectionDetailsScreen extends ConsumerWidget {
                   mediaQualityMode:
                       MediaQualityMode.fromName(settings.mediaQualityMode),
                   favoriteKeys: favoriteKeys,
-                  onOpen: (post) => context.push(
-                    '/post/${post.providerId}/${post.id}',
-                    extra: PostNavigationContext(
-                      currentPost: post,
-                      posts: items,
-                    ),
+                  onOpen: (post) => AppNavigator.openPost(
+                    context,
+                    post: post,
+                    postsList: items,
                   ),
                   onFavorite: (post) async {
                     if (favoriteKeys.contains(post.cacheKey)) {

lib/features/favorites/presentation/favorites_screen.dart

@@ -7,6 +7,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
 
 import '../../../app/app.dart';
+import '../../../app/app_navigator.dart';
 import '../../../app/responsive.dart';
 import '../../../backend/backend.dart';
 import '../../../shared/widgets/adaptive_scaffold.dart';
@@ -970,12 +971,10 @@ class _FavoritesScreenState extends ConsumerState<FavoritesScreen> {
       mediaQualityMode: MediaQualityMode.fromName(settings.mediaQualityMode),
       favoriteKeys: posts.map((post) => post.cacheKey).toSet(),
       downloadedKeys: downloadedKeys,
-      onOpen: (post) => context.push(
-        '/post/${post.providerId}/${post.id}',
-        extra: PostNavigationContext(
-          currentPost: post,
-          posts: posts,
-        ),
+      onOpen: (post) => AppNavigator.openPost(
+        context,
+        post: post,
+        postsList: posts,
       ),
       onFavorite: (post) =>
           ref.read(favoritesControllerProvider.notifier).remove(post),

lib/features/feed/presentation/feed_screen.dart

@@ -8,6 +8,7 @@ import 'dart:async';
 import 'package:cached_network_image/cached_network_image.dart';
 
 import '../../../app/app.dart';
+import '../../../app/app_navigator.dart';
 import '../../../app/responsive.dart';
 import '../../../backend/backend.dart';
 import '../../../core/utils/result.dart';
@@ -331,12 +332,10 @@ class _FeedScreenState extends ConsumerState<FeedScreen>
                             selectionMode: _selectionMode,
                             selectedKeys: _selectedKeys,
                             gridMode: settings.gridMode,
-                            onOpen: (post) => context.push(
-                              '/post/${post.providerId}/${post.id}',
-                              extra: PostNavigationContext(
-                                currentPost: post,
-                                posts: state.posts,
-                              ),
+                            onOpen: (post) => AppNavigator.openPost(
+                              context,
+                              post: post,
+                              postsList: state.posts,
                             ),
                             onPreview: (post) => _showPreview(context, post),
                             onToggleSelected: (post) => _toggleSelected(post),
@@ -392,7 +391,7 @@ class _FeedScreenState extends ConsumerState<FeedScreen>
   void _openRandom(List<Post> posts) {
     if (posts.isEmpty) return;
     final post = posts[Random().nextInt(posts.length)];
-    context.push('/post/${post.providerId}/${post.id}', extra: post);
+    AppNavigator.openPost(context, post: post, postsList: posts);
   }
 
   Future<void> _applySearchQuery(String query) async {

lib/features/post/presentation/post_details_screen.dart

@@ -8,6 +8,7 @@ import 'package:share_plus/share_plus.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 import '../../../app/app.dart';
+import '../../../app/app_navigator.dart';
 import '../../../app/app_strings.dart';
 import '../../../app/motion.dart';
 import '../../../app/responsive.dart';
@@ -872,7 +873,7 @@ class PostDetailsScreen extends ConsumerWidget {
   }
 
   void _openSimilar(BuildContext context, WidgetRef ref, Post post) {
-    context.push('/post/${post.providerId}/${post.id}/similar', extra: post);
+    AppNavigator.openSimilarPosts(context, post: post);
   }
 
   Future<void> _openSourcePage(WidgetRef ref, Post post) async {
@@ -888,7 +889,16 @@ class PostDetailsScreen extends ConsumerWidget {
   }
 
   void _replacePost(BuildContext context, Post post) {
-    context.replace('/post/${post.providerId}/${post.id}', extra: post);
+    Navigator.of(context).pushReplacement(
+      MaterialPageRoute<void>(
+        builder: (ctx) => PostDetailsScreen(
+          providerId: post.providerId,
+          postId: post.id,
+          initialPost: post,
+          postsList: postsList,
+        ),
+      ),
+    );
   }
 
   void _close(BuildContext context) {

lib/features/post/presentation/similar_posts_screen.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:go_router/go_router.dart';
 
 import '../../../app/app.dart';
+import '../../../app/app_navigator.dart';
 import '../../../app/responsive.dart';
 import '../../../backend/backend.dart';
 import '../../../core/utils/result.dart';
@@ -98,9 +98,9 @@ class SimilarPostsScreen extends ConsumerWidget {
                           MediaQualityMode.fromName(settings.mediaQualityMode),
                       favoriteKeys: favorites,
                       viewedKeys: viewed,
-                      onOpen: (post) => context.push(
-                        '/post/${post.providerId}/${post.id}',
-                        extra: post,
+                      onOpen: (post) => AppNavigator.openPost(
+                        context,
+                        post: post,
                       ),
                       onFavorite: (post) =>
                           _toggleFavorite(ref, post, favorites),

lib/features/providers/presentation/provider_form_screen.dart

@@ -288,14 +288,6 @@ class _ProviderFormScreenState extends ConsumerState<ProviderFormScreen> {
                           value: 'realbooru_html',
                           child: Text('Realbooru HTML'),
                         ),
-                        DropdownMenuItem(
-                          value: 'kemono',
-                          child: Text('Kemono Party artists'),
-                        ),
-                        DropdownMenuItem(
-                          value: 'coomer',
-                          child: Text('Coomer Party artists'),
-                        ),
                         DropdownMenuItem(
                           value: 'custom',
                           child: Text('Custom REST API'),

lib/features/providers/presentation/widgets/provider_card.dart

@@ -305,16 +305,6 @@ class ProviderCard extends StatelessWidget {
           Icons.pets_rounded,
           'e621 / e926',
         ),
-      'kemono' => (
-          const Color(0xFFEC4899),
-          Icons.palette_rounded,
-          'Kemono',
-        ),
-      'coomer' => (
-          const Color(0xFF06B6D4),
-          Icons.collections_rounded,
-          'Coomer',
-        ),
       _ => (
           const Color(0xFF6366F1),
           Icons.hub_rounded,

lib/features/settings/presentation/hidden_posts_screen.dart

@@ -1,9 +1,9 @@
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:go_router/go_router.dart';
 
 import '../../../app/app.dart';
+import '../../../app/app_navigator.dart';
 import '../../../backend/backend.dart';
 import '../../../core/utils/result.dart';
 import '../../../shared/widgets/adaptive_scaffold.dart';
@@ -62,9 +62,9 @@ class HiddenPostsScreen extends ConsumerWidget {
                     item: item,
                     onOpen: item.post == null
                         ? null
-                        : () => context.push(
-                              '/post/${item.post!.providerId}/${item.post!.id}',
-                              extra: item.post,
+                        : () => AppNavigator.openPost(
+                              context,
+                              post: item.post!,
                             ),
                     onRestore: () async {
                       await ref

lib/features/viewed/presentation/viewed_screen.dart

@@ -7,6 +7,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
 
 import '../../../app/app.dart';
+import '../../../app/app_navigator.dart';
 import '../../../app/responsive.dart';
 import '../../../backend/backend.dart';
 import '../../../shared/widgets/adaptive_scaffold.dart';
@@ -142,12 +143,10 @@ class _ViewedScreenState extends ConsumerState<ViewedScreen> {
                 mediaQualityMode:
                     MediaQualityMode.fromName(settings.mediaQualityMode),
                 favoriteKeys: favoriteKeys,
-                onOpen: (post) => context.push(
-                  '/post/${post.providerId}/${post.id}',
-                  extra: PostNavigationContext(
-                    currentPost: post,
-                    posts: allPosts,
-                  ),
+                onOpen: (post) => AppNavigator.openPost(
+                  context,
+                  post: post,
+                  postsList: allPosts,
                 ),
                 onFavorite: (post) => _toggleFavorite(
                   ref,
@@ -260,12 +259,10 @@ class _ViewedScreenState extends ConsumerState<ViewedScreen> {
                       isFavorite: favoriteKeys.contains(item.post.cacheKey),
                       isRu: isRu,
                       onOpen: () {
-                        context.push(
-                          '/post/${item.post.providerId}/${item.post.id}',
-                          extra: PostNavigationContext(
-                            currentPost: item.post,
-                            posts: allPosts,
-                          ),
+                        AppNavigator.openPost(
+                          context,
+                          post: item.post,
+                          postsList: allPosts,
                         );
                       },
                       onFavorite: () => _toggleFavorite(

lib/shared/widgets/app_shell.dart

@@ -7,13 +7,19 @@ import 'package:go_router/go_router.dart';
 import '../../app/app.dart';
 import '../../app/motion.dart';
 import '../../app/responsive.dart';
+import '../../app/router.dart';
 import '../../backend/backend.dart';
 import '../../core/utils/result.dart';
 
 class AppShell extends ConsumerStatefulWidget {
-  const AppShell({required this.child, super.key});
+  const AppShell({
+    required this.child,
+    this.navigationShell,
+    super.key,
+  });
 
   final Widget child;
+  final StatefulNavigationShell? navigationShell;
 
   static const destinations = [
     _Destination('feed', 'Feed', Icons.dashboard_rounded, '/'),
@@ -33,6 +39,30 @@ class AppShell extends ConsumerStatefulWidget {
     _Destination('settings', 'Settings', Icons.settings_rounded, '/settings'),
   ];
 
+  static int branchIndexForLocation(String location) {
+    if (location.startsWith('/settings')) return 7;
+    if (location.startsWith('/providers')) return 6;
+    if (location.startsWith('/artists')) return 5;
+    if (location.startsWith('/collections')) return 4;
+    if (location.startsWith('/viewed')) return 3;
+    if (location.startsWith('/favorites')) return 2;
+    if (location.startsWith('/search')) return 1;
+    return 0;
+  }
+
+  static String locationForBranchIndex(int index) {
+    return switch (index) {
+      1 => '/search',
+      2 => '/favorites',
+      3 => '/viewed',
+      4 => '/collections',
+      5 => '/artists',
+      6 => '/providers',
+      7 => '/settings',
+      _ => '/',
+    };
+  }
+
   static List<_Destination> _visibleDestinations(
     AppSettings settings,
     bool hasArtists,
@@ -52,11 +82,70 @@ class _AppShellState extends ConsumerState<AppShell> {
   final List<String> _tabHistory = [];
   String? _currentPath;
   bool _isBackNavigating = false;
+  bool _restoredTab = false;
+  late final AppLifecycleListener _lifecycleListener;
+
+  @override
+  void initState() {
+    super.initState();
+    _lifecycleListener = AppLifecycleListener(
+      onStateChange: (state) {
+        if (state == AppLifecycleState.paused ||
+            state == AppLifecycleState.inactive ||
+            state == AppLifecycleState.detached) {
+          _saveCurrentLocation();
+        }
+      },
+    );
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      final settings = ref.read(appSettingsProvider).value;
+      _maybeRestoreLastActiveTab(settings);
+    });
+  }
+
+  @override
+  void dispose() {
+    _lifecycleListener.dispose();
+    super.dispose();
+  }
+
+  void _saveCurrentLocation([String? location]) {
+    final loc = location ??
+        _currentPath ??
+        (widget.navigationShell != null
+            ? AppShell.locationForBranchIndex(
+                widget.navigationShell!.currentIndex)
+            : '/');
+    ref.read(settingsServiceProvider).saveLastActiveLocation(loc);
+  }
+
+  void _maybeRestoreLastActiveTab(AppSettings? settings) {
+    if (_restoredTab || settings == null) return;
+    final lastLocation = settings.lastActiveLocation;
+    if (lastLocation.isNotEmpty && lastLocation != '/') {
+      final idx = AppShell.branchIndexForLocation(lastLocation);
+      if (idx > 0 && widget.navigationShell != null) {
+        _restoredTab = true;
+        widget.navigationShell!.goBranch(idx, initialLocation: false);
+      }
+    }
+  }
 
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
     final path = GoRouterState.of(context).uri.path;
+    _syncPath(path);
+  }
+
+  @override
+  void didUpdateWidget(covariant AppShell oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    final path = GoRouterState.of(context).uri.path;
+    _syncPath(path);
+  }
+
+  void _syncPath(String path) {
     if (_isBackNavigating) {
       _isBackNavigating = false;
       _currentPath = path;
@@ -74,10 +163,37 @@ class _AppShellState extends ConsumerState<AppShell> {
       }
     }
     _currentPath = path;
+    _saveCurrentLocation(path);
+  }
+
+  void _onNavigate(String location) {
+    final targetIndex = AppShell.branchIndexForLocation(location);
+    if (widget.navigationShell != null) {
+      if (widget.navigationShell!.currentIndex == targetIndex) {
+        branchNavKeys[targetIndex]
+            .currentState
+            ?.popUntil((route) => route.isFirst);
+      } else {
+        widget.navigationShell!.goBranch(
+          targetIndex,
+          initialLocation: false,
+        );
+      }
+    } else {
+      context.go(location);
+    }
+    _saveCurrentLocation(location);
   }
 
   bool _handleBack() {
-    if (Navigator.of(context).canPop()) {
+    final shell = widget.navigationShell;
+    if (shell != null) {
+      final currentBranchKey = branchNavKeys[shell.currentIndex];
+      if (currentBranchKey.currentState?.canPop() ?? false) {
+        currentBranchKey.currentState?.pop();
+        return true;
+      }
+    } else if (Navigator.of(context).canPop()) {
       Navigator.of(context).pop();
       return true;
     }
@@ -90,13 +206,13 @@ class _AppShellState extends ConsumerState<AppShell> {
     if (_tabHistory.isNotEmpty) {
       final previous = _tabHistory.removeLast();
       _isBackNavigating = true;
-      context.go(previous);
+      _onNavigate(previous);
       return true;
     }
 
-    if (currentPath != '/') {
+    if (currentPath != '/' && (shell == null || shell.currentIndex != 0)) {
       _isBackNavigating = true;
-      context.go('/');
+      _onNavigate('/');
       return true;
     }
 
@@ -105,6 +221,12 @@ class _AppShellState extends ConsumerState<AppShell> {
 
   @override
   Widget build(BuildContext context) {
+    ref.listen<AsyncValue<AppSettings>>(appSettingsProvider, (prev, next) {
+      next.whenData((settings) {
+        _maybeRestoreLastActiveTab(settings);
+      });
+    });
+
     final settings =
         ref.watch(appSettingsProvider).value ?? AppSettings.defaults;
     final artistConfigs =
@@ -147,7 +269,7 @@ class _AppShellState extends ConsumerState<AppShell> {
           actions: {
             _NavigateIntent: CallbackAction<_NavigateIntent>(
               onInvoke: (intent) {
-                context.go(intent.location);
+                _onNavigate(intent.location);
                 return null;
               },
             ),
@@ -164,11 +286,15 @@ class _AppShellState extends ConsumerState<AppShell> {
                 ? _DesktopShell(
                     destinations: destinations,
                     ru: ru,
+                    currentBranchIndex: widget.navigationShell?.currentIndex,
+                    onNavigate: _onNavigate,
                     child: widget.child,
                   )
                 : _MobileShell(
                     destinations: destinations,
                     ru: ru,
+                    currentBranchIndex: widget.navigationShell?.currentIndex,
+                    onNavigate: _onNavigate,
                     child: widget.child,
                   ),
           ),
@@ -183,10 +309,14 @@ class _DesktopShell extends StatefulWidget {
     required this.child,
     required this.destinations,
     required this.ru,
+    required this.onNavigate,
+    this.currentBranchIndex,
   });
   final Widget child;
   final List<_Destination> destinations;
   final bool ru;
+  final ValueChanged<String> onNavigate;
+  final int? currentBranchIndex;
 
   @override
   State<_DesktopShell> createState() => _DesktopShellState();
@@ -198,10 +328,10 @@ class _DesktopShellState extends State<_DesktopShell> {
   @override
   Widget build(BuildContext context) {
     final location = GoRouterState.of(context).uri.path;
+    final activeBranch = widget.currentBranchIndex ??
+        AppShell.branchIndexForLocation(location);
     final selected = widget.destinations.indexWhere(
-      (item) => item.location == '/'
-          ? location == '/'
-          : location.startsWith(item.location),
+      (item) => AppShell.branchIndexForLocation(item.location) == activeBranch,
     );
     return Scaffold(
       body: Row(
@@ -229,7 +359,7 @@ class _DesktopShellState extends State<_DesktopShell> {
                           selected: (selected < 0 ? 0 : selected) == index,
                           expanded: _hovered,
                           onTap: () {
-                            context.go(widget.destinations[index].location);
+                            widget.onNavigate(widget.destinations[index].location);
                           },
                         ),
                       const Spacer(),
@@ -334,10 +464,14 @@ class _MobileShell extends StatelessWidget {
     required this.child,
     required this.destinations,
     required this.ru,
+    required this.onNavigate,
+    this.currentBranchIndex,
   });
   final Widget child;
   final List<_Destination> destinations;
   final bool ru;
+  final ValueChanged<String> onNavigate;
+  final int? currentBranchIndex;
 
   @override
   Widget build(BuildContext context) {
@@ -347,10 +481,10 @@ class _MobileShell extends StatelessWidget {
         .take(6)
         .toList();
     final location = GoRouterState.of(context).uri.path;
+    final activeBranch = currentBranchIndex ??
+        AppShell.branchIndexForLocation(location);
     final selected = items.indexWhere(
-      (item) => item.location == '/'
-          ? location == '/'
-          : location.startsWith(item.location),
+      (item) => AppShell.branchIndexForLocation(item.location) == activeBranch,
     );
     final isKeyboardOpen = MediaQuery.viewInsetsOf(context).bottom > 0;
     final bottomInset = isKeyboardOpen
@@ -368,13 +502,13 @@ class _MobileShell extends StatelessWidget {
         ),
         child: child,
       ),
-      floatingActionButton: (location == '/settings' || isKeyboardOpen)
+      floatingActionButton: (activeBranch == 7 || isKeyboardOpen)
           ? null
           : Padding(
               padding: const EdgeInsets.only(bottom: 0, right: 2),
               child: _LiquidGlassSettingsButton(
                 ru: ru,
-                onTap: () => context.go('/settings'),
+                onTap: () => onNavigate('/settings'),
               ),
             ),
       floatingActionButtonLocation: FloatingActionButtonLocation.endFloat,
@@ -383,7 +517,7 @@ class _MobileShell extends StatelessWidget {
           : _LiquidGlassBottomBar(
               selectedIndex: selected < 0 ? 0 : selected,
               onDestinationSelected: (index) =>
-                  context.go(items[index].location),
+                  onNavigate(items[index].location),
               items: items,
               ru: ru,
             ),

pubspec.yaml

@@ -1,7 +1,7 @@
 name: gel_rule_app
 description: Local backend/core layer for a Flutter booru browser app.
 publish_to: "none"
-version: 3.5.3+79
+version: 3.5.5+81
 
 environment:
   sdk: ">=3.3.0 <4.0.0"

test/backend/pawchive_provider_test.dart

@@ -111,5 +111,28 @@ void main() {
     expect(MediaUrlSelector.isAudio(photoPost), isFalse);
     expect(MediaUrlSelector.isVideo(photoPost), isFalse);
   });
+
+  test('MediaUrlSelector classifies mp4 containing "audio" in query parameter as video and not audio', () {
+    final trickyVideoPost = Post(
+      id: 'patreon:123:456:3',
+      providerId: 'pawchive',
+      providerName: 'Pawchive',
+      previewUrl: '',
+      sampleUrl: '',
+      fileUrl:
+          'https://file.pawchive.pw/data/b4/65/b465cb03ab7b26c0a677db3ae43500d1ef71e3e25151f160cda244c1fb40cfae.mp4?f=nsfw%202%20-%20audio%20spicy.mp4',
+      tags: const ['patreon', 'artist', 'nsfw 2 - audio spicy'],
+      rating: 'unknown',
+      width: 1920,
+      height: 1080,
+      createdAt: DateTime.now(),
+      fileType: 'video',
+      score: 0,
+    );
+
+    expect(MediaUrlSelector.isVideo(trickyVideoPost), isTrue);
+    expect(MediaUrlSelector.isAudio(trickyVideoPost), isFalse);
+    expect(MediaUrlSelector.video(trickyVideoPost), contains(trickyVideoPost.fileUrl));
+  });
 }
 

test/backend/provider_parser_test.dart

@@ -6,7 +6,6 @@ import 'package:gel_rule_app/backend/mappers/moebooru_mapper.dart';
 import 'package:gel_rule_app/backend/mappers/rule34_mapper.dart';
 import 'package:gel_rule_app/backend/models/content_provider_config.dart';
 import 'package:gel_rule_app/backend/providers/custom_provider.dart';
-import 'package:gel_rule_app/backend/providers/kemono_provider.dart';
 import 'package:gel_rule_app/backend/providers/provider_factory.dart';
 import 'package:gel_rule_app/backend/providers/realbooru_html_provider.dart';
 import 'package:gel_rule_app/backend/repositories/provider_repository.dart';
@@ -307,7 +306,7 @@ void main() {
     expect(provider, isA<RealbooruHtmlProvider>());
   });
 
-  test('provider factory creates Kemono and Coomer artist providers', () {
+  test('provider factory treats removed Kemono and Coomer as unsupported', () {
     final now = DateTime(2026);
     for (final apiType in ['kemono', 'coomer']) {
       final provider = ProviderFactory().create(ContentProviderConfig(
@@ -323,7 +322,7 @@ void main() {
         updatedAt: now,
       ));
 
-      expect(provider, isA<KemonoProvider>());
+      expect(provider, isA<UnsupportedCustomProvider>());
     }
   });
 }

test/features/tab_navigation_preservation_test.dart

@@ -0,0 +1,47 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:gel_rule_app/backend/backend.dart';
+import 'package:gel_rule_app/shared/widgets/app_shell.dart';
+
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+
+  group('Tab Navigation & State Preservation Tests', () {
+    test('AppShell branchIndexForLocation and locationForBranchIndex map correctly', () {
+      expect(AppShell.branchIndexForLocation('/'), 0);
+      expect(AppShell.branchIndexForLocation('/?q=test'), 0);
+      expect(AppShell.branchIndexForLocation('/search'), 1);
+      expect(AppShell.branchIndexForLocation('/favorites'), 2);
+      expect(AppShell.branchIndexForLocation('/viewed'), 3);
+      expect(AppShell.branchIndexForLocation('/collections'), 4);
+      expect(AppShell.branchIndexForLocation('/collections/123'), 4);
+      expect(AppShell.branchIndexForLocation('/artists'), 5);
+      expect(AppShell.branchIndexForLocation('/artists/pawchive/patreon/99'), 5);
+      expect(AppShell.branchIndexForLocation('/providers'), 6);
+      expect(AppShell.branchIndexForLocation('/settings'), 7);
+      expect(AppShell.branchIndexForLocation('/settings/hidden'), 7);
+
+      expect(AppShell.locationForBranchIndex(0), '/');
+      expect(AppShell.locationForBranchIndex(1), '/search');
+      expect(AppShell.locationForBranchIndex(2), '/favorites');
+      expect(AppShell.locationForBranchIndex(3), '/viewed');
+      expect(AppShell.locationForBranchIndex(4), '/collections');
+      expect(AppShell.locationForBranchIndex(5), '/artists');
+      expect(AppShell.locationForBranchIndex(6), '/providers');
+      expect(AppShell.locationForBranchIndex(7), '/settings');
+    });
+
+    test('AppSettings preserves lastActiveLocation in JSON serialization', () {
+      const defaults = AppSettings.defaults;
+      expect(defaults.lastActiveLocation, '/');
+
+      final updated = defaults.copyWith(lastActiveLocation: '/artists/pawchive/patreon/12345');
+      expect(updated.lastActiveLocation, '/artists/pawchive/patreon/12345');
+
+      final json = updated.toJson();
+      expect(json['lastActiveLocation'], '/artists/pawchive/patreon/12345');
+
+      final restored = AppSettings.fromJson(json);
+      expect(restored.lastActiveLocation, '/artists/pawchive/patreon/12345');
+    });
+  });
+}