Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2024-12-23 05:53:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show keywords setting

Browse Source
This commit is contained in:
Arkadiusz Fal 2021-11-04 00:14:09 +01:00
parent c69d60f3ee
commit 2fcbe94e6f
3 changed files with 65 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Shared/Defaults.swift
View File

@ -53,6 +53,7 @@ extension Defaults.Keys {
static let quality = Key<Stream.ResolutionSetting>("quality", default: .hd720pFirstThenBest) static let quality = Key<Stream.ResolutionSetting>("quality", default: .hd720pFirstThenBest)
static let playerSidebar = Key<PlayerSidebarSetting>("playerSidebar", default: PlayerSidebarSetting.defaultValue) static let playerSidebar = Key<PlayerSidebarSetting>("playerSidebar", default: PlayerSidebarSetting.defaultValue)
static let showKeywords = Key<Bool>("showKeywords", default: false)
static let recentlyOpened = Key<[RecentItem]>("recentlyOpened", default: []) static let recentlyOpened = Key<[RecentItem]>("recentlyOpened", default: [])

5
Shared/Player/VideoDetails.swift
View File

@ -1,3 +1,4 @@
import Defaults
import Foundation import Foundation
import SwiftUI import SwiftUI
@ -25,6 +26,8 @@ struct VideoDetails: View {
@EnvironmentObject<PlaylistsModel> private var playlists @EnvironmentObject<PlaylistsModel> private var playlists
@EnvironmentObject<SubscriptionsModel> private var subscriptions @EnvironmentObject<SubscriptionsModel> private var subscriptions
@Default(.showKeywords) private var showKeywords
init( init(
sidebarQueue: Binding<Bool>? = nil, sidebarQueue: Binding<Bool>? = nil,
fullScreen: Binding<Bool>? = nil fullScreen: Binding<Bool>? = nil
@ -338,6 +341,7 @@ struct VideoDetails: View {
.foregroundColor(.secondary) .foregroundColor(.secondary)
} }
if showKeywords {
ScrollView(.horizontal, showsIndicators: showScrollIndicators) { ScrollView(.horizontal, showsIndicators: showScrollIndicators) {
HStack { HStack {
ForEach(video.keywords, id: \.self) { keyword in ForEach(video.keywords, id: \.self) { keyword in
@ -361,6 +365,7 @@ struct VideoDetails: View {
} }
} }
} }
}
.padding(.horizontal) .padding(.horizontal)
} }

37
Shared/Settings/PlaybackSettings.swift
View File

@ -4,6 +4,7 @@ import SwiftUI
struct PlaybackSettings: View { struct PlaybackSettings: View {
@Default(.quality) private var quality @Default(.quality) private var quality
@Default(.playerSidebar) private var playerSidebar @Default(.playerSidebar) private var playerSidebar
@Default(.showKeywords) private var showKeywords
#if os(iOS) #if os(iOS)
private var idiom: UIUserInterfaceIdiom { private var idiom: UIUserInterfaceIdiom {
@ -12,6 +13,18 @@ struct PlaybackSettings: View {
#endif #endif
var body: some View { var body: some View {
qualitySection
#if !os(tvOS)
playerSection
#endif
#if os(macOS)
Spacer()
#endif
}
private var qualitySection: some View {
Section(header: Text("Quality")) { Section(header: Text("Quality")) {
Picker("Quality", selection: $quality) { Picker("Quality", selection: $quality) {
ForEach(Stream.ResolutionSetting.allCases, id: \.self) { resolution in ForEach(Stream.ResolutionSetting.allCases, id: \.self) { resolution in
@ -26,32 +39,33 @@ struct PlaybackSettings: View {
.pickerStyle(.inline) .pickerStyle(.inline)
#endif #endif
} }
}
private var playerSection: some View {
Section(header: Text("Player")) {
#if os(iOS) #if os(iOS)
if idiom == .pad { if idiom == .pad {
playerSidebarSection sidebarPicker
} }
#elseif os(macOS) #elseif os(macOS)
playerSidebarSection sidebarPicker
#endif #endif
#if os(macOS) Toggle("Show video keywords", isOn: $showKeywords)
Spacer() }
#endif
} }
private var playerSidebarSection: some View { private var sidebarPicker: some View {
Section(header: Text("Player Sidebar")) { Picker("Sidebar", selection: $playerSidebar) {
Picker("Player Sidebar", selection: $playerSidebar) {
#if os(macOS) #if os(macOS)
Text("Show").tag(PlayerSidebarSetting.always) Text("Show sidebar").tag(PlayerSidebarSetting.always)
#endif #endif
#if os(iOS) #if os(iOS)
Text("Show when space permits").tag(PlayerSidebarSetting.whenFits) Text("Show sidebar when space permits").tag(PlayerSidebarSetting.whenFits)
#endif #endif
Text("Hide").tag(PlayerSidebarSetting.never) Text("Hide sidebar").tag(PlayerSidebarSetting.never)
} }
.labelsHidden() .labelsHidden()
@ -62,4 +76,3 @@ struct PlaybackSettings: View {
#endif #endif
} }
} }
}