From 5eafbb11510906a1b62b863b40921044053d7715 Mon Sep 17 00:00:00 2001 From: Arkadiusz Fal Date: Fri, 11 Nov 2022 14:54:12 +0100 Subject: [PATCH] Remove "Show history in player" --- Shared/Defaults.swift | 1 - .../Player/AppleAVPlayerViewController.swift | 3 -- Shared/Player/PlayerQueueView.swift | 26 ---------------- Shared/Settings/LocationsSettings.swift | 2 +- Shared/Settings/PlayerSettings.swift | 6 ---- tvOS/NowPlayingView.swift | 30 ++----------------- 6 files changed, 3 insertions(+), 65 deletions(-) diff --git a/Shared/Defaults.swift b/Shared/Defaults.swift index ecfbdae1..f879a10f 100644 --- a/Shared/Defaults.swift +++ b/Shared/Defaults.swift @@ -115,7 +115,6 @@ extension Defaults.Keys { static let seekGestureSpeed = Key("seekGestureSpeed", default: 0.5) static let seekGestureSensitivity = Key("seekGestureSensitivity", default: 20.0) static let showKeywords = Key("showKeywords", default: false) - static let showHistoryInPlayer = Key("showHistoryInPlayer", default: false) #if !os(tvOS) static let commentsPlacement = Key("commentsPlacement", default: .separate) #endif diff --git a/Shared/Player/AppleAVPlayerViewController.swift b/Shared/Player/AppleAVPlayerViewController.swift index 478376f9..119cd0fd 100644 --- a/Shared/Player/AppleAVPlayerViewController.swift +++ b/Shared/Player/AppleAVPlayerViewController.swift @@ -49,9 +49,6 @@ final class AppleAVPlayerViewController: UIViewController { infoViewControllers.append(infoViewController([.comments], title: "Comments")) var queueSections = [NowPlayingView.ViewSection.playingNext] - if Defaults[.showHistoryInPlayer] { - queueSections.append(.playedPreviously) - } infoViewControllers.append(contentsOf: [ infoViewController([.related], title: "Related"), diff --git a/Shared/Player/PlayerQueueView.swift b/Shared/Player/PlayerQueueView.swift index d4fd1c13..fdd57666 100644 --- a/Shared/Player/PlayerQueueView.swift +++ b/Shared/Player/PlayerQueueView.swift @@ -15,7 +15,6 @@ struct PlayerQueueView: View { @EnvironmentObject private var player @Default(.saveHistory) private var saveHistory - @Default(.showHistoryInPlayer) private var showHistoryInPlayer var body: some View { List { @@ -27,9 +26,6 @@ struct PlayerQueueView: View { if sidebarQueue { related } - if saveHistory, showHistoryInPlayer { - playedPreviously - } } .listRowBackground(Color.clear) #if !os(iOS) @@ -108,28 +104,6 @@ struct PlayerQueueView: View { watches.filter { $0.videoID != player.currentVideo?.videoID } } - var playedPreviously: some View { - Group { - if !visibleWatches.isEmpty { - Section(header: Text("History")) { - ForEach(visibleWatches, id: \.videoID) { watch in - PlayerQueueRow( - item: PlayerQueueItem.from(watch, video: player.historyVideo(watch.videoID)), - history: true, - fullScreen: $fullScreen - ) - .onAppear { - player.loadHistoryVideoDetails(watch.videoID) - } - .contextMenu { - VideoContextMenuView(video: watch.video) - } - } - } - } - } - } - @ViewBuilder private var related: some View { if let related = player.currentVideo?.related, !related.isEmpty { Section(header: Text("Related")) { diff --git a/Shared/Settings/LocationsSettings.swift b/Shared/Settings/LocationsSettings.swift index 3e71abc0..7c38e341 100644 --- a/Shared/Settings/LocationsSettings.swift +++ b/Shared/Settings/LocationsSettings.swift @@ -19,7 +19,7 @@ struct LocationsSettings: View { settings Spacer() #else - List { + Group { settings } #if os(iOS) diff --git a/Shared/Settings/PlayerSettings.swift b/Shared/Settings/PlayerSettings.swift index 1d0c0ea0..009f85e8 100644 --- a/Shared/Settings/PlayerSettings.swift +++ b/Shared/Settings/PlayerSettings.swift @@ -6,7 +6,6 @@ struct PlayerSettings: View { @Default(.playerInstanceID) private var playerInstanceID @Default(.playerSidebar) private var playerSidebar - @Default(.showHistoryInPlayer) private var showHistory @Default(.playerControlsLayout) private var playerControlsLayout @Default(.fullScreenPlayerControlsLayout) private var fullScreenPlayerControlsLayout @Default(.horizontalPlayerGestureEnabled) private var horizontalPlayerGestureEnabled @@ -99,7 +98,6 @@ struct PlayerSettings: View { #endif keywordsToggle - showHistoryToggle if !accounts.isDemo { returnYouTubeDislikeToggle @@ -225,10 +223,6 @@ struct PlayerSettings: View { Toggle("Show keywords", isOn: $showKeywords) } - private var showHistoryToggle: some View { - Toggle("Show history", isOn: $showHistory) - } - private var returnYouTubeDislikeToggle: some View { Toggle("Enable Return YouTube Dislike", isOn: $enableReturnYouTubeDislike) } diff --git a/tvOS/NowPlayingView.swift b/tvOS/NowPlayingView.swift index 41473146..ad744a2b 100644 --- a/tvOS/NowPlayingView.swift +++ b/tvOS/NowPlayingView.swift @@ -4,10 +4,10 @@ import SwiftUI struct NowPlayingView: View { enum ViewSection: CaseIterable { - case nowPlaying, playingNext, playedPreviously, related, comments, chapters + case nowPlaying, playingNext, related, comments, chapters } - var sections = [ViewSection.nowPlaying, .playingNext, .playedPreviously, .related] + var sections = [ViewSection.nowPlaying, .playingNext, .related] var inInfoViewController = false @State private var repliesID: Comment.ID? @@ -20,7 +20,6 @@ struct NowPlayingView: View { @EnvironmentObject private var recents @Default(.saveHistory) private var saveHistory - @Default(.showHistoryInPlayer) private var showHistoryInPlayer var body: some View { if inInfoViewController { @@ -99,31 +98,6 @@ struct NowPlayingView: View { } } - if sections.contains(.playedPreviously), saveHistory, showHistoryInPlayer, !visibleWatches.isEmpty { - Section(header: Text("Played Previously")) { - ForEach(visibleWatches, id: \.videoID) { watch in - Button { - player.playHistory( - PlayerQueueItem.from(watch, video: player.historyVideo(watch.videoID)) - ) - player.show() - } label: { - VideoBanner( - video: player.historyVideo(watch.videoID), - playbackTime: CMTime.secondsInDefaultTimescale(watch.stoppedAt), - videoDuration: watch.videoDuration - ) - } - .onAppear { - player.loadHistoryVideoDetails(watch.videoID) - } - .contextMenu { - VideoContextMenuView(video: watch.video) - } - } - } - } - if sections.contains(.comments) { if comments.disabled { NoCommentsView(text: "Comments are disabled".localized(), systemImage: "xmark.circle.fill")