Icon Schmicon

- overlay buttons
- encrypted storage
- downloadbutton (wip)

android/app/build.gradle.kts

@@ -11,12 +11,12 @@ android {
     ndkVersion = flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
 
     defaultConfig {

android/app/src/main/AndroidManifest.xml

@@ -5,7 +5,6 @@
         android:label="f0ckapp"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
-        android:roundIcon="@mipmap/ic_launcher_round"
         android:enableOnBackInvokedCallback="true">
         <activity
             android:name=".MainActivity"

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

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

lib/main.dart

@@ -1,42 +1,33 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
-import 'package:f0ckapp/providers/MediaProvider.dart';
-import 'package:f0ckapp/providers/ThemeProvider.dart';
 import 'package:f0ckapp/screens/MediaGrid.dart';
 import 'package:f0ckapp/utils/AppVersion.dart';
+import 'package:f0ckapp/providers/ThemeProvider.dart';
 
-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
   await SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
   await AppVersion.init();
 
-  runApp(
+  runApp(ProviderScope(child: const F0ckApp()));
-    MultiProvider(
-      providers: [
-        ChangeNotifierProvider(create: (context) => ThemeProvider()),
-        ChangeNotifierProvider(create: (context) => MediaProvider())
-      ],
-      child: F0ckApp()
-    )
-  );
 }
 
-class F0ckApp extends StatelessWidget {
+class F0ckApp extends ConsumerWidget {
   const F0ckApp({super.key});
 
   @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
-    final themeProvider = Provider.of<ThemeProvider>(context);
+    return Consumer(
-
+      builder: (context, ref, _) {
-    return MaterialApp(
+        return MaterialApp(
-      debugShowCheckedModeBanner: false,
+          debugShowCheckedModeBanner: false,
-      theme: themeProvider.themeData,
+          theme: ref.watch(themeNotifierProvider),
-      home: Scaffold(
+          home: const MediaGrid(),
-        body: MediaGrid(),
+        );
-      ),
+      },
     );
   }
 }

lib/providers/MediaProvider.dart

@@ -1,95 +1,142 @@
-import 'package:f0ckapp/services/Api.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:flutter/material.dart';
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+
 import 'package:f0ckapp/models/MediaItem.dart';
+import 'package:f0ckapp/services/Api.dart';
 
-class MediaProvider extends ChangeNotifier {
+const List<String> mediaTypes = ["alles", "image", "video", "audio"];
-  int _typeid = 0;
+const List<String> mediaModes = ["sfw", "nsfw", "untagged", "all"];
-  int _mode = 0;
+const _unsetTag = Object();
-  bool _random = false;
-  String? _tag;
-  int _crossAxisCount = 0;
-  List<MediaItem> _mediaItems = [];
-  bool _isLoading = false;
 
-  List<String> types = ["alles", "image", "video", "audio"];
+class MediaState {
-  List<String> modes = ["sfw", "nsfw", "untagged", "all"];
+  final int typeIndex;
+  final int modeIndex;
+  final bool random;
+  final String? tag;
+  final int crossAxisCount;
+  final List<MediaItem> mediaItems;
+  final bool isLoading;
+  final bool muted;
 
-  String get type => types[_typeid];
+  const MediaState({
-  int get typeid => _typeid;
+    this.typeIndex = 0,
-  int get mode => _mode;
+    this.modeIndex = 0,
-  bool get random => _random;
+    this.random = false,
-  String? get tag => _tag;
+    this.tag,
-  int get crossAxisCount => _crossAxisCount;
+    this.crossAxisCount = 0,
-  List<MediaItem> get mediaItems => _mediaItems;
+    this.mediaItems = const [],
-  bool get isLoading => _isLoading;
+    this.isLoading = false,
-  Function get resetMedia => _resetMedia;
+    this.muted = false,
+  });
 
-  void setType(String type) {
+  MediaState replace({
-    _typeid = types.indexOf(type);
+    int? typeIndex,
-    _resetMedia();
+    int? modeIndex,
+    bool? random,
+    Object? tag = _unsetTag,
+    int? crossAxisCount,
+    List<MediaItem>? mediaItems,
+    bool? isLoading,
+    bool? muted,
+  }) {
+    return MediaState(
+      typeIndex: typeIndex ?? this.typeIndex,
+      modeIndex: modeIndex ?? this.modeIndex,
+      random: random ?? this.random,
+      tag: identical(tag, _unsetTag) ? this.tag : tag as String?,
+      crossAxisCount: crossAxisCount ?? this.crossAxisCount,
+      mediaItems: mediaItems ?? this.mediaItems,
+      isLoading: isLoading ?? this.isLoading,
+      muted: muted ?? this.muted,
+    );
+  }
+}
+
+class MediaNotifier extends StateNotifier<MediaState> {
+  final _storage = const FlutterSecureStorage(
+    aOptions: AndroidOptions(encryptedSharedPreferences: true),
+  );
+
+  MediaNotifier() : super(const MediaState()) {
+    _loadMutedState();
   }
 
-  void setMode(int mode) {
+  Future<void> _loadMutedState() async {
-    _mode = mode;
+    final storedMuted = await _storage.read(key: 'muted');
-    _resetMedia();
+    final isMuted = storedMuted == 'true';
+    state = state.replace(muted: isMuted);
+  }
+
+  Future<void> _saveMutedState() async {
+    await _storage.write(key: 'muted', value: state.muted.toString());
+  }
+
+  void setType(String type) {
+    final newIndex = mediaTypes.indexOf(type);
+    state = state.replace(typeIndex: newIndex);
+    resetMedia();
+  }
+
+  void setMode(int modeIndex) {
+    state = state.replace(modeIndex: modeIndex);
+    resetMedia();
   }
 
   void toggleRandom() {
-    _random = !_random;
+    state = state.replace(random: !state.random);
-    _resetMedia();
+    resetMedia();
   }
 
   void setTag(String? tag) {
-    _tag = tag;
+    state = state.replace(tag: tag);
-    _resetMedia();
+    resetMedia();
   }
 
-  void setCrossAxisCount(int crossAxisCount) {
+  void setCrossAxisCount(int count) {
-    _crossAxisCount = crossAxisCount;
+    state = state.replace(crossAxisCount: count);
-    notifyListeners();
   }
 
-  void setMediaItems(List<MediaItem> mediaItems) {
+  void resetMedia() {
-    if (_mediaItems != mediaItems) {
+    state = state.replace(mediaItems: []);
-      _mediaItems.clear();
-      _mediaItems.addAll(mediaItems);
-      notifyListeners();
-    }
-  }
-
-  void addMediaItems(List<MediaItem> newItems) {
-    _mediaItems.addAll(newItems);
-    notifyListeners();
-  }
-
-  void _resetMedia() {
-    _mediaItems.clear();
-    notifyListeners();
     loadMedia();
   }
 
-  Future<void> loadMedia({bool notify = true}) async {
+  void addMediaItems(List<MediaItem> newItems) {
-    if (_isLoading) return;
+    final updated = List<MediaItem>.from(state.mediaItems)..addAll(newItems);
-    _isLoading = true;
+    state = state.replace(mediaItems: updated);
-    if (notify) notifyListeners();
+  }
 
+  Future<void> loadMedia() async {
+    if (state.isLoading) return;
+
+    state = state.replace(isLoading: true);
     try {
+      final older = state.mediaItems.isNotEmpty
+          ? state.mediaItems.last.id
+          : null;
       final newMedia = await fetchMedia(
-        older: _mediaItems.isNotEmpty ? _mediaItems.last.id : null,
+        older: older,
-        type: type,
+        type: mediaTypes[state.typeIndex],
-        mode: mode,
+        mode: state.modeIndex,
-        random: random,
+        random: state.random,
-        tag: tag,
+        tag: state.tag,
       );
-
+      if (newMedia.isNotEmpty) {
-      if(_mediaItems != newMedia) {
         addMediaItems(newMedia);
-        if (notify) notifyListeners();
       }
     } catch (e) {
-      debugPrint('Fehler beim Laden der Medien: $e');
+      print('Fehler beim Laden der Medien: $e');
     } finally {
-      _isLoading = false;
+      state = state.replace(isLoading: false);
     }
   }
+
+  void toggleMute() {
+    state = state.replace(muted: !state.muted);
+    _saveMutedState();
+  }
 }
+
+final mediaProvider = StateNotifierProvider<MediaNotifier, MediaState>(
+  (ref) => MediaNotifier(),
+);

lib/providers/ThemeProvider.dart

@@ -1,132 +1,240 @@
 import 'package:flutter/material.dart';
 
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+class ThemeNotifier extends StateNotifier<ThemeData> {
+  final FlutterSecureStorage secureStorage;
+
+  ThemeNotifier({required this.secureStorage}) : super(f0ckTheme) {
+    _loadTheme();
+  }
+
+  Future<void> _loadTheme() async {
+    String? savedThemeName = await secureStorage.read(key: 'theme');
+    if (savedThemeName != null) {
+      final customTheme = themes.firstWhere(
+        (t) => t.name == savedThemeName,
+        orElse: () => CustomTheme(name: 'f0ck', theme: f0ckTheme),
+      );
+      state = customTheme.theme;
+    }
+  }
+
+  Future<void> updateTheme(String themeName) async {
+    await secureStorage.write(key: 'theme', value: themeName);
+    final newTheme = themes.firstWhere(
+      (t) => t.name == themeName,
+      orElse: () => CustomTheme(name: 'f0ck', theme: f0ckTheme),
+    );
+    state = newTheme.theme;
+  }
+}
+
+final themeNotifierProvider = StateNotifierProvider<ThemeNotifier, ThemeData>((
+  ref,
+) {
+  return ThemeNotifier(
+    secureStorage: FlutterSecureStorage(
+      aOptions: AndroidOptions(encryptedSharedPreferences: true),
+    ),
+  );
+});
+
+class CustomTheme {
+  final String name;
+  final ThemeData theme;
+
+  CustomTheme({required this.name, required this.theme});
+}
+
+final List<CustomTheme> themes = [
+  CustomTheme(name: 'f0ck', theme: f0ckTheme),
+  CustomTheme(name: 'Paper', theme: paperTheme),
+  CustomTheme(name: 'Orange', theme: orangeTheme),
+  CustomTheme(name: 'Amoled', theme: amoledTheme),
+  CustomTheme(name: 'f0ck95', theme: f0ck95Theme),
+  CustomTheme(name: 'f0ck95d', theme: f0ck95dTheme),
+];
+
 final ThemeData f0ckTheme = ThemeData(
   brightness: Brightness.dark,
-  primaryColor: Color(0xFF9FFF00),
+  primaryColor: const Color(0xFF9FFF00),
-  scaffoldBackgroundColor: Color(0xFF000000),
+  scaffoldBackgroundColor: const Color(0xFF000000),
-  colorScheme: ColorScheme.dark(
+  colorScheme: const ColorScheme.dark(
     primary: Color(0xFF9FFF00),
     secondary: Color(0xFF262626),
     surface: Color(0xFF232323),
     onPrimary: Color(0xFF000000),
-    onSecondary: Color(0xFFFFFFFF),
+    onSecondary: Colors.white,
-    onSurface: Color(0xFFFFFFFF),
+    onSurface: Colors.white,
   ),
-  appBarTheme: AppBarTheme(
+  appBarTheme: const AppBarTheme(
     backgroundColor: Color(0xFF2B2B2B),
     foregroundColor: Color(0xFF9FFF00),
     elevation: 2,
   ),
-  textTheme: TextTheme(
+  textTheme: const TextTheme(
-    bodyLarge: TextStyle(fontFamily: 'VCR', color: Color(0xFFFFFFFF)),
+    bodyLarge: TextStyle(color: Colors.white),
-    bodyMedium: TextStyle(fontFamily: 'monospace', color: Color(0xFFFFFFFF)),
+    bodyMedium: TextStyle(color: Colors.white),
   ),
   buttonTheme: ButtonThemeData(
-    buttonColor: Color(0xFF9FFF00),
+    buttonColor: const Color(0xFF9FFF00),
     textTheme: ButtonTextTheme.primary,
   ),
   scrollbarTheme: ScrollbarThemeData(
-    thumbColor: WidgetStateProperty.all(Color(0xFF2B2B2B)),
+    thumbColor: WidgetStatePropertyAll<Color>(Color(0xFF2B2B2B)),
-    trackColor: WidgetStateProperty.all(Color(0xFF424242)),
+    trackColor: WidgetStatePropertyAll<Color>(Color(0xFF424242)),
   ),
 );
 
 final ThemeData paperTheme = ThemeData(
   brightness: Brightness.light,
-  primaryColor: Color(0xFF000000),
+  primaryColor: const Color(0xFF000000),
-  scaffoldBackgroundColor: Color(0xFFFFFFFF),
+  scaffoldBackgroundColor: const Color(0xFFFFFFFF),
-  colorScheme: ColorScheme.light(
+  colorScheme: const ColorScheme.light(
     primary: Color(0xFF000000),
     secondary: Color(0xFF262626),
     surface: Color(0xFFFFFFFF),
-    onPrimary: Color(0xFFFFFFFF),
+    onPrimary: Colors.white,
-    onSecondary: Color(0xFFFFFFFF),
+    onSecondary: Colors.white,
     onSurface: Color(0xFF000000),
   ),
-  appBarTheme: AppBarTheme(
+  appBarTheme: const AppBarTheme(
     backgroundColor: Color(0xFFFFFFFF),
     foregroundColor: Color(0xFF000000),
     elevation: 0,
   ),
-  textTheme: TextTheme(
+  textTheme: const TextTheme(
-    bodyLarge: TextStyle(fontFamily: 'VCR', color: Color(0xFF000000)),
+    bodyLarge: TextStyle(color: Color(0xFF000000)),
-    bodyMedium: TextStyle(fontFamily: 'monospace', color: Color(0xFF000000)),
+    bodyMedium: TextStyle(color: Color(0xFF000000)),
   ),
   buttonTheme: ButtonThemeData(
-    buttonColor: Color(0xFF000000),
+    buttonColor: const Color(0xFF000000),
     textTheme: ButtonTextTheme.primary,
   ),
 );
 
+final ThemeData orangeTheme = ThemeData(
+  brightness: Brightness.dark,
+  primaryColor: const Color(0xFFFF6F00),
+  scaffoldBackgroundColor: const Color(0xFF171717),
+  colorScheme: const ColorScheme.dark(
+    primary: Color(0xFFFF6F00),
+    secondary: Color(0xFF262626),
+    surface: Color(0xFF232323),
+    onPrimary: Colors.white,
+    onSecondary: Colors.white,
+    onSurface: Colors.white,
+  ),
+  appBarTheme: const AppBarTheme(
+    backgroundColor: Color(0xFF2B2B2B),
+    foregroundColor: Color(0xFFFF6F00),
+    elevation: 2,
+  ),
+  textTheme: const TextTheme(
+    bodyLarge: TextStyle(color: Colors.white),
+    bodyMedium: TextStyle(color: Colors.white),
+  ),
+  buttonTheme: ButtonThemeData(
+    buttonColor: const Color(0xFFFF6F00),
+    textTheme: ButtonTextTheme.primary,
+  ),
+  scrollbarTheme: ScrollbarThemeData(
+    thumbColor: WidgetStatePropertyAll<Color>(Color(0xFF2B2B2B)),
+    trackColor: WidgetStatePropertyAll<Color>(Color(0xFF424242)),
+  ),
+);
+
+final ThemeData amoledTheme = ThemeData(
+  brightness: Brightness.dark,
+  primaryColor: const Color(0xFFFFFFFF),
+  scaffoldBackgroundColor: const Color(0xFF000000),
+  canvasColor: const Color(0xFF000000),
+  cardColor: const Color(0xFF000000),
+  colorScheme: const ColorScheme.dark(
+    primary: Color(0xFFFFFFFF),
+    secondary: Color(0xFF1F1F1F),
+    surface: Color(0xFF000000),
+    onPrimary: Color(0xFF000000),
+    onSecondary: Colors.white,
+    onSurface: Colors.white,
+  ),
+  appBarTheme: const AppBarTheme(
+    backgroundColor: Color(0xFF000000),
+    foregroundColor: Colors.white,
+    elevation: 2,
+  ),
+  textTheme: const TextTheme(
+    bodyLarge: TextStyle(color: Colors.white),
+    bodyMedium: TextStyle(color: Colors.white),
+  ),
+  buttonTheme: ButtonThemeData(
+    buttonColor: const Color(0xFFFFFFFF),
+    textTheme: ButtonTextTheme.primary,
+  ),
+  scrollbarTheme: ScrollbarThemeData(
+    thumbColor: WidgetStateProperty.all<Color>(const Color(0xFF1D1C1C)),
+    trackColor: WidgetStateProperty.all<Color>(const Color(0xFF000000)),
+  ),
+);
+
 final ThemeData f0ck95Theme = ThemeData(
   brightness: Brightness.light,
-  primaryColor: Color(0xFFC0C0C0),
+  primaryColor: const Color(0xFFC0C0C0),
-  scaffoldBackgroundColor: Color(0xFF008080),
+  scaffoldBackgroundColor: const Color(0xFF008080),
-  colorScheme: ColorScheme.light(
+  colorScheme: const ColorScheme.light(
     primary: Color(0xFFC0C0C0),
     secondary: Color(0xFF808080),
     surface: Color(0xFFC0C0C0),
-    onPrimary: Color(0xFF000000),
+    onPrimary: Colors.black,
-    onSecondary: Color(0xFFFFFFFF),
+    onSecondary: Colors.white,
   ),
-  appBarTheme: AppBarTheme(
+  appBarTheme: const AppBarTheme(
     backgroundColor: Color(0xFFC0C0C0),
-    foregroundColor: Color(0xFF000000),
+    foregroundColor: Colors.black,
     elevation: 2,
   ),
-  textTheme: TextTheme(
+  textTheme: const TextTheme(
-    bodyLarge: TextStyle(fontFamily: 'VCR', color: Color(0xFF000000)),
+    bodyLarge: TextStyle(color: Colors.black),
-    bodyMedium: TextStyle(fontFamily: 'monospace', color: Color(0xFF000000)),
+    bodyMedium: TextStyle(color: Colors.black),
   ),
   buttonTheme: ButtonThemeData(
-    buttonColor: Color(0xFF000000),
+    buttonColor: Colors.black,
     textTheme: ButtonTextTheme.primary,
   ),
   scrollbarTheme: ScrollbarThemeData(
-    thumbColor: WidgetStateProperty.all(Color(0xFF2B2B2B)),
+    thumbColor: WidgetStatePropertyAll<Color>(Color(0xFF2B2B2B)),
-    trackColor: WidgetStateProperty.all(Color(0xFF424242)),
+    trackColor: WidgetStatePropertyAll<Color>(Color(0xFF424242)),
   ),
 );
 
 final ThemeData f0ck95dTheme = ThemeData(
   brightness: Brightness.dark,
-  primaryColor: Color(0xFFFFFFFF),
+  primaryColor: const Color(0xFFFFFFFF),
-  scaffoldBackgroundColor: Color(0xFF0E0F0F),
+  scaffoldBackgroundColor: const Color(0xFF0E0F0F),
-  colorScheme: ColorScheme.dark(
+  colorScheme: const ColorScheme.dark(
     primary: Color(0xFFFFFFFF),
     secondary: Color(0xFFC0C0C0),
     surface: Color(0xFF333131),
-    onPrimary: Color(0xFF000000),
+    onPrimary: Colors.black,
-    onSecondary: Color(0xFFFFFFFF),
+    onSecondary: Colors.white,
   ),
-  appBarTheme: AppBarTheme(
+  appBarTheme: const AppBarTheme(
     backgroundColor: Color(0xFF0B0A0A),
-    foregroundColor: Color(0xFFFFFFFF),
+    foregroundColor: Colors.white,
     elevation: 2,
   ),
-  textTheme: TextTheme(
+  textTheme: const TextTheme(
-    bodyLarge: TextStyle(fontFamily: 'VCR', color: Color(0xFFFFFFFF)),
+    bodyLarge: TextStyle(color: Colors.white),
-    bodyMedium: TextStyle(fontFamily: 'monospace', color: Color(0xFFFFFFFF)),
+    bodyMedium: TextStyle(color: Colors.white),
   ),
   buttonTheme: ButtonThemeData(
-    buttonColor: Color(0xFFFFFFFF),
+    buttonColor: Colors.white,
     textTheme: ButtonTextTheme.primary,
   ),
   scrollbarTheme: ScrollbarThemeData(
-    thumbColor: WidgetStateProperty.all(Color(0xFF2B2B2B)),
+    thumbColor: WidgetStatePropertyAll<Color>(Color(0xFF2B2B2B)),
-    trackColor: WidgetStateProperty.all(Color(0xFF424242)),
+    trackColor: WidgetStatePropertyAll<Color>(Color(0xFF424242)),
   ),
 );
-
-
-
-class ThemeProvider extends ChangeNotifier {
-  ThemeData _themeData = f0ck95dTheme;
-
-  ThemeData get themeData => _themeData;
-
-  /*void toggleTheme() {
-    _themeData = _themeData == lightTheme ? darkTheme : lightTheme;
-    notifyListeners();
-  }*/
-}

lib/screens/DetailView.dart

@@ -2,27 +2,28 @@ import 'dart:io';
 import 'dart:typed_data';
 
 import 'package:flutter/material.dart';
+
 import 'package:cached_network_image/cached_network_image.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_cache_manager/flutter_cache_manager.dart';
+import 'package:share_plus/share_plus.dart';
+
 import 'package:f0ckapp/models/MediaItem.dart';
-import 'package:f0ckapp/services/Api.dart';
 import 'package:f0ckapp/widgets/VideoWidget.dart';
 import 'package:f0ckapp/utils/SmartRefreshIndicator.dart';
 import 'package:f0ckapp/utils/PageTransformer.dart';
 import 'package:f0ckapp/providers/MediaProvider.dart';
-import 'package:flutter_cache_manager/flutter_cache_manager.dart';
-import 'package:share_plus/share_plus.dart';
 
-class DetailView extends StatefulWidget {
+class DetailView extends ConsumerStatefulWidget {
   final int initialItemId;
 
   const DetailView({super.key, required this.initialItemId});
 
   @override
-  State createState() => _DetailViewState();
+  ConsumerState<DetailView> createState() => _DetailViewState();
 }
 
-class _DetailViewState extends State<DetailView> {
+class _DetailViewState extends ConsumerState<DetailView> {
   late PageController _pageController;
   bool isLoading = false;
   int _currentIndex = 0;
@@ -30,15 +31,14 @@ class _DetailViewState extends State<DetailView> {
   @override
   void initState() {
     super.initState();
-    final provider = Provider.of<MediaProvider>(context, listen: false);
 
-    final initialIndex = provider.mediaItems.indexWhere(
+    final mediaState = ref.read(mediaProvider);
+    final initialIndex = mediaState.mediaItems.indexWhere(
       (item) => item.id == widget.initialItemId,
     );
-
     _pageController = PageController(initialPage: initialIndex);
-
     _currentIndex = initialIndex;
+
     _pageController.addListener(() {
       setState(() => _currentIndex = _pageController.page?.round() ?? 0);
     });
@@ -47,16 +47,15 @@ class _DetailViewState extends State<DetailView> {
   }
 
   void _preloadAdjacentMedia(int index) async {
-    final provider = Provider.of<MediaProvider>(context, listen: false);
+    final mediaState = ref.read(mediaProvider);
-    if (index + 1 < provider.mediaItems.length) {
+    if (index + 1 < mediaState.mediaItems.length) {
-      final nextUrl = provider.mediaItems[index + 1].mediaUrl;
+      final nextUrl = mediaState.mediaItems[index + 1].mediaUrl;
       if (await DefaultCacheManager().getFileFromCache(nextUrl) == null) {
         await DefaultCacheManager().downloadFile(nextUrl);
       }
     }
-
     if (index - 1 >= 0) {
-      final prevUrl = provider.mediaItems[index - 1].mediaUrl;
+      final prevUrl = mediaState.mediaItems[index - 1].mediaUrl;
       if (await DefaultCacheManager().getFileFromCache(prevUrl) == null) {
         await DefaultCacheManager().downloadFile(prevUrl);
       }
@@ -67,19 +66,8 @@ class _DetailViewState extends State<DetailView> {
     if (isLoading) return;
     setState(() => isLoading = true);
 
-    final provider = Provider.of<MediaProvider>(context, listen: false);
-
     try {
-      final newMedia = await fetchMedia(
+      await ref.read(mediaProvider.notifier).loadMedia();
-        older: provider.mediaItems.last.id,
-        type: provider.type,
-        mode: provider.mode,
-        random: provider.random,
-        tag: provider.tag,
-      );
-      if (mounted && newMedia.isNotEmpty) {
-        setState(() => provider.mediaItems.addAll(newMedia));
-      }
     } catch (e) {
       _showError("Fehler beim Laden der Medien: $e");
     } finally {
@@ -89,42 +77,63 @@ class _DetailViewState extends State<DetailView> {
 
   void _showError(String message) {
     if (!mounted) return;
-    ScaffoldMessenger.of(
+    ScaffoldMessenger.of(context)
-      context,
+      ..removeCurrentSnackBar()
-    ).showSnackBar(SnackBar(content: Text(message)));
+      ..showSnackBar(SnackBar(content: Text(message)));
+  }
+
+  @override
+  void dispose() {
+    _pageController.dispose();
+    super.dispose();
   }
 
   @override
   Widget build(BuildContext context) {
-    final provider = Provider.of<MediaProvider>(context);
+    final mediaState = ref.watch(mediaProvider);
+    final mediaNotifier = ref.read(mediaProvider.notifier);
+
+    if (mediaState.mediaItems.isEmpty) {
+      return Scaffold(
+        appBar: AppBar(),
+        body: const Center(child: CircularProgressIndicator()),
+      );
+    }
 
     return Scaffold(
       appBar: AppBar(
         centerTitle: true,
-        title: Text(
+        title: Text('f0ck #${mediaState.mediaItems[_currentIndex].id}'),
-          'f0ck #${provider.mediaItems.elementAt(_currentIndex).id.toString()}',
-        ),
         actions: [
+          IconButton(
+            icon: Icon(Icons.download),
+            onPressed: () {
+              // wip
+            },
+          ),
           PopupMenuButton<String>(
             onSelected: (value) async {
-              final item = provider.mediaItems.elementAt(_currentIndex);
+              final item = mediaState.mediaItems[_currentIndex];
               switch (value) {
                 case 'media':
                   File file = await DefaultCacheManager().getSingleFile(
                     item.mediaUrl,
                   );
                   Uint8List bytes = await file.readAsBytes();
-
                   final params = ShareParams(
                     files: [XFile.fromData(bytes, mimeType: item.mime)],
                   );
                   await SharePlus.instance.share(params);
                   break;
                 case 'direct_link':
-                  await SharePlus.instance.share(ShareParams(text: item.mediaUrl));
+                  await SharePlus.instance.share(
+                    ShareParams(text: item.mediaUrl),
+                  );
                   break;
                 case 'post_link':
-                  await SharePlus.instance.share(ShareParams(text: item.postUrl));
+                  await SharePlus.instance.share(
+                    ShareParams(text: item.postUrl),
+                  );
                   break;
               }
             },
@@ -132,26 +141,26 @@ class _DetailViewState extends State<DetailView> {
               PopupMenuItem(
                 value: 'media',
                 child: ListTile(
-                  leading: Icon(Icons.image),
+                  leading: const Icon(Icons.image),
-                  title: Text('Als Datei'),
+                  title: const Text('Als Datei'),
                 ),
               ),
               PopupMenuItem(
                 value: 'direct_link',
                 child: ListTile(
-                  leading: Icon(Icons.link),
+                  leading: const Icon(Icons.link),
-                  title: Text('Link zum Bild'),
+                  title: const Text('Link zur Datei'),
                 ),
               ),
               PopupMenuItem(
                 value: 'post_link',
                 child: ListTile(
-                  leading: Icon(Icons.article),
+                  leading: const Icon(Icons.article),
-                  title: Text('Link zum Post'),
+                  title: const Text('Link zum f0ck'),
                 ),
               ),
             ],
-            icon: Icon(Icons.share),
+            icon: const Icon(Icons.share),
           ),
         ],
       ),
@@ -159,9 +168,8 @@ class _DetailViewState extends State<DetailView> {
         children: [
           PageTransformer(
             controller: _pageController,
-            pages: provider.mediaItems.map((item) {
+            pages: mediaState.mediaItems.map((item) {
-              int itemIndex = provider.mediaItems.indexOf(item);
+              int itemIndex = mediaState.mediaItems.indexOf(item);
-
               return SafeArea(
                 child: SmartRefreshIndicator(
                   onRefresh: _loadMoreMedia,
@@ -172,16 +180,16 @@ class _DetailViewState extends State<DetailView> {
           ),
         ],
       ),
-      persistentFooterButtons: provider.tag != null
+      persistentFooterButtons: mediaState.tag != null
           ? [
-              InputChip(
+              Center(
-                label: Text(provider.tag!),
+                child: InputChip(
-                backgroundColor: const Color(0xFF090909),
+                  label: Text(mediaState.tag!),
-                labelStyle: const TextStyle(color: Colors.white),
+                  onDeleted: () {
-                onDeleted: () {
+                    mediaNotifier.setTag(null);
-                  provider.setTag(null);
+                    Navigator.pop(context);
-                  Navigator.pop(context);
+                  },
-                },
+                ),
               ),
             ]
           : null,
@@ -189,7 +197,7 @@ class _DetailViewState extends State<DetailView> {
   }
 
   Widget _buildMediaItem(MediaItem item, bool isActive) {
-    final provider = Provider.of<MediaProvider>(context);
+    final mediaNotifier = ref.read(mediaProvider.notifier);
 
     return SingleChildScrollView(
       child: Column(
@@ -198,16 +206,11 @@ class _DetailViewState extends State<DetailView> {
             CachedNetworkImage(
               imageUrl: item.mediaUrl,
               fit: BoxFit.contain,
-              placeholder: (context, url) => CircularProgressIndicator(),
+              placeholder: (context, url) => const CircularProgressIndicator(),
-              errorWidget: (context, url, error) => Icon(Icons.error),
+              errorWidget: (context, url, error) => const Icon(Icons.error),
             )
           else
             VideoWidget(details: item, isActive: isActive),
-          /*const SizedBox(height: 20),
-          Text(
-            'f0ck #${item.id.toString()}',
-            style: const TextStyle(color: Colors.white, fontSize: 18),
-          ),*/
           const SizedBox(height: 10, width: double.infinity),
           Wrap(
             alignment: WrapAlignment.center,
@@ -217,7 +220,7 @@ class _DetailViewState extends State<DetailView> {
                 onPressed: () {
                   if (tag.tag == 'sfw' || tag.tag == 'nsfw') return;
                   setState(() {
-                    provider.setTag(tag.tag);
+                    mediaNotifier.setTag(tag.tag);
                     Navigator.pop(context, true);
                   });
                 },

lib/screens/MediaGrid.dart

@@ -1,38 +1,29 @@
-import 'package:f0ckapp/services/Api.dart';
 import 'package:flutter/material.dart';
+
 import 'package:cached_network_image/cached_network_image.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
 import 'package:f0ckapp/screens/DetailView.dart';
 import 'package:f0ckapp/providers/MediaProvider.dart';
 import 'package:f0ckapp/utils/AppVersion.dart';
+import 'package:f0ckapp/providers/ThemeProvider.dart';
 
-class MediaGrid extends StatefulWidget {
+const List<String> mediaTypes = ["alles", "image", "video", "audio"];
+const List<String> mediaModes = ["sfw", "nsfw", "untagged", "all"];
+
+class MediaGrid extends ConsumerStatefulWidget {
   const MediaGrid({super.key});
 
   @override
-  State createState() => _MediaGridState();
+  ConsumerState<MediaGrid> createState() => _MediaGridState();
 }
 
-class _MediaGridState extends State<MediaGrid> {
+class _MediaGridState extends ConsumerState<MediaGrid> {
   final ScrollController _scrollController = ScrollController();
+  final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
 
-  @override
+  final TextEditingController _usernameController = TextEditingController();
-  void initState() {
+  final TextEditingController _passwordController = TextEditingController();
-    super.initState();
-
-    final provider = Provider.of<MediaProvider>(context, listen: false);
-
-    Future.microtask(() {
-      provider.loadMedia();
-    });
-
-    _scrollController.addListener(() {
-      if (_scrollController.position.pixels >=
-          _scrollController.position.maxScrollExtent - 200) {
-        provider.loadMedia(notify: false);
-      }
-    });
-  }
 
   int _calculateCrossAxisCount(BuildContext context, int defaultCount) {
     return defaultCount == 0
@@ -41,34 +32,65 @@ class _MediaGridState extends State<MediaGrid> {
   }
 
   @override
-  Widget build(BuildContext context) {
+  void initState() {
-    final provider = Provider.of<MediaProvider>(context);
+    super.initState();
-    final GlobalKey<ScaffoldState> scaffoldKey = GlobalKey<ScaffoldState>();
+    Future.microtask(() {
+      ref.read(mediaProvider.notifier).loadMedia();
+    });
+    _scrollController.addListener(() {
+      if (_scrollController.position.pixels >=
+          _scrollController.position.maxScrollExtent - 200) {
+        ref.read(mediaProvider.notifier).loadMedia();
+      }
+    });
+  }
 
-    final TextEditingController _usernameController = TextEditingController();
+  @override
-    final TextEditingController _passwordController = TextEditingController();
+  void dispose() {
+    _scrollController.dispose();
+    _usernameController.dispose();
+    _passwordController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final mediaState = ref.watch(mediaProvider);
+    final mediaNotifier = ref.read(mediaProvider.notifier);
 
     return Scaffold(
-      key: scaffoldKey,
+      key: _scaffoldKey,
       appBar: AppBar(
-        title: Image.asset(
+        title: GestureDetector(
-          'assets/images/f0ck_small.webp',
+          child: Row(
-          fit: BoxFit.fitHeight,
+            spacing: 10,
+            children: [
+              Image.asset(
+                'assets/images/f0ck_small.webp',
+                fit: BoxFit.fitHeight,
+              ),
+              Text('fApp', style: TextStyle(fontSize: 24)),
+            ],
+          ),
+          onTap: () {
+            mediaNotifier.setTag(null);
+            _scrollController.jumpTo(0);
+          },
         ),
         actions: [
           IconButton(
             icon: Icon(
-              provider.random ? Icons.shuffle_on_outlined : Icons.shuffle,
+              mediaState.random ? Icons.shuffle_on_outlined : Icons.shuffle,
             ),
             onPressed: () {
-              provider.toggleRandom();
+              mediaNotifier.toggleRandom();
               _scrollController.jumpTo(0);
             },
           ),
           IconButton(
             icon: const Icon(Icons.menu),
             onPressed: () {
-              scaffoldKey.currentState?.openEndDrawer();
+              _scaffoldKey.currentState?.openEndDrawer();
             },
           ),
         ],
@@ -78,32 +100,11 @@ class _MediaGridState extends State<MediaGrid> {
         child: Row(
           mainAxisAlignment: MainAxisAlignment.spaceAround,
           children: [
-            Text('type: '),
+            const Text('type: '),
             DropdownButton<String>(
-              // type
+              value: mediaTypes[mediaState.typeIndex],
-              value: provider.type,
               isDense: true,
-              //icon: SizedBox.shrink(),
+              items: mediaTypes.map((String value) {
-              items: provider.types.map((String value) {
-                return DropdownMenuItem<String>(
-                  value: value,
-                  child: Text(value, style: TextStyle(color: Colors.white)),
-                );
-              }).toList(),
-              onChanged: (String? newValue) {
-                if (newValue != null) {
-                  provider.setType(newValue);
-                  _scrollController.jumpTo(0);
-                }
-              },
-            ),
-            Text('mode: '),
-            DropdownButton<String>(
-              // mode
-              value: provider.modes[provider.mode],
-              isDense: true,
-              //icon: SizedBox.shrink(),
-              items: provider.modes.map((String value) {
                 return DropdownMenuItem<String>(
                   value: value,
                   child: Text(value),
@@ -111,7 +112,24 @@ class _MediaGridState extends State<MediaGrid> {
               }).toList(),
               onChanged: (String? newValue) {
                 if (newValue != null) {
-                  provider.setMode(provider.modes.indexOf(newValue));
+                  mediaNotifier.setType(newValue);
+                  _scrollController.jumpTo(0);
+                }
+              },
+            ),
+            const Text('mode: '),
+            DropdownButton<String>(
+              value: mediaModes[mediaState.modeIndex],
+              isDense: true,
+              items: mediaModes.map((String value) {
+                return DropdownMenuItem<String>(
+                  value: value,
+                  child: Text(value),
+                );
+              }).toList(),
+              onChanged: (String? newValue) {
+                if (newValue != null) {
+                  mediaNotifier.setMode(mediaModes.indexOf(newValue));
                   _scrollController.jumpTo(0);
                 }
               },
@@ -124,7 +142,7 @@ class _MediaGridState extends State<MediaGrid> {
           padding: EdgeInsets.zero,
           children: [
             DrawerHeader(
-              decoration: BoxDecoration(
+              decoration: const BoxDecoration(
                 image: DecorationImage(
                   image: AssetImage('assets/images/menu.webp'),
                   fit: BoxFit.cover,
@@ -134,140 +152,167 @@ class _MediaGridState extends State<MediaGrid> {
               child: null,
             ),
             ExpansionTile(
-              title: Text('Login'),
+              title: const Text('Login'),
               children: [
                 Padding(
-                  padding: EdgeInsets.all(16.0),
+                  padding: const EdgeInsets.all(16.0),
                   child: Column(
                     children: [
                       TextField(
                         readOnly: true,
                         controller: _usernameController,
-                        decoration: InputDecoration(labelText: 'Benutzername'),
+                        decoration: const InputDecoration(
+                          labelText: 'Benutzername',
+                        ),
                       ),
-                      SizedBox(height: 10),
+                      const SizedBox(height: 10),
                       TextField(
                         readOnly: true,
                         controller: _passwordController,
                         obscureText: true,
-                        decoration: InputDecoration(labelText: 'Passwort'),
+                        decoration: const InputDecoration(
+                          labelText: 'Passwort',
+                        ),
                       ),
-                      SizedBox(height: 20),
+                      const SizedBox(height: 20),
                       ElevatedButton(
                         onPressed: () async {
                           ScaffoldMessenger.of(context).showSnackBar(
-                            SnackBar(
+                            const SnackBar(
                               content: Text("noch nicht implementiert lol"),
                             ),
-                          );
+                            /*final success = await login(
-                          /*final success = await login(
+                              _usernameController.text,
-                            _usernameController.text,
+                              _passwordController.text,
-                            _passwordController.text,
-                          );
-
-                          if (success) {
-                            Navigator.pop(context);
-                          } else {
-                            ScaffoldMessenger.of(context).showSnackBar(
-                              SnackBar(content: Text("Login fehlgeschlagen!")),
                             );
-                          }*/
+
+                            if (success) {
+                              Navigator.pop(context);
+                            } else {
+                              ScaffoldMessenger.of(context).showSnackBar(
+                                SnackBar(content: Text("Login fehlgeschlagen!")),
+                              );
+                            }*/
+                          );
                         },
-                        child: Text('Login'),
+                        child: const Text('Login'),
                       ),
                     ],
                   ),
                 ),
               ],
             ),
+            ExpansionTile(
+              title: const Text('Theme'),
+              children: [
+                Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: 16.0),
+                  child: Column(
+                    children: themes.map((themeData) {
+                      final currentTheme = ref.watch(themeNotifierProvider);
+                      final isSelected = currentTheme == themeData.theme;
+                      return ListTile(
+                        title: Text(themeData.name),
+                        selected: isSelected,
+                        selectedTileColor: Colors.blue.withValues(alpha: 0.2),
+                        onTap: () async {
+                          await ref
+                              .read(themeNotifierProvider.notifier)
+                              .updateTheme(themeData.name);
+                        },
+                      );
+                    }).toList(),
+                  ),
+                ),
+              ],
+            ),
+
             ListTile(
               title: Text('v${AppVersion.version}'),
               onTap: () {
                 ScaffoldMessenger.of(context).showSnackBar(
-                  SnackBar(content: Text('jooong lass das, hier ist nichts')),
+                  const SnackBar(
+                    content: Text('jooong lass das, hier ist nichts'),
+                  ),
                 );
               },
             ),
           ],
         ),
       ),
-      persistentFooterButtons: provider.tag != null
+      persistentFooterButtons: mediaState.tag != null
           ? [
-              InputChip(
+              Center(
-                label: Text(provider.tag!),
+                child: InputChip(
-                backgroundColor: const Color(0xFF090909),
+                  label: Text(mediaState.tag!),
-                labelStyle: const TextStyle(color: Colors.white),
+                  onDeleted: () {
-                onDeleted: () {
+                    mediaNotifier.setTag(null);
-                  provider.setTag(null);
+                    _scrollController.jumpTo(0);
-                  _scrollController.jumpTo(0);
+                  },
-                },
+                ),
               ),
             ]
           : null,
       body: RefreshIndicator(
         onRefresh: () async {
-          await provider.resetMedia();
+          mediaNotifier.resetMedia();
           _scrollController.jumpTo(0);
         },
-        child: Consumer<MediaProvider>(
+        child: GridView.builder(
-          builder: (context, mediaProvider, child) {
+          key: const PageStorageKey('mediaGrid'),
-            return GridView.builder(
+          controller: _scrollController,
-              key: PageStorageKey('mediaGrid'),
+          gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-              controller: _scrollController,
+            crossAxisCount: _calculateCrossAxisCount(
-              gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+              context,
-                crossAxisCount: _calculateCrossAxisCount(
+              mediaState.crossAxisCount,
-                  context,
+            ),
-                  provider.crossAxisCount,
+            crossAxisSpacing: 5.0,
-                ),
+            mainAxisSpacing: 5.0,
-                crossAxisSpacing: 5.0,
+          ),
-                mainAxisSpacing: 5.0,
+          itemCount:
-              ),
+              mediaState.mediaItems.length + (mediaState.isLoading ? 1 : 0),
-              itemCount:
+          itemBuilder: (context, index) {
-                  provider.mediaItems.length + (provider.isLoading ? 1 : 0),
+            if (index >= mediaState.mediaItems.length) {
-              itemBuilder: (context, index) {
+              return const Center(child: CircularProgressIndicator());
-                if (index >= provider.mediaItems.length) {
+            }
-                  return const Center(child: CircularProgressIndicator());
+            final item = mediaState.mediaItems[index];
-                }
-                final item = provider.mediaItems[index];
 
-                return InkWell(
+            return InkWell(
-                  onTap: () async {
+              onTap: () async {
-                    bool? ret = await Navigator.push(
+                bool? ret = await Navigator.push(
-                      context,
+                  context,
-                      MaterialPageRoute(
+                  MaterialPageRoute(
-                        builder: (context) =>
+                    builder: (context) => DetailView(initialItemId: item.id),
-                            DetailView(initialItemId: item.id),
-                      ),
-                    );
-                    if (ret != null && ret) {
-                      _scrollController.jumpTo(0);
-                    }
-                  },
-                  child: Stack(
-                    fit: StackFit.expand,
-                    children: <Widget>[
-                      CachedNetworkImage(
-                        imageUrl: item.thumbnailUrl,
-                        fit: BoxFit.cover,
-                        placeholder: (context, url) => SizedBox.shrink(),
-                        errorWidget: (context, url, error) => Icon(Icons.error),
-                      ),
-                      Align(
-                        alignment: FractionalOffset.bottomRight,
-                        child: Icon(
-                          Icons.square,
-                          color: switch (item.mode) {
-                            1 => Colors.green,
-                            2 => Colors.red,
-                            _ => Colors.yellow,
-                          },
-                          size: 15.0,
-                        ),
-                      ),
-                    ],
                   ),
                 );
+                if (ret != null && ret) {
+                  _scrollController.jumpTo(0);
+                }
               },
+              child: Stack(
+                fit: StackFit.expand,
+                children: <Widget>[
+                  CachedNetworkImage(
+                    imageUrl: item.thumbnailUrl,
+                    fit: BoxFit.cover,
+                    placeholder: (context, url) => const SizedBox.shrink(),
+                    errorWidget: (context, url, error) =>
+                        const Icon(Icons.error),
+                  ),
+                  Align(
+                    alignment: Alignment.bottomRight,
+                    child: Icon(
+                      Icons.square,
+                      color: switch (item.mode) {
+                        1 => Colors.green,
+                        2 => Colors.red,
+                        _ => Colors.yellow,
+                      },
+                      size: 15.0,
+                    ),
+                  ),
+                ],
+              ),
             );
           },
         ),

lib/services/Api.dart

@@ -1,4 +1,5 @@
 import 'dart:convert';
+
 import 'package:http/http.dart' as http;
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 
@@ -48,8 +49,10 @@ Future<MediaItem> fetchMediaDetail(int itemId) async {
 }
 
 Future<bool> login(String username, String password) async {
+  final Uri url = Uri.parse('https://api.f0ck.me/login');
+
   final response = await http.post(
-    Uri.parse('https://api.f0ck.me/login'),
+    url,
     body: {'username': username, 'password': password},
   );