v1.2.0+54

- screaming_possum.gif

lib/screens/detailview_screen.dart

@@ -1,66 +1,103 @@
 import 'dart:io';
 
-import 'package:f0ckapp/screens/fullscreen_screen.dart';
-import 'package:f0ckapp/widgets/end_drawer.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 
 import 'package:cached_network_image/cached_network_image.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/models/mediaitem_model.dart';
+import 'package:f0ckapp/services/api_service.dart';
+import 'package:f0ckapp/widgets/end_drawer.dart';
+import 'package:f0ckapp/screens/fullscreen_screen.dart';
 import 'package:f0ckapp/widgets/video_widget.dart';
-import 'package:f0ckapp/utils/smartrefreshindicator_util.dart';
-import 'package:f0ckapp/utils/pagetransformer_util.dart';
-import 'package:f0ckapp/providers/media_provider.dart';
 
-class DetailView extends ConsumerStatefulWidget {
+class DetailView extends StatefulWidget {
   final int initialItemId;
-
   const DetailView({super.key, required this.initialItemId});
 
   @override
-  ConsumerState<DetailView> createState() => _DetailViewState();
+  State<DetailView> createState() => _DetailViewState();
 }
 
-class _DetailViewState extends ConsumerState<DetailView> {
+class _DetailViewState extends State<DetailView> {
+  final ApiService apiService = Get.find<ApiService>();
   PageController? _pageController;
-  bool isLoading = false;
-  int _currentIndex = 0;
+  Future<void>? _loadingFuture;
+  int _currentPage = 0;
 
   @override
   void initState() {
     super.initState();
-  }
-
-  void _preloadAdjacentMedia(int index) async {
-    final mediaState = ref.read(mediaProvider);
-    for (int offset in [-1, 1]) {
-      final adjacentIndex = index + offset;
-      if (adjacentIndex >= 0 && adjacentIndex < mediaState.mediaItems.length) {
-        final url = mediaState.mediaItems[adjacentIndex].mediaUrl;
-        if (await DefaultCacheManager().getFileFromCache(url) == null) {
-          await DefaultCacheManager().downloadFile(url);
-        }
-      }
+    if (!_mediaItemExists(widget.initialItemId)) {
+      _loadingFuture = _fetchAndPreloadMedia(widget.initialItemId);
+    } else {
+      _initializePageController();
     }
   }
 
-  Future<void> _loadMoreMedia() async {
-    if (isLoading) return;
-    setState(() => isLoading = true);
+  bool _mediaItemExists(int id) {
+    return apiService.mediaItems.any((media) => media.id == id);
+  }
 
+  Future<void> _fetchAndPreloadMedia(int targetId) async {
     try {
-      await ref.read(mediaProvider.notifier).loadMedia();
+      await apiService.setTag(null);
+      await apiService.fetchMedia(id: targetId + 50, reset: false);
+      _initializePageController();
     } catch (e) {
-      _showMsg("Fehler beim Laden der Medien: $e");
-    } finally {
-      setState(() => isLoading = false);
+      _showMsg("Medien konnten nicht geladen werden");
     }
   }
 
+  void _initializePageController() {
+    _currentPage = apiService.mediaItems.indexWhere(
+      (media) => media.id == widget.initialItemId,
+    );
+    if (_currentPage < 0) {
+      _currentPage = 0;
+    }
+    _pageController = PageController(initialPage: _currentPage)
+      ..addListener(() {
+        setState(() {
+          _currentPage = _pageController!.page!.round();
+        });
+      });
+    setState(() {});
+  }
+
+  @override
+  void dispose() {
+    _pageController?.dispose();
+    super.dispose();
+  }
+
+  MediaItem? _findMediaItem() {
+    try {
+      return apiService.mediaItems.firstWhere(
+        (media) => media.id == widget.initialItemId,
+      );
+    } catch (e) {
+      return null;
+    }
+  }
+
+  Future<void> _downloadMedia(MediaItem item) async {
+    final File file = await DefaultCacheManager().getSingleFile(item.mediaUrl);
+    final MethodChannel methodChannel = const MethodChannel('MediaShit');
+
+    bool? success = await methodChannel.invokeMethod<bool>('saveFile', {
+      'filePath': file.path,
+      'fileName': item.dest,
+    });
+
+    success == true
+        ? _showMsg('${item.dest} wurde in Downloads/fApp neigespeichert.')
+        : _showMsg('${item.dest} konnte nicht heruntergeladen werden.');
+  }
+
   void _showMsg(String message) {
     if (!mounted) return;
     ScaffoldMessenger.of(context)
@@ -68,70 +105,55 @@ class _DetailViewState extends ConsumerState<DetailView> {
       ..showSnackBar(SnackBar(content: Text(message)));
   }
 
-  Future<void> _downloadMedia() async {
-    final MediaState mediaState = ref.read(mediaProvider);
-    final MediaItem currentItem = mediaState.mediaItems[_currentIndex];
-    final File file = await DefaultCacheManager().getSingleFile(
-      currentItem.mediaUrl,
-    );
-    final MethodChannel methodChannel = const MethodChannel('MediaShit');
-
-    bool? success = await methodChannel.invokeMethod<bool>('saveFile', {
-      'filePath': file.path,
-      'fileName': currentItem.dest,
-    });
-
-    success == true
-        ? _showMsg(
-            '${currentItem.dest} wurde in Downloads/fApp neigespeichert.',
-          )
-        : _showMsg('${currentItem.dest} konnte nicht heruntergeladen werden.');
-  }
-
-  @override
-  void dispose() {
-    _pageController?.dispose();
-    super.dispose();
-  }
-
   @override
   Widget build(BuildContext context) {
-    final MediaState mediaState = ref.watch(mediaProvider);
-    final int itemIndex = mediaState.mediaItems.indexWhere(
-      (item) => item.id == widget.initialItemId,
-    );
-
-    if (itemIndex == -1) {
-      Future.microtask(() {
-        ref.read(mediaProvider.notifier).loadMedia(id: widget.initialItemId + 50);
-      });
-      return Scaffold(
-        appBar: AppBar(),
-        body: const Center(child: CircularProgressIndicator()),
+    if (_loadingFuture != null) {
+      return FutureBuilder<void>(
+        future: _loadingFuture,
+        builder: (context, snapshot) {
+          if (snapshot.connectionState == ConnectionState.waiting) {
+            return Scaffold(
+              appBar: AppBar(title: const Text("Detail")),
+              body: const Center(child: CircularProgressIndicator()),
+            );
+          } else {
+            MediaItem? item = _findMediaItem();
+            if (item == null) {
+              return Scaffold(
+                appBar: AppBar(title: const Text("Detail")),
+                body: const Center(child: Text("f0ck nicht gefunden")),
+              );
+            }
+            return _buildDetail();
+          }
+        },
       );
     }
 
-    if (_pageController == null) {
-      _pageController = PageController(initialPage: itemIndex);
-      _currentIndex = itemIndex;
-      _pageController!.addListener(() {
-        setState(() => _currentIndex = _pageController!.page?.round() ?? 0);
-      });
-      _preloadAdjacentMedia(itemIndex);
+    MediaItem? existingItem = _findMediaItem();
+    if (existingItem == null) {
+      return Scaffold(
+        appBar: AppBar(title: const Text("Detail")),
+        body: const Center(child: Text("f0ck nicht gefunden")),
+      );
     }
+    return _buildDetail();
+  }
+
+  Widget _buildDetail() {
+    final MediaItem currentItem = apiService.mediaItems[_currentPage];
 
     return Scaffold(
-      endDrawer: EndDrawer(ref: ref),
+      endDrawer: const EndDrawer(),
       endDrawerEnableOpenDragGesture: false,
-      persistentFooterButtons: mediaState.tag != null
+      persistentFooterButtons: apiService.tag.value != null
           ? [
               Center(
                 child: InputChip(
-                  label: Text(mediaState.tag!),
+                  label: Text(apiService.tag.value!),
                   onDeleted: () {
-                    ref.read(mediaProvider.notifier).setTag(null);
-                    //context.push('/', extra: true);
-                    Navigator.pushNamed(context, '/');
+                    apiService.setTag(null);
+                    Get.offAllNamed('/');
                   },
                 ),
               ),
@@ -141,54 +163,53 @@ class _DetailViewState extends ConsumerState<DetailView> {
         slivers: [
           SliverAppBar(
             floating: true,
+            pinned: true,
             snap: true,
             centerTitle: true,
-            title: Text('f0ck #${mediaState.mediaItems[_currentIndex].id}'),
+            title: Text('f0ck #${currentItem.id.toString()}'),
             leading: IconButton(
               icon: const Icon(Icons.arrow_back),
-              onPressed: () {
-                Navigator.canPop(context) ? Navigator.pop(context) : Navigator.pushNamed(context, '/');
-                //context.canPop() ? context.pop() : context.go('/', extra: true);
-              },
+              onPressed: () => Get.back(),
             ),
             actions: [
               IconButton(
                 icon: const Icon(Icons.fullscreen),
                 onPressed: () {
-                  final currentItem = mediaState.mediaItems[_currentIndex];
-                  Navigator.of(context).push(
-                    MaterialPageRoute(
-                      builder: (_) => FullScreenMediaView(item: currentItem),
-                    ),
+                  Get.to(
+                    FullScreenMediaView(item: currentItem),
+                    fullscreenDialog: true,
                   );
                 },
               ),
               IconButton(
                 icon: const Icon(Icons.download),
-                onPressed: _downloadMedia,
+                onPressed: () async {
+                  await _downloadMedia(currentItem);
+                },
               ),
               PopupMenuButton<String>(
                 onSelected: (value) async {
-                  final item = mediaState.mediaItems[_currentIndex];
                   switch (value) {
                     case 'media':
                       File file = await DefaultCacheManager().getSingleFile(
-                        item.mediaUrl,
+                        currentItem.mediaUrl,
                       );
                       Uint8List bytes = await file.readAsBytes();
                       final params = ShareParams(
-                        files: [XFile.fromData(bytes, mimeType: item.mime)],
+                        files: [
+                          XFile.fromData(bytes, mimeType: currentItem.mime),
+                        ],
                       );
                       await SharePlus.instance.share(params);
                       break;
                     case 'direct_link':
                       await SharePlus.instance.share(
-                        ShareParams(text: item.mediaUrl),
+                        ShareParams(text: currentItem.mediaUrl),
                       );
                       break;
                     case 'post_link':
                       await SharePlus.instance.share(
-                        ShareParams(text: item.postUrl),
+                        ShareParams(text: currentItem.postUrl),
                       );
                       break;
                   }
@@ -228,72 +249,81 @@ class _DetailViewState extends ConsumerState<DetailView> {
               ),
             ],
           ),
-          SliverPadding(
-            padding: EdgeInsets.zero,
-            sliver: SliverFillRemaining(
-              child: PageTransformer(
-                controller: _pageController!,
-                pages: mediaState.mediaItems.map((item) {
-                  int pageIndex = mediaState.mediaItems.indexOf(item);
-                  return SafeArea(
+          SliverFillRemaining(
+            child: PageView.builder(
+              controller: _pageController,
+              itemCount: apiService.mediaItems.length,
+              itemBuilder: (context, index) {
+                final MediaItem pageItem = apiService.mediaItems[index];
+                return AnimatedBuilder(
+                  animation: _pageController!,
+                  builder: (context, child) {
+                    double value = 0;
+                    if (_pageController!.position.haveDimensions) {
+                      value = (_pageController!.page! - index).abs();
+                    }
+                    double factor = Curves.easeOut.transform(
+                      1 - value.clamp(0.0, 1.0),
+                    );
+                    double scale = 0.8 + factor * 0.2;
+                    return Transform.scale(scale: scale, child: child);
+                  },
+                  child: SafeArea(
                     top: false,
-                    child: SmartRefreshIndicator(
-                      onRefresh: _loadMoreMedia,
-                      child: _buildMediaItem(item, _currentIndex == pageIndex),
+                    child: SingleChildScrollView(
+                      child: Column(
+                        children: [
+                          if (pageItem.mime.startsWith('image'))
+                            CachedNetworkImage(
+                              imageUrl: pageItem.mediaUrl,
+                              fit: BoxFit.contain,
+                              placeholder: (context, url) => const Center(
+                                child: CircularProgressIndicator(),
+                              ),
+                              errorWidget: (context, url, error) =>
+                                  const Center(child: Icon(Icons.error)),
+                            )
+                          else
+                            VideoWidget(
+                              details: pageItem,
+                              isActive: index == _currentPage,
+                            ),
+                          const SizedBox(height: 10, width: double.infinity),
+                          Wrap(
+                            alignment: WrapAlignment.center,
+                            spacing: 5.0,
+                            children: pageItem.tags.map((tag) {
+                              return ActionChip(
+                                onPressed: () {
+                                  if (tag.tag == 'sfw' || tag.tag == 'nsfw') {
+                                    return;
+                                  }
+                                  apiService.setTag(tag.tag);
+                                  Get.offAllNamed('/');
+                                },
+                                label: Text(tag.tag),
+                                backgroundColor: switch (tag.id) {
+                                  1 => Colors.green,
+                                  2 => Colors.red,
+                                  _ => const Color(0xFF090909),
+                                },
+                                labelStyle: const TextStyle(
+                                  color: Colors.white,
+                                ),
+                              );
+                            }).toList(),
+                          ),
+                          const SizedBox(height: 20),
+                        ],
+                      ),
                     ),
-                  );
-                }).toList(),
-              ),
+                  ),
+                );
+              },
             ),
           ),
         ],
       ),
     );
   }
-
-  Widget _buildMediaItem(MediaItem item, bool isActive) {
-    final MediaNotifier mediaNotifier = ref.read(mediaProvider.notifier);
-
-    return SingleChildScrollView(
-      child: Column(
-        children: [
-          if (item.mime.startsWith('image'))
-            CachedNetworkImage(
-              imageUrl: item.mediaUrl,
-              fit: BoxFit.contain,
-              placeholder: (context, url) =>
-                  const Center(child: CircularProgressIndicator()),
-              errorWidget: (context, url, error) =>
-                  const Center(child: Icon(Icons.error)),
-            )
-          else
-            VideoWidget(details: item, isActive: isActive),
-          const SizedBox(height: 10, width: double.infinity),
-          Wrap(
-            alignment: WrapAlignment.center,
-            spacing: 5.0,
-            children: item.tags.map((tag) {
-              return ActionChip(
-                onPressed: () {
-                  if (tag.tag == 'sfw' || tag.tag == 'nsfw') return;
-                  setState(() {
-                    mediaNotifier.setTag(tag.tag);
-                    Navigator.pushReplacementNamed(context, '/');
-                  });
-                },
-                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/media_grid.dart

@@ -0,0 +1,134 @@
+import 'package:flutter/material.dart';
+
+import 'package:get/get.dart';
+
+import 'package:f0ckapp/services/api_service.dart';
+import 'package:f0ckapp/widgets/media_tile.dart';
+import 'package:f0ckapp/widgets/end_drawer.dart';
+import 'package:f0ckapp/widgets/filter_bar.dart';
+import 'package:f0ckapp/utils/customsearchdelegate_util.dart';
+
+class MediaGrid extends StatefulWidget {
+  const MediaGrid({super.key});
+
+  @override
+  State<StatefulWidget> createState() => _MediaGrid();
+}
+
+class _MediaGrid extends State<MediaGrid> {
+  final ApiService apiService = Get.find<ApiService>();
+  final ScrollController _scrollController = ScrollController();
+
+  @override
+  void initState() {
+    super.initState();
+    _scrollController.addListener(() async {
+      if (_scrollController.position.pixels >=
+          _scrollController.position.maxScrollExtent - 300) {
+        await apiService.fetchMedia();
+      }
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      endDrawer: EndDrawer(),
+      persistentFooterButtons: [
+        Obx(() {
+          if (apiService.tag.value != null) {
+            return Center(
+              child: InputChip(
+                label: Text(apiService.tag.value!),
+                onDeleted: () {
+                  apiService.setTag(null);
+                  Get.offAllNamed('/');
+                },
+              ),
+            );
+          } else {
+            return SizedBox.shrink();
+          }
+        }),
+      ],
+      body: CustomScrollView(
+        controller: _scrollController,
+        slivers: [
+          SliverAppBar(
+            floating: true,
+            snap: true,
+            title: GestureDetector(
+              onTap: () async {
+                apiService.setTag(null);
+              },
+              child: Row(
+                children: [
+                  Image.asset(
+                    'assets/images/f0ck_small.webp',
+                    fit: BoxFit.fitHeight,
+                  ),
+                  const SizedBox(width: 10),
+                  const Text('fApp', style: TextStyle(fontSize: 24)),
+                ],
+              ),
+            ),
+            actions: [
+              IconButton(
+                icon: const Icon(Icons.search),
+                onPressed: () async {
+                  await showSearch(
+                    context: context,
+                    delegate: CustomSearchDelegate(),
+                  );
+                },
+              ),
+              Obx(
+                () => IconButton(
+                  icon: Icon(
+                    apiService.random.value
+                        ? Icons.shuffle_on_outlined
+                        : Icons.shuffle,
+                  ),
+                  onPressed: () {
+                    apiService.toggleRandom();
+                  },
+                ),
+              ),
+              Builder(
+                builder: (context) {
+                  return IconButton(
+                    icon: const Icon(Icons.menu),
+                    onPressed: () {
+                      Scaffold.of(context).openEndDrawer();
+                    },
+                  );
+                },
+              ),
+            ],
+          ),
+          SliverPadding(
+            padding: EdgeInsets.zero,
+            sliver: Obx(
+              () => SliverGrid(
+                delegate: SliverChildBuilderDelegate((context, index) {
+                  return MediaTile(item: apiService.mediaItems[index]);
+                }, childCount: apiService.mediaItems.length),
+                gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent(
+                  maxCrossAxisExtent: 150,
+                  crossAxisSpacing: 5,
+                  mainAxisSpacing: 5,
+                  childAspectRatio: 1,
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+      bottomNavigationBar: FilterBar(scrollController: _scrollController),
+      floatingActionButton: FloatingActionButton(
+        onPressed: () {},
+        child: Icon(Icons.add),
+      ),
+    );
+  }
+}

lib/screens/mediagrid_screen.dart

@@ -1,162 +0,0 @@
-import 'package:flutter/material.dart';
-
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-
-import 'package:f0ckapp/providers/media_provider.dart';
-import 'package:f0ckapp/utils/customsearchdelegate_util.dart';
-import 'package:f0ckapp/widgets/media_tile.dart';
-import 'package:f0ckapp/widgets/filter_bar.dart';
-import 'package:f0ckapp/widgets/end_drawer.dart';
-
-class MediaGrid extends ConsumerStatefulWidget {
-  const MediaGrid({super.key});
-
-  @override
-  ConsumerState<MediaGrid> createState() => _MediaGridState();
-}
-
-class _MediaGridState extends ConsumerState<MediaGrid> {
-  final ScrollController _scrollController = ScrollController();
-
-  @override
-  void initState() {
-    super.initState();
-    Future.microtask(() {
-      ref.read(mediaProvider.notifier).loadMedia();
-    });
-    _scrollController.addListener(() {
-      if (_scrollController.position.pixels >=
-          _scrollController.position.maxScrollExtent - 200) {
-        ref.read(mediaProvider.notifier).loadMedia();
-      }
-    });
-  }
-
-  @override
-  void dispose() {
-    _scrollController.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final MediaState mediaState = ref.watch(mediaProvider);
-    final MediaNotifier mediaNotifier = ref.read(mediaProvider.notifier);
-
-    return Scaffold(
-      body: RefreshIndicator(
-        onRefresh: () async {
-          mediaNotifier.setTag(null);
-          _scrollController.jumpTo(0);
-          await mediaNotifier.loadMedia();
-        },
-        child: CustomScrollView(
-          controller: _scrollController,
-          slivers: [
-            SliverAppBar(
-              floating: true,
-              snap: true,
-              title: GestureDetector(
-                onTap: () {
-                  mediaNotifier.setTag(null);
-                  _scrollController.jumpTo(0);
-                },
-                child: Row(
-                  children: [
-                    Image.asset(
-                      'assets/images/f0ck_small.webp',
-                      fit: BoxFit.fitHeight,
-                    ),
-                    const SizedBox(width: 10),
-                    const Text('fApp', style: TextStyle(fontSize: 24)),
-                  ],
-                ),
-              ),
-              actions: [
-                IconButton(
-                  icon: const Icon(Icons.search),
-                  onPressed: () async {
-                    await showSearch(
-                      context: context,
-                      delegate: CustomSearchDelegate(),
-                    );
-                  },
-                ),
-                IconButton(
-                  icon: Icon(
-                    mediaState.random
-                        ? Icons.shuffle_on_outlined
-                        : Icons.shuffle,
-                  ),
-                  onPressed: () {
-                    mediaNotifier.toggleRandom();
-                    _scrollController.jumpTo(0);
-                  },
-                ),
-                Builder(
-                  builder: (context) {
-                    return IconButton(
-                      icon: const Icon(Icons.menu),
-                      onPressed: () {
-                        Scaffold.of(context).openEndDrawer();
-                      },
-                    );
-                  },
-                ),
-              ],
-            ),
-            SliverPadding(
-              padding: EdgeInsets.zero,
-              sliver: SliverGrid(
-                delegate: SliverChildBuilderDelegate(
-                  (context, index) {
-                    if (index >= mediaState.mediaItems.length) {
-                      return const Center(child: CircularProgressIndicator());
-                    }
-                    return MediaTile(item: mediaState.mediaItems[index]);
-                  },
-                  childCount:
-                      mediaState.mediaItems.length +
-                      (mediaState.isLoading ? 1 : 0),
-                ),
-                gridDelegate: mediaState.crossAxisCount == 0
-                    ? const SliverGridDelegateWithMaxCrossAxisExtent(
-                        maxCrossAxisExtent: 150,
-                        crossAxisSpacing: 5,
-                        mainAxisSpacing: 5,
-                        childAspectRatio: 1,
-                      )
-                    : SliverGridDelegateWithFixedCrossAxisCount(
-                        crossAxisCount: mediaState.crossAxisCount,
-                        crossAxisSpacing: 5,
-                        mainAxisSpacing: 5,
-                        childAspectRatio: 1,
-                      ),
-              ),
-            ),
-          ],
-        ),
-      ),
-      bottomNavigationBar: FilterBar(
-        mediaNotifier: mediaNotifier,
-        mediaState: mediaState,
-        scrollController: _scrollController,
-      ),
-      endDrawer: EndDrawer(ref: ref),
-      endDrawerEnableOpenDragGesture: false,
-      persistentFooterButtons: mediaState.tag != null
-          ? [
-              Center(
-                child: InputChip(
-                  label: Text(mediaState.tag!),
-                  onDeleted: () {
-                    mediaNotifier.setTag(null);
-                    _scrollController.jumpTo(0);
-                  },
-                ),
-              ),
-            ]
-          : null,
-    );
-  }
-}

lib/screens/settings_screen.dart

@@ -1,30 +1,32 @@
 import 'package:flutter/material.dart';
 
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 
-import 'package:f0ckapp/providers/media_provider.dart';
 import 'package:f0ckapp/widgets/end_drawer.dart';
+import 'package:get/get.dart';
 
-class SettingsPage extends ConsumerStatefulWidget {
+class SettingsPage extends StatefulWidget {
   const SettingsPage({super.key});
 
   @override
-  ConsumerState<SettingsPage> createState() => _SettingsPageState();
+  State<StatefulWidget> createState() => _SettingsPageState();
 }
 
-class _SettingsPageState extends ConsumerState<SettingsPage> {
+class _SettingsPageState extends State<SettingsPage> {
   int _columns = 3;
   bool _drawerSwipeEnabled = true;
 
+  void _showMsg(String message, BuildContext context) {
+    ScaffoldMessenger.of(context)
+      ..removeCurrentSnackBar()
+      ..showSnackBar(SnackBar(content: Text(message)));
+  }
+
   @override
   Widget build(BuildContext context) {
-    final MediaState mediaState = ref.watch(mediaProvider);
-    final MediaNotifier mediaNotifier = ref.read(mediaProvider.notifier);
-
     return Scaffold(
       endDrawerEnableOpenDragGesture: _drawerSwipeEnabled,
-      endDrawer: EndDrawer(ref: ref),
+      endDrawer: EndDrawer(),
       body: CustomScrollView(
         slivers: [
           SliverAppBar(
@@ -34,13 +36,13 @@ class _SettingsPageState extends ConsumerState<SettingsPage> {
             leading: IconButton(
               icon: const Icon(Icons.arrow_back),
               onPressed: () {
-                Navigator.canPop(context) ? Navigator.pop(context) : Navigator.pushReplacementNamed(context, '/');
+                Get.back();
               },
             ),
           ),
           SliverList(
             delegate: SliverChildListDelegate([
-              Padding(
+              /*Padding(
                 padding: const EdgeInsets.all(16.0),
                 child: Text(
                   "Anzahl der Spalten",
@@ -68,7 +70,7 @@ class _SettingsPageState extends ConsumerState<SettingsPage> {
                     }
                   },
                 ),
-              ),
+              ),*/
               const Divider(),
               SwitchListTile(
                 title: const Text("Drawer per Geste öffnen"),
@@ -84,14 +86,12 @@ class _SettingsPageState extends ConsumerState<SettingsPage> {
               ),
               const Divider(),
               ListTile(
-                title: const Text("Cache löschen"),
+                title: Text("Cache löschen"),
                 trailing: ElevatedButton(
                   onPressed: () async {
                     await DefaultCacheManager().emptyCache();
                     if (!mounted) return;
-                    ScaffoldMessenger.of(context).showSnackBar(
-                      const SnackBar(content: Text("Cache wurde geleert.")),
-                    );
+                    _showMsg('Cache wurde geleert.', context);
                   },
                   child: const Text("Löschen"),
                 ),