v1.1.9+39

- blah

android/app/src/main/AndroidManifest.xml

@@ -1,11 +1,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
     <application
         android:label="f0ckapp"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
-        android:roundIcon="@mipmap/ic_launcher_round"
         android:enableOnBackInvokedCallback="true">
         <activity
             android:name=".MainActivity"
@@ -29,12 +29,26 @@
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
+            <meta-data android:name="flutter_deeplinking_enabled" android:value="true"/>
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
+                <data android:scheme="https" android:host="f0ck.me"/>
+            </intent-filter>
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
+                <data android:scheme="f0ck" android:host="com.f0ck.f0ckapp"/>
+            </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />
+        
     </application>
     <!-- Required to query activities that can process text, see:
          https://developer.android.com/training/package-visibility and

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@mipmap/ic_launcher_background"/>
+  <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+  <monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
+</adaptive-icon>

lib/main.dart

@@ -1,33 +1,87 @@
+import 'package:f0ckapp/providers/MediaProvider.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
+import 'package:go_router/go_router.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
 import 'package:f0ckapp/screens/MediaGrid.dart';
+import 'package:f0ckapp/screens/DetailView.dart';
 import 'package:f0ckapp/utils/AppVersion.dart';
 import 'package:f0ckapp/providers/ThemeProvider.dart';
 
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
   await SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
   await AppVersion.init();
 
-  runApp(ProviderScope(child: const F0ckApp()));
+  runApp(ProviderScope(child: F0ckApp()));
 }
 
 class F0ckApp extends ConsumerWidget {
-  const F0ckApp({super.key});
+  F0ckApp({super.key});
+
+  final GoRouter _router = GoRouter(
+    initialLocation: '/',
+    routes: [
+      GoRoute(
+        path: '/',
+        builder: (context, state) {
+          return const MediaGrid();
+        },
+      ),
+      GoRoute(
+        path: '/:rest(.*)',
+        builder: (context, state) {
+          final isInternalLink = (state.extra is bool && state.extra == true);
+          final fullPath = state.matchedLocation;
+
+          final regExp = RegExp(
+            r'^(?:/tag/(?<tag>.+?))?(?:/(?<mime>image|audio|video))?(?:/(?<itemid>\d+))?$',
+          );
+          final match = regExp.firstMatch(fullPath);
+
+          if (match == null) {
+            return const Scaffold(body: Center(child: Text('Ungültiger Link')));
+          }
+
+          final String? tag = match.namedGroup('tag');
+          final String? mime = match.namedGroup('mime');
+          final String? idStr = match.namedGroup('itemid');
+          final int? itemId = idStr != null ? int.tryParse(idStr) : null;
+          const preloadOffset = 50;
+
+          return Consumer(
+            builder: (context, ref, child) {
+              WidgetsBinding.instance.addPostFrameCallback((_) async {
+                final mediaNotifier = ref.read(mediaProvider.notifier);
+                if (!isInternalLink) {
+                  mediaNotifier.setType(mime ?? "alles");
+                  mediaNotifier.setTag(tag);
+                }
+                if (itemId != null) {
+                  await mediaNotifier.loadMedia(id: itemId + preloadOffset);
+                }
+              });
+              if (itemId != null) {
+                return DetailView(initialItemId: itemId);
+              } else {
+                return MediaGrid();
+              }
+            },
+          );
+        },
+      ),
+    ],
+  );
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    return Consumer(
-      builder: (context, ref, _) {
-        return MaterialApp(
-          debugShowCheckedModeBanner: false,
-          theme: ref.watch(themeNotifierProvider),
-          home: const MediaGrid(),
-        );
-      },
+    final theme = ref.watch(themeNotifierProvider);
+    return MaterialApp.router(
+      debugShowCheckedModeBanner: false,
+      routerConfig: _router,
+      theme: theme,
     );
   }
 }

lib/providers/MediaProvider.dart

