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: add to album render empty app bar (#20480)

Browse source 
* fix: add to album render empty app bar

* set current album
This commit is contained in:
Alex 2025-07-31 21:28:33 -05:00 • committed by GitHub
parent 4bd465e752
commit 1378f22368
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 36 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

29
mobile/lib/presentation/pages/drift_remote_album.page.dart
View file

@ -28,13 +28,15 @@ class RemoteAlbumPage extends ConsumerStatefulWidget {
}
class _RemoteAlbumPageState extends ConsumerState<RemoteAlbumPage> {
late RemoteAlbum _album;
@override
void 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),
),
);
}

2
mobile/lib/presentation/widgets/album/album_selector.widget.dart
View file

@ -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));
}