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

feat(mobile): Add selected assets to album (#901)

Browse source 
* First implementation that uses new API

* Various UI improvements

* Create new album from home screen

* Fix padding when in multiselect mode

* Alex Suggestions

* Change to album after creation
This commit is contained in:
Matthias Rupp 2022-11-06 02:21:55 +01:00 • committed by GitHub
parent 02bc84062e
commit b5751a3fa8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 252 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

98
mobile/lib/modules/home/views/home_page.dart
View file

@ -1,6 +1,11 @@
import 'package:auto_route/auto_route.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:immich_mobile/modules/album/providers/album.provider.dart';
import 'package:immich_mobile/modules/album/providers/shared_album.provider.dart';
import 'package:immich_mobile/modules/album/services/album.service.dart';
import 'package:immich_mobile/modules/home/providers/home_page_render_list_provider.dart';
import 'package:immich_mobile/modules/home/providers/multiselect.provider.dart';
import 'package:immich_mobile/modules/home/ui/asset_grid/immich_asset_grid.dart';
@ -9,10 +14,12 @@ import 'package:immich_mobile/modules/home/ui/immich_sliver_appbar.dart';
import 'package:immich_mobile/modules/home/ui/profile_drawer/profile_drawer.dart';
import 'package:immich_mobile/modules/settings/providers/app_settings.provider.dart';
import 'package:immich_mobile/modules/settings/services/app_settings.service.dart';
import 'package:immich_mobile/routing/router.dart';
import 'package:immich_mobile/shared/providers/asset.provider.dart';
import 'package:immich_mobile/shared/providers/server_info.provider.dart';
import 'package:immich_mobile/shared/providers/websocket.provider.dart';
import 'package:immich_mobile/shared/services/share.service.dart';
import 'package:immich_mobile/shared/ui/immich_toast.dart';
import 'package:openapi/api.dart';
class HomePage extends HookConsumerWidget {
@ -23,14 +30,26 @@ class HomePage extends HookConsumerWidget {
final appSettingService = ref.watch(appSettingsServiceProvider);
var renderList = ref.watch(renderListProvider);
final multiselectEnabled = ref.watch(multiselectProvider.notifier);
final selectionEnabledHook = useState(false);
final selection = useState(<AssetResponseDto>{});
final albums = ref.watch(albumProvider);
final albumService = ref.watch(albumServiceProvider);
useEffect(
() {
ref.read(websocketProvider.notifier).connect();
ref.read(assetProvider.notifier).getAllAsset();
ref.read(albumProvider.notifier).getAllAlbums();
ref.watch(serverInfoProvider.notifier).getServerVersion();
return null;
selectionEnabledHook.addListener(() {
multiselectEnabled.state = selectionEnabledHook.value;
});
return () {
selectionEnabledHook.dispose();
};
},
[],
);
@ -44,41 +63,81 @@ class HomePage extends HookConsumerWidget {
bool multiselect,
Set<AssetResponseDto> selectedAssets,
) {
multiselectEnabled.state = multiselect;
selectionEnabledHook.value = multiselect;
selection.value = selectedAssets;
}
void onShareAssets() {
ref.watch(shareServiceProvider).shareAssets(selection.value.toList());
multiselectEnabled.state = false;
selectionEnabledHook.value = false;
}
void onDelete() {
ref.watch(assetProvider.notifier).deleteAssets(selection.value);
multiselectEnabled.state = false;
selectionEnabledHook.value = false;
}
void onAddToAlbum(AlbumResponseDto album) async {
final result = await albumService.addAdditionalAssetToAlbum(
selection.value, album.id);
if (result != null) {
if (result.alreadyInAlbum.isNotEmpty) {
ImmichToast.show(
context: context,
msg: "home_page_add_to_album_conflicts".tr(
namedArgs: {
"album": album.albumName,
"added": result.successfullyAdded.toString(),
"failed": result.alreadyInAlbum.length.toString()
},
),
);
} else {
ImmichToast.show(
context: context,
msg: "home_page_add_to_album_success".tr(
namedArgs: {
"album": album.albumName,
"added": result.successfullyAdded.toString(),
},
),
);
}
selectionEnabledHook.value = false;
}
}
void onCreateNewAlbum() async {
final result =
await albumService.createAlbumWithGeneratedName(selection.value);
if (result != null) {
ref.watch(albumProvider.notifier).getAllAlbums();
selectionEnabledHook.value = false;
AutoRouter.of(context).push(AlbumViewerRoute(albumId: result.id));
}
}
return SafeArea(
bottom: !multiselectEnabled.state,
top: !multiselectEnabled.state,
top: true,
child: Stack(
children: [
CustomScrollView(
slivers: [
multiselectEnabled.state
? const SliverToBoxAdapter(
child: SizedBox(
height: 70,
child: null,
),
)
: ImmichSliverAppBar(
onPopBack: reloadAllAsset,
),
if (!multiselectEnabled.state)
ImmichSliverAppBar(
onPopBack: reloadAllAsset,
),
],
),
Padding(
padding: const EdgeInsets.only(top: 60.0, bottom: 0.0),
padding: EdgeInsets.only(
top: selectionEnabledHook.value ? 0 : 60, bottom: 0.0),
child: ImmichAssetGrid(
renderList: renderList,
assetsPerRow:
@ -86,13 +145,16 @@ class HomePage extends HookConsumerWidget {
showStorageIndicator: appSettingService
.getSetting(AppSettingsEnum.storageIndicator),
listener: selectionListener,
selectionActive: multiselectEnabled.state,
selectionActive: selectionEnabledHook.value,
),
),
if (multiselectEnabled.state) ...[
if (selectionEnabledHook.value) ...[
ControlBottomAppBar(
onShare: onShareAssets,
onDelete: onDelete,
onAddToAlbum: onAddToAlbum,
albums: albums,
onCreateNewAlbum: onCreateNewAlbum,
),
],
],