1.0.25+25

- preload adjacent media

lib/screens/DetailView.dart

@@ -5,6 +5,7 @@ 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:flutter_cache_manager/flutter_cache_manager.dart';
 
 class DetailView extends StatefulWidget {
   final int initialItemId;
@@ -12,6 +13,7 @@ class DetailView extends StatefulWidget {
   final String type;
   final int mode;
   final bool random;
+  final String? tagname;
 
   const DetailView({
     super.key,
@@ -20,6 +22,7 @@ class DetailView extends StatefulWidget {
     required this.type,
     required this.mode,
     required this.random,
+    required this.tagname,
   });
 
   @override
@@ -29,6 +32,7 @@ class DetailView extends StatefulWidget {
 class _DetailViewState extends State<DetailView> {
   late PageController _pageController;
   late List<MediaItem> mediaItems;
+  String? _tagname;
   int currentItemId = 0;
   bool isLoading = false;
 
@@ -36,25 +40,50 @@ class _DetailViewState extends State<DetailView> {
   void initState() {
     super.initState();
     mediaItems = widget.mediaItems;
+    _tagname = widget.tagname;
     final initialIndex = mediaItems.indexWhere(
       (item) => item.id == widget.initialItemId,
     );
     _pageController = PageController(initialPage: initialIndex);
     currentItemId = mediaItems[initialIndex].id;
 
-    _pageController.addListener(_onPageScroll);
+    int? lastLoadedIndex;
-  }
+    _pageController.addListener(() async {
-
-  void _onPageScroll() {
       final newIndex = _pageController.page?.round();
-    if (newIndex != null && newIndex < mediaItems.length) {
+      if (newIndex != null &&
+          newIndex < mediaItems.length &&
+          newIndex != lastLoadedIndex) {
         setState(() => currentItemId = mediaItems[newIndex].id);
+        lastLoadedIndex = newIndex;
+
+        _preloadAdjacentMedia(newIndex);
       }
 
       if (_pageController.position.pixels >=
           _pageController.position.maxScrollExtent - 100) {
         _loadMoreMedia();
       }
+    });
+
+    _preloadAdjacentMedia(initialIndex);
+  }
+
+  void _preloadAdjacentMedia(int index) async {
+    if (index + 1 < mediaItems.length) {
+      final nextUrl = mediaItems[index + 1].mediaUrl;
+      if (await DefaultCacheManager().getFileFromCache(nextUrl) == null) {
+        await DefaultCacheManager().downloadFile(nextUrl);
+        print('preload ${mediaItems[index + 1].id}');
+      }
+    }
+
+    if (index - 1 >= 0) {
+      final prevUrl = mediaItems[index - 1].mediaUrl;
+      if (await DefaultCacheManager().getFileFromCache(prevUrl) == null) {
+        await DefaultCacheManager().downloadFile(prevUrl);
+        print('preload ${mediaItems[index - 1].id}');
+      }
+    }
   }
 
   Future<void> _loadMoreMedia() async {
@@ -67,6 +96,7 @@ class _DetailViewState extends State<DetailView> {
         type: widget.type,
         mode: widget.mode,
         random: widget.random,
+        tag: _tagname,
       );
       if (mounted && newMedia.isNotEmpty) {
         setState(() => mediaItems.addAll(newMedia));
@@ -110,23 +140,62 @@ class _DetailViewState extends State<DetailView> {
         title: Text('f0ck #$currentItemId (${widget.type})'),
         centerTitle: true,
       ),
-      body: PageTransformer(
+      body: Stack(
+        children: [
+          PageTransformer(
             controller: _pageController,
             pages: mediaItems.map((item) {
+              final isActive = item.id == currentItemId;
               return Scaffold(
                 body: SafeArea(
                   child: SmartRefreshIndicator(
                     onRefresh: _refreshMediaItem,
-                child: _buildMediaItem(item),
+                    child: _buildMediaItem(item, isActive),
                   ),
                 ),
               );
             }).toList(),
           ),
+          if (_tagname != null)
+            Positioned(
+              bottom: 60,
+              left: MediaQuery.of(context).size.width * 0.2,
+              right: MediaQuery.of(context).size.width * 0.2,
+              child: Container(
+                padding: const EdgeInsets.symmetric(
+                  vertical: 10,
+                  horizontal: 20,
+                ),
+                decoration: BoxDecoration(
+                  color: Colors.black.withValues(alpha: 0.8),
+                  borderRadius: BorderRadius.circular(12),
+                ),
+                child: Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                  children: [
+                    Text(
+                      'Tag: $_tagname',
+                      style: const TextStyle(color: Colors.white),
+                    ),
+                    IconButton(
+                      icon: const Icon(Icons.close, color: Colors.white),
+                      onPressed: () {
+                        setState(() {
+                          _tagname = '___empty___';
+                          Navigator.pop(context, _tagname);
+                        });
+                      },
+                    ),
+                  ],
+                ),
+              ),
+            ),
+        ],
+      ),
     );
   }
 
-  Widget _buildMediaItem(MediaItem item) {
+  Widget _buildMediaItem(MediaItem item, bool isActive) {
     return SingleChildScrollView(
       child: Column(
         mainAxisAlignment: MainAxisAlignment.center,
@@ -139,7 +208,7 @@ class _DetailViewState extends State<DetailView> {
               errorWidget: (context, url, error) => Icon(Icons.error),
             )
           else
-            VideoWidget(details: item),
+            VideoWidget(details: item, isActive: isActive),
           const SizedBox(height: 20),
           Text(
             item.mime,
@@ -150,7 +219,15 @@ class _DetailViewState extends State<DetailView> {
             alignment: WrapAlignment.center,
             spacing: 5.0,
             children: item.tags.map((tag) {
-              return Chip(
+              return GestureDetector(
+                onTap: () {
+                  if (tag.tag == 'sfw' || tag.tag == 'nsfw') return;
+                  setState(() {
+                    _tagname = tag.tag;
+                    Navigator.pop(context, _tagname);
+                  });
+                },
+                child: Chip(
                   label: Text(tag.tag),
                   backgroundColor: switch (tag.id) {
                     1 => Colors.green,
@@ -158,6 +235,7 @@ class _DetailViewState extends State<DetailView> {
                     _ => const Color(0xFF090909),
                   },
                   labelStyle: const TextStyle(color: Colors.white),
+                ),
               );
             }).toList(),
           ),

lib/screens/MediaGrid.dart

@@ -14,7 +14,7 @@ class MediaGrid extends StatefulWidget {
 
 class _MediaGridState extends State<MediaGrid> {
   final ScrollController _scrollController = ScrollController();
-  final String _version = '1.0.23+23';
+  final String _version = '1.0.25+25';
   List<MediaItem> mediaItems = [];
   bool isLoading = false;
   Timer? _debounceTimer;
@@ -24,6 +24,7 @@ class _MediaGridState extends State<MediaGrid> {
   int _selectedMode = 0;
   bool _random = false;
   final List<String> _modes = ["sfw", "nsfw", "untagged", "all"];
+  String? _selectedTag;
 
   @override
   void initState() {
@@ -63,6 +64,7 @@ class _MediaGridState extends State<MediaGrid> {
         type: _selectedType,
         mode: _selectedMode,
         random: _random,
+        tag: _selectedTag,
       );
       if (mounted) {
         setState(() => mediaItems.addAll(newMedia));
@@ -86,6 +88,7 @@ class _MediaGridState extends State<MediaGrid> {
         type: _selectedType,
         mode: _selectedMode,
         random: _random,
+        tag: _selectedTag,
       );
       if (mounted) {
         setState(() {
@@ -110,7 +113,7 @@ class _MediaGridState extends State<MediaGrid> {
     _navigationCompleter = Completer();
     try {
       if (mounted) {
-        await Navigator.push(
+        final String? newTag = await Navigator.push(
           context,
           MaterialPageRoute(
             builder: (context) => DetailView(
@@ -119,9 +122,22 @@ class _MediaGridState extends State<MediaGrid> {
               type: _selectedType,
               mode: _selectedMode,
               random: _random,
+              tagname: _selectedTag,
             ),
           ),
         );
+
+        if (newTag != null) {
+          setState(() {
+            if (newTag == '___empty___') {
+              _selectedTag = null;
+            }
+            else {
+              _selectedTag = newTag;
+            }
+            _refreshMedia();
+          });
+        }
       }
     } catch (e) {
       if (mounted) {
@@ -153,9 +169,9 @@ class _MediaGridState extends State<MediaGrid> {
                   _refreshMedia();
                 });
               },
-            )
+            ),
-          ]
+          ],
-        )
+        ),
       ),
       bottomNavigationBar: BottomAppBar(
         color: const Color.fromARGB(255, 43, 43, 43),
@@ -228,7 +244,9 @@ class _MediaGridState extends State<MediaGrid> {
           ),
         ),
       ),
-      body: RefreshIndicator(
+      body: Stack(
+        children: [
+          RefreshIndicator(
             onRefresh: _refreshMedia,
             child: GridView.builder(
               controller: _scrollController,
@@ -262,9 +280,9 @@ class _MediaGridState extends State<MediaGrid> {
                           color: switch (item.mode) {
                             1 => Colors.green,
                             2 => Colors.red,
-                        _ => Colors.yellow
+                            _ => Colors.yellow,
                           },
-                      size: 15.0
+                          size: 15.0,
                         ),
                       ),
                     ],
@@ -273,6 +291,58 @@ class _MediaGridState extends State<MediaGrid> {
               },
             ),
           ),
+          if (_selectedTag != null)
+            Positioned(
+              bottom: 20,
+              left: MediaQuery.of(context).size.width * 0.2,
+              right: MediaQuery.of(context).size.width * 0.2,
+              child: Container(
+                padding: const EdgeInsets.symmetric(
+                  vertical: 10,
+                  horizontal: 20,
+                ),
+                decoration: BoxDecoration(
+                  color: Colors.black.withValues(alpha: 0.8),
+                  borderRadius: BorderRadius.circular(12),
+                ),
+                child: Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                  children: [
+                    Text(
+                      'Tag: $_selectedTag',
+                      style: const TextStyle(color: Colors.white),
+                    ),
+                    IconButton(
+                      icon: const Icon(Icons.close, color: Colors.white),
+                      onPressed: () {
+                        setState(() {
+                          _selectedTag = null;
+                          _refreshMedia();
+                        });
+                        _scrollController.animateTo(
+                          0.0,
+                          duration: const Duration(milliseconds: 500),
+                          curve: Curves.easeOut,
+                        );
+                      },
+                    ),
+                  ],
+                ),
+              ),
+            ),
+        ],
+      ),
+      /*floatingActionButton: FloatingActionButton(
+        backgroundColor: Colors.black.withValues(alpha: 0.8),
+        child: const Icon(Icons.arrow_upward, color: Colors.white),
+        onPressed: () {
+          _scrollController.animateTo(
+            0.0,
+            duration: const Duration(milliseconds: 500),
+            curve: Curves.easeOut,
+          );
+        },
+      ),*/
     );
   }
 

lib/services/Api.dart

@@ -8,12 +8,14 @@ Future<List<MediaItem>> fetchMedia({
   String? type,
   int? mode,
   bool? random,
+  String? tag,
 }) async {
   final Uri url = Uri.parse('https://api.f0ck.me/items/get').replace(
     queryParameters: {
       'type': type ?? 'image',
       'mode': (mode ?? 0).toString(),
       'random': (random! ? 1 : 0).toString(),
+      if (tag != null) 'tag': tag,
       if (older != null) 'older': older,
     },
   );

lib/widgets/VideoWidget.dart

@@ -7,7 +7,9 @@ import 'dart:async';
 
 class VideoWidget extends StatefulWidget {
   final MediaItem details;
-  const VideoWidget({super.key, required this.details});
+  final bool isActive;
+
+  const VideoWidget({super.key, required this.details, required this.isActive});
 
   @override
   State createState() => _VideoWidgetState();
@@ -32,7 +34,9 @@ class _VideoWidgetState extends State<VideoWidget> {
     setState(() {});
 
     _controller.addListener(() => setState(() {}));
+    if (widget.isActive) {
       _controller.play();
+    }
     _controller.setLooping(true);
   }
 
@@ -43,6 +47,16 @@ class _VideoWidgetState extends State<VideoWidget> {
     super.dispose();
   }
 
+  @override
+  void didUpdateWidget(VideoWidget oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (widget.isActive) {
+      _controller.play();
+    } else {
+      _controller.pause();
+    }
+  }
+
   void _onTap({bool ctrlButton = false}) {
     if (!ctrlButton) {
       setState(() => _showControls = !_showControls);
@@ -81,7 +95,7 @@ class _VideoWidgetState extends State<VideoWidget> {
                         errorWidget: (context, url, error) => Image.asset(
                           'assets/images/music.webp',
                           fit: BoxFit.contain,
-                          width: double.infinity
+                          width: double.infinity,
                         ),
                       )
                     : _controller.value.isInitialized

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.0.23+23
+version: 1.0.25+25
 
 environment:
   sdk: ^3.9.0-100.2.beta