felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-23 10:02:46 +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 adf0aaf9b5
commit e0caf5980e
17 changed files with 82 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/Coordinator/UserSessionsOverviewCoordinator.swift
+8 -8
View File
@@ -58,12 +58,12 @@ final class UserSessionsOverviewCoordinator: Coordinator, Presentable {
self.showAllInactiveSessions()
case .verifyCurrentSession:
self.startVerifyCurrentSession()
case let .showCurrentSessionOverview(sessionInfo):
self.showCurrentSessionOverview(sessionInfo: sessionInfo)
case let .showCurrentSessionOverview(session):
self.showCurrentSessionOverview(session: session)
case .showAllOtherSessions:
self.showAllOtherSessions()
case let .showUserSessionOverview(sessionInfo):
self.showUserSessionOverview(sessionInfo: sessionInfo)
case let .showUserSessionOverview(session):
self.showUserSessionOverview(session: session)
}
}
}
@@ -99,12 +99,12 @@ final class UserSessionsOverviewCoordinator: Coordinator, Presentable {
// TODO:
}
private func showCurrentSessionOverview(sessionInfo: UserSessionInfo) {
completion?(.openSessionOverview(session: sessionInfo, isCurrentSession: true))
private func showCurrentSessionOverview(session: UserSessionInfo) {
completion?(.openSessionOverview(session: session, isCurrentSession: true))
}
private func showUserSessionOverview(sessionInfo: UserSessionInfo) {
completion?(.openSessionOverview(session: sessionInfo, isCurrentSession: false))
private func showUserSessionOverview(session: UserSessionInfo) {
completion?(.openSessionOverview(session: session, isCurrentSession: false))
}
private func showAllOtherSessions() {
RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/UserSessionsOverviewModels.swift
+2 -2
View File
@@ -28,9 +28,9 @@ enum UserSessionsOverviewViewModelResult {
case showAllUnverifiedSessions
case showAllInactiveSessions
case verifyCurrentSession
case showCurrentSessionOverview(sessionInfo: UserSessionInfo)
case showCurrentSessionOverview(session: UserSessionInfo)
case showAllOtherSessions
case showUserSessionOverview(sessionInfo: UserSessionInfo)
case showUserSessionOverview(session: UserSessionInfo)
}
// MARK: View
RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/UserSessionsOverviewViewModel.swift
+5 -5
View File
@@ -44,7 +44,7 @@ class UserSessionsOverviewViewModel: UserSessionsOverviewViewModelType, UserSess
assertionFailure("Missing current session")
return
}
completion?(.showCurrentSessionOverview(sessionInfo: currentSessionInfo))
completion?(.showCurrentSessionOverview(session: currentSessionInfo))
case .viewAllUnverifiedSessions:
completion?(.showAllUnverifiedSessions)
case .viewAllInactiveSessions:
@@ -52,11 +52,11 @@ class UserSessionsOverviewViewModel: UserSessionsOverviewViewModelType, UserSess
case .viewAllOtherSessions:
completion?(.showAllOtherSessions)
case .tapUserSession(let sessionId):
guard let sessionInfo = userSessionsOverviewService.sessionForIdentifier(sessionId) else {
guard let session = userSessionsOverviewService.sessionForIdentifier(sessionId) else {
assertionFailure("Missing session info")
return
}
completion?(.showUserSessionOverview(sessionInfo: sessionInfo))
completion?(.showUserSessionOverview(session: session))
}
}
@@ -68,7 +68,7 @@ class UserSessionsOverviewViewModel: UserSessionsOverviewViewModelType, UserSess
state.otherSessionsViewData = userSessionsViewData.otherSessions.asViewData()
if let currentSessionInfo = userSessionsViewData.currentSession {
state.currentSessionViewData = UserSessionCardViewData(userSessionInfo: currentSessionInfo, isCurrentSessionDisplayMode: true)
state.currentSessionViewData = UserSessionCardViewData(session: currentSessionInfo, isCurrentSessionDisplayMode: true)
}
}
@@ -95,6 +95,6 @@ class UserSessionsOverviewViewModel: UserSessionsOverviewViewModelType, UserSess
private extension Collection where Element == UserSessionInfo {
func asViewData() -> [UserSessionListItemViewData] {
map { UserSessionListItemViewData(userSessionInfo: $0) }
map { UserSessionListItemViewData(session: $0) }
}
}
RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/View/UserSessionListItem.swift
+1 -1
View File
@@ -69,7 +69,7 @@ struct UserSessionListPreview: View {
var body: some View {
VStack(alignment: .leading, spacing: 0) {
ForEach(userSessionsOverviewService.overviewData.otherSessions) { userSessionInfo in
let viewData = UserSessionListItemViewData(userSessionInfo: userSessionInfo)
let viewData = UserSessionListItemViewData(session: userSessionInfo)
UserSessionListItem(viewData: viewData, onBackgroundTap: { _ in
RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/View/UserSessionListItemViewData.swift
+2 -2
View File
@@ -68,7 +68,7 @@ struct UserSessionListItemViewData: Identifiable {
}
extension UserSessionListItemViewData {
init(userSessionInfo: UserSessionInfo) {
self.init(sessionId: userSessionInfo.sessionId, sessionDisplayName: userSessionInfo.sessionName, deviceType: userSessionInfo.deviceType, isVerified: userSessionInfo.isVerified, lastActivityDate: userSessionInfo.lastSeenTimestamp)
init(session: UserSessionInfo) {
self.init(sessionId: session.sessionId, sessionDisplayName: session.sessionName, deviceType: session.deviceType, isVerified: session.isVerified, lastActivityDate: session.lastSeenTimestamp)
}
}