v1.4.2+63

- oops xd

assets/i18n/de_DE.json

@@ -0,0 +1,11 @@
+{
+  "settings_title": "Einstellungen",
+  "settings_language": "Sprache",
+  "settings_drawer_title": "Drawer per Geste öffnen",
+  "settings_drawer_subtitle": "Wähle, ob der Drawer mit einer Wischgeste geschlossen/geöffnet werden kann.",
+  "settings_numberofcolumns_title": "Spaltenanzahl",
+  "settings_numberofcolumns_columns": "@count Spalten",
+  "settings_pageanimation_title": "Seitenwechselanimation",
+  "settings_cache_title": "Cache leeren",
+  "settings_cache_clear_button": "Leeren"
+}

assets/i18n/en_US.json

@@ -0,0 +1,11 @@
+{
+  "settings_title": "Settings",
+  "settings_language": "Language",
+  "settings_drawer_title": "Open drawer with gesture",
+  "settings_drawer_subtitle": "Choose whether the drawer can be closed/opened with a swipe gesture.",
+  "settings_numberofcolumns_title": "Number of columns",
+  "settings_numberofcolumns_columns": "@count columns",
+  "settings_pageanimation_title": "Page change animation",
+  "settings_cache_title": "Clear Cache",
+  "settings_cache_clear_button": "Clear"
+}

assets/i18n/fr_FR.json

@@ -0,0 +1,11 @@
+{
+  "settings_title": "Paramètres",
+  "settings_language": "Langue",
+  "settings_drawer_title": "Ouvrir le tiroir avec un geste",
+  "settings_drawer_subtitle": "Choisissez si le tiroir peut être ouvert/fermé avec un geste de balayage.",
+  "settings_numberofcolumns_title": "Nombre de colonnes",
+  "settings_numberofcolumns_columns": "@count colonnes",
+  "settings_pageanimation_title": "Animation de changement de page",
+  "settings_cache_title": "Vider le cache",
+  "settings_cache_clear_button": "Vider"
+}

assets/i18n/nl_NL.json

@@ -0,0 +1,11 @@
+{
+  "settings_title": "Instellingen",
+  "settings_language": "Taal",
+  "settings_drawer_title": "Lade openen met een gebaar",
+  "settings_drawer_subtitle": "Kies of de lade geopend/gesloten kan worden met een veeggebaar.",
+  "settings_numberofcolumns_title": "Aantal kolommen",
+  "settings_numberofcolumns_columns": "@count kolommen",
+  "settings_pageanimation_title": "Pagina-overgangsanimatie",
+  "settings_cache_title": "Cache wissen",
+  "settings_cache_clear_button": "Wissen"
+}

lib/controller/authcontroller.dart

@@ -0,0 +1,102 @@
+import 'dart:convert';
+
+import 'package:get/get.dart';
+import 'package:encrypt_shared_preferences/provider.dart';
+import 'package:http/http.dart' as http;
+
+import 'package:f0ckapp/models/user.dart';
+
+class AuthController extends GetxController {
+  final EncryptedSharedPreferencesAsync storage =
+      EncryptedSharedPreferencesAsync.getInstance();
+
+  RxnString token = RxnString();
+  Rxn<User> user = Rxn<User>();
+  RxBool isLoading = false.obs;
+  RxnString error = RxnString();
+
+  @override
+  void onInit() {
+    super.onInit();
+    loadToken();
+  }
+
+  Future<void> loadToken() async {
+    token.value = await storage.getString('token');
+    if (token.value != null) {
+      await fetchUserInfo();
+    }
+  }
+
+  Future<void> saveToken(String newToken) async {
+    token.value = newToken;
+    await storage.setString('token', newToken);
+    await fetchUserInfo();
+  }
+
+  Future<void> logout() async {
+    if (token.value != null) {
+      try {
+        await http.post(
+          Uri.parse('https://api.f0ck.me/logout'),
+          headers: {
+            'Authorization': 'Bearer ${token.value}',
+            'Content-Type': 'application/json',
+          },
+        );
+      } catch (_) {}
+    }
+    token.value = null;
+    user.value = null;
+    await storage.remove('token');
+  }
+
+  Future<bool> login(String username, String password) async {
+    isLoading.value = true;
+    error.value = null;
+    try {
+      final http.Response response = await http.post(
+        Uri.parse('https://api.f0ck.me/login'),
+        headers: {'Content-Type': 'application/json'},
+        body: json.encode({'username': username, 'password': password}),
+      );
+      if (response.statusCode == 200) {
+        final dynamic data = json.decode(response.body);
+        if (data['token'] != null) {
+          await saveToken(data['token']);
+          user.value = User.fromJson(data);
+          return true;
+        } else {
+          error.value = 'Kein Token erhalten';
+        }
+      } else {
+        error.value = 'Login fehlgeschlagen';
+      }
+    } catch (e) {
+      error.value = e.toString();
+    } finally {
+      isLoading.value = false;
+    }
+    return false;
+  }
+
+  Future<void> fetchUserInfo() async {
+    if (token.value == null) return;
+    try {
+      final http.Response response = await http.get(
+        Uri.parse('https://api.f0ck.me/login/check'),
+        headers: {'Authorization': 'Bearer ${token.value}'},
+      );
+      if (response.statusCode == 200) {
+        final dynamic data = json.decode(response.body);
+        user.value = User.fromJson(data);
+      } else {
+        await logout();
+      }
+    } catch (_) {
+      await logout();
+    }
+  }
+
+  bool get isLoggedIn => token.value != null && token.value!.isNotEmpty;
+}

lib/controller/localizationcontroller.dart

@@ -0,0 +1,79 @@
+import 'dart:convert';
+
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+
+import 'package:get/get.dart';
+import 'package:encrypt_shared_preferences/provider.dart';
+
+const Map<String, Locale> supportedLocales = {
+  'en_US': Locale('en', 'US'),
+  'de_DE': Locale('de', 'DE'),
+  'fr_FR': Locale('fr', 'FR'),
+  'nl_NL': Locale('nl', 'NL'),
+};
+
+class MyTranslations extends Translations {
+  static final MyTranslations instance = MyTranslations._internal();
+  MyTranslations._internal();
+
+  static final Map<String, Map<String, String>> _translations = {};
+
+  static Future<void> loadTranslations() async {
+    for (final localeKey in supportedLocales.keys) {
+      try {
+        final String jsonString = await rootBundle.loadString(
+          'assets/i18n/$localeKey.json',
+        );
+        final Map<String, dynamic> jsonMap = json.decode(jsonString);
+        _translations[localeKey] = jsonMap.map(
+          (key, value) => MapEntry(key, value.toString()),
+        );
+      } catch (e) {
+        debugPrint('Konnte Übersetzung für $localeKey nicht laden: $e');
+      }
+    }
+  }
+
+  @override
+  Map<String, Map<String, String>> get keys => _translations;
+}
+
+class LocalizationController extends GetxController {
+  final EncryptedSharedPreferencesAsync storage =
+      EncryptedSharedPreferencesAsync.getInstance();
+  Rx<Locale> currentLocale = supportedLocales['en_US']!.obs;
+
+  @override
+  void onInit() {
+    super.onInit();
+    loadLocale();
+  }
+
+  Future<void> loadLocale() async {
+    String? savedLocaleKey = await storage.getString(
+      'locale',
+      defaultValue: 'en_US',
+    );
+
+    final Locale locale =
+        supportedLocales[savedLocaleKey ?? 'en_US'] ??
+        supportedLocales['en_US']!;
+
+    currentLocale.value = locale;
+    Get.locale = locale;
+  }
+
+  Future<void> changeLocale(Locale newLocale) async {
+    final String localeKey = supportedLocales.entries
+        .firstWhere(
+          (entry) => entry.value == newLocale,
+          orElse: () => supportedLocales.entries.first,
+        )
+        .key;
+
+    currentLocale.value = newLocale;
+    Get.updateLocale(newLocale);
+    await storage.setString('locale', localeKey);
+  }
+}

lib/controller/media_controller.dart

@@ -1,110 +0,0 @@
-import 'package:encrypt_shared_preferences/provider.dart';
-import 'package:f0ckapp/utils/animatedtransition.dart';
-import 'package:get/get.dart';
-
-import 'package:f0ckapp/service/media_service.dart';
-import 'package:f0ckapp/models/media_item.dart';
-
-class MediaController extends GetxController {
-  final EncryptedSharedPreferencesAsync storage =
-      EncryptedSharedPreferencesAsync.getInstance();
-
-  final RxList<MediaItem> mediaItems = <MediaItem>[].obs;
-  final RxBool isLoading = false.obs;
-  final RxString errorMessage = ''.obs;
-  final MediaService _mediaService = MediaService();
-
-  RxnString tag = RxnString();
-  RxInt type = 0.obs;
-  RxInt mode = 0.obs;
-  RxBool random = false.obs;
-  late RxBool muted = false.obs;
-  late RxInt crossAxisCount = 0.obs;
-  late RxBool drawerSwipeEnabled = true.obs;
-  final Rx<PageTransition> transitionType = PageTransition.opacity.obs;
-
-  @override
-  void onInit() async {
-    super.onInit();
-    await loadSettings();
-  }
-
-  Future<void> loadSettings() async {
-    muted.value = await storage.getBoolean('muted') ?? false;
-    crossAxisCount.value = await storage.getInt('crossAxisCount') ?? 0;
-    drawerSwipeEnabled.value =
-        await storage.getBoolean('drawerSwipeEnabled') ?? true;
-    transitionType.value =
-        PageTransition.values[await storage.getInt('transitionType') ?? 0];
-  }
-
-  Future<void> saveSettings() async {
-    await storage.setBoolean('muted', muted.value);
-    await storage.setInt('crossAxisCount', crossAxisCount.value);
-    await storage.setBoolean('drawerSwipeEnabled', drawerSwipeEnabled.value);
-    await storage.setInt('transitionType', transitionType.value.index);
-  }
-
-  Future<void> setTag(String? newTag) async {
-    tag.value = newTag;
-    await loadMediaItems();
-  }
-
-  Future<void> setType(int newType) async {
-    type.value = newType;
-    await loadMediaItems();
-  }
-
-  Future<void> setMode(int newMode) async {
-    mode.value = newMode;
-    await loadMediaItems();
-  }
-
-  Future<void> toggleRandom() async {
-    random.value = !random.value;
-    await loadMediaItems();
-  }
-
-  Future<void> toggleMuted() async {
-    muted.value = !muted.value;
-    await saveSettings();
-  }
-
-  Future<void> setCrossAxisCount(int newCrossAxisCount) async {
-    crossAxisCount.value = newCrossAxisCount;
-    await saveSettings();
-  }
-
-  Future<void> setDrawerSwipeEnabled(bool newValue) async {
-    drawerSwipeEnabled.value = newValue;
-    await saveSettings();
-  }
-
-  Future<void> setTransitionType(PageTransition newType) async {
-    transitionType.value = newType;
-    await saveSettings();
-  }
-
-  Future<void> loadMediaItems({int? older, bool append = false}) async {
-    if (isLoading.value) return;
-    try {
-      isLoading.value = true;
-      final List<MediaItem> items = await _mediaService.fetchMediaItems(
-        type: type.value,
-        mode: mode.value,
-        random: random.value ? 1 : 0,
-        tag: tag.value,
-        older: older,
-      );
-
-      append ? mediaItems.addAll(items) : mediaItems.assignAll(items);
-      
-      errorMessage.value = '';
-    } catch (e) {
-      errorMessage.value = 'Fehler beim Laden der Daten: ${e.toString()}';
-      Get.snackbar('Error', e.toString());
-    } finally {
-      isLoading.value = false;
-    }
-  }
-}

lib/controller/mediacontroller.dart

