v1.1.3+33

lib/providers/MediaProvider.dart

@@ -1,123 +1,142 @@
-import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.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 {
-  int _typeid = 0;
-  int _mode = 0;
-  bool _random = false;
-  String? _tag;
-  int _crossAxisCount = 0;
-  List<MediaItem> _mediaItems = [];
-  bool _isLoading = false;
-  bool _muted = false;
-  final storage = FlutterSecureStorage(
-    aOptions: const AndroidOptions(encryptedSharedPreferences: true),
+const List<String> mediaTypes = ["alles", "image", "video", "audio"];
+const List<String> mediaModes = ["sfw", "nsfw", "untagged", "all"];
+const _unsetTag = Object();
+
+class MediaState {
+  final int typeIndex;
+  final int modeIndex;
+  final bool random;
+  final String? tag;
+  final int crossAxisCount;
+  final List<MediaItem> mediaItems;
+  final bool isLoading;
+  final bool muted;
+
+  const MediaState({
+    this.typeIndex = 0,
+    this.modeIndex = 0,
+    this.random = false,
+    this.tag,
+    this.crossAxisCount = 0,
+    this.mediaItems = const [],
+    this.isLoading = false,
+    this.muted = false,
+  });
+
+  MediaState replace({
+    int? typeIndex,
+    int? modeIndex,
+    bool? random,
+    Object? tag = _unsetTag,
+    int? crossAxisCount,
+    List<MediaItem>? mediaItems,
+    bool? isLoading,
+    bool? muted,
+  }) {
+    return MediaState(
+      typeIndex: typeIndex ?? this.typeIndex,
+      modeIndex: modeIndex ?? this.modeIndex,
+      random: random ?? this.random,
+      tag: identical(tag, _unsetTag) ? this.tag : tag as String?,
+      crossAxisCount: crossAxisCount ?? this.crossAxisCount,
+      mediaItems: mediaItems ?? this.mediaItems,
+      isLoading: isLoading ?? this.isLoading,
+      muted: muted ?? this.muted,
+    );
+  }
+}
+
+class MediaNotifier extends StateNotifier<MediaState> {
+  final _storage = const FlutterSecureStorage(
+    aOptions: AndroidOptions(encryptedSharedPreferences: true),
   );
 
-  List<String> types = ["alles", "image", "video", "audio"];
-  List<String> modes = ["sfw", "nsfw", "untagged", "all"];
-
-  String get type => types[_typeid];
-  int get typeid => _typeid;
-  int get mode => _mode;
-  bool get random => _random;
-  String? get tag => _tag;
-  int get crossAxisCount => _crossAxisCount;
-  List<MediaItem> get mediaItems => _mediaItems;
-  bool get isLoading => _isLoading;
-  bool get muted => _muted;
-
-  Function get resetMedia => _resetMedia;
-
-  MediaProvider() {
+  MediaNotifier() : super(const MediaState()) {
     _loadMutedState();
   }
 
-  void setType(String type) {
-    _typeid = types.indexOf(type);
-    _resetMedia();
-  }
-
-  void setMode(int mode) {
-    _mode = mode;
-    _resetMedia();
-  }
-
-  void toggleRandom() {
-    _random = !_random;
-    _resetMedia();
-  }
-
-  void setTag(String? tag) {
-    _tag = tag;
-    _resetMedia();
-  }
-
-  void setCrossAxisCount(int crossAxisCount) {
-    _crossAxisCount = crossAxisCount;
-    notifyListeners();
-  }
-
-  void setMediaItems(List<MediaItem> mediaItems) {
-    if (_mediaItems != mediaItems) {
-      _mediaItems.clear();
-      _mediaItems.addAll(mediaItems);
-      notifyListeners();
-    }
-  }
-
-  void addMediaItems(List<MediaItem> newItems) {
-    _mediaItems.addAll(newItems);
-    notifyListeners();
-  }
-
-  void _resetMedia() {
-    _mediaItems.clear();
-    notifyListeners();
-    loadMedia();
-  }
-
-  void toggleMute() {
-    _muted = !_muted;
-    _saveMutedState();
-    notifyListeners();
-  }
-
   Future<void> _loadMutedState() async {
-    _muted = (await storage.read(key: 'muted') == 'true');
-    notifyListeners();
+    final storedMuted = await _storage.read(key: 'muted');
+    final isMuted = storedMuted == 'true';
+    state = state.replace(muted: isMuted);
   }
 
   Future<void> _saveMutedState() async {
-    await storage.write(key: 'muted', value: _muted ? 'false' : 'true');
-    notifyListeners();
+    await _storage.write(key: 'muted', value: state.muted.toString());
   }
 
-  Future<void> loadMedia({bool notify = true}) async {
-    if (_isLoading) return;
-    _isLoading = true;
-    if (notify) notifyListeners();
+  void setType(String type) {
+    final newIndex = mediaTypes.indexOf(type);
+    state = state.replace(typeIndex: newIndex);
+    resetMedia();
+  }
 
+  void setMode(int modeIndex) {
+    state = state.replace(modeIndex: modeIndex);
+    resetMedia();
+  }
+
+  void toggleRandom() {
+    state = state.replace(random: !state.random);
+    resetMedia();
+  }
+
+  void setTag(String? tag) {
+    state = state.replace(tag: tag);
+    resetMedia();
+  }
+
+  void setCrossAxisCount(int count) {
+    state = state.replace(crossAxisCount: count);
+  }
+
+  void resetMedia() {
+    state = state.replace(mediaItems: []);
+    loadMedia();
+  }
+
+  void addMediaItems(List<MediaItem> newItems) {
+    final updated = List<MediaItem>.from(state.mediaItems)..addAll(newItems);
+    state = state.replace(mediaItems: updated);
+  }
+
+  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,
-        type: type,
-        mode: mode,
-        random: random,
-        tag: tag,
+        older: older,
+        type: mediaTypes[state.typeIndex],
+        mode: state.modeIndex,
+        random: state.random,
+        tag: state.tag,
       );
-
-      if (_mediaItems != newMedia) {
+      if (newMedia.isNotEmpty) {
         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(),
+);