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

Remove the dynamic member lookup from UserSettings in favour of nested access. (#6294)

Browse Source 
* Remove the dynamic member lookup from UserSettings in favour of nested access.

* Remove forwarding methods from UserSettings.

* Update the Enterprise submodule.
This commit is contained in:
Doug
2026-10-08 15:19:44 +01:00
committed by GitHub
parent fba28ed422
commit fc75f90ef5
75 changed files with 346 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/SearchScreen/SearchScreenViewModel.swift
+6 -6
View File
@@ -73,7 +73,7 @@ class SearchScreenViewModel: SearchScreenViewModelType, SearchScreenViewModelPro
.store(in: &cancellables)
// The room list is empty on a cold start, so the room breadcrumbs are re-resolved as it loads.
userSettings.searchBreadcrumbsPublisher
userSettings.account.searchBreadcrumbsPublisher
.combineLatest(clientProxy.staticRoomSummaryProvider.roomListPublisher)
.receive(on: DispatchQueue.main)
.sink { [weak self] storedBreadcrumbs, _ in
@@ -122,7 +122,7 @@ class SearchScreenViewModel: SearchScreenViewModelType, SearchScreenViewModelPro
}
updateRooms(with: roomSummaryProvider.roomListPublisher.value)
state.breadcrumbs = makeBreadcrumbs(from: userSettings.searchBreadcrumbs)
state.breadcrumbs = makeBreadcrumbs(from: userSettings.account.searchBreadcrumbs)
}
isolated deinit {
@@ -154,7 +154,7 @@ class SearchScreenViewModel: SearchScreenViewModelType, SearchScreenViewModelPro
case .removeBreadcrumb(let breadcrumb):
removeBreadcrumb(breadcrumb)
case .clearBreadcrumbs:
userSettings.searchBreadcrumbs = []
userSettings.account.searchBreadcrumbs = []
case .reachedTop:
if state.bindings.searchMode == .rooms {
updateVisibleRange(edge: .top)
@@ -223,11 +223,11 @@ class SearchScreenViewModel: SearchScreenViewModelType, SearchScreenViewModelPro
/// Moves the breadcrumb to the top of the history, adding it if needed.
private func recordBreadcrumb(_ breadcrumb: SearchBreadcrumb) {
var breadcrumbs = userSettings.searchBreadcrumbs
var breadcrumbs = userSettings.account.searchBreadcrumbs
breadcrumbs.removeAll { $0 == breadcrumb }
breadcrumbs.insert(breadcrumb, at: 0)
userSettings.searchBreadcrumbs = Array(breadcrumbs.prefix(Self.maximumBreadcrumbCount))
userSettings.account.searchBreadcrumbs = Array(breadcrumbs.prefix(Self.maximumBreadcrumbCount))
}
private func removeBreadcrumb(_ breadcrumb: SearchScreenBreadcrumb) {
@@ -235,7 +235,7 @@ class SearchScreenViewModel: SearchScreenViewModelType, SearchScreenViewModelPro
case .query(let query): .query(query)
case .room(let room): .room(roomID: room.id)
}
userSettings.searchBreadcrumbs.removeAll { $0 == storedBreadcrumb }
userSettings.account.searchBreadcrumbs.removeAll { $0 == storedBreadcrumb }
}
private func setActiveTabLoading(_ isLoading: Bool) {
ElementX/Sources/Screens/SearchScreen/View/SearchScreen.swift
+1 -1
View File
@@ -709,7 +709,7 @@ struct SearchScreen_Previews: PreviewProvider, TestablePreview {
private static func makeUserSettings(breadcrumbs: [SearchBreadcrumb]) -> UserSettings {
let userSettings = UserSettings.mock()
userSettings.searchBreadcrumbs = breadcrumbs
userSettings.account.searchBreadcrumbs = breadcrumbs
return userSettings
}