v1.1.21+51

- fullscreen

.gitea/workflows/android.yml

@@ -3,7 +3,7 @@ name: Flutter Schmutter
 on:
   push:
     tags:
-      - 'v*'
+      - '*'
 
 jobs:
   build:
@@ -52,5 +52,10 @@ jobs:
             build/app/outputs/flutter-apk/app-release.apk
           token: '${{secrets.RELEASE_TOKEN}}'
 
-      - name: trigger fdroid puller
-        run: curl https://flumm.io/pullfdroid.php?token=${{secrets.PULLER_TOKEN}}
+      - name: upload apk to f-droid server
+        run: |
+          BUILD_NUMBER=$(grep '^version:' pubspec.yaml | sed 's/.*+//')
+          curl -X POST "https://flumm.io/pullfdroid.php" \
+            -F "token=${{ secrets.PULLER_TOKEN }}" \
+            -F "apk=@build/app/outputs/flutter-apk/app-release.apk" \
+            -F "build=$BUILD_NUMBER"

android/app/src/main/AndroidManifest.xml

@@ -3,7 +3,7 @@
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <application
-        android:label="f0ckapp"
+        android:label="f0ck"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
         android:enableOnBackInvokedCallback="true">

android/app/src/main/kotlin/com/f0ck/f0ckapp/MainActivity.kt

@@ -48,7 +48,7 @@ class MainActivity : FlutterActivity() {
     val values =
             ContentValues().apply {
               put(MediaStore.MediaColumns.DISPLAY_NAME, fileName)
-              put(MediaStore.MediaColumns.RELATIVE_PATH, Environment.DIRECTORY_DOWNLOADS + "/" + (subDir ?: "fApp"))
+              put(MediaStore.MediaColumns.RELATIVE_PATH, Environment.DIRECTORY_DOWNLOADS + "/" + (subDir ?: "f0ck"))
               put(MediaStore.MediaColumns.IS_PENDING, 1)
             }
 

lib/providers/media_provider.dart

@@ -115,6 +115,17 @@ class MediaNotifier extends StateNotifier<MediaState> {
     }
   }
 
