Merge branch 'main' of github.com:immich-app/immich into feat/mobile-platform-clients

2025-09-20 08:18:22 -05:00
parent 5054719f43 de57fecb69
commit e1c6813ee0
72 changed files with 9736 additions and 1691 deletions
@@ -31,6 +31,11 @@ class Scrubber extends ConsumerStatefulWidget {

  final double? monthSegmentSnappingOffset;

+  final bool snapToMonth;
+
+  /// Whether an app bar is present, affects coordinate calculations
+  final bool hasAppBar;
+
  Scrubber({
    super.key,
    Key? scrollThumbKey,
@@ -39,6 +44,8 @@ class Scrubber extends ConsumerStatefulWidget {
    this.topPadding = 0,
    this.bottomPadding = 0,
    this.monthSegmentSnappingOffset,
+    this.snapToMonth = true,
+    this.hasAppBar = true,
    required this.child,
  }) : assert(child.scrollDirection == Axis.vertical);

@@ -232,7 +239,7 @@ class ScrubberState extends ConsumerState<Scrubber> with TickerProviderStateMixi
      }
    }

-    if (_monthCount < kMinMonthsToEnableScrubberSnap) {
+    if (_monthCount < kMinMonthsToEnableScrubberSnap || !widget.snapToMonth) {
      // If there are less than kMinMonthsToEnableScrubberSnap months, we don't need to snap to segments
      setState(() {
        _thumbTopOffset = dragPosition;
@@ -259,14 +266,28 @@ class ScrubberState extends ConsumerState<Scrubber> with TickerProviderStateMixi
  /// - If user drags to global Y position that's 100 pixels from the top
  /// - The relative position would be 100 - 50 = 50 (50 pixels into the scrubber area)
  double _calculateDragPosition(DragUpdateDetails details) {
+    if (widget.hasAppBar) {
+      final dragAreaTop = widget.topPadding;
+      final dragAreaBottom = widget.timelineHeight - widget.bottomPadding;
+      final dragAreaHeight = dragAreaBottom - dragAreaTop;
+
+      final relativePosition = details.globalPosition.dy - dragAreaTop;
+
+      // Make sure the position stays within the scrubber's bounds
+      return relativePosition.clamp(0.0, dragAreaHeight);
+    }
+
+    // Get the local position relative to the gesture detector
+    final RenderBox? renderBox = context.findRenderObject() as RenderBox?;
+    if (renderBox != null) {
+      final localPosition = renderBox.globalToLocal(details.globalPosition);
+      return localPosition.dy.clamp(0.0, _scrubberHeight);
+    }
+
+    // Fallback to current logic if render box is not available
    final dragAreaTop = widget.topPadding;
-    final dragAreaBottom = widget.timelineHeight - widget.bottomPadding;
-    final dragAreaHeight = dragAreaBottom - dragAreaTop;
-
    final relativePosition = details.globalPosition.dy - dragAreaTop;
-
-    // Make sure the position stays within the scrubber's bounds
-    return relativePosition.clamp(0.0, dragAreaHeight);
+    return relativePosition.clamp(0.0, _scrubberHeight);
  }

  /// Find the segment closest to the given position
@@ -14,6 +14,7 @@ import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/download_status_floating_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/scrubber.widget.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/segment.model.dart';
@@ -38,6 +39,7 @@ class Timeline extends StatelessWidget {
    this.bottomSheet = const GeneralBottomSheet(minChildSize: 0.18),
    this.groupBy,
    this.withScrubber = true,
+    this.snapToMonth = true,
  });

  final Widget? topSliverWidget;
@@ -48,11 +50,13 @@ class Timeline extends StatelessWidget {
  final bool withStack;
  final GroupAssetsBy? groupBy;
  final bool withScrubber;
+  final bool snapToMonth;

  @override
  Widget build(BuildContext context) {
    return Scaffold(
      resizeToAvoidBottomInset: false,
+      floatingActionButton: const DownloadStatusFloatingButton(),
      body: LayoutBuilder(
        builder: (_, constraints) => ProviderScope(
          overrides: [
@@ -73,6 +77,7 @@ class Timeline extends StatelessWidget {
            appBar: appBar,
            bottomSheet: bottomSheet,
            withScrubber: withScrubber,
+            snapToMonth: snapToMonth,
          ),
        ),
      ),
@@ -87,6 +92,7 @@ class _SliverTimeline extends ConsumerStatefulWidget {
    this.appBar,
    this.bottomSheet,
    this.withScrubber = true,
+    this.snapToMonth = true,
  });

  final Widget? topSliverWidget;
@@ -94,6 +100,7 @@ class _SliverTimeline extends ConsumerStatefulWidget {
  final Widget? appBar;
  final Widget? bottomSheet;
  final bool withScrubber;
+  final bool snapToMonth;

  @override
  ConsumerState createState() => _SliverTimelineState();
@@ -309,11 +316,13 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
          final Widget timeline;
          if (widget.withScrubber) {
            timeline = Scrubber(
+              snapToMonth: widget.snapToMonth,
              layoutSegments: segments,
              timelineHeight: maxHeight,
              topPadding: topPadding,
              bottomPadding: bottomPadding,
              monthSegmentSnappingOffset: widget.topSliverWidgetHeight ?? 0 + appBarExpandedHeight,
+              hasAppBar: widget.appBar != null,
              child: grid,
            );
          } else {