@@ -106,14 +106,12 @@ class MediaNotifier extends StateNotifier<MediaState> {
     state = state.replace(mediaItems: updated);
   }
 
-  Future<void> loadMedia() async {
+  Future<void> loadMedia({int? id}) async {
     if (state.isLoading) return;
-
     state = state.replace(isLoading: true);
     try {
-      final older = state.mediaItems.isNotEmpty
-          ? state.mediaItems.last.id
-          : null;
+      final older =
+          id ?? (state.mediaItems.isNotEmpty ? state.mediaItems.last.id : null);
       final newMedia = await fetchMedia(
         older: older,
         type: mediaTypes[state.typeIndex],

lib/providers/ThemeProvider.dart

@@ -1,8 +1,18 @@
 import 'package:flutter/material.dart';
-
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
+final Map<String, ThemeData> themeMap = {
+  'f0ck': f0ckTheme,
+  'P1nk': p1nkTheme, // done
+  'Orange': orangeTheme,
+  'Amoled': amoledTheme,
+  'Paper': paperTheme,
+  //'Iced': icedTheme,
+  'f0ck95': f0ck95Theme,
+  'f0ck95d': f0ck95dTheme,
+};
+
 class ThemeNotifier extends StateNotifier<ThemeData> {
   final FlutterSecureStorage secureStorage;
 
@@ -11,48 +21,37 @@ class ThemeNotifier extends StateNotifier<ThemeData> {
   }
 
   Future<void> _loadTheme() async {
-    String? savedThemeName = await secureStorage.read(key: 'theme');
-    if (savedThemeName != null) {
-      final customTheme = themes.firstWhere(
-        (t) => t.name == savedThemeName,
-        orElse: () => CustomTheme(name: 'f0ck', theme: f0ckTheme),
-      );
-      state = customTheme.theme;
+    try {
+      String? savedThemeName = await secureStorage.read(key: 'theme');
+      if (savedThemeName != null && themeMap.containsKey(savedThemeName)) {
+        state = themeMap[savedThemeName]!;
+      }
+    } catch (error) {
+      debugPrint('Fehler beim Laden des Themes: $error');
+      state = f0ckTheme;
     }
   }
 
   Future<void> updateTheme(String themeName) async {
-    await secureStorage.write(key: 'theme', value: themeName);
-    final newTheme = themes.firstWhere(
-      (t) => t.name == themeName,
-      orElse: () => CustomTheme(name: 'f0ck', theme: f0ckTheme),
-    );
-    state = newTheme.theme;
+    try {
+      await secureStorage.write(key: 'theme', value: themeName);
+      state = themeMap[themeName] ?? f0ckTheme;
+    } catch (error) {
+      debugPrint('Fehler beim Aktualisieren des Themes: $error');
+    }
   }
 }
 
 final themeNotifierProvider = StateNotifierProvider<ThemeNotifier, ThemeData>((
   ref,
 ) {
-  return ThemeNotifier(secureStorage: FlutterSecureStorage());
+  return ThemeNotifier(
+    secureStorage: const FlutterSecureStorage(
+      aOptions: AndroidOptions(encryptedSharedPreferences: true),
+    ),
+  );
 });
 
-class CustomTheme {
-  final String name;
-  final ThemeData theme;
-
-  CustomTheme({required this.name, required this.theme});
-}
-
-final List<CustomTheme> themes = [
-  CustomTheme(name: 'f0ck', theme: f0ckTheme),
-  CustomTheme(name: 'Paper', theme: paperTheme),
-  CustomTheme(name: 'Orange', theme: orangeTheme),
-  CustomTheme(name: 'Amoled', theme: amoledTheme),
-  CustomTheme(name: 'f0ck95', theme: f0ck95Theme),
-  CustomTheme(name: 'f0ck95d', theme: f0ck95dTheme),
-];
-
 final ThemeData f0ckTheme = ThemeData(
   brightness: Brightness.dark,
   primaryColor: const Color(0xFF9FFF00),
@@ -74,13 +73,53 @@ final ThemeData f0ckTheme = ThemeData(
     bodyLarge: TextStyle(color: Colors.white),
     bodyMedium: TextStyle(color: Colors.white),
   ),
-  buttonTheme: ButtonThemeData(
-    buttonColor: const Color(0xFF9FFF00),
-    textTheme: ButtonTextTheme.primary,
+  elevatedButtonTheme: ElevatedButtonThemeData(
+    style: ElevatedButton.styleFrom(
+      foregroundColor: const Color(0xFF000000),
+      backgroundColor: const Color(0xFF9FFF00),
+    ),
   ),
   scrollbarTheme: ScrollbarThemeData(
-    thumbColor: WidgetStatePropertyAll<Color>(Color(0xFF2B2B2B)),
-    trackColor: WidgetStatePropertyAll<Color>(Color(0xFF424242)),
+    thumbColor: WidgetStateProperty.all<Color>(const Color(0xFF2B2B2B)),
+    trackColor: WidgetStateProperty.all<Color>(const Color(0xFF424242)),
+  ),
+);
+
+final ThemeData p1nkTheme = ThemeData(
+  brightness: Brightness.dark,
+  primaryColor: const Color(0xFF171717),
+  scaffoldBackgroundColor: const Color(0xFF171717),
+  appBarTheme: const AppBarTheme(
+    color: Color(0xFF2B2B2B),
+    foregroundColor: Color(0xFFFF00D0),
+    elevation: 2,
+  ),
+  textTheme: const TextTheme(
+    bodyLarge: TextStyle(color: Color(0xFFFFFFFF)),
+    bodyMedium: TextStyle(color: Color(0xFFFFFFFF)),
+    titleLarge: TextStyle(color: Color(0xFFFFFFFF)),
+  ),
+  elevatedButtonTheme: ElevatedButtonThemeData(
+    style: ElevatedButton.styleFrom(
+      foregroundColor: const Color(0xFF000000),
+      backgroundColor: const Color(0xFFFF00D0),
+    ),
+  ),
+  progressIndicatorTheme: const ProgressIndicatorThemeData(
+    color: Color(0xFFFF00D0),
+  ),
+  scrollbarTheme: ScrollbarThemeData(
+    thumbColor: WidgetStateProperty.all(const Color(0xFF2B2B2B)),
+    trackColor: WidgetStateProperty.all(const Color(0xFF424242)),
+  ),
+  colorScheme: const ColorScheme.dark(
+    primary: Color(0xFF171717),
+    secondary: Color(0xFFFF00D0),
+    surface: Color(0xFF171717),
+    onPrimary: Color(0xFFFFFFFF),
+    onSecondary: Color(0xFF000000),
+    onSurface: Color(0xFFFFFFFF),
+    error: Color(0xFFA72828),
   ),
 );
 
@@ -105,9 +144,11 @@ final ThemeData paperTheme = ThemeData(
     bodyLarge: TextStyle(color: Color(0xFF000000)),
     bodyMedium: TextStyle(color: Color(0xFF000000)),
   ),
-  buttonTheme: ButtonThemeData(
-    buttonColor: const Color(0xFF000000),
-    textTheme: ButtonTextTheme.primary,
+  elevatedButtonTheme: ElevatedButtonThemeData(
+    style: ElevatedButton.styleFrom(
+      foregroundColor: const Color(0xFFFFFFFF),
+      backgroundColor: const Color(0xFF000000),
+    ),
   ),
 );
 
@@ -132,13 +173,15 @@ final ThemeData orangeTheme = ThemeData(
     bodyLarge: TextStyle(color: Colors.white),
     bodyMedium: TextStyle(color: Colors.white),
   ),
-  buttonTheme: ButtonThemeData(
-    buttonColor: const Color(0xFFFF6F00),
-    textTheme: ButtonTextTheme.primary,
+  elevatedButtonTheme: ElevatedButtonThemeData(
+    style: ElevatedButton.styleFrom(
+      foregroundColor: Colors.white,
+      backgroundColor: const Color(0xFFFF6F00),
+    ),
   ),
   scrollbarTheme: ScrollbarThemeData(
-    thumbColor: WidgetStatePropertyAll<Color>(Color(0xFF2B2B2B)),
-    trackColor: WidgetStatePropertyAll<Color>(Color(0xFF424242)),
+    thumbColor: WidgetStateProperty.all<Color>(const Color(0xFF2B2B2B)),
+    trackColor: WidgetStateProperty.all<Color>(const Color(0xFF424242)),
   ),
 );
 
@@ -165,9 +208,11 @@ final ThemeData amoledTheme = ThemeData(
     bodyLarge: TextStyle(color: Colors.white),
     bodyMedium: TextStyle(color: Colors.white),
   ),
-  buttonTheme: ButtonThemeData(
-    buttonColor: const Color(0xFFFFFFFF),
-    textTheme: ButtonTextTheme.primary,
+  elevatedButtonTheme: ElevatedButtonThemeData(
+    style: ElevatedButton.styleFrom(
+      foregroundColor: Colors.black,
+      backgroundColor: const Color(0xFFFFFFFF),
+    ),
   ),
   scrollbarTheme: ScrollbarThemeData(
     thumbColor: WidgetStateProperty.all<Color>(const Color(0xFF1D1C1C)),
@@ -195,13 +240,15 @@ final ThemeData f0ck95Theme = ThemeData(
     bodyLarge: TextStyle(color: Colors.black),
     bodyMedium: TextStyle(color: Colors.black),
   ),
-  buttonTheme: ButtonThemeData(
-    buttonColor: Colors.black,
-    textTheme: ButtonTextTheme.primary,
+  elevatedButtonTheme: ElevatedButtonThemeData(
+    style: ElevatedButton.styleFrom(
+      foregroundColor: Colors.white,
+      backgroundColor: Colors.black,
+    ),
   ),
   scrollbarTheme: ScrollbarThemeData(
-    thumbColor: WidgetStatePropertyAll<Color>(Color(0xFF2B2B2B)),
-    trackColor: WidgetStatePropertyAll<Color>(Color(0xFF424242)),
+    thumbColor: WidgetStateProperty.all<Color>(const Color(0xFF2B2B2B)),
+    trackColor: WidgetStateProperty.all<Color>(const Color(0xFF424242)),
   ),
 );
 
@@ -225,12 +272,14 @@ final ThemeData f0ck95dTheme = ThemeData(
     bodyLarge: TextStyle(color: Colors.white),
     bodyMedium: TextStyle(color: Colors.white),
   ),
-  buttonTheme: ButtonThemeData(
-    buttonColor: Colors.white,
-    textTheme: ButtonTextTheme.primary,
+  elevatedButtonTheme: ElevatedButtonThemeData(
+    style: ElevatedButton.styleFrom(
+      foregroundColor: Colors.black,
+      backgroundColor: Colors.white,
+    ),
   ),
   scrollbarTheme: ScrollbarThemeData(
-    thumbColor: WidgetStatePropertyAll<Color>(Color(0xFF2B2B2B)),
-    trackColor: WidgetStatePropertyAll<Color>(Color(0xFF424242)),
+    thumbColor: WidgetStateProperty.all<Color>(const Color(0xFF2B2B2B)),
+    trackColor: WidgetStateProperty.all<Color>(const Color(0xFF424242)),
   ),
 );

lib/screens/DetailView.dart

@@ -2,10 +2,10 @@ import 'dart:io';
 import 'dart:typed_data';
 
 import 'package:flutter/material.dart';
-
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
+import 'package:go_router/go_router.dart';
 import 'package:share_plus/share_plus.dart';
 
 import 'package:f0ckapp/models/MediaItem.dart';
@@ -24,40 +24,24 @@ class DetailView extends ConsumerStatefulWidget {
 }
 
 class _DetailViewState extends ConsumerState<DetailView> {
-  late PageController _pageController;
+  PageController? _pageController;
   bool isLoading = false;
   int _currentIndex = 0;
 
   @override
   void initState() {
     super.initState();
-
-    final mediaState = ref.read(mediaProvider);
-    final initialIndex = mediaState.mediaItems.indexWhere(
-      (item) => item.id == widget.initialItemId,
-    );
-    _pageController = PageController(initialPage: initialIndex);
-    _currentIndex = initialIndex;
-
-    _pageController.addListener(() {
-      setState(() => _currentIndex = _pageController.page?.round() ?? 0);
-    });
-
-    _preloadAdjacentMedia(initialIndex);
   }
 
   void _preloadAdjacentMedia(int index) async {
     final mediaState = ref.read(mediaProvider);
-    if (index + 1 < mediaState.mediaItems.length) {
-      final nextUrl = mediaState.mediaItems[index + 1].mediaUrl;
-      if (await DefaultCacheManager().getFileFromCache(nextUrl) == null) {
-        await DefaultCacheManager().downloadFile(nextUrl);
-      }
-    }
-    if (index - 1 >= 0) {
-      final prevUrl = mediaState.mediaItems[index - 1].mediaUrl;
-      if (await DefaultCacheManager().getFileFromCache(prevUrl) == null) {
-        await DefaultCacheManager().downloadFile(prevUrl);
+    for (int offset in [-1, 1]) {
+      final adjacentIndex = index + offset;
+      if (adjacentIndex >= 0 && adjacentIndex < mediaState.mediaItems.length) {
+        final url = mediaState.mediaItems[adjacentIndex].mediaUrl;
+        if (await DefaultCacheManager().getFileFromCache(url) == null) {
+          await DefaultCacheManager().downloadFile(url);
+        }
       }
     }
   }
@@ -84,31 +68,60 @@ class _DetailViewState extends ConsumerState<DetailView> {
 
   @override
   void dispose() {
-    _pageController.dispose();
+    _pageController?.dispose();
     super.dispose();
   }
 
   @override
   Widget build(BuildContext context) {
     final mediaState = ref.watch(mediaProvider);
-    final mediaNotifier = ref.read(mediaProvider.notifier);
+    final int itemIndex = mediaState.mediaItems.indexWhere(
+      (item) => item.id == widget.initialItemId,
+    );
 
-    if (mediaState.mediaItems.isEmpty) {
+    if (itemIndex == -1) {
+      Future.microtask(() {
+        ref
+            .read(mediaProvider.notifier)
+            .loadMedia(id: widget.initialItemId + 50);
+      });
       return Scaffold(
         appBar: AppBar(),
         body: const Center(child: CircularProgressIndicator()),
       );
     }
 
+    if (_pageController == null) {
+      _pageController = PageController(initialPage: itemIndex);
+      _currentIndex = itemIndex;
+      _pageController!.addListener(() {
+        setState(() => _currentIndex = _pageController!.page?.round() ?? 0);
+      });
+      _preloadAdjacentMedia(itemIndex);
+    }
+
     return Scaffold(
       appBar: AppBar(
         centerTitle: true,
         title: Text('f0ck #${mediaState.mediaItems[_currentIndex].id}'),
+        automaticallyImplyLeading: false,
+        leading: IconButton(
+          icon: const Icon(Icons.arrow_back),
+          onPressed: () {
+            context.canPop() ? context.pop() : context.go('/', extra: true);
+          },
+        ),
         actions: [
           IconButton(
-            icon: Icon(mediaState.muted ? Icons.volume_off : Icons.volume_up),
+            icon: const Icon(Icons.fullscreen),
             onPressed: () {
-              mediaNotifier.toggleMute();
+              _showError('fullscreen ist wip');
+            },
+          ),
+          IconButton(
+            icon: const Icon(Icons.download),
+            onPressed: () {
+              _showError('download ist wip');
             },
           ),
           PopupMenuButton<String>(
@@ -149,14 +162,14 @@ class _DetailViewState extends ConsumerState<DetailView> {
                 value: 'direct_link',
                 child: ListTile(
                   leading: const Icon(Icons.link),
-                  title: const Text('Link zum Bild'),
+                  title: const Text('Link zur Datei'),
                 ),
               ),
               PopupMenuItem(
                 value: 'post_link',
                 child: ListTile(
                   leading: const Icon(Icons.article),
-                  title: const Text('Link zum Post'),
+                  title: const Text('Link zum f0ck'),
                 ),
               ),
             ],
@@ -167,7 +180,7 @@ class _DetailViewState extends ConsumerState<DetailView> {
       body: Stack(
         children: [
           PageTransformer(
-            controller: _pageController,
+            controller: _pageController!,
             pages: mediaState.mediaItems.map((item) {
               int itemIndex = mediaState.mediaItems.indexOf(item);
               return SafeArea(
@@ -182,14 +195,14 @@ class _DetailViewState extends ConsumerState<DetailView> {
       ),
       persistentFooterButtons: mediaState.tag != null
           ? [
-              InputChip(
-                label: Text(mediaState.tag!),
-                //backgroundColor: const Color(0xFF090909),
-                //labelStyle: const TextStyle(color: Colors.white),
-                onDeleted: () {
-                  mediaNotifier.setTag(null);
-                  Navigator.pop(context);
-                },
+              Center(
+                child: InputChip(
+                  label: Text(mediaState.tag!),
+                  onDeleted: () {
+                    ref.read(mediaProvider.notifier).setTag(null);
+                    context.go('/', extra: true);
+                  },
+                ),
               ),
             ]
           : null,
@@ -221,7 +234,7 @@ class _DetailViewState extends ConsumerState<DetailView> {
                   if (tag.tag == 'sfw' || tag.tag == 'nsfw') return;
                   setState(() {
                     mediaNotifier.setTag(tag.tag);
-                    Navigator.pop(context, true);
+                    context.go('/', extra: true);
                   });
                 },
                 label: Text(tag.tag),

lib/screens/MediaGrid.dart

@@ -7,6 +7,7 @@ import 'package:f0ckapp/screens/DetailView.dart';
 import 'package:f0ckapp/providers/MediaProvider.dart';
 import 'package:f0ckapp/utils/AppVersion.dart';
 import 'package:f0ckapp/providers/ThemeProvider.dart';
+import 'package:go_router/go_router.dart';
 
 const List<String> mediaTypes = ["alles", "image", "video", "audio"];
 const List<String> mediaModes = ["sfw", "nsfw", "untagged", "all"];
@@ -61,15 +62,21 @@ class _MediaGridState extends ConsumerState<MediaGrid> {
     return Scaffold(
       key: _scaffoldKey,
       appBar: AppBar(
-        title: Row(
-          spacing: 15,
-          children: [
-            Image.asset('assets/images/f0ck_small.webp', fit: BoxFit.fitHeight),
-            Text(
-              'fApp',
-              style: TextStyle(fontSize: 24),
-            ),
-          ],
+        title: GestureDetector(
+          child: Row(
+            spacing: 10,
+            children: [
+              Image.asset(
+                'assets/images/f0ck_small.webp',
+                fit: BoxFit.fitHeight,
+              ),
+              Text('fApp', style: TextStyle(fontSize: 24)),
+            ],
+          ),
+          onTap: () {
+            mediaNotifier.setTag(null);
+            _scrollController.jumpTo(0);
+          },
         ),
         actions: [
           IconButton(
@@ -202,17 +209,19 @@ class _MediaGridState extends ConsumerState<MediaGrid> {
                 Padding(
                   padding: const EdgeInsets.symmetric(horizontal: 16.0),
                   child: Column(
-                    children: themes.map((themeData) {
+                    children: themeMap.entries.map((entry) {
+                      final themeName = entry.key;
+                      final themeData = entry.value;
                       final currentTheme = ref.watch(themeNotifierProvider);
-                      final isSelected = currentTheme == themeData.theme;
+                      final isSelected = currentTheme == themeData;
                       return ListTile(
-                        title: Text(themeData.name),
+                        title: Text(themeName),
                         selected: isSelected,
                         selectedTileColor: Colors.blue.withValues(alpha: 0.2),
                         onTap: () async {
                           await ref
                               .read(themeNotifierProvider.notifier)
-                              .updateTheme(themeData.name);
+                              .updateTheme(themeName);
                         },
                       );
                     }).toList(),
@@ -220,7 +229,6 @@ class _MediaGridState extends ConsumerState<MediaGrid> {
                 ),
               ],
             ),
-
             ListTile(
               title: Text('v${AppVersion.version}'),
               onTap: () {
@@ -236,12 +244,14 @@ class _MediaGridState extends ConsumerState<MediaGrid> {
       ),
       persistentFooterButtons: mediaState.tag != null
           ? [
-              InputChip(
-                label: Text(mediaState.tag!),
-                onDeleted: () {
-                  mediaNotifier.setTag(null);
-                  _scrollController.jumpTo(0);
-                },
+              Center(
+                child: InputChip(
+                  label: Text(mediaState.tag!),
+                  onDeleted: () {
+                    mediaNotifier.setTag(null);
+                    _scrollController.jumpTo(0);
+                  },
+                ),
               ),
             ]
           : null,
@@ -271,15 +281,7 @@ class _MediaGridState extends ConsumerState<MediaGrid> {
 
             return InkWell(
               onTap: () async {
-                bool? ret = await Navigator.push(
-                  context,
-                  MaterialPageRoute(
-                    builder: (context) => DetailView(initialItemId: item.id),
-                  ),
-                );
-                if (ret != null && ret) {
-                  _scrollController.jumpTo(0);
-                }
+                context.push('/${item.id}', extra: true);
               },
               child: Stack(
                 fit: StackFit.expand,

lib/utils/ParseDeepLink.dart

@@ -0,0 +1,94 @@
+import 'package:flutter/material.dart';
+
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import 'package:f0ckapp/providers/MediaProvider.dart';
+import 'package:f0ckapp/screens/DetailView.dart';
+
+Map<String, RegExp> routes = {
+  //'login': RegExp(r'^/login/?$'),
+  //'user': RegExp(r'^/user/(?<user>.*)$'),
+  'complex': RegExp(
+    r'^/?'
+    r'(?:tag/(?<tag>.+?))?'
+    r'(?:/user/(?<username>.+?)/(?<set>f0cks|favs))?'
+    r'(?:/(?<media>image|audio|video))?'
+    r'(?:/(?<id>\d+))?'
+    r'$',
+  ),
+  //'random': RegExp(r'^/random$'),
+  //'search': RegExp(r'^/search/?$'),
+};
+
+Map<String, dynamic> parseDeepLink(Uri? uri) {
+  if (uri == null) {
+    return {};
+  }
+  String url = uri.toString().replaceAll("https://f0ck.me", "");
+
+  for (final MapEntry<String, RegExp> entry in routes.entries) {
+    final String routeName = entry.key;
+    final RegExp pattern = entry.value;
+    final RegExpMatch? match = pattern.firstMatch(url.toString());
+    if (match != null) {
+      Map<String, String> params = <String, String>{};
+      for (String name in match.groupNames) {
+        params[name] = match.namedGroup(name) ?? '';
+      }
+      return {'route': routeName, 'params': params};
+    }
+  }
+  return {};
+}
+
+Future<void> handleComplexDeepLink(
+  Map<String, String> params,
+  BuildContext context,
+  WidgetRef ref,
+  ScrollController scrollController,
+) async {
+  final media = params['media'];
+  const validMediaTypes = {'audio', 'video', 'image'};
+  if (media != null && validMediaTypes.contains(media)) {
+    ref.read(mediaProvider.notifier).setType(media);
+  } else {
+    ref.read(mediaProvider.notifier).setType('alles');
+  }
+  ref.read(mediaProvider.notifier).setMode(0); // wip
+  ref.read(mediaProvider.notifier).setTag(null);
+
+  final idParam = params['id'];
+  if (idParam == null || idParam.isEmpty) return;
+
+  final int? id = int.tryParse(idParam);
+  if (id == null) return;
+
+  final mediaState = ref.read(mediaProvider);
+  final index = mediaState.mediaItems.indexWhere((item) => item.id == id);
+  if (index == -1) {
+    await ref.read(mediaProvider.notifier).loadMedia(id: id + 50);
+
+    final updatedState = ref.read(mediaProvider);
+    final updatedIndex = updatedState.mediaItems.indexWhere(
+      (item) => item.id == id,
+    );
+    print(updatedIndex.toString());
+    if (updatedIndex == -1) {
+      return;
+    }
+  }
+
+  bool? navigationResult = await Navigator.push(
+    context,
+    MaterialPageRoute(builder: (_) => DetailView(initialItemId: id)),
+  );
+
+  if (navigationResult == true) {
+    scrollController.jumpTo(0);
+  }
+}
+/*
+type: mediaTypes[state.typeIndex],
+mode: state.modeIndex,
+random: state.random,
+tag: state.tag,*/

lib/widgets/VideoOverlay.dart

@@ -1,8 +1,11 @@
 import 'package:flutter/material.dart';
 
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:cached_video_player_plus/cached_video_player_plus.dart';
 
-class VideoControlsOverlay extends StatelessWidget {
+import 'package:f0ckapp/providers/MediaProvider.dart';
+
+class VideoControlsOverlay extends ConsumerWidget {
   final CachedVideoPlayerPlusController controller;
   final VoidCallback button;
 
@@ -13,10 +16,25 @@ class VideoControlsOverlay extends StatelessWidget {
   });
 
   @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, ref) {
+    final mediaState = ref.watch(mediaProvider);
+    final mediaNotifier = ref.read(mediaProvider.notifier);
+
     return Stack(
       alignment: Alignment.center,
       children: [
+        Positioned(
+          right: 12,
+          bottom: 12,
+          child: _ControlButton(
+            mediaState.muted ? Icons.volume_off : Icons.volume_up,
+            () {
+              button();
+              mediaNotifier.toggleMute();
+            },
+            size: 16,
+          ),
+        ),
         Center(
           child: Row(
             mainAxisAlignment: MainAxisAlignment.center,
@@ -64,7 +82,6 @@ class VideoControlsOverlay extends StatelessWidget {
                   bottom: 12,
                   child: Text(
                     '${_formatDuration(controller.value.position)} / ${_formatDuration(controller.value.duration)}',
-                    style: TextStyle(color: Colors.white),
                   ),
                 ),
                 Listener(
@@ -128,7 +145,7 @@ class _ControlButton extends StatelessWidget {
         color: Colors.black.withValues(alpha: 0.4),
       ),
       child: IconButton(
-        icon: Icon(icon, color: Colors.white, size: size),
+        icon: Icon(icon, size: size),
         onPressed: onPressed,
       ),
     );

pubspec.lock

@@ -240,6 +240,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.1"
+  go_router:
+    dependency: "direct main"
+    description:
+      name: go_router
+      sha256: b453934c36e289cef06525734d1e676c1f91da9e22e2017d9dcab6ce0f999175
+      url: "https://pub.dev"
+    source: hosted
+    version: "15.1.3"
   html:
     dependency: transitive
     description:
@@ -304,6 +312,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.0.0"
+  logging:
+    dependency: transitive
+    description:
+      name: logging
+      sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.0"
   matcher:
     dependency: transitive
     description: