From 015adb595c0f92cf4f6019993a48dfd24116747e Mon Sep 17 00:00:00 2001 From: Neeraj Gupta <254676+ua741@users.noreply.github.com> Date: Wed, 30 Apr 2025 10:37:53 +0530 Subject: [PATCH] Support for DB filters on home screen --- mobile/lib/services/remote/localMapper/merge.dart | 15 ++++++++++++--- mobile/lib/ui/home/home_gallery_widget_v2.dart | 3 ++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/mobile/lib/services/remote/localMapper/merge.dart b/mobile/lib/services/remote/localMapper/merge.dart index 942bebd5fa..35e2996213 100644 --- a/mobile/lib/services/remote/localMapper/merge.dart +++ b/mobile/lib/services/remote/localMapper/merge.dart @@ -1,8 +1,15 @@ import "package:photos/models/file/file.dart"; +import "package:photos/services/filter/db_filters.dart"; -List merge({ +final homeGalleryFilters = DBFilterOptions( + dedupeUploadID: true, + ignoreSavedFiles: true, + onlyUploadedFiles: false, +); +Future> merge({ required List localFiles, required List remoteFiles, + DBFilterOptions? filterOptions, }) { final List mergedFiles = []; int i = 0; @@ -21,6 +28,8 @@ List merge({ // Add remaining elements (only one of these loops will actually run) mergedFiles.addAll(localFiles.sublist(i)); mergedFiles.addAll(remoteFiles.sublist(j)); - - return mergedFiles; + if (filterOptions != null) { + return applyDBFilters(mergedFiles, filterOptions); + } + return Future.value(mergedFiles); } diff --git a/mobile/lib/ui/home/home_gallery_widget_v2.dart b/mobile/lib/ui/home/home_gallery_widget_v2.dart index 4160508fb4..d01e672ce4 100644 --- a/mobile/lib/ui/home/home_gallery_widget_v2.dart +++ b/mobile/lib/ui/home/home_gallery_widget_v2.dart @@ -95,9 +95,10 @@ class _HomeGalleryWidgetV2State extends State { ), ); - final List allFiles = merge( + final List allFiles = await merge( localFiles: localFiles, remoteFiles: enteFiles, + filterOptions: homeGalleryFilters, ); // merge