Recently opened for sidebar navigation

Shared/Navigation/AppSidebarNavigation.swift

@@ -14,6 +14,7 @@ struct AppSidebarNavigation: View {
 
     @EnvironmentObject<NavigationState> private var navigationState
     @EnvironmentObject<Playlists> private var playlists
+    @EnvironmentObject<Recents> private var recents
     @EnvironmentObject<SearchState> private var searchState
     @EnvironmentObject<Subscriptions> private var subscriptions
 
@@ -66,6 +67,8 @@ struct AppSidebarNavigation: View {
                 query.query = self.searchQuery
             }
 
+            recents.open(RecentItem(type: .query, identifier: self.searchQuery, title: self.searchQuery))
+
             navigationState.tabSelection = .search
         }
     }
@@ -111,7 +114,7 @@ struct AppSidebarNavigation: View {
             return Group {
                 mainNavigationLinks
 
-                AppSidebarRecentlyOpened(selection: selection)
+                AppSidebarRecents(selection: selection)
                     .id("recentlyOpened")
                 AppSidebarSubscriptions(selection: selection)
                 AppSidebarPlaylists(selection: selection)
@@ -130,7 +133,7 @@ struct AppSidebarNavigation: View {
             }
 
             NavigationLink(destination: LazyView(SubscriptionsView()), tag: TabSelection.subscriptions, selection: selection) {
-                Label("Subscriptions", systemImage: "star.circle.fill")
+                Label("Subscriptions", systemImage: "star.circle")
                     .accessibility(label: Text("Subscriptions"))
             }
 

Shared/Navigation/AppSidebarRecentlyOpened.swift

@@ -1,54 +0,0 @@
-import SwiftUI
-
-struct AppSidebarRecentlyOpened: View {
-    @Binding var selection: TabSelection?
-
-    @EnvironmentObject<NavigationState> private var navigationState
-    @EnvironmentObject<Subscriptions> private var subscriptions
-
-    @State private var subscriptionsChanged = false
-
-    var body: some View {
-        Group {
-            if !recentlyOpened.isEmpty {
-                Section(header: Text("Recently Opened")) {
-                    ForEach(recentlyOpened) { channel in
-                        NavigationLink(tag: TabSelection.channel(channel.id), selection: $selection) {
-                            LazyView(ChannelVideosView(channel))
-                        } label: {
-                            HStack {
-                                Label(channel.name, systemImage: AppSidebarNavigation.symbolSystemImage(channel.name))
-
-                                Spacer()
-
-                                Button(action: { navigationState.closeChannel(channel) }) {
-                                    Image(systemName: "xmark.circle.fill")
-                                }
-                                .foregroundColor(.secondary)
-                                .buttonStyle(.plain)
-                            }
-                        }
-
-                        // force recalculating the view on change of subscriptions
-                        .opacity(subscriptionsChanged ? 1 : 1)
-                        .id(channel.id)
-                        .contextMenu {
-                            Button("Subscribe") {
-                                subscriptions.subscribe(channel.id) {
-                                    navigationState.sidebarSectionChanged.toggle()
-                                }
-                            }
-                        }
-                    }
-                }
-                .onChange(of: subscriptions.all) { _ in
-                    subscriptionsChanged.toggle()
-                }
-            }
-        }
-    }
-
-    var recentlyOpened: [Channel] {
-        navigationState.openChannels.filter { !subscriptions.all.contains($0) }
-    }
-}

Shared/Navigation/AppSidebarRecents.swift

@@ -0,0 +1,91 @@
+import Defaults
+import SwiftUI
+
+struct AppSidebarRecents: View {
+    @Binding var selection: TabSelection?
+
+    @EnvironmentObject<NavigationState> private var navigationState
+    @EnvironmentObject<Recents> private var recents
+
+    @Default(.recentlyOpened) private var recentItems
+
+    var body: some View {
+        Group {
+            if !recentItems.isEmpty {
+                Section(header: Text("Recents")) {
+                    ForEach(recentItems) { recent in
+                        Group {
+                            switch recent.type {
+                            case .channel:
+                                RecentNavigationLink(recent: recent, selection: $selection) {
+                                    LazyView(ChannelVideosView(Channel(id: recent.id, name: recent.title)))
+                                }
+                            case .query:
+                                RecentNavigationLink(recent: recent, selection: $selection, systemImage: "magnifyingglass") {
+                                    LazyView(SearchView(recent.query!))
+                                }
+                            }
+                        }
+                        .contextMenu {
+                            Button("Clear All Recents") {
+                                recents.clear()
+                            }
+
+                            Button("Clear Search History") {
+                                recents.clearQueries()
+                            }
+                            .disabled(!recentItems.contains { $0.type == .query })
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+struct RecentNavigationLink<DestinationContent: View>: View {
+    @EnvironmentObject<Recents> private var recents
+
+    var recent: RecentItem
+    @Binding var selection: TabSelection?
+
+    var systemImage: String?
+    let destination: DestinationContent
+
+    init(
+        recent: RecentItem,
+        selection: Binding<TabSelection?>,
+        systemImage: String? = nil,
+        @ViewBuilder destination: () -> DestinationContent
+    ) {
+        self.recent = recent
+        _selection = selection
+        self.systemImage = systemImage
+        self.destination = destination()
+    }
+
+    var body: some View {
+        NavigationLink(tag: TabSelection.recentlyOpened(recent.tag), selection: $selection) {
+            destination
+        } label: {
+            HStack {
+                Label(recent.title, systemImage: labelSystemImage)
+
+                Spacer()
+
+                Button(action: {
+                    recents.close(recent)
+                }) {
+                    Image(systemName: "xmark.circle.fill")
+                }
+                .foregroundColor(.secondary)
+                .buttonStyle(.plain)
+            }
+        }
+        .id(recent.tag)
+    }
+
+    var labelSystemImage: String {
+        systemImage != nil ? systemImage! : AppSidebarNavigation.symbolSystemImage(recent.title)
+    }
+}

Shared/Navigation/AppTabNavigation.swift

@@ -5,6 +5,8 @@ struct AppTabNavigation: View {
     @EnvironmentObject<NavigationState> private var navigationState
     @EnvironmentObject<SearchState> private var searchState
 
+    @EnvironmentObject<Recents> private var recents
+
     @State private var searchQuery = ""
 
     var body: some View {
@@ -82,18 +84,17 @@ struct AppTabNavigation: View {
             .tag(TabSelection.search)
         }
         .sheet(isPresented: $navigationState.isChannelOpen, onDismiss: {
-            navigationState.closeChannel(presentedChannel)
+            if let channel = recents.presentedChannel {
+                let recent = RecentItem(from: channel)
+                recents.close(recent)
+            }
         }) {
-            if presentedChannel != nil {
+            if recents.presentedChannel != nil {
                 NavigationView {
-                    ChannelVideosView(presentedChannel)
+                    ChannelVideosView(recents.presentedChannel!)
                         .environment(\.inNavigationView, true)
                 }
             }
         }
     }
-
-    fileprivate var presentedChannel: Channel! {
-        navigationState.openChannels.first
-    }
 }

Shared/Navigation/ContentView.swift

@@ -3,9 +3,10 @@ import SwiftUI
 struct ContentView: View {
     @StateObject private var navigationState = NavigationState()
     @StateObject private var playbackState = PlaybackState()
+    @StateObject private var playlists = Playlists()
+    @StateObject private var recents = Recents()
     @StateObject private var searchState = SearchState()
     @StateObject private var subscriptions = Subscriptions()
-    @StateObject private var playlists = Playlists()
 
     #if os(iOS)
         @Environment(\.horizontalSizeClass) private var horizontalSizeClass
@@ -44,9 +45,10 @@ struct ContentView: View {
         #endif
         .environmentObject(navigationState)
             .environmentObject(playbackState)
+            .environmentObject(playlists)
+            .environmentObject(recents)
             .environmentObject(searchState)
             .environmentObject(subscriptions)
-            .environmentObject(playlists)
     }
 }