v1.1.1+31

- fix share
- logo

android/app/src/main/AndroidManifest.xml

@@ -4,7 +4,8 @@
     <application
         android:label="f0ckapp"
         android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/ic_launcher"
+        android:enableOnBackInvokedCallback="true">
         <activity
             android:name=".MainActivity"
             android:exported="true"

lib/models/MediaItem.dart

@@ -34,6 +34,7 @@ class MediaItem {
   String get thumbnailUrl => 'https://f0ck.me/t/$id.webp';
   String get mediaUrl => 'https://f0ck.me/b/$dest';
   String get coverUrl => 'https://f0ck.me/ca/$id.webp';
+  String get postUrl => 'https://f0ck.me/$id';
 }
 
 class Tag {

lib/providers/MediaProvider.dart

@@ -22,25 +22,26 @@ class MediaProvider extends ChangeNotifier {
   int get crossAxisCount => _crossAxisCount;
   List<MediaItem> get mediaItems => _mediaItems;
   bool get isLoading => _isLoading;
+  Function get resetMedia => _resetMedia;
 
   void setType(String type) {
     _typeid = types.indexOf(type);
-    loadMedia(reload: true);
+    _resetMedia();
   }
 
   void setMode(int mode) {
     _mode = mode;
-    loadMedia(reload: true);
+    _resetMedia();
   }
 
   void toggleRandom() {
     _random = !_random;
-    loadMedia(reload: true);
+    _resetMedia();
   }
 
   void setTag(String? tag) {
     _tag = tag;
-    loadMedia(reload: true);
+    _resetMedia();
   }
 
   void setCrossAxisCount(int crossAxisCount) {
@@ -50,7 +51,8 @@ class MediaProvider extends ChangeNotifier {
 
   void setMediaItems(List<MediaItem> mediaItems) {
     if (_mediaItems != mediaItems) {
-      _mediaItems = mediaItems;
+      _mediaItems.clear();
+      _mediaItems.addAll(mediaItems);
       notifyListeners();
     }
   }
@@ -60,30 +62,34 @@ class MediaProvider extends ChangeNotifier {
     notifyListeners();
   }
 
-  Future<void> loadMedia({bool reload = false, bool notify = true}) async {
+  void _resetMedia() {
+    _mediaItems.clear();
+    notifyListeners();
+    loadMedia();
+  }
+
+  Future<void> loadMedia({bool notify = true}) async {
     if (_isLoading) return;
     _isLoading = true;
     if (notify) notifyListeners();
 
     try {
       final newMedia = await fetchMedia(
-        older: reload
-            ? null
-            : _mediaItems.isNotEmpty
-            ? _mediaItems.last.id
-            : null,
+        older: _mediaItems.isNotEmpty ? _mediaItems.last.id : null,
         type: type,
         mode: mode,
         random: random,
         tag: tag,
       );
 
-      reload ? setMediaItems(newMedia) : addMediaItems(newMedia);
+      if(_mediaItems != newMedia) {
+        addMediaItems(newMedia);
+        if (notify) notifyListeners();
+      }
     } catch (e) {
       debugPrint('Fehler beim Laden der Medien: $e');
     } finally {
       _isLoading = false;
-      if(notify) notifyListeners();
     }
   }
 }

lib/screens/DetailView.dart

@@ -1,3 +1,6 @@
+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';
@@ -8,6 +11,7 @@ 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 {
   final int initialItemId;
@@ -31,14 +35,12 @@ class _DetailViewState extends State<DetailView> {
     final initialIndex = provider.mediaItems.indexWhere(
       (item) => item.id == widget.initialItemId,
     );
-    
+
     _pageController = PageController(initialPage: initialIndex);
 
     _currentIndex = initialIndex;
     _pageController.addListener(() {
-      setState(() {
-        _currentIndex = _pageController.page?.round() ?? 0;
-      });
+      setState(() => _currentIndex = _pageController.page?.round() ?? 0);
     });
 
     _preloadAdjacentMedia(initialIndex);
@@ -99,7 +101,59 @@ class _DetailViewState extends State<DetailView> {
     return Scaffold(
       appBar: AppBar(
         centerTitle: true,
-        title: Text('f0ck #${widget.initialItemId} (${provider.type})'),
+        title: Text(
+          'f0ck #${provider.mediaItems.elementAt(_currentIndex).id.toString()}',
+        ),
+        actions: [
+          PopupMenuButton<String>(
+            onSelected: (value) async {
+              final item = provider.mediaItems.elementAt(_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));
+                  break;
+                case 'post_link':
+                  await SharePlus.instance.share(ShareParams(text: item.postUrl));
+                  break;
+              }
+            },
+            itemBuilder: (context) => [
+              PopupMenuItem(
+                value: 'media',
+                child: ListTile(
+                  leading: Icon(Icons.image),
+                  title: Text('Als Datei'),
+                ),
+              ),
+              PopupMenuItem(
+                value: 'direct_link',
+                child: ListTile(
+                  leading: Icon(Icons.link),
+                  title: Text('Link zum Bild'),
+                ),
+              ),
+              PopupMenuItem(
+                value: 'post_link',
+                child: ListTile(
+                  leading: Icon(Icons.article),
+                  title: Text('Link zum Post'),
+                ),
+              ),
+            ],
+            icon: Icon(Icons.share),
+          ),
+        ],
       ),
       body: Stack(
         children: [
@@ -120,20 +174,14 @@ class _DetailViewState extends State<DetailView> {
       ),
       persistentFooterButtons: provider.tag != null
           ? [
-              Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
-                  Text('tag: '),
-                  InputChip(
-                    label: Text(provider.tag!),
-                    backgroundColor: const Color(0xFF090909),
-                    labelStyle: const TextStyle(color: Colors.white),
-                    onDeleted: () {
-                      provider.setTag(null);
-                      Navigator.pop(context);
-                    },
-                  ),
-                ],
+              InputChip(
+                label: Text(provider.tag!),
+                backgroundColor: const Color(0xFF090909),
+                labelStyle: const TextStyle(color: Colors.white),
+                onDeleted: () {
+                  provider.setTag(null);
+                  Navigator.pop(context);
+                },
               ),
             ]
           : null,
@@ -155,11 +203,11 @@ class _DetailViewState extends State<DetailView> {
             )
           else
             VideoWidget(details: item, isActive: isActive),
-          const SizedBox(height: 20),
+          /*const SizedBox(height: 20),
           Text(
-            item.mime,
+            'f0ck #${item.id.toString()}',
             style: const TextStyle(color: Colors.white, fontSize: 18),
-          ),
+          ),*/
           const SizedBox(height: 10, width: double.infinity),
           Wrap(
             alignment: WrapAlignment.center,
@@ -170,7 +218,7 @@ class _DetailViewState extends State<DetailView> {
                   if (tag.tag == 'sfw' || tag.tag == 'nsfw') return;
                   setState(() {
                     provider.setTag(tag.tag);
-                    Navigator.pop(context);
+                    Navigator.pop(context, true);
                   });
                 },
                 label: Text(tag.tag),

lib/screens/MediaGrid.dart

@@ -27,12 +27,18 @@ class _MediaGridState extends State<MediaGrid> {
 
     _scrollController.addListener(() {
       if (_scrollController.position.pixels >=
-          _scrollController.position.maxScrollExtent - 100) {
+          _scrollController.position.maxScrollExtent - 200) {
         provider.loadMedia(notify: false);
       }
     });
   }
 
+  int _calculateCrossAxisCount(BuildContext context, int defaultCount) {
+    return defaultCount == 0
+        ? (MediaQuery.of(context).size.width / 110).clamp(3, 5).toInt()
+        : defaultCount;
+  }
+
   @override
   Widget build(BuildContext context) {
     final provider = Provider.of<MediaProvider>(context);
@@ -41,12 +47,19 @@ class _MediaGridState extends State<MediaGrid> {
     return Scaffold(
       key: scaffoldKey,
       appBar: AppBar(
-        //centerTitle: true,
-        title: Text('fApp v${AppVersion.version}'),
+        title: Image.asset(
+          'assets/images/f0ck_small.webp',
+          fit: BoxFit.fitHeight,
+        ),
         actions: [
           IconButton(
-            icon: Icon(provider.random ? Icons.shuffle_on_outlined : Icons.shuffle),
-            onPressed: () => provider.toggleRandom(),
+            icon: Icon(
+              provider.random ? Icons.shuffle_on_outlined : Icons.shuffle,
+            ),
+            onPressed: () {
+              provider.toggleRandom();
+              _scrollController.jumpTo(0);
+            },
           ),
           IconButton(
             icon: const Icon(Icons.menu),
@@ -76,6 +89,7 @@ class _MediaGridState extends State<MediaGrid> {
               onChanged: (String? newValue) {
                 if (newValue != null) {
                   provider.setType(newValue);
+                  _scrollController.jumpTo(0);
                 }
               },
             ),
@@ -94,6 +108,7 @@ class _MediaGridState extends State<MediaGrid> {
               onChanged: (String? newValue) {
                 if (newValue != null) {
                   provider.setMode(provider.modes.indexOf(newValue));
+                  _scrollController.jumpTo(0);
                 }
               },
             ),
@@ -105,33 +120,43 @@ class _MediaGridState extends State<MediaGrid> {
           padding: EdgeInsets.zero,
           children: [
             DrawerHeader(
-              padding: EdgeInsets.all(0),
-              child: Image.asset('assets/images/menu.webp', fit: BoxFit.cover),
+              decoration: BoxDecoration(
+                image: DecorationImage(
+                  image: AssetImage('assets/images/menu.webp'),
+                  fit: BoxFit.cover,
+                  alignment: Alignment.topCenter,
+                ),
+              ),
+              child: null,
+            ),
+            ListTile(
+              title: Text('v${AppVersion.version}'),
+              onTap: () {
+                ScaffoldMessenger.of(context).showSnackBar(
+                  SnackBar(content: Text('jooong lass das, hier ist nichts')),
+                );
+              },
             ),
           ],
         ),
       ),
       persistentFooterButtons: provider.tag != null
           ? [
-              Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
-                  Text('tag: '),
-                  InputChip(
-                    label: Text(provider.tag!),
-                    backgroundColor: const Color(0xFF090909),
-                    labelStyle: const TextStyle(color: Colors.white),
-                    onDeleted: () {
-                      provider.setTag(null);
-                    },
-                  ),
-                ],
+              InputChip(
+                label: Text(provider.tag!),
+                backgroundColor: const Color(0xFF090909),
+                labelStyle: const TextStyle(color: Colors.white),
+                onDeleted: () {
+                  provider.setTag(null);
+                  _scrollController.jumpTo(0);
+                },
               ),
             ]
           : null,
       body: RefreshIndicator(
         onRefresh: () async {
-          await provider.loadMedia(reload: true);
+          await provider.resetMedia();
+          _scrollController.jumpTo(0);
         },
         child: Consumer<MediaProvider>(
           builder: (context, mediaProvider, child) {
@@ -139,11 +164,10 @@ class _MediaGridState extends State<MediaGrid> {
               key: PageStorageKey('mediaGrid'),
               controller: _scrollController,
               gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-                crossAxisCount: mediaProvider.crossAxisCount == 0
-                    ? (MediaQuery.of(context).size.width / 110)
-                          .clamp(3, 5)
-                          .toInt()
-                    : mediaProvider.crossAxisCount,
+                crossAxisCount: _calculateCrossAxisCount(
+                  context,
+                  provider.crossAxisCount,
+                ),
                 crossAxisSpacing: 5.0,
                 mainAxisSpacing: 5.0,
               ),
@@ -156,12 +180,18 @@ class _MediaGridState extends State<MediaGrid> {
                 final item = provider.mediaItems[index];
 
                 return InkWell(
-                  onTap: () => Navigator.push(
-                    context,
-                    MaterialPageRoute(
-                      builder: (context) => DetailView(initialItemId: item.id),
-                    ),
-                  ),
+                  onTap: () async {
+                    bool? ret = await Navigator.push(
+                      context,
+                      MaterialPageRoute(
+                        builder: (context) =>
+                            DetailView(initialItemId: item.id),
+                      ),
+                    );
+                    if (ret != null && ret) {
+                      _scrollController.jumpTo(0);
+                    }
+                  },
                   child: Stack(
                     fit: StackFit.expand,
                     children: <Widget>[

linux/flutter/generated_plugin_registrant.cc

@@ -6,6 +6,10 @@
 
 #include "generated_plugin_registrant.h"
 
+#include <url_launcher_linux/url_launcher_plugin.h>
 
 void fl_register_plugins(FlPluginRegistry* registry) {
+  g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin");
+  url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar);
 }

linux/flutter/generated_plugins.cmake

@@ -3,6 +3,7 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
+  url_launcher_linux
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -7,12 +7,14 @@ import Foundation
 
 import package_info_plus
 import path_provider_foundation
+import share_plus
 import sqflite_darwin
 import video_player_avfoundation
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
+  SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))
   SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))
   FVPVideoPlayerPlugin.register(with: registry.registrar(forPlugin: "FVPVideoPlayerPlugin"))
 }

pubspec.lock

@@ -73,6 +73,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.19.1"
+  cross_file:
+    dependency: transitive
+    description:
+      name: cross_file
+      sha256: "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.4+2"
   crypto:
     dependency: transitive
     description:
@@ -256,6 +264,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.16.0"
+  mime:
+    dependency: transitive
+    description:
+      name: mime
+      sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.0"
   nested:
     dependency: transitive
     description:
@@ -376,6 +392,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.28.0"
+  share_plus:
+    dependency: "direct main"
+    description:
+      name: share_plus
+      sha256: b2961506569e28948d75ec346c28775bb111986bb69dc6a20754a457e3d97fa0
+      url: "https://pub.dev"
+    source: hosted
+    version: "11.0.0"
+  share_plus_platform_interface:
+    dependency: transitive
+    description:
+      name: share_plus_platform_interface
+      sha256: "1032d392bc5d2095a77447a805aa3f804d2ae6a4d5eef5e6ebb3bd94c1bc19ef"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.0.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -493,6 +525,38 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.4.0"
+  url_launcher_linux:
+    dependency: transitive
+    description:
+      name: url_launcher_linux
+      sha256: "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.2.1"
+  url_launcher_platform_interface:
+    dependency: transitive
+    description:
+      name: url_launcher_platform_interface
+      sha256: "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.2"
+  url_launcher_web:
+    dependency: transitive
+    description:
+      name: url_launcher_web
+      sha256: "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.1"
+  url_launcher_windows:
+    dependency: transitive
+    description:
+      name: url_launcher_windows
+      sha256: "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.4"
   uuid:
     dependency: transitive
     description:

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.28+28
+version: 1.1.1+31
 
 environment:
   sdk: ^3.9.0-100.2.beta
@@ -39,6 +39,7 @@ dependencies:
   cached_video_player_plus: ^3.0.3
   provider: ^6.1.5
   package_info_plus: ^8.3.0
+  share_plus: ^11.0.0
 
 dev_dependencies:
   flutter_test:

windows/flutter/generated_plugin_registrant.cc

@@ -6,6 +6,12 @@
 
 #include "generated_plugin_registrant.h"
 
+#include <share_plus/share_plus_windows_plugin_c_api.h>
+#include <url_launcher_windows/url_launcher_windows.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
+  SharePlusWindowsPluginCApiRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("SharePlusWindowsPluginCApi"));
+  UrlLauncherWindowsRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("UrlLauncherWindows"));
 }

windows/flutter/generated_plugins.cmake

@@ -3,6 +3,8 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
+  share_plus
+  url_launcher_windows
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST