From 0b36498ff83f8d279ec0314cfc5591e91d49c614 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Wed, 1 Jul 2020 17:39:27 -0500 Subject: [PATCH] Added date and byline to timeline --- .../Shared/Timeline/TimelineItem.swift | 8 ++++++++ .../Shared/Timeline/TimelineItemView.swift | 19 +++++++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/Multiplatform/Shared/Timeline/TimelineItem.swift b/Multiplatform/Shared/Timeline/TimelineItem.swift index 730530b1a..786854f4b 100644 --- a/Multiplatform/Shared/Timeline/TimelineItem.swift +++ b/Multiplatform/Shared/Timeline/TimelineItem.swift @@ -33,4 +33,12 @@ struct TimelineItem: Identifiable { return .showNone } + var byline: String { + return article.byline() + } + + var dateTimeString: String { + return ArticleStringFormatter.dateString(article.logicalDatePublished) + } + } diff --git a/Multiplatform/Shared/Timeline/TimelineItemView.swift b/Multiplatform/Shared/Timeline/TimelineItemView.swift index 4f6fbe96a..dd952b9c7 100644 --- a/Multiplatform/Shared/Timeline/TimelineItemView.swift +++ b/Multiplatform/Shared/Timeline/TimelineItemView.swift @@ -21,8 +21,23 @@ struct TimelineItemView: View { IconImageView(iconImage: image) .frame(width: AppDefaults.timelineIconSize.size.width, height: AppDefaults.timelineIconSize.size.height, alignment: /*@START_MENU_TOKEN@*/.center/*@END_MENU_TOKEN@*/) } - Text(verbatim: timelineItem.article.title ?? "N/A") - .frame(maxWidth: .infinity, alignment: .leading) + VStack { + Text(verbatim: timelineItem.article.title ?? "N/A") + .lineLimit(3) + .frame(maxWidth: .infinity, alignment: .leading) + .padding(.trailing, 4) + Spacer() + HStack { + Text(verbatim: timelineItem.byline) + .font(.footnote) + .foregroundColor(.secondary) + Spacer() + Text(verbatim: timelineItem.dateTimeString) + .font(.footnote) + .foregroundColor(.secondary) + .padding(.trailing, 4) + } + } } Divider() }