Cleaned up various things, mostly removed unnecessary selfs, comments and bad formatting

This commit is contained in:
Stefan Ceriu
2022-09-26 18:21:34 +03:00
committed by Stefan Ceriu
parent c073dfd95d
commit eac1401cc1
39 changed files with 141 additions and 350 deletions
@@ -18,14 +18,9 @@ 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 {
return sessionId
}
@@ -38,8 +33,6 @@ struct UserSessionListItemViewData: Identifiable {
let deviceAvatarViewData: DeviceAvatarViewData
// MARK: - Setup
init(sessionId: String,
sessionDisplayName: String?,
deviceType: DeviceType,
@@ -47,15 +40,14 @@ struct UserSessionListItemViewData: Identifiable {
lastActivityDate: TimeInterval?) {
self.sessionId = sessionId
self.sessionName = Self.userSessionNameFormatter.sessionName(deviceType: deviceType, sessionDisplayName: sessionDisplayName)
self.sessionDetails = Self.buildSessionDetails(isVerified: isVerified, lastActivityDate: lastActivityDate)
self.deviceAvatarViewData = DeviceAvatarViewData(deviceType: deviceType, isVerified: isVerified)
sessionName = Self.userSessionNameFormatter.sessionName(deviceType: deviceType, sessionDisplayName: sessionDisplayName)
sessionDetails = Self.buildSessionDetails(isVerified: isVerified, lastActivityDate: lastActivityDate)
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
@@ -77,7 +69,6 @@ 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)
}