High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix: add to album render empty app bar (#20480)
Alex1378f223682d
diff --git a/mobile/lib/pages/backup/drift_backup_album_selection.page.dart b/mobile/lib/pages/backup/drift_backup_album_selection.page.dartindex 396b711d07..865845525a 100644--- a/mobile/lib/pages/backup/drift_backup_album_selection.page.dart+++ b/mobile/lib/pages/backup/drift_backup_album_selection.page.dart@@ -6,7 +6,6 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';import 'package:immich_mobile/domain/models/album/local_album.model.dart';import 'package:immich_mobile/extensions/build_context_extensions.dart';import 'package:immich_mobile/extensions/translate_extensions.dart';-import 'package:immich_mobile/providers/album/album.provider.dart';import 'package:immich_mobile/providers/app_settings.provider.dart';import 'package:immich_mobile/providers/backup/backup_album.provider.dart';import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';@@ -14,7 +13,6 @@ import 'package:immich_mobile/providers/user.provider.dart';import 'package:immich_mobile/services/app_settings.service.dart';import 'package:immich_mobile/widgets/backup/drift_album_info_list_tile.dart';import 'package:immich_mobile/widgets/common/search_field.dart';-import 'package:immich_mobile/widgets/settings/settings_switch_list_tile.dart';@RoutePage()class DriftBackupAlbumSelectionPage extends ConsumerStatefulWidget {@@ -67,14 +65,14 @@ class _DriftBackupAlbumSelectionPageState extends ConsumerState<DriftBackupAlbumfinal selectedBackupAlbums = albums.where((album) => album.backupSelection == BackupSelection.selected).toList();final excludedBackupAlbums = albums.where((album) => album.backupSelection == BackupSelection.excluded).toList();- handleSyncAlbumToggle(bool isEnable) async {- if (isEnable) {- await ref.read(albumProvider.notifier).refreshRemoteAlbums();- for (final album in selectedBackupAlbums) {- await ref.read(albumProvider.notifier).createSyncAlbum(album.name);- }- }- }+ // handleSyncAlbumToggle(bool isEnable) async {+ // if (isEnable) {+ // await ref.read(albumProvider.notifier).refreshRemoteAlbums();+ // for (final album in selectedBackupAlbums) {+ // await ref.read(albumProvider.notifier).createSyncAlbum(album.name);+ // }+ // }+ // }return PopScope(onPopInvokedWithResult: (didPop, result) async {@@ -167,16 +165,15 @@ class _DriftBackupAlbumSelectionPageState extends ConsumerState<DriftBackupAlbum),),- SettingsSwitchListTile(- valueNotifier: _enableSyncUploadAlbum,- title: "sync_albums".t(context: context),- subtitle: "sync_upload_album_setting_subtitle".t(context: context),- contentPadding: const EdgeInsets.symmetric(horizontal: 16),- titleStyle: context.textTheme.bodyLarge?.copyWith(fontWeight: FontWeight.bold),- subtitleStyle: context.textTheme.labelLarge?.copyWith(color: context.colorScheme.primary),- onChanged: handleSyncAlbumToggle,- ),-+ // SettingsSwitchListTile(+ // valueNotifier: _enableSyncUploadAlbum,+ // title: "sync_albums".t(context: context),+ // subtitle: "sync_upload_album_setting_subtitle".t(context: context),+ // contentPadding: const EdgeInsets.symmetric(horizontal: 16),+ // titleStyle: context.textTheme.bodyLarge?.copyWith(fontWeight: FontWeight.bold),+ // subtitleStyle: context.textTheme.labelLarge?.copyWith(color: context.colorScheme.primary),+ // onChanged: handleSyncAlbumToggle,+ // ),ListTile(title: Text("albums_on_device_count".t(context: context, args: {'count': albumCount.toString()}),diff --git a/mobile/lib/presentation/pages/drift_remote_album.page.dart b/mobile/lib/presentation/pages/drift_remote_album.page.dartindex 336050d5a9..f1f1cfda92 100644--- a/mobile/lib/presentation/pages/drift_remote_album.page.dart+++ b/mobile/lib/presentation/pages/drift_remote_album.page.dart@@ -28,13 +28,15 @@ class RemoteAlbumPage extends ConsumerStatefulWidget {}class _RemoteAlbumPageState extends ConsumerState<RemoteAlbumPage> {+ late RemoteAlbum _album;@overridevoid initState() {super.initState();+ _album = widget.album;}Future<void> addAssets(BuildContext context) async {- final albumAssets = await ref.read(remoteAlbumProvider.notifier).getAssets(widget.album.id);+ final albumAssets = await ref.read(remoteAlbumProvider.notifier).getAssets(_album.id);final newAssets = await context.pushRoute<Set<BaseAsset>>(DriftAssetSelectionTimelineRoute(lockedSelectionAssets: albumAssets.toSet()),@@ -47,7 +49,7 @@ class _RemoteAlbumPageState extends ConsumerState<RemoteAlbumPage> {final added = await ref.read(remoteAlbumProvider.notifier).addAssets(- widget.album.id,+ _album.id,newAssets.map((asset) {final remoteAsset = asset as RemoteAsset;return remoteAsset.id;@@ -64,14 +66,14 @@ class _RemoteAlbumPageState extends ConsumerState<RemoteAlbumPage> {}Future<void> addUsers(BuildContext context) async {- final newUsers = await context.pushRoute<List<String>>(DriftUserSelectionRoute(album: widget.album));+ final newUsers = await context.pushRoute<List<String>>(DriftUserSelectionRoute(album: _album));if (newUsers == null || newUsers.isEmpty) {return;}try {- await ref.read(remoteAlbumProvider.notifier).addUsers(widget.album.id, newUsers);+ await ref.read(remoteAlbumProvider.notifier).addUsers(_album.id, newUsers);if (newUsers.isNotEmpty) {ImmichToast.show(@@ -81,7 +83,7 @@ class _RemoteAlbumPageState extends ConsumerState<RemoteAlbumPage> {);}- ref.invalidate(remoteAlbumSharedUsersProvider(widget.album.id));+ ref.invalidate(remoteAlbumSharedUsersProvider(_album.id));} catch (e) {ImmichToast.show(context: context,@@ -92,7 +94,7 @@ class _RemoteAlbumPageState extends ConsumerState<RemoteAlbumPage> {}Future<void> toggleAlbumOrder() async {- await ref.read(remoteAlbumProvider.notifier).toggleAlbumOrder(widget.album.id);+ await ref.read(remoteAlbumProvider.notifier).toggleAlbumOrder(_album.id);ref.invalidate(timelineServiceProvider);}@@ -106,7 +108,7 @@ class _RemoteAlbumPageState extends ConsumerState<RemoteAlbumPage> {content: Column(mainAxisSize: MainAxisSize.min,children: [- Text('album_delete_confirmation'.t(context: context, args: {'album': widget.album.name})),+ Text('album_delete_confirmation'.t(context: context, args: {'album': _album.name})),const SizedBox(height: 8),Text('album_delete_confirmation_description'.t(context: context)),],@@ -128,7 +130,7 @@ class _RemoteAlbumPageState extends ConsumerState<RemoteAlbumPage> {if (confirmed == true) {try {- await ref.read(remoteAlbumProvider.notifier).deleteAlbum(widget.album.id);+ await ref.read(remoteAlbumProvider.notifier).deleteAlbum(_album.id);ImmichToast.show(context: context,@@ -151,17 +153,20 @@ class _RemoteAlbumPageState extends ConsumerState<RemoteAlbumPage> {final result = await showDialog<_EditAlbumData?>(context: context,barrierDismissible: true,- builder: (context) => _EditAlbumDialog(album: widget.album),+ builder: (context) => _EditAlbumDialog(album: _album),);if (result != null && context.mounted) {+ setState(() {+ _album = _album.copyWith(name: result.name, description: result.description ?? '');+ });HapticFeedback.mediumImpact();}}void showOptionSheet(BuildContext context) {final user = ref.watch(currentUserProvider);- final isOwner = user != null ? user.id == widget.album.ownerId : false;+ final isOwner = user != null ? user.id == _album.ownerId : false;showModalBottomSheet(context: context,@@ -205,7 +210,7 @@ class _RemoteAlbumPageState extends ConsumerState<RemoteAlbumPage> {return ProviderScope(overrides: [timelineServiceProvider.overrideWith((ref) {- final timelineService = ref.watch(timelineFactoryProvider).remoteAlbum(albumId: widget.album.id);+ final timelineService = ref.watch(timelineFactoryProvider).remoteAlbum(albumId: _album.id);ref.onDispose(timelineService.dispose);return timelineService;}),@@ -217,7 +222,7 @@ class _RemoteAlbumPageState extends ConsumerState<RemoteAlbumPage> {onToggleAlbumOrder: () => toggleAlbumOrder(),onEditTitle: () => showEditTitleAndDescription(context),),- bottomSheet: RemoteAlbumBottomSheet(album: widget.album),+ bottomSheet: RemoteAlbumBottomSheet(album: _album),),);}diff --git a/mobile/lib/presentation/widgets/album/album_selector.widget.dart b/mobile/lib/presentation/widgets/album/album_selector.widget.dartindex cb6a38041d..2eec620ec4 100644--- a/mobile/lib/presentation/widgets/album/album_selector.widget.dart+++ b/mobile/lib/presentation/widgets/album/album_selector.widget.dart@@ -14,6 +14,7 @@ import 'package:immich_mobile/models/albums/album_search.model.dart';import 'package:immich_mobile/pages/common/large_leading_tile.dart';import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';import 'package:immich_mobile/providers/infrastructure/album.provider.dart';+import 'package:immich_mobile/providers/infrastructure/current_album.provider.dart';import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';import 'package:immich_mobile/providers/user.provider.dart';import 'package:immich_mobile/routing/router.dart';@@ -578,6 +579,7 @@ class AddToAlbumHeader extends ConsumerWidget {return;}+ ref.read(currentRemoteAlbumProvider.notifier).setAlbum(newAlbum);context.pushRoute(RemoteAlbumRoute(album: newAlbum));}