Cutlery/immich
1
0
Fork 1
mirror of https://github.com/immich-app/immich.git synced 2025-07-08 10:44:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mobile/lib/pages/common/tab_shell.page.dart
View File

@ -4,11 +4,11 @@ import 'package:flutter/material.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:immich_mobile/extensions/build_context_extensions.dart';
import 'package:immich_mobile/providers/asset_viewer/scroll_notifier.provider.dart';
import 'package:immich_mobile/providers/multiselect.provider.dart';
import 'package:immich_mobile/providers/search/search_input_focus.provider.dart';
import 'package:immich_mobile/routing/router.dart';
import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
import 'package:immich_mobile/providers/search/search_input_focus.provider.dart';
import 'package:immich_mobile/providers/tab.provider.dart';
import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
import 'package:immich_mobile/routing/router.dart';
@RoutePage()
class TabShellPage extends ConsumerWidget {
@ -138,7 +138,8 @@ class TabShellPage extends ConsumerWidget {
);
}
final multiselectEnabled = ref.watch(multiselectProvider);
final multiselectEnabled =
ref.watch(multiSelectProvider.select((s) => s.isEnabled));
return AutoTabsRouter(
routes: [
const MainTimelineRoute(),

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) ...[

54
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,33 +59,15 @@ 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 _) {
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;
@ -112,14 +83,15 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
layoutSegments: segments,
timelineHeight: maxHeight,
topPadding: totalAppBarHeight + 10,
bottomPadding: context.padding.bottom + scrubberBottomPadding,
bottomPadding:
context.padding.bottom + scrubberBottomPadding,
child: CustomScrollView(
primary: true,
cacheExtent: maxHeight * 2,
slivers: [
SliverAnimatedOpacity(
duration: Durations.medium1,
opacity: _isMultiSelectEnabled ? 0 : 1,
opacity: isMultiSelectEnabled ? 0 : 1,
sliver: const ImmichSliverAppBar(
floating: true,
pinned: false,
@ -149,17 +121,21 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
],
),
),
if (_isMultiSelectEnabled)
if (isMultiSelectEnabled) ...[
const Positioned(
top: 60,
left: 25,
child: _MultiSelectStatusButton(),
),
const HomeBottomAppBar(),
],
],
),
);
},
);
},
);
}
}

8
mobile/lib/providers/infrastructure/action.provider.dart
View File

@ -1,20 +1,18 @@
import 'package:flutter/material.dart';
import 'package:immich_mobile/constants/enums.dart';
import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
import 'package:immich_mobile/providers/multiselect.provider.dart';
import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
import 'package:immich_mobile/providers/user.provider.dart';
import 'package:immich_mobile/services/action.service.dart';
import 'package:immich_mobile/services/timeline.service.dart';
import 'package:logging/logging.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
final actionProvider = NotifierProvider<ActionNotifier, void>(
ActionNotifier.new,
dependencies: [
actionServiceProvider,
multiSelectProvider,
timelineServiceProvider,
multiselectProvider,
],
);
@ -32,7 +30,7 @@ class ActionResult {
class ActionNotifier extends Notifier<void> {
final Logger _logger = Logger('ActionNotifier');
late final ActionService _service;
late ActionService _service;
ActionNotifier() : super();

14
mobile/lib/providers/infrastructure/timeline.provider.dart
View File

@ -15,9 +15,17 @@ final timelineArgsProvider = Provider.autoDispose<TimelineArgs>(
throw UnimplementedError('Will be overridden through a ProviderScope.'),
);
final timelineServiceProvider = Provider.autoDispose<TimelineService>(
(ref) =>
throw UnimplementedError('Will be overridden through a ProviderScope.'),
final timelineServiceProvider = Provider<TimelineService>(
(ref) {
final timelineUsers = ref.watch(timelineUsersProvider).valueOrNull ?? [];
final timelineService =
ref.watch(timelineFactoryProvider).main(timelineUsers);
ref.onDispose(timelineService.dispose);
return timelineService;
},
// Empty dependencies to inform the framework that this provider
// might be used in a ProviderScope
dependencies: [],
);
final timelineFactoryProvider = Provider<TimelineFactory>(

6
mobile/lib/providers/timeline/multiselect.provider.dart
View File

@ -47,12 +47,10 @@ class MultiSelectState {
}
class MultiSelectNotifier extends Notifier<MultiSelectState> {
late final TimelineService _timelineService;
TimelineService get _timelineService => ref.read(timelineServiceProvider);
@override
MultiSelectState build() {
_timelineService = ref.read(timelineServiceProvider);
return const MultiSelectState(selectedAssets: {});
}
@ -145,5 +143,5 @@ final bucketSelectionProvider = Provider.family<bool, List<BaseAsset>>(
// Check if all assets in the bucket are selected
return bucketAssets.every((asset) => selectedAssets.contains(asset));
},
dependencies: [multiSelectProvider],
dependencies: [multiSelectProvider, timelineServiceProvider],
);