1.0.17

- new appicon
- smartRefreshIndicator (https://github.com/flutter/flutter/issues/65356#issuecomment-2410727567)

lib/screens/detailview.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:f0ckapp/models/mediaitem.dart';
 import 'package:f0ckapp/services/api.dart';
 import 'package:f0ckapp/widgets/video_widget.dart';
+import 'package:f0ckapp/utils/SmartRefreshIndicator.dart';
 
 class DetailView extends StatefulWidget {
   final int initialItemId;
@@ -26,33 +27,32 @@ class DetailView extends StatefulWidget {
 class _DetailViewState extends State<DetailView> {
   late PageController _pageController;
   late List<MediaItem> mediaItems;
-  final List<String> _modes = ["sfw", "nsfw", "untagged", "all"];
   int currentItemId = 0;
   bool isLoading = false;
 
   @override
   void initState() {
     super.initState();
-
     mediaItems = widget.mediaItems;
     final initialIndex = mediaItems.indexWhere(
       (item) => item.id == widget.initialItemId,
     );
     _pageController = PageController(initialPage: initialIndex);
-
     currentItemId = mediaItems[initialIndex].id;
 
-    _pageController.addListener(() {
-      final newIndex = _pageController.page?.round();
-      if (newIndex != null && newIndex < mediaItems.length) {
-        setState(() => currentItemId = mediaItems[newIndex].id);
-      }
+    _pageController.addListener(_onPageScroll);
+  }
 
-      if (_pageController.position.pixels >=
-          _pageController.position.maxScrollExtent - 100) {
-        _loadMoreMedia();
-      }
-    });
+  void _onPageScroll() {
+    final newIndex = _pageController.page?.round();
+    if (newIndex != null && newIndex < mediaItems.length) {
+      setState(() => currentItemId = mediaItems[newIndex].id);
+    }
+
+    if (_pageController.position.pixels >=
+        _pageController.position.maxScrollExtent - 100) {
+      _loadMoreMedia();
+    }
   }
 
   Future<void> _loadMoreMedia() async {
@@ -66,15 +66,11 @@ class _DetailViewState extends State<DetailView> {
         mode: widget.mode,
         random: widget.random,
       );
-      if (mounted) {
+      if (mounted && newMedia.isNotEmpty) {
         setState(() => mediaItems.addAll(newMedia));
       }
     } catch (e) {
-      if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(content: Text('Fehler beim Laden weiterer Medien: $e')),
-        );
-      }
+      _showError("Fehler beim Laden weiterer Medien: $e");
     } finally {
       setState(() => isLoading = false);
     }
@@ -84,21 +80,21 @@ class _DetailViewState extends State<DetailView> {
     try {
       final updatedItem = await fetchMediaDetail(currentItemId);
       if (mounted) {
-        setState(() {
-          final index = mediaItems.indexWhere(
-            (item) => item.id == currentItemId,
-          );
-          if (index != -1) {
-            mediaItems[index] = updatedItem;
-          }
-        });
+        final index = mediaItems.indexWhere((item) => item.id == currentItemId);
+        if (index != -1) {
+          setState(() => mediaItems[index] = updatedItem);
+        }
       }
     } catch (e) {
-      if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(content: Text('Fehler beim Aktualisieren des Items: $e')),
-        );
-      }
+      _showError("Fehler beim Aktualisieren des Items: $e");
+    }
+  }
+
+  void _showError(String message) {
+    if (mounted) {
+      ScaffoldMessenger.of(
+        context,
+      ).showSnackBar(SnackBar(content: Text(message)));
     }
   }
 
@@ -109,70 +105,60 @@ class _DetailViewState extends State<DetailView> {
       appBar: AppBar(
         backgroundColor: const Color(0xFF2B2B2B),
         foregroundColor: Colors.white,
-        title: Text(
-          'f0ck #$currentItemId (${widget.type}, ${_modes[widget.mode]})',
-        ),
+        title: Text('f0ck #$currentItemId (${widget.type})'),
         centerTitle: true,
       ),
-      body: RefreshIndicator(
-        onRefresh: _refreshMediaItem,
-        child: SingleChildScrollView(
-          child: Column(
-            children: [
-              SizedBox(
-                height: MediaQuery.of(context).size.height,
-                child: PageView.builder(
-                  controller: _pageController,
-                  itemCount: mediaItems.length,
-                  itemBuilder: (context, index) {
-                    final item = mediaItems[index];
-                    return Column(
-                      children: [
-                        if (item.mime.startsWith('image'))
-                          Image.network(item.mediaUrl, fit: BoxFit.contain)
-                        else
-                          VideoWidget(details: item),
-                        const SizedBox(height: 20),
-                        Text(
-                          item.mime,
-                          style: const TextStyle(
-                            color: Colors.white,
-                            fontSize: 18,
-                          ),
-                        ),
-                        const SizedBox(height: 10),
-                        Wrap(
-                          alignment: WrapAlignment.center,
-                          spacing: 5.0,
-                          children: item.tags.map((tag) {
-                            Color tagColor;
-                            switch (tag.id) {
-                              case 1:
-                                tagColor = Colors.green;
-                                break;
-                              case 2:
-                                tagColor = Colors.red;
-                                break;
-                              default:
-                                tagColor = const Color(0xFF090909);
-                            }
-
-                            return Chip(
-                              label: Text(tag.tag),
-                              backgroundColor: tagColor,
-                              labelStyle: const TextStyle(color: Colors.white),
-                            );
-                          }).toList(),
-                        ),
-                        const SizedBox(height: 40),
-                      ],
-                    );
-                  },
-                ),
+      body: PageView.builder(
+        controller: _pageController,
+        itemCount: mediaItems.length,
+        itemBuilder: (context, index) {
+          final MediaItem item = mediaItems[index];
+          return Scaffold(
+            body: SafeArea(
+              child: SmartRefreshIndicator(
+                onRefresh: _refreshMediaItem,
+                child: _buildMediaItem(item)
               ),
-            ],
+            ),
+          );
+        },
+      ),
+    );
+  }
+
+  Widget _buildMediaItem(MediaItem item) {
+    return SingleChildScrollView(
+      child: Column(
+        children: [
+          if (item.mime.startsWith('image'))
+            Image.network(
+              item.mediaUrl,
+              fit: BoxFit.contain,
+            )
+          else
+            VideoWidget(details: item),
+          const SizedBox(height: 20),
+          Text(
+            item.mime,
+            style: const TextStyle(color: Colors.white, fontSize: 18),
           ),
-        ),
+          const SizedBox(height: 10),
+          Wrap(
+            alignment: WrapAlignment.center,
+            spacing: 5.0,
+            children: item.tags.map((tag) {
+              return Chip(
+                label: Text(tag.tag),
+                backgroundColor: {
+                  1: Colors.green,
+                  2: Colors.red
+                }[tag.id] ?? const Color(0xFF090909),
+                labelStyle: const TextStyle(color: Colors.white),
+              );
+            }).toList(),
+          ),
+          const SizedBox(height: 20),
+        ],
       ),
     );
   }