feat(mobile): lazy loading of assets (#2413)

mobile/lib/modules/album/providers/album.provider.dart

@@ -1,4 +1,5 @@
-import 'package:collection/collection.dart';
+import 'dart:async';
+
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/modules/album/services/album.service.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
@@ -9,50 +10,38 @@ import 'package:immich_mobile/shared/providers/db.provider.dart';
 import 'package:isar/isar.dart';
 
 class AlbumNotifier extends StateNotifier<List<Album>> {
-  AlbumNotifier(this._albumService, this._db) : super([]);
+  AlbumNotifier(this._albumService, Isar db) : super([]) {
+    final query = db.albums
+        .filter()
+        .owner((q) => q.isarIdEqualTo(Store.get(StoreKey.currentUser).isarId));
+    query.findAll().then((value) => state = value);
+    _streamSub = query.watch().listen((data) => state = data);
+  }
   final AlbumService _albumService;
-  final Isar _db;
+  late final StreamSubscription<List<Album>> _streamSub;
 
-  Future<void> getAllAlbums() async {
-    final User me = Store.get(StoreKey.currentUser);
-    List<Album> albums = await _db.albums
-        .filter()
-        .owner((q) => q.isarIdEqualTo(me.isarId))
-        .findAll();
-    if (!const ListEquality().equals(albums, state)) {
-      state = albums;
-    }
-    await Future.wait([
-      _albumService.refreshDeviceAlbums(),
-      _albumService.refreshRemoteAlbums(isShared: false),
-    ]);
-    albums = await _db.albums
-        .filter()
-        .owner((q) => q.isarIdEqualTo(me.isarId))
-        .findAll();
-    if (!const ListEquality().equals(albums, state)) {
-      state = albums;
-    }
-  }
+  Future<void> getAllAlbums() => Future.wait([
+        _albumService.refreshDeviceAlbums(),
+        _albumService.refreshRemoteAlbums(isShared: false),
+      ]);
 
-  Future<bool> deleteAlbum(Album album) async {
-    state = state.where((a) => a.id != album.id).toList();
-    return _albumService.deleteAlbum(album);
-  }
+  Future<bool> deleteAlbum(Album album) => _albumService.deleteAlbum(album);
 
   Future<Album?> createAlbum(
     String albumTitle,
     Set<Asset> assets,
-  ) async {
-    Album? album = await _albumService.createAlbum(albumTitle, assets, []);
-    if (album != null) {
-      state = [...state, album];
-    }
-    return album;
+  ) =>
+      _albumService.createAlbum(albumTitle, assets, []);
+
+  @override
+  void dispose() {
+    _streamSub.cancel();
+    super.dispose();
   }
 }
 
-final albumProvider = StateNotifierProvider<AlbumNotifier, List<Album>>((ref) {
+final albumProvider =
+    StateNotifierProvider.autoDispose<AlbumNotifier, List<Album>>((ref) {
   return AlbumNotifier(
     ref.watch(albumServiceProvider),
     ref.watch(dbProvider),

mobile/lib/modules/album/providers/asset_selection.provider.dart

@@ -1,134 +0,0 @@
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/modules/album/models/asset_selection_state.model.dart';
-import 'package:immich_mobile/shared/models/asset.dart';
-
-class AssetSelectionNotifier extends StateNotifier<AssetSelectionState> {
-  AssetSelectionNotifier()
-      : super(
-          AssetSelectionState(
-            selectedNewAssetsForAlbum: {},
-            selectedMonths: {},
-            selectedAdditionalAssetsForAlbum: {},
-            selectedAssetsInAlbumViewer: {},
-            isAlbumExist: false,
-            isMultiselectEnable: false,
-          ),
-        );
-
-  void setIsAlbumExist(bool isAlbumExist) {
-    state = state.copyWith(isAlbumExist: isAlbumExist);
-  }
-
-  void removeAssetsInMonth(
-    String removedMonth,
-    List<Asset> assetsInMonth,
-  ) {
-    Set<Asset> currentAssetList = state.selectedNewAssetsForAlbum;
-    Set<String> currentMonthList = state.selectedMonths;
-
-    currentMonthList
-        .removeWhere((selectedMonth) => selectedMonth == removedMonth);
-
-    for (Asset asset in assetsInMonth) {
-      currentAssetList.removeWhere((e) => e.id == asset.id);
-    }
-
-    state = state.copyWith(
-      selectedNewAssetsForAlbum: currentAssetList,
-      selectedMonths: currentMonthList,
-    );
-  }
-
-  void addAdditionalAssets(List<Asset> assets) {
-    state = state.copyWith(
-      selectedAdditionalAssetsForAlbum: {
-        ...state.selectedAdditionalAssetsForAlbum,
-        ...assets
-      },
-    );
-  }
-
-  void addAllAssetsInMonth(String month, List<Asset> assetsInMonth) {
-    state = state.copyWith(
-      selectedMonths: {...state.selectedMonths, month},
-      selectedNewAssetsForAlbum: {
-        ...state.selectedNewAssetsForAlbum,
-        ...assetsInMonth
-      },
-    );
-  }
-
-  void addNewAssets(Iterable<Asset> assets) {
-    state = state.copyWith(
-      selectedNewAssetsForAlbum: {
-        ...state.selectedNewAssetsForAlbum,
-        ...assets
-      },
-    );
-  }
-
-  void removeSelectedNewAssets(List<Asset> assets) {
-    Set<Asset> currentList = state.selectedNewAssetsForAlbum;
-
-    for (Asset asset in assets) {
-      currentList.removeWhere((e) => e.id == asset.id);
-    }
-
-    state = state.copyWith(selectedNewAssetsForAlbum: currentList);
-  }
-
-  void removeSelectedAdditionalAssets(List<Asset> assets) {
-    Set<Asset> currentList = state.selectedAdditionalAssetsForAlbum;
-
-    for (Asset asset in assets) {
-      currentList.removeWhere((e) => e.id == asset.id);
-    }
-
-    state = state.copyWith(selectedAdditionalAssetsForAlbum: currentList);
-  }
-
-  void removeAll() {
-    state = state.copyWith(
-      selectedNewAssetsForAlbum: {},
-      selectedMonths: {},
-      selectedAdditionalAssetsForAlbum: {},
-      selectedAssetsInAlbumViewer: {},
-      isAlbumExist: false,
-    );
-  }
-
-  void enableMultiselection() {
-    state = state.copyWith(isMultiselectEnable: true);
-  }
-
-  void disableMultiselection() {
-    state = state.copyWith(
-      isMultiselectEnable: false,
-      selectedAssetsInAlbumViewer: {},
-    );
-  }
-
-  void addAssetsInAlbumViewer(List<Asset> assets) {
-    state = state.copyWith(
-      selectedAssetsInAlbumViewer: {
-        ...state.selectedAssetsInAlbumViewer,
-        ...assets
-      },
-    );
-  }
-
-  void removeAssetsInAlbumViewer(List<Asset> assets) {
-    Set<Asset> currentList = state.selectedAssetsInAlbumViewer;
-
-    for (Asset asset in assets) {
-      currentList.removeWhere((e) => e.id == asset.id);
-    }
-
-    state = state.copyWith(selectedAssetsInAlbumViewer: currentList);
-  }
-}
-
-final assetSelectionProvider =
-    StateNotifierProvider<AssetSelectionNotifier, AssetSelectionState>((ref) {
-  return AssetSelectionNotifier();
-});

mobile/lib/modules/album/providers/shared_album.provider.dart

@@ -1,7 +1,9 @@
-import 'package:collection/collection.dart';
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/modules/album/services/album.service.dart';
+import 'package:immich_mobile/modules/home/ui/asset_grid/asset_grid_data_structure.dart';
 import 'package:immich_mobile/shared/models/album.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
 import 'package:immich_mobile/shared/models/user.dart';
@@ -9,10 +11,14 @@ import 'package:immich_mobile/shared/providers/db.provider.dart';
 import 'package:isar/isar.dart';
 
 class SharedAlbumNotifier extends StateNotifier<List<Album>> {
-  SharedAlbumNotifier(this._albumService, this._db) : super([]);
+  SharedAlbumNotifier(this._albumService, Isar db) : super([]) {
+    final query = db.albums.filter().sharedEqualTo(true).sortByCreatedAtDesc();
+    query.findAll().then((value) => state = value);
+    _streamSub = query.watch().listen((data) => state = data);
+  }
 
   final AlbumService _albumService;
-  final Isar _db;
+  late final StreamSubscription<List<Album>> _streamSub;
 
   Future<Album?> createSharedAlbum(
     String albumName,
@@ -20,46 +26,21 @@ class SharedAlbumNotifier extends StateNotifier<List<Album>> {
     Iterable<User> sharedUsers,
   ) async {
     try {
-      final Album? newAlbum = await _albumService.createAlbum(
+      return await _albumService.createAlbum(
         albumName,
         assets,
         sharedUsers,
       );
-
-      if (newAlbum != null) {
-        state = [...state, newAlbum];
-        return newAlbum;
-      }
     } catch (e) {
       debugPrint("Error createSharedAlbum  ${e.toString()}");
     }
     return null;
   }
 
-  Future<void> getAllSharedAlbums() async {
-    var albums = await _db.albums
-        .filter()
-        .sharedEqualTo(true)
-        .sortByCreatedAtDesc()
-        .findAll();
-    if (!const ListEquality().equals(albums, state)) {
-      state = albums;
-    }
-    await _albumService.refreshRemoteAlbums(isShared: true);
-    albums = await _db.albums
-        .filter()
-        .sharedEqualTo(true)
-        .sortByCreatedAtDesc()
-        .findAll();
-    if (!const ListEquality().equals(albums, state)) {
-      state = albums;
-    }
-  }
+  Future<void> getAllSharedAlbums() =>
+      _albumService.refreshRemoteAlbums(isShared: true);
 
-  Future<bool> deleteAlbum(Album album) {
-    state = state.where((a) => a.id != album.id).toList();
-    return _albumService.deleteAlbum(album);
-  }
+  Future<bool> deleteAlbum(Album album) => _albumService.deleteAlbum(album);
 
   Future<bool> leaveAlbum(Album album) async {
     var res = await _albumService.leaveAlbum(album);
@@ -75,10 +56,16 @@ class SharedAlbumNotifier extends StateNotifier<List<Album>> {
   Future<bool> removeAssetFromAlbum(Album album, Iterable<Asset> assets) {
     return _albumService.removeAssetFromAlbum(album, assets);
   }
+
+  @override
+  void dispose() {
+    _streamSub.cancel();
+    super.dispose();
+  }
 }
 
 final sharedAlbumProvider =
-    StateNotifierProvider<SharedAlbumNotifier, List<Album>>((ref) {
+    StateNotifierProvider.autoDispose<SharedAlbumNotifier, List<Album>>((ref) {
   return SharedAlbumNotifier(
     ref.watch(albumServiceProvider),
     ref.watch(dbProvider),
@@ -86,10 +73,15 @@ final sharedAlbumProvider =
 });
 
 final sharedAlbumDetailProvider =
-    FutureProvider.autoDispose.family<Album?, int>((ref, albumId) async {
+    StreamProvider.autoDispose.family<Album, int>((ref, albumId) async* {
   final AlbumService sharedAlbumService = ref.watch(albumServiceProvider);
 
-  final Album? a = await sharedAlbumService.getAlbumDetail(albumId);
-  await a?.loadSortedAssets();
-  return a;
+  await for (final a in sharedAlbumService.watchAlbum(albumId)) {
+    if (a == null) {
+      throw Exception("Album with ID=$albumId does not exist anymore!");
+    }
+    await for (final _ in a.watchRenderList(GroupAssetsBy.none)) {
+      yield a;
+    }
+  }
 });