Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ struct DemoMessageReadsInfoView: View {
ForEach(deliveredUsers, id: \.id) { user in
UserReadInfoRow(
user: user,
status: .delivered,
timestamp: getDeliveredTimestamp(for: user)
status: .delivered
)
}
}
Expand All @@ -41,8 +40,7 @@ struct DemoMessageReadsInfoView: View {
ForEach(readUsers, id: \.id) { user in
UserReadInfoRow(
user: user,
status: .read,
timestamp: getReadTimestamp(for: user)
status: .read
)
}
}
Expand Down Expand Up @@ -135,7 +133,6 @@ struct DemoMessageReadsInfoView: View {
struct UserReadInfoRow: View {
let user: ChatUser
let status: ReadStatus
let timestamp: Date?

enum ReadStatus {
case delivered
Expand Down Expand Up @@ -184,12 +181,6 @@ struct UserReadInfoRow: View {
Text(user.name ?? user.id)
.font(.headline)
.foregroundColor(.primary)

if let timestamp = timestamp {
Text(formatTimestamp(timestamp))
.font(.caption)
.foregroundColor(.secondary)
}
}

Spacer()
Expand All @@ -201,20 +192,4 @@ struct UserReadInfoRow: View {
}
.padding(.vertical, 4)
}

private func formatTimestamp(_ date: Date) -> String {
let formatter = DateFormatter()
formatter.dateStyle = .none
formatter.timeStyle = .short

let calendar = Calendar.current
if calendar.isDateInToday(date) {
return "Today at \(formatter.string(from: date))"
} else if calendar.isDateInYesterday(date) {
return "Yesterday at \(formatter.string(from: date))"
} else {
formatter.dateStyle = .short
return formatter.string(from: date)
}
}
}
Loading