mirror of
https://github.com/KevinMidboe/immich.git
synced 2026-01-17 06:36:36 +00:00
feat(mobile): lazy loading of assets (#2413)
This commit is contained in:
Fynn Petersen-Frey
committed by
GitHub
GitHub
parent
93863b0629
commit
0dde76bbbc
@@ -60,11 +60,7 @@ void main() {
|
||||
test('test grouped check months', () async {
|
||||
final renderList = await RenderList.fromAssets(
|
||||
assets,
|
||||
AssetGridLayoutParameters(
|
||||
3,
|
||||
false,
|
||||
GroupAssetsBy.day,
|
||||
),
|
||||
GroupAssetsBy.day,
|
||||
);
|
||||
|
||||
// Oct
|
||||
@@ -78,32 +74,33 @@ void main() {
|
||||
// 5 Assets => 2 Rows
|
||||
// Day 1
|
||||
// 5 Assets => 2 Rows
|
||||
expect(renderList.elements.length, 18);
|
||||
expect(renderList.elements.length, 4);
|
||||
expect(
|
||||
renderList.elements[0].type,
|
||||
RenderAssetGridElementType.monthTitle,
|
||||
);
|
||||
expect(renderList.elements[0].date.month, 10);
|
||||
expect(renderList.elements[0].date.month, 1);
|
||||
expect(
|
||||
renderList.elements[7].type,
|
||||
renderList.elements[1].type,
|
||||
RenderAssetGridElementType.groupDividerTitle,
|
||||
);
|
||||
expect(renderList.elements[1].date.month, 1);
|
||||
expect(
|
||||
renderList.elements[2].type,
|
||||
RenderAssetGridElementType.monthTitle,
|
||||
);
|
||||
expect(renderList.elements[7].date.month, 2);
|
||||
expect(renderList.elements[2].date.month, 2);
|
||||
expect(
|
||||
renderList.elements[11].type,
|
||||
renderList.elements[3].type,
|
||||
RenderAssetGridElementType.monthTitle,
|
||||
);
|
||||
expect(renderList.elements[11].date.month, 1);
|
||||
expect(renderList.elements[3].date.month, 10);
|
||||
});
|
||||
|
||||
test('test grouped check types', () async {
|
||||
final renderList = await RenderList.fromAssets(
|
||||
assets,
|
||||
AssetGridLayoutParameters(
|
||||
5,
|
||||
false,
|
||||
GroupAssetsBy.day,
|
||||
),
|
||||
GroupAssetsBy.day,
|
||||
);
|
||||
|
||||
// Oct
|
||||
@@ -120,17 +117,8 @@ void main() {
|
||||
final types = [
|
||||
RenderAssetGridElementType.monthTitle,
|
||||
RenderAssetGridElementType.groupDividerTitle,
|
||||
RenderAssetGridElementType.assetRow,
|
||||
RenderAssetGridElementType.assetRow,
|
||||
RenderAssetGridElementType.assetRow,
|
||||
RenderAssetGridElementType.monthTitle,
|
||||
RenderAssetGridElementType.groupDividerTitle,
|
||||
RenderAssetGridElementType.assetRow,
|
||||
RenderAssetGridElementType.monthTitle,
|
||||
RenderAssetGridElementType.groupDividerTitle,
|
||||
RenderAssetGridElementType.assetRow,
|
||||
RenderAssetGridElementType.groupDividerTitle,
|
||||
RenderAssetGridElementType.assetRow,
|
||||
];
|
||||
|
||||
expect(renderList.elements.length, types.length);
|
||||
|
||||
@@ -1,112 +0,0 @@
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
||||
import 'package:immich_mobile/modules/favorite/providers/favorite_provider.dart';
|
||||
import 'package:immich_mobile/shared/models/asset.dart';
|
||||
import 'package:immich_mobile/shared/providers/asset.provider.dart';
|
||||
import 'package:mockito/annotations.dart';
|
||||
import 'package:mockito/mockito.dart';
|
||||
|
||||
@GenerateNiceMocks([
|
||||
MockSpec<AssetsState>(),
|
||||
MockSpec<AssetNotifier>(),
|
||||
])
|
||||
import 'favorite_provider_test.mocks.dart';
|
||||
|
||||
Asset _getTestAsset(int id, bool favorite) {
|
||||
final Asset a = Asset(
|
||||
remoteId: id.toString(),
|
||||
localId: id.toString(),
|
||||
deviceId: 1,
|
||||
ownerId: 1,
|
||||
fileCreatedAt: DateTime.now(),
|
||||
fileModifiedAt: DateTime.now(),
|
||||
updatedAt: DateTime.now(),
|
||||
isLocal: false,
|
||||
durationInSeconds: 0,
|
||||
type: AssetType.image,
|
||||
fileName: '',
|
||||
isFavorite: favorite,
|
||||
isArchived: false,
|
||||
);
|
||||
a.id = id;
|
||||
return a;
|
||||
}
|
||||
|
||||
void main() {
|
||||
group("Test favoriteProvider", () {
|
||||
late MockAssetsState assetsState;
|
||||
late MockAssetNotifier assetNotifier;
|
||||
late ProviderContainer container;
|
||||
late StateNotifierProvider<FavoriteSelectionNotifier, Set<int>>
|
||||
testFavoritesProvider;
|
||||
|
||||
setUp(
|
||||
() {
|
||||
assetsState = MockAssetsState();
|
||||
assetNotifier = MockAssetNotifier();
|
||||
container = ProviderContainer();
|
||||
|
||||
testFavoritesProvider =
|
||||
StateNotifierProvider<FavoriteSelectionNotifier, Set<int>>((ref) {
|
||||
return FavoriteSelectionNotifier(
|
||||
assetsState,
|
||||
assetNotifier,
|
||||
);
|
||||
});
|
||||
},
|
||||
);
|
||||
|
||||
test("Empty favorites provider", () {
|
||||
when(assetsState.allAssets).thenReturn([]);
|
||||
expect(<int>{}, container.read(testFavoritesProvider));
|
||||
});
|
||||
|
||||
test("Non-empty favorites provider", () {
|
||||
when(assetsState.allAssets).thenReturn([
|
||||
_getTestAsset(1, false),
|
||||
_getTestAsset(2, true),
|
||||
_getTestAsset(3, false),
|
||||
_getTestAsset(4, false),
|
||||
_getTestAsset(5, true),
|
||||
]);
|
||||
|
||||
expect(<int>{2, 5}, container.read(testFavoritesProvider));
|
||||
});
|
||||
|
||||
test("Toggle favorite", () {
|
||||
when(assetNotifier.toggleFavorite(null, false))
|
||||
.thenAnswer((_) async => false);
|
||||
|
||||
final testAsset1 = _getTestAsset(1, false);
|
||||
final testAsset2 = _getTestAsset(2, true);
|
||||
|
||||
when(assetsState.allAssets).thenReturn([testAsset1, testAsset2]);
|
||||
|
||||
expect(<int>{2}, container.read(testFavoritesProvider));
|
||||
|
||||
container.read(testFavoritesProvider.notifier).toggleFavorite(testAsset2);
|
||||
expect(<int>{}, container.read(testFavoritesProvider));
|
||||
|
||||
container.read(testFavoritesProvider.notifier).toggleFavorite(testAsset1);
|
||||
expect(<int>{1}, container.read(testFavoritesProvider));
|
||||
});
|
||||
|
||||
test("Add favorites", () {
|
||||
when(assetNotifier.toggleFavorite(null, false))
|
||||
.thenAnswer((_) async => false);
|
||||
|
||||
when(assetsState.allAssets).thenReturn([]);
|
||||
|
||||
expect(<int>{}, container.read(testFavoritesProvider));
|
||||
|
||||
container.read(testFavoritesProvider.notifier).addToFavorites(
|
||||
[
|
||||
_getTestAsset(1, false),
|
||||
_getTestAsset(2, false),
|
||||
],
|
||||
);
|
||||
|
||||
expect(<int>{1, 2}, container.read(testFavoritesProvider));
|
||||
});
|
||||
});
|
||||
}
|
||||
@@ -1,298 +0,0 @@
|
||||
// Mocks generated by Mockito 5.3.2 from annotations
|
||||
// in immich_mobile/test/favorite_provider_test.dart.
|
||||
// Do not manually edit this file.
|
||||
|
||||
// ignore_for_file: no_leading_underscores_for_library_prefixes
|
||||
import 'dart:async' as _i5;
|
||||
|
||||
import 'package:hooks_riverpod/hooks_riverpod.dart' as _i7;
|
||||
import 'package:immich_mobile/modules/home/ui/asset_grid/asset_grid_data_structure.dart'
|
||||
as _i6;
|
||||
import 'package:immich_mobile/shared/models/asset.dart' as _i4;
|
||||
import 'package:immich_mobile/shared/providers/asset.provider.dart' as _i2;
|
||||
import 'package:logging/logging.dart' as _i3;
|
||||
import 'package:mockito/mockito.dart' as _i1;
|
||||
import 'package:state_notifier/state_notifier.dart' as _i8;
|
||||
|
||||
// ignore_for_file: type=lint
|
||||
// ignore_for_file: avoid_redundant_argument_values
|
||||
// ignore_for_file: avoid_setters_without_getters
|
||||
// ignore_for_file: comment_references
|
||||
// ignore_for_file: implementation_imports
|
||||
// ignore_for_file: invalid_use_of_visible_for_testing_member
|
||||
// ignore_for_file: prefer_const_constructors
|
||||
// ignore_for_file: unnecessary_parenthesis
|
||||
// ignore_for_file: camel_case_types
|
||||
// ignore_for_file: subtype_of_sealed_class
|
||||
|
||||
class _FakeAssetsState_0 extends _i1.SmartFake implements _i2.AssetsState {
|
||||
_FakeAssetsState_0(
|
||||
Object parent,
|
||||
Invocation parentInvocation,
|
||||
) : super(
|
||||
parent,
|
||||
parentInvocation,
|
||||
);
|
||||
}
|
||||
|
||||
class _FakeLogger_1 extends _i1.SmartFake implements _i3.Logger {
|
||||
_FakeLogger_1(
|
||||
Object parent,
|
||||
Invocation parentInvocation,
|
||||
) : super(
|
||||
parent,
|
||||
parentInvocation,
|
||||
);
|
||||
}
|
||||
|
||||
/// A class which mocks [AssetsState].
|
||||
///
|
||||
/// See the documentation for Mockito's code generation for more information.
|
||||
class MockAssetsState extends _i1.Mock implements _i2.AssetsState {
|
||||
@override
|
||||
List<_i4.Asset> get allAssets => (super.noSuchMethod(
|
||||
Invocation.getter(#allAssets),
|
||||
returnValue: <_i4.Asset>[],
|
||||
returnValueForMissingStub: <_i4.Asset>[],
|
||||
) as List<_i4.Asset>);
|
||||
@override
|
||||
_i5.Future<_i2.AssetsState> withRenderDataStructure(
|
||||
_i6.AssetGridLayoutParameters? layout) =>
|
||||
(super.noSuchMethod(
|
||||
Invocation.method(
|
||||
#withRenderDataStructure,
|
||||
[layout],
|
||||
),
|
||||
returnValue: _i5.Future<_i2.AssetsState>.value(_FakeAssetsState_0(
|
||||
this,
|
||||
Invocation.method(
|
||||
#withRenderDataStructure,
|
||||
[layout],
|
||||
),
|
||||
)),
|
||||
returnValueForMissingStub:
|
||||
_i5.Future<_i2.AssetsState>.value(_FakeAssetsState_0(
|
||||
this,
|
||||
Invocation.method(
|
||||
#withRenderDataStructure,
|
||||
[layout],
|
||||
),
|
||||
)),
|
||||
) as _i5.Future<_i2.AssetsState>);
|
||||
@override
|
||||
_i2.AssetsState withAdditionalAssets(List<_i4.Asset>? toAdd) =>
|
||||
(super.noSuchMethod(
|
||||
Invocation.method(
|
||||
#withAdditionalAssets,
|
||||
[toAdd],
|
||||
),
|
||||
returnValue: _FakeAssetsState_0(
|
||||
this,
|
||||
Invocation.method(
|
||||
#withAdditionalAssets,
|
||||
[toAdd],
|
||||
),
|
||||
),
|
||||
returnValueForMissingStub: _FakeAssetsState_0(
|
||||
this,
|
||||
Invocation.method(
|
||||
#withAdditionalAssets,
|
||||
[toAdd],
|
||||
),
|
||||
),
|
||||
) as _i2.AssetsState);
|
||||
}
|
||||
|
||||
/// A class which mocks [AssetNotifier].
|
||||
///
|
||||
/// See the documentation for Mockito's code generation for more information.
|
||||
class MockAssetNotifier extends _i1.Mock implements _i2.AssetNotifier {
|
||||
@override
|
||||
_i3.Logger get log => (super.noSuchMethod(
|
||||
Invocation.getter(#log),
|
||||
returnValue: _FakeLogger_1(
|
||||
this,
|
||||
Invocation.getter(#log),
|
||||
),
|
||||
returnValueForMissingStub: _FakeLogger_1(
|
||||
this,
|
||||
Invocation.getter(#log),
|
||||
),
|
||||
) as _i3.Logger);
|
||||
@override
|
||||
set onError(_i7.ErrorListener? _onError) => super.noSuchMethod(
|
||||
Invocation.setter(
|
||||
#onError,
|
||||
_onError,
|
||||
),
|
||||
returnValueForMissingStub: null,
|
||||
);
|
||||
@override
|
||||
bool get mounted => (super.noSuchMethod(
|
||||
Invocation.getter(#mounted),
|
||||
returnValue: false,
|
||||
returnValueForMissingStub: false,
|
||||
) as bool);
|
||||
@override
|
||||
_i5.Stream<_i2.AssetsState> get stream => (super.noSuchMethod(
|
||||
Invocation.getter(#stream),
|
||||
returnValue: _i5.Stream<_i2.AssetsState>.empty(),
|
||||
returnValueForMissingStub: _i5.Stream<_i2.AssetsState>.empty(),
|
||||
) as _i5.Stream<_i2.AssetsState>);
|
||||
@override
|
||||
_i2.AssetsState get state => (super.noSuchMethod(
|
||||
Invocation.getter(#state),
|
||||
returnValue: _FakeAssetsState_0(
|
||||
this,
|
||||
Invocation.getter(#state),
|
||||
),
|
||||
returnValueForMissingStub: _FakeAssetsState_0(
|
||||
this,
|
||||
Invocation.getter(#state),
|
||||
),
|
||||
) as _i2.AssetsState);
|
||||
@override
|
||||
set state(_i2.AssetsState? value) => super.noSuchMethod(
|
||||
Invocation.setter(
|
||||
#state,
|
||||
value,
|
||||
),
|
||||
returnValueForMissingStub: null,
|
||||
);
|
||||
@override
|
||||
_i2.AssetsState get debugState => (super.noSuchMethod(
|
||||
Invocation.getter(#debugState),
|
||||
returnValue: _FakeAssetsState_0(
|
||||
this,
|
||||
Invocation.getter(#debugState),
|
||||
),
|
||||
returnValueForMissingStub: _FakeAssetsState_0(
|
||||
this,
|
||||
Invocation.getter(#debugState),
|
||||
),
|
||||
) as _i2.AssetsState);
|
||||
@override
|
||||
bool get hasListeners => (super.noSuchMethod(
|
||||
Invocation.getter(#hasListeners),
|
||||
returnValue: false,
|
||||
returnValueForMissingStub: false,
|
||||
) as bool);
|
||||
@override
|
||||
_i5.Future<void> rebuildAssetGridDataStructure() => (super.noSuchMethod(
|
||||
Invocation.method(
|
||||
#rebuildAssetGridDataStructure,
|
||||
[],
|
||||
),
|
||||
returnValue: _i5.Future<void>.value(),
|
||||
returnValueForMissingStub: _i5.Future<void>.value(),
|
||||
) as _i5.Future<void>);
|
||||
@override
|
||||
_i5.Future<void> getAllAsset({bool? clear = false}) => (super.noSuchMethod(
|
||||
Invocation.method(
|
||||
#getAllAsset,
|
||||
[],
|
||||
{#clear: clear},
|
||||
),
|
||||
returnValue: _i5.Future<void>.value(),
|
||||
returnValueForMissingStub: _i5.Future<void>.value(),
|
||||
) as _i5.Future<void>);
|
||||
@override
|
||||
_i5.Future<void> clearAllAsset() => (super.noSuchMethod(
|
||||
Invocation.method(
|
||||
#clearAllAsset,
|
||||
[],
|
||||
),
|
||||
returnValue: _i5.Future<void>.value(),
|
||||
returnValueForMissingStub: _i5.Future<void>.value(),
|
||||
) as _i5.Future<void>);
|
||||
@override
|
||||
_i5.Future<void> onNewAssetUploaded(_i4.Asset? newAsset) =>
|
||||
(super.noSuchMethod(
|
||||
Invocation.method(
|
||||
#onNewAssetUploaded,
|
||||
[newAsset],
|
||||
),
|
||||
returnValue: _i5.Future<void>.value(),
|
||||
returnValueForMissingStub: _i5.Future<void>.value(),
|
||||
) as _i5.Future<void>);
|
||||
@override
|
||||
_i5.Future<void> deleteAssets(Set<_i4.Asset>? deleteAssets) =>
|
||||
(super.noSuchMethod(
|
||||
Invocation.method(
|
||||
#deleteAssets,
|
||||
[deleteAssets],
|
||||
),
|
||||
returnValue: _i5.Future<void>.value(),
|
||||
returnValueForMissingStub: _i5.Future<void>.value(),
|
||||
) as _i5.Future<void>);
|
||||
@override
|
||||
_i5.Future<bool> toggleFavorite(
|
||||
_i4.Asset? asset,
|
||||
bool? status,
|
||||
) =>
|
||||
(super.noSuchMethod(
|
||||
Invocation.method(
|
||||
#toggleFavorite,
|
||||
[
|
||||
asset,
|
||||
status,
|
||||
],
|
||||
),
|
||||
returnValue: _i5.Future<bool>.value(false),
|
||||
returnValueForMissingStub: _i5.Future<bool>.value(false),
|
||||
) as _i5.Future<bool>);
|
||||
@override
|
||||
_i5.Future<void> toggleArchive(
|
||||
Iterable<_i4.Asset>? assets,
|
||||
bool? status,
|
||||
) =>
|
||||
(super.noSuchMethod(
|
||||
Invocation.method(
|
||||
#toggleArchive,
|
||||
[
|
||||
assets,
|
||||
status,
|
||||
],
|
||||
),
|
||||
returnValue: _i5.Future<void>.value(),
|
||||
returnValueForMissingStub: _i5.Future<void>.value(),
|
||||
) as _i5.Future<void>);
|
||||
@override
|
||||
bool updateShouldNotify(
|
||||
_i2.AssetsState? old,
|
||||
_i2.AssetsState? current,
|
||||
) =>
|
||||
(super.noSuchMethod(
|
||||
Invocation.method(
|
||||
#updateShouldNotify,
|
||||
[
|
||||
old,
|
||||
current,
|
||||
],
|
||||
),
|
||||
returnValue: false,
|
||||
returnValueForMissingStub: false,
|
||||
) as bool);
|
||||
@override
|
||||
_i7.RemoveListener addListener(
|
||||
_i8.Listener<_i2.AssetsState>? listener, {
|
||||
bool? fireImmediately = true,
|
||||
}) =>
|
||||
(super.noSuchMethod(
|
||||
Invocation.method(
|
||||
#addListener,
|
||||
[listener],
|
||||
{#fireImmediately: fireImmediately},
|
||||
),
|
||||
returnValue: () {},
|
||||
returnValueForMissingStub: () {},
|
||||
) as _i7.RemoveListener);
|
||||
@override
|
||||
void dispose() => super.noSuchMethod(
|
||||
Invocation.method(
|
||||
#dispose,
|
||||
[],
|
||||
),
|
||||
returnValueForMissingStub: null,
|
||||
);
|
||||
}
|
||||
Reference in New Issue
Block a user