Bump sdk + Favourites filters implementation (#2484)

element-hq · Feb 19, 2024 · 1f389ed · 1f389ed
1 parent 6d9271c
commit 1f389ed
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
@@ -6781,7 +6781,7 @@
 			repositoryURL = "https://github.com/matrix-org/matrix-rust-components-swift";
 			requirement = {
 				kind = exactVersion;
-				version = 1.1.40;
+				version = 1.1.41;
 			};
 		};
 		821C67C9A7F8CC3FD41B28B4 /* XCRemoteSwiftPackageReference "emojibase-bindings" */ = {

diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -130,8 +130,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/matrix-org/matrix-rust-components-swift",
       "state" : {
-        "revision" : "c0101eb908a7a1afd2f1c099472f7e8526a2ac45",
-        "version" : "1.1.40"
+        "revision" : "d773c12e46b01b6512b9b3581268093c8ba4d55d",
+        "version" : "1.1.41"
       }
     },
     {

diff --git a/ElementX/Sources/Screens/HomeScreen/View/Filters/RoomListFilterModels.swift b/ElementX/Sources/Screens/HomeScreen/View/Filters/RoomListFilterModels.swift
@@ -56,7 +56,7 @@ enum RoomListFilter: Int, CaseIterable, Identifiable {
         }
     }
 
-    var rustFilter: RoomListEntriesDynamicFilterKind? {
+    var rustFilter: RoomListEntriesDynamicFilterKind {
         switch self {
         case .people:
             return .category(expect: .people)
@@ -65,8 +65,7 @@ enum RoomListFilter: Int, CaseIterable, Identifiable {
         case .unreads:
             return .unread
         case .favourites:
-            // Not implemented yet
-            return nil
+            return .favourite
         }
     }
 }

diff --git a/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift b/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift
@@ -154,7 +154,7 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol {
         case .excludeAll:
             _ = listUpdatesSubscriptionResult?.controller.setFilter(kind: .none)
         case let .include(predicate):
-            var filters = predicate.filters.compactMap(\.rustFilter)
+            var filters = predicate.filters.map(\.rustFilter)
             if let query = predicate.query {
                 filters.append(.normalizedMatchRoomName(pattern: query.lowercased()))
             }

diff --git a/changelog.d/pr-2484.wip b/changelog.d/pr-2484.wip
@@ -0,0 +1 @@
+Favourite filter implemented.
diff --git a/project.yml b/project.yml
@@ -47,7 +47,7 @@ packages:
   # Element/Matrix dependencies
   MatrixRustSDK:
     url: https://github.com/matrix-org/matrix-rust-components-swift
-    exactVersion: 1.1.40
+    exactVersion: 1.1.41
     # path: ../matrix-rust-sdk
   Compound:
     url: https://github.com/element-hq/compound-ios