Bump build and version number

Fixtures/Thumbnail+Fixtures.swift

@@ -10,7 +10,7 @@ extension Thumbnail {
     }
 
     private static var fixturesHost: String {
-        "https://invidious.home.arekf.net"
+        "https://invidious.snopyta.org"
     }
 
     private static func fixtureUrl(videoId: String, quality: Thumbnail.Quality) -> URL {

Fixtures/Video+Fixtures.swift

@@ -1,13 +1,16 @@
 import Foundation
 
 extension Video {
+    static var fixtureID: Video.ID {
+        "FIXTURE"
+    }
+
     static var fixture: Video {
-        let id = "D2sxamzaHkM"
         let thumbnailURL = "https://yt3.ggpht.com/ytc/AKedOLR-pT_JEsz_hcaA4Gjx8DHcqJ8mS42aTRqcVy6P7w=s88-c-k-c0x00ffffff-no-rj-mo"
 
         return Video(
-            videoID: UUID().uuidString,
-            title: "Relaxing Piano Music that will make you feel amazingly good",
+            videoID: fixtureID,
+            title: "Relaxing Piano Music to feel good",
             author: "Fancy Videotuber",
             length: 582,
             published: "7 years ago",
@@ -21,7 +24,7 @@ extension Video {
                 subscriptionsCount: 2300,
                 videos: []
             ),
-            thumbnails: Thumbnail.fixturesForAllQualities(videoId: id),
+            thumbnails: [],
             live: false,
             upcoming: false,
             publishedAt: Date(),

Model/Applications/PipedAPI.swift

@@ -232,6 +232,8 @@ final class PipedAPI: Service, ObservableObject, VideosAPI {
             if let channel = extractChannel(from: content) {
                 return ContentItem(channel: channel)
             }
+        default:
+            return nil
         }
 
         return nil
@@ -309,8 +311,12 @@ final class PipedAPI: Service, ObservableObject, VideosAPI {
         let author = details["uploaderName"]?.stringValue ?? details["uploader"]!.stringValue
         let authorThumbnailURL = details["avatarUrl"]?.url ?? details["uploaderAvatar"]?.url ?? details["avatar"]?.url
 
-        let published = (details["uploadedDate"] ?? details["uploadDate"])?.stringValue ??
-            (details["uploaded"]!.double! / 1000).formattedAsRelativeTime()!
+        let uploaded = details["uploaded"]?.doubleValue
+        var published = uploaded.isNil ? nil : (uploaded! / 1000).formattedAsRelativeTime()
+        if published.isNil {
+            published = (details["uploadedDate"] ?? details["uploadDate"])?.stringValue ?? ""
+        }
+
         let live = details["livestream"]?.boolValue ?? (details["duration"]?.intValue == -1)
 
         return Video(
@@ -318,7 +324,7 @@ final class PipedAPI: Service, ObservableObject, VideosAPI {
             title: details["title"]!.stringValue,
             author: author,
             length: details["duration"]!.doubleValue,
-            published: published,
+            published: published!,
             views: details["views"]!.intValue,
             description: extractDescription(from: content),
             channel: Channel(id: channelId, name: author, thumbnailURL: authorThumbnailURL),

Model/Applications/VideosAPI.swift

@@ -74,6 +74,8 @@ extension VideosAPI {
         case .playlist:
             urlComponents.path = "/playlist"
             queryItems.append(.init(name: "list", value: item.playlist.id))
+        default:
+            return nil
         }
 
         if !time.isNil, time!.seconds.isFinite {

Model/ContentItem.swift

@@ -2,7 +2,7 @@ import Foundation
 
 struct ContentItem: Identifiable {
     enum ContentType: String {
-        case video, playlist, channel
+        case video, playlist, channel, placeholder
 
         private var sortOrder: Int {
             switch self {
@@ -35,6 +35,6 @@ struct ContentItem: Identifiable {
     }
 
     var contentType: ContentType {
-        video.isNil ? (channel.isNil ? .playlist : .channel) : .video
+        video.isNil ? (channel.isNil ? (playlist.isNil ? .placeholder : .playlist) : .channel) : .video
     }
 }

Model/NavigationModel.swift

@@ -14,6 +14,31 @@ final class NavigationModel: ObservableObject {
         case nowPlaying
         case search
 
+        var stringValue: String {
+            switch self {
+            case .favorites:
+                return "favorites"
+            case .subscriptions:
+                return "subscriptions"
+            case .popular:
+                return "popular"
+            case .trending:
+                return "trending"
+            case .playlists:
+                return "playlists"
+            case let .channel(string):
+                return "channel\(string)"
+            case let .playlist(string):
+                return "playlist\(string)"
+            case .recentlyOpened:
+                return "recentlyOpened"
+            case .search:
+                return "search"
+            default:
+                return ""
+            }
+        }
+
         var playlistID: Playlist.ID? {
             if case let .playlist(id) = self {
                 return id
@@ -47,7 +72,7 @@ final class NavigationModel: ObservableObject {
         recents: RecentsModel,
         navigation: NavigationModel,
         navigationStyle: NavigationStyle,
-        delay: Bool = false
+        delay: Bool = true
     ) {
         let recent = RecentItem(from: channel)
         #if os(macOS)
@@ -141,6 +166,12 @@ final class NavigationModel: ObservableObject {
         channelToUnsubscribe = channel
         presentingUnsubscribeAlert = channelToUnsubscribe != nil
     }
+
+    func hideKeyboard() {
+        #if os(iOS)
+            UIApplication.shared.sendAction(#selector(UIResponder.resignFirstResponder), to: nil, from: nil, for: nil)
+        #endif
+    }
 }
 
 typealias TabSelection = NavigationModel.TabSelection

Model/Player/PlayerModel.swift

@@ -33,7 +33,7 @@ final class PlayerModel: ObservableObject {
     @Published var streamSelection: Stream? { didSet { rebuildTVMenu() } }
 
     @Published var queue = [PlayerQueueItem]() { didSet { Defaults[.queue] = queue } }
-    @Published var currentItem: PlayerQueueItem! { didSet { updateWindowTitle() } }
+    @Published var currentItem: PlayerQueueItem! { didSet { handleCurrentItemChange() } }
     @Published var historyVideos = [Video]()
 
     @Published var preservedTime: CMTime?
@@ -556,8 +556,6 @@ final class PlayerModel: ObservableObject {
                 controller?.playerView.dismiss(animated: false) { [weak self] in
                     self?.controller?.dismiss(animated: true)
                 }
-            #else
-                hide()
             #endif
         } else {
             advanceToNextItem()
@@ -804,10 +802,12 @@ final class PlayerModel: ObservableObject {
         }
     #endif
 
-    func updateWindowTitle() {
+    func handleCurrentItemChange() {
         #if os(macOS)
             Windows.player.window?.title = windowTitle
         #endif
+
+        Defaults[.lastPlayed] = currentItem
     }
 
     #if os(macOS)

Model/Player/PlayerQueue.swift

@@ -95,7 +95,9 @@ extension PlayerModel {
 
         switch quality {
         case .best:
-            return streams.first { $0.kind == .hls } ?? streams.first
+            return streams.first { $0.kind == .hls } ??
+                streams.filter { $0.kind == .stream }.max { $0.resolution < $1.resolution } ??
+                streams.first
         default:
             let sorted = streams.filter { $0.kind != .hls }.sorted { $0.resolution > $1.resolution }
             return sorted.first(where: { $0.resolution.height <= quality.value.height })
@@ -201,4 +203,21 @@ extension PlayerModel {
     func removeQueueItems() {
         queue.removeAll()
     }
+
+    func restoreQueue() {
+        guard !accounts.current.isNil else {
+            return
+        }
+
+        queue = ([Defaults[.lastPlayed]] + Defaults[.queue]).compactMap { $0 }
+        Defaults[.lastPlayed] = nil
+
+        queue.forEach { item in
+            accounts.api.loadDetails(item) { newItem in
+                if let index = self.queue.firstIndex(where: { $0.id == item.id }) {
+                    self.queue[index] = newItem
+                }
+            }
+        }
+    }
 }

Model/RecentsModel.swift

@@ -16,7 +16,7 @@ final class RecentsModel: ObservableObject {
         if !saveRecents {
             clear()
 
-            if item.type != .channel {
+            if item.type == .query {
                 return
             }
         }
@@ -34,8 +34,9 @@ final class RecentsModel: ObservableObject {
         }
     }
 
-    func addQuery(_ query: String) {
+    func addQuery(_ query: String, navigation: NavigationModel? = nil) {
         if !query.isEmpty {
+            navigation?.tabSelection = .search
             add(.init(from: query))
         }
     }

Model/SponsorBlock/SponsorBlockAPI.swift

@@ -20,13 +20,47 @@ final class SponsorBlockAPI: ObservableObject {
         switch name {
         case "selfpromo":
             return "Self-promotion"
+
         case "music_offtopic":
             return "Offtopic in Music Videos"
+
         default:
             return name.capitalized
         }
     }
 
+    static func categoryDetails(_ name: String) -> String? {
+        guard SponsorBlockAPI.categories.contains(name) else {
+            return nil
+        }
+
+        switch name {
+        case "sponsor":
+            return "Part of a video promoting a product or service not directly related to the creator. " +
+                "The creator will receive payment or compensation in the form of money or free products."
+
+        case "selfpromo":
+            return "Promoting a product or service that is directly related to the creator themselves. " +
+                "This usually includes merchandise or promotion of monetized platforms."
+
+        case "intro":
+            return "Segments typically found at the start of a video that include an animation, " +
+                "still frame or clip which are also seen in other videos by the same creator."
+
+        case "outro":
+            return "Typically near or at the end of the video when the credits pop up and/or endcards are shown."
+
+        case "interaction":
+            return "Explicit reminders to like, subscribe or interact with them on any paid or free platform(s) (e.g. click on a video)."
+
+        case "music_offtopic":
+            return "For videos which feature music as the primary content."
+
+        default:
+            return nil
+        }
+    }
+
     func loadSegments(videoID: String, categories: Set<String>, completionHandler: @escaping () -> Void = {}) {
         guard !skipSegmentsURL.isNil, self.videoID != videoID else {
             completionHandler()

README.md

@@ -1,7 +1,7 @@
 <div align="center">
   <img src="https://r.yattee.stream/icons/yattee-150.png" width="150" height="150" alt="Yattee logo">
   <h1>Yattee</h1>
-  <p>Videos browser and player for <a href="https://github.com/iv-org/invidious">Invidious</a> and <a href="https://github.com/TeamPiped/Piped">Piped</a> (alternative, privacy-friendly YouTube frontends)<br />built for iOS, tvOS and macOS.</p>
+  <p>Alternative YouTube frontend for iOS, tvOS and macOS<br />built with <a href="https://github.com/iv-org/invidious">Invidious</a> and <a href="https://github.com/TeamPiped/Piped">Piped</a></p>
 
 [![AGPL v3](https://shields.io/badge/License-AGPL%20v3-blue.svg)](https://www.gnu.org/licenses/agpl-3.0.en.html)
 [![GitHub issues](https://img.shields.io/github/issues/yattee/yattee)](https://github.com/yattee/yattee/issues)
@@ -19,8 +19,13 @@
 * Fullscreen playback, Picture in Picture and AirPlay support
 * Stream quality selection
 
+### Features in alpha testing for iOS and macOS
+* New player component with custom controls, gestures and support for 4K playback
+
+You can leave your feedback in [discussion on v1.4 release](https://github.com/yattee/yattee/discussions/75).
+
 ### Availability
-| Feature  | Invidious | Piped |
+|| Invidious | Piped |
 | - | - | - |
 | User Accounts | ✅ | ✅ |
 | Subscriptions | ✅ | ✅ |

Shared/Defaults+Workaround.swift

@@ -0,0 +1,38 @@
+import Defaults
+import Foundation
+
+extension Defaults.Serializable where Self: Codable {
+    static var bridge: Defaults.TopLevelCodableBridge<Self> { Defaults.TopLevelCodableBridge() }
+}
+
+extension Defaults.Serializable where Self: Codable & NSSecureCoding {
+    static var bridge: Defaults.CodableNSSecureCodingBridge<Self> { Defaults.CodableNSSecureCodingBridge() }
+}
+
+extension Defaults.Serializable where Self: Codable & NSSecureCoding & Defaults.PreferNSSecureCoding {
+    static var bridge: Defaults.NSSecureCodingBridge<Self> { Defaults.NSSecureCodingBridge() }
+}
+
+extension Defaults.Serializable where Self: Codable & RawRepresentable {
+    static var bridge: Defaults.RawRepresentableCodableBridge<Self> { Defaults.RawRepresentableCodableBridge() }
+}
+
+extension Defaults.Serializable where Self: Codable & RawRepresentable & Defaults.PreferRawRepresentable {
+    static var bridge: Defaults.RawRepresentableBridge<Self> { Defaults.RawRepresentableBridge() }
+}
+
+extension Defaults.Serializable where Self: RawRepresentable {
+    static var bridge: Defaults.RawRepresentableBridge<Self> { Defaults.RawRepresentableBridge() }
+}
+
+extension Defaults.Serializable where Self: NSSecureCoding {
+    static var bridge: Defaults.NSSecureCodingBridge<Self> { Defaults.NSSecureCodingBridge() }
+}
+
+extension Defaults.CollectionSerializable where Element: Defaults.Serializable {
+    static var bridge: Defaults.CollectionBridge<Self> { Defaults.CollectionBridge() }
+}
+
+extension Defaults.SetAlgebraSerializable where Element: Defaults.Serializable & Hashable {
+    static var bridge: Defaults.SetAlgebraBridge<Self> { Defaults.SetAlgebraBridge() }
+}

Shared/Defaults.swift

@@ -64,6 +64,7 @@ extension Defaults.Keys {
     static let recentlyOpened = Key<[RecentItem]>("recentlyOpened", default: [])
 
     static let queue = Key<[PlayerQueueItem]>("queue", default: [])
+    static let lastPlayed = Key<PlayerQueueItem?>("lastPlayed")
 
     static let saveHistory = Key<Bool>("saveHistory", default: true)
     static let showWatchingProgress = Key<Bool>("showWatchingProgress", default: true)
@@ -86,6 +87,7 @@ extension Defaults.Keys {
     #if os(iOS)
         static let honorSystemOrientationLock = Key<Bool>("honorSystemOrientationLock", default: true)
         static let enterFullscreenInLandscape = Key<Bool>("enterFullscreenInLandscape", default: UIDevice.current.userInterfaceIdiom == .phone)
+        static let lockLandscapeOnRotation = Key<Bool>("lockLandscapeOnRotation", default: false)
         static let lockLandscapeWhenEnteringFullscreen = Key<Bool>("lockLandscapeWhenEnteringFullscreen", default: false)
     #endif
 }

Shared/EnvironmentValues.swift

@@ -30,10 +30,10 @@ private struct CurrentPlaylistID: EnvironmentKey {
 }
 
 private struct LoadMoreContentHandler: EnvironmentKey {
-    static let defaultValue: LoadMoreContentHandlerClosure = { print("infinite load") }
+    static let defaultValue: LoadMoreContentHandlerType = {}
 }
 
-typealias LoadMoreContentHandlerClosure = () -> Void
+typealias LoadMoreContentHandlerType = () -> Void
 
 extension EnvironmentValues {
     var inNavigationView: Bool {
@@ -66,7 +66,7 @@ extension EnvironmentValues {
         set { self[CurrentPlaylistID.self] = newValue }
     }
 
-    var loadMoreContentHandler: LoadMoreContentHandlerClosure {
+    var loadMoreContentHandler: LoadMoreContentHandlerType {
         get { self[LoadMoreContentHandler.self] }
         set { self[LoadMoreContentHandler.self] = newValue }
     }

Shared/Favorites/DropFavorite.swift

@@ -11,10 +11,18 @@ struct DropFavorite: DropDelegate {
             return
         }
 
-        let from = favorites.firstIndex(of: current!)!
-        let to = favorites.firstIndex(of: item)!
+        guard let current = current else {
+            return
+        }
 
-        guard favorites[to].id != current!.id else {
+        let from = favorites.firstIndex(of: current)
+        let to = favorites.firstIndex(of: item)
+
+        guard let from = from, let to = to else {
+            return
+        }
+
+        guard favorites[to].id != current.id else {
             return
         }
 

Shared/Favorites/FavoriteResourceObserver.swift

@@ -13,6 +13,8 @@ final class FavoriteResourceObserver: ObservableObject, ResourceObserver {
             contentItems = playlist.videos.map { ContentItem(video: $0) }
         } else if let playlist: Playlist = resource.typedContent() {
             contentItems = playlist.videos.map { ContentItem(video: $0) }
+        } else if let page: SearchPage = resource.typedContent() {
+            contentItems = page.results
         } else if let items: [ContentItem] = resource.typedContent() {
             contentItems = items
         }

Shared/MenuCommands.swift

@@ -12,29 +12,29 @@ struct MenuCommands: Commands {
     private var navigationMenu: some Commands {
         CommandGroup(before: .windowSize) {
             Button("Favorites") {
-                model.navigation?.tabSelection = .favorites
+                setTabSelection(.favorites)
             }
             .keyboardShortcut("1")
 
             Button("Subscriptions") {
-                model.navigation?.tabSelection = .subscriptions
+                setTabSelection(.subscriptions)
             }
             .disabled(subscriptionsDisabled)
             .keyboardShortcut("2")
 
             Button("Popular") {
-                model.navigation?.tabSelection = .popular
+                setTabSelection(.popular)
             }
-            .disabled(!(model.accounts?.app.supportsPopular ?? true))
+            .disabled(!(model.accounts?.app.supportsPopular ?? false))
             .keyboardShortcut("3")
 
             Button("Trending") {
-                model.navigation?.tabSelection = .trending
+                setTabSelection(.trending)
             }
             .keyboardShortcut("4")
 
             Button("Search") {
-                model.navigation?.tabSelection = .search
+                setTabSelection(.search)
             }
             .keyboardShortcut("f")
 
@@ -42,6 +42,15 @@ struct MenuCommands: Commands {
         }
     }
 
+    private func setTabSelection(_ tabSelection: NavigationModel.TabSelection) {
+        guard let navigation = model.navigation else {
+            return
+        }
+
+        navigation.sidebarSectionChanged.toggle()
+        navigation.tabSelection = tabSelection
+    }
+
     private var subscriptionsDisabled: Bool {
         !(
             (model.accounts?.app.supportsSubscriptions ?? false) && model.accounts?.signedIn ?? false

Shared/Navigation/AppTabNavigation.swift

@@ -35,7 +35,7 @@ struct AppTabNavigation: View {
                 trendingNavigationView
             }
 
-            if visibleSections.contains(.playlists), accounts.app.supportsUserPlaylists {
+            if playlistsVisible {
                 playlistsNavigationView
             }
 
@@ -118,6 +118,11 @@ struct AppTabNavigation: View {
             accounts.app.supportsSubscriptions && !(accounts.current?.anonymous ?? true)
     }
 
+    private var playlistsVisible: Bool {
+        visibleSections.contains(.playlists) &&
+            accounts.app.supportsUserPlaylists && !(accounts.current?.anonymous ?? true)
+    }
+
     private var popularNavigationView: some View {
         NavigationView {
             LazyView(PopularView())

Shared/Navigation/ContentView.swift

@@ -139,6 +139,10 @@ struct ContentView: View {
         player.accounts = accounts
         player.comments = comments
 
+        if !accounts.current.isNil {
+            player.restoreQueue()
+        }
+
         if !Defaults[.saveRecents] {
             recents.clear()
         }

Shared/Navigation/Sidebar.swift

@@ -45,6 +45,7 @@ struct Sidebar: View {
                     Label("Favorites", systemImage: "heart")
                         .accessibility(label: Text("Favorites"))
                 }
+                .id("favorites")
             }
             if visibleSections.contains(.subscriptions),
                accounts.app.supportsSubscriptions && accounts.signedIn
@@ -53,6 +54,7 @@ struct Sidebar: View {
                     Label("Subscriptions", systemImage: "star.circle")
                         .accessibility(label: Text("Subscriptions"))
                 }
+                .id("subscriptions")
             }
 
             if visibleSections.contains(.popular), accounts.app.supportsPopular {
@@ -60,6 +62,7 @@ struct Sidebar: View {
                     Label("Popular", systemImage: "arrow.up.right.circle")
                         .accessibility(label: Text("Popular"))
                 }
+                .id("popular")
             }
 
             if visibleSections.contains(.trending) {
@@ -67,12 +70,14 @@ struct Sidebar: View {
                     Label("Trending", systemImage: "chart.bar")
                         .accessibility(label: Text("Trending"))
                 }
+                .id("trending")
             }
 
             NavigationLink(destination: LazyView(SearchView()), tag: TabSelection.search, selection: $navigation.tabSelection) {
                 Label("Search", systemImage: "magnifyingglass")
                     .accessibility(label: Text("Search"))
             }
+            .id("search")
             .keyboardShortcut("f")
         }
     }
@@ -80,8 +85,12 @@ struct Sidebar: View {
     private func scrollScrollViewToItem(scrollView: ScrollViewProxy, for selection: TabSelection) {
         if case .recentlyOpened = selection {
             scrollView.scrollTo("recentlyOpened")
+            return
         } else if case let .playlist(id) = selection {
             scrollView.scrollTo(id)
+            return
         }
+
+        scrollView.scrollTo(selection.stringValue)
     }
 }

Shared/Player/PlayerViewController.swift

@@ -127,6 +127,9 @@ extension PlayerViewController: AVPlayerViewControllerDelegate {
     }
 
     func playerViewControllerWillBeginDismissalTransition(_: AVPlayerViewController) {
+        if Defaults[.pauseOnHidingPlayer] {
+            playerModel.pause()
+        }
         dismiss(animated: false)
     }
 
@@ -134,9 +137,15 @@ extension PlayerViewController: AVPlayerViewControllerDelegate {
 
     func playerViewController(
         _: AVPlayerViewController,
-        willBeginFullScreenPresentationWithAnimationCoordinator _: UIViewControllerTransitionCoordinator
+        willBeginFullScreenPresentationWithAnimationCoordinator context: UIViewControllerTransitionCoordinator
     ) {
         playerModel.playingFullscreen = true
+
+        #if os(iOS)
+            if !context.isCancelled, Defaults[.lockLandscapeWhenEnteringFullscreen] {
+                Orientation.lockOrientation(.landscape, andRotateTo: UIDevice.current.orientation.isLandscape ? nil : .landscapeRight)
+            }
+        #endif
     }
 
     func playerViewController(

Shared/Player/VideoDetails.swift

@@ -5,13 +5,14 @@ import SwiftUI
 
 struct VideoDetails: View {
     enum Page {
-        case info, queue, related, comments
+        case info, comments, related, queue
     }
 
     @Binding var sidebarQueue: Bool
     @Binding var fullScreen: Bool
 
     @State private var subscribed = false
+    @State private var subscriptionToggleButtonDisabled = false
     @State private var presentingUnsubscribeAlert = false
     @State private var presentingAddToPlaylist = false
     @State private var presentingShareSheet = false
@@ -129,7 +130,7 @@ struct VideoDetails: View {
         }
         .onChange(of: sidebarQueue) { queue in
             if queue {
-                if currentPage == .queue {
+                if currentPage == .related || currentPage == .queue {
                     currentPage = .info
                 }
             } else if video.isNil {
@@ -236,7 +237,7 @@ struct VideoDetails: View {
                         }
                     }
 
-                    if accounts.app.supportsSubscriptions {
+                    if accounts.app.supportsSubscriptions, accounts.signedIn {
                         Spacer()
 
                         Section {
@@ -254,10 +255,13 @@ struct VideoDetails: View {
                                             "Are you sure you want to unsubscribe from \(video!.channel.name)?"
                                         ),
                                         primaryButton: .destructive(Text("Unsubscribe")) {
-                                            subscriptions.unsubscribe(video!.channel.id)
+                                            subscriptionToggleButtonDisabled = true
 
-                                            withAnimation {
-                                                subscribed.toggle()
+                                            subscriptions.unsubscribe(video!.channel.id) {
+                                                withAnimation {
+                                                    subscriptionToggleButtonDisabled = false
+                                                    subscribed.toggle()
+                                                }
                                             }
                                         },
                                         secondaryButton: .cancel()
@@ -265,16 +269,20 @@ struct VideoDetails: View {
                                 }
                             } else {
                                 Button("Subscribe") {
-                                    subscriptions.subscribe(video!.channel.id)
+                                    subscriptionToggleButtonDisabled = true
 
-                                    withAnimation {
-                                        subscribed.toggle()
+                                    subscriptions.subscribe(video!.channel.id) {
+                                        withAnimation {
+                                            subscriptionToggleButtonDisabled = false
+                                            subscribed.toggle()
+                                        }
                                     }
                                 }
                                 .backport
-                                .tint(.blue)
+                                .tint(subscriptionToggleButtonDisabled ? .gray : .blue)
                             }
                         }
+                        .disabled(subscriptionToggleButtonDisabled)
                         .font(.system(size: 13))
                         .buttonStyle(.borderless)
                     }

Shared/Player/VideoPlayerView.swift

@@ -28,13 +28,11 @@ struct VideoPlayerView: View {
 
         @Default(.enterFullscreenInLandscape) private var enterFullscreenInLandscape
         @Default(.honorSystemOrientationLock) private var honorSystemOrientationLock
-        @Default(.lockLandscapeWhenEnteringFullscreen) private var lockLandscapeWhenEnteringFullscreen
+        @Default(.lockLandscapeOnRotation) private var lockLandscapeOnRotation
 
         @State private var motionManager: CMMotionManager!
         @State private var orientation = UIInterfaceOrientation.portrait
         @State private var lastOrientation: UIInterfaceOrientation?
-
-        private var orientationThrottle = Throttle(interval: 2)
     #endif
 
     @EnvironmentObject<AccountsModel> private var accounts
@@ -140,7 +138,11 @@ struct VideoPlayerView: View {
                             #endif
                         }
                         .background(colorScheme == .dark ? Color.black : Color.white)
-                        .modifier(VideoDetailsPaddingModifier(geometry: geometry, aspectRatio: player.controller?.aspectRatio, fullScreen: fullScreenDetails))
+                        .modifier(VideoDetailsPaddingModifier(
+                            geometry: geometry,
+                            aspectRatio: player.controller?.aspectRatio,
+                            fullScreen: fullScreenDetails
+                        ))
                     }
                 #endif
             }
@@ -231,7 +233,11 @@ struct VideoPlayerView: View {
 
     #if os(iOS)
         private func configureOrientationUpdatesBasedOnAccelerometer() {
-            if UIDevice.current.orientation.isLandscape, enterFullscreenInLandscape, !player.playingFullscreen {
+            if UIDevice.current.orientation.isLandscape,
+               enterFullscreenInLandscape,
+               !player.playingFullscreen,
+               !player.playingInPictureInPicture
+            {
                 DispatchQueue.main.async {
                     player.enterFullScreen()
                 }
@@ -244,7 +250,7 @@ struct VideoPlayerView: View {
             motionManager = CMMotionManager()
             motionManager.accelerometerUpdateInterval = 0.2
             motionManager.startAccelerometerUpdates(to: OperationQueue()) { data, _ in
-                guard player.presentingPlayer, !data.isNil else {
+                guard player.presentingPlayer, !player.playingInPictureInPicture, !data.isNil else {
                     return
                 }
 
@@ -278,11 +284,12 @@ struct VideoPlayerView: View {
 
                         player.enterFullScreen()
 
-                        let orientationLockMask = orientation == .landscapeLeft ? UIInterfaceOrientationMask.landscapeLeft : .landscapeRight
+                        let orientationLockMask = orientation == .landscapeLeft ?
+                            UIInterfaceOrientationMask.landscapeLeft : .landscapeRight
 
                         Orientation.lockOrientation(orientationLockMask, andRotateTo: orientation)
 
-                        guard lockLandscapeWhenEnteringFullscreen else {
+                        guard lockLandscapeOnRotation else {
                             return
                         }
 
@@ -307,7 +314,11 @@ struct VideoPlayerView: View {
 
         private func handleOrientationDidChangeNotification() {
             let newOrientation = UIApplication.shared.windows.first?.windowScene?.interfaceOrientation
-            if newOrientation?.isLandscape ?? false, player.presentingPlayer, lockLandscapeWhenEnteringFullscreen, !player.lockedOrientation.isNil {
+            if newOrientation?.isLandscape ?? false,
+               player.presentingPlayer,
+               lockLandscapeOnRotation,
+               !player.lockedOrientation.isNil
+            {
                 Orientation.lockOrientation(.landscape, andRotateTo: newOrientation)
                 return
             }

Shared/Search/SearchField.swift

@@ -3,6 +3,7 @@ import SwiftUI
 struct SearchTextField: View {
     @Environment(\.navigationStyle) private var navigationStyle
 
+    @EnvironmentObject<NavigationModel> private var navigation
     @EnvironmentObject<RecentsModel> private var recents
     @EnvironmentObject<SearchModel> private var state
 
@@ -28,8 +29,11 @@ struct SearchTextField: View {
                         .opacity(0.8)
                 #endif
                 TextField("Search...", text: $state.queryText) {
-                    state.changeQuery { query in query.query = state.queryText }
-                    recents.addQuery(state.queryText)
+                    state.changeQuery { query in
+                        query.query = state.queryText
+                        navigation.hideKeyboard()
+                    }
+                    recents.addQuery(state.queryText, navigation: navigation)
                 }
                 .onChange(of: state.queryText) { _ in
                     if state.query.query.compare(state.queryText, options: .caseInsensitive) == .orderedSame {

Shared/Search/SearchSuggestions.swift

@@ -1,6 +1,7 @@
 import SwiftUI
 
 struct SearchSuggestions: View {
+    @EnvironmentObject<NavigationModel> private var navigation
     @EnvironmentObject<RecentsModel> private var recents
     @EnvironmentObject<SearchModel> private var state
 
@@ -30,10 +31,12 @@ struct SearchSuggestions: View {
                         HStack {
                             Image(systemName: "magnifyingglass")
                             HStack(spacing: 0) {
-                                Text(state.suggestionsText)
-                                    .lineLimit(1)
-                                    .layoutPriority(2)
-                                    .foregroundColor(.secondary)
+                                if suggestion.hasPrefix(state.suggestionsText.lowercased()) {
+                                    Text(state.suggestionsText.lowercased())
+                                        .lineLimit(1)
+                                        .layoutPriority(2)
+                                        .foregroundColor(.secondary)
+                                }
 
                                 Text(querySuffix(suggestion))
                                     .lineLimit(1)
@@ -72,9 +75,10 @@ struct SearchSuggestions: View {
         state.changeQuery { query in
             query.query = state.queryText
             state.fieldIsFocused = false
+            navigation.hideKeyboard()
         }
 
-        recents.addQuery(state.queryText)
+        recents.addQuery(state.queryText, navigation: navigation)
     }
 
     private var visibleSuggestions: [String] {

Shared/Search/SearchView.swift

@@ -177,11 +177,40 @@ struct SearchView: View {
                 .navigationTitle("Search")
         #endif
         #if os(iOS)
-        .navigationBarHidden(!Defaults[.visibleSections].isEmpty || navigationStyle == .sidebar)
+        .navigationBarHidden(navigationBarHidden)
         .navigationBarTitleDisplayMode(.inline)
         #endif
     }
 
+    private var navigationBarHidden: Bool {
+        if navigationStyle == .sidebar {
+            return true
+        }
+
+        let preferred = Defaults[.visibleSections]
+        var visibleSections = [VisibleSection]()
+
+        if accounts.app.supportsPopular && preferred.contains(.popular) {
+            visibleSections.append(.popular)
+        }
+
+        if accounts.app.supportsSubscriptions && accounts.signedIn && preferred.contains(.subscriptions) {
+            visibleSections.append(.subscriptions)
+        }
+
+        if accounts.app.supportsUserPlaylists && preferred.contains(.playlists) {
+            visibleSections.append(.playlists)
+        }
+
+        [VisibleSection.favorites, .trending].forEach { section in
+            if preferred.contains(section) {
+                visibleSections.append(section)
+            }
+        }
+
+        return !visibleSections.isEmpty
+    }
+
     private var results: some View {
         VStack {
             if showRecentQueries {
@@ -205,7 +234,7 @@ struct SearchView: View {
                     }
                     .edgesIgnoringSafeArea(.horizontal)
                 #else
-                    VerticalCells(items: items)
+                    VerticalCells(items: items, allowEmpty: state.query.isEmpty)
                         .environment(\.loadMoreContentHandler) { state.loadNextPage() }
                 #endif
 
@@ -324,7 +353,7 @@ struct SearchView: View {
 
     private var removeAllButton: some View {
         Button {
-            recents.clearQueries()
+            recents.clear()
             recentsChanged.toggle()
         } label: {
             Label("Remove All", systemImage: "trash.fill")

Shared/Settings/PlayerSettings.swift

@@ -18,8 +18,9 @@ struct PlayerSettings: View {
     @Default(.pauseOnHidingPlayer) private var pauseOnHidingPlayer
     #if os(iOS)
         @Default(.honorSystemOrientationLock) private var honorSystemOrientationLock
-        @Default(.lockLandscapeWhenEnteringFullscreen) private var lockLandscapeWhenEnteringFullscreen
+        @Default(.lockLandscapeOnRotation) private var lockLandscapeOnRotation
         @Default(.enterFullscreenInLandscape) private var enterFullscreenInLandscape
+        @Default(.lockLandscapeWhenEnteringFullscreen) private var lockLandscapeWhenEnteringFullscreen
     #endif
     @Default(.closePiPOnNavigation) private var closePiPOnNavigation
     @Default(.closePiPOnOpeningPlayer) private var closePiPOnOpeningPlayer
@@ -85,16 +86,6 @@ struct PlayerSettings: View {
                 channelSubscribersToggle
             }
 
-            #if os(iOS)
-                Section(header: SettingsHeader(text: "Orientation")) {
-                    if idiom == .pad {
-                        enterFullscreenInLandscapeToggle
-                    }
-                    honorSystemOrientationLockToggle
-                    lockLandscapeWhenEnteringFullscreenToggle
-                }
-            #endif
-
             Section(header: SettingsHeader(text: "Picture in Picture")) {
                 closePiPOnNavigationToggle
                 closePiPOnOpeningPlayerToggle
@@ -102,6 +93,17 @@ struct PlayerSettings: View {
                     closePiPAndOpenPlayerOnEnteringForegroundToggle
                 #endif
             }
+
+            #if os(iOS)
+                Section(header: SettingsHeader(text: "Orientation"), footer: orientationFooter) {
+                    if idiom == .pad {
+                        enterFullscreenInLandscapeToggle
+                    }
+                    honorSystemOrientationLockToggle
+                    lockLandscapeOnRotationToggle
+                    lockLandscapeWhenEnteringFullscreenToggle
+                }
+            #endif
         }
     }
 
@@ -212,10 +214,18 @@ struct PlayerSettings: View {
             Toggle("Enter fullscreen in landscape", isOn: $enterFullscreenInLandscape)
         }
 
-        private var lockLandscapeWhenEnteringFullscreenToggle: some View {
-            Toggle("Lock landscape on rotation", isOn: $lockLandscapeWhenEnteringFullscreen)
+        private var lockLandscapeOnRotationToggle: some View {
+            Toggle("Lock landscape on rotation", isOn: $lockLandscapeOnRotation)
                 .disabled(!enterFullscreenInLandscape)
         }
+
+        private var lockLandscapeWhenEnteringFullscreenToggle: some View {
+            Toggle("Rotate and lock landscape on entering fullscreen", isOn: $lockLandscapeWhenEnteringFullscreen)
+        }
+
+        private var orientationFooter: some View {
+            Text("Orientation settings are experimental and do not yet work properly with all devices and iOS versions")
+        }
     #endif
 
     private var closePiPOnNavigationToggle: some View {

Shared/Settings/SettingsView.swift

@@ -183,7 +183,7 @@ struct SettingsView: View {
             case .history:
                 return 480
             case .sponsorBlock:
-                return 290
+                return 660
             case .updates:
                 return 200
             case .help:

Shared/Settings/SponsorBlockSettings.swift

@@ -39,7 +39,7 @@ struct SponsorBlockSettings: View {
                 #endif
             }
 
-            Section(header: SettingsHeader(text: "Categories to Skip")) {
+            Section(header: SettingsHeader(text: "Categories to Skip"), footer: categoriesDetails) {
                 #if os(macOS)
                     let list = ForEach(SponsorBlockAPI.categories, id: \.self) { category in
                         SponsorBlockCategorySelectionRow(
@@ -74,6 +74,24 @@ struct SponsorBlockSettings: View {
         }
     }
 
+    private var categoriesDetails: some View {
+        VStack(alignment: .leading) {
+            ForEach(SponsorBlockAPI.categories, id: \.self) { category in
+                Text(SponsorBlockAPI.categoryDescription(category) ?? "Category")
+                    .fontWeight(.bold)
+                #if os(tvOS)
+                    .focusable()
+                #endif
+
+                Text(SponsorBlockAPI.categoryDetails(category) ?? "Details")
+                    .padding(.bottom, 3)
+                    .fixedSize(horizontal: false, vertical: true)
+            }
+        }
+        .foregroundColor(.secondary)
+        .padding(.top, 3)
+    }
+
     func toggleCategory(_ category: String, value: Bool) {
         if let index = sponsorBlockCategories.firstIndex(where: { $0 == category }), !value {
             sponsorBlockCategories.remove(at: index)
@@ -123,7 +141,7 @@ struct SponsorBlockSettings: View {
     }
 }
 
-struct ServicesSettings_Previews: PreviewProvider {
+struct SponsorBlockSettings_Previews: PreviewProvider {
     static var previews: some View {
         VStack {
             SponsorBlockSettings()

Shared/Trending/TrendingView.swift

@@ -127,6 +127,7 @@ struct TrendingView: View {
                         resource.load()
                     }
                     .keyboardShortcut("r")
+                    .opacity(0)
                 )
                 .navigationTitle("Trending")
         #endif

Shared/Videos/HorizontalCells.swift

@@ -11,7 +11,7 @@ struct HorizontalCells: View {
     var body: some View {
         ScrollView(.horizontal, showsIndicators: false) {
             LazyHStack(spacing: 20) {
-                ForEach(items) { item in
+                ForEach(contentItems) { item in
                     ContentItemView(item: item)
                         .environment(\.horizontalCells, true)
                         .onAppear { loadMoreContentItemsIfNeeded(current: item) }
@@ -36,6 +36,14 @@ struct HorizontalCells: View {
         .edgesIgnoringSafeArea(.horizontal)
     }
 
+    var contentItems: [ContentItem] {
+        items.isEmpty ? placeholders : items
+    }
+
+    var placeholders: [ContentItem] {
+        (0 ..< 9).map { _ in .init() }
+    }
+
     func loadMoreContentItemsIfNeeded(current item: ContentItem) {
         let thresholdIndex = items.index(items.endIndex, offsetBy: -5)
         if items.firstIndex(where: { $0.id == item.id }) == thresholdIndex {

Shared/Videos/VerticalCells.swift

@@ -9,11 +9,12 @@ struct VerticalCells: View {
     @Environment(\.loadMoreContentHandler) private var loadMoreContentHandler
 
     var items = [ContentItem]()
+    var allowEmpty = false
 
     var body: some View {
         ScrollView(.vertical, showsIndicators: scrollViewShowsIndicators) {
             LazyVGrid(columns: columns, alignment: .center) {
-                ForEach(items.sorted { $0 < $1 }) { item in
+                ForEach(contentItems) { item in
                     ContentItemView(item: item)
                         .onAppear { loadMoreContentItemsIfNeeded(current: item) }
                 }
@@ -27,6 +28,14 @@ struct VerticalCells: View {
         #endif
     }
 
+    var contentItems: [ContentItem] {
+        items.isEmpty ? (allowEmpty ? items : placeholders) : items.sorted { $0 < $1 }
+    }
+
+    var placeholders: [ContentItem] {
+        (0 ..< 9).map { _ in .init() }
+    }
+
     func loadMoreContentItemsIfNeeded(current item: ContentItem) {
         let thresholdIndex = items.index(items.endIndex, offsetBy: -5)
         if items.firstIndex(where: { $0.id == item.id }) == thresholdIndex {
@@ -36,7 +45,7 @@ struct VerticalCells: View {
 
     var columns: [GridItem] {
         #if os(tvOS)
-            items.count < 3 ? Array(repeating: GridItem(.fixed(500)), count: [items.count, 1].max()!) : adaptiveItem
+            contentItems.count < 3 ? Array(repeating: GridItem(.fixed(500)), count: [contentItems.count, 1].max()!) : adaptiveItem
         #else
             adaptiveItem
         #endif

Shared/Videos/VideoCell.swift

@@ -6,6 +6,7 @@ struct VideoCell: View {
     private var video: Video
 
     @Environment(\.inNavigationView) private var inNavigationView
+    @Environment(\.navigationStyle) private var navigationStyle
 
     #if os(iOS)
         @Environment(\.verticalSizeClass) private var verticalSizeClass
@@ -13,7 +14,9 @@ struct VideoCell: View {
     #endif
 
     @EnvironmentObject<AccountsModel> private var accounts
+    @EnvironmentObject<NavigationModel> private var navigation
     @EnvironmentObject<PlayerModel> private var player
+    @EnvironmentObject<RecentsModel> private var recents
     @EnvironmentObject<ThumbnailsModel> private var thumbnails
 
     @Default(.channelOnThumbnail) private var channelOnThumbnail
@@ -59,6 +62,10 @@ struct VideoCell: View {
     }
 
     private func playAction() {
+        guard video.videoID != Video.fixtureID else {
+            return
+        }
+
         if watchingNow {
             if !player.playingInPictureInPicture {
                 player.show()
@@ -147,9 +154,7 @@ struct VideoCell: View {
                         .frame(minWidth: 0, maxWidth: .infinity, alignment: .leading)
 
                     if !channelOnThumbnail {
-                        Text(video.channel.name)
-                            .fontWeight(.semibold)
-                            .foregroundColor(.secondary)
+                        channelButton(badge: false)
                     }
 
                     if additionalDetailsAvailable {
@@ -231,9 +236,7 @@ struct VideoCell: View {
                             .frame(minHeight: 40, alignment: .top)
                         #endif
                         if !channelOnThumbnail {
-                            Text(video.channel.name)
-                                .fontWeight(.semibold)
-                                .foregroundColor(.secondary)
+                            channelButton(badge: false)
                                 .padding(.top, 4)
                                 .padding(.bottom, 6)
                         }
@@ -289,6 +292,29 @@ struct VideoCell: View {
         }
     }
 
+    private func channelButton(badge: Bool = true) -> some View {
+        Button {
+            NavigationModel.openChannel(
+                video.channel,
+                player: player,
+                recents: recents,
+                navigation: navigation,
+                navigationStyle: navigationStyle
+            )
+        } label: {
+            if badge {
+                DetailBadge(text: video.author, style: .prominent)
+                    .foregroundColor(.primary)
+            } else {
+                Text(video.channel.name)
+                    .fontWeight(.semibold)
+                    .foregroundColor(.secondary)
+            }
+        }
+        .buttonStyle(.plain)
+        .help("\(video.channel.name) Channel")
+    }
+
     private var additionalDetailsAvailable: Bool {
         video.publishedDate != nil || video.views != 0 ||
             (!timeOnThumbnail && !video.length.formattedAsPlaybackTime().isNil)
@@ -325,7 +351,7 @@ struct VideoCell: View {
                     Spacer()
 
                     if channelOnThumbnail {
-                        DetailBadge(text: video.author, style: .prominent)
+                        channelButton()
                     }
                 }
                 #if os(tvOS)
@@ -415,7 +441,7 @@ struct VideoCell: View {
            stoppedAt.isFinite,
            let stoppedAtFormatted = stoppedAt.formattedAsPlaybackTime()
         {
-            if watch?.videoDuration ?? 0 > 0 {
+            if (watch?.videoDuration ?? 0) > 0 {
                 videoTime = watch!.videoDuration.formattedAsPlaybackTime() ?? "?"
             }
             return "\(stoppedAtFormatted) / \(videoTime)"

Shared/Views/ChannelVideosView.swift

@@ -6,6 +6,7 @@ struct ChannelVideosView: View {
 
     @State private var presentingShareSheet = false
     @State private var shareURL: URL?
+    @State private var subscriptionToggleButtonDisabled = false
 
     @StateObject private var store = Store<Channel>()
 
@@ -146,17 +147,25 @@ struct ChannelVideosView: View {
             if accounts.app.supportsSubscriptions && accounts.signedIn {
                 if subscriptions.isSubscribing(channel.id) {
                     Button("Unsubscribe") {
-                        navigation.presentUnsubscribeAlert(channel)
+                        subscriptionToggleButtonDisabled = true
+
+                        subscriptions.unsubscribe(channel.id) {
+                            subscriptionToggleButtonDisabled = false
+                        }
                     }
                 } else {
                     Button("Subscribe") {
+                        subscriptionToggleButtonDisabled = true
+
                         subscriptions.subscribe(channel.id) {
+                            subscriptionToggleButtonDisabled = false
                             navigation.sidebarSectionChanged.toggle()
                         }
                     }
                 }
             }
         }
+        .disabled(subscriptionToggleButtonDisabled)
     }
 
     private var contentItem: ContentItem {

Shared/Views/ContentItemView.swift

@@ -11,8 +11,10 @@ struct ContentItemView: View {
                 ChannelPlaylistCell(playlist: item.playlist)
             case .channel:
                 ChannelCell(channel: item.channel)
-            default:
+            case .video:
                 VideoCell(video: item.video)
+            default:
+                PlaceholderCell()
             }
         }
     }

Shared/Views/DetailBadge.swift

@@ -1,3 +1,4 @@
+import Defaults
 import SwiftUI
 
 struct DetailBadge: View {
@@ -82,12 +83,17 @@ struct DetailBadge: View {
     var text: String
     var style: Style = .default
 
+    @Default(.roundedThumbnails) private var roundedThumbnails
+
     var body: some View {
         Text(text)
             .truncationMode(.middle)
-            .padding(10)
+            .padding(4)
+        #if os(tvOS)
+            .padding(.horizontal, 5)
+        #endif
             .modifier(StyleModifier(style: style))
-            .mask(RoundedRectangle(cornerRadius: 12))
+            .mask(RoundedRectangle(cornerRadius: roundedThumbnails ? 6 : 0))
     }
 }
 

Shared/Views/PlaceholderCell.swift

@@ -0,0 +1,16 @@
+import Defaults
+import SwiftUI
+
+struct PlaceholderCell: View {
+    var body: some View {
+        VideoCell(video: .fixture)
+            .redacted(reason: .placeholder)
+    }
+}
+
+struct PlaceholderCell_Previews: PreviewProvider {
+    static var previews: some View {
+        PlaceholderCell()
+            .injectFixtureEnvironmentObjects()
+    }
+}

Shared/Views/PopularView.swift

@@ -36,6 +36,7 @@ struct PopularView: View {
                 resource?.load()
             }
             .keyboardShortcut("r")
+            .opacity(0)
         )
         #endif
         #if os(iOS)

Shared/Views/SubscriptionsView.swift

@@ -44,6 +44,7 @@ struct SubscriptionsView: View {
                 loadResources(force: true)
             }
             .keyboardShortcut("r")
+            .opacity(0)
         )
         #endif
         #if os(iOS)

Shared/Views/VideoContextMenuView.swift

@@ -33,6 +33,12 @@ struct VideoContextMenuView: View {
     }
 
     var body: some View {
+        if video.videoID != Video.fixtureID {
+            contextMenu
+        }
+    }
+
+    @ViewBuilder var contextMenu: some View {
         if saveHistory {
             Section {
                 if let watchedAtString = watchedAtString {

Yattee.xcodeproj/project.pbxproj

@@ -514,6 +514,9 @@
 		37D526E02720AC4400ED2F5E /* VideosAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37D526DD2720AC4400ED2F5E /* VideosAPI.swift */; };
 		37D526E32720B4BE00ED2F5E /* View+SwipeGesture.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37D526E22720B4BE00ED2F5E /* View+SwipeGesture.swift */; };
 		37D526E42720B4BE00ED2F5E /* View+SwipeGesture.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37D526E22720B4BE00ED2F5E /* View+SwipeGesture.swift */; };
+		37D6F3A127ECA1FF006FE38B /* Defaults+Workaround.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37D6F3A027ECA1FF006FE38B /* Defaults+Workaround.swift */; };
+		37D6F3A227ECA1FF006FE38B /* Defaults+Workaround.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37D6F3A027ECA1FF006FE38B /* Defaults+Workaround.swift */; };
+		37D6F3A327ECA1FF006FE38B /* Defaults+Workaround.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37D6F3A027ECA1FF006FE38B /* Defaults+Workaround.swift */; };
 		37DD87C7271C9CFE0027CBF9 /* PlayerStreams.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37DD87C6271C9CFE0027CBF9 /* PlayerStreams.swift */; };
 		37DD87C8271C9CFE0027CBF9 /* PlayerStreams.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37DD87C6271C9CFE0027CBF9 /* PlayerStreams.swift */; };
 		37DD87C9271C9CFE0027CBF9 /* PlayerStreams.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37DD87C6271C9CFE0027CBF9 /* PlayerStreams.swift */; };
@@ -587,6 +590,9 @@
 		37FD43E42704847C0073EE42 /* View+Fixtures.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37FD43E22704847C0073EE42 /* View+Fixtures.swift */; };
 		37FD43E52704847C0073EE42 /* View+Fixtures.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37FD43E22704847C0073EE42 /* View+Fixtures.swift */; };
 		37FD43F02704A9C00073EE42 /* RecentsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37C194C626F6A9C8005D3B96 /* RecentsModel.swift */; };
+		37FEF11327EFD8580033912F /* PlaceholderCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37FEF11227EFD8580033912F /* PlaceholderCell.swift */; };
+		37FEF11427EFD8580033912F /* PlaceholderCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37FEF11227EFD8580033912F /* PlaceholderCell.swift */; };
+		37FEF11527EFD8580033912F /* PlaceholderCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37FEF11227EFD8580033912F /* PlaceholderCell.swift */; };
 		37FFC440272734C3009FFD26 /* Throttle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37FFC43F272734C3009FFD26 /* Throttle.swift */; };
 		37FFC441272734C3009FFD26 /* Throttle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37FFC43F272734C3009FFD26 /* Throttle.swift */; };
 		37FFC442272734C3009FFD26 /* Throttle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37FFC43F272734C3009FFD26 /* Throttle.swift */; };
@@ -791,6 +797,7 @@
 		37D4B1AE26729DEB00C925CA /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		37D526DD2720AC4400ED2F5E /* VideosAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideosAPI.swift; sourceTree = "<group>"; };
 		37D526E22720B4BE00ED2F5E /* View+SwipeGesture.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "View+SwipeGesture.swift"; sourceTree = "<group>"; };
+		37D6F3A027ECA1FF006FE38B /* Defaults+Workaround.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Defaults+Workaround.swift"; sourceTree = "<group>"; };
 		37D9169A27388A81002B1BAA /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 		37DD87C6271C9CFE0027CBF9 /* PlayerStreams.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayerStreams.swift; sourceTree = "<group>"; };
 		37DD9DA22785BBC900539416 /* NoCommentsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoCommentsView.swift; sourceTree = "<group>"; };
@@ -818,6 +825,7 @@
 		37FB285D272225E800A57617 /* ContentItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentItemView.swift; sourceTree = "<group>"; };
 		37FD43DB270470B70073EE42 /* InstancesSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InstancesSettings.swift; sourceTree = "<group>"; };
 		37FD43E22704847C0073EE42 /* View+Fixtures.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "View+Fixtures.swift"; sourceTree = "<group>"; };
+		37FEF11227EFD8580033912F /* PlaceholderCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlaceholderCell.swift; sourceTree = "<group>"; };
 		37FFC43F272734C3009FFD26 /* Throttle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Throttle.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -1001,6 +1009,7 @@
 				37B17D9F268A1F25006AEE9B /* VideoContextMenuView.swift */,
 				37E70922271CD43000D34DDE /* WelcomeScreen.swift */,
 				3769C02D2779F18600DDB3EA /* PlaceholderProgressView.swift */,
+				37FEF11227EFD8580033912F /* PlaceholderCell.swift */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -1257,6 +1266,7 @@
 				371AAE2826CEC7D900901972 /* Views */,
 				375168D52700FAFF008F96A6 /* Debounce.swift */,
 				372915E52687E3B900F5A35B /* Defaults.swift */,
+				37D6F3A027ECA1FF006FE38B /* Defaults+Workaround.swift */,
 				3761ABFC26F0F8DE00AA496F /* EnvironmentValues.swift */,
 				3729037D2739E47400EA99F6 /* MenuCommands.swift */,
 				37B7958F2771DAE0001CF27B /* OpenURLHandler.swift */,
@@ -2009,12 +2019,14 @@
 				37484C2526FC83E000287258 /* InstanceForm.swift in Sources */,
 				37DD9DBD2785D60300539416 /* ScrollViewMatcher.swift in Sources */,
 				37B767DB2677C3CA0098BAA8 /* PlayerModel.swift in Sources */,
+				37D6F3A127ECA1FF006FE38B /* Defaults+Workaround.swift in Sources */,
 				3788AC2726F6840700F6BAA9 /* FavoriteItemView.swift in Sources */,
 				375DFB5826F9DA010013F468 /* InstancesModel.swift in Sources */,
 				37DD9DC62785D63A00539416 /* UIResponder+Extensions.swift in Sources */,
 				37C3A24927235FAA0087A57A /* ChannelPlaylistCell.swift in Sources */,
 				373CFACB26966264003CB2C6 /* SearchQuery.swift in Sources */,
 				37141673267A8E10006CA35D /* Country.swift in Sources */,
+				37FEF11327EFD8580033912F /* PlaceholderCell.swift in Sources */,
 				37B2631A2735EAAB00FE0D40 /* FavoriteResourceObserver.swift in Sources */,
 				3748186E26A769D60084E870 /* DetailBadge.swift in Sources */,
 				376BE50B27349108009AD608 /* BrowsingSettings.swift in Sources */,
@@ -2099,6 +2111,7 @@
 				37484C3226FCB8F900287258 /* AccountValidator.swift in Sources */,
 				378AE944274EF00A006A4EE1 /* Color+Background.swift in Sources */,
 				37F49BA426CAA59B00304AC0 /* Playlist+Fixtures.swift in Sources */,
+				37D6F3A227ECA1FF006FE38B /* Defaults+Workaround.swift in Sources */,
 				37EAD870267B9ED100D9E01B /* Segment.swift in Sources */,
 				3788AC2826F6840700F6BAA9 /* FavoriteItemView.swift in Sources */,
 				378AE93A274EDFAF006A4EE1 /* Badge+Backport.swift in Sources */,
@@ -2160,6 +2173,7 @@
 				3748186726A7627F0084E870 /* Video+Fixtures.swift in Sources */,
 				3784B23E2728B85300B09468 /* ShareButton.swift in Sources */,
 				37BE0BDA26A214630092E2DB /* PlayerViewController.swift in Sources */,
+				37FEF11427EFD8580033912F /* PlaceholderCell.swift in Sources */,
 				37E64DD226D597EB00C71877 /* SubscriptionsModel.swift in Sources */,
 				374108D1272B11B2006C5CC8 /* PictureInPictureDelegate.swift in Sources */,
 				37C7A1D6267BFD9D0010EAD6 /* SponsorBlockSegment.swift in Sources */,
@@ -2379,11 +2393,13 @@
 				37CEE4C32677B697005A1EFE /* Stream.swift in Sources */,
 				37F64FE626FE70A60081B69E /* RedrawOnModifier.swift in Sources */,
 				37B2631C2735EAAB00FE0D40 /* FavoriteResourceObserver.swift in Sources */,
+				37D6F3A327ECA1FF006FE38B /* Defaults+Workaround.swift in Sources */,
 				37484C2B26FC83FF00287258 /* AccountForm.swift in Sources */,
 				37FB2860272225E800A57617 /* ContentItemView.swift in Sources */,
 				374C053727242D9F009BDDBE /* SponsorBlockSettings.swift in Sources */,
 				37C069802725C8D400F7F6CB /* CMTime+DefaultTimescale.swift in Sources */,
 				3711404126B206A6005B3555 /* SearchModel.swift in Sources */,
+				37FEF11527EFD8580033912F /* PlaceholderCell.swift in Sources */,
 				37FD43F02704A9C00073EE42 /* RecentsModel.swift in Sources */,
 				379775952689365600DD52A8 /* Array+Next.swift in Sources */,
 				3705B180267B4DFB00704544 /* TrendingCountry.swift in Sources */,
@@ -2458,7 +2474,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Open in Yattee/Open in Yattee.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 20;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -2471,7 +2487,7 @@
 					"@executable_path/../../../../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 1.3;
+				MARKETING_VERSION = 1.3.3;
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,
@@ -2492,7 +2508,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Open in Yattee/Open in Yattee.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 20;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -2505,7 +2521,7 @@
 					"@executable_path/../../../../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 1.3;
+				MARKETING_VERSION = 1.3.3;
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,
@@ -2524,7 +2540,7 @@
 			buildSettings = {
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 20;
 				DEVELOPMENT_TEAM = "";
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "Open in Yattee/Info.plist";
@@ -2536,7 +2552,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.3;
+				MARKETING_VERSION = 1.3.3;
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,
@@ -2556,7 +2572,7 @@
 			buildSettings = {
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 20;
 				DEVELOPMENT_TEAM = "";
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "Open in Yattee/Info.plist";
@@ -2568,7 +2584,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.3;
+				MARKETING_VERSION = 1.3.3;
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,
@@ -2719,14 +2735,14 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 14;
+				CURRENT_PROJECT_VERSION = 20;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = iOS/Info.plist;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
-				INFOPLIST_KEY_UIRequiresFullScreen = NO;
+				INFOPLIST_KEY_UIRequiresFullScreen = YES;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
@@ -2735,7 +2751,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.3;
+				MARKETING_VERSION = 1.3.3;
 				PRODUCT_BUNDLE_IDENTIFIER = stream.yattee.app;
 				PRODUCT_NAME = Yattee;
 				SDKROOT = iphoneos;
@@ -2751,14 +2767,14 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 14;
+				CURRENT_PROJECT_VERSION = 20;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = iOS/Info.plist;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
-				INFOPLIST_KEY_UIRequiresFullScreen = NO;
+				INFOPLIST_KEY_UIRequiresFullScreen = YES;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
@@ -2767,7 +2783,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.3;
+				MARKETING_VERSION = 1.3.3;
 				PRODUCT_BUNDLE_IDENTIFIER = stream.yattee.app;
 				PRODUCT_NAME = Yattee;
 				SDKROOT = iphoneos;
@@ -2787,7 +2803,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 14;
+				CURRENT_PROJECT_VERSION = 20;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_APP_SANDBOX = YES;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -2802,7 +2818,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 1.3;
+				MARKETING_VERSION = 1.3.3;
 				PRODUCT_BUNDLE_IDENTIFIER = stream.yattee.app;
 				PRODUCT_NAME = Yattee;
 				SDKROOT = macosx;
@@ -2820,7 +2836,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 14;
+				CURRENT_PROJECT_VERSION = 20;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_APP_SANDBOX = YES;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -2835,7 +2851,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 1.3;
+				MARKETING_VERSION = 1.3.3;
 				PRODUCT_BUNDLE_IDENTIFIER = stream.yattee.app;
 				PRODUCT_NAME = Yattee;
 				SDKROOT = macosx;
@@ -2951,7 +2967,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 14;
+				CURRENT_PROJECT_VERSION = 20;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = "";
 				ENABLE_PREVIEWS = YES;
@@ -2966,7 +2982,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.3;
+				MARKETING_VERSION = 1.3.3;
 				PRODUCT_BUNDLE_IDENTIFIER = stream.yattee.app;
 				PRODUCT_NAME = Yattee;
 				SDKROOT = appletvos;
@@ -2983,7 +2999,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 14;
+				CURRENT_PROJECT_VERSION = 20;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = "";
 				ENABLE_PREVIEWS = YES;
@@ -2998,7 +3014,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.3;
+				MARKETING_VERSION = 1.3.3;
 				PRODUCT_BUNDLE_IDENTIFIER = stream.yattee.app;
 				PRODUCT_NAME = Yattee;
 				SDKROOT = appletvos;

Yattee.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,133 +1,131 @@
 {
-  "object": {
-    "pins": [
-      {
-        "package": "Alamofire",
-        "repositoryURL": "https://github.com/Alamofire/Alamofire.git",
-        "state": {
-          "branch": null,
-          "revision": "f82c23a8a7ef8dc1a49a8bfc6a96883e79121864",
-          "version": "5.5.0"
-        }
-      },
-      {
-        "package": "Defaults",
-        "repositoryURL": "https://github.com/sindresorhus/Defaults",
-        "state": {
-          "branch": null,
-          "revision": "55f3302c3ab30a8760f10042d0ebc0a6907f865a",
-          "version": "6.1.0"
-        }
-      },
-      {
-        "package": "libwebp",
-        "repositoryURL": "https://github.com/SDWebImage/libwebp-Xcode.git",
-        "state": {
-          "branch": null,
-          "revision": "2b3b43faaef54d1b897482428428357b7f7cd08b",
-          "version": "1.2.1"
-        }
-      },
-      {
-        "package": "PINCache",
-        "repositoryURL": "https://github.com/pinterest/PINCache",
-        "state": {
-          "branch": "master",
-          "revision": "9ca06045b5aff12ee8c0ef5880aa8469c4896144",
-          "version": null
-        }
-      },
-      {
-        "package": "PINOperation",
-        "repositoryURL": "https://github.com/pinterest/PINOperation.git",
-        "state": {
-          "branch": null,
-          "revision": "44d8ca154a4e75a028a5548c31ff3a53b90cef15",
-          "version": "1.2.1"
-        }
-      },
-      {
-        "package": "SDWebImage",
-        "repositoryURL": "https://github.com/SDWebImage/SDWebImage.git",
-        "state": {
-          "branch": null,
-          "revision": "0fff0d7505b5306348263ea64fcc561253bbeb21",
-          "version": "5.12.2"
-        }
-      },
-      {
-        "package": "SDWebImagePINPlugin",
-        "repositoryURL": "https://github.com/SDWebImage/SDWebImagePINPlugin.git",
-        "state": {
-          "branch": null,
-          "revision": "bd73a4fb30352ec311303d811559c9c46df4caa4",
-          "version": "0.3.0"
-        }
-      },
-      {
-        "package": "SDWebImageSwiftUI",
-        "repositoryURL": "https://github.com/SDWebImage/SDWebImageSwiftUI.git",
-        "state": {
-          "branch": null,
-          "revision": "cd8625b7cf11a97698e180d28bb7d5d357196678",
-          "version": "2.0.2"
-        }
-      },
-      {
-        "package": "SDWebImageWebPCoder",
-        "repositoryURL": "https://github.com/SDWebImage/SDWebImageWebPCoder.git",
-        "state": {
-          "branch": null,
-          "revision": "95a6838df13bc08d8064cf7e048b787b6e52348d",
-          "version": "0.8.4"
-        }
-      },
-      {
-        "package": "Siesta",
-        "repositoryURL": "https://github.com/bustoutsolutions/siesta",
-        "state": {
-          "branch": null,
-          "revision": "43f34046ebb5beb6802200353c473af303bbc31e",
-          "version": "1.5.2"
-        }
-      },
-      {
-        "package": "Sparkle",
-        "repositoryURL": "https://github.com/sparkle-project/Sparkle",
-        "state": {
-          "branch": "2.x",
-          "revision": "71fc8d7b1182d24879edacefccb06151e99c34fe",
-          "version": null
-        }
-      },
-      {
-        "package": "swift-log",
-        "repositoryURL": "https://github.com/apple/swift-log.git",
-        "state": {
-          "branch": null,
-          "revision": "5d66f7ba25daf4f94100e7022febf3c75e37a6c7",
-          "version": "1.4.2"
-        }
-      },
-      {
-        "package": "Introspect",
-        "repositoryURL": "https://github.com/siteline/SwiftUI-Introspect.git",
-        "state": {
-          "branch": null,
-          "revision": "2e09be8af614401bc9f87d40093ec19ce56ccaf2",
-          "version": "0.1.3"
-        }
-      },
-      {
-        "package": "SwiftyJSON",
-        "repositoryURL": "https://github.com/SwiftyJSON/SwiftyJSON.git",
-        "state": {
-          "branch": null,
-          "revision": "b3dcd7dbd0d488e1a7077cb33b00f2083e382f07",
-          "version": "5.0.1"
-        }
+  "pins" : [
+    {
+      "identity" : "alamofire",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/Alamofire/Alamofire.git",
+      "state" : {
+        "revision" : "f82c23a8a7ef8dc1a49a8bfc6a96883e79121864",
+        "version" : "5.5.0"
       }
-    ]
-  },
-  "version": 1
+    },
+    {
+      "identity" : "defaults",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/sindresorhus/Defaults",
+      "state" : {
+        "revision" : "119f654d44f7b90f00dc11f7dd1c94a36f12576b",
+        "version" : "6.2.1"
+      }
+    },
+    {
+      "identity" : "libwebp-xcode",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/SDWebImage/libwebp-Xcode.git",
+      "state" : {
+        "revision" : "2b3b43faaef54d1b897482428428357b7f7cd08b",
+        "version" : "1.2.1"
+      }
+    },
+    {
+      "identity" : "pincache",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pinterest/PINCache",
+      "state" : {
+        "branch" : "master",
+        "revision" : "9ca06045b5aff12ee8c0ef5880aa8469c4896144"
+      }
+    },
+    {
+      "identity" : "pinoperation",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pinterest/PINOperation.git",
+      "state" : {
+        "revision" : "44d8ca154a4e75a028a5548c31ff3a53b90cef15",
+        "version" : "1.2.1"
+      }
+    },
+    {
+      "identity" : "sdwebimage",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/SDWebImage/SDWebImage.git",
+      "state" : {
+        "revision" : "2e63d0061da449ad0ed130768d05dceb1496de44",
+        "version" : "5.12.5"
+      }
+    },
+    {
+      "identity" : "sdwebimagepinplugin",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/SDWebImage/SDWebImagePINPlugin.git",
+      "state" : {
+        "revision" : "bd73a4fb30352ec311303d811559c9c46df4caa4",
+        "version" : "0.3.0"
+      }
+    },
+    {
+      "identity" : "sdwebimageswiftui",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/SDWebImage/SDWebImageSwiftUI.git",
+      "state" : {
+        "revision" : "cd8625b7cf11a97698e180d28bb7d5d357196678",
+        "version" : "2.0.2"
+      }
+    },
+    {
+      "identity" : "sdwebimagewebpcoder",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/SDWebImage/SDWebImageWebPCoder.git",
+      "state" : {
+        "revision" : "95a6838df13bc08d8064cf7e048b787b6e52348d",
+        "version" : "0.8.4"
+      }
+    },
+    {
+      "identity" : "siesta",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/bustoutsolutions/siesta",
+      "state" : {
+        "revision" : "43f34046ebb5beb6802200353c473af303bbc31e",
+        "version" : "1.5.2"
+      }
+    },
+    {
+      "identity" : "sparkle",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/sparkle-project/Sparkle",
+      "state" : {
+        "branch" : "2.x",
+        "revision" : "f250bead4b943ef9711c61274a1f52e380afa0e8"
+      }
+    },
+    {
+      "identity" : "swift-log",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-log.git",
+      "state" : {
+        "revision" : "5d66f7ba25daf4f94100e7022febf3c75e37a6c7",
+        "version" : "1.4.2"
+      }
+    },
+    {
+      "identity" : "swiftui-introspect",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/siteline/SwiftUI-Introspect.git",
+      "state" : {
+        "revision" : "f2616860a41f9d9932da412a8978fec79c06fe24",
+        "version" : "0.1.4"
+      }
+    },
+    {
+      "identity" : "swiftyjson",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/SwiftyJSON/SwiftyJSON.git",
+      "state" : {
+        "revision" : "b3dcd7dbd0d488e1a7077cb33b00f2083e382f07",
+        "version" : "5.0.1"
+      }
+    }
+  ],
+  "version" : 2
 }

tvOS/NowPlayingView.swift

@@ -20,6 +20,7 @@ struct NowPlayingView: View {
     @EnvironmentObject<RecentsModel> private var recents
 
     @Default(.saveHistory) private var saveHistory
+    @Default(.showHistoryInPlayer) private var showHistoryInPlayer
 
     var body: some View {
         if inInfoViewController {
@@ -102,7 +103,7 @@ struct NowPlayingView: View {
                     }
                 }
 
-                if sections.contains(.playedPreviously), saveHistory, !visibleWatches.isEmpty {
+                if sections.contains(.playedPreviously), saveHistory, showHistoryInPlayer, !visibleWatches.isEmpty {
                     Section(header: Text("Played Previously")) {
                         ForEach(visibleWatches, id: \.videoID) { watch in
                             Button {