Merge branch 'main' into cool-app-bar

mobile/lib/presentation/widgets/timeline/timeline.widget.dart

@@ -18,6 +18,7 @@ import 'package:immich_mobile/providers/infrastructure/setting.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_sliver_app_bar.dart';
+import 'package:immich_mobile/widgets/common/mesmerizing_sliver_app_bar.dart';
 import 'package:immich_mobile/widgets/common/selection_sliver_app_bar.dart';
 
 class Timeline extends StatelessWidget {
@@ -105,6 +106,10 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
       onData: (segments) {
         final childCount = (segments.lastOrNull?.lastIndex ?? -1) + 1;
         final statusBarHeight = context.padding.top;
+        final double appBarExpandedHeight =
+            widget.appBar != null && widget.appBar is MesmerizingSliverAppBar
+                ? 200
+                : 0;
         final totalAppBarHeight = statusBarHeight + kToolbarHeight;
         const scrubberBottomPadding = 100.0;
 
@@ -117,7 +122,8 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
                 timelineHeight: maxHeight,
                 topPadding: totalAppBarHeight + 10,
                 bottomPadding: context.padding.bottom + scrubberBottomPadding,
-                monthSegmentSnappingOffset: widget.topSliverWidgetHeight,
+                monthSegmentSnappingOffset:
+                    widget.topSliverWidgetHeight ?? 0 + appBarExpandedHeight,
                 child: CustomScrollView(
                   primary: true,
                   cacheExtent: maxHeight * 2,