+  List<MediaItem> mergeMediaItems(
+    List<MediaItem> current,
+    List<MediaItem> incoming,
+  ) {
+    final existingIds = current.map((item) => item.id).toSet();
+    final newItems = incoming
+        .where((item) => !existingIds.contains(item.id))
+        .toList();
+    return [...current, ...newItems];
+  }
+
   Future<void> loadMedia({int? id}) async {
     if (state.isLoading) return;
     state = state.replace(isLoading: true);
@@ -128,8 +139,11 @@ class MediaNotifier extends StateNotifier<MediaState> {
         random: state.random,
         tag: state.tag,
       );
+
       if (newMedia.isNotEmpty) {
-        addMediaItems(newMedia);
+        state = state.replace(
+          mediaItems: mergeMediaItems(state.mediaItems, newMedia),
+        );
       }
     } catch (e) {
       print('Fehler beim Laden der Medien: $e');

lib/providers/theme_provider.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
@@ -232,10 +233,11 @@ final ThemeData f0ck95Theme = ThemeData(
     onPrimary: Colors.black,
     onSecondary: Colors.white,
   ),
-  appBarTheme: const AppBarTheme(
-    backgroundColor: Color(0xFFC0C0C0),
+  appBarTheme: AppBarTheme(
+    backgroundColor: const Color(0xFFE0E0E0),
     foregroundColor: Colors.black,
-    elevation: 2,
+    elevation: 4,
+    centerTitle: true
   ),
   textTheme: const TextTheme(
     bodyLarge: TextStyle(color: Colors.black),

lib/screens/detailview_screen.dart

@@ -1,6 +1,8 @@
 import 'dart:io';
 import 'dart:typed_data';
 
+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';
@@ -71,7 +73,9 @@ class _DetailViewState extends ConsumerState<DetailView> {
   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 File file = await DefaultCacheManager().getSingleFile(
+      currentItem.mediaUrl,
+    );
     final MethodChannel methodChannel = const MethodChannel('MediaShit');
 
     bool? success = await methodChannel.invokeMethod<bool>('saveFile', {
@@ -80,7 +84,9 @@ class _DetailViewState extends ConsumerState<DetailView> {
     });
 
     success == true
-        ? _showMsg('${currentItem.dest} wurde in Downloads/fApp neigespeichert.')
+        ? _showMsg(
+            '${currentItem.dest} wurde in Downloads/fApp neigespeichert.',
+          )
         : _showMsg('${currentItem.dest} konnte nicht heruntergeladen werden.');
   }
 
@@ -99,9 +105,7 @@ class _DetailViewState extends ConsumerState<DetailView> {
 
     if (itemIndex == -1) {
       Future.microtask(() {
-        ref
-            .read(mediaProvider.notifier)
-            .loadMedia(id: widget.initialItemId + 50);
+        ref.read(mediaProvider.notifier).loadMedia(id: widget.initialItemId + 50);
       });
       return Scaffold(
         appBar: AppBar(),
@@ -119,96 +123,7 @@ class _DetailViewState extends ConsumerState<DetailView> {
     }
 
     return Scaffold(
-      appBar: AppBar(
-        centerTitle: true,
-        title: Text('f0ck #${mediaState.mediaItems[_currentIndex].id}'),
-        automaticallyImplyLeading: false,
-        leading: IconButton(
-          icon: const Icon(Icons.arrow_back),
-          onPressed: () {
-            context.canPop() ? context.pop() : context.go('/', extra: true);
-          },
-        ),
-        actions: [
-          IconButton(
-            icon: const Icon(Icons.fullscreen),
-            onPressed: () {
-              _showMsg('fullscreen ist wip');
-            },
-          ),
-          IconButton(
-            icon: const Icon(Icons.download),
-            onPressed: _downloadMedia,
-          ),
-          PopupMenuButton<String>(
-            onSelected: (value) async {
-              final item = mediaState.mediaItems[_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: const Icon(Icons.image),
-                  title: const Text('Als Datei'),
-                ),
-              ),
-              PopupMenuItem(
-                value: 'direct_link',
-                child: ListTile(
-                  leading: const Icon(Icons.link),
-                  title: const Text('Link zur Datei'),
-                ),
-              ),
-              PopupMenuItem(
-                value: 'post_link',
-                child: ListTile(
-                  leading: const Icon(Icons.article),
-                  title: const Text('Link zum f0ck'),
-                ),
-              ),
-            ],
-            icon: const Icon(Icons.share),
-          ),
-        ],
-      ),
-      body: Stack(
-        children: [
-          PageTransformer(
-            controller: _pageController!,
-            pages: mediaState.mediaItems.map((item) {
-              int itemIndex = mediaState.mediaItems.indexOf(item);
-              return SafeArea(
-                child: SmartRefreshIndicator(
-                  onRefresh: _loadMoreMedia,
-                  child: _buildMediaItem(item, _currentIndex == itemIndex),
-                ),
-              );
-            }).toList(),
-          ),
-        ],
-      ),
+      endDrawer: EndDrawer(ref: ref),
       persistentFooterButtons: mediaState.tag != null
           ? [
               Center(
@@ -222,6 +137,120 @@ class _DetailViewState extends ConsumerState<DetailView> {
               ),
             ]
           : null,
+      body: CustomScrollView(
+        slivers: [
+          SliverAppBar(
+            floating: true,
+            pinned: true,
+            snap: true,
+            centerTitle: true,
+            title: Text('f0ck #${mediaState.mediaItems[_currentIndex].id}'),
+            leading: IconButton(
+              icon: const Icon(Icons.arrow_back),
+              onPressed: () {
+                context.canPop() ? context.pop() : context.go('/', extra: true);
+              },
+            ),
+            actions: [
+              IconButton(
+                icon: const Icon(Icons.fullscreen),
+                onPressed: () {
+                  final currentItem = mediaState.mediaItems[_currentIndex];
+                  Navigator.of(context).push(
+                    MaterialPageRoute(
+                      builder: (_) => FullScreenMediaView(item: currentItem),
+                    ),
+                  );
+                },
+              ),
+              IconButton(
+                icon: const Icon(Icons.download),
+                onPressed: _downloadMedia,
+              ),
+              PopupMenuButton<String>(
+                onSelected: (value) async {
+                  final item = mediaState.mediaItems[_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: const Icon(Icons.image),
+                      title: const Text('Als Datei'),
+                    ),
+                  ),
+                  PopupMenuItem(
+                    value: 'direct_link',
+                    child: ListTile(
+                      leading: const Icon(Icons.link),
+                      title: const Text('Link zur Datei'),
+                    ),
+                  ),
+                  PopupMenuItem(
+                    value: 'post_link',
+                    child: ListTile(
+                      leading: const Icon(Icons.article),
+                      title: const Text('Link zum f0ck'),
+                    ),
+                  ),
+                ],
+                icon: const Icon(Icons.share),
+              ),
+              Builder(
+                builder: (context) => IconButton(
+                  icon: const Icon(Icons.menu),
+                  onPressed: () {
+                    Scaffold.of(context).openEndDrawer();
+                  },
+                ),
+              ),
+            ],
+            flexibleSpace: FlexibleSpaceBar(
+              background: Container(color: Colors.transparent),
+            ),
+          ),
+          SliverPadding(
+            padding: EdgeInsets.zero,
+            sliver: SliverFillRemaining(
+              child: PageTransformer(
+                controller: _pageController!,
+                pages: mediaState.mediaItems.map((item) {
+                  int pageIndex = mediaState.mediaItems.indexOf(item);
+                  return SafeArea(
+                    top: false,
+                    child: SmartRefreshIndicator(
+                      onRefresh: _loadMoreMedia,
+                      child: _buildMediaItem(item, _currentIndex == pageIndex),
+                    ),
+                  );
+                }).toList(),
+              ),
+            ),
+          ),
+        ],
+      ),
     );
   }
 
@@ -235,8 +264,10 @@ class _DetailViewState extends ConsumerState<DetailView> {
             CachedNetworkImage(
               imageUrl: item.mediaUrl,
               fit: BoxFit.contain,
-              placeholder: (context, url) => const CircularProgressIndicator(),
-              errorWidget: (context, url, error) => const Icon(Icons.error),
+              placeholder: (context, url) =>
+                  const Center(child: CircularProgressIndicator()),
+              errorWidget: (context, url, error) =>
+                  const Center(child: Icon(Icons.error)),
             )
           else
             VideoWidget(details: item, isActive: isActive),

lib/screens/fullscreen_screen.dart

@@ -0,0 +1,74 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+
+import 'package:cached_network_image/cached_network_image.dart';
+
+import 'package:f0ckapp/models/mediaitem_model.dart';
+import 'package:f0ckapp/widgets/video_widget.dart';
+
+class FullScreenMediaView extends StatefulWidget {
+  final MediaItem item;
+
+  const FullScreenMediaView({super.key, required this.item});
+
+  @override
+  State createState() => _FullScreenMediaViewState();
+}
+
+class _FullScreenMediaViewState extends State<FullScreenMediaView> {
+  @override
+  void initState() {
+    super.initState();
+    SystemChrome.setPreferredOrientations(DeviceOrientation.values);
+    SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
+  }
+
+  @override
+  void dispose() {
+    SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
+    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      backgroundColor: Colors.black,
+      body: Stack(
+        children: [
+          Positioned.fill(
+            child: widget.item.mime.startsWith('image')
+                ? InteractiveViewer(
+                    minScale: 1.0,
+                    maxScale: 6.0,
+                    child: CachedNetworkImage(
+                      imageUrl: widget.item.mediaUrl,
+                      fit: BoxFit.contain,
+                      placeholder: (context, url) =>
+                          const Center(child: CircularProgressIndicator()),
+                      errorWidget: (context, url, error) =>
+                          const Icon(Icons.error),
+                    ),
+                  )
+                : SizedBox.expand(
+                    child: VideoWidget(
+                      details: widget.item,
+                      isActive: true,
+                      fullScreen: true,
+                    ),
+                  ),
+          ),
+          SafeArea(
+            child: Align(
+              alignment: Alignment.topLeft,
+              child: IconButton(
+                icon: const Icon(Icons.arrow_back, color: Colors.white),
+                onPressed: () => Navigator.of(context).pop(),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/screens/mediagrid_screen.dart

@@ -1,14 +1,12 @@
 import 'package:flutter/material.dart';
 
-import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:go_router/go_router.dart';
 
-import 'package:f0ckapp/models/mediaitem_model.dart';
 import 'package:f0ckapp/providers/media_provider.dart';
-import 'package:f0ckapp/utils/appversion_util.dart';
-import 'package:f0ckapp/providers/theme_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});
@@ -19,16 +17,6 @@ class MediaGrid extends ConsumerStatefulWidget {
 
 class _MediaGridState extends ConsumerState<MediaGrid> {
   final ScrollController _scrollController = ScrollController();
-  final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
-
-  final TextEditingController _usernameController = TextEditingController();
-  final TextEditingController _passwordController = TextEditingController();
-
-  int _calculateCrossAxisCount(BuildContext context, int defaultCount) {
-    return defaultCount == 0
-        ? (MediaQuery.of(context).size.width / 110).clamp(3, 5).toInt()
-        : defaultCount;
-  }
 
   @override
   void initState() {
@@ -47,8 +35,6 @@ class _MediaGridState extends ConsumerState<MediaGrid> {
   @override
   void dispose() {
     _scrollController.dispose();
-    _usernameController.dispose();
-    _passwordController.dispose();
     super.dispose();
   }
 
@@ -58,197 +44,98 @@ class _MediaGridState extends ConsumerState<MediaGrid> {
     final MediaNotifier mediaNotifier = ref.read(mediaProvider.notifier);
 
     return Scaffold(
-      key: _scaffoldKey,
-      appBar: AppBar(
-        title: GestureDetector(
-          child: Row(
-            spacing: 10,
-            children: [
-              Image.asset(
-                'assets/images/f0ck_small.webp',
-                fit: BoxFit.fitHeight,
+      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)),
+                  ],
+                ),
               ),
-              Text('fApp', style: TextStyle(fontSize: 24)),
-            ],
-          ),
-          onTap: () {
-            mediaNotifier.setTag(null);
-            _scrollController.jumpTo(0);
-          },
-        ),
-        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,
+              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();
+                      },
+                    );
+                  },
+                ),
+              ],
             ),
-            onPressed: () {
-              mediaNotifier.toggleRandom();
-              _scrollController.jumpTo(0);
-            },
-          ),
-          IconButton(
-            icon: const Icon(Icons.menu),
-            onPressed: () {
-              _scaffoldKey.currentState?.openEndDrawer();
-            },
-          ),
-        ],
-      ),
-      bottomNavigationBar: BottomAppBar(
-        height: 50,
-        child: Row(
-          mainAxisAlignment: MainAxisAlignment.spaceAround,
-          children: [
-            const Text('type: '),
-            DropdownButton<String>(
-              value: mediaTypes[mediaState.typeIndex],
-              isDense: true,
-              items: mediaTypes.map((String value) {
-                return DropdownMenuItem<String>(
-                  value: value,
-                  child: Text(value),
-                );
-              }).toList(),
-              onChanged: (String? newValue) {
-                if (newValue != null) {
-                  mediaNotifier.setType(newValue);
-                  _scrollController.jumpTo(0);
-                }
-              },
-            ),
-            const Text('mode: '),
-            DropdownButton<String>(
-              value: mediaModes[mediaState.modeIndex],
-              isDense: true,
-              items: mediaModes.map((String value) {
-                return DropdownMenuItem<String>(
-                  value: value,
-                  child: Text(value),
-                );
-              }).toList(),
-              onChanged: (String? newValue) {
-                if (newValue != null) {
-                  mediaNotifier.setMode(mediaModes.indexOf(newValue));
-                  _scrollController.jumpTo(0);
-                }
-              },
+            SliverPadding(
+              padding: const EdgeInsets.all(5.0),
+              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: const SliverGridDelegateWithMaxCrossAxisExtent(
+                  maxCrossAxisExtent: 150,
+                  crossAxisSpacing: 5,
+                  mainAxisSpacing: 5,
+                  childAspectRatio: 1,
+                ),
+              ),
             ),
           ],
         ),
       ),
-      endDrawer: Drawer(
-        child: ListView(
-          padding: EdgeInsets.zero,
-          children: [
-            DrawerHeader(
-              decoration: const BoxDecoration(
-                image: DecorationImage(
-                  image: AssetImage('assets/images/menu.webp'),
-                  fit: BoxFit.cover,
-                  alignment: Alignment.topCenter,
-                ),
-              ),
-              child: null,
-            ),
-            /*ExpansionTile(
-              title: const Text('Login'),
-              children: [
-                Padding(
-                  padding: const EdgeInsets.all(16.0),
-                  child: Column(
-                    children: [
-                      TextField(
-                        readOnly: true,
-                        controller: _usernameController,
-                        decoration: const InputDecoration(
-                          labelText: 'Benutzername',
-                        ),
-                      ),
-                      const SizedBox(height: 10),
-                      TextField(
-                        readOnly: true,
-                        controller: _passwordController,
-                        obscureText: true,
-                        decoration: const InputDecoration(
-                          labelText: 'Passwort',
-                        ),
-                      ),
-                      const SizedBox(height: 20),
-                      ElevatedButton(
-                        onPressed: () async {
-                          ScaffoldMessenger.of(context).showSnackBar(
-                            const SnackBar(
-                              content: Text("noch nicht implementiert lol"),
-                            ),
-                            final success = await login(
-                              _usernameController.text,
-                              _passwordController.text,
-                            );
-
-                            if (success) {
-                              Navigator.pop(context);
-                            } else {
-                              ScaffoldMessenger.of(context).showSnackBar(
-                                SnackBar(content: Text("Login fehlgeschlagen!")),
-                              );
-                            }
-                          );
-                        },
-                        child: const Text('Login'),
-                      ),
-                    ],
-                  ),
-                ),
-              ],
-            ),*/
-            ExpansionTile(
-              title: const Text('Theme'),
-              children: [
-                Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 16.0),
-                  child: Column(
-                    children: themeMap.entries.map((entry) {
-                      final String themeName = entry.key;
-                      final ThemeData themeData = entry.value;
-                      final ThemeData currentTheme = ref.watch(themeNotifierProvider);
-                      final bool isSelected = currentTheme == themeData;
-                      return ListTile(
-                        title: Text(themeName),
-                        selected: isSelected,
-                        selectedTileColor: Colors.blue.withValues(alpha: 0.2),
-                        onTap: () async {
-                          await ref
-                              .read(themeNotifierProvider.notifier)
-                              .updateTheme(themeName);
-                        },
-                      );
-                    }).toList(),
-                  ),
-                ),
-              ],
-            ),
-            ListTile(
-              title: Text('v${AppVersion.version}'),
-              onTap: () {
-                ScaffoldMessenger.of(context).showSnackBar(
-                  const SnackBar(
-                    content: Text('jooong lass das, hier ist nichts'),
-                  ),
-                );
-              },
-            ),
-          ],
-        ),
+      bottomNavigationBar: FilterBar(
+        mediaNotifier: mediaNotifier,
+        mediaState: mediaState,
+        scrollController: _scrollController,
       ),
+      endDrawer: EndDrawer(ref: ref),
       persistentFooterButtons: mediaState.tag != null
           ? [
               Center(
@@ -262,62 +149,6 @@ class _MediaGridState extends ConsumerState<MediaGrid> {
               ),
             ]
           : null,
-      body: RefreshIndicator(
-        onRefresh: () async {
-          mediaNotifier.resetMedia();
-          _scrollController.jumpTo(0);
-        },
-        child: GridView.builder(
-          key: const PageStorageKey('mediaGrid'),
-          controller: _scrollController,
-          gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-            crossAxisCount: _calculateCrossAxisCount(
-              context,
-              mediaState.crossAxisCount,
-            ),
-            crossAxisSpacing: 5.0,
-            mainAxisSpacing: 5.0,
-          ),
-          itemCount:
-              mediaState.mediaItems.length + (mediaState.isLoading ? 1 : 0),
-          itemBuilder: (BuildContext context, int index) {
-            if (index >= mediaState.mediaItems.length) {
-              return const Center(child: CircularProgressIndicator());
-            }
-            final MediaItem item = mediaState.mediaItems[index];
-
-            return InkWell(
-              onTap: () async {
-                context.push('/${item.id}', extra: true);
-              },
-              child: Stack(
-                fit: StackFit.expand,
-                children: <Widget>[
-                  CachedNetworkImage(
-                    imageUrl: item.thumbnailUrl,
-                    fit: BoxFit.cover,
-                    placeholder: (context, url) => const SizedBox.shrink(),
-                    errorWidget: (context, url, error) =>
-                        const Icon(Icons.error),
-                  ),
-                  Align(
-                    alignment: Alignment.bottomRight,
-                    child: Icon(
-                      Icons.square,
-                      color: switch (item.mode) {
-                        1 => Colors.green,
-                        2 => Colors.red,
-                        _ => Colors.yellow,
-                      },
-                      size: 15.0,
-                    ),
-                  ),
-                ],
-              ),
-            );
-          },
-        ),
-      ),
     );
   }
 }

lib/services/api_service.dart

@@ -13,16 +13,16 @@ final FlutterSecureStorage storage = const FlutterSecureStorage(
 
 Future<List<MediaItem>> fetchMedia({
   int? older,
-  String? type,
-  int? mode,
-  bool? random,
+  String type = 'image',
+  int mode = 0,
+  bool random = false,
   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(),
+      'type': type,
+      'mode': mode.toString(),
+      'random': (random ? 1 : 0).toString(),
       if (tag != null) 'tag': tag,
       if (older != null) 'older': older.toString(),
     },
@@ -61,14 +61,14 @@ Future<List<Suggestion>> fetchSuggestions(String query) async {
 
     if (response.statusCode == 200) {
       final dynamic decoded = jsonDecode(response.body);
-
       if (decoded is List) {
-        return decoded
+        final suggestions = decoded
             .map((item) => Suggestion.fromJson(item as Map<String, dynamic>))
-            .toList()
-          ..sort((a, b) => b.score.compareTo(a.score));
+            .toList();
+        suggestions.sort((a, b) => b.score.compareTo(a.score));
+        return suggestions;
       } else {
-        throw Exception('Unerwartetes Format: Erwartet wurde eine Liste.');
+        throw Exception('Unerwartetes Format: Es wurde eine Liste erwartet.');
       }
     } else if (response.statusCode == 400) {
       final dynamic error = jsonDecode(response.body);
@@ -84,7 +84,7 @@ Future<List<Suggestion>> fetchSuggestions(String query) async {
   } on TimeoutException {
     throw Exception('Anfrage an die API hat zu lange gedauert.');
   } catch (e) {
-    throw Exception('Fehler beim Verarbeiten der Anfrage: $e');
+    throw Exception('Fehler bei der Verarbeitung der Anfrage: $e');
   }
 }
 
@@ -98,12 +98,14 @@ Future<bool> login(String username, String password) async {
 
   if (response.statusCode == 200) {
     final dynamic data = jsonDecode(response.body);
-    final dynamic token = data['token'];
-
-    await storage.write(key: "token", value: token);
-
-    return true;
+    final token = data['token'];
+    if (token != null) {
+      await storage.write(key: "token", value: token);
+      return true;
+    } else {
+      throw Exception('Token nicht im Response enthalten.');
+    }
   } else {
-    return false;
+    throw Exception('Login fehlgeschlagen: ${response.statusCode}');
   }
 }

lib/widgets/end_drawer.dart

@@ -0,0 +1,122 @@
+import 'package:flutter/material.dart';
+
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import 'package:f0ckapp/providers/theme_provider.dart';
+import 'package:f0ckapp/utils/appversion_util.dart';
+
+class EndDrawer extends StatelessWidget {
+  final WidgetRef ref;
+
+  const EndDrawer({super.key, required this.ref});
+
+  @override
+  Widget build(BuildContext context) {
+    return Drawer(
+      child: ListView(
+        padding: EdgeInsets.zero,
+        children: [
+          DrawerHeader(
+            decoration: const BoxDecoration(
+              image: DecorationImage(
+                image: AssetImage('assets/images/menu.webp'),
+                fit: BoxFit.cover,
+                alignment: Alignment.topCenter,
+              ),
+            ),
+            child: null,
+          ),
+          /*ExpansionTile(
+              title: const Text('Login'),
+              children: [
+                Padding(
+                  padding: const EdgeInsets.all(16.0),
+                  child: Column(
+                    children: [
+                      TextField(
+                        readOnly: true,
+                        controller: _usernameController,
+                        decoration: const InputDecoration(
+                          labelText: 'Benutzername',
+                        ),
+                      ),
+                      const SizedBox(height: 10),
+                      TextField(
+                        readOnly: true,
+                        controller: _passwordController,
+                        obscureText: true,
+                        decoration: const InputDecoration(
+                          labelText: 'Passwort',
+                        ),
+                      ),
+                      const SizedBox(height: 20),
+                      ElevatedButton(
+                        onPressed: () async {
+                          ScaffoldMessenger.of(context).showSnackBar(
+                            const SnackBar(
+                              content: Text("noch nicht implementiert lol"),
+                            ),
+                            final success = await login(
+                              _usernameController.text,
+                              _passwordController.text,
+                            );
+
+                            if (success) {
+                              Navigator.pop(context);
+                            } else {
+                              ScaffoldMessenger.of(context).showSnackBar(
+                                SnackBar(content: Text("Login fehlgeschlagen!")),
+                              );
+                            }
+                          );
+                        },
+                        child: const Text('Login'),
+                      ),
+                    ],
+                  ),
+                ),
+              ],
+            ),*/
+          ExpansionTile(
+            title: const Text('Theme'),
+            children: [
+              Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 16.0),
+                child: Column(
+                  children: themeMap.entries.map((entry) {
+                    final String themeName = entry.key;
+                    final ThemeData themeData = entry.value;
+                    final ThemeData currentTheme = ref.watch(
+                      themeNotifierProvider,
+                    );
+                    final bool isSelected = currentTheme == themeData;
+                    return ListTile(
+                      title: Text(themeName),
+                      selected: isSelected,
+                      selectedTileColor: Colors.blue.withValues(alpha: 0.2),
+                      onTap: () async {
+                        await ref
+                            .read(themeNotifierProvider.notifier)
+                            .updateTheme(themeName);
+                      },
+                    );
+                  }).toList(),
+                ),
+              ),
+            ],
+          ),
+          ListTile(
+            title: Text('v${AppVersion.version}'),
+            onTap: () {
+              ScaffoldMessenger.of(context).showSnackBar(
+                const SnackBar(
+                  content: Text('jooong lass das, hier ist nichts'),
+                ),
+              );
+            },
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/widgets/filter_bar.dart

@@ -0,0 +1,62 @@
+import 'package:flutter/material.dart';
+
+import 'package:f0ckapp/providers/media_provider.dart';
+
+class FilterBar extends StatelessWidget {
+  final MediaState mediaState;
+  final MediaNotifier mediaNotifier;
+  final ScrollController scrollController;
+  
+  const FilterBar({
+    super.key,
+    required this.mediaState,
+    required this.mediaNotifier,
+    required this.scrollController,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return BottomAppBar(
+      height: 50,
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.spaceAround,
+        children: [
+          const Text('type: '),
+          DropdownButton<String>(
+            value: mediaTypes[mediaState.typeIndex],
+            isDense: true,
+            items: mediaTypes.map((String value) {
+              return DropdownMenuItem<String>(
+                value: value,
+                child: Text(value),
+              );
+            }).toList(),
+            onChanged: (String? newValue) {
+              if (newValue != null) {
+                mediaNotifier.setType(newValue);
+                scrollController.jumpTo(0);
+              }
+            },
+          ),
+          const Text('mode: '),
+          DropdownButton<String>(
+            value: mediaModes[mediaState.modeIndex],
+            isDense: true,
+            items: mediaModes.map((String value) {
+              return DropdownMenuItem<String>(
+                value: value,
+                child: Text(value),
+              );
+            }).toList(),
+            onChanged: (String? newValue) {
+              if (newValue != null) {
+                mediaNotifier.setMode(mediaModes.indexOf(newValue));
+                scrollController.jumpTo(0);
+              }
+            },
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/widgets/media_tile.dart

@@ -0,0 +1,46 @@
+import 'package:flutter/material.dart';
+
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:go_router/go_router.dart';
+
+import 'package:f0ckapp/models/mediaitem_model.dart';
+
+class MediaTile extends StatelessWidget {
+  final MediaItem item;
+
+  const MediaTile({super.key, required this.item});
+
+  @override
+  Widget build(BuildContext context) {
+    return InkWell(
+      onTap: () {
+        context.push('/${item.id}', extra: true);
+      },
+      child: Stack(
+        fit: StackFit.expand,
+        children: [
+          Hero(
+            tag: 'media-${item.id}',
+            child: CachedNetworkImage(
+              imageUrl: item.thumbnailUrl,
+              fit: BoxFit.cover,
+              errorWidget: (context, url, error) => const Icon(Icons.error),
+            ),
+          ),
+          Align(
+            alignment: Alignment.bottomRight,
+            child: Icon(
+              Icons.square,
+              color: switch (item.mode) {
+                1 => Colors.green,
+                2 => Colors.red,
+                _ => Colors.yellow,
+              },
+              size: 15.0,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/widgets/video_widget.dart

@@ -13,8 +13,14 @@ import 'package:f0ckapp/providers/media_provider.dart';
 class VideoWidget extends ConsumerStatefulWidget {
   final MediaItem details;
   final bool isActive;
+  final bool fullScreen;
 
-  const VideoWidget({super.key, required this.details, required this.isActive});
+  const VideoWidget({
+    super.key,
+    required this.details,
+    required this.isActive,
+    this.fullScreen = false,
+  });
 
   @override
   ConsumerState<VideoWidget> createState() => _VideoWidgetState();
@@ -90,17 +96,15 @@ class _VideoWidgetState extends ConsumerState<VideoWidget> {
 
     bool isAudio = widget.details.mime.startsWith('audio');
 
-    return Column(
-      mainAxisSize: MainAxisSize.min,
-      children: [
-        AspectRatio(
-          aspectRatio: _controller.value.isInitialized
-              ? _controller.value.aspectRatio
-              : 9 / 16,
-          child: Stack(
-            alignment: Alignment.topCenter,
-            children: [
-              GestureDetector(
+    if (widget.fullScreen) {
+      return Stack(
+        children: [
+          Center(
+            child: AspectRatio(
+              aspectRatio: _controller.value.isInitialized
+                  ? _controller.value.aspectRatio
+                  : 9 / 16,
+              child: GestureDetector(
                 onTap: _onTap,
                 child: isAudio
                     ? CachedNetworkImage(
@@ -118,24 +122,71 @@ class _VideoWidgetState extends ConsumerState<VideoWidget> {
                     ? CachedVideoPlayerPlus(_controller)
                     : const Center(child: CircularProgressIndicator()),
               ),
-              if (_controller.value.isInitialized && _showControls) ...[
-                IgnorePointer(
-                  ignoring: true,
-                  child: Container(
-                    color: Colors.black.withValues(alpha: 0.5),
-                    width: double.infinity,
-                    height: double.infinity,
+            ),
+          ),
+          if (_controller.value.isInitialized && _showControls)
+            Positioned.fill(
+              child: GestureDetector(
+                onTap: _onTap,
+                child: Container(
+                  color: Colors.black.withValues(alpha: 0.5),
+                  child: VideoControlsOverlay(
+                    controller: _controller,
+                    button: () => _onTap(ctrlButton: true),
                   ),
                 ),
-                VideoControlsOverlay(
-                  controller: _controller,
-                  button: () => _onTap(ctrlButton: true),
+              ),
+            ),
+        ],
+      );
+    } else {
+      return Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          AspectRatio(
+            aspectRatio: _controller.value.isInitialized
+                ? _controller.value.aspectRatio
+                : 9 / 16,
+            child: Stack(
+              alignment: Alignment.topCenter,
+              children: [
+                GestureDetector(
+                  onTap: _onTap,
+                  child: isAudio
+                      ? CachedNetworkImage(
+                          imageUrl: widget.details.coverUrl,
+                          fit: BoxFit.cover,
+                          placeholder: (context, url) =>
+                              const CircularProgressIndicator(),
+                          errorWidget: (context, url, error) => Image.asset(
+                            'assets/images/music.webp',
+                            fit: BoxFit.contain,
+                            width: double.infinity,
+                          ),
+                        )
+                      : _controller.value.isInitialized
+                      ? CachedVideoPlayerPlus(_controller)
+                      : const Center(child: CircularProgressIndicator()),
                 ),
+                if (_controller.value.isInitialized && _showControls) ...[
+                  IgnorePointer(
+                    ignoring: true,
+                    child: Container(
+                      color: Colors.black.withValues(alpha: 0.5),
+                      width: double.infinity,
+                      height: double.infinity,
+                    ),
+                  ),
+                  VideoControlsOverlay(
+                    controller: _controller,
+                    button: () => _onTap(ctrlButton: true),
+                  ),
+                ],
               ],
-            ],
+            ),
           ),
-        ),
-      ],
-    );
+        ],
+      );
+    }
   }
 }

pubspec.yaml

@@ -1,5 +1,5 @@
 name: f0ckapp
-description: "A new Flutter project."
+description: "f0ck schm0ck"
 # The following line prevents the package from being accidentally published to
 # pub.dev using `flutter pub publish`. This is preferred for private packages.
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
@@ -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.1.14+44
+version: 1.1.21+51
 
 environment:
   sdk: ^3.9.0-100.2.beta

test/widget_test.dart

@@ -13,7 +13,7 @@ import 'package:f0ckapp/main.dart';
 void main() {
   testWidgets('Counter increments smoke test', (WidgetTester tester) async {
     // Build our app and trigger a frame.
-    await tester.pumpWidget(const F0ckApp());
+    await tester.pumpWidget(F0ckApp());
 
     // Verify that our counter starts at 0.
     expect(find.text('0'), findsOneWidget);