Merge pull request #1869 from anyproto/ios-3251-open-page-object-with…

…-version iOS-3251 Version history | Add icon and date time title
anyproto · Aug 1, 2024 · 8481123 · 8481123
2 parents ab83a79 + 2906088
commit 8481123
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 5 deletions.
diff --git a/...or/EditorPage/Views/Settings/History/Coordinator/VersionHistoryCoordinatorViewModel.swift b/...or/EditorPage/Views/Settings/History/Coordinator/VersionHistoryCoordinatorViewModel.swift
@@ -3,7 +3,7 @@ import SwiftUI
 
 @MainActor
 protocol VersionHistoryModuleOutput: AnyObject {
-    func onVersionTap(title: String, versionId: String)
+    func onVersionTap(title: String, icon: ObjectIcon?, versionId: String)
 }
 
 @MainActor
@@ -19,9 +19,10 @@ final class VersionHistoryCoordinatorViewModel: ObservableObject, VersionHistory
 
     // MARK: VersionHistoryModuleOutput
 
-    func onVersionTap(title: String, versionId: String) {
+    func onVersionTap(title: String, icon: ObjectIcon?, versionId: String) {
         objectVersionData = ObjectVersionData(
             title: title,
+            icon: icon,
             objectId: data.objectId,
             versionId: versionId,
             isListType: data.isListType

diff --git a/...entationLayer/TextEditor/EditorPage/Views/Settings/History/Object/ObjectVersionView.swift b/...entationLayer/TextEditor/EditorPage/Views/Settings/History/Object/ObjectVersionView.swift
@@ -19,7 +19,10 @@ struct ObjectVersionView: View {
     private var header: some View {
         VStack(spacing: 0) {
             DragIndicator()
-            TitleView(title: model.data.title)
+            TitleView(title:  model.data.title) {
+                ObjectIconView(icon: model.data.icon)
+                    .frame(width: 24, height: 24)
+            }
         }
         .background(Color.Background.primary)
     }

diff --git a/...ionLayer/TextEditor/EditorPage/Views/Settings/History/Object/ObjectVersionViewModel.swift b/...ionLayer/TextEditor/EditorPage/Views/Settings/History/Object/ObjectVersionViewModel.swift
@@ -3,6 +3,7 @@ import SwiftUI
 
 struct ObjectVersionData: Identifiable, Hashable {
     let title: String
+    let icon: ObjectIcon?
     let objectId: String
     let versionId: String
     let isListType: Bool

diff --git a/...ntationLayer/TextEditor/EditorPage/Views/Settings/History/VersionHistoryDataBuilder.swift b/...ntationLayer/TextEditor/EditorPage/Views/Settings/History/VersionHistoryDataBuilder.swift
@@ -18,6 +18,12 @@ final class VersionHistoryDataBuilder: VersionHistoryDataBuilderProtocol {
         dateFormatter.timeStyle = .short
         return dateFormatter
     }()
+    private let dateTimeFormatter: DateFormatter = {
+        let dateFormatter = DateFormatter()
+        dateFormatter.dateStyle = .medium
+        dateFormatter.timeStyle = .short
+        return dateFormatter
+    }()
 
     nonisolated init() { }
 
@@ -98,7 +104,8 @@ final class VersionHistoryDataBuilder: VersionHistoryDataBuilderProtocol {
 
     private func buildVersionHistoryItem(for version: VersionHistory, participant: Participant) -> VersionHistoryItem {
         VersionHistoryItem(
-            id: version.id,
+            id: version.id, 
+            dateTime: buildDateTimeString(for: version),
             time: buildTimeString(for: version),
             author: participant.localName,
             icon: participant.icon
@@ -110,6 +117,11 @@ final class VersionHistoryDataBuilder: VersionHistoryDataBuilderProtocol {
         return dateFormatter.localizedString(for: date)
     }
 
+    private func buildDateTimeString(for version: VersionHistory) -> String {
+        let date = buildDate(for: version)
+        return dateTimeFormatter.string(from: date)
+    }
+
     private func buildTimeString(for version: VersionHistory) -> String {
         let date = buildDate(for: version)
         return timeFormatter.string(from: date)

diff --git a/...sentationLayer/TextEditor/EditorPage/Views/Settings/History/VersionHistoryDataGroup.swift b/...sentationLayer/TextEditor/EditorPage/Views/Settings/History/VersionHistoryDataGroup.swift
@@ -11,6 +11,7 @@ struct VersionHistoryDataGroup: Identifiable, Hashable {
 
 struct VersionHistoryItem: Identifiable, Hashable {
     let id: String
+    let dateTime: String
     let time: String
     let author: String
     let icon: ObjectIcon?

diff --git a/...sentationLayer/TextEditor/EditorPage/Views/Settings/History/VersionHistoryViewModel.swift b/...sentationLayer/TextEditor/EditorPage/Views/Settings/History/VersionHistoryViewModel.swift
@@ -56,7 +56,7 @@ final class VersionHistoryViewModel: ObservableObject {
     }
 
     func onVersionTap(_ version: VersionHistoryItem) {
-        output?.onVersionTap(title: version.time, versionId: version.id)
+        output?.onVersionTap(title: version.dateTime, icon: version.icon, versionId: version.id)
     }
 
     private func updateView() {