Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-28 23:32:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Mock settings in UserSessionsOverviewViewModel

Browse source
This commit is contained in:
Alfonso Grillo 2022-11-02 20:08:43 +01:00
parent 1221b0f874
commit 18e9783a64
7 changed files with 87 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
RiotSwiftUI/Modules/UserSessions/Common/Service/MatrixSDK/RiotSettings+ UserSessionSettingsProtocol.swift Normal file
View file

@ -0,0 +1,28 @@
//
// Copyright 2022 New Vector Ltd
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
import Combine
extension RiotSettings: UserSessionSettingsProtocol {
var showIPAddressesInSessionsManagerPublisher: AnyPublisher<Bool, Never> {
NotificationCenter.default
.publisher(for: .userDefaultValueUpdated)
.compactMap { $0.object as? String }
.filter { $0 == RiotSettings.UserDefaultsKeys.showIPAddressesInSessionsManager }
.map { _ in RiotSettings.shared.showIPAddressesInSessionsManager }
.eraseToAnyPublisher()
}
}

25
RiotSwiftUI/Modules/UserSessions/Common/Service/Mock/MockUserSessionSettings.swift Normal file
View file

@ -0,0 +1,25 @@
//
// Copyright 2022 New Vector Ltd
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
import Combine
final class MockUserSessionSettings: UserSessionSettingsProtocol {
var showIPAddressesInSessionsManager: Bool = false
var showIPAddressesInSessionsManagerPublisher: AnyPublisher<Bool, Never> {
Just(showIPAddressesInSessionsManager).eraseToAnyPublisher()
}
}

23
RiotSwiftUI/Modules/UserSessions/Common/Service/UserSessionSettingsProtocol.swift Normal file
View file

@ -0,0 +1,23 @@
//
// Copyright 2022 New Vector Ltd
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
import Combine
protocol UserSessionSettingsProtocol: AnyObject {
var showIPAddressesInSessionsManager: Bool { get set }
var showIPAddressesInSessionsManagerPublisher: AnyPublisher<Bool, Never> { get }
}

2
RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/Coordinator/UserSessionsOverviewCoordinator.swift
View file

@ -39,7 +39,7 @@ final class UserSessionsOverviewCoordinator: Coordinator, Presentable {
self.parameters = parameters
service = parameters.service
viewModel = UserSessionsOverviewViewModel(userSessionsOverviewService: parameters.service)
viewModel = UserSessionsOverviewViewModel(userSessionsOverviewService: parameters.service, settingsService: RiotSettings.shared)
hostingViewController = VectorHostingController(rootView: UserSessionsOverview(viewModel: viewModel.context))
hostingViewController.vc_setLargeTitleDisplayMode(.never)

2
RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/MockUserSessionsOverviewScreenState.swift
View file

@ -51,7 +51,7 @@ enum MockUserSessionsOverviewScreenState: MockScreenState, CaseIterable {
fatalError()
}
let viewModel = UserSessionsOverviewViewModel(userSessionsOverviewService: service)
let viewModel = UserSessionsOverviewViewModel(userSessionsOverviewService: service, settingsService: MockUserSessionSettings())
return (
[service, viewModel],

2
RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/UserSessionsOverviewModels.swift
View file

@ -50,7 +50,7 @@ struct UserSessionsOverviewViewState: BindableState {
var otherSessionsViewData = [UserSessionListItemViewData]()
var showLoadingIndicator = false
var linkDeviceButtonVisible = false
var showLocationInfo = RiotSettings.shared.showIPAddressesInSessionsManager
var showLocationInfo: Bool
}
enum UserSessionsOverviewViewAction {

17
RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/UserSessionsOverviewViewModel.swift
View file

@ -20,24 +20,23 @@ typealias UserSessionsOverviewViewModelType = StateStoreViewModel<UserSessionsOv
class UserSessionsOverviewViewModel: UserSessionsOverviewViewModelType, UserSessionsOverviewViewModelProtocol {
private let userSessionsOverviewService: UserSessionsOverviewServiceProtocol
private let settingsService: UserSessionSettingsProtocol
var completion: ((UserSessionsOverviewViewModelResult) -> Void)?
init(userSessionsOverviewService: UserSessionsOverviewServiceProtocol) {
init(userSessionsOverviewService: UserSessionsOverviewServiceProtocol, settingsService: UserSessionSettingsProtocol) {
self.userSessionsOverviewService = userSessionsOverviewService
self.settingsService = settingsService
super.init(initialViewState: .init())
super.init(initialViewState: .init(showLocationInfo: settingsService.showIPAddressesInSessionsManager))
userSessionsOverviewService.overviewDataPublisher.sink { [weak self] overviewData in
self?.updateViewState(with: overviewData)
}
.store(in: &cancellables)
NotificationCenter.default
.publisher(for: .userDefaultValueUpdated)
.compactMap { $0.object as? String }
.filter { $0 == RiotSettings.UserDefaultsKeys.showIPAddressesInSessionsManager }
.map { _ in RiotSettings.shared.showIPAddressesInSessionsManager }
self.settingsService
.showIPAddressesInSessionsManagerPublisher
.weakAssign(to: \.state.showLocationInfo, on: self)
.store(in: &cancellables)
@ -87,8 +86,8 @@ class UserSessionsOverviewViewModel: UserSessionsOverviewViewModelType, UserSess
case .logoutOtherSessions:
completion?(.logoutFromUserSessions(sessionInfos: userSessionsOverviewService.otherSessions))
case .showLocationInfo:
RiotSettings.shared.showIPAddressesInSessionsManager.toggle()
state.showLocationInfo = RiotSettings.shared.showIPAddressesInSessionsManager
settingsService.showIPAddressesInSessionsManager.toggle()
state.showLocationInfo = settingsService.showIPAddressesInSessionsManager
}
}