ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-05 11:58:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump sdk + Favourites filters implementation (#2484)

Browse Source
This commit is contained in:
Mauro
2024-02-19 17:53:57 +01:00
committed by GitHub
parent 6d9271ce59
commit 1f389ed008
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX.xcodeproj/project.pbxproj
+1 -1
View File
@@ -6781,7 +6781,7 @@
repositoryURL = "https://github.com/matrix-org/matrix-rust-components-swift"; repositoryURL = "https://github.com/matrix-org/matrix-rust-components-swift";
requirement = { requirement = {
kind = exactVersion; kind = exactVersion;
version = 1.1.40; version = 1.1.41;
}; };
}; };
821C67C9A7F8CC3FD41B28B4 /* XCRemoteSwiftPackageReference "emojibase-bindings" */ = { 821C67C9A7F8CC3FD41B28B4 /* XCRemoteSwiftPackageReference "emojibase-bindings" */ = {
ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+2 -2
View File
@@ -130,8 +130,8 @@
"kind" : "remoteSourceControl", "kind" : "remoteSourceControl",
"location" : "https://github.com/matrix-org/matrix-rust-components-swift", "location" : "https://github.com/matrix-org/matrix-rust-components-swift",
"state" : { "state" : {
"revision" : "c0101eb908a7a1afd2f1c099472f7e8526a2ac45", "revision" : "d773c12e46b01b6512b9b3581268093c8ba4d55d",
"version" : "1.1.40" "version" : "1.1.41"
} }
}, },
{ {
ElementX/Sources/Screens/HomeScreen/View/Filters/RoomListFilterModels.swift
+2 -3
View File
@@ -56,7 +56,7 @@ enum RoomListFilter: Int, CaseIterable, Identifiable {
} }
} }
var rustFilter: RoomListEntriesDynamicFilterKind? { var rustFilter: RoomListEntriesDynamicFilterKind {
switch self { switch self {
case .people: case .people:
return .category(expect: .people) return .category(expect: .people)
@@ -65,8 +65,7 @@ enum RoomListFilter: Int, CaseIterable, Identifiable {
case .unreads: case .unreads:
return .unread return .unread
case .favourites: case .favourites:
// Not implemented yet return .favourite
return nil
} }
} }
} }
ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift
+1 -1
View File
@@ -154,7 +154,7 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol {
case .excludeAll: case .excludeAll:
_ = listUpdatesSubscriptionResult?.controller.setFilter(kind: .none) _ = listUpdatesSubscriptionResult?.controller.setFilter(kind: .none)
case let .include(predicate): case let .include(predicate):
var filters = predicate.filters.compactMap(\.rustFilter) var filters = predicate.filters.map(\.rustFilter)
if let query = predicate.query { if let query = predicate.query {
filters.append(.normalizedMatchRoomName(pattern: query.lowercased())) filters.append(.normalizedMatchRoomName(pattern: query.lowercased()))
} }
changelog.d/pr-2484.wip
+1
View File
@@ -0,0 +1 @@
Favourite filter implemented.
project.yml
+1 -1
View File
@@ -47,7 +47,7 @@ packages:
# Element/Matrix dependencies # Element/Matrix dependencies
MatrixRustSDK: MatrixRustSDK:
url: https://github.com/matrix-org/matrix-rust-components-swift url: https://github.com/matrix-org/matrix-rust-components-swift
exactVersion: 1.1.40 exactVersion: 1.1.41
# path: ../matrix-rust-sdk # path: ../matrix-rust-sdk
Compound: Compound:
url: https://github.com/element-hq/compound-ios url: https://github.com/element-hq/compound-ios