mirror of
https://github.com/immich-app/immich.git
synced 2026-05-18 03:10:24 +03:00
Merge branch 'main' into plan-local-image-display
This commit is contained in:
@@ -160,12 +160,25 @@ class DriftMemoryPage extends HookConsumerWidget {
|
||||
currentAssetPage.value = otherIndex;
|
||||
updateProgressText();
|
||||
|
||||
final activeMemory = currentMemory.value;
|
||||
|
||||
// Wait for page change animation to finish
|
||||
await Future.delayed(const Duration(milliseconds: 400));
|
||||
|
||||
// check if memory is still the same and if context is still mounted
|
||||
if (currentMemory.value != activeMemory || !context.mounted) {
|
||||
return;
|
||||
}
|
||||
|
||||
// And then precache the next asset
|
||||
await precacheAsset(otherIndex + 1);
|
||||
|
||||
final asset = currentMemory.value.assets[otherIndex];
|
||||
// check again as precache involves async operations
|
||||
if (currentMemory.value != activeMemory || !context.mounted) {
|
||||
return;
|
||||
}
|
||||
|
||||
final asset = activeMemory.assets[otherIndex];
|
||||
currentAsset.value = asset;
|
||||
ref.read(assetViewerProvider.notifier).setAsset(asset);
|
||||
}
|
||||
|
||||
@@ -106,10 +106,17 @@ class DriftSearchPage extends HookConsumerWidget {
|
||||
|
||||
Future.microtask(() {
|
||||
textSearchController.clear();
|
||||
peopleCurrentFilterWidget.value = null;
|
||||
dateRangeCurrentFilterWidget.value = null;
|
||||
cameraCurrentFilterWidget.value = null;
|
||||
tagCurrentFilterWidget.value = null;
|
||||
mediaTypeCurrentFilterWidget.value = null;
|
||||
ratingCurrentFilterWidget.value = null;
|
||||
displayOptionCurrentFilterWidget.value = null;
|
||||
locationCurrentFilterWidget.value = preFilter.location.city != null
|
||||
? Text(preFilter.location.city!, style: context.textTheme.labelLarge)
|
||||
: null;
|
||||
search(preFilter);
|
||||
if (preFilter.location.city != null) {
|
||||
locationCurrentFilterWidget.value = Text(preFilter.location.city!, style: context.textTheme.labelLarge);
|
||||
}
|
||||
});
|
||||
|
||||
return null;
|
||||
|
||||
Reference in New Issue
Block a user