v1.2.1+55

- fix deeplink - add mute button
v1.2.0+54
2025-06-13 15:01:48 +02:00 · 2025-06-13 13:55:05 +02:00 · 2025-06-12 11:39:31 +02:00 · 2025-06-11 21:30:05 +02:00 · 2025-06-11 20:45:37 +02:00 · 2025-06-11 18:56:55 +02:00
22 changed files with 1240 additions and 1099 deletions
--- a/.gitea/workflows/android.yml
+++ b/.gitea/workflows/android.yml
@ -3,7 +3,7 @@ name: Flutter Schmutter
 on:
  push:
    tags:
-      - 'v*'
+      - '*'

 jobs:
  build:
@ -52,5 +52,10 @@ jobs:
            build/app/outputs/flutter-apk/app-release.apk
          token: '${{secrets.RELEASE_TOKEN}}'

-      - name: trigger fdroid puller
-        run: curl https://flumm.io/pullfdroid.php?token=${{secrets.PULLER_TOKEN}}
+      - name: upload apk to f-droid server
+        run: |
+          BUILD_NUMBER=$(grep '^version:' pubspec.yaml | sed 's/.*+//')
+          curl -X POST "https://flumm.io/pullfdroid.php" \
+            -F "token=${{ secrets.PULLER_TOKEN }}" \
+            -F "apk=@build/app/outputs/flutter-apk/app-release.apk" \
+            -F "build=$BUILD_NUMBER"
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@ -3,7 +3,7 @@
    <uses-permission android:name="android.permission.WAKE_LOCK"/>
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
    <application
-        android:label="f0ckapp"
+        android:label="f0ck"
        android:name="${applicationName}"
        android:icon="@mipmap/ic_launcher"
        android:enableOnBackInvokedCallback="true">
@ -28,19 +28,12 @@
                <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="false"/>
            <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 -->
--- a/android/app/src/main/kotlin/com/f0ck/f0ckapp/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/f0ck/f0ckapp/MainActivity.kt
@ -1,5 +1,69 @@
 package com.f0ck.f0ckapp

+import android.content.ContentValues
+import android.content.Context
+import android.os.Environment
+import android.provider.MediaStore
+import androidx.annotation.NonNull
 import io.flutter.embedding.android.FlutterActivity
+import io.flutter.embedding.engine.FlutterEngine
+import io.flutter.plugin.common.MethodChannel
+import java.io.File
+import java.io.FileInputStream

-class MainActivity : FlutterActivity()
+class MainActivity : FlutterActivity() {
+  private val CHANNEL = "MediaShit"
+
+  override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine): Unit {
+    super.configureFlutterEngine(flutterEngine)
+
+    MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CHANNEL).setMethodCallHandler {
+            call,
+            result ->
+      if (call.method == "saveFile") {
+        val filePath = call.argument<String>("filePath")
+        val fileName = call.argument<String>("fileName")
+        val subDir = call.argument<String?>("subDir")
+
+        if (filePath == null || fileName == null)
+                result.error("SAVE_FAILED", "file not found", null)
+
+        if (!saveFileUsingMediaStore(applicationContext, filePath!!, fileName!!, subDir))
+                result.error("COPY_FAILED", "Datei konnte nicht gespeichert werden", null)
+        result.success(true)
+      } else result.notImplemented()
+    }
+  }
+
+  private fun saveFileUsingMediaStore(
+          context: Context,
+          filePath: String,
+          fileName: String,
+          subDir: String?
+          
+  ): Boolean {
+    val srcFile = File(filePath)
+    if (!srcFile.exists()) return false
+
+    val values =
+            ContentValues().apply {
+              put(MediaStore.MediaColumns.DISPLAY_NAME, fileName)
+              put(MediaStore.MediaColumns.RELATIVE_PATH, Environment.DIRECTORY_DOWNLOADS + "/" + (subDir ?: "f0ck"))
+              put(MediaStore.MediaColumns.IS_PENDING, 1)
+            }
+
+    val resolver = context.contentResolver
+    val collection = MediaStore.Downloads.EXTERNAL_CONTENT_URI
+    val uri = resolver.insert(collection, values) ?: return false
+
+    resolver.openOutputStream(uri).use { out ->
+      FileInputStream(srcFile).use { input -> input.copyTo(out!!, 4096) }
+    }
+
+    values.clear()
+    values.put(MediaStore.MediaColumns.IS_PENDING, 0)
+    resolver.update(uri, values, null, null)
+
+    return true
+  }
+}
--- a/lib/main.dart
+++ b/lib/main.dart
@ -1,87 +1,47 @@
-import 'package:f0ckapp/providers/media_provider.dart';
+import 'package:f0ckapp/providers/theme_provider.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:get/get.dart';

-import 'package:f0ckapp/screens/mediagrid_screen.dart';
-import 'package:f0ckapp/screens/detailview_screen.dart';
 import 'package:f0ckapp/utils/appversion_util.dart';
-import 'package:f0ckapp/providers/theme_provider.dart';
+import 'package:f0ckapp/services/api_service.dart';
+import 'package:f0ckapp/screens/media_grid.dart';
+import 'package:f0ckapp/screens/settings_screen.dart';
+import 'package:f0ckapp/screens/detailview_screen.dart';

 void main() async {
  WidgetsFlutterBinding.ensureInitialized();
  await SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
  await AppVersion.init();
+  final ThemeController themeController = Get.put(ThemeController());

-  runApp(ProviderScope(child: F0ckApp()));
-}
+  final api = ApiService();
+  await api.fetchMedia();
+  Get.put(api);

