From 2eb20c86af7d9727878ae8b8f1a6ef13f7bfee53 Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Sat, 11 Jul 2020 20:11:01 -0500
Subject: [PATCH] Refactor timeline code to be more clear

---
 .../Shared/Timeline/TimelineView.swift        | 26 +++++++------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/Multiplatform/Shared/Timeline/TimelineView.swift b/Multiplatform/Shared/Timeline/TimelineView.swift
index 605e50db5..f5b4bb89e 100644
--- a/Multiplatform/Shared/Timeline/TimelineView.swift
+++ b/Multiplatform/Shared/Timeline/TimelineView.swift
@@ -20,7 +20,7 @@ struct TimelineView: View {
 				EmptyView()
 			}.hidden()
 			List(timelineModel.timelineItems, selection: $timelineModel.selectedArticleIDs) { timelineItem in
-				buildTimelineItemNavigation(timelineItem)
+				TimelineItemView(timelineItem: timelineItem)
 			}
 		}
 		.onChange(of: timelineModel.selectedArticleIDs) { value in
@@ -28,24 +28,16 @@ struct TimelineView: View {
 		}
 		#else
 		List(timelineModel.timelineItems) { timelineItem in
-			buildTimelineItemNavigation(timelineItem)
+			ZStack {
+				TimelineItemView(timelineItem: timelineItem)
+				NavigationLink(destination: ArticleContainerView(articles: timelineModel.selectedArticles),
+							   tag: timelineItem.article.articleID,
+							   selection: $timelineModel.selectedArticleID) {
+					EmptyView()
+				}.buttonStyle(PlainButtonStyle())
+			}
 		}
 		#endif
     }
 
-	func buildTimelineItemNavigation(_ timelineItem: TimelineItem) -> some View {
-		#if os(macOS)
-		return TimelineItemView(timelineItem: timelineItem)
-		#else
-		return ZStack {
-			TimelineItemView(timelineItem: timelineItem)
-			NavigationLink(destination: ArticleContainerView(articles: timelineModel.selectedArticles),
-						   tag: timelineItem.article.articleID,
-						   selection: $timelineModel.selectedArticleID) {
-				EmptyView()
-			}.buttonStyle(PlainButtonStyle())
-		}
-		#endif
-	}
-	
 }