helpy4/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich synced 2025-11-07 17:27:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: timeline service uninitialised across routes (#19544)

Browse source
This commit is contained in:
shenlong 2025-07-01 20:53:20 +05:30 • committed by GitHub
parent f59b0bab5a
commit 15be3437bf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 95 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mobile/lib/presentation/pages/dev/local_timeline.page.dart
View file

@ -1,5 +1,3 @@
import 'dart:async';
import 'package:auto_route/auto_route.dart';
import 'package:flutter/widgets.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
@ -20,7 +18,7 @@ class LocalTimelinePage extends StatelessWidget {
(ref) {
final timelineService =
ref.watch(timelineFactoryProvider).localAlbum(albumId: albumId);
ref.onDispose(() => unawaited(timelineService.dispose()));
ref.onDispose(timelineService.dispose);
return timelineService;
},
),

22
mobile/lib/presentation/pages/dev/main_timeline.page.dart
View file

@ -1,10 +1,7 @@
import 'dart:async';
import 'package:auto_route/auto_route.dart';
import 'package:flutter/material.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';
import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
@RoutePage()
class MainTimelinePage extends ConsumerWidget {
@ -12,23 +9,6 @@ class MainTimelinePage extends ConsumerWidget {
@override
Widget build(BuildContext context, WidgetRef ref) {
return ProviderScope(
key: ref.watch(timelineUsersProvider).value != null
? ValueKey(ref.watch(timelineUsersProvider).value)
: const ValueKey("main-timeline"),
overrides: [
timelineServiceProvider.overrideWith(
(ref) {
final timelineUsers =
ref.watch(timelineUsersProvider).valueOrNull ?? [];
final timelineService =
ref.watch(timelineFactoryProvider).main(timelineUsers);
ref.onDispose(() => unawaited(timelineService.dispose()));
return timelineService;
},
),
],
child: const Timeline(),
);
return const Timeline();
}
}

4
mobile/lib/presentation/pages/dev/remote_timeline.page.dart
View file

@ -1,5 +1,3 @@
import 'dart:async';
import 'package:auto_route/auto_route.dart';
import 'package:flutter/widgets.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
@ -21,7 +19,7 @@ class RemoteTimelinePage extends StatelessWidget {
final timelineService = ref
.watch(timelineFactoryProvider)
.remoteAlbum(albumId: albumId);
ref.onDispose(() => unawaited(timelineService.dispose()));
ref.onDispose(timelineService.dispose);
return timelineService;
},
),

3
mobile/lib/presentation/widgets/bottom_app_bar/home_bottom_app_bar.widget.dart
View file

@ -30,8 +30,7 @@ class HomeBottomAppBar extends ConsumerWidget {
return BaseBottomSheet(
initialChildSize: 0.25,
minChildSize: 0.22,
expand: false,
shouldCloseOnMinExtent: false,
actions: [
if (multiselect.isEnabled) const ShareActionButton(),
if (multiselect.hasRemote) ...[

164
mobile/lib/presentation/widgets/timeline/timeline.widget.dart
View file

@ -43,26 +43,15 @@ class Timeline extends StatelessWidget {
}
}
class _SliverTimeline extends ConsumerStatefulWidget {
class _SliverTimeline extends StatefulWidget {
const _SliverTimeline();
@override
ConsumerState createState() => _SliverTimelineState();
State createState() => _SliverTimelineState();
}
class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
class _SliverTimelineState extends State<_SliverTimeline> {
final _scrollController = ScrollController();
PersistentBottomSheetController? _bottomSheetController;
bool _isMultiSelectEnabled = false;
@override
void initState() {
super.initState();
ref.listenManual(
multiSelectProvider.select((s) => s.isEnabled),
_onMultiSelectChanged,
);
}
@override
void dispose() {
@ -70,93 +59,80 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
super.dispose();
}
void _onMultiSelectChanged(bool? previous, bool current) {
if (context.mounted && current != _isMultiSelectEnabled) {
setState(() {
_isMultiSelectEnabled = current;
if (current) {
_bottomSheetController = showBottomSheet(
context: context,
builder: (_) => const HomeBottomAppBar(),
);
_bottomSheetController?.closed.then((_) {
_bottomSheetController = null;
// Reset the multi-select state when the bottom sheet is closed
ref.read(multiSelectProvider.notifier).reset();
});
} else {
_bottomSheetController?.close();
}
});
}
}
@override
Widget build(BuildContext _) {
final asyncSegments = ref.watch(timelineSegmentProvider);
final maxHeight =
ref.watch(timelineArgsProvider.select((args) => args.maxHeight));
return Consumer(
builder: (context, ref, child) {
final asyncSegments = ref.watch(timelineSegmentProvider);
final maxHeight =
ref.watch(timelineArgsProvider.select((args) => args.maxHeight));
final isMultiSelectEnabled =
ref.watch(multiSelectProvider.select((s) => s.isEnabled));
return asyncSegments.widgetWhen(
onData: (segments) {
final childCount = (segments.lastOrNull?.lastIndex ?? -1) + 1;
final statusBarHeight = context.padding.top;
final totalAppBarHeight = statusBarHeight + kToolbarHeight;
const scrubberBottomPadding = 100.0;
return asyncSegments.widgetWhen(
onData: (segments) {
final childCount = (segments.lastOrNull?.lastIndex ?? -1) + 1;
final statusBarHeight = context.padding.top;
final totalAppBarHeight = statusBarHeight + kToolbarHeight;
const scrubberBottomPadding = 100.0;
return PrimaryScrollController(
controller: _scrollController,
child: Stack(
children: [
Scrubber(
layoutSegments: segments,
timelineHeight: maxHeight,
topPadding: totalAppBarHeight + 10,
bottomPadding: context.padding.bottom + scrubberBottomPadding,
child: CustomScrollView(
primary: true,
cacheExtent: maxHeight * 2,
slivers: [
SliverAnimatedOpacity(
duration: Durations.medium1,
opacity: _isMultiSelectEnabled ? 0 : 1,
sliver: const ImmichSliverAppBar(
floating: true,
pinned: false,
snap: false,
),
return PrimaryScrollController(
controller: _scrollController,
child: Stack(
children: [
Scrubber(
layoutSegments: segments,
timelineHeight: maxHeight,
topPadding: totalAppBarHeight + 10,
bottomPadding:
context.padding.bottom + scrubberBottomPadding,
child: CustomScrollView(
primary: true,
cacheExtent: maxHeight * 2,
slivers: [
SliverAnimatedOpacity(
duration: Durations.medium1,
opacity: isMultiSelectEnabled ? 0 : 1,
sliver: const ImmichSliverAppBar(
floating: true,
pinned: false,
snap: false,
),
),
_SliverSegmentedList(
segments: segments,
delegate: SliverChildBuilderDelegate(
(ctx, index) {
if (index >= childCount) return null;
final segment = segments.findByIndex(index);
return segment?.builder(ctx, index) ??
const SizedBox.shrink();
},
childCount: childCount,
addAutomaticKeepAlives: false,
// We add repaint boundary around tiles, so skip the auto boundaries
addRepaintBoundaries: false,
),
),
const SliverPadding(
padding: EdgeInsets.only(
bottom: scrubberBottomPadding,
),
),
],
),
_SliverSegmentedList(
segments: segments,
delegate: SliverChildBuilderDelegate(
(ctx, index) {
if (index >= childCount) return null;
final segment = segments.findByIndex(index);
return segment?.builder(ctx, index) ??
const SizedBox.shrink();
},
childCount: childCount,
addAutomaticKeepAlives: false,
// We add repaint boundary around tiles, so skip the auto boundaries
addRepaintBoundaries: false,
),
),
const SliverPadding(
padding: EdgeInsets.only(
bottom: scrubberBottomPadding,
),
),
if (isMultiSelectEnabled) ...[
const Positioned(
top: 60,
left: 25,
child: _MultiSelectStatusButton(),
),
const HomeBottomAppBar(),
],
),
],
),
if (_isMultiSelectEnabled)
const Positioned(
top: 60,
left: 25,
child: _MultiSelectStatusButton(),
),
],
),
);
},
);
},
);