v1.1.11+41

- fixed: duplicates on the frontpage
- new: search by tag

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 f0ck
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,16 +1,48 @@
-# f0ckapp
+# fApp
+![f0ck.me Logo](https://git.lat/f0ck/fApp/raw/branch/master/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png)
+## Overview
 
-A new Flutter project.
+fApp is the mobile application for the website [f0ck.me](https://f0ck.me). This app provides a user-friendly interface to access the content of the website and utilize its features conveniently from your mobile device.
 
-## Getting Started
+## Installation
 
-This project is a starting point for a Flutter application.
+fApp is available in its own F-Droid repository.
 
-A few resources to get you started if this is your first Flutter project:
+### Installation Steps
 
-- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab)
-- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook)
+1. Add the F-Droid repository to your F-Droid app:
+   - Go to the settings in the F-Droid app.
+   - Select "Repositories" and add the URL `https://fdroid.flumm.io/fdroid/repo/`.
 
-For help getting started with Flutter development, view the
-[online documentation](https://docs.flutter.dev/), which offers tutorials,
-samples, guidance on mobile development, and a full API reference.
+2. Search for "f0ckapp" in the F-Droid app and install the app.
+
+## Development
+
+### Prerequisites
+
+- Flutter SDK
+- Dart SDK
+- Android Studio or Visual Studio Code
+
+### Setting Up the Project
+
+1. Clone the repository:
+   ```bash
+   git clone https://git.lat/f0ck/fApp.git
+   cd fApp
+2. Install dependencies:
+  ```flutter pub get```
+3. Run the app:
+  ```flutter run```
+
+### Contributing
+
+don't.
+
+### License
+
+This project is licensed under the MIT License. See the LICENSE file for more information.
+
+### Contact
+
+For questions or feedback, you can reach us at [contact@f0ck.me](mailto:contact@f0ck.me).

android/app/build.gradle.kts

@@ -11,12 +11,12 @@ android {
     ndkVersion = flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
 
     defaultConfig {

android/app/src/main/AndroidManifest.xml

@@ -1,11 +1,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 
     <application
         android:label="f0ckapp"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
-        android:roundIcon="@mipmap/ic_launcher_round"
         android:enableOnBackInvokedCallback="true">
         <activity
             android:name=".MainActivity"
@@ -29,12 +30,26 @@
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
+            <meta-data android:name="flutter_deeplinking_enabled" android:value="false"/>
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
+                <data android:scheme="https" android:host="f0ck.me"/>
+            </intent-filter>
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
+                <data android:scheme="f0ck" android:host="com.f0ck.f0ckapp"/>
+            </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />
+        
     </application>
     <!-- Required to query activities that can process text, see:
          https://developer.android.com/training/package-visibility and

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@mipmap/ic_launcher_background"/>
+  <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+  <monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
+</adaptive-icon>

lib/main.dart

@@ -1,42 +1,89 @@
+import 'package:f0ckapp/providers/media_provider.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
-import 'package:f0ckapp/providers/MediaProvider.dart';
-import 'package:f0ckapp/providers/ThemeProvider.dart';
-import 'package:f0ckapp/screens/MediaGrid.dart';
-import 'package:f0ckapp/utils/AppVersion.dart';
+import 'package:go_router/go_router.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_downloader/flutter_downloader.dart';
 
-import 'package:provider/provider.dart';
+import 'package:f0ckapp/screens/mediagrid_screen.dart';
+import 'package:f0ckapp/screens/detailview_screen.dart';
+import 'package:f0ckapp/utils/appversion_util.dart';
+import 'package:f0ckapp/providers/theme_provider.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
   await SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
+  await FlutterDownloader.initialize();
   await AppVersion.init();
 
-  runApp(
-    MultiProvider(
-      providers: [
-        ChangeNotifierProvider(create: (context) => ThemeProvider()),
-        ChangeNotifierProvider(create: (context) => MediaProvider())
-      ],
-      child: F0ckApp()
-    )
-  );
+  runApp(ProviderScope(child: F0ckApp()));
 }
 
-class F0ckApp extends StatelessWidget {
-  const F0ckApp({super.key});
+class F0ckApp extends ConsumerWidget {
+  F0ckApp({super.key});
+
+  final GoRouter _router = GoRouter(
+    initialLocation: '/',
+    routes: [
+      GoRoute(
+        path: '/',
+        builder: (BuildContext context, GoRouterState state) {
+          return const MediaGrid();
+        },
+      ),
+      GoRoute(
+        path: '/:rest(.*)',
+        builder: (context, state) {
+          final bool isInternalLink = (state.extra is bool && state.extra == true);
+          final String fullPath = state.matchedLocation;
+
+          final regExp = RegExp(
+            r'^(?:/tag/(?<tag>.+?))?(?:/(?<mime>image|audio|video))?(?:/(?<itemid>\d+))?$',
+          );
+          final RegExpMatch? match = regExp.firstMatch(fullPath);
+
+          if (match == null) {
+            return const Scaffold(body: Center(child: Text('Ungültiger Link')));
+          }
+
+          final String? tag = match.namedGroup('tag');
+          final String? mime = match.namedGroup('mime');
+          final String? idStr = match.namedGroup('itemid');
+          final int? itemId = idStr != null ? int.tryParse(idStr) : null;
+          const int preloadOffset = 50;
+
+          return Consumer(
+            builder: (BuildContext context, WidgetRef ref, Widget? child) {
+              WidgetsBinding.instance.addPostFrameCallback((_) async {
+                final MediaNotifier mediaNotifier = ref.read(mediaProvider.notifier);
+                if (!isInternalLink) {
+                  mediaNotifier.setType(mime ?? "alles");
+                  mediaNotifier.setTag(tag);
+                }
+                if (itemId != null) {
+                  await mediaNotifier.loadMedia(id: itemId + preloadOffset);
+                }
+              });
+              if (itemId != null) {
+                return DetailView(initialItemId: itemId);
+              } else {
+                return MediaGrid();
+              }
+            },
+          );
+        },
+      ),
+    ],
+  );
 
   @override
-  Widget build(BuildContext context) {
-    final themeProvider = Provider.of<ThemeProvider>(context);
-
-    return MaterialApp(
+  Widget build(BuildContext context, WidgetRef ref) {
+    final ThemeData theme = ref.watch(themeNotifierProvider);
+    return MaterialApp.router(
       debugShowCheckedModeBanner: false,
-      theme: themeProvider.themeData,
-      home: Scaffold(
-        body: MediaGrid(),
-      ),
+      routerConfig: _router,
+      theme: theme,
     );
   }
 }

lib/models/suggestion_model.dart

@@ -0,0 +1,15 @@
+class Suggestion {
+  final String tag;
+  final int tagged;
+  final double score;
+
+  Suggestion({required this.tag, required this.tagged, required this.score});
+
+  factory Suggestion.fromJson(Map<String, dynamic> json) {
+    return Suggestion(
+      tag: json['tag'].toString(),
+      tagged: int.tryParse(json['tagged'].toString()) ?? 0,
+      score: (json['score'] as num).toDouble(),
+    );
+  }
+}

lib/providers/MediaProvider.dart

@@ -1,95 +0,0 @@
-import 'package:f0ckapp/services/Api.dart';
-import 'package:flutter/material.dart';
-import 'package:f0ckapp/models/MediaItem.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;
-
-  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;
-  Function get resetMedia => _resetMedia;
-
-  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();
-  }
-
-  Future<void> loadMedia({bool notify = true}) async {
-    if (_isLoading) return;
-    _isLoading = true;
-    if (notify) notifyListeners();
-
-    try {
-      final newMedia = await fetchMedia(
-        older: _mediaItems.isNotEmpty ? _mediaItems.last.id : null,
-        type: type,
-        mode: mode,
-        random: random,
-        tag: tag,
-      );
-
-      if(_mediaItems != newMedia) {
-        addMediaItems(newMedia);
-        if (notify) notifyListeners();
-      }
-    } catch (e) {
-      debugPrint('Fehler beim Laden der Medien: $e');
-    } finally {
-      _isLoading = false;
-    }
-  }
-}