Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-29 07:42:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

UserSessionListItemViewData: Handles session name and details string building.

Browse source
This commit is contained in:
SBiOSoftWhare 2022-09-07 12:22:48 +02:00
parent 03aaae4d75
commit 1d71de75e2
2 changed files with 37 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/View/UserSessionListItem.swift
View file

@ -23,43 +23,7 @@ struct UserSessionListItem: View {
// MARK: Private
@Environment(\.theme) private var theme: ThemeSwiftUI
private var sessionTitle: String {
let sessionTitle: String
let clientName = viewData.deviceType.name
if let sessionName = viewData.sessionName {
sessionTitle = VectorL10n.userSessionName(clientName, sessionName)
} else {
sessionTitle = clientName
}
return sessionTitle
}
private var sessionDetailsText: String {
let sessionDetailsString: String
let sessionStatusText = viewData.isVerified ? VectorL10n.userSessionVerifiedShort : VectorL10n.userSessionUnverifiedShort
var lastActivityDateString: String?
if let lastActivityDate = viewData.lastActivityDate {
lastActivityDateString = self.lastActivityDateString(from: lastActivityDate)
}
if let lastActivityDateString = lastActivityDateString, lastActivityDateString.isEmpty == false {
sessionDetailsString = VectorL10n.userSessionItemDetails(sessionStatusText, lastActivityDateString)
} else {
sessionDetailsString = sessionStatusText
}
return sessionDetailsString
}
// MARK: Public
let viewData: UserSessionListItemViewData
@ -74,12 +38,12 @@ struct UserSessionListItem: View {
HStack(spacing: 18) {
DeviceAvatarView(viewData: viewData.deviceAvatarViewData)
VStack(alignment: .leading, spacing: 2) {
Text(sessionTitle)
Text(viewData.sessionName)
.font(theme.fonts.bodySB)
.foregroundColor(theme.colors.primaryContent)
.multilineTextAlignment(.leading)
Text(sessionDetailsText)
Text(viewData.sessionDetails)
.font(theme.fonts.caption1)
.foregroundColor(theme.colors.secondaryContent)
.multilineTextAlignment(.leading)
@ -89,22 +53,6 @@ struct UserSessionListItem: View {
.frame(maxWidth: .infinity, alignment: .leading)
.padding(.horizontal, 15)
}
// MARK: - Private
private func lastActivityDateString(from timestamp: TimeInterval) -> String? {
let dateFormatter = DateFormatter()
dateFormatter.locale = Locale.current
let date = Date(timeIntervalSince1970: timestamp)
dateFormatter.dateStyle = .medium
dateFormatter.timeStyle = .short
dateFormatter.doesRelativeDateFormatting = true
return dateFormatter.string(from: date)
}
}
struct UserSessionListPreview: View {

47
RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/View/UserSessionListItemViewData.swift
View file

@ -19,6 +19,11 @@ import Foundation
/// View data for UserSessionListItem
struct UserSessionListItemViewData: Identifiable {
// MARK: - Constants
private static let userSessionNameFormatter = UserSessionNameFormatter()
private static let lastActivityDateFormatter = UserSessionLastActivityFormatter()
// MARK: - Properties
var id: String {
@ -27,35 +32,53 @@ struct UserSessionListItemViewData: Identifiable {
let sessionId: String
let sessionName: String?
let sessionName: String
let deviceType: DeviceType
let isVerified: Bool
let lastActivityDate: TimeInterval?
let sessionDetails: String
let deviceAvatarViewData: DeviceAvatarViewData
// MARK: - Setup
init(sessionId: String,
sessionName: String?,
sessionDisplayName: String?,
deviceType: DeviceType,
isVerified: Bool,
lastActivityDate: TimeInterval?) {
self.sessionId = sessionId
self.sessionName = sessionName
self.deviceType = deviceType
self.isVerified = isVerified
self.lastActivityDate = lastActivityDate
self.sessionName = Self.userSessionNameFormatter.sessionName(deviceType: deviceType, sessionDisplayName: sessionDisplayName)
self.sessionDetails = Self.buildSessionDetails(isVerified: isVerified, lastActivityDate: lastActivityDate)
self.deviceAvatarViewData = DeviceAvatarViewData(deviceType: deviceType, isVerified: isVerified)
}
// MARK: - Private
private static func buildSessionDetails(isVerified: Bool, lastActivityDate: TimeInterval?) -> String {
let sessionDetailsString: String
let sessionStatusText = isVerified ? VectorL10n.userSessionVerifiedShort : VectorL10n.userSessionUnverifiedShort
var lastActivityDateString: String?
if let lastActivityDate = lastActivityDate {
lastActivityDateString = Self.lastActivityDateFormatter.lastActivityDateString(from: lastActivityDate)
}
if let lastActivityDateString = lastActivityDateString, lastActivityDateString.isEmpty == false {
sessionDetailsString = VectorL10n.userSessionItemDetails(sessionStatusText, lastActivityDateString)
} else {
sessionDetailsString = sessionStatusText
}
return sessionDetailsString
}
}
extension UserSessionListItemViewData {
init(userSessionInfo: UserSessionInfo) {
self.init(sessionId: userSessionInfo.sessionId, sessionName: userSessionInfo.sessionName, deviceType: userSessionInfo.deviceType, isVerified: userSessionInfo.isVerified, lastActivityDate: userSessionInfo.lastSeenTimestamp)
self.init(sessionId: userSessionInfo.sessionId, sessionDisplayName: userSessionInfo.sessionName, deviceType: userSessionInfo.deviceType, isVerified: userSessionInfo.isVerified, lastActivityDate: userSessionInfo.lastSeenTimestamp)
}
}