@@ -0,0 +1,194 @@
+import 'package:get/get.dart';
+import 'package:encrypt_shared_preferences/provider.dart';
+
+import 'package:f0ckapp/models/feed.dart';
+import 'package:f0ckapp/models/item.dart';
+import 'package:f0ckapp/services/api.dart';
+import 'package:f0ckapp/utils/animatedtransition.dart';
+
+const List<String> mediaTypes = ["alles", "image", "video", "audio"];
+const List<String> mediaModes = ["sfw", "nsfw", "untagged", "all"];
+
+class MediaController extends GetxController {
+  final ApiService _api = Get.find<ApiService>();
+  final EncryptedSharedPreferencesAsync storage =
+      EncryptedSharedPreferencesAsync.getInstance();
+
+  RxList<MediaItem> items = <MediaItem>[].obs;
+  RxBool loading = false.obs;
+  RxBool atEnd = false.obs;
+  RxBool atStart = false.obs;
+
+  RxInt typeIndex = 0.obs;
+  RxInt modeIndex = 0.obs;
+  RxInt random = 0.obs;
+  Rxn<String> tag = Rxn<String>(null);
+  RxBool muted = false.obs;
+  Rx<PageTransition> transitionType = PageTransition.opacity.obs;
+  RxBool drawerSwipeEnabled = true.obs;
+  RxInt crossAxisCount = 0.obs;
+  RxInt videoControlsTimerNotifier = 0.obs;
+  RxInt hideControlsNotifier = 0.obs;
+
+  void setTypeIndex(int idx) {
+    typeIndex.value = idx;
+    fetchInitial();
+  }
+
+  void setModeIndex(int idx) {
+    modeIndex.value = idx;
+    fetchInitial();
+  }
+
+  void setTag(String? newTag, {bool reload = true}) {
+    tag.value = newTag;
+    if (reload) {
+      fetchInitial();
+    }
+  }
+
+  Future<List<Favorite>?> toggleFavorite(
+    MediaItem item,
+    bool isFavorite,
+  ) async {
+    try {
+      return await _api.toggleFavorite(item, isFavorite);
+    } catch (e) {
+      return [];
+    }
+  }
+
+  Future<Feed?> _fetchItems({int? older, int? newer}) async {
+    if (loading.value) return null;
+    loading.value = true;
+    try {
+      return await _api.fetchItems(
+        older: older,
+        newer: newer,
+        type: typeIndex.value,
+        mode: modeIndex.value,
+        random: random.value,
+        tag: tag.value,
+      );
+    } catch (e) {
+      Get.snackbar(
+        'Fehler beim Laden',
+        'Die Daten konnten nicht abgerufen werden. Wo Internet?',
+        snackPosition: SnackPosition.BOTTOM,
+      );
+      return null;
+    } finally {
+      loading.value = false;
+    }
+  }
+
+  Future<void> fetchInitial({int? id}) async {
+    final result = await _fetchItems(older: id);
+    if (result != null) {
+      items.assignAll(result.items);
+      atEnd.value = result.atEnd;
+      atStart.value = result.atStart;
+    }
+  }
+
+  Future<void> fetchMore() async {
+    if (items.isEmpty || atEnd.value) return;
+    final result = await _fetchItems(older: items.last.id);
+    if (result != null) {
+      final Set<int> existingIds = items.map((e) => e.id).toSet();
+      final List<MediaItem> newItems = result.items
+          .where((item) => !existingIds.contains(item.id))
+          .toList();
+      items.addAll(newItems);
+      items.refresh();
+      atEnd.value = result.atEnd;
+    }
+  }
+
+  Future<int> fetchNewer() async {
+    if (items.isEmpty || atStart.value) return 0;
+    final oldLength = items.length;
+    final result = await _fetchItems(newer: items.first.id);
+    if (result != null) {
+      final Set<int> existingIds = items.map((e) => e.id).toSet();
+      final List<MediaItem> newItems = result.items
+          .where((item) => !existingIds.contains(item.id))
+          .toList();
+      items.insertAll(0, newItems);
+      items.refresh();
+      atStart.value = result.atStart;
+      return items.length - oldLength;
+    }
+    return 0;
+  }
+
+  Future<void> handleRefresh() async {
+    if (loading.value) return;
+    if (!atStart.value) {
+      await fetchNewer();
+    } else {
+      await fetchInitial();
+    }
+  }
+
+  Future<void> handleLoading() async {
+    if (!loading.value && !atEnd.value) {
+      await fetchMore();
+    }
+  }
+
+  void toggleMuted() {
+    muted.value = !muted.value;
+  }
+
+  void setMuted(bool value) {
+    muted.value = value;
+  }
+
+  Future<void> setTransitionType(PageTransition type) async {
+    transitionType.value = type;
+    await saveSettings();
+  }
+
+  Future<void> setCrossAxisCount(int value) async {
+    crossAxisCount.value = value;
+    await saveSettings();
+  }
+
+  Future<void> setDrawerSwipeEnabled(bool enabled) async {
+    drawerSwipeEnabled.value = enabled;
+    await saveSettings();
+  }
+
+  void toggleRandom() {
+    random.value = random.value == 1 ? 0 : 1;
+    fetchInitial();
+  }
+
+  void resetVideoControlsTimer() => videoControlsTimerNotifier.value++;
+  void hideVideoControls() => hideControlsNotifier.value++;
+
+  @override
+  void onInit() async {
+    super.onInit();
+    await loadSettings();
+  }
+
+  Future<void> loadSettings() async {
+    muted.value = await storage.getBoolean('muted') ?? false;
+    crossAxisCount.value = await storage.getInt('crossAxisCount') ?? 0;
+    drawerSwipeEnabled.value =
+        await storage.getBoolean('drawerSwipeEnabled') ?? true;
+    transitionType.value =
+        PageTransition.values[await storage.getInt('transitionType') ?? 0];
+  }
+
+  Future<void> saveSettings() async {
+    await storage.setBoolean('muted', muted.value);
+    await storage.setInt('crossAxisCount', crossAxisCount.value);
+    await storage.setBoolean('drawerSwipeEnabled', drawerSwipeEnabled.value);
+    await storage.setInt('transitionType', transitionType.value.index);
+  }
+
+  bool get isRandomEnabled => random.value == 1;
+}

lib/controller/themecontroller.dart

@@ -186,7 +186,6 @@ final ThemeData f0ck95Theme = ThemeData(
     backgroundColor: const Color(0xFFE0E0E0),
     foregroundColor: Colors.black,
     elevation: 4,
-    centerTitle: true,
   ),
   textTheme: const TextTheme(
     bodyLarge: TextStyle(color: Colors.black),

lib/main.dart

@@ -1,43 +1,72 @@
-import 'package:f0ckapp/screens/settings_screen.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 
-import 'package:get/get.dart';
 import 'package:encrypt_shared_preferences/provider.dart';
+import 'package:get/get.dart';
 
+import 'package:f0ckapp/services/api.dart';
+import 'package:f0ckapp/controller/authcontroller.dart';
+import 'package:f0ckapp/controller/localizationcontroller.dart';
+import 'package:f0ckapp/controller/themecontroller.dart';
+import 'package:f0ckapp/screens/mediadetail.dart';
 import 'package:f0ckapp/utils/appversion.dart';
-import 'package:f0ckapp/controller/theme_controller.dart';
-import 'package:f0ckapp/controller/media_controller.dart';
-import 'package:f0ckapp/screens/detail_view.dart';
-import 'package:f0ckapp/screens/media_grid.dart';
+import 'package:f0ckapp/controller/mediacontroller.dart';
+import 'package:f0ckapp/screens/mediagrid.dart';
+import 'package:f0ckapp/screens/login.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
-  await SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
-  await EncryptedSharedPreferencesAsync.initialize('VokTnbAbemBUa2j9');
-  await AppVersion.init();
+
+  await Future.wait([
+    EncryptedSharedPreferencesAsync.initialize('VokTnbAbemBUa2j9'),
+    MyTranslations.loadTranslations(),
+    AppVersion.init(),
+  ]);
+
+  Get.put(AuthController());
+  Get.put(ApiService());
   Get.put(MediaController());
+
   final ThemeController themeController = Get.put(ThemeController());
+  final LocalizationController localizationController = Get.put(
+    LocalizationController(),
+  );
+
+  Get.addTranslations(MyTranslations.instance.keys);
+  Get.locale = localizationController.currentLocale.value;
+
+  //Locale systemLocale = WidgetsBinding.instance.platformDispatcher.locale;
 
   runApp(
     Obx(
       () => MaterialApp(
+        locale: Get.locale,
         navigatorKey: Get.key,
         theme: themeController.currentTheme.value,
         debugShowCheckedModeBanner: false,
+        initialRoute: '/',
         onGenerateRoute: (RouteSettings settings) {
-          final uri = Uri.parse(settings.name ?? '/');
+          final Uri uri = Uri.parse(settings.name ?? '/');
 
           if (uri.path == '/' || uri.pathSegments.isEmpty) {
-            return MaterialPageRoute(builder: (_) => MediaGrid());
+            return MaterialPageRoute(builder: (_) => const MediaGrid());
+          }
+
+          if (uri.path == '/login') {
+            return MaterialPageRoute(builder: (_) => LoginScreen());
           }
 
           if (uri.pathSegments.length == 1) {
-            final int id = int.parse(uri.pathSegments.first);
-            return MaterialPageRoute(builder: (_) => DetailView(initialId: id));
+            try {
+              final int id = int.parse(uri.pathSegments.first);
+              return MaterialPageRoute(
+                builder: (_) => MediaDetailScreen(initialId: id),
+              );
+            } catch (e) {
+              return MaterialPageRoute(builder: (_) => const MediaGrid());
+            }
           }
 
-          return MaterialPageRoute(builder: (_) => MediaGrid());
+          return MaterialPageRoute(builder: (_) => const MediaGrid());
         },
       ),
     ),

lib/models/feed.dart

@@ -0,0 +1,17 @@
+import 'package:f0ckapp/models/item.dart';
+
+class Feed {
+  final bool atEnd;
+  final bool atStart;
+  final List<MediaItem> items;
+
+  Feed({required this.atEnd, required this.atStart, required this.items});
+
+  factory Feed.fromJson(Map<String, dynamic> json) {
+    return Feed(
+      atEnd: json['atEnd'] ?? false,
+      atStart: json['atStart'] ?? false,
+      items: (json['items'] as List).map((e) => MediaItem.fromJson(e)).toList(),
+    );
+  }
+}

lib/models/item.dart

@@ -0,0 +1,107 @@
+class MediaItem {
+  final int id;
+  final String mime;
+  final int size;
+  final int stamp;
+  final String dest;
+  final int mode;
+  final List<Tag>? tags;
+  final List<Favorite>? favorites;
+
+  MediaItem({
+    required this.id,
+    required this.mime,
+    required this.size,
+    required this.stamp,
+    required this.dest,
+    required this.mode,
+    this.tags = const [],
+    this.favorites = const [],
+  });
+
+  String get thumbnailUrl => 'https://f0ck.me/t/$id.webp';
+  String get mediaUrl => 'https://f0ck.me/b/$dest';
+  String get coverUrl => 'https://f0ck.me/ca/$id.webp';
+  String get postUrl => 'https://f0ck.me/$id';
+
+  MediaItem copyWith({
+    int? id,
+    String? mime,
+    int? size,
+    int? stamp,
+    String? dest,
+    int? mode,
+    List<Tag>? tags,
+    List<Favorite>? favorites,
+  }) {
+    return MediaItem(
+      id: id ?? this.id,
+      mime: mime ?? this.mime,
+      size: size ?? this.size,
+      stamp: stamp ?? this.stamp,
+      dest: dest ?? this.dest,
+      mode: mode ?? this.mode,
+      tags: tags ?? this.tags,
+      favorites: favorites ?? this.favorites,
+    );
+  }
+
+  factory MediaItem.fromJson(Map<String, dynamic> json) {
+    return MediaItem(
+      id: json['id'],
+      mime: json['mime'],
+      size: json['size'],
+      stamp: json['stamp'],
+      dest: json['dest'],
+      mode: json['mode'],
+      tags:
+          (json['tags'] as List<dynamic>?)
+              ?.map((e) => Tag.fromJson(e))
+              .toList() ??
+          [],
+      favorites:
+          (json['favorites'] as List<dynamic>?)
+              ?.map((e) => Favorite.fromJson(e))
+              .toList() ??
+          [],
+    );
+  }
+}
+
+class Tag {
+  final int id;
+  final String tag;
+  final String normalized;
+
+  Tag({required this.id, required this.tag, required this.normalized});
+
+  factory Tag.fromJson(Map<String, dynamic> json) {
+    return Tag(
+      id: json['id'],
+      tag: json['tag'],
+      normalized: json['normalized'],
+    );
+  }
+}
+
+class Favorite {
+  final int userId;
+  final String username;
+  final int avatar;
+
+  Favorite({
+    required this.userId,
+    required this.username,
+    required this.avatar,
+  });
+
+  factory Favorite.fromJson(Map<String, dynamic> json) {
+    return Favorite(
+      userId: json['user_id'],
+      username: json['user'],
+      avatar: json['avatar'],
+    );
+  }
+
+  String get avatarUrl => 'https://f0ck.me/t/$avatar.webp';
+}

lib/models/media_item.dart

@@ -1,61 +0,0 @@
-class MediaItem {
-  final int id;
-  final String mime;
-  final int size;
-  final int stamp;
-  final String dest;
-  final int mode;
-  final List<Tag> tags;
-
-  MediaItem({
-    required this.id,
-    required this.mime,
-    required this.size,
-    required this.stamp,
-    required this.dest,
-    required this.mode,
-    required this.tags,
-  });
-
-  factory MediaItem.fromJson(Map<String, dynamic> json) {
-    List<Tag> parsedTags = [];
-    if (json['tags'] is List) {
-      parsedTags = (json['tags'] as List<dynamic>)
-          .map((tagJson) => Tag.fromJson(tagJson as Map<String, dynamic>))
-          .toList();
-    } else {
-      parsedTags = [];
-    }
-
-    return MediaItem(
-      id: json['id'],
-      mime: json['mime'],
-      size: json['size'],
-      stamp: json['stamp'],
-      dest: json['dest'],
-      mode: json['mode'],
-      tags: parsedTags,
-    );
-  }
-
-  String get thumbnailUrl => 'https://f0ck.me/t/$id.webp';
-  String get mediaUrl => 'https://f0ck.me/b/$dest';
-  String get coverUrl => 'https://f0ck.me/ca/$id.webp';
-  String get postUrl => 'https://f0ck.me/$id';
-}
-
-class Tag {
-  final int id;
-  final String tag;
-  final String normalized;
-
-  Tag({required this.id, required this.tag, required this.normalized});
-
-  factory Tag.fromJson(Map<String, dynamic> json) {
-    return Tag(
-      id: json['id'],
-      tag: json['tag'],
-      normalized: json['normalized'],
-    );
-  }
-}

lib/models/user.dart

@@ -0,0 +1,17 @@
+class User {
+  final int id;
+  final String username;
+  final String? avatarUrl;
+
+  User({required this.id, required this.username, this.avatarUrl});
+
+  factory User.fromJson(Map<String, dynamic> json) {
+    return User(
+      id: json['userid'],
+      username: json['user'],
+      avatarUrl: json['avatar'] != null
+          ? 'https://f0ck.me/t/${json['avatar']}.webp'
+          : null,
+    );
+  }
+}

lib/screens/detail_view.dart

@@ -1,314 +0,0 @@
-import 'dart:io';
-
-import 'package:f0ckapp/utils/animatedtransition.dart';
-import 'package:f0ckapp/utils/smartrefreshindicator.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-
-import 'package:cached_network_image/cached_network_image.dart';
-import 'package:get/get.dart';
-import 'package:flutter_cache_manager/flutter_cache_manager.dart';
-import 'package:share_plus/share_plus.dart';
-
-import 'package:f0ckapp/controller/media_controller.dart';
-import 'package:f0ckapp/models/media_item.dart';
-import 'package:f0ckapp/screens/media_grid.dart';
-import 'package:f0ckapp/screens/fullscreen_screen.dart';
-import 'package:f0ckapp/widgets/end_drawer.dart';
-import 'package:f0ckapp/widgets/video_widget.dart';
-
-class DetailView extends StatefulWidget {
-  final int initialId;
-  const DetailView({super.key, required this.initialId});
-
-  @override
-  State<DetailView> createState() => _DetailViewState();
-}
-
-class _DetailViewState extends State<DetailView> {
-  final MediaController controller = Get.find<MediaController>();
-  MediaItem? item;
-  bool isLoading = false;
-  PageController? _pageController;
-  int _currentPage = 0;
-
-  @override
-  void initState() {
-    super.initState();
-    _setupInitialView();
-
-    ever(controller.drawerSwipeEnabled, (_) {
-      setState(() {});
-    });
-  }
-
-  Future<void> _setupInitialView() async {
-    bool itemExists = controller.mediaItems.any(
-      (media) => media.id == widget.initialId,
-    );
-
-    if (!itemExists) {
-      await _initializeDetail(widget.initialId);
-    }
-    _initializePageController();
-  }
-
-  void _initializePageController() {
-    _currentPage = controller.mediaItems.indexWhere(
-      (media) => media.id == widget.initialId,
-    );
-    if (_currentPage < 0) _currentPage = 0;
-    _pageController = PageController(initialPage: _currentPage)
-      ..addListener(() {
-        setState(() => _currentPage = _pageController!.page!.round());
-      });
-    setState(() {});
-  }
-
-  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;
-    Get
-      ..closeAllSnackbars()
-      ..snackbar('hehe', message, snackPosition: SnackPosition.BOTTOM);
-  }
-
-  Future<void> _initializeDetail(int deepLinkId) async {
-    item = controller.mediaItems.firstWhereOrNull(
-      (element) => element.id == deepLinkId,
-    );
-
-    if (item == null) {
-      setState(() => isLoading = true);
-      await controller.loadMediaItems(older: deepLinkId + 50);
-      item = controller.mediaItems.firstWhereOrNull(
-        (element) => element.id == deepLinkId,
-      );
-      if (item == null) {
-        Get.offAll(() => const MediaGrid());
-      }
-      setState(() => isLoading = false);
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    if (isLoading) {
-      return Scaffold(
-        appBar: AppBar(
-          title: const Text("f0ck"),
-          leading: Navigator.canPop(context)
-              ? null
-              : IconButton(
-                  icon: const Icon(Icons.arrow_back),
-                  onPressed: () {
-                    Get.offAll(() => const MediaGrid());
-                  },
-                ),
-        ),
-        body: const Center(child: CircularProgressIndicator()),
-      );
-    }
-
-    final MediaItem currentItem = controller.mediaItems[_currentPage];
-
-    return Scaffold(
-      endDrawer: const EndDrawer(),
-      endDrawerEnableOpenDragGesture: controller.drawerSwipeEnabled.value,
-      persistentFooterButtons: controller.tag.value != null
-          ? [
-              Center(
-                child: InputChip(
-                  label: Text(controller.tag.value!),
-                  onDeleted: () {
-                    controller.setTag(null);
-                    Get.offAllNamed('/');
-                  },
-                ),
-              ),
-            ]
-          : null,
-      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: () {
-                  Get.to(
-                    FullScreenMediaView(item: currentItem),
-                    fullscreenDialog: true,
-                  );
-                },
-              ),
-              IconButton(
-                icon: const Icon(Icons.download),
-                onPressed: () async {
-                  await _downloadMedia(currentItem);
-                },
-              ),
-              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: controller.mediaItems.length,
-              itemBuilder: (context, index) {
-                final MediaItem pageItem = controller.mediaItems[index];
-                return AnimatedBuilder(
-                  animation: _pageController!,
-                  builder: (context, child) {
-                    return buildAnimatedTransition(
-                      context: context,
-                      child: child!,
-                      pageController: _pageController!,
-                      index: index,
-                      controller: controller,
-                    );
-                  },
-                  child: SmartRefreshIndicator(
-                    onRefresh: () async {
-                      _showMsg('not hehe');
-                    },
-                    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;
-                                    }
-                                    controller.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),
-                          ],
-                        ),
-                      ),
-                    ),
-                  ),
-                );
-              },
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}

