felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-21 17:12:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Renamed userSession and userSessionInfo to session

Browse Source
This commit is contained in:
Aleksandrs Proskurins
2022-09-27 13:57:54 +03:00
parent 1df0be344d
commit 512e2f7933
17 changed files with 82 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RiotSwiftUI/Modules/UserSessions/UserSessionOverview/Coordinator/UserSessionOverviewCoordinator.swift
+4 -4
View File
@@ -18,7 +18,7 @@ import CommonKit
import SwiftUI
struct UserSessionOverviewCoordinatorParameters {
let userSessionInfo: UserSessionInfo
let session: UserSessionInfo
let isCurrentSession: Bool
}
@@ -41,7 +41,7 @@ final class UserSessionOverviewCoordinator: Coordinator, Presentable {
init(parameters: UserSessionOverviewCoordinatorParameters) {
self.parameters = parameters
viewModel = UserSessionOverviewViewModel(userSessionInfo: parameters.userSessionInfo,
viewModel = UserSessionOverviewViewModel(session: parameters.session,
isCurrentSession: parameters.isCurrentSession)
hostingController = VectorHostingController(rootView: UserSessionOverview(viewModel: viewModel.context))
@@ -59,8 +59,8 @@ final class UserSessionOverviewCoordinator: Coordinator, Presentable {
switch result {
case .verifyCurrentSession:
break // TODO:
case let .showSessionDetails(sessionInfo: sessionInfo):
self.completion?(.openSessionDetails(session: sessionInfo))
case let .showSessionDetails(session: session):
self.completion?(.openSessionDetails(session: session))
}
}
}
RiotSwiftUI/Modules/UserSessions/UserSessionOverview/MockUserSessionOverviewScreenState.swift
+4 -4
View File
@@ -42,21 +42,21 @@ enum MockUserSessionOverviewScreenState: MockScreenState, CaseIterable {
let viewModel: UserSessionOverviewViewModel
switch self {
case .currentSession:
let currentSessionInfo = UserSessionInfo(sessionId: "session",
let session = UserSessionInfo(sessionId: "session",
sessionName: "iOS",
deviceType: .mobile,
isVerified: false,
lastSeenIP: "10.0.0.10",
lastSeenTimestamp: Date().timeIntervalSince1970 - 100)
viewModel = UserSessionOverviewViewModel(userSessionInfo: currentSessionInfo, isCurrentSession: true)
viewModel = UserSessionOverviewViewModel(session: session, isCurrentSession: true)
case .otherSession:
let currentSessionInfo = UserSessionInfo(sessionId: "session",
let session = UserSessionInfo(sessionId: "session",
sessionName: "Mac",
deviceType: .desktop,
isVerified: true,
lastSeenIP: "10.0.0.10",
lastSeenTimestamp: Date().timeIntervalSince1970 - 100)
viewModel = UserSessionOverviewViewModel(userSessionInfo: currentSessionInfo, isCurrentSession: false)
viewModel = UserSessionOverviewViewModel(session: session, isCurrentSession: false)
}
// can simulate service and viewModel actions here if needs be.
RiotSwiftUI/Modules/UserSessions/UserSessionOverview/Test/Unit/UserSessionOverviewViewModelTests.swift
+3 -3
View File
@@ -23,7 +23,7 @@ class UserSessionOverviewViewModelTests: XCTestCase {
var sut: UserSessionOverviewViewModel!
func test_whenVerifyCurrentSessionProcessed_completionWithVerifyCurrentSessionCalled() {
sut = UserSessionOverviewViewModel(userSessionInfo: createUserSessionInfo(), isCurrentSession: true)
sut = UserSessionOverviewViewModel(session: createUserSessionInfo(), isCurrentSession: true)
var modelResult: UserSessionOverviewViewModelResult?
sut.completion = { result in
@@ -35,14 +35,14 @@ class UserSessionOverviewViewModelTests: XCTestCase {
func test_whenViewSessionDetailsProcessed_completionWithShowSessionDetailsCalled() {
let session = createUserSessionInfo()
sut = UserSessionOverviewViewModel(userSessionInfo: session, isCurrentSession: true)
sut = UserSessionOverviewViewModel(session: session, isCurrentSession: true)
var modelResult: UserSessionOverviewViewModelResult?
sut.completion = { result in
modelResult = result
}
sut.process(viewAction: .viewSessionDetails)
XCTAssertEqual(modelResult, .showSessionDetails(sessionInfo: session))
XCTAssertEqual(modelResult, .showSessionDetails(session: session))
}
private func createUserSessionInfo() -> UserSessionInfo {
RiotSwiftUI/Modules/UserSessions/UserSessionOverview/UserSessionOverviewModels.swift
+1 -1
View File
@@ -25,7 +25,7 @@ enum UserSessionOverviewCoordinatorResult {
// MARK: View model
enum UserSessionOverviewViewModelResult: Equatable {
case showSessionDetails(sessionInfo: UserSessionInfo)
case showSessionDetails(session: UserSessionInfo)
case verifyCurrentSession
}
RiotSwiftUI/Modules/UserSessions/UserSessionOverview/UserSessionOverviewViewModel.swift
+5 -5
View File
@@ -19,14 +19,14 @@ import SwiftUI
typealias UserSessionOverviewViewModelType = StateStoreViewModel<UserSessionOverviewViewState, UserSessionOverviewViewAction>
class UserSessionOverviewViewModel: UserSessionOverviewViewModelType, UserSessionOverviewViewModelProtocol {
private let userSessionInfo: UserSessionInfo
private let session: UserSessionInfo
var completion: ((UserSessionOverviewViewModelResult) -> Void)?
init(userSessionInfo: UserSessionInfo, isCurrentSession: Bool) {
self.userSessionInfo = userSessionInfo
init(session: UserSessionInfo, isCurrentSession: Bool) {
self.session = session
let cardViewData = UserSessionCardViewData(userSessionInfo: userSessionInfo, isCurrentSessionDisplayMode: isCurrentSession)
let cardViewData = UserSessionCardViewData(session: session, isCurrentSessionDisplayMode: isCurrentSession)
let state = UserSessionOverviewViewState(cardViewData: cardViewData, isCurrentSession: isCurrentSession)
super.init(initialViewState: state)
}
@@ -38,7 +38,7 @@ class UserSessionOverviewViewModel: UserSessionOverviewViewModelType, UserSessio
case .verifyCurrentSession:
completion?(.verifyCurrentSession)
case .viewSessionDetails:
completion?(.showSessionDetails(sessionInfo: userSessionInfo))
completion?(.showSessionDetails(session: session))
}
}
}