v1.4.8+69

...
v1.4.7+68
2025-06-24 03:02:39 +02:00 · 2025-06-24 02:21:06 +02:00 · 2025-06-23 16:32:15 +02:00
10 changed files with 633 additions and 440 deletions
--- a/.gitea/workflows/android.yml
+++ b/.gitea/workflows/android.yml
@ -41,7 +41,7 @@ jobs:
          TAR_OPTIONS: --no-same-owner
      
      - name: build apk
-        run: flutter build apk --release
+        run: flutter build apk --release --split-per-abi

      - name: release-build
        uses: akkuman/gitea-release-action@v1
@ -49,7 +49,9 @@ jobs:
          NODE_OPTIONS: '--experimental-fetch'
        with:
          files: |-
-            build/app/outputs/flutter-apk/app-release.apk
+            build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk
+            build/app/outputs/flutter-apk/app-arm64-v8a-release.apk
+            build/app/outputs/flutter-apk/app-x86_64-release.apk
          token: '${{secrets.RELEASE_TOKEN}}'

      - name: upload apk to f-droid server
@ -57,5 +59,5 @@ jobs:
          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 "apk=@build/app/outputs/flutter-apk/app-arm64-v8a-release.apk" \
            -F "build=$BUILD_NUMBER"
--- a/lib/controller/mediacontroller.dart
+++ b/lib/controller/mediacontroller.dart
@ -14,6 +14,7 @@ class MediaController extends GetxController {
  RxBool loading = false.obs;
  RxBool atEnd = false.obs;
  RxBool atStart = false.obs;
+  Rxn<String> errorMessage = Rxn<String>();

  RxInt typeIndex = 0.obs;
  RxInt modeIndex = 0.obs;
@ -22,12 +23,10 @@ class MediaController extends GetxController {

  void setTypeIndex(int idx) {
    typeIndex.value = idx;
-    fetchInitial();
  }

  void setModeIndex(int idx) {
    modeIndex.value = idx;
-    fetchInitial();
  }

  void setTag(String? newTag, {bool reload = true}) {
@ -37,6 +36,10 @@ class MediaController extends GetxController {
    }
  }

+  void toggleRandom() {
+    random.value = random.value == 0 ? 1 : 0;
+  }
+
  Future<List<Favorite>?> toggleFavorite(
    MediaItem item,
    bool isFavorite,
@ -51,6 +54,7 @@ class MediaController extends GetxController {
  Future<Feed?> _fetchItems({int? older, int? newer}) async {
    if (loading.value) return null;
    loading.value = true;
+    errorMessage.value = null;
    try {
      return await _api.fetchItems(
        older: older,
@ -61,11 +65,10 @@ class MediaController extends GetxController {
        tag: tag.value,
      );
    } catch (e) {
-      Get.snackbar(
-        'Fehler beim Laden',
-        'Die Daten konnten nicht abgerufen werden. Wo Internet?',
-        snackPosition: SnackPosition.BOTTOM,
-      );
+      final String errorText =
+          'Die Daten konnten nicht abgerufen werden. Wo Internet?';
+      errorMessage.value = errorText;
+      Get.snackbar('Fehler beim Laden', errorText);
      return null;
    } finally {
      loading.value = false;
@ -73,7 +76,7 @@ class MediaController extends GetxController {
  }

  Future<void> fetchInitial({int? id}) async {
-    final result = await _fetchItems(older: id);
+    final Feed? result = await _fetchItems(older: id);
    if (result != null) {
      items.assignAll(result.items);
      atEnd.value = result.atEnd;
@ -83,7 +86,7 @@ class MediaController extends GetxController {

  Future<void> fetchMore() async {
    if (items.isEmpty || atEnd.value) return;
-    final result = await _fetchItems(older: items.last.id);
+    final Feed? result = await _fetchItems(older: items.last.id);
    if (result != null) {
      final Set<int> existingIds = items.map((e) => e.id).toSet();
      final List<MediaItem> newItems = result.items
@ -95,10 +98,9 @@ class MediaController extends GetxController {
    }
  }

-  Future<int> fetchNewer() async {
-    if (items.isEmpty || atStart.value) return 0;
-    final oldLength = items.length;
-    final result = await _fetchItems(newer: items.first.id);
+  Future<void> fetchNewer() async {
+    if (items.isEmpty || atStart.value) return;
+    final Feed? result = await _fetchItems(newer: items.first.id);
    if (result != null) {
      final Set<int> existingIds = items.map((e) => e.id).toSet();
      final List<MediaItem> newItems = result.items
@ -107,9 +109,8 @@ class MediaController extends GetxController {
      items.insertAll(0, newItems);
      items.refresh();
      atStart.value = result.atStart;
-      return items.length - oldLength;
    }
-    return 0;
+    return;
  }

  Future<void> handleRefresh() async {
@ -122,15 +123,11 @@ class MediaController extends GetxController {
  }

  Future<void> handleLoading() async {
+    if (loading.value) return;
    if (!loading.value && !atEnd.value) {
      await fetchMore();
    }
  }

-  void toggleRandom() {
-    random.value = random.value == 1 ? 0 : 1;
-    fetchInitial();
-  }
-
  bool get isRandomEnabled => random.value == 1;
 }
--- a/lib/controller/settingscontroller.dart
+++ b/lib/controller/settingscontroller.dart
@ -19,9 +19,6 @@ class SettingsController extends GetxController {
  RxBool drawerSwipeEnabled = true.obs;
  RxInt crossAxisCount = 0.obs;

-  RxInt videoControlsTimerNotifier = 0.obs;
-  RxInt hideControlsNotifier = 0.obs;
-
  @override
  void onInit() {
    super.onInit();
@ -53,9 +50,6 @@ class SettingsController extends GetxController {
    await saveSettings();
  }

-  void resetVideoControlsTimer() => videoControlsTimerNotifier.value++;
-  void hideVideoControls() => hideControlsNotifier.value++;
-
  Future<void> loadSettings() async {
    muted.value = await storage.getBoolean(_StorageKeys.muted) ?? false;
    crossAxisCount.value =
--- a/lib/screens/fullscreen.dart
+++ b/lib/screens/fullscreen.dart
@ -8,14 +8,21 @@ import 'package:f0ckapp/widgets/video_widget.dart';

 class FullScreenMediaView extends StatefulWidget {
  final MediaItem item;
+  final Duration? initialPosition;

-  const FullScreenMediaView({super.key, required this.item});
+  const FullScreenMediaView({
+    super.key,
+    required this.item,
+    this.initialPosition,
+  });

  @override
  State createState() => _FullScreenMediaViewState();
 }

 class _FullScreenMediaViewState extends State<FullScreenMediaView> {
+  final GlobalKey<VideoWidgetState> _videoKey = GlobalKey<VideoWidgetState>();
+
  @override
  void initState() {
    super.initState();
@ -30,9 +37,21 @@ class _FullScreenMediaViewState extends State<FullScreenMediaView> {
    super.dispose();
  }

+  void _popWithPosition() {
+    Duration? currentPosition;
+    if (widget.item.mime.startsWith('video') && _videoKey.currentState != null) {
+      currentPosition = _videoKey.currentState!.videoController.value.position;
+    }
+    Navigator.of(context).pop(currentPosition);
+  }
+
  @override
  Widget build(BuildContext context) {
-    return Scaffold(
+    return PopScope(
+      onPopInvokedWithResult: (bool didPop, Object? result) async {
+        return _popWithPosition();
+      },
+      child: Scaffold(
        backgroundColor: Colors.black,
        body: Stack(
          children: [
@ -52,9 +71,11 @@ class _FullScreenMediaViewState extends State<FullScreenMediaView> {
                    )
                  : Center(
                      child: VideoWidget(
+                        key: _videoKey,
                        details: widget.item,
                        isActive: true,
                        fullScreen: true,
+                        initialPosition: widget.initialPosition,
                      ),
                    ),
            ),
@ -63,12 +84,13 @@ class _FullScreenMediaViewState extends State<FullScreenMediaView> {
                alignment: Alignment.topLeft,
                child: IconButton(
                  icon: const Icon(Icons.arrow_back, color: Colors.white),
-                onPressed: () => Navigator.of(context).pop(),
+                  onPressed: _popWithPosition,
                ),
              ),
            ),
          ],
        ),
+      ),
    );
  }
 }
--- a/lib/screens/mediadetail.dart
+++ b/lib/screens/mediadetail.dart
@ -39,10 +39,12 @@ class _MediaDetailScreenState extends State<MediaDetailScreen> {
  final RxInt _currentIndex = 0.obs;
  final MethodChannel _mediaSaverChannel = const MethodChannel('MediaShit');
  final Map<int, PullexRefreshController> _refreshControllers = {};
+  final Map<int, GlobalKey<VideoWidgetState>> _videoWidgetKeys = {};

  bool _isLoading = true;
  bool _itemNotFound = false;
  final Set<int> _readyItemIds = {};
+  final Map<int, bool> _showFavoriteAnimation = {};

  final List<PopupMenuEntry<ShareAction>> _shareMenuItems = const [
    PopupMenuItem(
@ -140,6 +142,18 @@ class _MediaDetailScreenState extends State<MediaDetailScreen> {
        setState(() => _readyItemIds.add(item.id));
      }
    }
+
+    if (idx + 1 < mediaController.items.length) {
+      DefaultCacheManager().downloadFile(
+        mediaController.items[idx + 1].mediaUrl,
+      );
+    }
+    if (idx - 1 >= 0) {
+      DefaultCacheManager().downloadFile(
+        mediaController.items[idx - 1].mediaUrl,
+      );
+    }
+
    if (idx >= mediaController.items.length - 2 &&
        !mediaController.loading.value &&
        !mediaController.atEnd.value) {
@ -201,6 +215,37 @@ class _MediaDetailScreenState extends State<MediaDetailScreen> {
    }
  }

+  Future<void> _handleFullScreen(MediaItem currentItem) async {
+    if (currentItem.mime.startsWith('image')) {
+      Get.to(
+        () => FullScreenMediaView(item: currentItem),
+        fullscreenDialog: true,
+      );
+      return;
+    }
+
+    final GlobalKey<VideoWidgetState>? key = _videoWidgetKeys[currentItem.id];
+    final VideoWidgetState? videoState = key?.currentState;
+    if (videoState == null || !videoState.videoController.value.isInitialized) {
+      return;
+    }
+
+    final Duration position = videoState.videoController.value.position;
+    await videoState.videoController.pause();
+
+    final Duration? newPosition = await Get.to<Duration?>(
+      () => FullScreenMediaView(item: currentItem, initialPosition: position),
+      fullscreenDialog: true,
+    );
+
+    if (mounted && videoState.mounted) {
+      if (newPosition != null) {
+        await videoState.videoController.seekTo(newPosition);
+      }
+      await videoState.videoController.play();
+    }
+  }
+
  @override
  void dispose() {
    _pageController?.dispose();
@ -210,16 +255,49 @@ class _MediaDetailScreenState extends State<MediaDetailScreen> {
    super.dispose();
  }

+  Future<void> _handleFavoriteToggle(MediaItem item, bool isFavorite) async {
+    if (!authController.isLoggedIn) return;
+    HapticFeedback.lightImpact();
+
+    final List<Favorite>? newFavorites = await mediaController.toggleFavorite(
+      item,
+      isFavorite,
+    );
+
+    final int index = mediaController.items.indexWhere((i) => i.id == item.id);
+
+    if (newFavorites != null && index != -1) {
+      mediaController.items[index] = item.copyWith(favorites: newFavorites);
+      mediaController.items.refresh();
+    }
+
+    if (!mounted) return;
+    setState(() => _showFavoriteAnimation[item.id] = true);
+    Future.delayed(const Duration(milliseconds: 700), () {
+      if (mounted) {
+        setState(() => _showFavoriteAnimation[item.id] = false);
+      }
+    });
+  }
+
  Widget _buildMedia(MediaItem item, bool isActive) {
+    Widget mediaWidget;
    if (item.mime.startsWith('image/')) {
-      return CachedNetworkImage(
+      mediaWidget = CachedNetworkImage(
        imageUrl: item.mediaUrl,
        fit: BoxFit.contain,
+        placeholder: (context, url) =>
+            const Center(child: CircularProgressIndicator()),
        errorWidget: (c, e, s) => const Icon(Icons.broken_image, size: 100),
      );
    } else if (item.mime.startsWith('video/') ||
        item.mime.startsWith('audio/')) {
-      return VideoWidget(
+      final key = _videoWidgetKeys.putIfAbsent(
+        item.id,
+        () => GlobalKey<VideoWidgetState>(),
+      );
+      mediaWidget = VideoWidget(
+        key: key,
        details: item,
        isActive: isActive,
        onInitialized: () {
@ -229,8 +307,39 @@ class _MediaDetailScreenState extends State<MediaDetailScreen> {
        },
      );
    } else {
-      return const Icon(Icons.help_outline, size: 100);
+      mediaWidget = const Icon(Icons.help_outline, size: 100);
    }
+
+    final bool isFavorite =
+        item.favorites?.any((f) => f.userId == authController.user.value?.id) ??
+        false;
+
+    return Hero(
+      tag: 'media_${item.id}',
+      child: GestureDetector(
+        onDoubleTap: () => _handleFavoriteToggle(item, isFavorite),
+        child: Stack(
+          alignment: Alignment.center,
+          children: [
+            mediaWidget,
+            AnimatedOpacity(
+              opacity: _showFavoriteAnimation[item.id] ?? false ? 1.0 : 0.0,
+              duration: const Duration(milliseconds: 200),
+              child: AnimatedScale(
+                scale: _showFavoriteAnimation[item.id] ?? false ? 1.0 : 0.5,
+                duration: const Duration(milliseconds: 400),
+                curve: Curves.easeOutBack,
+                child: Icon(
+                  isFavorite ? Icons.favorite : Icons.favorite_outline,
+                  color: Colors.red,
+                  size: 100,
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
  }

  @override
@ -267,12 +376,7 @@ class _MediaDetailScreenState extends State<MediaDetailScreen> {
          actions: [
            IconButton(
              icon: const Icon(Icons.fullscreen),
-              onPressed: () {
-                Get.to(
-                  FullScreenMediaView(item: currentItem),
-                  fullscreenDialog: true,
-                );
-              },
+              onPressed: () => _handleFullScreen(currentItem),
            ),
            IconButton(
              icon: const Icon(Icons.download),
@ -291,28 +395,26 @@ class _MediaDetailScreenState extends State<MediaDetailScreen> {
            ),
          ],
        ),
-        body: PageView.builder(
+        body: Stack(
+          children: [
+            PageView.builder(
              controller: _pageController!,
              itemCount: mediaController.items.length,
              onPageChanged: _onPageChanged,
              itemBuilder: (context, index) {
                final MediaItem item = mediaController.items[index];
                final bool isReady = _readyItemIds.contains(item.id);
-            final ScrollController scrollController = ScrollController();
                final PullexRefreshController refreshController =
                    _refreshControllers.putIfAbsent(
                      item.id,
                      () => PullexRefreshController(),
                    );

-            return Stack(
-              children: [
-                PullexRefresh(
+                return PullexRefresh(
                  onRefresh: () => _onRefresh(item.id, refreshController),
                  header: const WaterDropHeader(),
                  controller: refreshController,
                  child: CustomScrollView(
-                    controller: scrollController,
                    slivers: [
                      SliverToBoxAdapter(
                        child: AnimatedBuilder(
@ -335,9 +437,6 @@ class _MediaDetailScreenState extends State<MediaDetailScreen> {
                        SliverFillRemaining(
                          hasScrollBody: false,
                          fillOverscroll: true,
-                          child: GestureDetector(
-                            onTap: () => settingsController.hideVideoControls(),
-                            behavior: HitTestBehavior.translucent,
                          child: Padding(
                            padding: const EdgeInsets.all(16.0),
                            child: Column(
@ -346,12 +445,13 @@ class _MediaDetailScreenState extends State<MediaDetailScreen> {
                            ),
                          ),
                        ),
-                        ),
                      const SliverToBoxAdapter(
                        child: SafeArea(child: SizedBox.shrink()),
                      ),
                    ],
                  ),
+                );
+              },
            ),
            Obx(() {
              if (!authController.isLoggedIn) {
@ -359,10 +459,14 @@ class _MediaDetailScreenState extends State<MediaDetailScreen> {
              }
              final MediaItem currentItem =
                  mediaController.items[_currentIndex.value];
+
+              final bool hasSoftButtons =
+                  MediaQuery.of(context).padding.bottom > 24.0;
+
              return DraggableScrollableSheet(
-                    initialChildSize: 0.11,
-                    minChildSize: 0.11,
-                    maxChildSize: 0.245,
+                initialChildSize: hasSoftButtons ? 0.11 : 0.2,
+                minChildSize: hasSoftButtons ? 0.11 : 0.2,
+                maxChildSize: hasSoftButtons ? 0.245 : 0.2,
                snap: true,
                builder: (context, scrollController) => ListView(
                  controller: scrollController,
@ -394,8 +498,6 @@ class _MediaDetailScreenState extends State<MediaDetailScreen> {
              );
            }),
          ],
-            );
-          },
        ),
        persistentFooterButtons: mediaController.tag.value != null
            ? [TagFooter()]
--- a/lib/screens/mediagrid.dart
+++ b/lib/screens/mediagrid.dart
@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pullex/pullex.dart';

+import 'package:f0ckapp/models/item.dart';
 import 'package:f0ckapp/widgets/tagfooter.dart';
 import 'package:f0ckapp/utils/customsearchdelegate.dart';
 import 'package:f0ckapp/widgets/end_drawer.dart';
@ -28,11 +29,27 @@ class _MediaGrid extends State<MediaGrid> {

  late final _MediaGridAppBar _appBar;
  late final _MediaGridBody _body;
+  Worker? _filterWorker;

  @override
  void initState() {
    super.initState();
    _mediaController.fetchInitial();
+
+    _filterWorker = everAll(
+      [
+        _mediaController.typeIndex,
+        _mediaController.modeIndex,
+        _mediaController.tag,
+        _mediaController.random,
+      ],
+      (_) {
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          _refreshController.requestRefresh();
+        });
+      },
+    );
+
    _appBar = _MediaGridAppBar(mediaController: _mediaController);
    _body = _MediaGridBody(
      refreshController: _refreshController,
@ -44,6 +61,7 @@ class _MediaGrid extends State<MediaGrid> {

  @override
  void dispose() {
+    _filterWorker?.dispose();
    _scrollController.dispose();
    _refreshController.dispose();
    super.dispose();
@ -51,19 +69,55 @@ class _MediaGrid extends State<MediaGrid> {

  @override
  Widget build(BuildContext context) {
-    return Obx(
-      () => Scaffold(
+    return Obx(() {
+      if (_mediaController.loading.value && _mediaController.items.isEmpty) {
+        return Scaffold(
+          appBar: _appBar,
+          body: const Center(child: CircularProgressIndicator()),
+        );
+      }
+
+      if (_mediaController.errorMessage.value != null &&
+          _mediaController.items.isEmpty) {
+        return Scaffold(
+          appBar: _appBar,
+          body: Center(
+            child: Padding(
+              padding: const EdgeInsets.all(16.0),
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  const Icon(Icons.error_outline, color: Colors.red, size: 60),
+                  const SizedBox(height: 16),
+                  Text(
+                    '${_mediaController.errorMessage.value}',
+                    textAlign: TextAlign.center,
+                    style: Theme.of(context).textTheme.titleMedium,
+                  ),
+                  const SizedBox(height: 16),
+                  ElevatedButton(
+                    onPressed: () => _mediaController.fetchInitial(),
+                    child: const Text('Erneut versuchen'),
+                  ),
+                ],
+              ),
+            ),
+          ),
+        );
+      }
+
+      return Scaffold(
        endDrawer: const EndDrawer(),
        endDrawerEnableOpenDragGesture:
            _settingsController.drawerSwipeEnabled.value,
-        bottomNavigationBar: FilterBar(scrollController: _scrollController),
+        bottomNavigationBar: FilterBar(),
        appBar: _appBar,
        body: _body,
        persistentFooterButtons: _mediaController.tag.value != null
            ? [TagFooter()]
            : null,
-      ),
      );
+    });
  }
 }

@ -77,7 +131,9 @@ class _MediaGridAppBar extends StatelessWidget implements PreferredSizeWidget {
    return AppBar(
      title: InkWell(
        onTap: () {
+          if (mediaController.tag.value != null) {
            mediaController.setTag(null);
+          }
        },
        child: Row(
          mainAxisSize: MainAxisSize.min,
@ -105,7 +161,9 @@ class _MediaGridAppBar extends StatelessWidget implements PreferredSizeWidget {
                  ? Icons.shuffle_on_outlined
                  : Icons.shuffle,
            ),
-            onPressed: mediaController.toggleRandom,
+            onPressed: () {
+              mediaController.toggleRandom();
+            },
          ),
        ),
        IconButton(
@ -133,14 +191,28 @@ class _MediaGridBody extends StatelessWidget {
  final SettingsController settingsController;
  final ScrollController scrollController;

-
  @override
  Widget build(BuildContext context) {
-    return PullexRefresh(
+    if (mediaController.items.isEmpty && !mediaController.loading.value) {
+      return const Center(
+        child: Text(
+          'Keine f0cks gefunden.\n\nVersuch mal andere Filter.',
+          textAlign: TextAlign.center,
+        ),
+      );
+    }
+    return NotificationListener<ScrollNotification>(
+      onNotification: (scrollInfo) {
+        if (!mediaController.loading.value &&
+            !mediaController.atEnd.value &&
+            scrollInfo.metrics.pixels >=
+                scrollInfo.metrics.maxScrollExtent - 600) {
+          mediaController.handleLoading();
+        }
+        return true;
+      },
+      child: PullexRefresh(
        controller: refreshController,
-      enablePullDown: true,
-      enablePullUp: true,
-      header: const WaterDropHeader(),
        onRefresh: () async {
          try {
            await mediaController.handleRefresh();
@ -148,19 +220,13 @@ class _MediaGridBody extends StatelessWidget {
            refreshController.refreshCompleted();
          }
        },
-      onLoading: () async {
-        try {
-          await mediaController.handleLoading();
-        } finally {
-          refreshController.loadComplete();
-        }
-      },
+        header: const WaterDropHeader(),
        child: Obx(
          () => GridView.builder(
            addAutomaticKeepAlives: false,
            controller: scrollController,
-          physics: const NeverScrollableScrollPhysics(),
            shrinkWrap: true,
+            physics: const NeverScrollableScrollPhysics(),
            padding: const EdgeInsets.all(4),
            itemCount: mediaController.items.length,
            gridDelegate: settingsController.crossAxisCount.value == 0
@ -177,15 +243,22 @@ class _MediaGridBody extends StatelessWidget {
                    childAspectRatio: 1,
                  ),
            itemBuilder: (context, index) {
-            final item = mediaController.items[index];
-            return GestureDetector(
+              final MediaItem item = mediaController.items[index];
+              return Hero(
+                tag: 'media_${item.id}',
+                child: Material(
+                  type: MaterialType.transparency,
+                  child: GestureDetector(
                    key: ValueKey(item.id),
                    onTap: () => Get.toNamed('/${item.id}'),
                    child: MediaTile(item: item),
+                  ),
+                ),
              );
            },
          ),
        ),
+      ),
    );
  }
 }
--- a/lib/widgets/filter_bar.dart
+++ b/lib/widgets/filter_bar.dart
@ -5,9 +5,7 @@ import 'package:get/get.dart';
 import 'package:f0ckapp/controller/mediacontroller.dart';

 class FilterBar extends StatelessWidget {
-  final ScrollController scrollController;
-
-  const FilterBar({super.key, required this.scrollController});
+  const FilterBar({super.key});

  @override
  Widget build(BuildContext context) {
@ -32,7 +30,6 @@ class FilterBar extends StatelessWidget {
              onChanged: (String? newValue) {
                if (newValue != null) {
                  c.setTypeIndex(mediaTypes.indexOf(newValue));
-                  scrollController.jumpTo(0);
                }
              },
            ),
@ -51,7 +48,6 @@ class FilterBar extends StatelessWidget {
              onChanged: (String? newValue) {
                if (newValue != null) {
                  c.setModeIndex(mediaModes.indexOf(newValue));
-                  scrollController.jumpTo(0);
                }
              },
            ),
--- a/lib/widgets/video_controls_overlay.dart
+++ b/lib/widgets/video_controls_overlay.dart
@ -1,197 +1,111 @@
 import 'dart:async';
-
 import 'package:flutter/material.dart';
-
 import 'package:cached_video_player_plus/cached_video_player_plus.dart';
+import 'package:get/get.dart';
+import 'package:f0ckapp/controller/settingscontroller.dart';

 class VideoControlsOverlay extends StatefulWidget {
  final CachedVideoPlayerPlusController controller;
-  final VoidCallback onOverlayTap;
-  final bool muted;
-  final VoidCallback onMuteToggle;

-  const VideoControlsOverlay({
-    super.key,
-    required this.controller,
-    required this.onOverlayTap,
-    required this.muted,
-    required this.onMuteToggle,
-  });
+  const VideoControlsOverlay({super.key, required this.controller});

  @override
  State<VideoControlsOverlay> createState() => _VideoControlsOverlayState();
 }

 class _VideoControlsOverlayState extends State<VideoControlsOverlay> {
-  bool _showSeekIndicator = false;
-  bool _isRewinding = false;
+  final SettingsController _settingsController = Get.find();
  Timer? _hideTimer;
+  bool _controlsVisible = false;
+
+  bool _isScrubbing = false;
+  Duration _scrubbingStartPosition = Duration.zero;
+  double _scrubbingStartDx = 0.0;
+  Duration _scrubbingSeekPosition = Duration.zero;
+
+  @override
+  void initState() {
+    super.initState();
+    widget.controller.addListener(_listener);
+  }

  @override
  void dispose() {
    _hideTimer?.cancel();
+    widget.controller.removeListener(_listener);
    super.dispose();
  }

-  void _handleDoubleTap(TapDownDetails details) {
-    final double screenWidth = MediaQuery.of(context).size.width;
-    final bool isRewind = details.globalPosition.dx < screenWidth / 2;
-    widget.onOverlayTap();
-
-    Future(() {
-      if (isRewind) {
-        final Duration newPosition =
-            widget.controller.value.position - const Duration(seconds: 10);
-        widget.controller.seekTo(
-          newPosition < Duration.zero ? Duration.zero : newPosition,
-        );
-      } else {
-        final Duration newPosition =
-            widget.controller.value.position + const Duration(seconds: 10);
-        final Duration duration = widget.controller.value.duration;
-        widget.controller.seekTo(
-          newPosition > duration ? duration : newPosition,
-        );
+  void _listener() {
+    if (mounted) {
+      setState(() {});
+    }
  }
-    });

+  void _startHideTimer() {
    _hideTimer?.cancel();
-    setState(() {
-      _showSeekIndicator = true;
-      _isRewinding = isRewind;
-    });
-    _hideTimer = Timer(const Duration(milliseconds: 500), () {
-      setState(() => _showSeekIndicator = false);
+    _hideTimer = Timer(const Duration(seconds: 5), () {
+      if (mounted) {
+        setState(() => _controlsVisible = false);
+      }
    });
  }

-  @override
-  Widget build(BuildContext context) {
-    return Stack(
-      alignment: Alignment.center,
-      children: [
-        GestureDetector(
-          onTap: widget.onOverlayTap,
-          onDoubleTapDown: _handleDoubleTap,
-          child: Container(color: Colors.transparent),
-        ),
-        AnimatedOpacity(
-          opacity: _showSeekIndicator ? 1.0 : 0.0,
-          duration: const Duration(milliseconds: 200),
-          child: Align(
-            alignment: _isRewinding
-                ? Alignment.centerLeft
-                : Alignment.centerRight,
-            child: Padding(
-              padding: const EdgeInsets.symmetric(horizontal: 40.0),
-              child: Icon(
-                _isRewinding
-                    ? Icons.fast_rewind_rounded
-                    : Icons.fast_forward_rounded,
-                color: Colors.white70,
-                size: 60,
-              ),
-            ),
-          ),
-        ),
-        IconButton(
-          icon: Icon(
-            widget.controller.value.isPlaying ? Icons.pause : Icons.play_arrow,
-            size: 64,
-          ),
-          onPressed: () {
-            widget.onOverlayTap();
+  void _toggleControlsVisibility() {
+    setState(() => _controlsVisible = !_controlsVisible);
+    if (_controlsVisible) {
+      _startHideTimer();
+    }
+  }
+
+  void _handlePlayPause() {
    widget.controller.value.isPlaying
        ? widget.controller.pause()
        : widget.controller.play();
-          },
-        ),
-        Positioned(
-          right: 12,
-          bottom: 12,
-          child: IconButton(
-            icon: Icon(
-              widget.muted ? Icons.volume_off : Icons.volume_up,
-              size: 16,
-            ),
-            onPressed: () {
-              widget.onOverlayTap();
-              widget.onMuteToggle();
-            },
-          ),
-        ),
-        Align(
-          alignment: Alignment.bottomCenter,
-          child: Padding(
-            padding: const EdgeInsets.only(bottom: 0),
-            child: LayoutBuilder(
-              builder: (context, constraints) {
-                return Stack(
-                  clipBehavior: Clip.none,
-                  children: [
-                    Positioned(
-                      left: 10,
-                      bottom: 12,
-                      child: Text(
-                        '${_formatDuration(widget.controller.value.position)} / ${_formatDuration(widget.controller.value.duration)}',
-                        style: const TextStyle(
-                          color: Colors.white,
-                          fontSize: 12,
-                        ),
-                      ),
-                    ),
-                    Listener(
-                      onPointerDown: (_) {
-                        widget.onOverlayTap();
-                      },
-                      child: VideoProgressIndicator(
-                        widget.controller,
-                        allowScrubbing: true,
-                        padding: const EdgeInsets.only(top: 25.0),
-                        colors: VideoProgressColors(
-                          playedColor: Theme.of(context).colorScheme.primary,
-                          backgroundColor: Theme.of(
-                            context,
-                          ).colorScheme.surface.withValues(alpha: 0.5),
-                          bufferedColor: Theme.of(
-                            context,
-                          ).colorScheme.secondary.withValues(alpha: 0.5),
-                        ),
-                      ),
-                    ),
-                    if (widget.controller.value.duration.inMilliseconds > 0)
-                      Positioned(
-                        left:
-                            (widget.controller.value.position.inMilliseconds /
-                                    widget
-                                        .controller
-                                        .value
-                                        .duration
-                                        .inMilliseconds) *
-                                constraints.maxWidth -
-                            6,
-                        bottom: -4,
-                        child: Container(
-                          width: 12,
-                          height: 12,
-                          decoration: BoxDecoration(
-                            shape: BoxShape.circle,
-                            color: Theme.of(context).colorScheme.primary,
-                            border: Border.all(
-                              color: Theme.of(context).colorScheme.primary,
-                              width: 2,
-                            ),
-                          ),
-                        ),
-                      ),
-                  ],
-                );
-              },
-            ),
-          ),
-        ),
-      ],
-    );
+    _startHideTimer();
+  }
+
+  void _onHorizontalDragStart(DragStartDetails details) {
+    if (!widget.controller.value.isInitialized || !_controlsVisible) return;
+
+    setState(() {
+      _isScrubbing = true;
+      _scrubbingStartPosition = widget.controller.value.position;
+      _scrubbingStartDx = details.globalPosition.dx;
+      _scrubbingSeekPosition = widget.controller.value.position;
+    });
+    _hideTimer?.cancel();
+  }
+
+  void _onHorizontalDragUpdate(DragUpdateDetails details) {
+    if (!_isScrubbing) return;
+
+    final double delta = details.globalPosition.dx - _scrubbingStartDx;
+    final int seekMillis =
+        _scrubbingStartPosition.inMilliseconds + (delta * 300).toInt();
+
+    setState(() {
+      final Duration duration = widget.controller.value.duration;
+      final Duration seekDuration = Duration(milliseconds: seekMillis);
+      final Duration clampedSeekDuration = seekDuration < Duration.zero
+          ? Duration.zero
+          : (seekDuration > duration ? duration : seekDuration);
+      _scrubbingSeekPosition = clampedSeekDuration;
+    });
+  }
+
+  void _onHorizontalDragEnd(DragEndDetails details) {
+    if (!_isScrubbing) return;
+
+    widget.controller.seekTo(_scrubbingSeekPosition);
+    setState(() => _isScrubbing = false);
+    _startHideTimer();
+  }
+
+  void _onHorizontalDragCancel() {
+    if (!_isScrubbing) return;
+    setState(() => _isScrubbing = false);
+    _startHideTimer();
  }

  String _formatDuration(Duration? duration) {
@ -199,4 +113,149 @@ class _VideoControlsOverlayState extends State<VideoControlsOverlay> {
    String twoDigits(int n) => n.toString().padLeft(2, '0');
    return "${twoDigits(duration.inMinutes % 60)}:${twoDigits(duration.inSeconds % 60)}";
  }
+
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      behavior: HitTestBehavior.opaque,
+      onTap: _toggleControlsVisibility,
+      onHorizontalDragStart: _controlsVisible ? _onHorizontalDragStart : null,
+      onHorizontalDragUpdate: _controlsVisible ? _onHorizontalDragUpdate : null,
+      onHorizontalDragEnd: _controlsVisible ? _onHorizontalDragEnd : null,
+      onHorizontalDragCancel: _controlsVisible ? _onHorizontalDragCancel : null,
+      child: Stack(
+        alignment: Alignment.center,
+        children: [
+          AnimatedContainer(
+            duration: const Duration(milliseconds: 300),
+            color: _controlsVisible && !_isScrubbing
+                ? Colors.black.withValues(alpha: 0.5)
+                : Colors.transparent,
+          ),
+          AnimatedOpacity(
+            opacity: _isScrubbing ? 1.0 : 0.0,
+            duration: const Duration(milliseconds: 200),
+            child: _buildScrubbingIndicator(),
+          ),
+          AnimatedOpacity(
+            opacity: _controlsVisible && !_isScrubbing ? 1.0 : 0.0,
+            duration: const Duration(milliseconds: 300),
+            child: IgnorePointer(
+              ignoring: !_controlsVisible,
+              child: Stack(
+                alignment: Alignment.center,
+                children: [
+                  IconButton(
+                    icon: Icon(
+                      widget.controller.value.isPlaying
+                          ? Icons.pause
+                          : Icons.play_arrow,
+                      size: 64,
+                      color: Theme.of(context).colorScheme.primary,
+                    ),
+                    onPressed: _handlePlayPause,
+                  ),
+                  Align(
+                    alignment: Alignment.bottomCenter,
+                    child: _buildBottomBar(),
+                  ),
+                ],
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildScrubbingIndicator() {
+    final Duration positionChange =
+        _scrubbingSeekPosition - _scrubbingStartPosition;
+    final String changeSign = positionChange.isNegative ? '-' : '+';
+    final String changeText = _formatDuration(positionChange.abs());
+
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
+      decoration: BoxDecoration(
+        color: Colors.black.withValues(alpha: 0.7),
+        borderRadius: BorderRadius.circular(8),
+      ),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Text(
+            _formatDuration(_scrubbingSeekPosition),
+            style: const TextStyle(
+              color: Colors.white,
+              fontSize: 22,
+              fontWeight: FontWeight.bold,
+            ),
+          ),
+          Text(
+            '[$changeSign$changeText]',
+            style: TextStyle(
+              color: Colors.white.withValues(alpha: 0.8),
+              fontSize: 16,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildBottomBar() {
+    return Padding(
+      padding: const EdgeInsets.fromLTRB(16, 0, 16, 8),
+      child: Row(
+        children: [
+          Text(
+            _formatDuration(widget.controller.value.position),
+            style: TextStyle(
+              color: Theme.of(context).colorScheme.primary,
+              fontSize: 12,
+            ),
+          ),
+          Expanded(
+            child: Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 12),
+              child: VideoProgressIndicator(
+                widget.controller,
+                allowScrubbing: true,
+                colors: VideoProgressColors(
+                  playedColor: Theme.of(context).colorScheme.primary,
+                  backgroundColor: Colors.white.withValues(alpha: 0.3),
+                  bufferedColor: Colors.white.withValues(alpha: 0.6),
+                ),
+              ),
+            ),
+          ),
+          Text(
+            _formatDuration(widget.controller.value.duration),
+            style: TextStyle(
+              color: Theme.of(context).colorScheme.primary,
+              fontSize: 12,
+            ),
+          ),
+          const SizedBox(width: 8),
+          Obx(
+            () => IconButton(
+              icon: Icon(
+                _settingsController.muted.value
+                    ? Icons.volume_off
+                    : Icons.volume_up,
+                color: Theme.of(context).colorScheme.primary,
+                size: 20,
+              ),
+              onPressed: () {
+                _settingsController.toggleMuted();
+                _startHideTimer();
+              },
+              constraints: const BoxConstraints(),
+              padding: EdgeInsets.zero,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
 }
--- a/lib/widgets/video_widget.dart
+++ b/lib/widgets/video_widget.dart
@ -16,6 +16,7 @@ class VideoWidget extends StatefulWidget {
  final bool isActive;
  final bool fullScreen;
  final VoidCallback? onInitialized;
+  final Duration? initialPosition;

  const VideoWidget({
    super.key,
@ -23,21 +24,18 @@ class VideoWidget extends StatefulWidget {
    required this.isActive,
    this.fullScreen = false,
    this.onInitialized,
+    this.initialPosition,
  });

  @override
-  State<VideoWidget> createState() => _VideoWidgetState();
+  State<VideoWidget> createState() => VideoWidgetState();
 }

-class _VideoWidgetState extends State<VideoWidget> {
+class VideoWidgetState extends State<VideoWidget> {
  final MediaController mediaController = Get.find<MediaController>();
  final SettingsController settingsController = Get.find<SettingsController>();
  late CachedVideoPlayerPlusController videoController;
  late Worker _muteWorker;
-  late Worker _timerResetWorker;
-  late Worker _hideControlsWorker;
-  bool _showControls = false;
-  Timer? _hideControlsTimer;

  @override
  void initState() {
@ -48,22 +46,6 @@ class _VideoWidgetState extends State<VideoWidget> {
        videoController.setVolume(muted ? 0.0 : 1.0);
      }
    });
-    _timerResetWorker = ever(settingsController.videoControlsTimerNotifier, (
-      _,
-    ) {
-      if (widget.isActive && mounted) {
-        if (!_showControls) {
-          setState(() => _showControls = true);
-        }
-        _startHideControlsTimer();
-      }
-    });
-    _hideControlsWorker = ever(settingsController.hideControlsNotifier, (_) {
-      if (mounted && _showControls) {
-        setState(() => _showControls = false);
-        _hideControlsTimer?.cancel();
-      }
-    });
  }

  Future<void> _initController() async {
@ -72,8 +54,14 @@ class _VideoWidgetState extends State<VideoWidget> {
      videoPlayerOptions: VideoPlayerOptions(mixWithOthers: true),
    );
    await videoController.initialize();
-    widget.onInitialized?.call();
    if (!mounted) return;
+
+    setState(() {});
+
+    if (widget.initialPosition != null) {
+      await videoController.seekTo(widget.initialPosition!);
+    }
+    widget.onInitialized?.call();
    videoController.setLooping(true);
    videoController.setVolume(settingsController.muted.value ? 0.0 : 1.0);

@ -93,6 +81,7 @@ class _VideoWidgetState extends State<VideoWidget> {
    }

    if (widget.isActive != oldWidget.isActive) {
+      if (videoController.value.isInitialized) {
        if (widget.isActive) {
          videoController.play();
        } else {
@ -100,45 +89,17 @@ class _VideoWidgetState extends State<VideoWidget> {
        }
      }
    }
+  }

  @override
  void dispose() {
    _muteWorker.dispose();
-    _timerResetWorker.dispose();
-    _hideControlsWorker.dispose();
    videoController.dispose();
-    _hideControlsTimer?.cancel();
    super.dispose();
  }

-  void _startHideControlsTimer() {
-    _hideControlsTimer?.cancel();
-    _hideControlsTimer = Timer(const Duration(seconds: 3), () {
-      if (mounted) {
-        setState(() => _showControls = false);
-      }
-    });
-  }
-
-  void _onTap({bool ctrlButton = false}) {
-    if (ctrlButton) {
-      _startHideControlsTimer();
-      return;
-    }
-
-    final bool newShowState = !_showControls;
-    setState(() => _showControls = newShowState);
-
-    if (newShowState) {
-      _startHideControlsTimer();
-    } else {
-      _hideControlsTimer?.cancel();
-    }
-  }
-
  @override
  Widget build(BuildContext context) {
-    final bool muted = settingsController.muted.value;
    bool isAudio = widget.details.mime.startsWith('audio');

    Widget mediaContent;
@ -165,26 +126,13 @@ class _VideoWidgetState extends State<VideoWidget> {
      child: Stack(
        alignment: Alignment.center,
        children: [
-          GestureDetector(onTap: _onTap, child: mediaContent),
+          mediaContent,
          AnimatedBuilder(
            animation: videoController,
            builder: (context, child) {
-              if (videoController.value.isInitialized && _showControls) {
+              if (videoController.value.isInitialized) {
                return Positioned.fill(
-                  child: GestureDetector(
-                    onTap: _onTap,
-                    child: Container(
-                      color: Colors.black.withValues(alpha: 0.5),
-                      child: VideoControlsOverlay(
-                        controller: videoController,
-                        onOverlayTap: () => _onTap(ctrlButton: true),
-                        muted: muted,
-                        onMuteToggle: () {
-                          settingsController.toggleMuted();
-                        },
-                      ),
-                    ),
-                  ),
+                  child: VideoControlsOverlay(controller: videoController),
                );
              }
              return const SizedBox.shrink();
--- a/pubspec.yaml
+++ b/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.4.6+67
+version: 1.4.8+69

 environment:
  sdk: ^3.9.0-100.2.beta
Author	SHA1	Message	Date
Flummi	ba7505c2b3	v1.4.8+69 All checks were successful Flutter Schmutter / build (push) Successful in 3m39s Details	2025-06-24 03:02:39 +02:00
Flummi	39fadc009f	...	2025-06-24 02:21:06 +02:00
Flummi	0d42fad708	v1.4.7+68 All checks were successful Flutter Schmutter / build (push) Successful in 3m37s Details	2025-06-23 16:32:15 +02:00