diff --git a/mobile/lib/models/search/hierarchical/album_filter.dart b/mobile/lib/models/search/hierarchical/album_filter.dart index bce7f7c674..71c197ed2a 100644 --- a/mobile/lib/models/search/hierarchical/album_filter.dart +++ b/mobile/lib/models/search/hierarchical/album_filter.dart @@ -1,7 +1,6 @@ import "package:flutter/material.dart"; import "package:photos/models/file/file.dart"; import "package:photos/models/search/hierarchical/hierarchical_search_filter.dart"; -import "package:photos/models/search/search_types.dart"; class AlbumFilter extends HierarchicalSearchFilter { final int collectionID; @@ -49,9 +48,4 @@ class AlbumFilter extends HierarchicalSearchFilter { } return false; } - - @override - ResultType resultType() { - return ResultType.collection; - } } diff --git a/mobile/lib/models/search/hierarchical/contacts_filter.dart b/mobile/lib/models/search/hierarchical/contacts_filter.dart index 7c6db60600..a5d3e1adb8 100644 --- a/mobile/lib/models/search/hierarchical/contacts_filter.dart +++ b/mobile/lib/models/search/hierarchical/contacts_filter.dart @@ -2,7 +2,6 @@ import "package:flutter/material.dart"; import "package:photos/models/api/collection/user.dart"; import "package:photos/models/file/file.dart"; import "package:photos/models/search/hierarchical/hierarchical_search_filter.dart"; -import "package:photos/models/search/search_types.dart"; class ContactsFilter extends HierarchicalSearchFilter { final User user; @@ -49,9 +48,4 @@ class ContactsFilter extends HierarchicalSearchFilter { IconData? icon() { return Icons.person_outlined; } - - @override - ResultType resultType() { - return ResultType.shared; - } } diff --git a/mobile/lib/models/search/hierarchical/face_filter.dart b/mobile/lib/models/search/hierarchical/face_filter.dart index 9d1dff0402..4fa183ddac 100644 --- a/mobile/lib/models/search/hierarchical/face_filter.dart +++ b/mobile/lib/models/search/hierarchical/face_filter.dart @@ -1,7 +1,6 @@ import "package:flutter/material.dart"; import "package:photos/models/file/file.dart"; import "package:photos/models/search/hierarchical/hierarchical_search_filter.dart"; -import "package:photos/models/search/search_types.dart"; class FaceFilter extends HierarchicalSearchFilter { final String? personId; @@ -60,9 +59,4 @@ class FaceFilter extends HierarchicalSearchFilter { } return false; } - - @override - ResultType resultType() { - return ResultType.faces; - } } diff --git a/mobile/lib/models/search/hierarchical/file_type_filter.dart b/mobile/lib/models/search/hierarchical/file_type_filter.dart index ac77f9045f..064261e964 100644 --- a/mobile/lib/models/search/hierarchical/file_type_filter.dart +++ b/mobile/lib/models/search/hierarchical/file_type_filter.dart @@ -2,7 +2,6 @@ import "package:flutter/material.dart"; import "package:photos/models/file/file.dart"; import "package:photos/models/file/file_type.dart"; import "package:photos/models/search/hierarchical/hierarchical_search_filter.dart"; -import "package:photos/models/search/search_types.dart"; extension FileTypeExtension on FileType { IconData get icon { @@ -62,9 +61,4 @@ class FileTypeFilter extends HierarchicalSearchFilter { } return false; } - - @override - ResultType resultType() { - return ResultType.fileType; - } } diff --git a/mobile/lib/models/search/hierarchical/hierarchical_search_filter.dart b/mobile/lib/models/search/hierarchical/hierarchical_search_filter.dart index e2d1aa8bd2..9dd616c0b2 100644 --- a/mobile/lib/models/search/hierarchical/hierarchical_search_filter.dart +++ b/mobile/lib/models/search/hierarchical/hierarchical_search_filter.dart @@ -1,6 +1,5 @@ import "package:flutter/widgets.dart"; import "package:photos/models/file/file.dart"; -import "package:photos/models/search/search_types.dart"; int kMostRelevantFilter = 10000; int kLeastRelevantFilter = -1; @@ -26,5 +25,4 @@ abstract class HierarchicalSearchFilter { bool isMatch(EnteFile file); Set getMatchedUploadedIDs(); bool isSameFilter(HierarchicalSearchFilter other); - ResultType resultType(); } diff --git a/mobile/lib/models/search/hierarchical/location_filter.dart b/mobile/lib/models/search/hierarchical/location_filter.dart index ff03dfd118..9245826dad 100644 --- a/mobile/lib/models/search/hierarchical/location_filter.dart +++ b/mobile/lib/models/search/hierarchical/location_filter.dart @@ -2,7 +2,6 @@ import "package:flutter/material.dart"; import "package:photos/models/file/file.dart"; import "package:photos/models/location_tag/location_tag.dart"; import "package:photos/models/search/hierarchical/hierarchical_search_filter.dart"; -import "package:photos/models/search/search_types.dart"; import "package:photos/services/location_service.dart"; class LocationFilter extends HierarchicalSearchFilter { @@ -57,9 +56,4 @@ class LocationFilter extends HierarchicalSearchFilter { IconData icon() { return Icons.location_pin; } - - @override - ResultType resultType() { - return ResultType.location; - } } diff --git a/mobile/lib/models/search/hierarchical/magic_filter.dart b/mobile/lib/models/search/hierarchical/magic_filter.dart index f65fe25d74..765a52e286 100644 --- a/mobile/lib/models/search/hierarchical/magic_filter.dart +++ b/mobile/lib/models/search/hierarchical/magic_filter.dart @@ -1,7 +1,6 @@ import "package:flutter/widgets.dart"; import "package:photos/models/file/file.dart"; import "package:photos/models/search/hierarchical/hierarchical_search_filter.dart"; -import "package:photos/models/search/search_types.dart"; class MagicFilter extends HierarchicalSearchFilter { @override @@ -39,10 +38,4 @@ class MagicFilter extends HierarchicalSearchFilter { // TODO: implement relevance throw UnimplementedError(); } - - @override - ResultType resultType() { - // TODO: implement resultType - throw UnimplementedError(); - } } diff --git a/mobile/lib/models/search/hierarchical/top_level_generic_filter.dart b/mobile/lib/models/search/hierarchical/top_level_generic_filter.dart index fe5490da39..93cd9e3fa6 100644 --- a/mobile/lib/models/search/hierarchical/top_level_generic_filter.dart +++ b/mobile/lib/models/search/hierarchical/top_level_generic_filter.dart @@ -41,7 +41,7 @@ class TopLevelGenericFilter extends HierarchicalSearchFilter { @override bool isSameFilter(HierarchicalSearchFilter other) { - return other.resultType() == filterResultType && other.name() == name(); + return other.name() == name(); } @override @@ -58,9 +58,4 @@ class TopLevelGenericFilter extends HierarchicalSearchFilter { int relevance() { return occurrence; } - - @override - ResultType resultType() { - return filterResultType; - } }