Merge remote-tracking branch 'upstream/swiftui' into swiftui

Multiplatform/Shared/Article/ArticleContainerView.swift

@@ -13,19 +13,15 @@ struct ArticleContainerView: View {
 	
 	@EnvironmentObject private var sceneModel: SceneModel
 	@StateObject private var articleModel = ArticleModel()
-	var article: Article? = nil
+	var article: Article
 	
 	@ViewBuilder var body: some View {
-		if let article = article {
-			ArticleView()
-				.environmentObject(articleModel)
-				.onAppear {
-					sceneModel.articleModel = articleModel
-					articleModel.delegate = sceneModel
-				}
-		} else {
-			EmptyView()
-		}
+		ArticleView()
+			.environmentObject(articleModel)
+			.onAppear {
+				sceneModel.articleModel = articleModel
+				articleModel.delegate = sceneModel
+			}
 	}
 	
 }

Multiplatform/Shared/Timeline/TimelineContainerView.swift

@@ -24,6 +24,37 @@ struct TimelineContainerView: View {
 					timelineModel.delegate = sceneModel
 					timelineModel.rebuildTimelineItems(feed)
 				}
+				.toolbar {
+					#if os(iOS)
+					ToolbarItem {
+						Button(action: {
+						}, label: {
+							AppAssets.markAllAsReadImage
+								.foregroundColor(.accentColor)
+						}).help("Mark All As Read")
+					}
+					ToolbarItem {
+						Spacer()
+					}
+					ToolbarItem {
+						Text("Last updated")
+							.font(.caption)
+							.foregroundColor(.secondary)
+					}
+					ToolbarItem {
+						Spacer()
+					}
+					ToolbarItem {
+						Button(action: {
+						}, label: {
+							AppAssets.nextUnreadArticleImage
+								.resizable()
+								.scaledToFit()
+								.frame(width: 22, height: 22, alignment: .center)
+						})
+					}
+					#endif
+				}
 		} else {
 			EmptyView()
 		}

NetNewsWire.xcodeproj/project.pbxproj

@@ -2688,10 +2688,10 @@
 			children = (
 				51919FED24AB85E400541E64 /* TimelineContainerView.swift */,
 				51919FF324AB869C00541E64 /* TimelineItem.swift */,
+				514E6C0124AD29A300AC6F6E /* TimelineItemStatusView.swift */,
 				514E6BD924ACEA0400AC6F6E /* TimelineItemView.swift */,
 				51919FF024AB864A00541E64 /* TimelineModel.swift */,
 				51919FF624AB8B7700541E64 /* TimelineView.swift */,
-				514E6C0124AD29A300AC6F6E /* TimelineItemStatusView.swift */,
 			);
 			path = Timeline;
 			sourceTree = "<group>";