From 487cf59fc854a94be54799c81b6f6a88dd764a7c Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Mon, 19 Feb 2024 17:05:43 +0100 Subject: [PATCH 1/2] bump sdk + favourites filters implementation --- ElementX.xcodeproj/project.pbxproj | 4 +++- .../xcshareddata/swiftpm/Package.resolved | 4 ++-- .../HomeScreen/View/Filters/RoomListFilterModels.swift | 5 ++--- .../Services/Room/RoomSummary/RoomSummaryProvider.swift | 2 +- project.yml | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index 6ca3175cf6..7b662bfca6 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -1560,6 +1560,7 @@ 86376BEE425704AEE197CA54 /* PillContext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PillContext.swift; sourceTree = ""; }; 86873A768B13069BB5CAECF6 /* InvitesScreenViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InvitesScreenViewModelProtocol.swift; sourceTree = ""; }; 86A6F283BC574FDB96ABBB07 /* DeveloperOptionsScreenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeveloperOptionsScreenViewModel.swift; sourceTree = ""; }; + 86C8CE2630F54D5FE1591786 /* ro */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ro; path = ro.lproj/InfoPlist.strings; sourceTree = ""; }; 88410BD213FDF9B28E8B671F /* UserDetailsEditScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDetailsEditScreen.swift; sourceTree = ""; }; 8896CDD20CA2D87EA3B848A1 /* RoomNotificationSettingsScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomNotificationSettingsScreen.swift; sourceTree = ""; }; 889DEDD63C68ABDA8AD29812 /* VoiceMessageMediaManagerProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VoiceMessageMediaManagerProtocol.swift; sourceTree = ""; }; @@ -6251,6 +6252,7 @@ 1D652E78832289CD9EB64488 /* hu */, 7199693797B66245EF97BCF5 /* id */, 44C314C00533E2C297796B60 /* it */, + 86C8CE2630F54D5FE1591786 /* ro */, 9B7D8D3638864B7482E148CC /* ru */, 7D39AF1F659923D77778511E /* sk */, ); @@ -6779,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 index 34e1392e23..5870744e40 100644 --- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -129,8 +129,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 index 0af4d1e6bf..30908ae2a3 100644 --- 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 index c998ce2759..a9b63238fc 100644 --- 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/project.yml b/project.yml index a28474fefd..31275d9fbd 100644 --- 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 From 8afda0bb2152f49aaddd359c9ffabf1d35adb989 Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Mon, 19 Feb 2024 17:13:20 +0100 Subject: [PATCH 2/2] changelog --- changelog.d/pr-2484.wip | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/pr-2484.wip diff --git a/changelog.d/pr-2484.wip b/changelog.d/pr-2484.wip new file mode 100644 index 0000000000..a17080b153 --- /dev/null +++ b/changelog.d/pr-2484.wip @@ -0,0 +1 @@ +Favourite filter implemented. \ No newline at end of file