Add a feature flag and use the SDK filters.

pixlwave · pixlwave · commit 11701096666a · 2025-08-13T10:26:58.000+01:00
diff --git a/ElementX/Resources/Localizations/en.lproj/Localizable.strings b/ElementX/Resources/Localizations/en.lproj/Localizable.strings
@@ -1075,6 +1075,7 @@
 "screen_roomlist_filter_favourites_empty_state_title" = "You don’t have favourite chats yet";
 "screen_roomlist_filter_invites_empty_state_title" = "You don't have any pending invites.";
 "screen_roomlist_filter_low_priority" = "Low Priority";
+"screen_roomlist_filter_low_priority_empty_state_title" = "You don’t have any low priority chats yet";
 "screen_roomlist_filter_mixed_empty_state_subtitle" = "You can deselect filters in order to see your other chats";
 "screen_roomlist_filter_mixed_empty_state_title" = "You don’t have chats for this selection";
 "screen_roomlist_filter_people_empty_state_title" = "You don’t have any DMs yet";
diff --git a/ElementX/Sources/Application/Settings/AppSettings.swift b/ElementX/Sources/Application/Settings/AppSettings.swift
@@ -55,6 +55,7 @@ final class AppSettings {
         // Feature flags
         case publicSearchEnabled
         case fuzzyRoomListSearchEnabled
+        case lowPriorityFilterEnabled
         case enableOnlySignedDeviceIsolationMode
         case enableKeyShareOnInvite
         case knockingEnabled
@@ -345,6 +346,9 @@ final class AppSettings {
     @UserPreference(key: UserDefaultsKeys.fuzzyRoomListSearchEnabled, defaultValue: false, storageType: .userDefaults(store))
     var fuzzyRoomListSearchEnabled
     
+    @UserPreference(key: UserDefaultsKeys.lowPriorityFilterEnabled, defaultValue: false, storageType: .userDefaults(store))
+    var lowPriorityFilterEnabled
+    
     @UserPreference(key: UserDefaultsKeys.knockingEnabled, defaultValue: false, storageType: .userDefaults(store))
     var knockingEnabled
     
diff --git a/ElementX/Sources/Generated/Strings.swift b/ElementX/Sources/Generated/Strings.swift
@@ -2581,6 +2581,8 @@ internal enum L10n {
   internal static var screenRoomlistFilterInvitesEmptyStateTitle: String { return L10n.tr("Localizable", "screen_roomlist_filter_invites_empty_state_title") }
   /// Low Priority
   internal static var screenRoomlistFilterLowPriority: String { return L10n.tr("Localizable", "screen_roomlist_filter_low_priority") }
+  /// You don’t have any low priority chats yet
+  internal static var screenRoomlistFilterLowPriorityEmptyStateTitle: String { return L10n.tr("Localizable", "screen_roomlist_filter_low_priority_empty_state_title") }
   /// You can deselect filters in order to see your other chats
   internal static var screenRoomlistFilterMixedEmptyStateSubtitle: String { return L10n.tr("Localizable", "screen_roomlist_filter_mixed_empty_state_subtitle") }
   /// You don’t have chats for this selection
diff --git a/ElementX/Sources/Screens/HomeScreen/HomeScreenModels.swift b/ElementX/Sources/Screens/HomeScreen/HomeScreenModels.swift
@@ -113,7 +113,7 @@ struct HomeScreenViewState: BindableState {
         return rooms
     }
         
-    var bindings = HomeScreenViewStateBindings()
+    var bindings: HomeScreenViewStateBindings
     
     var placeholderRooms: [HomeScreenRoom] {
         (1...10).map { _ in
@@ -136,7 +136,7 @@ struct HomeScreenViewState: BindableState {
 }
 
 struct HomeScreenViewStateBindings {
-    var filtersState = RoomListFiltersState()
+    var filtersState: RoomListFiltersState
     var searchQuery = ""
     var isSearchFieldFocused = false
     
diff --git a/ElementX/Sources/Screens/HomeScreen/HomeScreenViewModel.swift b/ElementX/Sources/Screens/HomeScreen/HomeScreenViewModel.swift
@@ -40,7 +40,8 @@ class HomeScreenViewModel: HomeScreenViewModelType, HomeScreenViewModelProtocol
         
         roomSummaryProvider = userSession.clientProxy.roomSummaryProvider
         
-        super.init(initialViewState: .init(userID: userSession.clientProxy.userID),
+        super.init(initialViewState: .init(userID: userSession.clientProxy.userID,
+                                           bindings: .init(filtersState: .init(appSettings: appSettings))),
                    mediaProvider: userSession.mediaProvider)
         
         userSession.clientProxy.userAvatarURLPublisher
diff --git a/ElementX/Sources/Screens/HomeScreen/View/Filters/RoomListFilterModels.swift b/ElementX/Sources/Screens/HomeScreen/View/Filters/RoomListFilterModels.swift
@@ -74,24 +74,28 @@ enum RoomListFilter: Int, CaseIterable, Identifiable {
         case .invites:
             return .invite
         case .lowPriority:
-            // TODO: Replace with actual SDK filter when available
-            // This will need to be updated to .all(filters: [.lowPriority, .joined]) when SDK support is ready
-            // Note: The main logic for NonLowPriority vs LowPriority filtering is handled in setFilter method
-            return .all(filters: [.joined])
+            // Note: When not activated, the setFilter method automatically applies the .nonLowPriority filter.
+            return .all(filters: [.lowPriority, .joined])
         }
     }
 }
 
 struct RoomListFiltersState {
     private(set) var activeFilters: OrderedSet<RoomListFilter>
+    private let appSettings: AppSettings
     
-    init(activeFilters: OrderedSet<RoomListFilter> = []) {
+    init(activeFilters: OrderedSet<RoomListFilter> = [], appSettings: AppSettings) {
         self.activeFilters = .init(activeFilters)
+        self.appSettings = appSettings
     }
     
     var availableFilters: [RoomListFilter] {
         var availableFilters = OrderedSet(RoomListFilter.availableFilters)
         
+        if !appSettings.lowPriorityFilterEnabled {
+            availableFilters.remove(.lowPriority)
+        }
+        
         for filter in activeFilters {
             availableFilters.remove(filter)
             filter.incompatibleFilters.forEach { availableFilters.remove($0) }
diff --git a/ElementX/Sources/Screens/HomeScreen/View/Filters/RoomListFiltersEmptyStateView.swift b/ElementX/Sources/Screens/HomeScreen/View/Filters/RoomListFiltersEmptyStateView.swift
@@ -23,6 +23,8 @@ struct RoomListFiltersEmptyStateView: View {
                 return L10n.screenRoomlistFilterFavouritesEmptyStateTitle
             case .invites:
                 return L10n.screenRoomlistFilterInvitesEmptyStateTitle
+            case .lowPriority:
+                return L10n.screenRoomlistFilterLowPriorityEmptyStateTitle
             }
         }
         return L10n.screenRoomlistFilterMixedEmptyStateTitle
@@ -55,9 +57,11 @@ struct RoomListFiltersEmptyStateView_Previews: PreviewProvider, TestablePreview
     static var previews: some View {
         VStack(spacing: 24) {
             ForEach(RoomListFilter.allCases) { filter in
-                RoomListFiltersEmptyStateView(state: .init(activeFilters: [filter]))
+                RoomListFiltersEmptyStateView(state: .init(activeFilters: [filter],
+                                                           appSettings: ServiceLocator.shared.settings))
             }
-            RoomListFiltersEmptyStateView(state: .init(activeFilters: [.people, .favourites]))
+            RoomListFiltersEmptyStateView(state: .init(activeFilters: [.people, .favourites],
+                                                       appSettings: ServiceLocator.shared.settings))
         }
         .padding(.bottom)
         .previewLayout(.sizeThatFits)
diff --git a/ElementX/Sources/Screens/HomeScreen/View/Filters/RoomListFiltersView.swift b/ElementX/Sources/Screens/HomeScreen/View/Filters/RoomListFiltersView.swift
@@ -87,9 +87,12 @@ struct RoomListFiltersView: View {
 
 struct RoomListFiltersView_Previews: PreviewProvider, TestablePreview {
     static var previews: some View {
-        RoomListFiltersView(state: .constant(.init()))
-        RoomListFiltersView(state: .constant(.init(activeFilters: [.rooms, .favourites])))
-        RoomListFiltersView(state: .constant(.init(activeFilters: [.lowPriority])))
-        RoomListFiltersView(state: .constant(.init(activeFilters: [.unreads, .lowPriority])))
+        RoomListFiltersView(state: .constant(.init(appSettings: ServiceLocator.shared.settings)))
+        RoomListFiltersView(state: .constant(.init(activeFilters: [.rooms, .favourites],
+                                                   appSettings: ServiceLocator.shared.settings)))
+        RoomListFiltersView(state: .constant(.init(activeFilters: [.lowPriority],
+                                                   appSettings: ServiceLocator.shared.settings)))
+        RoomListFiltersView(state: .constant(.init(activeFilters: [.unreads, .lowPriority],
+                                                   appSettings: ServiceLocator.shared.settings)))
     }
 }
diff --git a/ElementX/Sources/Screens/Settings/DeveloperOptionsScreen/DeveloperOptionsScreenModels.swift b/ElementX/Sources/Screens/Settings/DeveloperOptionsScreen/DeveloperOptionsScreenModels.swift
@@ -50,6 +50,7 @@ protocol DeveloperOptionsProtocol: AnyObject {
     
     var publicSearchEnabled: Bool { get set }
     var fuzzyRoomListSearchEnabled: Bool { get set }
+    var lowPriorityFilterEnabled: Bool { get set }
     var knockingEnabled: Bool { get set }
 }
 
diff --git a/ElementX/Sources/Screens/Settings/DeveloperOptionsScreen/View/DeveloperOptionsScreen.swift b/ElementX/Sources/Screens/Settings/DeveloperOptionsScreen/View/DeveloperOptionsScreen.swift
@@ -50,6 +50,10 @@ struct DeveloperOptionsScreen: View {
                 Toggle(isOn: $context.fuzzyRoomListSearchEnabled) {
                     Text("Fuzzy searching")
                 }
+                
+                Toggle(isOn: $context.lowPriorityFilterEnabled) {
+                    Text("Low priority filter")
+                }
             }
             
             Section("Timeline") {
diff --git a/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift b/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift
@@ -130,18 +130,8 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol {
             var rustFilters = filters.map(\.rustFilter)
             rustFilters.append(contentsOf: [.nonLeft, .nonSpace, .deduplicateVersions])
             
-            // Handle low priority room filtering based on SDK requirements:
-            // - When low priority filter is NOT active: include NonLowPriority filter to hide low priority rooms  
-            // - When low priority filter IS active: include LowPriority filter to show only low priority rooms
-            let hasLowPriorityFilter = filters.contains(.lowPriority)
-            if hasLowPriorityFilter {
-                // TODO: When SDK support is available, replace with:
-                // rustFilters.append(.lowPriority)
-                // For now, keep existing placeholder behavior
-            } else {
-                // TODO: When SDK support is available, replace with:
-                // rustFilters.append(.nonLowPriority)
-                // This will hide low priority rooms by default
+            if !filters.contains(.lowPriority), appSettings.lowPriorityFilterEnabled {
+                rustFilters.append(.all(filters: [.nonLowPriority, .joined]))
             }
             
             _ = listUpdatesSubscriptionResult?.controller().setFilter(kind: .all(filters: rustFilters))

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ struct HomeScreenViewState: BindableState {`
`113`	`113`	`return rooms`
`114`	`114`	`}`
`115`	`115`
`116`		`- var bindings = HomeScreenViewStateBindings()`
	`116`	`+ var bindings: HomeScreenViewStateBindings`
`117`	`117`
`118`	`118`	`var placeholderRooms: [HomeScreenRoom] {`
`119`	`119`	`(1...10).map { _ in`
`@@ -136,7 +136,7 @@ struct HomeScreenViewState: BindableState {`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`struct HomeScreenViewStateBindings {`
`139`		`- var filtersState = RoomListFiltersState()`
	`139`	`+ var filtersState: RoomListFiltersState`
`140`	`140`	`var searchQuery = ""`
`141`	`141`	`var isSearchFieldFocused = false`
`142`	`142`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,8 @@ struct RoomListFiltersEmptyStateView: View {`
`23`	`23`	`return L10n.screenRoomlistFilterFavouritesEmptyStateTitle`
`24`	`24`	`case .invites:`
`25`	`25`	`return L10n.screenRoomlistFilterInvitesEmptyStateTitle`
	`26`	`+ case .lowPriority:`
	`27`	`+ return L10n.screenRoomlistFilterLowPriorityEmptyStateTitle`
`26`	`28`	`}`
`27`	`29`	`}`
`28`	`30`	`return L10n.screenRoomlistFilterMixedEmptyStateTitle`
`@@ -55,9 +57,11 @@ struct RoomListFiltersEmptyStateView_Previews: PreviewProvider, TestablePreview`
`55`	`57`	`static var previews: some View {`
`56`	`58`	`VStack(spacing: 24) {`
`57`	`59`	`ForEach(RoomListFilter.allCases) { filter in`
`58`		`- RoomListFiltersEmptyStateView(state: .init(activeFilters: [filter]))`
	`60`	`+ RoomListFiltersEmptyStateView(state: .init(activeFilters: [filter],`
	`61`	`+ appSettings: ServiceLocator.shared.settings))`
`59`	`62`	`}`
`60`		`- RoomListFiltersEmptyStateView(state: .init(activeFilters: [.people, .favourites]))`
	`63`	`+ RoomListFiltersEmptyStateView(state: .init(activeFilters: [.people, .favourites],`
	`64`	`+ appSettings: ServiceLocator.shared.settings))`
`61`	`65`	`}`
`62`	`66`	`.padding(.bottom)`
`63`	`67`	`.previewLayout(.sizeThatFits)`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ protocol DeveloperOptionsProtocol: AnyObject {`
`50`	`50`
`51`	`51`	`var publicSearchEnabled: Bool { get set }`
`52`	`52`	`var fuzzyRoomListSearchEnabled: Bool { get set }`
	`53`	`+ var lowPriorityFilterEnabled: Bool { get set }`
`53`	`54`	`var knockingEnabled: Bool { get set }`
`54`	`55`	`}`
`55`	`56`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,10 @@ struct DeveloperOptionsScreen: View {`
`50`	`50`	`Toggle(isOn: $context.fuzzyRoomListSearchEnabled) {`
`51`	`51`	`Text("Fuzzy searching")`
`52`	`52`	`}`
	`53`	`+`
	`54`	`+ Toggle(isOn: $context.lowPriorityFilterEnabled) {`
	`55`	`+ Text("Low priority filter")`
	`56`	`+ }`
`53`	`57`	`}`
`54`	`58`
`55`	`59`	`Section("Timeline") {`