Refactored creation of UserSessionListItemViewData, added inactive session icon

2026-04-21 00:52:43 +02:00 · 2022-10-03 15:45:06 +03:00
parent 97be8fef5a
commit e9c21b5320
10 changed files with 153 additions and 59 deletions
@@ -42,11 +42,16 @@ struct UserSessionListItem: View {
                            .font(theme.fonts.bodySB)
                            .foregroundColor(theme.colors.primaryContent)
                            .multilineTextAlignment(.leading)
-                        
-                        Text(viewData.sessionDetails)
-                            .font(theme.fonts.caption1)
-                            .foregroundColor(theme.colors.secondaryContent)
-                            .multilineTextAlignment(.leading)
+                        HStack {
+                            if let sessionDetailsIcon = viewData.sessionDetailsIcon {
+                                Image(sessionDetailsIcon)
+                                    .padding(.leading, 2)
+                            }
+                            Text(viewData.sessionDetails)
+                                .font(theme.fonts.caption1)
+                                .foregroundColor(theme.colors.secondaryContent)
+                                .multilineTextAlignment(.leading)
+                        }
                    }
                }
                .frame(maxWidth: .infinity, alignment: .leading)
@@ -69,7 +74,7 @@ struct UserSessionListPreview: View {
    var body: some View {
        VStack(alignment: .leading, spacing: 0) {
            ForEach(userSessionsOverviewService.overviewData.otherSessions) { userSessionInfo in
-                let viewData = UserSessionListItemViewData(session: userSessionInfo)
+                let viewData = UserSessionListItemViewDataFactory().create(from: userSessionInfo)

                UserSessionListItem(viewData: viewData, onBackgroundTap: { _ in

@@ -18,61 +18,17 @@ import Foundation

 /// View data for UserSessionListItem
 struct UserSessionListItemViewData: Identifiable, Hashable {
-    private static let userSessionNameFormatter = UserSessionNameFormatter()
-    private static let lastActivityDateFormatter = UserSessionLastActivityFormatter()
-
    var id: String {
        sessionId
    }
    
    let sessionId: String
-
+    
    let sessionName: String
    
    let sessionDetails: String
    
    let deviceAvatarViewData: DeviceAvatarViewData
    
-    init(sessionId: String,
-         sessionDisplayName: String?,
-         deviceType: DeviceType,
-         isVerified: Bool,
-         lastActivityDate: TimeInterval?) {
-        self.sessionId = sessionId
-        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
-        
-        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(session: UserSessionInfo) {
-        self.init(sessionId: session.id,
-                  sessionDisplayName: session.name,
-                  deviceType: session.deviceType,
-                  isVerified: session.isVerified,
-                  lastActivityDate: session.lastSeenTimestamp)
-    }
+    let sessionDetailsIcon: String?
 }
@@ -0,0 +1,80 @@
+//
+// 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 Foundation
+
+struct UserSessionListItemViewDataFactory {
+    
+    private static let userSessionNameFormatter = UserSessionNameFormatter()
+    private static let lastActivityDateFormatter = UserSessionLastActivityFormatter()
+    private static let inactiveSessionDateFormatter = InactiveUserSessionLastActivityFormatter()
+    
+    func create(from session: UserSessionInfo) -> UserSessionListItemViewData {
+        let sessionName = UserSessionListItemViewDataFactory.userSessionNameFormatter.sessionName(deviceType: session.deviceType,
+                                                                                                  sessionDisplayName: session.name)
+        let sessionDetails = buildSessionDetails(isVerified: session.isVerified,
+                                                 lastActivityDate: session.lastSeenTimestamp,
+                                                 isActive: session.isActive)
+        let deviceAvatarViewData = DeviceAvatarViewData(deviceType: session.deviceType,
+                                                        isVerified: session.isVerified)
+        return UserSessionListItemViewData(sessionId: session.id,
+                                           sessionName: sessionName,
+                                           sessionDetails: sessionDetails,
+                                           deviceAvatarViewData: deviceAvatarViewData,
+                                           sessionDetailsIcon: getSessionDetailsIcon(isActive: session.isActive))
+    }
+    
+    private func buildSessionDetails(isVerified: Bool, lastActivityDate: TimeInterval?, isActive: Bool) -> String {
+        if isActive {
+            return activeSessionDetails(isVerified: isVerified, lastActivityDate: lastActivityDate)
+        } else {
+            return inactiveSessionDetails(lastActivityDate: lastActivityDate)
+        }
+    }
+    
+    private func inactiveSessionDetails(lastActivityDate: TimeInterval?) -> String {
+        if let lastActivityDate = lastActivityDate {
+            let lastActivityDateString = Self.inactiveSessionDateFormatter.lastActivityDateString(from: lastActivityDate)
+            return "Inactive for 90+ days (\(lastActivityDateString))"
+        }
+        return "Inactive for 90+ days"
+    }
+    
+    private func activeSessionDetails(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
+    }
+    
+    private func getSessionDetailsIcon(isActive: Bool) -> String? {
+        isActive ? nil : Asset.Images.userSessionListItemInactiveSession.name
+    }
+    
+}