Fix both layouts

1 files changed, 11 insertions, 7 deletions

diff --git a/JuickNext/View/FeedView.swift b/JuickNext/View/FeedView.swift
index cd0569f..783d8c0 100644
--- a/JuickNext/View/FeedView.swift
+++ b/JuickNext/View/FeedView.swift
@@ -9,6 +9,7 @@
 import SwiftUI
 
 struct FeedView: View {
+    @Environment(\.horizontalSizeClass) private var size
     @ObservedObject var messageFetcher : MessageFetcher
     
     let feed: Feed
@@ -38,18 +39,21 @@ struct FeedView: View {
     }
     
     var body: some View {
-        VStack {
+        let content = VStack {
             stateContent
-        }.toolbar {
-            ToolbarItem(placement: .principal) {
-                Text(feed.title)
-            }
-        }
+        }.screenTitle(title: feed.title)
+        
+        let view = (size == .compact) ?
+        AnyView(
+            NavigationView {
+                content
+            }) : AnyView(content)
+        view
     }
 }
 
 struct FeedView_Previews: PreviewProvider {
     static var previews: some View {
-        FeedView(Feed(title:"Discover", url: "https://api.juick.com/messages"))
+        FeedView(Feed(title:"Discover", url: "https://api.juick.com/messages", imageName: "Discover"))
     }
 }