Fix method and property access

This reverts commit c6cff4dee4.

CHANGELOG.md

@@ -1,4 +1,33 @@
-## Build 151
+## Build 155
+* Fixed reported crashes
+* Minor performance improvements
+
+## Previous Builds
+* Fixed issue where AVPlayer would pause playing on exiting fullscreen
+* Fixed issue with empty button appearing on subscriptions list on tvOS
+
+* Fixed issue with AVPlayer not always using full width
+* Fixed issue with layout when switching backend while in fullscreen
+* Fixed issue with updating watched time on closing video
+* Fixed issue with adjusting AVPlayer playback rate when using system controls
+* Fixed issue where comments would load indefinitely
+* Improved Home buttons layout on tvOS
+* Reverted change to placeholders as were causing issues to properly display loading status, will be revisited in future
+* Fixed performance issue with swiping back to subscribed channels list
+* Fixed reported crashes
+
+* Tapping second time on search tab button focuses the input field and selects entered query text (iOS)
+* Added Browsing setting "Keep channels with unwatched videos on top of subscriptions list"
+* Improved buttons and layout on tvOS
+* Fixed issue with trending categories (Invidious) not working when using non-English language
+* Fixed issue with search query suggestions not being displayed properly in some languages
+* Changed subscriptions page picker label from icon to text
+* Views will display information if there is no videos to show instead of always showing placeholders
+* Fixed AVPlayer issue with music mode playing video track
+* Added remove context menu option for all types of recent items in Search
+* Added advanced setting "Show video context menu options to force selected backend"
+* Fixed reported crashes
+
 * Improved Home
   - Added menu with view options on iOS and toolbar buttons on macOS/tvOS
   - Added Home Settings
@@ -20,9 +49,7 @@
 * Fixed issue with playlists view showing duplicated buttons when "Show cache status" is enabled
 * Fixed issue where navigating to channel from list view in Playlists and Search would immediately go back
 * Fixed issue where first URL would fail to open
-* Other minor fixes and improvements
 
-## Previous Builds
 * Added support for AVPlayer native system controls on iOS and macOS
   - Use system features such as AirPlay, subtitles switching (Piped with HLS), text detection and copy and more
   - Added Controls setting: "Use system controls with AVPlayer"

Extensions/String+ReplacingHTMLEntities.swift

@@ -0,0 +1,14 @@
+import Foundation
+
+extension String {
+    var replacingHTMLEntities: String {
+        do {
+            return try NSAttributedString(data: Data(utf8), options: [
+                .documentType: NSAttributedString.DocumentType.html,
+                .characterEncoding: String.Encoding.utf8.rawValue
+            ], documentAttributes: nil).string
+        } catch {
+            return self
+        }
+    }
+}

Model/Accounts/Account.swift