lib/screens/fullscreen.dart

@@ -3,7 +3,7 @@ import 'package:flutter/services.dart';
 
 import 'package:cached_network_image/cached_network_image.dart';
 
-import 'package:f0ckapp/models/media_item.dart';
+import 'package:f0ckapp/models/item.dart';
 import 'package:f0ckapp/widgets/video_widget.dart';
 
 class FullScreenMediaView extends StatefulWidget {
@@ -50,7 +50,7 @@ class _FullScreenMediaViewState extends State<FullScreenMediaView> {
                           const Icon(Icons.error),
                     ),
                   )
-                : SizedBox.expand(
+                : Center(
                     child: VideoWidget(
                       details: widget.item,
                       isActive: true,

lib/screens/login.dart

@@ -0,0 +1,134 @@
+import 'package:flutter/material.dart';
+
+import 'package:get/get.dart';
+
+import 'package:f0ckapp/controller/authcontroller.dart';
+
+class LoginScreen extends StatefulWidget {
+  const LoginScreen({super.key});
+
+  @override
+  State<LoginScreen> createState() => _LoginScreenState();
+}
+
+class _LoginScreenState extends State<LoginScreen> {
+  final AuthController authController = Get.put(AuthController());
+  final TextEditingController usernameController = TextEditingController();
+  final TextEditingController passwordController = TextEditingController();
+
+  bool _isLoading = false;
+
+  void _showMsg(String message, {String title = ''}) {
+    Get
+      ..closeAllSnackbars()
+      ..snackbar(title, message, snackPosition: SnackPosition.BOTTOM);
+  }
+
+  @override
+  void dispose() {
+    usernameController.dispose();
+    passwordController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Center(
+        child: SingleChildScrollView(
+          padding: const EdgeInsets.all(24),
+          child: Card(
+            elevation: 8,
+            shape: RoundedRectangleBorder(
+              borderRadius: BorderRadius.circular(16),
+            ),
+            child: Padding(
+              padding: const EdgeInsets.all(24),
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  Row(
+                    children: [
+                      IconButton(
+                        icon: const Icon(Icons.arrow_back),
+                        tooltip: 'Zurück',
+                        onPressed: () => Get.back(),
+                      ),
+                      const SizedBox(width: 8),
+                      Text(
+                        'Login',
+                        style: Theme.of(context).textTheme.headlineMedium,
+                      ),
+                    ],
+                  ),
+                  const SizedBox(height: 24),
+                  TextField(
+                    controller: usernameController,
+                    decoration: const InputDecoration(
+                      labelText: 'Benutzername',
+                      prefixIcon: Icon(Icons.person),
+                      border: OutlineInputBorder(),
+                    ),
+                  ),
+                  const SizedBox(height: 16),
+                  TextField(
+                    controller: passwordController,
+                    obscureText: true,
+                    decoration: const InputDecoration(
+                      labelText: 'Passwort',
+                      prefixIcon: Icon(Icons.lock),
+                      border: OutlineInputBorder(),
+                    ),
+                  ),
+                  const SizedBox(height: 24),
+                  if (authController.error.value != null)
+                    Text(
+                      authController.error.value!,
+                      style: const TextStyle(color: Colors.red),
+                    ),
+                  SizedBox(
+                    width: double.infinity,
+                    child: ElevatedButton(
+                      onPressed: _isLoading
+                          ? null
+                          : () async {
+                              setState(() => _isLoading = true);
+                              final bool success = await authController.login(
+                                usernameController.text,
+                                passwordController.text,
+                              );
+                              setState(() => _isLoading = false);
+                              if (!success) {
+                                _showMsg(
+                                  'Login fehlgeschlagen!',
+                                  title: 'Fehler',
+                                );
+                              } else {
+                                Get.offAllNamed('/');
+                                _showMsg(
+                                  'Erfolgreich eingeloggt.',
+                                  title: 'Login',
+                                );
+                              }
+                            },
+                      child: _isLoading
+                          ? const SizedBox(
+                              width: 24,
+                              height: 24,
+                              child: CircularProgressIndicator(
+                                strokeWidth: 2,
+                                color: Colors.white,
+                              ),
+                            )
+                          : const Text('Login'),
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/screens/media_grid.dart

@@ -1,157 +0,0 @@
-import 'package:f0ckapp/utils/smartrefreshindicator.dart';
-import 'package:flutter/material.dart';
-
-import 'package:get/get.dart';
-
-import 'package:f0ckapp/utils/customsearchdelegate.dart';
-import 'package:f0ckapp/widgets/filter_bar.dart';
-import 'package:f0ckapp/widgets/end_drawer.dart';
-import 'package:f0ckapp/controller/media_controller.dart';
-import 'package:f0ckapp/widgets/media_tile.dart';
-
-class MediaGrid extends StatefulWidget {
-  const MediaGrid({super.key});
-
-  @override
-  State<MediaGrid> createState() => _MediaGridState();
-}
-
-class _MediaGridState extends State<MediaGrid> {
-  final MediaController controller = Get.find<MediaController>();
-  final ScrollController _scrollController = ScrollController();
-
-  @override
-  void initState() {
-    super.initState();
-    controller.loadMediaItems();
-
-    ever(controller.drawerSwipeEnabled, (_) {
-      setState(() {});
-    });
-
-    _scrollController.addListener(() {
-      if (_scrollController.position.extentAfter < 200 &&
-          !controller.isLoading.value) {
-        controller.loadMediaItems(
-          older: controller.mediaItems.isNotEmpty
-              ? controller.mediaItems.last.id
-              : null,
-          append: true,
-        );
-      }
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      endDrawer: EndDrawer(),
-      endDrawerEnableOpenDragGesture: controller.drawerSwipeEnabled.value,
-      body: RefreshIndicator(
-        edgeOffset: 100,
-        onRefresh: () async {
-          await controller.loadMediaItems();
-        },
-        child: CustomScrollView(
-          controller: _scrollController,
-          slivers: [
-            SliverAppBar(
-              floating: true,
-              snap: true,
-              title: GestureDetector(
-                child: Row(
-                  children: [
-                    Image.asset(
-                      'assets/images/f0ck_small.webp',
-                      fit: BoxFit.fitHeight,
-                    ),
-                    const SizedBox(width: 10),
-                    const Text('fApp', style: TextStyle(fontSize: 24)),
-                  ],
-                ),
-                onTap: () {
-                  controller.setTag(null);
-                },
-              ),
-              actions: [
-                IconButton(
-                  icon: const Icon(Icons.search),
-                  onPressed: () async {
-                    await showSearch(
-                      context: context,
-                      delegate: CustomSearchDelegate(),
-                    );
-                  },
-                ),
-                Obx(
-                  () => IconButton(
-                    icon: Icon(
-                      controller.random.value
-                          ? Icons.shuffle_on_outlined
-                          : Icons.shuffle,
-                    ),
-                    onPressed: () async {
-                      await controller.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: controller.mediaItems[index]);
-                  }, childCount: controller.mediaItems.length),
-                  gridDelegate: controller.crossAxisCount.value == 0
-                      ? const SliverGridDelegateWithMaxCrossAxisExtent(
-                          maxCrossAxisExtent: 150,
-                          crossAxisSpacing: 5,
-                          mainAxisSpacing: 5,
-                          childAspectRatio: 1,
-                        )
-                      : SliverGridDelegateWithFixedCrossAxisCount(
-                          crossAxisCount: controller.crossAxisCount.value,
-                          crossAxisSpacing: 5,
-                          mainAxisSpacing: 5,
-                          childAspectRatio: 1,
-                        ),
-                ),
-              ),
-            ),
-          ],
-        ),
-      ),
-      persistentFooterButtons: [
-        Obx(() {
-          if (controller.tag.value != null) {
-            return Center(
-              child: InputChip(
-                label: Text(controller.tag.value!),
-                onDeleted: () async {
-                  await controller.setTag(null);
-                  Get.offAllNamed('/');
-                },
-              ),
-            );
-          } else {
-            return SizedBox.shrink();
-          }
-        }),
-      ],
-      bottomNavigationBar: FilterBar(scrollController: _scrollController),
-    );
-  }
-}

lib/screens/mediadetail.dart

@@ -0,0 +1,368 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:flutter_cache_manager/file.dart';
+import 'package:flutter_cache_manager/flutter_cache_manager.dart';
+import 'package:get/get.dart';
+import 'package:share_plus/share_plus.dart';
+
+import 'package:f0ckapp/widgets/tagfooter.dart';
+import 'package:f0ckapp/utils/animatedtransition.dart';
+import 'package:f0ckapp/controller/authcontroller.dart';
+import 'package:f0ckapp/widgets/actiontag.dart';
+import 'package:f0ckapp/widgets/favoritesection.dart';
+import 'package:f0ckapp/screens/fullscreen.dart';
+import 'package:f0ckapp/widgets/end_drawer.dart';
+import 'package:f0ckapp/controller/mediacontroller.dart';
+import 'package:f0ckapp/models/item.dart';
+import 'package:f0ckapp/widgets/video_widget.dart';
+
+enum ShareAction { media, directLink, postLink }
+
+class MediaDetailScreen extends StatefulWidget {
+  final int initialId;
+  const MediaDetailScreen({super.key, required this.initialId});
+
+  @override
+  State<MediaDetailScreen> createState() => _MediaDetailScreenState();
+}
+
+class _MediaDetailScreenState extends State<MediaDetailScreen> {
+  PageController? _pageController;
+  final MediaController mediaController = Get.find<MediaController>();
+  final AuthController authController = Get.find<AuthController>();
+  final RxInt _currentIndex = 0.obs;
+  final MethodChannel _mediaSaverChannel = const MethodChannel('MediaShit');
+  final Map<int, bool> _expandedTags = {};
+
+  bool _isLoading = true;
+  bool _itemNotFound = false;
+  final Set<int> _readyItemIds = {};
+
+  final List<PopupMenuEntry<ShareAction>> _shareMenuItems = const [
+    PopupMenuItem(
+      value: ShareAction.media,
+      child: ListTile(leading: Icon(Icons.image), title: Text('Als Datei')),
+    ),
+    PopupMenuItem(
+      value: ShareAction.directLink,
+      child: ListTile(leading: Icon(Icons.link), title: Text('Link zur Datei')),
+    ),
+    PopupMenuItem(
+      value: ShareAction.postLink,
+      child: ListTile(
+        leading: Icon(Icons.article),
+        title: Text('Link zum f0ck'),
+      ),
+    ),
+  ];
+
+  @override
+  void initState() {
+    super.initState();
+    _loadInitialItem();
+  }
+
+  Future<void> _loadInitialItem() async {
+    int initialIndex = mediaController.items.indexWhere(
+      (item) => item.id == widget.initialId,
+    );
+
+    if (initialIndex < 0) {
+      await mediaController.fetchInitial(id: widget.initialId + 20);
+      initialIndex = mediaController.items.indexWhere(
+        (item) => item.id == widget.initialId,
+      );
+    }
+
+    if (initialIndex < 0) {
+      if (mounted) {
+        setState(() {
+          _itemNotFound = true;
+          _isLoading = false;
+        });
+      }
+      return;
+    }
+
+    if (mounted) {
+      _currentIndex.value = initialIndex;
+      _pageController = PageController(initialPage: initialIndex);
+      if (mediaController.items[initialIndex].mime.startsWith('image/')) {
+        _readyItemIds.add(mediaController.items[initialIndex].id);
+      }
+      setState(() => _isLoading = false);
+    }
+  }
+
+  void _showMsg(String message) {
+    if (!mounted) return;
+    Get
+      ..closeAllSnackbars()
+      ..snackbar('hehe', message, snackPosition: SnackPosition.BOTTOM);
+  }
+
+  void _onPageChanged(int idx) {
+    if (idx != _currentIndex.value) {
+      _currentIndex.value = idx;
+      final MediaItem item = mediaController.items[idx];
+      if (item.mime.startsWith('image/') && !_readyItemIds.contains(item.id)) {
+        setState(() => _readyItemIds.add(item.id));
+      }
+    }
+    if (idx >= mediaController.items.length - 2 &&
+        !mediaController.loading.value &&
+        !mediaController.atEnd.value) {
+      mediaController.fetchMore();
+    } else if (idx <= 1 &&
+        !mediaController.loading.value &&
+        !mediaController.atStart.value) {
+      mediaController.fetchNewer();
+    }
+  }
+
+  Future<void> _downloadMedia(MediaItem item) async {
+    try {
+      final File file = await DefaultCacheManager().getSingleFile(
+        item.mediaUrl,
+      );
+
+      final bool? success = await _mediaSaverChannel.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.');
+    } catch (e) {
+      _showMsg('Fehler beim Download: $e');
+    }
+  }
+
+  Future<void> _handleShareAction(ShareAction value, MediaItem item) async {
+    try {
+      if (value == ShareAction.media) {
+        final File file = await DefaultCacheManager().getSingleFile(
+          item.mediaUrl,
+        );
+        final Uint8List bytes = await file.readAsBytes();
+        final params = ShareParams(
+          files: [XFile.fromData(bytes, mimeType: item.mime)],
+        );
+        await SharePlus.instance.share(params);
+        return;
+      }
+
+      final String textToShare;
+      switch (value) {
+        case ShareAction.directLink:
+          textToShare = item.mediaUrl;
+          break;
+        case ShareAction.postLink:
+          textToShare = item.postUrl;
+          break;
+        case ShareAction.media:
+          return;
+      }
+      await SharePlus.instance.share(ShareParams(text: textToShare));
+    } catch (e) {
+      _showMsg('Fehler beim Teilen: $e');
+    }
+  }
+
+  @override
+  void dispose() {
+    _pageController?.dispose();
+    super.dispose();
+  }
+
+  Widget _buildMedia(MediaItem item, bool isActive) {
+    if (item.mime.startsWith('image/')) {
+      return CachedNetworkImage(
+        imageUrl: item.mediaUrl,
+        fit: BoxFit.contain,
+        errorWidget: (c, e, s) => const Icon(Icons.broken_image, size: 100),
+      );
+    } else if (item.mime.startsWith('video/') ||
+        item.mime.startsWith('audio/')) {
+      return VideoWidget(
+        details: item,
+        isActive: isActive,
+        onInitialized: () {
+          if (mounted && !_readyItemIds.contains(item.id)) {
+            setState(() => _readyItemIds.add(item.id));
+          }
+        },
+      );
+    } else {
+      return const Icon(Icons.help_outline, size: 100);
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (_isLoading) {
+      return Scaffold(
+        appBar: AppBar(title: Text('Lade f0ck #${widget.initialId}...')),
+        body: const Center(child: CircularProgressIndicator()),
+      );
+    }
+
+    if (_itemNotFound) {
+      return Scaffold(
+        appBar: AppBar(title: const Text('Fehler')),
+        body: const Center(child: Text('f0ck nicht gefunden.')),
+      );
+    }
+
+    return Obx(
+      () => PageView.builder(
+        controller: _pageController!,
+        itemCount: mediaController.items.length,
+        onPageChanged: _onPageChanged,
+        itemBuilder: (context, index) {
+          final MediaItem item = mediaController.items[index];
+          final bool isReady = _readyItemIds.contains(item.id);
+          final bool areTagsExpanded = _expandedTags[item.id] ?? false;
+          final List<Tag> allTags = item.tags ?? [];
+          final bool hasMoreTags = allTags.length > 5;
+          final List<Tag> tagsToShow = areTagsExpanded
+              ? allTags
+              : allTags.take(5).toList();
+
+          return Obx(
+            () => Scaffold(
+              endDrawer: EndDrawer(),
+              endDrawerEnableOpenDragGesture:
+                  mediaController.drawerSwipeEnabled.value,
+              appBar: AppBar(
+                title: Text('f0ck #${item.id}'),
+                actions: [
+                  IconButton(
+                    icon: const Icon(Icons.fullscreen),
+                    onPressed: () {
+                      Get.to(
+                        FullScreenMediaView(item: item),
+                        fullscreenDialog: true,
+                      );
+                    },
+                  ),
+                  IconButton(
+                    icon: const Icon(Icons.download),
+                    onPressed: () async {
+                      await _downloadMedia(item);
+                    },
+                  ),
+                  PopupMenuButton<ShareAction>(
+                    onSelected: (value) => _handleShareAction(value, item),
+                    itemBuilder: (context) => _shareMenuItems,
+                    icon: const Icon(Icons.share),
+                  ),
+                  Builder(
+                    builder: (context) => IconButton(
+                      icon: const Icon(Icons.menu),
+                      onPressed: () {
+                        Scaffold.of(context).openEndDrawer();
+                      },
+                    ),
+                  ),
+                ],
+              ),
+              body: Column(
+                crossAxisAlignment: CrossAxisAlignment.stretch,
+                children: [
+                  AnimatedBuilder(
+                    animation: _pageController!,
+                    builder: (context, child) {
+                      return buildAnimatedTransition(
+                        context: context,
+                        pageController: _pageController!,
+                        index: index,
+                        controller: mediaController,
+                        child: child!,
+                      );
+                    },
+                    child: Obx(
+                      () => _buildMedia(item, index == _currentIndex.value),
+                    ),
+                  ),
+                  Expanded(
+                    child: GestureDetector(
+                      onTap: () => mediaController.hideVideoControls(),
+                      behavior: HitTestBehavior.translucent,
+                      child: Visibility(
+                        visible: isReady,
+                        child: SingleChildScrollView(
+                          child: Padding(
+                            padding: const EdgeInsets.all(16.0),
+                            child: Column(
+                              crossAxisAlignment: CrossAxisAlignment.center,
+                              children: [
+                                Wrap(
+                                  spacing: 6.0,
+                                  runSpacing: 4.0,
+                                  alignment: WrapAlignment.center,
+                                  children: [
+                                    ...tagsToShow.map(
+                                      (tag) => ActionTag(
+                                        tag,
+                                        (tag.tag == 'sfw' || tag.tag == 'nsfw')
+                                            ? (onTagTap) => {}
+                                            : (onTagTap) {
+                                                mediaController.setTag(
+                                                  onTagTap,
+                                                );
+                                                Get.offAllNamed('/');
+                                              },
+                                      ),
+                                    ),
+                                  ],
+                                ),
+                                if (hasMoreTags)
+                                  TextButton(
+                                    onPressed: () {
+                                      setState(
+                                        () => _expandedTags[item.id] =
+                                            !areTagsExpanded,
+                                      );
+                                    },
+                                    child: Text(
+                                      areTagsExpanded
+                                          ? 'Weniger anzeigen'
+                                          : 'Alle ${allTags.length} Tags anzeigen',
+                                    ),
+                                  ),
+                                Obx(
+                                  () => Visibility(
+                                    visible: authController.isLoggedIn,
+                                    child: Padding(
+                                      padding: const EdgeInsets.only(top: 20.0),
+                                      child: FavoriteSection(
+                                        item: item,
+                                        index: index,
+                                      ),
+                                    ),
+                                  ),
+                                ),
+                              ],
+                            ),
+                          ),
+                        ),
+                      ),
+                    ),
+                  ),
+                  const SafeArea(child: SizedBox.shrink()),
+                ],
+              ),
+              persistentFooterButtons: mediaController.tag.value != null
+                  ? [TagFooter()]
+                  : null,
+            ),
+          );
+        },
+      ),
+    );
+  }
+}

lib/screens/mediagrid.dart

@@ -0,0 +1,185 @@
+import 'package:flutter/material.dart';
+
+import 'package:get/get.dart';
+import 'package:pullex/pullex.dart';
+
+import 'package:f0ckapp/widgets/tagfooter.dart';
+import 'package:f0ckapp/utils/customsearchdelegate.dart';
+import 'package:f0ckapp/widgets/end_drawer.dart';
+import 'package:f0ckapp/widgets/filter_bar.dart';
+import 'package:f0ckapp/widgets/media_tile.dart';
+import 'package:f0ckapp/controller/mediacontroller.dart';
+
+class MediaGrid extends StatefulWidget {
+  const MediaGrid({super.key});
+
+  @override
+  State<MediaGrid> createState() => _MediaGrid();
+}
+
+class _MediaGrid extends State<MediaGrid> {
+  final ScrollController _scrollController = ScrollController();
+  final MediaController _mediaController = Get.put(MediaController());
+  final PullexRefreshController _refreshController = PullexRefreshController(
+    initialRefresh: false,
+  );
+
+  late final _MediaGridAppBar _appBar;
+  late final _MediaGridBody _body;
+
+  @override
+  void initState() {
+    super.initState();
+    _mediaController.fetchInitial();
+    _appBar = _MediaGridAppBar(mediaController: _mediaController);
+    _body = _MediaGridBody(
+      refreshController: _refreshController,
+      mediaController: _mediaController,
+      scrollController: _scrollController,
+    );
+  }
+
+  @override
+  void dispose() {
+    _scrollController.dispose();
+    _refreshController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Obx(
+      () => Scaffold(
+        endDrawer: const EndDrawer(),
+        endDrawerEnableOpenDragGesture:
+            _mediaController.drawerSwipeEnabled.value,
+        bottomNavigationBar: FilterBar(scrollController: _scrollController),
+        appBar: _appBar,
+        body: _body,
+        persistentFooterButtons: _mediaController.tag.value != null
+            ? [TagFooter()]
+            : null,
+      ),
+    );
+  }
+}
+
+class _MediaGridAppBar extends StatelessWidget implements PreferredSizeWidget {
+  const _MediaGridAppBar({required this.mediaController});
+
+  final MediaController mediaController;
+
+  @override
+  Widget build(BuildContext context) {
+    return AppBar(
+      title: InkWell(
+        onTap: () {
+          mediaController.setTag(null);
+        },
+        child: Row(
+          mainAxisSize: MainAxisSize.min,
+          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(
+              mediaController.isRandomEnabled
+                  ? Icons.shuffle_on_outlined
+                  : Icons.shuffle,
+            ),
+            onPressed: mediaController.toggleRandom,
+          ),
+        ),
+        IconButton(
+          icon: const Icon(Icons.menu),
+          onPressed: () => Scaffold.of(context).openEndDrawer(),
+        ),
+      ],
+    );
+  }
+
+  @override
+  Size get preferredSize => const Size.fromHeight(kToolbarHeight);
+}
+
+class _MediaGridBody extends StatelessWidget {
+  const _MediaGridBody({
+    required this.refreshController,
+    required this.mediaController,
+    required this.scrollController,
+  });
+
+  final PullexRefreshController refreshController;
+  final MediaController mediaController;
+  final ScrollController scrollController;
+
+  @override
+  Widget build(BuildContext context) {
+    return PullexRefresh(
+      controller: refreshController,
+      enablePullDown: true,
+      enablePullUp: true,
+      header: const MaterialHeader(),
+      onRefresh: () async {
+        try {
+          await mediaController.handleRefresh();
+        } finally {
+          refreshController.refreshCompleted();
+        }
+      },
+      onLoading: () async {
+        try {
+          await mediaController.handleLoading();
+        } finally {
+          refreshController.loadComplete();
+        }
+      },
+      child: Obx(
+        () => GridView.builder(
+          addAutomaticKeepAlives: false,
+          controller: scrollController,
+          physics: const NeverScrollableScrollPhysics(),
+          shrinkWrap: true,
+          padding: const EdgeInsets.all(4),
+          itemCount: mediaController.items.length,
+          gridDelegate: mediaController.crossAxisCount.value == 0
+              ? const SliverGridDelegateWithMaxCrossAxisExtent(
+                  maxCrossAxisExtent: 150,
+                  crossAxisSpacing: 5,
+                  mainAxisSpacing: 5,
+                  childAspectRatio: 1,
+                )
+              : SliverGridDelegateWithFixedCrossAxisCount(
+                  crossAxisCount: mediaController.crossAxisCount.value,
+                  crossAxisSpacing: 5,
+                  mainAxisSpacing: 5,
+                  childAspectRatio: 1,
+                ),
+          itemBuilder: (context, index) {
+            final item = mediaController.items[index];
+            return GestureDetector(
+              key: ValueKey(item.id),
+              onTap: () => Get.toNamed('/${item.id}'),
+              child: MediaTile(item: item),
+            );
+          },
+        ),
+      ),
+    );
+  }
+}

lib/screens/settings.dart

@@ -1,10 +1,11 @@
-import 'package:f0ckapp/utils/animatedtransition.dart';
 import 'package:flutter/material.dart';
 
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 import 'package:get/get.dart';
 
-import 'package:f0ckapp/controller/media_controller.dart';
+import 'package:f0ckapp/controller/localizationcontroller.dart';
+import 'package:f0ckapp/controller/mediacontroller.dart';
+import 'package:f0ckapp/utils/animatedtransition.dart';
 
 class SettingsPage extends StatefulWidget {
   const SettingsPage({super.key});
@@ -14,7 +15,8 @@ class SettingsPage extends StatefulWidget {
 }
 
 class _SettingsPageState extends State<SettingsPage> {
-  final MediaController controller = Get.find<MediaController>();
+  final MediaController controller = Get.find();
+  final LocalizationController localizationController = Get.find();
 
   @override
   Widget build(BuildContext context) {
@@ -24,12 +26,12 @@ class _SettingsPageState extends State<SettingsPage> {
           SliverAppBar(
             floating: false,
             pinned: true,
-            title: const Text('Settings'),
+            title: Text('settings_title'.tr),
           ),
           SliverList(
             delegate: SliverChildListDelegate([
               ListTile(
-                title: const Text("Spaltenanzahl"),
+                title: Text('settings_numberofcolumns_title'.tr),
                 trailing: Obx(
                   () => DropdownButton<int>(
                     value: controller.crossAxisCount.value,
@@ -38,13 +40,18 @@ class _SettingsPageState extends State<SettingsPage> {
                     items: [0, 3, 4, 5].map((int value) {
                       return DropdownMenuItem<int>(
                         value: value,
-                        child: Text(value == 0 ? 'auto' : '$value Spalten'),
+                        child: Text(
+                          value == 0
+                              ? 'auto'
+                              : 'settings_numberofcolumns_columns'.trParams({
+                                  'count': value.toString(),
+                                }),
+                        ),
                       );
                     }).toList(),
                     onChanged: (int? newValue) async {
                       if (newValue != null) {
                         await controller.setCrossAxisCount(newValue);
-                        setState(() {});
                       }
                     },
                   ),
@@ -52,7 +59,7 @@ class _SettingsPageState extends State<SettingsPage> {
               ),
               const Divider(),
               ListTile(
-                title: const Text("Seitenwechselanimation"),
+                title: Text('settings_pageanimation_title'.tr),
                 trailing: Obx(
                   () => DropdownButton<PageTransition>(
                     value: controller.transitionType.value,
@@ -85,7 +92,6 @@ class _SettingsPageState extends State<SettingsPage> {
                     onChanged: (PageTransition? newValue) async {
                       if (newValue != null) {
                         await controller.setTransitionType(newValue);
-                        setState(() {});
                       }
                     },
                   ),
@@ -94,10 +100,8 @@ class _SettingsPageState extends State<SettingsPage> {
 
               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.",
-                ),
+                title: Text('settings_drawer_title'.tr),
+                subtitle: Text('settings_drawer_subtitle'.tr),
                 value: controller.drawerSwipeEnabled.value,
                 onChanged: (bool value) async {
                   await controller.setDrawerSwipeEnabled(value);
@@ -106,17 +110,50 @@ class _SettingsPageState extends State<SettingsPage> {
               ),
               const Divider(),
               ListTile(
-                title: Text("Cache löschen"),
+                title: Text('settings_language'.tr),
+                trailing: Obx(
+                  () => DropdownButton<Locale>(
+                    value: localizationController.currentLocale.value,
+                    dropdownColor: const Color.fromARGB(255, 43, 43, 43),
+                    iconEnabledColor: Colors.white,
+                    items: const [
+                      DropdownMenuItem<Locale>(
+                        value: Locale('en', 'US'),
+                        child: Text('English'),
+                      ),
+                      DropdownMenuItem<Locale>(
+                        value: Locale('de', 'DE'),
+                        child: Text('Deutsch'),
+                      ),
+                      DropdownMenuItem<Locale>(
+                        value: Locale('fr', 'FR'),
+                        child: Text('Français'),
+                      ),
+                      DropdownMenuItem<Locale>(
+                        value: Locale('nl', 'NL'),
+                        child: Text('Nederlands'),
+                      ),
+                    ],
+                    onChanged: (Locale? newLocale) async {
+                      if (newLocale != null) {
+                        await localizationController.changeLocale(newLocale);
+                      }
+                    },
+                  ),
+                ),
+              ),
+              const Divider(),
+              ListTile(
+                title: Text('settings_cache_title'.tr),
                 trailing: ElevatedButton(
                   onPressed: () async {
                     await DefaultCacheManager().emptyCache();
                     if (!mounted) return;
                     Get.snackbar('', 'der Cache wurde geleert.');
                   },
-                  child: const Text("Löschen"),
+                  child: Text('settings_cache_clear_button'.tr),
                 ),
               ),
-              const SizedBox(height: 20),
             ]),
           ),
         ],

lib/service/media_service.dart

@@ -1,39 +0,0 @@
-import 'package:get/get.dart';
-
-import 'package:f0ckapp/models/media_item.dart';
-
-const List<String> mediaTypes = ["alles", "image", "video", "audio"];
-const List<String> mediaModes = ["sfw", "nsfw", "untagged", "all"];
-
-class MediaService extends GetConnect {
-  Future<List<MediaItem>> fetchMediaItems({
-    required int type,
-    required int mode,
-    required int random,
-    String? tag,
-    int? older,
-  }) async {
-    final queryParameters = {
-      'type': type.toString(),
-      'mode': mode.toString(),
-      'random': random.toString(),
-      if (tag != null) 'tag': tag,
-      if (older != null) 'older': older.toString(),
-    };
-
-    try {
-      final response = await get(
-        'https://api.f0ck.me/items/get',
-        query: queryParameters,
-      );
-      if (response.status.code == 200 && response.body is List) {
-        final data = response.body as List<dynamic>;
-        return data.map((json) => MediaItem.fromJson(json)).toList();
-      } else {
-        return Future.error('Fehler beim Laden der Daten: ${response.body}');
-      }
-    } catch (e) {
-      return Future.error('Netzwerkfehler: ${e.toString()}');
-    }
-  }
-}

lib/services/api.dart

@@ -0,0 +1,89 @@
+import 'package:encrypt_shared_preferences/provider.dart';
+import 'package:get/get.dart';
+
+import 'package:f0ckapp/models/item.dart';
+import 'package:f0ckapp/models/feed.dart';
+
+class ApiService extends GetConnect {
+  final EncryptedSharedPreferencesAsync storage =
+      EncryptedSharedPreferencesAsync.getInstance();
+
+  Future<Feed> fetchItems({
+    int? older,
+    int? newer,
+    int type = 0,
+    int mode = 0,
+    int random = 0,
+    String? tag,
+  }) async {
+    String? token = await storage.getString('token');
+    final params = <String, String>{
+      'type': type.toString(),
+      'mode': mode.toString(),
+      'random': random.toString(),
+    };
+    if (older != null) params['older'] = older.toString();
+    if (newer != null) params['newer'] = newer.toString();
+    if (tag != null) params['tag'] = tag;
+
+    final Map<String, String> headers = <String, String>{};
+    if (token != null && token.isNotEmpty) {
+      headers['Authorization'] = 'Bearer $token';
+    }
+
+    final Response<dynamic> response = await get(
+      'https://api.f0ck.me/items_new/get',
+      query: params,
+      headers: headers,
+    );
+
+    if (response.status.code == 200 && response.body is Map<String, dynamic>) {
+      final Feed feed = Feed.fromJson(response.body as Map<String, dynamic>);
+      feed.items.sort((a, b) => b.id.compareTo(a.id));
+      return feed;
+    } else {
+      if (Get.isSnackbarOpen == false) {
+        Get.snackbar('Fehler', 'Fehler beim Laden der Items');
+      }
+      throw Exception('Fehler beim Laden der Items');
+    }
+  }
+
+  Future<List<Favorite>?> toggleFavorite(
+    MediaItem item,
+    bool isFavorite,
+  ) async {
+    String? token = await storage.getString('token');
+    if (token == null || token.isEmpty) return null;
+
+    final Map<String, String> headers = {
+      'Authorization': 'Bearer $token',
+      'Content-Type': 'application/json',
+    };
+
+    try {
+      Response response;
+      if (!isFavorite) {
+        response = await put(
+          'https://api.f0ck.me/favorites/${item.id}',
+          null,
+          headers: headers,
+        );
+      } else {
+        response = await delete(
+          'https://api.f0ck.me/favorites/${item.id}',
+          headers: headers,
+        );
+      }
+      if (response.status.code == 200 && response.body is List) {
+        return (response.body as List)
+            .map((json) => Favorite.fromJson(json))
+            .toList();
+      } else {
+        return null;
+      }
+    } catch (e) {
+      return null;
+    }
+  }
+}

lib/utils/animatedtransition.dart

@@ -1,65 +1,50 @@
 import 'package:flutter/material.dart';
 
-import 'package:f0ckapp/controller/media_controller.dart';
+import 'package:f0ckapp/controller/mediacontroller.dart';
 
 enum PageTransition { opacity, scale, slide, rotate, flip }
 
 Widget buildAnimatedTransition({
-    required BuildContext context,
-    required Widget child,
-    required PageController pageController,
-    required int index,
-    required MediaController controller,
-  }) {
-    final double value = pageController.position.haveDimensions
-        ? pageController.page! - index
-        : 0;
+  required BuildContext context,
+  required Widget child,
+  required PageController pageController,
+  required int index,
+  required MediaController controller,
+}) {
+  final double value = pageController.position.haveDimensions
+      ? pageController.page! - index
+      : 0;
 
-    switch (controller.transitionType.value) {
-      case PageTransition.opacity:
-        return Opacity(
-          opacity: Curves.easeOut.transform(1 - value.abs().clamp(0.0, 500.0)),
-          child: Transform(transform: Matrix4.identity(), child: child),
-        );
-      case PageTransition.scale:
-        return Transform.scale(
-          scale:
-              0.8 +
-              Curves.easeOut.transform(1 - value.abs().clamp(0.0, 1.0)) * 0.2,
-          child: child,
-        );
-      case PageTransition.slide:
-        return Transform.translate(
-          offset: Offset(300 * value.abs(), 0),
-          child: child,
-        );
-      case PageTransition.rotate:
-        return Opacity(
-          opacity: (1 - value.abs()).clamp(0.0, 1.0),
-          child: Transform.rotate(angle: value.abs() * 0.5, child: child),
-        );
-      case PageTransition.flip:
-        return Transform(
-          transform: Matrix4.identity()
-            ..setEntry(3, 2, 0.001)
-            ..rotateY(value.abs()),
-          alignment: Alignment.center,
-          child: child,
-        );
-    }
-    /*int blah = 1;
-
-    if (blah == 0) {
+  switch (controller.transitionType.value) {
+    case PageTransition.opacity:
       return Opacity(
-        opacity: Curves.easeOut.transform(1 - value.abs().clamp(0.0, 500.0)),
+        opacity: Curves.easeOut.transform(1 - value.abs().clamp(0.0, 1.0)),
         child: Transform(transform: Matrix4.identity(), child: child),
       );
-    } else {
+    case PageTransition.scale:
       return Transform.scale(
         scale:
             0.8 +
             Curves.easeOut.transform(1 - value.abs().clamp(0.0, 1.0)) * 0.2,
         child: child,
       );
-    }*/
-  }
+    case PageTransition.slide:
+      return Transform.translate(
+        offset: Offset(300 * value.abs(), 0),
+        child: child,
+      );
+    case PageTransition.rotate:
+      return Opacity(
+        opacity: (1 - value.abs()).clamp(0.0, 1.0),
+        child: Transform.rotate(angle: value.abs() * 0.5, child: child),
+      );
+    case PageTransition.flip:
+      return Transform(
+        transform: Matrix4.identity()
+          ..setEntry(3, 2, 0.001)
+          ..rotateY(value.abs()),
+        alignment: Alignment.center,
+        child: child,
+      );
+  }
+}

lib/utils/customsearchdelegate.dart

@@ -1,13 +1,13 @@
 import 'dart:async';
 import 'dart:convert';
 
-import 'package:f0ckapp/controller/media_controller.dart';
 import 'package:flutter/material.dart';
 
 import 'package:get/get.dart';
 import 'package:http/http.dart' as http;
 
-import 'package:f0ckapp/models/suggestion_model.dart';
+import 'package:f0ckapp/controller/mediacontroller.dart';
+import 'package:f0ckapp/models/suggestion.dart';
 
 class CustomSearchDelegate extends SearchDelegate<String> {
   final MediaController controller = Get.find<MediaController>();
@@ -144,8 +144,8 @@ class CustomSearchDelegate extends SearchDelegate<String> {
                 'Getaggt: ${suggestion.tagged}x • Score: ${suggestion.score.toStringAsFixed(2)}',
                 style: TextStyle(fontSize: 12),
               ),
-              onTap: () async {
-                await controller.setTag(suggestion.tag);
+              onTap: () {
+                controller.setTag(suggestion.tag);
                 close(context, suggestion.tag);
               },
             );

lib/utils/smartrefreshindicator.dart

@@ -1,28 +0,0 @@
-import 'package:flutter/material.dart';
-
-class SmartRefreshIndicator extends StatelessWidget {
-  final Future<void> Function() onRefresh;
-  final Widget child;
-
-  const SmartRefreshIndicator({
-    super.key,
-    required this.onRefresh,
-    required this.child,
-  });
-
-  @override
-  Widget build(context) {
-    return LayoutBuilder(
-      builder: (context, constraints) => RefreshIndicator(
-        onRefresh: onRefresh,
-        child: SingleChildScrollView(
-          physics: const AlwaysScrollableScrollPhysics(),
-          child: ConstrainedBox(
-            constraints: BoxConstraints(minHeight: constraints.maxHeight),
-            child: child,
-          ),
-        ),
-      ),
-    );
-  }
-}

lib/widgets/actiontag.dart

@@ -0,0 +1,74 @@
+import 'package:flutter/material.dart';
+
+import 'package:f0ckapp/models/item.dart';
+
+class ActionTag extends StatelessWidget {
+  final Tag tag;
+  final void Function(String tag) onTagTap;
+
+  const ActionTag(this.tag, this.onTagTap, {super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      onTap: () => onTagTap(tag.tag),
+      child:
+          ['german', 'dutch', 'ukraine', 'russia', 'belgium'].contains(tag.tag)
+          ? Stack(
+              alignment: Alignment.center,
+              children: [
+                Container(
+                  decoration: BoxDecoration(
+                    borderRadius: BorderRadius.circular(10),
+                    border: Border.all(color: Colors.white, width: 1),
+                  ),
+                  child: ClipRRect(
+                    borderRadius: BorderRadius.circular(10),
+                    child: Image.asset(
+                      'assets/images/tags/${tag.tag}.webp',
+                      height: 27,
+                      width: 60,
+                      repeat: ImageRepeat.repeat,
+                      fit: BoxFit.fill,
+                    ),
+                  ),
+                ),
+                Padding(
+                  padding: const EdgeInsets.symmetric(
+                    horizontal: 9,
+                    vertical: 6,
+                  ),
+                  child: Text(
+                    tag.tag,
+                    style: const TextStyle(
+                      fontSize: 12,
+                      color: Colors.white,
+                      fontWeight: FontWeight.w500,
+                    ),
+                  ),
+                ),
+              ],
+            )
+          : Container(
+              padding: const EdgeInsets.symmetric(horizontal: 9, vertical: 5),
+              decoration: BoxDecoration(
+                borderRadius: BorderRadius.circular(10),
+                border: Border.all(color: Colors.white, width: 1),
+                color: switch (tag.id) {
+                  1 => Colors.green,
+                  2 => Colors.red,
+                  _ => const Color(0xFF090909),
+                },
+              ),
+              child: Text(
+                tag.tag,
+                style: const TextStyle(
+                  fontSize: 12,
+                  color: Colors.white,
+                  fontWeight: FontWeight.w500,
+                ),
+              ),
+            ),
+    );
+  }
+}

lib/widgets/end_drawer.dart

@@ -1,89 +1,103 @@
-import 'package:f0ckapp/screens/settings_screen.dart';
 import 'package:flutter/material.dart';
 
 import 'package:get/get.dart';
 
-import 'package:f0ckapp/controller/theme_controller.dart';
+import 'package:f0ckapp/controller/authcontroller.dart';
+import 'package:f0ckapp/controller/themecontroller.dart';
+import 'package:f0ckapp/screens/login.dart';
+import 'package:f0ckapp/screens/settings.dart';
 import 'package:f0ckapp/utils/appversion.dart';
 
 class EndDrawer extends StatelessWidget {
   const EndDrawer({super.key});
 
-  void _showMsg(String message, BuildContext context) {
-    ScaffoldMessenger.of(context)
-      ..removeCurrentSnackBar()
-      ..showSnackBar(SnackBar(content: Text(message)));
+  void _showMsg(String message, {String title = ''}) {
+    Get
+      ..closeAllSnackbars()
+      ..snackbar(message, title, snackPosition: SnackPosition.BOTTOM);
   }
 
   @override
   Widget build(BuildContext context) {
     final ThemeController themeController = Get.find();
+    final AuthController authController = 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'),
-                      ),
-                    ],
+          Obx(() {
+            if (authController.token.value != null &&
+                authController.user.value?.avatarUrl != null) {
+              return DrawerHeader(
+                decoration: BoxDecoration(
+                  image: DecorationImage(
+                    image: NetworkImage(authController.user.value!.avatarUrl!),
+                    fit: BoxFit.cover,
+                    alignment: Alignment.topCenter,
                   ),
                 ),
-              ],
-            ),*/
+                child: null,
+              );
+            } else {
+              return DrawerHeader(
+                decoration: const BoxDecoration(
+                  image: DecorationImage(
+                    image: AssetImage('assets/images/menu.webp'),
+                    fit: BoxFit.cover,
+                    alignment: Alignment.topCenter,
+                  ),
+                ),
+                child: null,
+              );
+            }
+          }),
+          Obx(() {
+            if (authController.token.value != null) {
+              return Padding(
+                padding: const EdgeInsets.all(16.0),
+                child: Column(
+                  children: [
+                    if (authController.user.value?.username != null)
+                      Padding(
+                        padding: const EdgeInsets.symmetric(vertical: 8.0),
+                        child: Text(
+                          'Hamlo ${authController.user.value?.username}',
+                          style: const TextStyle(fontWeight: FontWeight.bold),
+                        ),
+                      ),
+                    ElevatedButton(
+                      onPressed: () async {
+                        await authController.logout();
+                        _showMsg('Erfolgreich ausgeloggt.');
+                      },
+                      child: const Text('Logout'),
+                    ),
+                  ],
+                ),
+              );
+            } else {
+              return Padding(
+                padding: const EdgeInsets.all(16.0),
+                child: Column(
+                  children: [
+                    const Text(
+                      'Du bist nicht eingeloggt.',
+                      style: TextStyle(fontWeight: FontWeight.bold),
+                    ),
+                    const SizedBox(height: 10),
+                    ElevatedButton(
+                      onPressed: () {
+                        Navigator.pop(context);
+                        Get.to(() => LoginScreen());
+                      },
+                      child: const Text('Login'),
+                    ),
+                  ],
+                ),
+              );
+            }
+          }),
           ExpansionTile(
             title: const Text('Theme'),
             children: [
@@ -121,7 +135,7 @@ class EndDrawer extends StatelessWidget {
             title: Text('v${AppVersion.version}'),
             onTap: () {
               Navigator.pop(context);
-              _showMsg('jooong lass das, hier ist nichts', context);
+              _showMsg('jooong lass das, hier ist nichts');
             },
           ),
         ],

lib/widgets/favoritesection.dart

@@ -0,0 +1,74 @@
+import 'package:flutter/material.dart';
+
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:get/get.dart';
+
+import 'package:f0ckapp/controller/authcontroller.dart';
+import 'package:f0ckapp/controller/mediacontroller.dart';
+import 'package:f0ckapp/models/item.dart';
+
+class FavoriteSection extends StatelessWidget {
+  final MediaItem item;
+  final int index;
+  final MediaController mediaController = Get.find<MediaController>();
+  final AuthController authController = Get.find<AuthController>();
+
+  FavoriteSection({super.key, required this.item, required this.index});
+
+  @override
+  Widget build(BuildContext context) {
+    final bool isFavorite =
+        item.favorites?.any((f) => f.userId == authController.user.value?.id) ??
+        false;
+
+    return Row(
+      children: [
+        Expanded(
+          child: SingleChildScrollView(
+            scrollDirection: Axis.horizontal,
+            child: Row(
+              crossAxisAlignment: CrossAxisAlignment.center,
+              children: [
+                ...(item.favorites ?? []).map((favorite) {
+                  return Container(
+                    height: 32,
+                    width: 32,
+                    margin: const EdgeInsets.only(right: 5.0),
+                    decoration: BoxDecoration(
+                      border: Border.all(
+                        color: Theme.of(context).brightness == Brightness.dark
+                            ? Colors.white
+                            : Colors.black,
+                        width: 1.0,
+                      ),
+                    ),
+                    child: CachedNetworkImage(
+                      imageUrl: favorite.avatarUrl,
+                      fit: BoxFit.cover,
+                    ),
+                  );
+                }),
+              ],
+            ),
+          ),
+        ),
+        IconButton(
+          icon: isFavorite
+              ? const Icon(Icons.favorite)
+              : const Icon(Icons.favorite_outline),
+          color: Colors.red,
+          onPressed: () async {
+            final List<Favorite>? newFavorites = await mediaController
+                .toggleFavorite(item, isFavorite);
+            if (newFavorites != null) {
+              mediaController.items[index] = item.copyWith(
+                favorites: newFavorites,
+              );
+              mediaController.items.refresh();
+            }
+          },
+        ),
+      ],
+    );
+  }
+}

lib/widgets/filter_bar.dart

@@ -2,16 +2,12 @@ import 'package:flutter/material.dart';
 
 import 'package:get/get.dart';
 
-import 'package:f0ckapp/controller/media_controller.dart';
-import 'package:f0ckapp/service/media_service.dart';
+import 'package:f0ckapp/controller/mediacontroller.dart';
 
 class FilterBar extends StatelessWidget {
   final ScrollController scrollController;
-  
-  const FilterBar({
-    super.key,
-    required this.scrollController,
-  });
+
+  const FilterBar({super.key, required this.scrollController});
 
   @override
   Widget build(BuildContext context) {
@@ -23,39 +19,43 @@ class FilterBar extends StatelessWidget {
         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);
-              }
-            },
-          )),
+          Obx(
+            () => DropdownButton<String>(
+              value: mediaTypes[c.typeIndex.value],
+              isDense: true,
+              items: mediaTypes.map((String value) {
+                return DropdownMenuItem<String>(
+                  value: value,
+                  child: Text(value),
+                );
+              }).toList(),
+              onChanged: (String? newValue) {
+                if (newValue != null) {
+                  c.setTypeIndex(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);
-              }
-            },
-          )),
+          Obx(
+            () => DropdownButton<String>(
+              value: mediaModes[c.modeIndex.value],
+              isDense: true,
+              items: mediaModes.map((String value) {
+                return DropdownMenuItem<String>(
+                  value: value,
+                  child: Text(value),
+                );
+              }).toList(),
+              onChanged: (String? newValue) {
+                if (newValue != null) {
+                  c.setModeIndex(mediaModes.indexOf(newValue));
+                  scrollController.jumpTo(0);
+                }
+              },
+            ),
+          ),
         ],
       ),
     );

lib/widgets/media_tile.dart

@@ -1,45 +1,41 @@
 import 'package:flutter/material.dart';
 
 import 'package:cached_network_image/cached_network_image.dart';
-import 'package:get/get.dart';
 
-import 'package:f0ckapp/models/media_item.dart';
+import 'package:f0ckapp/models/item.dart';
 
 class MediaTile extends StatelessWidget {
   final MediaItem item;
-
   const MediaTile({super.key, required this.item});
 
   @override
   Widget build(BuildContext context) {
-    return InkWell(
-      onTap: () {
-        Get.toNamed('/${item.id}');
-      },
-      child: Stack(
-        fit: StackFit.expand,
-        children: [
-          Hero(
-            tag: 'media-${item.id}',
-            child: CachedNetworkImage(
-              imageUrl: item.thumbnailUrl,
+    return RepaintBoundary(
+      child: InkWell(
+        child: Stack(
+          fit: StackFit.expand,
+          children: [
+            CachedNetworkImage(
+              imageUrl: 'https://f0ck.me/t/${item.id}.webp',
               fit: BoxFit.cover,
-              errorWidget: (context, url, error) => const Icon(Icons.error),
+              placeholder: (context, url) => Container(color: Colors.grey[900]),
+              errorWidget: (context, url, error) =>
+                  const Icon(Icons.broken_image),
             ),
-          ),
-          Align(
-            alignment: Alignment.bottomRight,
-            child: Icon(
-              Icons.square,
-              color: switch (item.mode) {
-                1 => Colors.green,
-                2 => Colors.red,
-                _ => Colors.yellow,
-              },
-              size: 15.0,
+            Align(
+              alignment: Alignment.bottomRight,
+              child: Icon(
+                Icons.square,
+                color: switch (item.mode) {
+                  1 => Colors.green,
+                  2 => Colors.red,
+                  _ => Colors.yellow,
+                },
+                size: 15.0,
+              ),
             ),
-          ),
-        ],
+          ],
+        ),
       ),
     );
   }

lib/widgets/tagfooter.dart

@@ -0,0 +1,30 @@
+import 'package:flutter/material.dart';
+
+import 'package:get/get.dart';
+
+import 'package:f0ckapp/controller/mediacontroller.dart';
+
+class TagFooter extends StatelessWidget {
+  final MediaController mediaController = Get.find<MediaController>();
+
+  TagFooter({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Obx(() {
+      if (mediaController.tag.value != null) {
+        return Center(
+          child: InputChip(
+            label: Text(mediaController.tag.value!),
+            onDeleted: () {
+              mediaController.setTag(null);
+              Get.offAllNamed('/');
+            },
+          ),
+        );
+      } else {
+        return const SizedBox.shrink();
+      }
+    });
+  }
+}

lib/widgets/video_controls_overlay.dart

@@ -0,0 +1,205 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+
+import 'package:cached_video_player_plus/cached_video_player_plus.dart';
+
+class VideoControlsOverlay extends StatefulWidget {
+  final CachedVideoPlayerPlusController controller;
+  final VoidCallback onOverlayTap;
+  final bool muted;
+  final VoidCallback onMuteToggle;
+
+  const VideoControlsOverlay({
+    super.key,
+    required this.controller,
+    required this.onOverlayTap,
+    required this.muted,
+    required this.onMuteToggle,
+  });
+
+  @override
+  State<VideoControlsOverlay> createState() => _VideoControlsOverlayState();
+}
+
+class _VideoControlsOverlayState extends State<VideoControlsOverlay> {
+  bool _showSeekIndicator = false;
+  bool _isRewinding = false;
+  Timer? _hideTimer;
+
+  @override
+  void dispose() {
+    _hideTimer?.cancel();
+    super.dispose();
+  }
+
+  void _handleDoubleTap(TapDownDetails details) {
+    final screenWidth = MediaQuery.of(context).size.width;
+    final isRewind = details.globalPosition.dx < screenWidth / 2;
+
+    Future(() {
+      if (isRewind) {
+        final newPosition =
+            widget.controller.value.position - const Duration(seconds: 10);
+        widget.controller.seekTo(
+          newPosition < Duration.zero ? Duration.zero : newPosition,
+        );
+      } else {
+        final newPosition =
+            widget.controller.value.position + const Duration(seconds: 10);
+        final duration = widget.controller.value.duration;
+        widget.controller.seekTo(
+          newPosition > duration ? duration : newPosition,
+        );
+      }
+    });
+
+    _hideTimer?.cancel();
+    setState(() {
+      _showSeekIndicator = true;
+      _isRewinding = isRewind;
+    });
+    _hideTimer = Timer(const Duration(milliseconds: 500), () {
+      setState(() => _showSeekIndicator = false);
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Stack(
+      alignment: Alignment.center,
+      children: [
+        GestureDetector(
+          onTap: widget.onOverlayTap,
+          onDoubleTapDown: _handleDoubleTap,
+          child: Container(color: Colors.transparent),
+        ),
+        AnimatedOpacity(
+          opacity: _showSeekIndicator ? 1.0 : 0.0,
+          duration: const Duration(milliseconds: 200),
+          child: Align(
+            alignment: _isRewinding
+                ? Alignment.centerLeft
+                : Alignment.centerRight,
+            child: Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 40.0),
+              child: Icon(
+                _isRewinding
+                    ? Icons.fast_rewind_rounded
+                    : Icons.fast_forward_rounded,
+                color: Colors.white70,
+                size: 60,
+              ),
+            ),
+          ),
+        ),
+        _ControlButton(
+          widget.controller.value.isPlaying ? Icons.pause : Icons.play_arrow,
+          () {
+            widget.onOverlayTap();
+            widget.controller.value.isPlaying
+                ? widget.controller.pause()
+                : widget.controller.play();
+          },
+          size: 64,
+        ),
+        Positioned(
+          right: 12,
+          bottom: 12,
+          child: _ControlButton(
+            widget.muted ? Icons.volume_off : Icons.volume_up,
+            () {
+              widget.onOverlayTap();
+              widget.onMuteToggle();
+            },
+            size: 16,
+          ),
+        ),
+        Align(
+          alignment: Alignment.bottomCenter,
+          child: Padding(
+            padding: const EdgeInsets.only(bottom: 0),
+            child: Stack(
+              clipBehavior: Clip.none,
+              children: [
+                Positioned(
+                  left: 10,
+                  bottom: 12,
+                  child: Text(
+                    '${_formatDuration(widget.controller.value.position)} / ${_formatDuration(widget.controller.value.duration)}',
+                    style: const TextStyle(color: Colors.white, fontSize: 12),
+                  ),
+                ),
+                Listener(
+                  onPointerDown: (_) {
+                    widget.onOverlayTap();
+                  },
+                  child: VideoProgressIndicator(
+                    widget.controller,
+                    allowScrubbing: true,
+                    padding: const EdgeInsets.only(top: 25.0),
+                    colors: const VideoProgressColors(
+                      playedColor: Colors.red,
+                      backgroundColor: Colors.grey,
+                      bufferedColor: Colors.white54,
+                    ),
+                  ),
+                ),
+                if (widget.controller.value.duration.inMilliseconds > 0)
+                  Positioned(
+                    left:
+                        (widget.controller.value.position.inMilliseconds /
+                                widget
+                                    .controller
+                                    .value
+                                    .duration
+                                    .inMilliseconds) *
+                            MediaQuery.of(context).size.width -
+                        6,
+                    bottom: -4,
+                    child: Container(
+                      width: 12,
+                      height: 12,
+                      decoration: BoxDecoration(
+                        shape: BoxShape.circle,
+                        color: Colors.red,
+                        border: Border.all(color: Colors.red, width: 2),
+                      ),
+                    ),
+                  ),
+              ],
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+
+  String _formatDuration(Duration? duration) {
+    if (duration == null) return '00:00';
+    String twoDigits(int n) => n.toString().padLeft(2, '0');
+    return "${twoDigits(duration.inMinutes % 60)}:${twoDigits(duration.inSeconds % 60)}";
+  }
+}
+
+class _ControlButton extends StatelessWidget {
+  final IconData icon;
+  final VoidCallback onPressed;
+  final double size;
+
+  const _ControlButton(this.icon, this.onPressed, {this.size = 24});
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      decoration: BoxDecoration(
+        shape: BoxShape.circle,
+        color: Colors.black.withValues(alpha: 0.4),
+      ),
+      child: IconButton(
+        icon: Icon(icon, size: size),
+        onPressed: onPressed,
+      ),
+    );
+  }
+}

lib/widgets/video_widget.dart

@@ -1,25 +1,27 @@
 import 'dart:async';
 
-import 'package:f0ckapp/controller/media_controller.dart';
-import 'package:f0ckapp/models/media_item.dart';
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:cached_video_player_plus/cached_video_player_plus.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:f0ckapp/widgets/videooverlay_widget.dart';
 import 'package:get/get.dart';
 
+import 'package:f0ckapp/models/item.dart';
+import 'package:f0ckapp/widgets/video_controls_overlay.dart';
+import 'package:f0ckapp/controller/mediacontroller.dart';
+
 class VideoWidget extends StatefulWidget {
   final MediaItem details;
   final bool isActive;
   final bool fullScreen;
+  final VoidCallback? onInitialized;
 
   const VideoWidget({
     super.key,
     required this.details,
     required this.isActive,
     this.fullScreen = false,
+    this.onInitialized,
   });
 
   @override
@@ -29,6 +31,9 @@ class VideoWidget extends StatefulWidget {
 class _VideoWidgetState extends State<VideoWidget> {
   final MediaController controller = Get.find<MediaController>();
   late CachedVideoPlayerPlusController _controller;
+  late Worker _muteWorker;
+  late Worker _timerResetWorker;
+  late Worker _hideControlsWorker;
   bool _showControls = false;
   Timer? _hideControlsTimer;
 
@@ -36,23 +41,43 @@ class _VideoWidgetState extends State<VideoWidget> {
   void initState() {
     super.initState();
     _initController();
+    _muteWorker = ever(controller.muted, (bool muted) {
+      if (_controller.value.isInitialized) {
+        _controller.setVolume(muted ? 0.0 : 1.0);
+      }
+    });
+    _timerResetWorker = ever(controller.videoControlsTimerNotifier, (_) {
+      if (widget.isActive && mounted) {
+        if (!_showControls) {
+          setState(() => _showControls = true);
+        }
+        _startHideControlsTimer();
+      }
+    });
+    _hideControlsWorker = ever(controller.hideControlsNotifier, (_) {
+      if (mounted && _showControls) {
+        setState(() => _showControls = false);
+        _hideControlsTimer?.cancel();
+      }
+    });
   }
 
   Future<void> _initController() async {
     _controller = CachedVideoPlayerPlusController.networkUrl(
       Uri.parse(widget.details.mediaUrl),
+      videoPlayerOptions: VideoPlayerOptions(mixWithOthers: true),
     );
     await _controller.initialize();
+    widget.onInitialized?.call();
+    if (!mounted) return;
     setState(() {});
-
     _controller.addListener(() => setState(() {}));
+    _controller.setLooping(true);
+    _controller.setVolume(controller.muted.value ? 0.0 : 1.0);
 
     if (widget.isActive) {
       _controller.play();
     }
-    _controller.setLooping(true);
-
-    _controller.setVolume(controller.muted.value ? 0.0 : 1.0);
   }
 
   @override
@@ -69,61 +94,69 @@ class _VideoWidgetState extends State<VideoWidget> {
 
   @override
   void dispose() {
+    _muteWorker.dispose();
+    _timerResetWorker.dispose();
+    _hideControlsWorker.dispose();
     _controller.dispose();
     _hideControlsTimer?.cancel();
     super.dispose();
   }
 
-  void _onTap({bool ctrlButton = false}) {
-    if (!ctrlButton) {
-      setState(() => _showControls = !_showControls);
-    }
-    if (_showControls) {
-      _hideControlsTimer?.cancel();
-      _hideControlsTimer = Timer(const Duration(seconds: 2), () {
+  void _startHideControlsTimer() {
+    _hideControlsTimer?.cancel();
+    _hideControlsTimer = Timer(const Duration(seconds: 3), () {
+      if (mounted) {
         setState(() => _showControls = false);
-      });
+      }
+    });
+  }
+
+  void _onTap({bool ctrlButton = false}) {
+    if (ctrlButton) {
+      _startHideControlsTimer();
+      return;
+    }
+
+    final bool newShowState = !_showControls;
+    setState(() => _showControls = newShowState);
+
+    if (newShowState) {
+      _startHideControlsTimer();
+    } else {
+      _hideControlsTimer?.cancel();
     }
   }
 
   @override
   Widget build(BuildContext context) {
     final bool muted = controller.muted.value;
-    if (_controller.value.isInitialized &&
-        _controller.value.volume != (muted ? 0.0 : 1.0)) {
-      _controller.setVolume(muted ? 0.0 : 1.0);
-    }
-
     bool isAudio = widget.details.mime.startsWith('audio');
 
-    if (widget.fullScreen) {
-      return Stack(
+    Widget mediaContent;
+    if (isAudio) {
+      mediaContent = CachedNetworkImage(
+        imageUrl: widget.details.coverUrl,
+        fit: BoxFit.cover,
+        errorWidget: (c, e, s) => Image.asset(
+          'assets/images/music.webp',
+          fit: BoxFit.contain,
+          width: double.infinity,
+        ),
+      );
+    } else {
+      mediaContent = _controller.value.isInitialized
+          ? CachedVideoPlayerPlus(_controller)
+          : const Center(child: CircularProgressIndicator());
+    }
+
+    return AspectRatio(
+      aspectRatio: _controller.value.isInitialized
+          ? _controller.value.aspectRatio
+          : (isAudio ? 16 / 9 : 9 / 16),
+      child: Stack(
+        alignment: Alignment.center,
         children: [
-          Center(
-            child: AspectRatio(
-              aspectRatio: _controller.value.isInitialized
-                  ? _controller.value.aspectRatio
-                  : 9 / 16,
-              child: 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()),
-              ),
-            ),
-          ),
+          GestureDetector(onTap: _onTap, child: mediaContent),
           if (_controller.value.isInitialized && _showControls)
             Positioned.fill(
               child: GestureDetector(
@@ -132,61 +165,17 @@ class _VideoWidgetState extends State<VideoWidget> {
                   color: Colors.black.withValues(alpha: 0.5),
                   child: VideoControlsOverlay(
                     controller: _controller,
-                    button: () => _onTap(ctrlButton: true),
+                    onOverlayTap: () => _onTap(ctrlButton: true),
+                    muted: muted,
+                    onMuteToggle: () {
+                      controller.toggleMuted();
+                    },
                   ),
                 ),
               ),
             ),
         ],
-      );
-    } 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),
-                  ),
-                ],
-              ],
-            ),
-          ),
-        ],
-      );
-    }
+      ),
+    );
   }
 }

lib/widgets/videooverlay_widget.dart

@@ -1,154 +0,0 @@
-import 'package:flutter/material.dart';
-
-import 'package:cached_video_player_plus/cached_video_player_plus.dart';
-import 'package:get/get.dart';
-
-import 'package:f0ckapp/controller/media_controller.dart';
-
-class VideoControlsOverlay extends StatelessWidget {
-  final CachedVideoPlayerPlusController controller;
-  final VoidCallback button;
-
-  const VideoControlsOverlay({
-    super.key,
-    required this.controller,
-    required this.button,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    final MediaController c = Get.find<MediaController>();
-
-    return Stack(
-      alignment: Alignment.center,
-      children: [
-        Positioned(
-          right: 12,
-          bottom: 12,
-          child: Obx(
-            () => _ControlButton(
-              c.muted.value ? Icons.volume_off : Icons.volume_up,
-              () async {
-                button();
-                await c.toggleMuted();
-              },
-              size: 16,
-            ),
-          ),
-        ),
-        Center(
-          child: Row(
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              _ControlButton(Icons.replay_10, () {
-                button();
-                Duration newPosition =
-                    controller.value.position - const Duration(seconds: 10);
-                if (newPosition < Duration.zero) newPosition = Duration.zero;
-                controller.seekTo(newPosition);
-              }),
-              SizedBox(width: 40),
-              _ControlButton(
-                controller.value.isPlaying ? Icons.pause : Icons.play_arrow,
-                () {
-                  button();
-                  controller.value.isPlaying
-                      ? controller.pause()
-                      : controller.play();
-                },
-                size: 64,
-              ),
-              SizedBox(width: 40),
-              _ControlButton(Icons.forward_10, () {
-                button();
-                Duration newPosition =
-                    controller.value.position + const Duration(seconds: 10);
-                if (newPosition > controller.value.duration) {
-                  newPosition = controller.value.duration;
-                }
-                controller.seekTo(newPosition);
-              }),
-            ],
-          ),
-        ),
-        Align(
-          alignment: Alignment.bottomCenter,
-          child: Padding(
-            padding: const EdgeInsets.only(bottom: 0),
-            child: Stack(
-              clipBehavior: Clip.none,
-              children: [
-                Positioned(
-                  left: 10,
-                  bottom: 12,
-                  child: Text(
-                    '${_formatDuration(controller.value.position)} / ${_formatDuration(controller.value.duration)}',
-                  ),
-                ),
-                Listener(
-                  onPointerDown: (_) {
-                    button();
-                  },
-                  child: VideoProgressIndicator(
-                    controller,
-                    allowScrubbing: true,
-                    padding: const EdgeInsets.only(top: 25.0),
-                    colors: const VideoProgressColors(
-                      playedColor: Colors.red,
-                      backgroundColor: Colors.grey,
-                      bufferedColor: Colors.white54,
-                    ),
-                  ),
-                ),
-                Positioned(
-                  left:
-                      (controller.value.position.inMilliseconds /
-                              controller.value.duration.inMilliseconds) *
-                          MediaQuery.of(context).size.width -
-                      6,
-                  bottom: -4,
-                  child: Container(
-                    width: 12,
-                    height: 12,
-                    decoration: BoxDecoration(
-                      shape: BoxShape.circle,
-                      color: Colors.red,
-                      border: Border.all(color: Colors.red, width: 2),
-                    ),
-                  ),
-                ),
-              ],
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-
-  String _formatDuration(Duration duration) {
-    String twoDigits(int n) => n.toString().padLeft(2, '0');
-    return "${twoDigits(duration.inMinutes % 60)}:${twoDigits(duration.inSeconds % 60)}";
-  }
-}
-
-class _ControlButton extends StatelessWidget {
-  final IconData icon;
-  final VoidCallback onPressed;
-  final double size;
-
-  const _ControlButton(this.icon, this.onPressed, {this.size = 24});
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      decoration: BoxDecoration(
-        shape: BoxShape.circle,
-        color: Colors.black.withValues(alpha: 0.4),
-      ),
-      child: IconButton(
-        icon: Icon(icon, size: size),
-        onPressed: onPressed,
-      ),
-    );
-  }
-}

pubspec.lock

@@ -199,7 +199,7 @@ packages:
     source: sdk
     version: "0.0.0"
   flutter_cache_manager:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: flutter_cache_manager
       sha256: "400b6592f16a4409a7f2bb929a9a7e38c72cceb8ffb99ee57bbf2cb2cecf8386"
@@ -448,6 +448,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.5.1"
+  pullex:
+    dependency: "direct main"
+    description:
+      name: pullex
+      sha256: f29a0b5eef4c16e32ae4b32cf6ad1a6eea0778d5bad8ee6cb29edb7d44496c1c
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.0"
   rxdart:
     dependency: transitive
     description:

pubspec.yaml

@@ -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.3.0+56
+version: 1.4.2+63
 
 environment:
   sdk: ^3.9.0-100.2.beta
@@ -31,12 +31,13 @@ dependencies:
   flutter:
     sdk: flutter
   http: ^1.4.0
-
+  get: ^4.7.2
+  encrypt_shared_preferences: ^0.9.9
   cached_network_image: ^3.4.1
   cached_video_player_plus: ^3.0.3
   share_plus: ^11.0.0
-  encrypt_shared_preferences: ^0.9.9
-  get: ^4.7.2
+  flutter_cache_manager: ^3.4.1
+  pullex: ^1.0.0
 
 dev_dependencies:
   flutter_test:
@@ -63,6 +64,8 @@ flutter:
   # To add assets to your application, add an assets section, like this:
   assets:
     - assets/images/
+    - assets/images/tags/
+    - assets/i18n/
     - pubspec.yaml
   #   - images/a_dot_burr.jpeg
   #   - images/a_dot_ham.jpeg