-class F0ckApp extends ConsumerWidget {
-  F0ckApp({super.key});
-
-  final GoRouter _router = GoRouter(
-    initialLocation: '/',
-    routes: [
-      GoRoute(
-        path: '/',
-        builder: (BuildContext context, GoRouterState state) {
-          return const MediaGrid();
-        },
+  runApp(
+    GetMaterialApp(
+      theme: themeController.currentTheme.value,
+      initialRoute: '/',
+      getPages: [
+        GetPage(name: '/', page: () => MediaGrid()),
+        GetPage(name: '/settings', page: () => SettingsPage()),
+        GetPage(
+          name: '/:itemId',
+          page: () {
+            int? test = int.tryParse(Get.parameters['itemId']!);
+            if (test == null) {
+              return Scaffold(body: Center(child: Text('oof')));
+            }
+            return DetailView(initialItemId: test);
+          },
+        ),
+      ],
+      unknownRoute: GetPage(
+        name: '/notfound',
+        page: () => Center(child: Text('oof')),
      ),
-      GoRoute(
-        path: '/:rest(.*)',
-        builder: (context, state) {
-          final bool isInternalLink = (state.extra is bool && state.extra == true);
-          final String fullPath = state.matchedLocation;
-
-          final regExp = RegExp(
-            r'^(?:/tag/(?<tag>.+?))?(?:/(?<mime>image|audio|video))?(?:/(?<itemid>\d+))?$',
-          );
-          final RegExpMatch? 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 int preloadOffset = 50;
-
-          return Consumer(
-            builder: (BuildContext context, WidgetRef ref, Widget? child) {
-              WidgetsBinding.instance.addPostFrameCallback((_) async {
-                final MediaNotifier 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) {
-    final ThemeData theme = ref.watch(themeNotifierProvider);
-    return MaterialApp.router(
-      debugShowCheckedModeBanner: false,
-      routerConfig: _router,
-      theme: theme,
-    );
-  }
 }
--- a/lib/providers/media_provider.dart
+++ b/lib/providers/media_provider.dart
@ -1,149 +0,0 @@
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
-
-import 'package:f0ckapp/models/mediaitem_model.dart';
-import 'package:f0ckapp/services/api_service.dart';
-
-const List<String> mediaTypes = ["alles", "image", "video", "audio"];
-const List<String> mediaModes = ["sfw", "nsfw", "untagged", "all"];
-const _unsetTag = Object();
-
-class MediaState {
-  final int typeIndex;
-  final int modeIndex;
-  final bool random;
-  final String? tag;
-  final int crossAxisCount;
-  final List<MediaItem> mediaItems;
-  final bool isLoading;
-  final bool muted;
-
-  const MediaState({
-    this.typeIndex = 0,
-    this.modeIndex = 0,
-    this.random = false,
-    this.tag,
-    this.crossAxisCount = 0,
-    this.mediaItems = const [],
-    this.isLoading = false,
-    this.muted = false,
-  });
-
-  MediaState replace({
-    int? typeIndex,
-    int? modeIndex,
-    bool? random,
-    Object? tag = _unsetTag,
-    int? crossAxisCount,
-    List<MediaItem>? mediaItems,
-    bool? isLoading,
-    bool? muted,
-  }) {
-    return MediaState(
-      typeIndex: typeIndex ?? this.typeIndex,
-      modeIndex: modeIndex ?? this.modeIndex,
-      random: random ?? this.random,
-      tag: identical(tag, _unsetTag) ? this.tag : tag as String?,
-      crossAxisCount: crossAxisCount ?? this.crossAxisCount,
-      mediaItems: mediaItems ?? this.mediaItems,
-      isLoading: isLoading ?? this.isLoading,
-      muted: muted ?? this.muted,
-    );
-  }
-}
-
-class MediaNotifier extends StateNotifier<MediaState> {
-  final _storage = const FlutterSecureStorage(
-    aOptions: AndroidOptions(encryptedSharedPreferences: true),
-  );
-
-  MediaNotifier() : super(const MediaState()) {
-    _loadMutedState();
-  }
-
-  Future<void> _loadMutedState() async {
-    final storedMuted = await _storage.read(key: 'muted');
-    final isMuted = storedMuted == 'true';
-    state = state.replace(muted: isMuted);
-  }
-
-  Future<void> _saveMutedState() async {
-    await _storage.write(key: 'muted', value: state.muted.toString());
-  }
-
-  void setType(String type) {
-    final newIndex = mediaTypes.indexOf(type);
-    state = state.replace(typeIndex: newIndex);
-    resetMedia();
-  }
-
-  void setMode(int modeIndex) {
-    state = state.replace(modeIndex: modeIndex);
-    resetMedia();
-  }
-
-  void toggleRandom() {
-    state = state.replace(random: !state.random);
-    resetMedia();
-  }
-
-  void setTag(String? tag) {
-    state = state.replace(tag: tag);
-    resetMedia();
-  }
-
-  void setCrossAxisCount(int count) {
-    state = state.replace(crossAxisCount: count);
-  }
-
-  void resetMedia() {
-    state = state.replace(mediaItems: []);
-    loadMedia();
-  }
-
-  void addMediaItems(List<MediaItem> newItems) {
-    final Set<int> existingIds = state.mediaItems
-        .map((item) => item.id)
-        .toSet();
-    final List<MediaItem> filteredItems = newItems
-        .where((item) => !existingIds.contains(item.id))
-        .toList();
-    if (filteredItems.isNotEmpty) {
-      final List<MediaItem> updated = List<MediaItem>.from(state.mediaItems)
-        ..addAll(filteredItems);
-      state = state.replace(mediaItems: updated);
-    }
-  }
-
-  Future<void> loadMedia({int? id}) async {
-    if (state.isLoading) return;
-    state = state.replace(isLoading: true);
-    try {
-      final older =
-          id ?? (state.mediaItems.isNotEmpty ? state.mediaItems.last.id : null);
-      final newMedia = await fetchMedia(
-        older: older,
-        type: mediaTypes[state.typeIndex],
-        mode: state.modeIndex,
-        random: state.random,
-        tag: state.tag,
-      );
-      if (newMedia.isNotEmpty) {
-        addMediaItems(newMedia);
-      }
-    } catch (e) {
-      print('Fehler beim Laden der Medien: $e');
-    } finally {
-      state = state.replace(isLoading: false);
-    }
-  }
-
-  void toggleMute() {
-    state = state.replace(muted: !state.muted);
-    _saveMutedState();
-  }
-}
-
-final mediaProvider = StateNotifierProvider<MediaNotifier, MediaState>(
-  (ref) => MediaNotifier(),
-);
--- a/lib/providers/theme_provider.dart
+++ b/lib/providers/theme_provider.dart
@ -1,57 +1,6 @@
 import 'package:flutter/material.dart';
-
+import 'package:get/get.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;
-
-  ThemeNotifier({required this.secureStorage}) : super(f0ckTheme) {
-    _loadTheme();
-  }
-
-  Future<void> _loadTheme() async {
-    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 {
-    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: const FlutterSecureStorage(
-      aOptions: AndroidOptions(encryptedSharedPreferences: true),
-    ),
-  );
-});

 final ThemeData f0ckTheme = ThemeData(
  brightness: Brightness.dark,
@ -232,10 +181,11 @@ final ThemeData f0ck95Theme = ThemeData(
    onPrimary: Colors.black,
    onSecondary: Colors.white,
  ),
-  appBarTheme: const AppBarTheme(
-    backgroundColor: Color(0xFFC0C0C0),
+  appBarTheme: AppBarTheme(
+    backgroundColor: const Color(0xFFE0E0E0),
    foregroundColor: Colors.black,
-    elevation: 2,
+    elevation: 4,
+    centerTitle: true,
  ),
  textTheme: const TextTheme(
    bodyLarge: TextStyle(color: Colors.black),
@ -284,3 +234,56 @@ final ThemeData f0ck95dTheme = ThemeData(
    trackColor: WidgetStateProperty.all<Color>(const Color(0xFF424242)),
  ),
 );
+
+class ThemeController extends GetxController {
+  final FlutterSecureStorage secureStorage = const FlutterSecureStorage(
+    aOptions: AndroidOptions(encryptedSharedPreferences: true),
+  );
+
+  final Rx<ThemeData> currentTheme = f0ckTheme.obs;
+
+  final Map<String, ThemeData> themeMap = {
+    'f0ck': f0ckTheme,
+    'P1nk': p1nkTheme,
+    'Orange': orangeTheme,
+    'Amoled': amoledTheme,
+    'Paper': paperTheme,
+    'f0ck95': f0ck95Theme,
+    'f0ck95d': f0ck95dTheme,
+  };
+
+  @override
+  void onInit() {
+    super.onInit();
+    _loadTheme();
+  }
+
+  Future<void> _loadTheme() async {
+    try {
+      final String? savedThemeName = await secureStorage.read(key: 'theme');
+      if (savedThemeName != null && themeMap.containsKey(savedThemeName)) {
+        currentTheme.value = themeMap[savedThemeName]!;
+        Get.changeTheme(currentTheme.value);
+      }
+    } catch (error) {
+      debugPrint('Fehler beim Laden des Themes: $error');
+      currentTheme.value = f0ckTheme;
+      Get.changeTheme(f0ckTheme);
+    }
+  }
+
+  Future<void> updateTheme(String themeName) async {
+    try {
+      await secureStorage.write(key: 'theme', value: themeName);
+      if (themeMap.containsKey(themeName)) {
+        currentTheme.value = themeMap[themeName]!;
+        Get.changeTheme(currentTheme.value);
+      } else {
+        currentTheme.value = f0ckTheme;
+        Get.changeTheme(f0ckTheme);
+      }
+    } catch (error) {
+      debugPrint('Fehler beim Aktualisieren des Themes: $error');
+    }
+  }
+}
--- a/lib/screens/detailview_screen.dart
+++ b/lib/screens/detailview_screen.dart
@ -1,65 +1,105 @@
 import 'dart:io';
-import 'dart:typed_data';

 import 'package:flutter/material.dart';
+import 'package:flutter/services.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:get/get.dart';
 import 'package:share_plus/share_plus.dart';
-import 'package:downloadsfolder/downloadsfolder.dart' as blah;

 import 'package:f0ckapp/models/mediaitem_model.dart';
+import 'package:f0ckapp/services/api_service.dart';
+import 'package:f0ckapp/widgets/end_drawer.dart';
+import 'package:f0ckapp/screens/fullscreen_screen.dart';
 import 'package:f0ckapp/widgets/video_widget.dart';
-import 'package:f0ckapp/utils/smartrefreshindicator_util.dart';
-import 'package:f0ckapp/utils/pagetransformer_util.dart';
-import 'package:f0ckapp/providers/media_provider.dart';

-class DetailView extends ConsumerStatefulWidget {
+class DetailView extends StatefulWidget {
  final int initialItemId;
-
  const DetailView({super.key, required this.initialItemId});

  @override
-  ConsumerState<DetailView> createState() => _DetailViewState();
+  State<DetailView> createState() => _DetailViewState();
 }

-class _DetailViewState extends ConsumerState<DetailView> {
+class _DetailViewState extends State<DetailView> {
+  final ApiService apiService = Get.find<ApiService>();
  PageController? _pageController;
-  bool isLoading = false;
-  int _currentIndex = 0;
+  Future<void>? _loadingFuture;
+  int _currentPage = 0;

  @override
  void initState() {
    super.initState();
-  }
-
-  void _preloadAdjacentMedia(int index) async {
-    final mediaState = ref.read(mediaProvider);
-    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);
-        }
-      }
+    if (!_mediaItemExists(widget.initialItemId)) {
+      _loadingFuture = _fetchAndPreloadMedia(widget.initialItemId);
+    } else {
+      _initializePageController();
    }
  }

-  Future<void> _loadMoreMedia() async {
-    if (isLoading) return;
-    setState(() => isLoading = true);
+  bool _mediaItemExists(int id) {
+    return apiService.mediaItems.any((media) => media.id == id);
+  }

+  Future<void> _fetchAndPreloadMedia(int targetId) async {
    try {
-      await ref.read(mediaProvider.notifier).loadMedia();
+      WidgetsBinding.instance.addPostFrameCallback((_) async {
+        await apiService.setTag(null);
+      });
+      await apiService.fetchMedia(id: targetId + 50, reset: false);
+      _initializePageController();
    } catch (e) {
-      _showMsg("Fehler beim Laden der Medien: $e");
-    } finally {
-      setState(() => isLoading = false);
+      _showMsg("Medien konnten nicht geladen werden");
    }
  }

+  void _initializePageController() {
+    _currentPage = apiService.mediaItems.indexWhere(
+      (media) => media.id == widget.initialItemId,
+    );
+    if (_currentPage < 0) {
+      _currentPage = 0;
+    }
+    _pageController = PageController(initialPage: _currentPage)
+      ..addListener(() {
+        setState(() {
+          _currentPage = _pageController!.page!.round();
+        });
+      });
+    setState(() {});
+  }
+
+  @override
+  void dispose() {
+    _pageController?.dispose();
+    super.dispose();
+  }
+
+  MediaItem? _findMediaItem() {
+    try {
+      return apiService.mediaItems.firstWhere(
+        (media) => media.id == widget.initialItemId,
+      );
+    } catch (e) {
+      return null;
+    }
+  }
+
+  Future<void> _downloadMedia(MediaItem item) async {
+    final File file = await DefaultCacheManager().getSingleFile(item.mediaUrl);
+    final MethodChannel methodChannel = const MethodChannel('MediaShit');
+
+    bool? success = await methodChannel.invokeMethod<bool>('saveFile', {
+      'filePath': file.path,
+      'fileName': item.dest,
+    });
+
+    success == true
+        ? _showMsg('${item.dest} wurde in Downloads/fApp neigespeichert.')
+        : _showMsg('${item.dest} konnte nicht heruntergeladen werden.');
+  }
+
  void _showMsg(String message) {
    if (!mounted) return;
    ScaffoldMessenger.of(context)
@ -67,202 +107,223 @@ class _DetailViewState extends ConsumerState<DetailView> {
      ..showSnackBar(SnackBar(content: Text(message)));
  }

-  Future<void> _downloadMedia() async {
-    final MediaState mediaState = ref.read(mediaProvider);
-    final MediaItem currentItem = mediaState.mediaItems[_currentIndex];
-    final file = await DefaultCacheManager().getSingleFile(currentItem.mediaUrl);
-
-    bool? success = await blah.copyFileIntoDownloadFolder(
-      '${file.dirname}/${file.basename}',
-      currentItem.mediaUrl.split('/').last
-    );
-    if (success == true) {
-      _showMsg('${file.basename} wurde irgendwie heruntergeladen. Viel Spaß bei der Suche');
-    } else {
-      _showMsg('${file.basename} konnte nicht heruntergeladen werden.');
-    }
-  }
-
-  @override
-  void dispose() {
-    _pageController?.dispose();
-    super.dispose();
-  }
-
  @override
  Widget build(BuildContext context) {
-    final MediaState mediaState = ref.watch(mediaProvider);
-    final int itemIndex = mediaState.mediaItems.indexWhere(
-      (item) => item.id == widget.initialItemId,
-    );
-
-    if (itemIndex == -1) {
-      Future.microtask(() {
-        ref
-            .read(mediaProvider.notifier)
-            .loadMedia(id: widget.initialItemId + 50);
-      });
-      return Scaffold(
-        appBar: AppBar(),
-        body: const Center(child: CircularProgressIndicator()),
+    if (_loadingFuture != null) {
+      return FutureBuilder<void>(
+        future: _loadingFuture,
+        builder: (context, snapshot) {
+          if (snapshot.connectionState == ConnectionState.waiting) {
+            return Scaffold(
+              appBar: AppBar(title: const Text("Detail")),
+              body: const Center(child: CircularProgressIndicator()),
+            );
+          } else {
+            MediaItem? item = _findMediaItem();
+            if (item == null) {
+              return Scaffold(
+                appBar: AppBar(title: const Text("Detail")),
+                body: const Center(child: Text("f0ck nicht gefunden")),
+              );
+            }
+            return _buildDetail();
+          }
+        },
      );
    }

-    if (_pageController == null) {
-      _pageController = PageController(initialPage: itemIndex);
-      _currentIndex = itemIndex;
-      _pageController!.addListener(() {
-        setState(() => _currentIndex = _pageController!.page?.round() ?? 0);
-      });
-      _preloadAdjacentMedia(itemIndex);
+    MediaItem? existingItem = _findMediaItem();
+    if (existingItem == null) {
+      return Scaffold(
+        appBar: AppBar(title: const Text("Detail")),
+        body: const Center(child: Text("f0ck nicht gefunden")),
+      );
    }
+    return _buildDetail();
+  }
+
+  Widget _buildDetail() {
+    final MediaItem currentItem = apiService.mediaItems[_currentPage];

    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: const Icon(Icons.fullscreen),
-            onPressed: () {
-              _showMsg('fullscreen ist wip');
-            },
-          ),
-          IconButton(
-            icon: const Icon(Icons.download),
-            onPressed: _downloadMedia,
-          ),
-          PopupMenuButton<String>(
-            onSelected: (value) async {
-              final item = mediaState.mediaItems[_currentIndex];
-              switch (value) {
-                case 'media':
-                  File file = await DefaultCacheManager().getSingleFile(
-                    item.mediaUrl,
-                  );
-                  Uint8List bytes = await file.readAsBytes();
-                  final params = ShareParams(
-                    files: [XFile.fromData(bytes, mimeType: item.mime)],
-                  );
-                  await SharePlus.instance.share(params);
-                  break;
-                case 'direct_link':
-                  await SharePlus.instance.share(
-                    ShareParams(text: item.mediaUrl),
-                  );
-                  break;
-                case 'post_link':
-                  await SharePlus.instance.share(
-                    ShareParams(text: item.postUrl),
-                  );
-                  break;
-              }
-            },
-            itemBuilder: (context) => [
-              PopupMenuItem(
-                value: 'media',
-                child: ListTile(
-                  leading: const Icon(Icons.image),
-                  title: const Text('Als Datei'),
-                ),
-              ),
-              PopupMenuItem(
-                value: 'direct_link',
-                child: ListTile(
-                  leading: const Icon(Icons.link),
-                  title: const Text('Link zur Datei'),
-                ),
-              ),
-              PopupMenuItem(
-                value: 'post_link',
-                child: ListTile(
-                  leading: const Icon(Icons.article),
-                  title: const Text('Link zum f0ck'),
-                ),
-              ),
-            ],
-            icon: const Icon(Icons.share),
-          ),
-        ],
-      ),
-      body: Stack(
-        children: [
-          PageTransformer(
-            controller: _pageController!,
-            pages: mediaState.mediaItems.map((item) {
-              int itemIndex = mediaState.mediaItems.indexOf(item);
-              return SafeArea(
-                child: SmartRefreshIndicator(
-                  onRefresh: _loadMoreMedia,
-                  child: _buildMediaItem(item, _currentIndex == itemIndex),
-                ),
-              );
-            }).toList(),
-          ),
-        ],
-      ),
-      persistentFooterButtons: mediaState.tag != null
+      endDrawer: const EndDrawer(),
+      endDrawerEnableOpenDragGesture: false,
+      persistentFooterButtons: apiService.tag.value != null
          ? [
              Center(
                child: InputChip(
-                  label: Text(mediaState.tag!),
+                  label: Text(apiService.tag.value!),
                  onDeleted: () {
-                    ref.read(mediaProvider.notifier).setTag(null);
-                    context.go('/', extra: true);
+                    apiService.setTag(null);
+                    Get.offAllNamed('/');
                  },
                ),
              ),
            ]
          : null,
-    );
-  }
-
-  Widget _buildMediaItem(MediaItem item, bool isActive) {
-    final MediaNotifier mediaNotifier = ref.read(mediaProvider.notifier);
-
-    return SingleChildScrollView(
-      child: Column(
-        children: [
-          if (item.mime.startsWith('image'))
-            CachedNetworkImage(
-              imageUrl: item.mediaUrl,
-              fit: BoxFit.contain,
-              placeholder: (context, url) => const CircularProgressIndicator(),
-              errorWidget: (context, url, error) => const Icon(Icons.error),
-            )
-          else
-            VideoWidget(details: item, isActive: isActive),
-          const SizedBox(height: 10, width: double.infinity),
-          Wrap(
-            alignment: WrapAlignment.center,
-            spacing: 5.0,
-            children: item.tags.map((tag) {
-              return ActionChip(
+      body: CustomScrollView(
+        slivers: [
+          SliverAppBar(
+            floating: true,
+            pinned: true,
+            snap: true,
+            centerTitle: true,
+            title: Text('f0ck #${currentItem.id.toString()}'),
+            leading: IconButton(
+              icon: const Icon(Icons.arrow_back),
+              onPressed: () => Get.back(),
+            ),
+            actions: [
+              IconButton(
+                icon: const Icon(Icons.fullscreen),
                onPressed: () {
-                  if (tag.tag == 'sfw' || tag.tag == 'nsfw') return;
-                  setState(() {
-                    mediaNotifier.setTag(tag.tag);
-                    context.go('/', extra: true);
-                  });
+                  Get.to(
+                    FullScreenMediaView(item: currentItem),
+                    fullscreenDialog: true,
+                  );
                },
-                label: Text(tag.tag),
-                backgroundColor: switch (tag.id) {
-                  1 => Colors.green,
-                  2 => Colors.red,
-                  _ => const Color(0xFF090909),
+              ),
+              IconButton(
+                icon: const Icon(Icons.download),
+                onPressed: () async {
+                  await _downloadMedia(currentItem);
                },
-                labelStyle: const TextStyle(color: Colors.white),
-              );
-            }).toList(),
+              ),
+              PopupMenuButton<String>(
+                onSelected: (value) async {
+                  switch (value) {
+                    case 'media':
+                      File file = await DefaultCacheManager().getSingleFile(
+                        currentItem.mediaUrl,
+                      );
+                      Uint8List bytes = await file.readAsBytes();
+                      final params = ShareParams(
+                        files: [
+                          XFile.fromData(bytes, mimeType: currentItem.mime),
+                        ],
+                      );
+                      await SharePlus.instance.share(params);
+                      break;
+                    case 'direct_link':
+                      await SharePlus.instance.share(
+                        ShareParams(text: currentItem.mediaUrl),
+                      );
+                      break;
+                    case 'post_link':
+                      await SharePlus.instance.share(
+                        ShareParams(text: currentItem.postUrl),
+                      );
+                      break;
+                  }
+                },
+                itemBuilder: (context) => [
+                  PopupMenuItem(
+                    value: 'media',
+                    child: ListTile(
+                      leading: const Icon(Icons.image),
+                      title: const Text('Als Datei'),
+                    ),
+                  ),
+                  PopupMenuItem(
+                    value: 'direct_link',
+                    child: ListTile(
+                      leading: const Icon(Icons.link),
+                      title: const Text('Link zur Datei'),
+                    ),
+                  ),
+                  PopupMenuItem(
+                    value: 'post_link',
+                    child: ListTile(
+                      leading: const Icon(Icons.article),
+                      title: const Text('Link zum f0ck'),
+                    ),
+                  ),
+                ],
+                icon: const Icon(Icons.share),
+              ),
+              Builder(
+                builder: (context) => IconButton(
+                  icon: const Icon(Icons.menu),
+                  onPressed: () {
+                    Scaffold.of(context).openEndDrawer();
+                  },
+                ),
+              ),
+            ],
+          ),
+          SliverFillRemaining(
+            child: PageView.builder(
+              controller: _pageController,
+              itemCount: apiService.mediaItems.length,
+              itemBuilder: (context, index) {
+                final MediaItem pageItem = apiService.mediaItems[index];
+                return AnimatedBuilder(
+                  animation: _pageController!,
+                  builder: (context, child) {
+                    double value = 0;
+                    if (_pageController!.position.haveDimensions) {
+                      value = (_pageController!.page! - index).abs();
+                    }
+                    double factor = Curves.easeOut.transform(
+                      1 - value.clamp(0.0, 1.0),
+                    );
+                    double scale = 0.8 + factor * 0.2;
+                    return Transform.scale(scale: scale, child: child);
+                  },
+                  child: SafeArea(
+                    top: false,
+                    child: SingleChildScrollView(
+                      child: Column(
+                        children: [
+                          if (pageItem.mime.startsWith('image'))
+                            CachedNetworkImage(
+                              imageUrl: pageItem.mediaUrl,
+                              fit: BoxFit.contain,
+                              placeholder: (context, url) => const Center(
+                                child: CircularProgressIndicator(),
+                              ),
+                              errorWidget: (context, url, error) =>
+                                  const Center(child: Icon(Icons.error)),
+                            )
+                          else
+                            VideoWidget(
+                              details: pageItem,
+                              isActive: index == _currentPage,
+                            ),
+                          const SizedBox(height: 10, width: double.infinity),
+                          Wrap(
+                            alignment: WrapAlignment.center,
+                            spacing: 5.0,
+                            children: pageItem.tags.map((tag) {
+                              return ActionChip(
+                                onPressed: () {
+                                  if (tag.tag == 'sfw' || tag.tag == 'nsfw') {
+                                    return;
+                                  }
+                                  apiService.setTag(tag.tag);
+                                  Get.offAllNamed('/');
+                                },
+                                label: Text(tag.tag),
+                                backgroundColor: switch (tag.id) {
+                                  1 => Colors.green,
+                                  2 => Colors.red,
+                                  _ => const Color(0xFF090909),
+                                },
+                                labelStyle: const TextStyle(
+                                  color: Colors.white,
+                                ),
+                              );
+                            }).toList(),
+                          ),
+                          const SizedBox(height: 20),
+                        ],
+                      ),
+                    ),
+                  ),
+                );
+              },
+            ),
          ),
-          const SizedBox(height: 20),
        ],
      ),
    );
--- a/lib/screens/fullscreen_screen.dart
+++ b/lib/screens/fullscreen_screen.dart
@ -0,0 +1,74 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+
+import 'package:cached_network_image/cached_network_image.dart';
+
+import 'package:f0ckapp/models/mediaitem_model.dart';
+import 'package:f0ckapp/widgets/video_widget.dart';
+
+class FullScreenMediaView extends StatefulWidget {
+  final MediaItem item;
+
+  const FullScreenMediaView({super.key, required this.item});
+
+  @override
+  State createState() => _FullScreenMediaViewState();
+}
+
+class _FullScreenMediaViewState extends State<FullScreenMediaView> {
+  @override
+  void initState() {
+    super.initState();
+    SystemChrome.setPreferredOrientations(DeviceOrientation.values);
+    SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
+  }
+
+  @override
+  void dispose() {
+    SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
+    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      backgroundColor: Colors.black,
+      body: Stack(
+        children: [
+          Positioned.fill(
+            child: widget.item.mime.startsWith('image')
+                ? InteractiveViewer(
+                    minScale: 1.0,
+                    maxScale: 7.0,
+                    child: CachedNetworkImage(
+                      imageUrl: widget.item.mediaUrl,
+                      fit: BoxFit.contain,
+                      placeholder: (context, url) =>
+                          const Center(child: CircularProgressIndicator()),
+                      errorWidget: (context, url, error) =>
+                          const Icon(Icons.error),
+                    ),
+                  )
+                : SizedBox.expand(
+                    child: VideoWidget(
+                      details: widget.item,
+                      isActive: true,
+                      fullScreen: true,
+                    ),
+                  ),
+          ),
+          SafeArea(
+            child: Align(
+              alignment: Alignment.topLeft,
+              child: IconButton(
+                icon: const Icon(Icons.arrow_back, color: Colors.white),
+                onPressed: () => Navigator.of(context).pop(),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
--- a/lib/screens/media_grid.dart
+++ b/lib/screens/media_grid.dart
@ -0,0 +1,130 @@
+import 'package:flutter/material.dart';
+
+import 'package:get/get.dart';
+
+import 'package:f0ckapp/services/api_service.dart';
+import 'package:f0ckapp/widgets/media_tile.dart';
+import 'package:f0ckapp/widgets/end_drawer.dart';
+import 'package:f0ckapp/widgets/filter_bar.dart';
+import 'package:f0ckapp/utils/customsearchdelegate_util.dart';
+
+class MediaGrid extends StatefulWidget {
+  const MediaGrid({super.key});
+
+  @override
+  State<StatefulWidget> createState() => _MediaGrid();
+}
+
+class _MediaGrid extends State<MediaGrid> {
+  final ApiService apiService = Get.find<ApiService>();
+  final ScrollController _scrollController = ScrollController();
+
+  @override
+  void initState() {
+    super.initState();
+    _scrollController.addListener(() async {
+      if (_scrollController.position.pixels >=
+          _scrollController.position.maxScrollExtent - 300) {
+        await apiService.fetchMedia();
+      }
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      endDrawer: EndDrawer(),
+      persistentFooterButtons: [
+        Obx(() {
+          if (apiService.tag.value != null) {
+            return Center(
+              child: InputChip(
+                label: Text(apiService.tag.value!),
+                onDeleted: () {
+                  apiService.setTag(null);
+                  Get.offAllNamed('/');
+                },
+              ),
+            );
+          } else {
+            return SizedBox.shrink();
+          }
+        }),
+      ],
+      body: CustomScrollView(
+        controller: _scrollController,
+        slivers: [
+          SliverAppBar(
+            floating: true,
+            snap: true,
+            title: GestureDetector(
+              onTap: () async {
+                apiService.setTag(null);
+              },
+              child: Row(
+                children: [
+                  Image.asset(
+                    'assets/images/f0ck_small.webp',
+                    fit: BoxFit.fitHeight,
+                  ),
+                  const SizedBox(width: 10),
+                  const Text('fApp', style: TextStyle(fontSize: 24)),
+                ],
+              ),
+            ),
+            actions: [
+              IconButton(
+                icon: const Icon(Icons.search),
+                onPressed: () async {
+                  await showSearch(
+                    context: context,
+                    delegate: CustomSearchDelegate(),
+                  );
+                },
+              ),
+              Obx(
+                () => IconButton(
+                  icon: Icon(
+                    apiService.random.value
+                        ? Icons.shuffle_on_outlined
+                        : Icons.shuffle,
+                  ),
+                  onPressed: () {
+                    apiService.toggleRandom();
+                  },
+                ),
+              ),
+              Builder(
+                builder: (context) {
+                  return IconButton(
+                    icon: const Icon(Icons.menu),
+                    onPressed: () {
+                      Scaffold.of(context).openEndDrawer();
+                    },
+                  );
+                },
+              ),
+            ],
+          ),
+          SliverPadding(
+            padding: EdgeInsets.zero,
+            sliver: Obx(
+              () => SliverGrid(
+                delegate: SliverChildBuilderDelegate((context, index) {
+                  return MediaTile(item: apiService.mediaItems[index]);
+                }, childCount: apiService.mediaItems.length),
+                gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent(
+                  maxCrossAxisExtent: 150,
+                  crossAxisSpacing: 5,
+                  mainAxisSpacing: 5,
+                  childAspectRatio: 1,
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+      bottomNavigationBar: FilterBar(scrollController: _scrollController),
+    );
+  }
+}
--- a/lib/screens/mediagrid_screen.dart
+++ b/lib/screens/mediagrid_screen.dart
@ -1,323 +0,0 @@
-import 'package:flutter/material.dart';
-
-import 'package:cached_network_image/cached_network_image.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:go_router/go_router.dart';
-
-import 'package:f0ckapp/models/mediaitem_model.dart';
-import 'package:f0ckapp/providers/media_provider.dart';
-import 'package:f0ckapp/utils/appversion_util.dart';
-import 'package:f0ckapp/providers/theme_provider.dart';
-import 'package:f0ckapp/utils/customsearchdelegate_util.dart';
-
-class MediaGrid extends ConsumerStatefulWidget {
-  const MediaGrid({super.key});
-
-  @override
-  ConsumerState<MediaGrid> createState() => _MediaGridState();
-}
-
-class _MediaGridState extends ConsumerState<MediaGrid> {
-  final ScrollController _scrollController = ScrollController();
-  final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
-
-  final TextEditingController _usernameController = TextEditingController();
-  final TextEditingController _passwordController = TextEditingController();
-
-  int _calculateCrossAxisCount(BuildContext context, int defaultCount) {
-    return defaultCount == 0
-        ? (MediaQuery.of(context).size.width / 110).clamp(3, 5).toInt()
-        : defaultCount;
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    Future.microtask(() {
-      ref.read(mediaProvider.notifier).loadMedia();
-    });
-    _scrollController.addListener(() {
-      if (_scrollController.position.pixels >=
-          _scrollController.position.maxScrollExtent - 200) {
-        ref.read(mediaProvider.notifier).loadMedia();
-      }
-    });
-  }
-
-  @override
-  void dispose() {
-    _scrollController.dispose();
-    _usernameController.dispose();
-    _passwordController.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final MediaState mediaState = ref.watch(mediaProvider);
-    final MediaNotifier mediaNotifier = ref.read(mediaProvider.notifier);
-
-    return Scaffold(
-      key: _scaffoldKey,
-      appBar: AppBar(
-        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(
-            icon: const Icon(Icons.search),
-            onPressed: () async {
-              await showSearch(
-                context: context,
-                delegate: CustomSearchDelegate(),
-              );
-            },
-          ),
-          IconButton(
-            icon: Icon(
-              mediaState.random ? Icons.shuffle_on_outlined : Icons.shuffle,
-            ),
-            onPressed: () {
-              mediaNotifier.toggleRandom();
-              _scrollController.jumpTo(0);
-            },
-          ),
-          IconButton(
-            icon: const Icon(Icons.menu),
-            onPressed: () {
-              _scaffoldKey.currentState?.openEndDrawer();
-            },
-          ),
-        ],
-      ),
-      bottomNavigationBar: BottomAppBar(
-        height: 50,
-        child: Row(
-          mainAxisAlignment: MainAxisAlignment.spaceAround,
-          children: [
-            const Text('type: '),
-            DropdownButton<String>(
-              value: mediaTypes[mediaState.typeIndex],
-              isDense: true,
-              items: mediaTypes.map((String value) {
-                return DropdownMenuItem<String>(
-                  value: value,
-                  child: Text(value),
-                );
-              }).toList(),
-              onChanged: (String? newValue) {
-                if (newValue != null) {
-                  mediaNotifier.setType(newValue);
-                  _scrollController.jumpTo(0);
-                }
-              },
-            ),
-            const Text('mode: '),
-            DropdownButton<String>(
-              value: mediaModes[mediaState.modeIndex],
-              isDense: true,
-              items: mediaModes.map((String value) {
-                return DropdownMenuItem<String>(
-                  value: value,
-                  child: Text(value),
-                );
-              }).toList(),
-              onChanged: (String? newValue) {
-                if (newValue != null) {
-                  mediaNotifier.setMode(mediaModes.indexOf(newValue));
-                  _scrollController.jumpTo(0);
-                }
-              },
-            ),
-          ],
-        ),
-      ),
-      endDrawer: Drawer(
-        child: ListView(
-          padding: EdgeInsets.zero,
-          children: [
-            DrawerHeader(
-              decoration: const BoxDecoration(
-                image: DecorationImage(
-                  image: AssetImage('assets/images/menu.webp'),
-                  fit: BoxFit.cover,
-                  alignment: Alignment.topCenter,
-                ),
-              ),
-              child: null,
-            ),
-            /*ExpansionTile(
-              title: const Text('Login'),
-              children: [
-                Padding(
-                  padding: const EdgeInsets.all(16.0),
-                  child: Column(
-                    children: [
-                      TextField(
-                        readOnly: true,
-                        controller: _usernameController,
-                        decoration: const InputDecoration(
-                          labelText: 'Benutzername',
-                        ),
-                      ),
-                      const SizedBox(height: 10),
-                      TextField(
-                        readOnly: true,
-                        controller: _passwordController,
-                        obscureText: true,
-                        decoration: const InputDecoration(
-                          labelText: 'Passwort',
-                        ),
-                      ),
-                      const SizedBox(height: 20),
-                      ElevatedButton(
-                        onPressed: () async {
-                          ScaffoldMessenger.of(context).showSnackBar(
-                            const SnackBar(
-                              content: Text("noch nicht implementiert lol"),
-                            ),
-                            final success = await login(
-                              _usernameController.text,
-                              _passwordController.text,
-                            );
-
-                            if (success) {
-                              Navigator.pop(context);
-                            } else {
-                              ScaffoldMessenger.of(context).showSnackBar(
-                                SnackBar(content: Text("Login fehlgeschlagen!")),
-                              );
-                            }
-                          );
-                        },
-                        child: const Text('Login'),
-                      ),
-                    ],
-                  ),
-                ),
-              ],
-            ),*/
-            ExpansionTile(
-              title: const Text('Theme'),
-              children: [
-                Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 16.0),
-                  child: Column(
-                    children: themeMap.entries.map((entry) {
-                      final String themeName = entry.key;
-                      final ThemeData themeData = entry.value;
-                      final ThemeData currentTheme = ref.watch(themeNotifierProvider);
-                      final bool isSelected = currentTheme == themeData;
-                      return ListTile(
-                        title: Text(themeName),
-                        selected: isSelected,
-                        selectedTileColor: Colors.blue.withValues(alpha: 0.2),
-                        onTap: () async {
-                          await ref
-                              .read(themeNotifierProvider.notifier)
-                              .updateTheme(themeName);
-                        },
-                      );
-                    }).toList(),
-                  ),
-                ),
-              ],
-            ),
-            ListTile(
-              title: Text('v${AppVersion.version}'),
-              onTap: () {
-                ScaffoldMessenger.of(context).showSnackBar(
-                  const SnackBar(
-                    content: Text('jooong lass das, hier ist nichts'),
-                  ),
-                );
-              },
-            ),
-          ],
-        ),
-      ),
-      persistentFooterButtons: mediaState.tag != null
-          ? [
-              Center(
-                child: InputChip(
-                  label: Text(mediaState.tag!),
-                  onDeleted: () {
-                    mediaNotifier.setTag(null);
-                    _scrollController.jumpTo(0);
-                  },
-                ),
-              ),
-            ]
-          : null,
-      body: RefreshIndicator(
-        onRefresh: () async {
-          mediaNotifier.resetMedia();
-          _scrollController.jumpTo(0);
-        },
-        child: GridView.builder(
-          key: const PageStorageKey('mediaGrid'),
-          controller: _scrollController,
-          gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-            crossAxisCount: _calculateCrossAxisCount(
-              context,
-              mediaState.crossAxisCount,
-            ),
-            crossAxisSpacing: 5.0,
-            mainAxisSpacing: 5.0,
-          ),
-          itemCount:
-              mediaState.mediaItems.length + (mediaState.isLoading ? 1 : 0),
-          itemBuilder: (BuildContext context, int index) {
-            if (index >= mediaState.mediaItems.length) {
-              return const Center(child: CircularProgressIndicator());
-            }
-            final MediaItem item = mediaState.mediaItems[index];
-
-            return InkWell(
-              onTap: () async {
-                context.push('/${item.id}', extra: true);
-              },
-              child: Stack(
-                fit: StackFit.expand,
-                children: <Widget>[
-                  CachedNetworkImage(
-                    imageUrl: item.thumbnailUrl,
-                    fit: BoxFit.cover,
-                    placeholder: (context, url) => const SizedBox.shrink(),
-                    errorWidget: (context, url, error) =>
-                        const Icon(Icons.error),
-                  ),
-                  Align(
-                    alignment: Alignment.bottomRight,
-                    child: Icon(
-                      Icons.square,
-                      color: switch (item.mode) {
-                        1 => Colors.green,
-                        2 => Colors.red,
-                        _ => Colors.yellow,
-                      },
-                      size: 15.0,
-                    ),
-                  ),
-                ],
-              ),
-            );
-          },
-        ),
-      ),
-    );
-  }
-}
--- a/lib/screens/settings_screen.dart
+++ b/lib/screens/settings_screen.dart
@ -0,0 +1,106 @@
+import 'package:flutter/material.dart';
+
+import 'package:flutter_cache_manager/flutter_cache_manager.dart';
+
+import 'package:f0ckapp/widgets/end_drawer.dart';
+import 'package:get/get.dart';
+
+class SettingsPage extends StatefulWidget {
+  const SettingsPage({super.key});
+
+  @override
+  State<StatefulWidget> createState() => _SettingsPageState();
+}
+
+class _SettingsPageState extends State<SettingsPage> {
+  int _columns = 3;
+  bool _drawerSwipeEnabled = true;
+
+  void _showMsg(String message, BuildContext context) {
+    ScaffoldMessenger.of(context)
+      ..removeCurrentSnackBar()
+      ..showSnackBar(SnackBar(content: Text(message)));
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      endDrawerEnableOpenDragGesture: _drawerSwipeEnabled,
+      endDrawer: EndDrawer(),
+      body: CustomScrollView(
+        slivers: [
+          SliverAppBar(
+            floating: false,
+            pinned: true,
+            title: const Text('Settings'),
+            leading: IconButton(
+              icon: const Icon(Icons.arrow_back),
+              onPressed: () {
+                Get.back();
+              },
+            ),
+          ),
+          SliverList(
+            delegate: SliverChildListDelegate([
+              /*Padding(
+                padding: const EdgeInsets.all(16.0),
+                child: Text(
+                  "Anzahl der Spalten",
+                  style: Theme.of(context).textTheme.titleLarge,
+                ),
+              ),
+              ListTile(
+                title: const Text("Spaltenanzahl"),
+                trailing: DropdownButton<int>(
+                  value: mediaState.crossAxisCount,
+                  dropdownColor: const Color.fromARGB(255, 43, 43, 43),
+                  iconEnabledColor: Colors.white,
+                  items: [0, 3, 4, 5].map((int value) {
+                    return DropdownMenuItem<int>(
+                      value: value,
+                      child: Text(value == 0 ? 'auto' : '$value Spalten'),
+                    );
+                  }).toList(),
+                  onChanged: (int? newValue) {
+                    if (newValue != null) {
+                      setState(() {
+                        _columns = newValue;
+                        mediaNotifier.setCrossAxisCount(newValue);
+                      });
+                    }
+                  },
+                ),
+              ),*/
+              const Divider(),
+              SwitchListTile(
+                title: const Text("Drawer per Geste öffnen"),
+                subtitle: const Text(
+                  "Wähle, ob der Drawer mit einer Wischgeste geschlossen/ geöffnet werden kann.",
+                ),
+                value: _drawerSwipeEnabled,
+                onChanged: (bool value) {
+                  setState(() {
+                    _drawerSwipeEnabled = value;
+                  });
+                },
+              ),
+              const Divider(),
+              ListTile(
+                title: Text("Cache löschen"),
+                trailing: ElevatedButton(
+                  onPressed: () async {
+                    await DefaultCacheManager().emptyCache();
+                    if (!mounted) return;
+                    _showMsg('Cache wurde geleert.', context);
+                  },
+                  child: const Text("Löschen"),
+                ),
+              ),
+              const SizedBox(height: 20),
+            ]),
+          ),
+        ],
+      ),
+    );
+  }
+}
--- a/lib/services/api_service.dart
+++ b/lib/services/api_service.dart
@ -1,109 +1,110 @@
-import 'dart:async';
-import 'dart:convert';
+import 'package:flutter/material.dart';

-import 'package:http/http.dart' as http;
+import 'package:get/get.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';

 import 'package:f0ckapp/models/mediaitem_model.dart';
-import 'package:f0ckapp/models/suggestion_model.dart';

-final FlutterSecureStorage storage = const FlutterSecureStorage(
-  aOptions: AndroidOptions(encryptedSharedPreferences: true),
-);
+const List<String> mediaTypes = ["alles", "image", "video", "audio"];
+const List<String> mediaModes = ["sfw", "nsfw", "untagged", "all"];

-Future<List<MediaItem>> fetchMedia({
-  int? older,
-  String? type,
-  int? mode,
-  bool? random,
-  String? tag,
-}) async {
-  final Uri url = Uri.parse('https://api.f0ck.me/items/get').replace(
-    queryParameters: {
-      'type': type ?? 'image',
-      'mode': (mode ?? 0).toString(),
-      'random': (random! ? 1 : 0).toString(),
-      if (tag != null) 'tag': tag,
-      if (older != null) 'older': older.toString(),
-    },
+class ApiService extends GetConnect {
+  final _storage = const FlutterSecureStorage(
+    aOptions: AndroidOptions(encryptedSharedPreferences: true),
  );
+  RxList<MediaItem> mediaItems = <MediaItem>[].obs;
+  RxnString tag = RxnString();
+  RxInt type = 0.obs;
+  RxInt mode = 0.obs;
+  RxBool random = false.obs;
+  RxBool muted = false.obs;

-  final http.Response response = await http.get(url);
-  if (response.statusCode == 200) {
-    final List<dynamic> jsonList = jsonDecode(response.body);
-    return jsonList.map((item) => MediaItem.fromJson(item)).toList();
-  } else {
-    throw Exception('Fehler beim Abrufen der Medien: ${response.statusCode}');
+  bool _isFetching = false;
+  DateTime? _lastFetchTime;
+  final Duration _minFetchInterval = Duration(milliseconds: 500);
+
+  @override
+  void onInit() {
+    super.onInit();
+    loadMutedState();
+    everAll([tag, type, mode, random], (_) => fetchMedia(reset: true));
  }
-}

-Future<MediaItem> fetchMediaDetail(int itemId) async {
-  final Uri url = Uri.parse('https://api.f0ck.me/item/${itemId.toString()}');
-
-  final http.Response response = await http.get(url);
-  if (response.statusCode == 200) {
-    final Map<String, dynamic> jsonResponse = jsonDecode(response.body);
-
-    return MediaItem.fromJson(jsonResponse);
-  } else {
-    throw Exception(
-      'Fehler beim Abrufen der Media-Details: ${response.statusCode}',
-    );
+  Future<void> loadMutedState() async {
+    String? value = await _storage.read(key: 'muted');
+    muted.value = value == 'true';
  }
-}

-Future<List<Suggestion>> fetchSuggestions(String query) async {
-  final Uri uri = Uri.parse('https://api.f0ck.me/search/?q=$query');
-  try {
-    final http.Response response = await http
-        .get(uri)
-        .timeout(const Duration(seconds: 5));
+  Future<void> toggleMuted() async {
+    muted.value = !muted.value;
+    await _storage.write(key: 'muted', value: muted.value.toString());
+  }

-    if (response.statusCode == 200) {
-      final dynamic decoded = jsonDecode(response.body);
+  Future<void> setTag(String? newTag) async {
+    tag.value = newTag;
+    return await fetchMedia(reset: true);
+  }

-      if (decoded is List) {
-        return decoded
-            .map((item) => Suggestion.fromJson(item as Map<String, dynamic>))
-            .toList()
-          ..sort((a, b) => b.score.compareTo(a.score));
-      } else {
-        throw Exception('Unerwartetes Format: Erwartet wurde eine Liste.');
+  Future<void> setType(int newType) async {
+    type.value = newType >= 0 && newType < mediaTypes.length ? newType : 0;
+    return await fetchMedia(reset: true);
+  }
+
+  Future<void> setMode(int newMode) async {
+    mode.value = newMode >= 0 && newMode < mediaModes.length ? newMode : 0;
+    return await fetchMedia(reset: true);
+  }
+
+  Future<void> toggleRandom() async {
+    random.value = !random.value;
+    return await fetchMedia(reset: true);
+  }
+
+  Future fetchMedia({int? id, bool reset = false}) async {
+    if (!reset) {
+      if (_isFetching) return;
+      if (_lastFetchTime != null &&
+          DateTime.now().difference(_lastFetchTime!) < _minFetchInterval) {
+        return;
      }
-    } else if (response.statusCode == 400) {
-      final dynamic error = jsonDecode(response.body);
-      final String message = error is Map<String, dynamic>
-          ? error['detail']?.toString() ?? 'Unbekannter Fehler.'
-          : 'Unbekannter Fehler.';
-      throw Exception('Client-Fehler 400: $message');
-    } else {
-      throw Exception(
-        'Fehler beim Abrufen der Vorschläge: ${response.statusCode}',
-      );
    }
-  } on TimeoutException {
-    throw Exception('Anfrage an die API hat zu lange gedauert.');
-  } catch (e) {
-    throw Exception('Fehler beim Verarbeiten der Anfrage: $e');
-  }
-}
-
-Future<bool> login(String username, String password) async {
-  final Uri url = Uri.parse('https://api.f0ck.me/login');
-
-  final http.Response response = await http.post(
-    url,
-    body: {'username': username, 'password': password},
-  );
-
-  if (response.statusCode == 200) {
-    final dynamic data = jsonDecode(response.body);
-    final dynamic token = data['token'];
-
-    await storage.write(key: "token", value: token);
-
-    return true;
-  } else {
-    return false;
+    _lastFetchTime = DateTime.now();
+    _isFetching = true;
+
+    if (reset) mediaItems.clear();
+
+    final int? older =
+        id ?? (mediaItems.isNotEmpty ? mediaItems.last.id : null);
+    final Uri url = Uri.parse('https://api.f0ck.me/items/get').replace(
+      queryParameters: {
+        'type': mediaTypes[type.value],
+        'mode': mode.value.toString(),
+        'random': (random.value ? 1 : 0).toString(),
+        if (tag.value != null) 'tag': tag.value,
+        if (older != null) 'older': older.toString(),
+      },
+    );
+
+    try {
+      final Response<dynamic> response = await get(url.toString());
+
+      if (response.isOk && response.body is List) {
+        List<MediaItem> newMedia = (response.body as List)
+            .map((json) => MediaItem.fromJson(json))
+            .toList();
+
+        if (reset) {
+          mediaItems.assignAll(newMedia);
+        } else {
+          mediaItems.addAll(newMedia);
+        }
+      } else {
+        debugPrint('Fehler beim Laden der MediaItems: ${response.statusText}');
+      }
+    } catch (e) {
+      debugPrint('Exception beim Laden der MediaItems: $e');
+    } finally {
+      _isFetching = false;
+    }
  }
 }
--- a/lib/utils/customsearchdelegate_util.dart
+++ b/lib/utils/customsearchdelegate_util.dart
@ -1,11 +1,16 @@
 import 'dart:async';
+import 'dart:convert';
+
 import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import 'package:get/get.dart';
+import 'package:http/http.dart' as http;
+
 import 'package:f0ckapp/services/api_service.dart';
 import 'package:f0ckapp/models/suggestion_model.dart';
-import 'package:f0ckapp/providers/media_provider.dart';

 class CustomSearchDelegate extends SearchDelegate<String> {
+  final ApiService apiService = Get.find<ApiService>();
  Timer? _debounceTimer;
  List<Suggestion>? _suggestions;
  bool _isLoading = false;
@ -42,13 +47,52 @@ class CustomSearchDelegate extends SearchDelegate<String> {
    return Center(child: Text('Suchergebnisse für: "$query"'));
  }

+  Future<List<Suggestion>> fetchSuggestions(String query) async {
+    final Uri uri = Uri.parse('https://api.f0ck.me/search/?q=$query');
+    try {
+      final http.Response response = await http
+          .get(uri)
+          .timeout(const Duration(seconds: 5));
+
+      if (response.statusCode == 200) {
+        final dynamic decoded = jsonDecode(response.body);
+        if (decoded is List) {
+          final suggestions = decoded
+              .map((item) => Suggestion.fromJson(item as Map<String, dynamic>))
+              .toList();
+          suggestions.sort((a, b) => b.score.compareTo(a.score));
+          return suggestions;
+        } else {
+          throw Exception('Unerwartetes Format: Es wurde eine Liste erwartet.');
+        }
+      } else if (response.statusCode == 400) {
+        final dynamic error = jsonDecode(response.body);
+        final String message = error is Map<String, dynamic>
+            ? error['detail']?.toString() ?? 'Unbekannter Fehler.'
+            : 'Unbekannter Fehler.';
+        throw Exception('Client-Fehler 400: $message');
+      } else {
+        throw Exception(
+          'Fehler beim Abrufen der Vorschläge: ${response.statusCode}',
+        );
+      }
+    } on TimeoutException {
+      throw Exception('Anfrage an die API hat zu lange gedauert.');
+    } catch (e) {
+      throw Exception('Fehler bei der Verarbeitung der Anfrage: $e');
+    }
+  }
+
  @override
  Widget buildSuggestions(BuildContext context) {
    return StatefulBuilder(
      builder: (BuildContext context, void Function(void Function()) setState) {
        if (query.isEmpty) {
          _debounceTimer?.cancel();
-          return Container(padding: const EdgeInsets.all(16.0), child: const Text(''));
+          return Container(
+            padding: const EdgeInsets.all(16.0),
+            child: const Text(''),
+          );
        }

        if (query != _lastFetchedQuery) {
@ -90,23 +134,19 @@ class CustomSearchDelegate extends SearchDelegate<String> {
          return Center(child: const Text("Keine Ergebnisse gefunden."));
        }

-        return Consumer(
-          builder: (BuildContext context, WidgetRef ref, Widget? child) {
-            return ListView.builder(
-              itemCount: _suggestions!.length,
-              itemBuilder: (BuildContext context, int index) {
-                final Suggestion suggestion = _suggestions![index];
-                return ListTile(
-                  title: Text(suggestion.tag),
-                  subtitle: Text(
-                    'Getaggt: ${suggestion.tagged}x • Score: ${suggestion.score.toStringAsFixed(2)}',
-                    style: TextStyle(fontSize: 12),
-                  ),
-                  onTap: () {
-                    ref.read(mediaProvider.notifier).setTag(suggestion.tag);
-                    close(context, suggestion.tag);
-                  },
-                );
+        return ListView.builder(
+          itemCount: _suggestions!.length,
+          itemBuilder: (BuildContext context, int index) {
+            final Suggestion suggestion = _suggestions![index];
+            return ListTile(
+              title: Text(suggestion.tag),
+              subtitle: Text(
+                'Getaggt: ${suggestion.tagged}x • Score: ${suggestion.score.toStringAsFixed(2)}',
+                style: TextStyle(fontSize: 12),
+              ),
+              onTap: () async {
+                await apiService.setTag(suggestion.tag);
+                close(context, suggestion.tag);
              },
            );
          },
--- a/lib/utils/pagetransformer_util.dart
+++ b/lib/utils/pagetransformer_util.dart
@ -1,42 +0,0 @@
-import 'package:flutter/material.dart';
-
-class PageTransformer extends StatelessWidget {
-  final List<Widget> pages;
-  final PageController controller;
-
-  const PageTransformer({
-    super.key,
-    required this.pages,
-    required this.controller,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return PageView.builder(
-      controller: controller,
-      itemCount: pages.length,
-      itemBuilder: (context, index) {
-        return _buildPage(pages[index], index);
-      },
-    );
-  }
-
-  Widget _buildPage(Widget page, int index) {
-    return AnimatedBuilder(
-      animation: controller,
-      builder: (context, child) {
-        double value = 1.0;
-        if (controller.position.haveDimensions) {
-          value = controller.page! - index;
-          value = (1 - (value.abs() * 0.5)).clamp(0.0, 1.0);
-        }
-        return Transform(
-          transform: Matrix4.identity()..scale(value, value),
-          alignment: Alignment.center,
-          child: child,
-        );
-      },
-      child: page,
-    );
-  }
-}
--- a/lib/widgets/end_drawer.dart
+++ b/lib/widgets/end_drawer.dart
@ -0,0 +1,132 @@
+import 'package:flutter/material.dart';
+
+import 'package:get/get.dart';
+
+import 'package:f0ckapp/providers/theme_provider.dart';
+//import 'package:f0ckapp/services/api_service.dart';
+import 'package:f0ckapp/utils/appversion_util.dart';
+
+class EndDrawer extends StatelessWidget {
+  const EndDrawer({super.key});
+
+  void _showMsg(String message, BuildContext context) {
+    ScaffoldMessenger.of(context)
+      ..removeCurrentSnackBar()
+      ..showSnackBar(SnackBar(content: Text(message)));
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    //final ApiService c = Get.find<ApiService>();
+    final ThemeController themeController = Get.find();
+
+    return Drawer(
+      child: ListView(
+        padding: EdgeInsets.zero,
+        children: [
+          DrawerHeader(
+            decoration: const BoxDecoration(
+              image: DecorationImage(
+                image: AssetImage('assets/images/menu.webp'),
+                fit: BoxFit.cover,
+                alignment: Alignment.topCenter,
+              ),
+            ),
+            child: null,
+          ),
+          /*ExpansionTile(
+              title: const Text('Login'),
+              children: [
+                Padding(
+                  padding: const EdgeInsets.all(16.0),
+                  child: Column(
+                    children: [
+                      TextField(
+                        readOnly: true,
+                        controller: _usernameController,
+                        decoration: const InputDecoration(
+                          labelText: 'Benutzername',
+                        ),
+                      ),
+                      const SizedBox(height: 10),
+                      TextField(
+                        readOnly: true,
+                        controller: _passwordController,
+                        obscureText: true,
+                        decoration: const InputDecoration(
+                          labelText: 'Passwort',
+                        ),
+                      ),
+                      const SizedBox(height: 20),
+                      ElevatedButton(
+                        onPressed: () async {
+                          ScaffoldMessenger.of(context).showSnackBar(
+                            const SnackBar(
+                              content: Text("noch nicht implementiert lol"),
+                            ),
+                            final success = await login(
+                              _usernameController.text,
+                              _passwordController.text,
+                            );
+
+                            if (success) {
+                              Navigator.pop(context);
+                            } else {
+                              ScaffoldMessenger.of(context).showSnackBar(
+                                SnackBar(content: Text("Login fehlgeschlagen!")),
+                              );
+                            }
+                          );
+                        },
+                        child: const Text('Login'),
+                      ),
+                    ],
+                  ),
+                ),
+              ],
+            ),*/
+          ExpansionTile(
+            title: const Text('Theme'),
+            children: [
+              Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 16.0),
+                child: Obx(() {
+                  return Column(
+                    children: themeController.themeMap.entries.map((entry) {
+                      final String themeName = entry.key;
+                      final ThemeData themeData = entry.value;
+                      final bool isSelected =
+                          themeController.currentTheme.value == themeData;
+                      return ListTile(
+                        title: Text(themeName),
+                        selected: isSelected,
+                        selectedTileColor: Colors.blue.withValues(alpha: 0.2),
+                        onTap: () async {
+                          await themeController.updateTheme(themeName);
+                        },
+                      );
+                    }).toList(),
+                  );
+                }),
+              ),
+            ],
+          ),
+          ListTile(
+            title: const Text('Settings'),
+            onTap: () {
+              Navigator.pop(context);
+              Get.toNamed('/settings');
+            },
+          ),
+          ListTile(
+            title: Text('v${AppVersion.version}'),
+            onTap: () {
+              Navigator.pop(context);
+              _showMsg('jooong lass das, hier ist nichts', context);
+            },
+          ),
+        ],
+      ),
+    );
+  }
+}
--- a/lib/widgets/filter_bar.dart
+++ b/lib/widgets/filter_bar.dart
@ -0,0 +1,62 @@
+import 'package:flutter/material.dart';
+
+import 'package:get/get.dart';
+
+import 'package:f0ckapp/services/api_service.dart';
+
+class FilterBar extends StatelessWidget {
+  final ScrollController scrollController;
+  
+  const FilterBar({
+    super.key,
+    required this.scrollController,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final ApiService c = Get.find<ApiService>();
+
+    return BottomAppBar(
+      height: 50,
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.spaceAround,
+        children: [
+          const Text('type: '),
+          Obx(() => DropdownButton<String>(
+            value: mediaTypes[c.type.value],
+            isDense: true,
+            items: mediaTypes.map((String value) {
+              return DropdownMenuItem<String>(
+                value: value,
+                child: Text(value),
+              );
+            }).toList(),
+            onChanged: (String? newValue) {
+              if (newValue != null) {
+                c.setType(mediaTypes.indexOf(newValue));
+                scrollController.jumpTo(0);
+              }
+            },
+          )),
+          const Text('mode: '),
+          Obx(() => DropdownButton<String>(
+            value: mediaModes[c.mode.value],
+            isDense: true,
+            items: mediaModes.map((String value) {
+              return DropdownMenuItem<String>(
+                value: value,
+                child: Text(value),
+              );
+            }).toList(),
+            onChanged: (String? newValue) {
+              if (newValue != null) {
+                c.setMode(mediaModes.indexOf(newValue));
+                scrollController.jumpTo(0);
+              }
+            },
+          )),
+        ],
+      ),
+    );
+  }
+}
--- a/lib/widgets/media_tile.dart
+++ b/lib/widgets/media_tile.dart
@ -0,0 +1,47 @@
+import 'package:flutter/material.dart';
+
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:get/get.dart';
+
+import 'package:f0ckapp/models/mediaitem_model.dart';
+
+class MediaTile extends StatelessWidget {
+  final MediaItem item;
+
+  const MediaTile({super.key, required this.item});
+
+  @override
+  Widget build(BuildContext context) {
+    return InkWell(
+      onTap: () {
+        //Navigator.pushNamed(context, '/${item.id}');
+        Get.toNamed('/${item.id}');
+      },
+      child: Stack(
+        fit: StackFit.expand,
+        children: [
+          Hero(
+            tag: 'media-${item.id}',
+            child: CachedNetworkImage(
+              imageUrl: item.thumbnailUrl,
+              fit: BoxFit.cover,
+              errorWidget: (context, url, error) => const Icon(Icons.error),
+            ),
+          ),
+          Align(
+            alignment: Alignment.bottomRight,
+            child: Icon(
+              Icons.square,
+              color: switch (item.mode) {
+                1 => Colors.green,
+                2 => Colors.red,
+                _ => Colors.yellow,
+              },
+              size: 15.0,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
--- a/lib/widgets/video_widget.dart
+++ b/lib/widgets/video_widget.dart
@ -1,26 +1,33 @@
 import 'dart:async';

+import 'package:f0ckapp/services/api_service.dart';
 import 'package:flutter/material.dart';

 import 'package:cached_video_player_plus/cached_video_player_plus.dart';
 import 'package:cached_network_image/cached_network_image.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';

 import 'package:f0ckapp/models/mediaitem_model.dart';
 import 'package:f0ckapp/widgets/videooverlay_widget.dart';
-import 'package:f0ckapp/providers/media_provider.dart';
+import 'package:get/get.dart';

-class VideoWidget extends ConsumerStatefulWidget {
+class VideoWidget extends StatefulWidget {
  final MediaItem details;
  final bool isActive;
+  final bool fullScreen;

-  const VideoWidget({super.key, required this.details, required this.isActive});
+  const VideoWidget({
+    super.key,
+    required this.details,
+    required this.isActive,
+    this.fullScreen = false,
+  });

  @override
-  ConsumerState<VideoWidget> createState() => _VideoWidgetState();
+  State<VideoWidget> createState() => _VideoWidgetState();
 }

-class _VideoWidgetState extends ConsumerState<VideoWidget> {
+class _VideoWidgetState extends State<VideoWidget> {
+  final ApiService apiService = Get.find<ApiService>();
  late CachedVideoPlayerPlusController _controller;
  bool _showControls = false;
  Timer? _hideControlsTimer;
@ -45,8 +52,7 @@ class _VideoWidgetState extends ConsumerState<VideoWidget> {
    }
    _controller.setLooping(true);

-    final bool muted = ref.read(mediaProvider).muted;
-    _controller.setVolume(muted ? 0.0 : 1.0);
+    _controller.setVolume(apiService.muted.value ? 0.0 : 1.0);
  }

  @override
@ -82,7 +88,7 @@ class _VideoWidgetState extends ConsumerState<VideoWidget> {

  @override
  Widget build(BuildContext context) {
-    final bool muted = ref.watch(mediaProvider).muted;
+    final bool muted = apiService.muted.value;
    if (_controller.value.isInitialized &&
        _controller.value.volume != (muted ? 0.0 : 1.0)) {
      _controller.setVolume(muted ? 0.0 : 1.0);
@ -90,17 +96,15 @@ class _VideoWidgetState extends ConsumerState<VideoWidget> {

    bool isAudio = widget.details.mime.startsWith('audio');

-    return Column(
-      mainAxisSize: MainAxisSize.min,
-      children: [
-        AspectRatio(
-          aspectRatio: _controller.value.isInitialized
-              ? _controller.value.aspectRatio
-              : 9 / 16,
-          child: Stack(
-            alignment: Alignment.topCenter,
-            children: [
-              GestureDetector(
+    if (widget.fullScreen) {
+      return Stack(
+        children: [
+          Center(
+            child: AspectRatio(
+              aspectRatio: _controller.value.isInitialized
+                  ? _controller.value.aspectRatio
+                  : 9 / 16,
+              child: GestureDetector(
                onTap: _onTap,
                child: isAudio
                    ? CachedNetworkImage(
@ -118,24 +122,71 @@ class _VideoWidgetState extends ConsumerState<VideoWidget> {
                    ? CachedVideoPlayerPlus(_controller)
                    : const Center(child: CircularProgressIndicator()),
              ),
-              if (_controller.value.isInitialized && _showControls) ...[
-                IgnorePointer(
-                  ignoring: true,
-                  child: Container(
-                    color: Colors.black.withValues(alpha: 0.5),
-                    width: double.infinity,
-                    height: double.infinity,
+            ),
+          ),
+          if (_controller.value.isInitialized && _showControls)
+            Positioned.fill(
+              child: GestureDetector(
+                onTap: _onTap,
+                child: Container(
+                  color: Colors.black.withValues(alpha: 0.5),
+                  child: VideoControlsOverlay(
+                    controller: _controller,
+                    button: () => _onTap(ctrlButton: true),
                  ),
                ),
-                VideoControlsOverlay(
-                  controller: _controller,
-                  button: () => _onTap(ctrlButton: true),
+              ),
+            ),
+        ],
+      );
+    } else {
+      return Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          AspectRatio(
+            aspectRatio: _controller.value.isInitialized
+                ? _controller.value.aspectRatio
+                : 9 / 16,
+            child: Stack(
+              alignment: Alignment.topCenter,
+              children: [
+                GestureDetector(
+                  onTap: _onTap,
+                  child: isAudio
+                      ? CachedNetworkImage(
+                          imageUrl: widget.details.coverUrl,
+                          fit: BoxFit.cover,
+                          placeholder: (context, url) =>
+                              const CircularProgressIndicator(),
+                          errorWidget: (context, url, error) => Image.asset(
+                            'assets/images/music.webp',
+                            fit: BoxFit.contain,
+                            width: double.infinity,
+                          ),
+                        )
+                      : _controller.value.isInitialized
+                      ? CachedVideoPlayerPlus(_controller)
+                      : const Center(child: CircularProgressIndicator()),
                ),
+                if (_controller.value.isInitialized && _showControls) ...[
+                  IgnorePointer(
+                    ignoring: true,
+                    child: Container(
+                      color: Colors.black.withValues(alpha: 0.5),
+                      width: double.infinity,
+                      height: double.infinity,
+                    ),
+                  ),
+                  VideoControlsOverlay(
+                    controller: _controller,
+                    button: () => _onTap(ctrlButton: true),
+                  ),
+                ],
              ],
-            ],
+            ),
          ),
-        ),
-      ],
-    );
+        ],
+      );
+    }
  }
 }
--- a/lib/widgets/videooverlay_widget.dart
+++ b/lib/widgets/videooverlay_widget.dart
@ -1,11 +1,10 @@
+import 'package:f0ckapp/services/api_service.dart';
 import 'package:flutter/material.dart';

-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:cached_video_player_plus/cached_video_player_plus.dart';
+import 'package:get/get.dart';

-import 'package:f0ckapp/providers/media_provider.dart';
-
-class VideoControlsOverlay extends ConsumerWidget {
+class VideoControlsOverlay extends StatelessWidget {
  final CachedVideoPlayerPlusController controller;
  final VoidCallback button;

@ -16,9 +15,8 @@ class VideoControlsOverlay extends ConsumerWidget {
  });

  @override
-  Widget build(BuildContext context, ref) {
-    final MediaState mediaState = ref.watch(mediaProvider);
-    final MediaNotifier mediaNotifier = ref.read(mediaProvider.notifier);
+  Widget build(BuildContext context) {
+    final ApiService apiService = Get.find<ApiService>();

    return Stack(
      alignment: Alignment.center,
@ -26,13 +24,15 @@ class VideoControlsOverlay extends ConsumerWidget {
        Positioned(
          right: 12,
          bottom: 12,
-          child: _ControlButton(
-            mediaState.muted ? Icons.volume_off : Icons.volume_up,
-            () {
-              button();
-              mediaNotifier.toggleMute();
-            },
-            size: 16,
+          child: Obx(
+            () => _ControlButton(
+              apiService.muted.value ? Icons.volume_off : Icons.volume_up,
+              () async {
+                button();
+                await apiService.toggleMuted();
+              },
+              size: 16,
+            ),
          ),
        ),
        Center(
--- a/pubspec.lock
+++ b/pubspec.lock
@ -105,30 +105,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.0.8"
-  dartx:
-    dependency: transitive
-    description:
-      name: dartx
-      sha256: "8b25435617027257d43e6508b5fe061012880ddfdaa75a71d607c3de2a13d244"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.0"
-  diacritic:
-    dependency: transitive
-    description:
-      name: diacritic
-      sha256: "12981945ec38931748836cd76f2b38773118d0baef3c68404bdfde9566147876"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.6"
-  downloadsfolder:
-    dependency: "direct main"
-    description:
-      name: downloadsfolder
-      sha256: "0e1bb7dd634d6231c0ac116c467da94507a07ed62239712ea0dead981d58b114"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.0"
  fake_async:
    dependency: transitive
    description:
@ -182,14 +158,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "6.0.0"
-  flutter_riverpod:
-    dependency: "direct main"
-    description:
-      name: flutter_riverpod
-      sha256: "9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.6.1"
  flutter_secure_storage:
    dependency: "direct main"
    description:
@ -249,7 +217,7 @@ packages:
    source: sdk
    version: "0.0.0"
  get:
-    dependency: transitive
+    dependency: "direct main"
    description:
      name: get
      sha256: c79eeb4339f1f3deffd9ec912f8a923834bec55f7b49c9e882b8fef2c139d425
@ -264,14 +232,6 @@ 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:
@ -336,14 +296,6 @@ 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:
@ -472,14 +424,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.1.8"
-  riverpod:
-    dependency: transitive
-    description:
-      name: riverpod
-      sha256: "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.6.1"
  rxdart:
    dependency: transitive
    description:
@ -573,14 +517,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.12.1"
-  state_notifier:
-    dependency: transitive
-    description:
-      name: state_notifier
-      sha256: b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
  stream_channel:
    dependency: transitive
    description:
@ -621,14 +557,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "0.7.6"
-  time:
-    dependency: transitive
-    description:
-      name: time
-      sha256: "370572cf5d1e58adcb3e354c47515da3f7469dac3a95b447117e728e7be6f461"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.5"
  typed_data:
    dependency: transitive
    description:
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -1,5 +1,5 @@
 name: f0ckapp
-description: "A new Flutter project."
+description: "f0ck schm0ck"
 # The following line prevents the package from being accidentally published to
 # pub.dev using `flutter pub publish`. This is preferred for private packages.
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.1.13+43
+version: 1.2.1+55

 environment:
  sdk: ^3.9.0-100.2.beta
@ -40,9 +40,7 @@ dependencies:
  package_info_plus: ^8.3.0
  share_plus: ^11.0.0
  flutter_secure_storage: ^9.2.4
-  flutter_riverpod: ^2.6.1
-  go_router: ^15.1.3
-  downloadsfolder: ^1.2.0
+  get: ^4.7.2

 dev_dependencies:
  flutter_test:
--- a/test/widget_test.dart
+++ b/test/widget_test.dart
@ -8,12 +8,12 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';

-import 'package:f0ckapp/main.dart';
+//import 'package:f0ckapp/main.dart';

 void main() {
  testWidgets('Counter increments smoke test', (WidgetTester tester) async {
    // Build our app and trigger a frame.
-    await tester.pumpWidget(const F0ckApp());
+    //await tester.pumpWidget(F0ckApp());

    // Verify that our counter starts at 0.
    expect(find.text('0'), findsOneWidget);
Author	SHA1	Message	Date
Flummi	2a500144f5	v1.2.1+55 All checks were successful Flutter Schmutter / build (push) Successful in 3m42s Details - fix deeplink - add mute button	2025-06-13 15:01:48 +02:00
Flummi	9655f15927	v1.2.0+54 All checks were successful Flutter Schmutter / build (push) Successful in 3m37s Details - screaming_possum.gif	2025-06-13 13:55:05 +02:00
Flummi	dff9cda829	v1.1.23+53 All checks were successful Flutter Schmutter / build (push) Successful in 3m40s Details - bye go_router	2025-06-12 11:39:31 +02:00
Flummi	16ebc51e77	v1.1.22+52 All checks were successful Flutter Schmutter / build (push) Successful in 3m39s Details	2025-06-11 21:30:05 +02:00
Flummi	7981436374	v1.1.21+51 All checks were successful Flutter Schmutter / build (push) Successful in 3m40s Details	2025-06-11 20:45:37 +02:00
Flummi	e38d2086b3	v1.1.20+50 All checks were successful Flutter Schmutter / build (push) Successful in 3m39s Details	2025-06-11 18:56:55 +02:00
Flummi	a4d50289c2	v1.1.19+49 All checks were successful Flutter Schmutter / build (push) Successful in 3m36s Details	2025-06-11 14:53:26 +02:00
Flummi	82fb23dbfd	v1.1.18+48 All checks were successful Flutter Schmutter / build (push) Successful in 3m36s Details - fullscreen	2025-06-11 13:41:12 +02:00
Flummi	13f957f016	test schmest All checks were successful Flutter Schmutter / build (push) Successful in 3m32s Details	2025-06-11 12:16:32 +02:00
Flummi	707f14c5fb	testbuild, rebranding All checks were successful Flutter Schmutter / build (push) Successful in 3m43s Details	2025-06-11 11:31:45 +02:00
Flummi	493422e724	v1.1.15+45 All checks were successful Flutter Schmutter / build (push) Successful in 3m35s Details - buildtest lol	2025-06-11 11:22:00 +02:00
Flummi	3b95d128e1	fk gitea	2025-06-11 11:01:40 +02:00
Flummi	57636c5de6	v1.1.14+44 All checks were successful Flutter Schmutter / build (push) Successful in 3m32s Details	2025-06-11 10:52:15 +02:00