@@ -53,7 +53,7 @@ struct Account: Defaults.Serializable, Hashable, Identifiable {
     }
 
     var instance: Instance! {
-        Defaults[.instances].first { $0.id == instanceID } ?? Instance(app: app ?? .invidious, name: urlString, apiURLString: urlString)
+        InstancesModel.shared.find(instanceID) ?? Instance(app: app ?? .invidious, name: urlString, apiURLString: urlString)
     }
 
     var isPublic: Bool {

Model/Applications/InvidiousAPI.swift

@@ -79,7 +79,7 @@ final class InvidiousAPI: Service, ObservableObject, VideosAPI {
 
         configureTransformer(pathPattern("search/suggestions"), requestMethods: [.get]) { (content: Entity<JSON>) -> [String] in
             if let suggestions = content.json.dictionaryValue["suggestions"] {
-                return suggestions.arrayValue.map(String.init)
+                return suggestions.arrayValue.map { $0.stringValue.replacingHTMLEntities }
             }
 
             return []
@@ -236,7 +236,7 @@ final class InvidiousAPI: Service, ObservableObject, VideosAPI {
 
     func trending(country: Country, category: TrendingCategory?) -> Resource {
         resource(baseURL: account.url, path: "\(Self.basePath)/trending")
-            .withParam("type", category?.name)
+            .withParam("type", category?.type)
             .withParam("region", country.rawValue)
     }
 

Model/Cache/SubscribedChannelsModel.swift

@@ -23,6 +23,7 @@ final class SubscribedChannelsModel: ObservableObject, CacheModel {
     @Published var error: RequestError?
 
     var accounts: AccountsModel { .shared }
+    var unwatchedFeedCount: UnwatchedFeedCountModel { .shared }
 
     var resource: Resource? {
         accounts.api.subscriptions
@@ -32,6 +33,19 @@ final class SubscribedChannelsModel: ObservableObject, CacheModel {
         channels.sorted { $0.name.lowercased() < $1.name.lowercased() }
     }
 
+    var allByUnwatchedCount: [Channel] {
+        if let account = accounts.current {
+            return all.sorted { c1, c2 in
+                let c1HasUnwatched = (unwatchedFeedCount.unwatchedByChannel[account]?[c1.id] ?? -1) > 0
+                let c2HasUnwatched = (unwatchedFeedCount.unwatchedByChannel[account]?[c2.id] ?? -1) > 0
+                let nameIncreasing = c1.name.lowercased() < c2.name.lowercased()
+
+                return c1HasUnwatched ? (c2HasUnwatched ? nameIncreasing : true) : (c2HasUnwatched ? false : nameIncreasing)
+            }
+        }
+        return all
+    }
+
     func subscribe(_ channelID: String, onSuccess: @escaping () -> Void = {}) {
         accounts.api.subscribe(channelID) {
             self.scheduleLoad(onSuccess: onSuccess)
@@ -54,15 +68,14 @@ final class SubscribedChannelsModel: ObservableObject, CacheModel {
             return
         }
 
-        loadCachedChannels(account)
-
         DispatchQueue.main.async { [weak self] in
             guard let self else { return }
             let request = force ? self.resource?.load() : self.resource?.loadIfNeeded()
+            guard request != nil else { return }
 
-            if request != nil {
-                self.isLoading = true
-            }
+            self.loadCachedChannels(account)
+
+            self.isLoading = true
 
             request?
                 .onCompletion { [weak self] _ in

Model/CommentsModel.swift

@@ -69,6 +69,7 @@ final class CommentsModel: ObservableObject {
     }
 
     func loadNextPage() {
+        guard nextPageAvailable else { return }
         load(page: nextPage)
     }
 

Model/HistoryModel.swift

@@ -46,11 +46,11 @@ extension PlayerModel {
             }
     }
 
-    func updateWatch(finished: Bool = false) {
+    func updateWatch(finished: Bool = false, time: CMTime? = nil) {
         guard let currentVideo, saveHistory else { return }
 
         let id = currentVideo.videoID
-        let time = backend.currentTime
+        let time = time ?? backend.currentTime
         let seconds = time?.seconds ?? 0
         let duration = playerTime.duration.seconds
         if seconds < 3 {
@@ -63,7 +63,7 @@ extension PlayerModel {
         let results = try? backgroundContext.fetch(watchFetchRequest)
 
         backgroundContext.perform { [weak self] in
-            guard let self, finished || self.backend.isPlaying else {
+            guard let self, finished || time != nil || self.backend.isPlaying else {
                 return
             }
 

Model/NavigationModel.swift

@@ -63,7 +63,9 @@ final class NavigationModel: ObservableObject {
         }
     }
 
-    @Published var tabSelection: TabSelection!
+    @Published var tabSelection: TabSelection! { didSet {
+        if oldValue == tabSelection { multipleTapHandler() }
+    }}
 
     @Published var presentingAddToPlaylist = false
     @Published var videoToAddToPlaylist: Video!
@@ -295,6 +297,15 @@ final class NavigationModel: ObservableObject {
         channelPresentedInSheet = channel
         presentingChannelSheet = true
     }
+
+    func multipleTapHandler() {
+        switch tabSelection {
+        case .search:
+            self.search.focused = true
+        default:
+            print("not implemented")
+        }
+    }
 }
 
 typealias TabSelection = NavigationModel.TabSelection

Model/Player/Backends/AVPlayerBackend.swift

@@ -333,6 +333,10 @@ final class AVPlayerBackend: PlayerBackend {
                     return
                 }
 
+                if self.model.musicMode {
+                    self.startMusicMode()
+                }
+
                 if !preservingTime,
                    !self.model.transitioningToPiP,
                    let segment = self.model.sponsorBlock.segments.first,
@@ -349,9 +353,11 @@ final class AVPlayerBackend: PlayerBackend {
                         }
 
                         self.model.lastSkipped = segment
+                        self.model.handleOnPlayStream(stream)
                         self.model.play()
                     }
                 } else {
+                    self.model.handleOnPlayStream(stream)
                     self.model.play()
                 }
             }
@@ -482,7 +488,9 @@ final class AVPlayerBackend: PlayerBackend {
                 if self.model.activeBackend == .appleAVPlayer,
                    self.isAutoplaying(playerItem)
                 {
-                    self.model.updateAspectRatio()
+                    if self.model.aspectRatio != self.aspectRatio {
+                        self.model.updateAspectRatio()
+                    }
 
                     if self.startPictureInPictureOnPlay,
                        let controller = self.model.pipController,
@@ -604,7 +612,7 @@ final class AVPlayerBackend: PlayerBackend {
             }
 
             self.timeObserverThrottle.execute {
-                self.model.updateWatch()
+                self.model.updateWatch(time: self.currentTime)
             }
         }
     }
@@ -634,8 +642,18 @@ final class AVPlayerBackend: PlayerBackend {
 
             if player.timeControlStatus == .playing {
                 self.model.objectWillChange.send()
-                if player.rate != Float(self.model.currentRate) {
-                    player.rate = Float(self.model.currentRate)
+
+                if let rate = self.model.rateToRestore, player.rate != rate {
+                    player.rate = rate
+                    self.model.rateToRestore = nil
+                }
+
+                if player.rate > 0, player.rate != Float(self.model.currentRate) {
+                    if self.model.avPlayerUsesSystemControls {
+                        self.model.currentRate = Double(player.rate)
+                    } else {
+                        player.rate = Float(self.model.currentRate)
+                    }
                 }
             }
 
@@ -648,7 +666,7 @@ final class AVPlayerBackend: PlayerBackend {
             #endif
 
             self.timeObserverThrottle.execute {
-                self.model.updateWatch()
+                self.model.updateWatch(time: self.currentTime)
             }
         }
     }
@@ -704,6 +722,17 @@ final class AVPlayerBackend: PlayerBackend {
         } else {
             stopMusicMode()
         }
+
+        #if os(iOS)
+            if model.playingFullScreen {
+                ControlOverlaysModel.shared.hide()
+                model.navigation.presentingPlaybackSettings = false
+
+                model.onPlayStream.append { _ in
+                    self.controller.enterFullScreen(animated: true)
+                }
+            }
+        #endif
     }
 
     var isStartingPiP: Bool {

Model/Player/Backends/MPVBackend.swift

@@ -267,9 +267,11 @@ final class MPVBackend: PlayerBackend {
 
                         self.model.lastSkipped = segment
                         self.play()
+                        self.model.handleOnPlayStream(stream)
                     }
                 } else {
                     self.play()
+                    self.model.handleOnPlayStream(stream)
                 }
             }
         }
@@ -423,7 +425,7 @@ final class MPVBackend: PlayerBackend {
         }
 
         timeObserverThrottle.execute {
-            self.model.updateWatch()
+            self.model.updateWatch(time: self.currentTime)
         }
     }
 

Model/Player/PlayerModel.swift

@@ -55,6 +55,7 @@ final class PlayerModel: ObservableObject {
 
     @Published var presentingPlayer = false { didSet { handlePresentationChange() } }
     @Published var activeBackend = PlayerBackendType.mpv
+    @Published var forceBackendOnPlay: PlayerBackendType?
 
     var avPlayerBackend = AVPlayerBackend()
     var mpvBackend = MPVBackend()
@@ -181,6 +182,8 @@ final class PlayerModel: ObservableObject {
     private var currentArtwork: MPMediaItemArtwork?
 
     var onPresentPlayer = [() -> Void]()
+    var onPlayStream = [(Stream) -> Void]()
+    var rateToRestore: Float?
     private var remoteCommandCenterConfigured = false
 
     init() {
@@ -235,16 +238,11 @@ final class PlayerModel: ObservableObject {
         }
 
         DispatchQueue.main.async { [weak self] in
-            self?.exitFullScreen(showControls: false)
+            Delay.by(0.3) {
+                self?.exitFullScreen(showControls: false)
+            }
         }
 
-        #if os(iOS)
-            if Defaults[.lockPortraitWhenBrowsing] {
-                Orientation.lockOrientation(.portrait, andRotateTo: .portrait)
-            } else {
-                Orientation.lockOrientation(.allButUpsideDown)
-            }
-        #endif
         #if os(macOS)
             Windows.player.hide()
         #endif
@@ -387,7 +385,7 @@ final class PlayerModel: ObservableObject {
         if !upgrading, !video.isLocal {
             resetSegments()
 
-            DispatchQueue.global(qos: .userInitiated).async { [weak self] in
+            DispatchQueue.main.async { [weak self] in
                 self?.sponsorBlock.loadSegments(
                     videoID: video.videoID,
                     categories: Defaults[.sponsorBlockCategories]
@@ -407,19 +405,19 @@ final class PlayerModel: ObservableObject {
             resetSegments()
         }
 
-        DispatchQueue.global(qos: .userInitiated).asyncAfter(deadline: .now() + 0.25) {
-            (withBackend ?? self.backend).playStream(
-                stream,
-                of: video,
-                preservingTime: preservingTime,
-                upgrading: upgrading
-            )
+        (withBackend ?? backend).playStream(
+            stream,
+            of: video,
+            preservingTime: preservingTime,
+            upgrading: upgrading
+        )
+
+        DispatchQueue.main.async {
+            self.forceBackendOnPlay = nil
         }
 
         if !upgrading {
-            DispatchQueue.global(qos: .userInitiated).asyncAfter(deadline: .now() + 0.5) {
-                self.updateCurrentArtwork()
-            }
+            updateCurrentArtwork()
         }
     }
 
@@ -452,7 +450,7 @@ final class PlayerModel: ObservableObject {
             return
         }
 
-        if let backend = (live && forceAVPlayerForLiveStreams) ? PlayerBackendType.appleAVPlayer : qualityProfile?.backend,
+        if let backend = forceBackendOnPlay ?? ((live && forceAVPlayerForLiveStreams) ? PlayerBackendType.appleAVPlayer : qualityProfile?.backend),
            backend != activeBackend,
            backend == .appleAVPlayer || !(avPlayerBackend.startPictureInPictureOnPlay || playingInPictureInPicture)
         {
@@ -545,6 +543,9 @@ final class PlayerModel: ObservableObject {
         if !self.backend.canPlayAtRate(currentRate) {
             currentRate = self.backend.suggestedPlaybackRates.last { $0 < currentRate } ?? 1.0
         }
+
+        self.rateToRestore = Float(currentRate)
+
         self.backend.didChangeTo()
 
         if wasPlaying {
@@ -621,17 +622,20 @@ final class PlayerModel: ObservableObject {
     func closeCurrentItem(finished: Bool = false) {
         pause()
         videoBeingOpened = nil
+        advancing = false
+        forceBackendOnPlay = nil
 
         closing = true
         controls.presentingControls = false
 
+        self.prepareCurrentItemForHistory(finished: finished)
+
         self.hide()
 
         Delay.by(0.8) { [weak self] in
             guard let self else { return }
             self.closePiP()
 
-            self.prepareCurrentItemForHistory(finished: finished)
             withAnimation {
                 self.currentItem = nil
             }
@@ -1080,7 +1084,9 @@ final class PlayerModel: ObservableObject {
 
             DispatchQueue.main.async { [weak self] in
                 guard let self else { return }
-                self.aspectRatio = self.backend.aspectRatio
+                withAnimation {
+                    self.aspectRatio = self.backend.aspectRatio
+                }
             }
         #endif
     }
@@ -1095,4 +1101,11 @@ final class PlayerModel: ObservableObject {
         guard let videoWidth = backend?.videoWidth, let videoHeight = backend?.videoHeight else { return "unknown" }
         return "\(String(format: "%.2f", videoWidth))\u{d7}\(String(format: "%.2f", videoHeight))"
     }
+
+    func handleOnPlayStream(_ stream: Stream) {
+        backend.setRate(currentRate)
+
+        onPlayStream.forEach { $0(stream) }
+        onPlayStream.removeAll()
+    }
 }

Model/Player/PlayerQueue.swift

@@ -257,7 +257,7 @@ extension PlayerModel {
                 if let video = currentVideo, !historyVideos.contains(where: { $0 == video }) {
                     historyVideos.append(video)
                 }
-                updateWatch(finished: finished)
+                updateWatch(finished: finished, time: backend.currentTime)
             }
 
             if let video = currentItem.video,
@@ -364,10 +364,7 @@ extension PlayerModel {
                 message: Text(message),
                 primaryButton: .cancel { [weak self] in
                     guard let self else { return }
-                    self.advancing = false
-                    self.videoBeingOpened = nil
-                    self.currentItem = nil
-                    self.hide()
+                    self.closeCurrentItem()
                 },
                 secondaryButton: retryButton
             )

Model/RecentsModel.swift

@@ -39,7 +39,9 @@ final class RecentsModel: ObservableObject {
 
     func addQuery(_ query: String) {
         if !query.isEmpty {
-            NavigationModel.shared.tabSelection = .search
+            if NavigationModel.shared.tabSelection != .search {
+                NavigationModel.shared.tabSelection = .search
+            }
             add(.init(from: query))
         }
     }

Model/Search/SearchModel.swift

@@ -16,9 +16,23 @@ final class SearchModel: ObservableObject {
     @Published var querySuggestions = [String]()
     private var suggestionsDebouncer = Debouncer(.milliseconds(200))
 
+    @Published var focused = false
+
     var accounts: AccountsModel { .shared }
     private var resource: Resource!
 
+    init() {
+        #if os(iOS)
+            addKeyboardDidHideNotificationObserver()
+        #endif
+    }
+
+    deinit {
+        #if os(iOS)
+            removeKeyboardDidHideNotificationObserver()
+        #endif
+    }
+
     var isLoading: Bool {
         resource?.isLoading ?? false
     }
@@ -136,4 +150,18 @@ final class SearchModel: ObservableObject {
                 }
             }
     }
+
+    #if os(iOS)
+        private func addKeyboardDidHideNotificationObserver() {
+            NotificationCenter.default.addObserver(self, selector: #selector(onKeyboardDidHide), name: UIResponder.keyboardDidHideNotification, object: nil)
+        }
+
+        @objc func onKeyboardDidHide() {
+            focused = false
+        }
+
+        private func removeKeyboardDidHideNotificationObserver() {
+            NotificationCenter.default.removeObserver(self, name: UIResponder.keyboardDidHideNotification, object: nil)
+        }
+    #endif
 }

Model/SponsorBlock/SponsorBlockAPI.swift

@@ -75,7 +75,7 @@ final class SponsorBlockAPI: ObservableObject {
 
         self.videoID = videoID
 
-        DispatchQueue.global(qos: .userInitiated).async { [weak self] in
+        DispatchQueue.main.async { [weak self] in
             self?.requestSegments(categories: categories, completionHandler: completionHandler)
         }
     }

Model/TrendingCategory.swift

@@ -41,4 +41,8 @@ enum TrendingCategory: String, CaseIterable, Identifiable, Defaults.Serializable
     var controlLabel: String {
         id == "default" ? "All".localized() : title
     }
+
+    var type: String {
+        rawValue.capitalized
+    }
 }

Shared/Channels/ChannelPlaylistView.swift

@@ -3,7 +3,7 @@ import Siesta
 import SwiftUI
 
 struct ChannelPlaylistView: View {
-    var playlist: ChannelPlaylist?
+    var playlist: ChannelPlaylist
     var showCloseButton = false
 
     @StateObject private var store = Store<ChannelPlaylist>()
@@ -19,15 +19,7 @@ struct ChannelPlaylistView: View {
         ContentItem.array(of: store.item?.videos ?? [])
     }
 
-    private var presentedPlaylist: ChannelPlaylist? {
-        playlist ?? recents.presentedPlaylist
-    }
-
     private var resource: Resource? {
-        guard let playlist = presentedPlaylist else {
-            return nil
-        }
-
         let resource = accounts.api.channelPlaylist(playlist.id)
         resource?.addObserver(store)
 
@@ -38,21 +30,19 @@ struct ChannelPlaylistView: View {
         VStack(alignment: .leading) {
             #if os(tvOS)
                 HStack {
-                    if let playlist = presentedPlaylist {
-                        ThumbnailView(url: store.item?.thumbnailURL ?? playlist.thumbnailURL)
-                            .frame(width: 140, height: 80)
-                            .clipShape(RoundedRectangle(cornerRadius: 2))
+                    ThumbnailView(url: store.item?.thumbnailURL ?? playlist.thumbnailURL)
+                        .frame(width: 140, height: 80)
+                        .clipShape(RoundedRectangle(cornerRadius: 2))
 
-                        Text(playlist.title)
-                            .font(.headline)
-                            .frame(alignment: .leading)
-                            .lineLimit(1)
+                    Text(playlist.title)
+                        .font(.headline)
+                        .frame(alignment: .leading)
+                        .lineLimit(1)
 
-                        Spacer()
+                    Spacer()
 
-                        FavoriteButton(item: FavoriteItem(section: .channelPlaylist(accounts.app.appType.rawValue, playlist.id, playlist.title)))
-                            .labelStyle(.iconOnly)
-                    }
+                    FavoriteButton(item: FavoriteItem(section: .channelPlaylist(accounts.app.appType.rawValue, playlist.id, playlist.title)))
+                        .labelStyle(.iconOnly)
 
                     playButtons
                         .labelStyle(.iconOnly)
@@ -63,9 +53,7 @@ struct ChannelPlaylistView: View {
         }
         .environment(\.listingStyle, channelPlaylistListingStyle)
         .onAppear {
-            if let playlist = presentedPlaylist,
-               let cache = ChannelPlaylistsCacheModel.shared.retrievePlaylist(playlist)
-            {
+            if let cache = ChannelPlaylistsCacheModel.shared.retrievePlaylist(playlist) {
                 store.replace(cache)
             }
             resource?.loadIfNeeded()?.onSuccess { response in
@@ -111,14 +99,12 @@ struct ChannelPlaylistView: View {
                 }
             }
         }
-        .navigationTitle(label)
+        .navigationTitle(playlist.title)
         #endif
     }
 
     @ViewBuilder private var favoriteButton: some View {
-        if let playlist = presentedPlaylist {
-            FavoriteButton(item: FavoriteItem(section: .channelPlaylist(accounts.app.appType.rawValue, playlist.id, playlist.title)))
-        }
+        FavoriteButton(item: FavoriteItem(section: .channelPlaylist(accounts.app.appType.rawValue, playlist.id, playlist.title)))
     }
 
     #if os(iOS)
@@ -140,13 +126,13 @@ struct ChannelPlaylistView: View {
                 }
             } label: {
                 HStack(spacing: 12) {
-                    if let url = store.item?.thumbnailURL ?? playlist?.thumbnailURL {
+                    if let url = store.item?.thumbnailURL ?? playlist.thumbnailURL {
                         ThumbnailView(url: url)
                             .frame(width: 60, height: 30)
                             .clipShape(RoundedRectangle(cornerRadius: 2))
                     }
 
-                    Text(label)
+                    Text(playlist.title)
                         .font(.headline)
                         .foregroundColor(.primary)
 
@@ -160,10 +146,6 @@ struct ChannelPlaylistView: View {
         }
     #endif
 
-    private var label: String {
-        presentedPlaylist?.title ?? ""
-    }
-
     private var playlistButtonsPlacement: ToolbarItemPlacement {
         #if os(iOS)
             .navigationBarTrailing

Shared/Channels/ChannelVideosView.swift

@@ -4,7 +4,7 @@ import Siesta
 import SwiftUI
 
 struct ChannelVideosView: View {
-    var channel: Channel?
+    var channel: Channel
     var showCloseButton = false
     var inNavigationView = true
 
@@ -32,7 +32,7 @@ struct ChannelVideosView: View {
     @Default(.expandChannelDescription) private var expandChannelDescription
 
     var presentedChannel: Channel? {
-        store.item?.channel ?? channel ?? recents.presentedChannel
+        store.item?.channel ?? channel
     }
 
     var contentItems: [ContentItem] {
@@ -165,10 +165,7 @@ struct ChannelVideosView: View {
         .onAppear {
             descriptionExpanded = expandChannelDescription
 
-            if let channel,
-               let cache = ChannelsCacheModel.shared.retrieve(channel.cacheKey),
-               store.item.isNil
-            {
+            if let cache = ChannelsCacheModel.shared.retrieve(channel.cacheKey), store.item.isNil {
                 store.replace(cache)
             }
 

Shared/Defaults.swift

@@ -51,6 +51,7 @@ extension Defaults.Keys {
         static let lockPortraitWhenBrowsing = Key<Bool>("lockPortraitWhenBrowsing", default: UIDevice.current.userInterfaceIdiom == .phone)
     #endif
     static let showUnwatchedFeedBadges = Key<Bool>("showUnwatchedFeedBadges", default: false)
+    static let keepChannelsWithUnwatchedFeedOnTop = Key<Bool>("keepChannelsWithUnwatchedFeedOnTop", default: true)
     static let showToggleWatchedStatusButton = Key<Bool>("showToggleWatchedStatusButton", default: false)
     static let expandChannelDescription = Key<Bool>("expandChannelDescription", default: false)
     static let channelOnThumbnail = Key<Bool>("channelOnThumbnail", default: false)
@@ -197,6 +198,7 @@ extension Defaults.Keys {
     #endif
 
     static let showMPVPlaybackStats = Key<Bool>("showMPVPlaybackStats", default: false)
+    static let showPlayNowInBackendContextMenu = Key<Bool>("showPlayNowInBackendContextMenu", default: false)
 
     #if os(macOS)
         static let playerDetailsPageButtonLabelStyleDefault = ButtonLabelStyle.iconAndText

Shared/Home/FavoriteItemView.swift

@@ -23,6 +23,7 @@ struct FavoriteItemView: View {
     @Default(.hideShorts) private var hideShorts
     @Default(.hideWatched) private var hideWatched
     @Default(.widgetsSettings) private var widgetsSettings
+    @Default(.visibleSections) private var visibleSections
 
     init(item: FavoriteItem) {
         self.item = item
@@ -72,7 +73,7 @@ struct FavoriteItemView: View {
                                 #if os(tvOS)
                                     .padding(.leading, 40)
                                 #else
-                                    .padding(.leading, 15)
+                                    .padding(.horizontal, 15)
                                 #endif
                             }
                         }
@@ -203,7 +204,8 @@ struct FavoriteItemView: View {
     }
 
     func watch(_ item: ContentItem) -> Watch? {
-        watches.first { $0.videoID == item.video.videoID }
+        guard let id = item.video?.videoID else { return nil }
+        return watches.first { $0.videoID == id }
     }
 
     var widgetListingStyle: WidgetListingStyle {
@@ -285,7 +287,18 @@ struct FavoriteItemView: View {
     }
 
     var navigatableItem: Bool {
-        item.section != .history
+        switch item.section {
+        case .history:
+            return false
+        case .trending:
+            return visibleSections.contains(.trending)
+        case .subscriptions:
+            return visibleSections.contains(.subscriptions) && accounts.signedIn
+        case .popular:
+            return visibleSections.contains(.popular) && accounts.app.supportsPopular
+        default:
+            return true
+        }
     }
 
     var inChannelView: Bool {
@@ -321,7 +334,9 @@ struct FavoriteItemView: View {
             itemLabel
                 .foregroundColor(.accentColor)
         }
+        #if !os(tvOS)
         .buttonStyle(.plain)
+        #endif
     }
 
     var itemNavigationLink: some View {

Shared/Home/HomeView.swift

@@ -32,23 +32,8 @@ struct HomeView: View {
     var body: some View {
         ScrollView(.vertical, showsIndicators: false) {
             VStack {
-                HStack {
-                    #if os(tvOS)
-                        Group {
-                            if showOpenActionsInHome {
-                                AccentButton(text: "Open Video", imageSystemName: "globe") {
-                                    NavigationModel.shared.presentingOpenVideos = true
-                                }
-                            }
-                            AccentButton(text: "Locations", imageSystemName: "globe") {
-                                NavigationModel.shared.presentingAccounts = true
-                            }
-
-                            AccentButton(text: "Settings", imageSystemName: "gear") {
-                                NavigationModel.shared.presentingSettings = true
-                            }
-                        }
-                    #else
+                #if !os(tvOS)
+                    HStack {
                         if showOpenActionsInHome {
                             AccentButton(text: "Files", imageSystemName: "folder") {
                                 NavigationModel.shared.presentingFileImporter = true
@@ -61,16 +46,36 @@ struct HomeView: View {
                             }
                             .frame(maxWidth: 40)
                         }
-                    #endif
-                }
+                    }
+                #endif
 
                 #if os(tvOS)
                     HStack {
+                        if showOpenActionsInHome {
+                            Button {
+                                NavigationModel.shared.presentingOpenVideos = true
+                            } label: {
+                                Label("Open Video", systemImage: "globe")
+                            }
+                        }
+                        Button {
+                            NavigationModel.shared.presentingAccounts = true
+                        } label: {
+                            Label("Locations", systemImage: "globe")
+                        }
                         Spacer()
                         HideWatchedButtons()
                         HideShortsButtons()
-                        HomeSettingsButton()
+                        Button {
+                            NavigationModel.shared.presentingSettings = true
+                        } label: {
+                            Label("Settings", systemImage: "gear")
+                        }
                     }
+                    #if os(tvOS)
+                    .font(.caption)
+                    .imageScale(.small)
+                    #endif
                 #endif
             }
             .padding(.top, 15)

Shared/Navigation/AppTabNavigation.swift

@@ -7,6 +7,7 @@ struct AppTabNavigation: View {
     private var player = PlayerModel.shared
     @ObservedObject private var feed = FeedModel.shared
     @ObservedObject private var feedCount = UnwatchedFeedCountModel.shared
+    private var recents = RecentsModel.shared
 
     @Default(.showHome) private var showHome
     @Default(.showDocuments) private var showDocuments
@@ -175,9 +176,9 @@ struct AppTabNavigation: View {
     }
 
     @ViewBuilder private var channelView: some View {
-        if navigation.presentingChannel {
+        if navigation.presentingChannel, let channel = recents.presentedChannel {
             NavigationView {
-                ChannelVideosView(showCloseButton: true)
+                ChannelVideosView(channel: channel, showCloseButton: true)
             }
             .environment(\.managedObjectContext, persistenceController.container.viewContext)
             .environment(\.inChannelView, true)
@@ -189,9 +190,9 @@ struct AppTabNavigation: View {
     }
 
     @ViewBuilder private var playlistView: some View {
-        if navigation.presentingPlaylist {
+        if navigation.presentingPlaylist, let playlist = recents.presentedPlaylist {
             NavigationView {
-                ChannelPlaylistView(showCloseButton: true)
+                ChannelPlaylistView(playlist: playlist, showCloseButton: true)
             }
             .environment(\.managedObjectContext, persistenceController.container.viewContext)
             .id("channelPlaylist")

Shared/Player/AppleAVPlayerView.swift

@@ -15,8 +15,8 @@ import SwiftUI
             false
         }
 
-        func playerViewController(_: AVPlayerViewController, willBeginFullScreenPresentationWithAnimationCoordinator _: UIViewControllerTransitionCoordinator) {
-            #if os(iOS)
+        #if os(iOS)
+            func playerViewController(_: AVPlayerViewController, willBeginFullScreenPresentationWithAnimationCoordinator _: UIViewControllerTransitionCoordinator) {
                 guard rotateToLandscapeOnEnterFullScreen.isRotating else { return }
                 if PlayerModel.shared.currentVideoIsLandscape {
                     let delay = PlayerModel.shared.activeBackend == .appleAVPlayer && avPlayerUsesSystemControls ? 0.8 : 0
@@ -27,34 +27,40 @@ import SwiftUI
                         Orientation.lockOrientation(.allButUpsideDown, andRotateTo: orientation)
                     }
                 }
-            #endif
-        }
+            }
 
-        func playerViewController(_: AVPlayerViewController, willEndFullScreenPresentationWithAnimationCoordinator coordinator: UIViewControllerTransitionCoordinator) {
-            let wasPlaying = player.isPlaying
-            coordinator.animate(alongsideTransition: nil) { context in
-                #if os(iOS)
+            func playerViewController(_: AVPlayerViewController, willEndFullScreenPresentationWithAnimationCoordinator coordinator: UIViewControllerTransitionCoordinator) {
+                let wasPlaying = player.isPlaying
+                coordinator.animate(alongsideTransition: nil) { context in
                     if wasPlaying {
                         self.player.play()
                     }
-                #endif
-                if !context.isCancelled {
-                    #if os(iOS)
-                        self.player.lockedOrientation = nil
+                    if !context.isCancelled {
+                        #if os(iOS)
+                            self.player.lockedOrientation = nil
 
-                        if Constants.isIPhone {
-                            Orientation.lockOrientation(.allButUpsideDown, andRotateTo: .portrait)
-                        }
+                            if Constants.isIPhone {
+                                Orientation.lockOrientation(.allButUpsideDown, andRotateTo: .portrait)
+                            }
 
-                        if wasPlaying {
-                            self.player.play()
-                        }
+                            if wasPlaying {
+                                self.player.play()
+                            }
 
-                        self.player.playingFullScreen = false
-                    #endif
+                            self.player.playingFullScreen = false
+                        #endif
+                    }
                 }
             }
-        }
+
+            func playerViewController(_: AVPlayerViewController, restoreUserInterfaceForFullScreenExitWithCompletionHandler completionHandler: @escaping (Bool) -> Void) {
+                withAnimation(nil) {
+                    player.presentingPlayer = true
+                }
+
+                completionHandler(true)
+            }
+        #endif
 
         func playerViewControllerWillStartPictureInPicture(_: AVPlayerViewController) {}
 
@@ -86,14 +92,6 @@ import SwiftUI
                 }
             }
         }
-
-        func playerViewController(_: AVPlayerViewController, restoreUserInterfaceForFullScreenExitWithCompletionHandler completionHandler: @escaping (Bool) -> Void) {
-            withAnimation(nil) {
-                player.presentingPlayer = true
-            }
-
-            completionHandler(true)
-        }
     }
 #endif
 

Shared/Player/AppleAVPlayerViewController.swift

@@ -93,15 +93,17 @@ extension AppleAVPlayerViewController: AVPlayerViewControllerDelegate {
 
     func playerViewControllerDidEndDismissalTransition(_: AVPlayerViewController) {}
 
-    func playerViewController(
-        _: AVPlayerViewController,
-        willBeginFullScreenPresentationWithAnimationCoordinator _: UIViewControllerTransitionCoordinator
-    ) {}
+    #if os(iOS)
+        func playerViewController(
+            _: AVPlayerViewController,
+            willBeginFullScreenPresentationWithAnimationCoordinator _: UIViewControllerTransitionCoordinator
+        ) {}
 
-    func playerViewController(
-        _: AVPlayerViewController,
-        willEndFullScreenPresentationWithAnimationCoordinator _: UIViewControllerTransitionCoordinator
-    ) {}
+        func playerViewController(
+            _: AVPlayerViewController,
+            willEndFullScreenPresentationWithAnimationCoordinator _: UIViewControllerTransitionCoordinator
+        ) {}
+    #endif
 
     func playerViewController(
         _: AVPlayerViewController,

Shared/Player/PlaybackSettings.swift

@@ -28,13 +28,7 @@ struct PlaybackSettings: View {
     #endif
 
     var body: some View {
-        #if DEBUG
-            // TODO: remove
-            if #available(iOS 15.0, macOS 12.0, *) {
-                Self._printChanges()
-            }
-        #endif
-        return ScrollView {
+        ScrollView {
             VStack(alignment: .leading, spacing: 10) {
                 HStack {
                     Button {
@@ -69,21 +63,24 @@ struct PlaybackSettings: View {
                 }
                 .padding(.vertical, 10)
 
-                HStack {
-                    controlsHeader("Rate".localized())
-                    Spacer()
-                    HStack(spacing: rateButtonsSpacing) {
-                        decreaseRateButton
-                        #if os(tvOS)
-                        .focused($focusedField, equals: .decreaseRate)
-                        #endif
-                        rateButton
-                        increaseRateButton
-                        #if os(tvOS)
-                        .focused($focusedField, equals: .increaseRate)
-                        #endif
+                if player.activeBackend == .mpv || !player.avPlayerUsesSystemControls {
+                    HStack {
+                        controlsHeader("Rate".localized())
+                        Spacer()
+                        HStack(spacing: rateButtonsSpacing) {
+                            decreaseRateButton
+                            #if os(tvOS)
+                            .focused($focusedField, equals: .decreaseRate)
+                            #endif
+                            rateButton
+                            increaseRateButton
+                            #if os(tvOS)
+                            .focused($focusedField, equals: .increaseRate)
+                            #endif
+                        }
                     }
                 }
+
                 if player.activeBackend == .mpv {
                     HStack {
                         controlsHeader("Captions".localized())

Shared/Player/VideoPlayerSizeModifier.swift

@@ -25,7 +25,7 @@ struct VideoPlayerSizeModifier: ViewModifier {
 
     func body(content: Content) -> some View {
         content
-            .frame(maxWidth: geometry.size.width)
+            .frame(width: geometry.size.width)
             .frame(maxHeight: maxHeight)
 
         #if !os(macOS)

Shared/Player/VideoPlayerView.swift

@@ -90,13 +90,7 @@ struct VideoPlayerView: View {
     }
 
     var videoPlayer: some View {
-        #if DEBUG
-            // TODO: remove
-            if #available(iOS 15.0, macOS 12.0, *) {
-                Self._printChanges()
-            }
-        #endif
-        return GeometryReader { geometry in
+        GeometryReader { geometry in
             HStack(spacing: 0) {
                 content
                     .onAppear {
@@ -382,7 +376,7 @@ struct VideoPlayerView: View {
                         .listStyle(.plain)
                         #endif
                         .frame(maxWidth: 350)
-                        .background(colorScheme == .dark ? Color.black : Color.white)
+                        .background((colorScheme == .dark ? Color.black : Color.white).ignoresSafeArea())
                         .transition(.move(edge: .bottom))
                     }
                 #elseif os(macOS)

Shared/Search/FocusableSearchTextField.swift

@@ -0,0 +1,29 @@
+import Introspect
+import Repeat
+import SwiftUI
+
+@available(iOS 15.0, macOS 12, *)
+struct FocusableSearchTextField: View {
+    @ObservedObject private var state = SearchModel.shared
+
+    #if os(iOS)
+        @State private var textField: UITextField?
+    #elseif os(macOS)
+        @State private var textField: NSTextField?
+    #endif
+
+    var body: some View {
+        SearchTextField()
+        #if os(iOS)
+            .introspectTextField { field in
+                textField = field
+            }
+            .onChange(of: state.focused) { newValue in
+                if newValue, let textField, !textField.isFirstResponder {
+                    textField.becomeFirstResponder()
+                    textField.selectedTextRange = textField.textRange(from: textField.beginningOfDocument, to: textField.endOfDocument)
+                }
+            }
+        #endif
+    }
+}

Shared/Search/SearchView.swift

@@ -95,7 +95,11 @@ struct SearchView: View {
                         filtersMenu
                     }
 
-                    SearchTextField()
+                    if #available(macOS 12, *) {
+                        FocusableSearchTextField()
+                    } else {
+                        SearchTextField()
+                    }
                 }
             #endif
         }
@@ -175,7 +179,11 @@ struct SearchView: View {
                 searchMenu
             }
             ToolbarItem(placement: .principal) {
-                SearchTextField()
+                if #available(iOS 15, *) {
+                    FocusableSearchTextField()
+                } else {
+                    SearchTextField()
+                }
             }
         }
         .navigationBarTitleDisplayMode(.inline)
@@ -325,6 +333,7 @@ struct SearchView: View {
         NavigationLink(destination: recentItemNavigationLinkDestination(item)) {
             recentItemLabel(item)
         }
+        .contextMenu { recentItemContextMenu(item) }
     }
 
     @ViewBuilder private func recentItemNavigationLinkDestination(_ item: RecentItem) -> some View {
@@ -385,7 +394,11 @@ struct SearchView: View {
         } label: {
             recentItemLabel(item)
         }
-        .contextMenu {
+        .contextMenu { recentItemContextMenu(item) }
+    }
+
+    private func recentItemContextMenu(_ item: RecentItem) -> some View {
+        Group {
             removeButton(item)
 
             #if os(tvOS)

Shared/Settings/AdvancedSettings.swift

@@ -8,6 +8,7 @@ struct AdvancedSettings: View {
     @Default(.mpvEnableLogging) private var mpvEnableLogging
     @Default(.showCacheStatus) private var showCacheStatus
     @Default(.feedCacheSize) private var feedCacheSize
+    @Default(.showPlayNowInBackendContextMenu) private var showPlayNowInBackendContextMenu
 
     @State private var filesToShare = [MPVClient.logFile]
     @State private var presentingShareSheet = false
@@ -56,6 +57,10 @@ struct AdvancedSettings: View {
     }
 
     @ViewBuilder var advancedSettings: some View {
+        Section(header: SettingsHeader(text: "Advanced")) {
+            showPlayNowInBackendButtonsToggle
+        }
+
         Section(header: SettingsHeader(text: "MPV"), footer: mpvFooter) {
             showMPVPlaybackStatsToggle
             #if !os(tvOS)
@@ -115,6 +120,10 @@ struct AdvancedSettings: View {
         .foregroundColor(.secondary)
     }
 
+    var showPlayNowInBackendButtonsToggle: some View {
+        Toggle("Show video context menu options to force selected backend", isOn: $showPlayNowInBackendContextMenu)
+    }
+
     var showMPVPlaybackStatsToggle: some View {
         Toggle("Show playback statistics", isOn: $showMPVPlaybackStats)
     }

Shared/Settings/BrowsingSettings.swift

@@ -8,6 +8,7 @@ struct BrowsingSettings: View {
     #endif
     @Default(.accountPickerDisplaysAnonymousAccounts) private var accountPickerDisplaysAnonymousAccounts
     @Default(.showUnwatchedFeedBadges) private var showUnwatchedFeedBadges
+    @Default(.keepChannelsWithUnwatchedFeedOnTop) private var keepChannelsWithUnwatchedFeedOnTop
     #if os(iOS)
         @Default(.lockPortraitWhenBrowsing) private var lockPortraitWhenBrowsing
         @Default(.showDocuments) private var showDocuments
@@ -180,9 +181,11 @@ struct BrowsingSettings: View {
                             FeedModel.shared.calculateUnwatchedFeed()
                         }
                     }
+
+                Toggle("Open channels with description expanded", isOn: $expandChannelDescription)
             }
 
-            Toggle("Open channels with description expanded", isOn: $expandChannelDescription)
+            Toggle("Keep channels with unwatched videos on top of subscriptions list", isOn: $keepChannelsWithUnwatchedFeedOnTop)
         }
     }
 

Shared/Settings/HomeSettings.swift

@@ -124,6 +124,8 @@ struct FavoriteItemEditor: View {
 
     @State private var presentingRemoveAlert = false
 
+    @Default(.favorites) private var favorites
+
     var body: some View {
         VStack(alignment: .leading) {
             HStack {
@@ -132,13 +134,13 @@ struct FavoriteItemEditor: View {
                 Spacer()
 
                 HStack(spacing: 10) {
-                    FavoriteItemEditorButton {
+                    FavoriteItemEditorButton(color: model.canMoveUp(item) ? .accentColor : .secondary) {
                         Label("Move Up", systemImage: "arrow.up")
                     } onTapGesture: {
                         model.moveUp(item)
                     }
 
-                    FavoriteItemEditorButton {
+                    FavoriteItemEditorButton(color: model.canMoveDown(item) ? .accentColor : .secondary) {
                         Label("Move Down", systemImage: "arrow.down")
                     } onTapGesture: {
                         model.moveDown(item)

Shared/Subscriptions/ChannelsView.swift

@@ -11,20 +11,28 @@ struct ChannelsView: View {
 
     @Default(.showCacheStatus) private var showCacheStatus
     @Default(.showUnwatchedFeedBadges) private var showUnwatchedFeedBadges
+    @Default(.keepChannelsWithUnwatchedFeedOnTop) private var keepChannelsWithUnwatchedFeedOnTop
+
+    @State private var channelLinkActive = false
+    @State private var channelForLink: Channel?
 
     var body: some View {
         List {
             Section(header: header) {
-                ForEach(subscriptions.all) { channel in
+                ForEach(channels) { channel in
                     let label = HStack {
                         if let url = channel.thumbnailURLOrCached {
                             ThumbnailView(url: url)
                                 .frame(width: 35, height: 35)
                                 .clipShape(RoundedRectangle(cornerRadius: 35))
-                            Text(channel.name)
                         } else {
-                            Label(channel.name, systemImage: RecentsModel.symbolSystemImage(channel.name))
+                            Image(systemName: RecentsModel.symbolSystemImage(channel.name))
+                                .imageScale(.large)
+                                .foregroundColor(.accentColor)
+                                .frame(width: 35, height: 35)
                         }
+                        Text(channel.name)
+                            .lineLimit(1)
                     }
                     .backport
                     .badge(showUnwatchedFeedBadges ? feedCount.unwatchedByChannelText(channel) : nil)
@@ -37,9 +45,15 @@ struct ChannelsView: View {
                                 label
                             }
                         #else
-                            NavigationLink(destination: ChannelVideosView(channel: channel)) {
+                            Button {
+                                channelForLink = channel
+                                channelLinkActive = channelForLink != nil
+                            } label: {
                                 label
+                                    .contentShape(Rectangle())
+                                    .foregroundColor(.primary)
                             }
+                            .buttonStyle(.plain)
                         #endif
                     }
                     .contextMenu {
@@ -63,6 +77,11 @@ struct ChannelsView: View {
                     .listRowSeparator(false)
             }
         }
+        #if !os(tvOS)
+        .background(
+            NavigationLink(destination: ChannelVideosView(channel: channelForLink ?? Video.fixture.channel), isActive: $channelLinkActive, label: EmptyView.init)
+        )
+        #endif
         .onAppear {
             subscriptions.load()
         }
@@ -99,6 +118,10 @@ struct ChannelsView: View {
         #endif
     }
 
+    var channels: [Channel] {
+        keepChannelsWithUnwatchedFeedOnTop ? subscriptions.allByUnwatchedCount : subscriptions.all
+    }
+
     var header: some View {
         HStack {
             #if os(tvOS)

Shared/Subscriptions/SubscriptionsView.swift

@@ -37,6 +37,7 @@ struct SubscriptionsView: View {
                             Label("Channels", systemImage: "person.3.fill").tag(Page.channels)
                         }
                         .pickerStyle(.segmented)
+                        .labelStyle(.titleOnly)
 
                         subscriptionsMenu
                     }

Shared/Videos/VideoBanner.swift

@@ -37,22 +37,22 @@ struct VideoBanner: View {
 
     var body: some View {
         HStack(alignment: .top, spacing: 12) {
-            ZStack(alignment: .bottom) {
-                VStack(alignment: .trailing, spacing: 2) {
+            VStack(alignment: .trailing, spacing: 2) {
+                ZStack(alignment: .bottom) {
                     smallThumbnail
+                        .layoutPriority(1)
 
-                    if !timeOnThumbnail, let timeLabel {
-                        Text(timeLabel)
-                            .font(.caption.monospacedDigit())
-                            .foregroundColor(.secondary)
-                    }
+                    ProgressView(value: watch?.progress ?? 44, total: 100)
+                        .frame(maxHeight: 4)
+                        .progressViewStyle(LinearProgressViewStyle(tint: Color("AppRedColor")))
+                        .opacity(watch?.isShowingProgress ?? false ? 1 : 0)
                 }
-                .layoutPriority(1)
 
-                ProgressView(value: watch?.progress ?? 44, total: 100)
-                    .frame(maxHeight: 4)
-                    .progressViewStyle(LinearProgressViewStyle(tint: Color("AppRedColor")))
-                    .opacity(watch?.isShowingProgress ?? false ? 1 : 0)
+                if !timeOnThumbnail, let timeLabel {
+                    Text(timeLabel)
+                        .font(.caption.monospacedDigit())
+                        .foregroundColor(.secondary)
+                }
             }
 
             VStack(alignment: .leading, spacing: 2) {

Shared/Views/AccentButton.swift

@@ -27,9 +27,11 @@ struct AccentButton: View {
             .frame(maxWidth: maxWidth)
             .contentShape(Rectangle())
         }
+        #if !os(tvOS)
         .foregroundColor(.accentColor)
         .buttonStyle(.plain)
         .background(buttonBackground)
+        #endif
     }
 
     var buttonBackground: some View {
@@ -40,6 +42,11 @@ struct AccentButton: View {
 
 struct OpenVideosButton_Previews: PreviewProvider {
     static var previews: some View {
-        AccentButton(text: "Open Videos", imageSystemName: "play.circle.fill")
+        VStack {
+            AccentButton(text: "Open Videos", imageSystemName: "play.circle.fill")
+                .padding(.horizontal, 100)
+            AccentButton(text: "Open Videos", imageSystemName: "play.circle.fill")
+                .padding(.horizontal, 100)
+        }
     }
 }

Shared/Views/VideoContextMenuView.swift

@@ -20,7 +20,7 @@ struct VideoContextMenuView: View {
 
     @FetchRequest private var watchRequest: FetchedResults<Watch>
 
-    @Default(.saveHistory) private var saveHistory
+    @Default(.showPlayNowInBackendContextMenu) private var showPlayNowInBackendContextMenu
 
     private var backgroundContext = PersistenceController.shared.container.newBackgroundContext()
 
@@ -43,7 +43,7 @@ struct VideoContextMenuView: View {
             removeAllFromQueueButton()
         }
         if !video.localStreamIsDirectory {
-            if saveHistory {
+            if Defaults[.saveHistory] {
                 Section {
                     if let watchedAtString {
                         Text(watchedAtString)
@@ -71,6 +71,14 @@ struct VideoContextMenuView: View {
                 #endif
             }
 
+            if Defaults[.showPlayNowInBackendContextMenu] {
+                Section {
+                    ForEach(PlayerBackendType.allCases, id: \.self) { backend in
+                        playNowInBackendButton(backend)
+                    }
+                }
+            }
+
             Section {
                 playNextButton
                 addToQueueButton
@@ -187,6 +195,20 @@ struct VideoContextMenuView: View {
         }
     }
 
+    private func playNowInBackendButton(_ backend: PlayerBackendType) -> some View {
+        Button {
+            if player.musicMode {
+                player.toggleMusicMode()
+            }
+
+            player.forceBackendOnPlay = backend
+
+            player.play(video)
+        } label: {
+            Label("Play Now in \(backend.label)", systemImage: "play")
+        }
+    }
+
     private var playNowInPictureInPictureButton: some View {
         Button {
             player.avPlayerBackend.startPictureInPictureOnPlay = true

Shared/de.lproj/Localizable.strings

@@ -579,3 +579,19 @@
 "Landscape left" = "Querformat links";
 "Landscape right" = "Querformat rechts";
 "No rotation" = "Keine Drehung";
+"Available" = "Verfügbar";
+"Startup section" = "Bereich Startup";
+"Home Settings" = "Startseite Einstellungen";
+"Watched: hidden" = "Beobachtet: versteckt";
+"(watched and shorts hidden)" = "(beobachtet und shorts versteckt)";
+"Watched: visible" = "Beobachtet: sichtbar";
+"No videos to show" = "Keine Videos zu zeigen";
+"(watched hidden)" = "(versteckt beobachtet)";
+"(shorts hidden)" = "(shorts versteckt)";
+"Disable filters" = "Filter deaktivieren";
+"Limit" = "Grenze";
+"Are you sure you want to remove %@ from Favorites?" = "Möchten Sie %@ wirklich aus den Favoriten entfernen?";
+"Play Now in MPV" = "Jetzt im MPV abspielen";
+"Keep channels with unwatched videos on top of subscriptions list" = "Kanäle mit ungesehenen Videos oben in der Abonnementliste halten";
+"Show video context menu options to force selected backend" = "Video-Kontextmenüoptionen anzeigen, um die Auswahl des Backends zu erzwingen";
+"Play Now in AVPlayer" = "Jetzt in AVPlayer abspielen";

Shared/en.lproj/Localizable.strings

@@ -589,3 +589,7 @@
 "Disable filters" = "Disable filters";
 "Limit" = "Limit";
 "Are you sure you want to remove %@ from Favorites?" = "Are you sure you want to remove %@ from Favorites?";
+"Keep channels with unwatched videos on top of subscriptions list" = "Keep channels with unwatched videos on top of subscriptions list";
+"Show video context menu options to force selected backend" = "Show video context menu options to force selected backend";
+"Play Now in MPV" = "Play Now in MPV";
+"Play Now in AVPlayer" = "Play Now in AVPlayer";

Shared/fr.lproj/Localizable.strings

@@ -579,3 +579,19 @@
 "Landscape right" = "Paysage droit";
 "No rotation" = "Aucune rotation";
 "Use system controls with AVPlayer" = "Utiliser les contrôles du système avec AVPlayer";
+"Available" = "Disponible";
+"Startup section" = "Section de démarrage";
+"Home Settings" = "Paramètres de l'accueil";
+"Watched: hidden" = "Regardées : masquées";
+"Watched: visible" = "Regardées : visibles";
+"(watched and shorts hidden)" = "(regardées et shorts masqués)";
+"Disable filters" = "Désactiver les filtres";
+"(shorts hidden)" = "(shorts masqués)";
+"No videos to show" = "Aucune vidéo à afficher";
+"(watched hidden)" = "(regardées masquées)";
+"Limit" = "Limite";
+"Are you sure you want to remove %@ from Favorites?" = "Êtes-vous sûr de vouloir supprimer %@ des favoris ?";
+"Keep channels with unwatched videos on top of subscriptions list" = "Conserver les chaînes dont les vidéos n'ont pas été visionnées en haut de la liste des abonnements";
+"Show video context menu options to force selected backend" = "Afficher les options contextuelles de la vidéo pour forcer la sélection du backend";
+"Play Now in AVPlayer" = "Lire maintenant dans AVPlayer";
+"Play Now in MPV" = "Lire maintenant dans MPV";

Shared/ja.lproj/Localizable.strings

@@ -202,7 +202,7 @@
 "Translations" = "翻訳";
 "Could not refresh Playlists" = "再生リストを更新できません";
 "No locations available at the moment" = "現時点で利用可能な場所がありません";
-"Show Open Videos quick actions" = "クイック操作に動画を開くを表示";
+"Show Open Videos quick actions" = "動画を開くクイック操作を表示";
 "Show Documents" = "文書を表示";
 "Pages toolbar position" = "ページのツールバー位置";
 "Buttons labels" = "ボタンのラベル";
@@ -510,12 +510,12 @@
 "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." = "動画の冒頭で、同じ作成者の他の動画でも見られるアニメーション、静止画やクリップを含む部分。";
 "This information will be processed only on your device and used to connect you to the server in the specified country." = "この情報は、この端末上でのみ処理され、指定した国のサーバーに接続するために使用されます。";
 "Videos" = "動画";
-"Typically near or at the end of the video when the credits pop up and/or endcards are shown." = "クレジットのポップアップやエンドカードが表示される、映像の最後のあたりに表示されます。";
+"Typically near or at the end of the video when the credits pop up and/or endcards are shown." = "クレジットのポップアップや終了シーンが表示される、映像の最後のあたりに表示されます。";
 "Verified" = "認証済み";
 "Mark channel feed as unwatched" = "チャンネルフィードを未視聴にする";
-"Open expanded" = "展開時に";
+"Open expanded" = "展開したまま開く";
 "Short videos: hidden" = "ショート動画: 非表示";
-"Player Bar" = "プレイヤーのバー";
+"Player Bar" = "プレイヤーバー";
 "Play all unwatched" = "未視聴をすべて再生";
 "Double tap gesture" = "ダブルタップ";
 "Single tap gesture" = "シングルタップ";
@@ -531,7 +531,7 @@
 "Switch to public locations" = "公開された場所に切り替え";
 "Explicit reminders to like, subscribe or interact with them on any paid or free platform(s) (e.g. click on a video)." = "有料/無料のプラットフォームかを問わず、いいね、登録などを明示的に操作を促す（例: 動画をクリック）。";
 "Proxy videos" = "動画閲覧にプロキシ使用";
-"Sections" = "表示部分";
+"Sections" = "表示する部分";
 "System controls show buttons for %@" = "システム制御「%@」用のボタンを表示";
 "You need to create an instance and accounts\nto access %@ section" = "%@ セクションの利用には\nインスタンスとアカウントの作成が必要";
 "You need to select an account\nto access %@ section" = "%@ セクションの利用には\nアカウントの選択が必要";
@@ -577,3 +577,18 @@
 "Show Next in Queue" = "「次の再生キュー」を表示";
 "Next in Queue" = "次の再生キュー";
 "Inspector" = "ファイルの詳細情報";
+"Available" = "選択候補";
+"Startup section" = "起動時の表示";
+"Home Settings" = "ホームの設定";
+"Watched: hidden" = "視聴済み: 隠す";
+"Watched: visible" = "視聴済み: 表示";
+"No videos to show" = "表示する動画なし";
+"(watched and shorts hidden)" = "(視聴済み/ショート非表示)";
+"(shorts hidden)" = "(ショート非表示)";
+"(watched hidden)" = "(視聴済み非表示)";
+"Disable filters" = "絞り込み解除";
+"Are you sure you want to remove %@ from Favorites?" = "お気に入りから %@ を除去しますか？";
+"Show video context menu options to force selected backend" = "強制的にバックエンドを選択するための動画のコンテキストメニューを表示";
+"Play Now in AVPlayer" = "AVPlayer で今すぐ再生";
+"Play Now in MPV" = "MPV で今すぐ再生";
+"Keep channels with unwatched videos on top of subscriptions list" = "未視聴の動画があるチャンネルをチャンネル一覧の上部に維持";

Shared/pl.lproj/Localizable.strings

@@ -582,7 +582,7 @@
 "Landscape left" = "Obrót w lewo";
 "Available" = "Dostępne";
 "Startup section" = "Sekcja startowa";
-"Home Settings" = "Ustawienia strony głównej";
+"Home Settings" = "Ustawienia głównej";
 "Watched: hidden" = "Obejrzane: ukryte";
 "Watched: visible" = "Obejrzane: widoczne";
 "No videos to show" = "Brak wideo do pokazania";
@@ -592,3 +592,7 @@
 "(watched hidden)" = "(obejrzane ukryte)";
 "Limit" = "Limit";
 "Are you sure you want to remove %@ from Favorites?" = "Czy na pewno chcesz usunąć element: %@ z Ulubionych?";
+"Play Now in AVPlayer" = "Odtwórz teraz w AVPlayerze";
+"Play Now in MPV" = "Odtwórz teraz w MPV";
+"Keep channels with unwatched videos on top of subscriptions list" = "Kanały z nieobejrzanymi filmami na górze listy subskrypcji";
+"Show video context menu options to force selected backend" = "Pokaż opcje menu kontekstowego wideo, aby wymusić wybrany silnik";

Shared/pt-BR.lproj/Localizable.strings

@@ -579,3 +579,19 @@
 "Close video and player on end" = "Fechar vídeo e player ao final";
 "Your Accounts" = "Suas Contas";
 "Use system controls with AVPlayer" = "Usar controles do sistema com o AVPlayer";
+"Available" = "Disponível";
+"Startup section" = "Seção ao iniciar";
+"Home Settings" = "Ajustes da tela Início";
+"Watched: hidden" = "Assistidos: ocultos";
+"Watched: visible" = "Assistidos: visíveis";
+"Disable filters" = "Desativar filtros";
+"(watched hidden)" = "(assistidos ocultos)";
+"(shorts hidden)" = "(shorts ocultos)";
+"Limit" = "Limite";
+"Are you sure you want to remove %@ from Favorites?" = "Tem certeza que deseja remover %@ dos Favoritos?";
+"No videos to show" = "Nenhum vídeo para mostrar";
+"(watched and shorts hidden)" = "(assistidos e shorts ocultos)";
+"Show video context menu options to force selected backend" = "Mostrar opções do menu contextual do vídeo para forçar o backend selecionado";
+"Keep channels with unwatched videos on top of subscriptions list" = "Manter canais com vídeos não vistos no topo da lista de inscrições";
+"Play Now in AVPlayer" = "Tocar Agora no AVPlayer";
+"Play Now in MPV" = "Tocar Agora em MPV";

Shared/ro.lproj/Localizable.strings

@@ -579,3 +579,19 @@
 "Your Accounts" = "Conturi tale";
 "Browse without account" = "Navigați fără cont";
 "Close video and player on end" = "Închideți videoclipul și player-ul la sfârșit";
+"Available" = "Disponibil";
+"Startup section" = "Secțiunea de pornire";
+"Watched: hidden" = "Vizionat: ascuns";
+"Watched: visible" = "Vizionat: vizibil";
+"Disable filters" = "Dezactivează filtrele";
+"Home Settings" = "Setări de acasă";
+"(watched and shorts hidden)" = "(vizionat și shorts ascunse)";
+"No videos to show" = "fără videoclipuri de afișat";
+"(watched hidden)" = "(vizionat ascuns)";
+"(shorts hidden)" = "(shorts ascunse)";
+"Limit" = "Limită";
+"Are you sure you want to remove %@ from Favorites?" = "Sigur doriți să eliminați %@ din Favorite?";
+"Keep channels with unwatched videos on top of subscriptions list" = "Păstrați canalele cu videoclipuri nevăzute în partea de sus a listei de abonamente";
+"Play Now in AVPlayer" = "Redă acum în AVPlayer";
+"Play Now in MPV" = "Redă acum în MPV";
+"Show video context menu options to force selected backend" = "Afișați opțiunile din meniul contextual video pentru a forța backend-ul selectat";

Yattee.xcodeproj/project.pbxproj

@@ -568,6 +568,10 @@
 		3776ADD6287381240078EBC4 /* Captions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3776ADD5287381240078EBC4 /* Captions.swift */; };
 		3776ADD7287381240078EBC4 /* Captions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3776ADD5287381240078EBC4 /* Captions.swift */; };
 		3776ADD8287381240078EBC4 /* Captions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3776ADD5287381240078EBC4 /* Captions.swift */; };
+		37772E0D2A216F8600608BD9 /* String+ReplacingHTMLEntities.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37772E0C2A216F8600608BD9 /* String+ReplacingHTMLEntities.swift */; };
+		37772E0E2A216F8600608BD9 /* String+ReplacingHTMLEntities.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37772E0C2A216F8600608BD9 /* String+ReplacingHTMLEntities.swift */; };
+		37772E0F2A216F8600608BD9 /* String+ReplacingHTMLEntities.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37772E0C2A216F8600608BD9 /* String+ReplacingHTMLEntities.swift */; };
+		37772E102A216F8600608BD9 /* String+ReplacingHTMLEntities.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37772E0C2A216F8600608BD9 /* String+ReplacingHTMLEntities.swift */; };
 		377A20A92693C9A2002842B8 /* TypedContentAccessors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 377A20A82693C9A2002842B8 /* TypedContentAccessors.swift */; };
 		377A20AA2693C9A2002842B8 /* TypedContentAccessors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 377A20A82693C9A2002842B8 /* TypedContentAccessors.swift */; };
 		377A20AB2693C9A2002842B8 /* TypedContentAccessors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 377A20A82693C9A2002842B8 /* TypedContentAccessors.swift */; };
@@ -686,6 +690,9 @@
 		379DC3D128BA4EB400B09677 /* Seek.swift in Sources */ = {isa = PBXBuildFile; fileRef = 379DC3D028BA4EB400B09677 /* Seek.swift */; };
 		379DC3D228BA4EB400B09677 /* Seek.swift in Sources */ = {isa = PBXBuildFile; fileRef = 379DC3D028BA4EB400B09677 /* Seek.swift */; };
 		379DC3D328BA4EB400B09677 /* Seek.swift in Sources */ = {isa = PBXBuildFile; fileRef = 379DC3D028BA4EB400B09677 /* Seek.swift */; };
+		379E7C332A20FE3900AF8118 /* FocusableSearchTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 379E7C322A20FE3900AF8118 /* FocusableSearchTextField.swift */; };
+		379E7C342A20FE3900AF8118 /* FocusableSearchTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 379E7C322A20FE3900AF8118 /* FocusableSearchTextField.swift */; };
+		379E7C362A2105B900AF8118 /* Introspect in Frameworks */ = {isa = PBXBuildFile; productRef = 379E7C352A2105B900AF8118 /* Introspect */; };
 		379EF9E029AA585F009FE6C6 /* HideShortsButtons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 379EF9DF29AA585F009FE6C6 /* HideShortsButtons.swift */; };
 		379EF9E129AA585F009FE6C6 /* HideShortsButtons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 379EF9DF29AA585F009FE6C6 /* HideShortsButtons.swift */; };
 		379EF9E229AA585F009FE6C6 /* HideShortsButtons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 379EF9DF29AA585F009FE6C6 /* HideShortsButtons.swift */; };
@@ -1350,6 +1357,7 @@
 		3776925129463C310055EC18 /* PlaylistsCacheModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlaylistsCacheModel.swift; sourceTree = "<group>"; };
 		377692552946476F0055EC18 /* ChannelPlaylistsCacheModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChannelPlaylistsCacheModel.swift; sourceTree = "<group>"; };
 		3776ADD5287381240078EBC4 /* Captions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Captions.swift; path = Model/Captions.swift; sourceTree = SOURCE_ROOT; };
+		37772E0C2A216F8600608BD9 /* String+ReplacingHTMLEntities.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+ReplacingHTMLEntities.swift"; sourceTree = "<group>"; };
 		377A20A82693C9A2002842B8 /* TypedContentAccessors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TypedContentAccessors.swift; sourceTree = "<group>"; };
 		377ABC3F286E4AD5009C986F /* InstancesManifest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InstancesManifest.swift; sourceTree = "<group>"; };
 		377ABC43286E4B74009C986F /* ManifestedInstance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ManifestedInstance.swift; sourceTree = "<group>"; };
@@ -1386,6 +1394,7 @@
 		379ACB502A1F8DB000E01914 /* HomeSettingsButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeSettingsButton.swift; sourceTree = "<group>"; };
 		379B0252287A1CDF001015B5 /* OrientationTracker.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrientationTracker.swift; sourceTree = "<group>"; };
 		379DC3D028BA4EB400B09677 /* Seek.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Seek.swift; sourceTree = "<group>"; };
+		379E7C322A20FE3900AF8118 /* FocusableSearchTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FocusableSearchTextField.swift; sourceTree = "<group>"; };
 		379EF9DF29AA585F009FE6C6 /* HideShortsButtons.swift */ = {isa = PBXFileReference; indentWidth = 3; lastKnownFileType = sourcecode.swift; path = HideShortsButtons.swift; sourceTree = "<group>"; };
 		379F141E289ECE7F00DE48B5 /* QualitySettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QualitySettings.swift; sourceTree = "<group>"; };
 		37A2B345294723850050933E /* CacheModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CacheModel.swift; sourceTree = "<group>"; };
@@ -1626,6 +1635,7 @@
 				37F7AB5228A94EB900FB46B5 /* IOKit.framework in Frameworks */,
 				370F4FDF27CC16CB001B35DC /* libxcb-shape.0.0.0.dylib in Frameworks */,
 				370F4FE127CC16CB001B35DC /* libuchardet.0.0.7.dylib in Frameworks */,
+				379E7C362A2105B900AF8118 /* Introspect in Frameworks */,
 				370F4FDB27CC16CB001B35DC /* libswscale.6.4.100.dylib in Frameworks */,
 				370F4FDC27CC16CB001B35DC /* libavutil.57.17.100.dylib in Frameworks */,
 				370F4FE327CC16CB001B35DC /* libbrotlicommon.1.dylib in Frameworks */,
@@ -2187,6 +2197,7 @@
 		3782B95527557A2400990149 /* Search */ = {
 			isa = PBXGroup;
 			children = (
+				379E7C322A20FE3900AF8118 /* FocusableSearchTextField.swift */,
 				3782B94E27553A6700990149 /* SearchSuggestions.swift */,
 				374710042755291C00CE0F87 /* SearchTextField.swift */,
 				37AAF27F26737550007FC770 /* SearchView.swift */,
@@ -2280,6 +2291,7 @@
 				377ABC47286E5887009C986F /* Sequence+Unique.swift */,
 				3782B9512755667600990149 /* String+Format.swift */,
 				37270F1B28E06E3E00856150 /* String+Localizable.swift */,
+				37772E0C2A216F8600608BD9 /* String+ReplacingHTMLEntities.swift */,
 				377A20A82693C9A2002842B8 /* TypedContentAccessors.swift */,
 				37F7AB4C28A9361F00FB46B5 /* UIDevice+Cellular.swift */,
 				370B79CB286279BA0045DB77 /* UIViewController+HideHomeIndicator.swift */,
@@ -2686,6 +2698,7 @@
 				374D11E62943C56300CB4350 /* Cache */,
 				371AC0B1294D1C230085989E /* CachedAsyncImage */,
 				379325D629A265AE00181CF1 /* Logging */,
+				379E7C352A2105B900AF8118 /* Introspect */,
 			);
 			productName = "Yattee (macOS)";
 			productReference = 37D4B0CF2671614900C925CA /* Yattee.app */;
@@ -3122,6 +3135,7 @@
 				374924DA2921050B0017D862 /* LocationsSettings.swift in Sources */,
 				378FFBC428660172009E3FBE /* URLParser.swift in Sources */,
 				3784B23D2728B85300B09468 /* ShareButton.swift in Sources */,
+				379E7C332A20FE3900AF8118 /* FocusableSearchTextField.swift in Sources */,
 				37EAD86B267B9C5600D9E01B /* SponsorBlockAPI.swift in Sources */,
 				3743CA52270F284F00E4D32B /* View+Borders.swift in Sources */,
 				3763495126DFF59D00B9A393 /* AppSidebarRecents.swift in Sources */,
@@ -3225,6 +3239,7 @@
 				37B4E803277D0A72004BF56A /* AppDelegate.swift in Sources */,
 				37FD77002932C4DA00D91A5F /* URL+ByReplacingYatteeProtocol.swift in Sources */,
 				373CFADB269663F1003CB2C6 /* Thumbnail.swift in Sources */,
+				37772E0D2A216F8600608BD9 /* String+ReplacingHTMLEntities.swift in Sources */,
 				3714166F267A8ACC006CA35D /* TrendingView.swift in Sources */,
 				37DCD3112A18E8150059A470 /* OrientationModel.swift in Sources */,
 				3782B9522755667600990149 /* String+Format.swift in Sources */,
@@ -3440,6 +3455,7 @@
 				377FC7DD267A081A00A6BBAF /* PopularView.swift in Sources */,
 				374924DB2921050B0017D862 /* LocationsSettings.swift in Sources */,
 				371AC0A0294D13AA0085989E /* UnwatchedFeedCountModel.swift in Sources */,
+				379E7C342A20FE3900AF8118 /* FocusableSearchTextField.swift in Sources */,
 				37F5C7E12A1E2AF300927B73 /* ListView.swift in Sources */,
 				37192D5828B179D60012EEDD /* ChaptersView.swift in Sources */,
 				3784CDE327772EE40055BBF2 /* Watch.swift in Sources */,
@@ -3481,6 +3497,7 @@
 				37F64FE526FE70A60081B69E /* RedrawOnModifier.swift in Sources */,
 				377ABC45286E4B74009C986F /* ManifestedInstance.swift in Sources */,
 				3795593727B08538007FF8F4 /* StreamControl.swift in Sources */,
+				37772E0E2A216F8600608BD9 /* String+ReplacingHTMLEntities.swift in Sources */,
 				375B8AB428B580D300397B31 /* KeychainModel.swift in Sources */,
 				37F7AB5528A951B200FB46B5 /* Power.swift in Sources */,
 				372CFD16285F2E2A00B0B54B /* ControlsBar.swift in Sources */,
@@ -3681,6 +3698,7 @@
 				3774124B27387D2300423605 /* ThumbnailsModel.swift in Sources */,
 				3774125427387D2300423605 /* Store.swift in Sources */,
 				37DCD31A2A191A180059A470 /* AVPlayerViewController+FullScreen.swift in Sources */,
+				37772E102A216F8600608BD9 /* String+ReplacingHTMLEntities.swift in Sources */,
 				3774125027387D2300423605 /* Video.swift in Sources */,
 				37EF9A79275BEB8E0043B585 /* CommentView.swift in Sources */,
 				3774125327387D2300423605 /* Country.swift in Sources */,
@@ -3866,6 +3884,7 @@
 				3748186C26A764FB0084E870 /* Thumbnail+Fixtures.swift in Sources */,
 				3744A96228B99ADD005DE0A7 /* PlayerControlsLayout.swift in Sources */,
 				3710A55729488C7D006F8025 /* PlaceholderListItem.swift in Sources */,
+				37772E0F2A216F8600608BD9 /* String+ReplacingHTMLEntities.swift in Sources */,
 				377A20AB2693C9A2002842B8 /* TypedContentAccessors.swift in Sources */,
 				3748186826A7627F0084E870 /* Video+Fixtures.swift in Sources */,
 				377F9F7D294403F20043F856 /* VideosCacheModel.swift in Sources */,
@@ -4034,7 +4053,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Open in Yattee/Open in Yattee.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 151;
+				CURRENT_PROJECT_VERSION = 155;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "Open in Yattee/Info.plist";
 				INFOPLIST_KEY_CFBundleDisplayName = "Open in Yattee";
@@ -4065,7 +4084,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 151;
+				CURRENT_PROJECT_VERSION = 155;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 78Z5H3M6RJ;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "Open in Yattee/Info.plist";
@@ -4096,7 +4115,7 @@
 			buildSettings = {
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 151;
+				CURRENT_PROJECT_VERSION = 155;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
@@ -4116,7 +4135,7 @@
 			buildSettings = {
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 151;
+				CURRENT_PROJECT_VERSION = 155;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
@@ -4276,7 +4295,7 @@
 				CODE_SIGN_ENTITLEMENTS = "iOS/Yattee (iOS).entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 151;
+				CURRENT_PROJECT_VERSION = 155;
 				ENABLE_PREVIEWS = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -4329,7 +4348,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 151;
+				CURRENT_PROJECT_VERSION = 155;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 78Z5H3M6RJ;
 				ENABLE_PREVIEWS = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = "GLES_SILENCE_DEPRECATION=1";
@@ -4381,7 +4400,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 151;
+				CURRENT_PROJECT_VERSION = 155;
 				DEAD_CODE_STRIPPING = YES;
 				ENABLE_APP_SANDBOX = YES;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -4423,7 +4442,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "3rd Party Mac Developer Application";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 151;
+				CURRENT_PROJECT_VERSION = 155;
 				DEAD_CODE_STRIPPING = YES;
 				"DEVELOPMENT_TEAM[sdk=macosx*]" = 78Z5H3M6RJ;
 				ENABLE_APP_SANDBOX = YES;
@@ -4461,7 +4480,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 151;
+				CURRENT_PROJECT_VERSION = 155;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -4485,7 +4504,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 151;
+				CURRENT_PROJECT_VERSION = 155;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -4511,7 +4530,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 151;
+				CURRENT_PROJECT_VERSION = 155;
 				DEAD_CODE_STRIPPING = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -4536,7 +4555,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 151;
+				CURRENT_PROJECT_VERSION = 155;
 				DEAD_CODE_STRIPPING = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -4562,7 +4581,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 151;
+				CURRENT_PROJECT_VERSION = 155;
 				DEVELOPMENT_ASSET_PATHS = "";
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -4602,7 +4621,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 151;
+				CURRENT_PROJECT_VERSION = 155;
 				DEVELOPMENT_ASSET_PATHS = "";
 				"DEVELOPMENT_TEAM[sdk=appletvos*]" = 78Z5H3M6RJ;
 				ENABLE_PREVIEWS = YES;
@@ -4643,7 +4662,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 151;
+				CURRENT_PROJECT_VERSION = 155;
 				GENERATE_INFOPLIST_FILE = YES;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -4667,7 +4686,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 151;
+				CURRENT_PROJECT_VERSION = 155;
 				GENERATE_INFOPLIST_FILE = YES;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -5166,6 +5185,11 @@
 			package = 3799AC0728B03CEC001376F9 /* XCRemoteSwiftPackageReference "ActiveLabel.swift" */;
 			productName = ActiveLabel;
 		};
+		379E7C352A2105B900AF8118 /* Introspect */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 37BD07C52698B27B003EBB87 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */;
+			productName = Introspect;
+		};
 		37BADCA42699FB72009BE4FB /* Alamofire */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 37BADCA32699FB72009BE4FB /* XCRemoteSwiftPackageReference "Alamofire" */;

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

@@ -96,7 +96,7 @@
       "location" : "https://github.com/SDWebImage/SDWebImage",
       "state" : {
         "branch" : "master",
-        "revision" : "7f9fb5d43ecd4aa714c00746f54873f354403438"
+        "revision" : "90aa750c92973005f086263e44c6224a1456bb12"
       }
     },
     {
@@ -150,7 +150,7 @@
       "location" : "https://github.com/lorenzofiamingo/swiftui-cached-async-image",
       "state" : {
         "branch" : "main",
-        "revision" : "f94be38411297c71aa8df69c6875127e6d8d7a92"
+        "revision" : "2abb11839f80ebb07a58ac5e146a1da664260c16"
       }
     },
     {
@@ -158,8 +158,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/siteline/SwiftUI-Introspect.git",
       "state" : {
-        "revision" : "5b3f3996c7a2a84d5f4ba0e03cd7d584154778f2",
-        "version" : "0.3.1"
+        "revision" : "c29b50a475120fdfa22573622464a7346aaf99a4",
+        "version" : "0.6.0"
       }
     },
     {