mirror of
https://github.com/yattee/yattee.git
synced 2024-12-22 21:43:41 +00:00
Show keywords setting
This commit is contained in:
parent
c69d60f3ee
commit
2fcbe94e6f
@ -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: [])
|
||||||
|
|
||||||
|
@ -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,25 +341,27 @@ struct VideoDetails: View {
|
|||||||
.foregroundColor(.secondary)
|
.foregroundColor(.secondary)
|
||||||
}
|
}
|
||||||
|
|
||||||
ScrollView(.horizontal, showsIndicators: showScrollIndicators) {
|
if showKeywords {
|
||||||
HStack {
|
ScrollView(.horizontal, showsIndicators: showScrollIndicators) {
|
||||||
ForEach(video.keywords, id: \.self) { keyword in
|
HStack {
|
||||||
HStack(alignment: .center, spacing: 0) {
|
ForEach(video.keywords, id: \.self) { keyword in
|
||||||
Text("#")
|
HStack(alignment: .center, spacing: 0) {
|
||||||
.font(.system(size: 11).bold())
|
Text("#")
|
||||||
|
.font(.system(size: 11).bold())
|
||||||
|
|
||||||
Text(keyword)
|
Text(keyword)
|
||||||
.frame(maxWidth: 500)
|
.frame(maxWidth: 500)
|
||||||
|
}
|
||||||
|
.font(.caption)
|
||||||
|
.foregroundColor(.white)
|
||||||
|
.padding(.vertical, 4)
|
||||||
|
.padding(.horizontal, 8)
|
||||||
|
.background(Color("VideoDetailLikesSymbolColor"))
|
||||||
|
.mask(RoundedRectangle(cornerRadius: 3))
|
||||||
}
|
}
|
||||||
.font(.caption)
|
|
||||||
.foregroundColor(.white)
|
|
||||||
.padding(.vertical, 4)
|
|
||||||
.padding(.horizontal, 8)
|
|
||||||
.background(Color("VideoDetailLikesSymbolColor"))
|
|
||||||
.mask(RoundedRectangle(cornerRadius: 3))
|
|
||||||
}
|
}
|
||||||
|
.padding(.bottom, 10)
|
||||||
}
|
}
|
||||||
.padding(.bottom, 10)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -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,40 +39,40 @@ struct PlaybackSettings: View {
|
|||||||
.pickerStyle(.inline)
|
.pickerStyle(.inline)
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
#if os(iOS)
|
|
||||||
if idiom == .pad {
|
|
||||||
playerSidebarSection
|
|
||||||
}
|
|
||||||
#elseif os(macOS)
|
|
||||||
playerSidebarSection
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if os(macOS)
|
|
||||||
Spacer()
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private var playerSidebarSection: some View {
|
private var playerSection: some View {
|
||||||
Section(header: Text("Player Sidebar")) {
|
Section(header: Text("Player")) {
|
||||||
Picker("Player Sidebar", selection: $playerSidebar) {
|
|
||||||
#if os(macOS)
|
|
||||||
Text("Show").tag(PlayerSidebarSetting.always)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if os(iOS)
|
|
||||||
Text("Show when space permits").tag(PlayerSidebarSetting.whenFits)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
Text("Hide").tag(PlayerSidebarSetting.never)
|
|
||||||
}
|
|
||||||
.labelsHidden()
|
|
||||||
|
|
||||||
#if os(iOS)
|
#if os(iOS)
|
||||||
.pickerStyle(.automatic)
|
if idiom == .pad {
|
||||||
#elseif os(tvOS)
|
sidebarPicker
|
||||||
.pickerStyle(.inline)
|
}
|
||||||
|
#elseif os(macOS)
|
||||||
|
sidebarPicker
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Toggle("Show video keywords", isOn: $showKeywords)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private var sidebarPicker: some View {
|
||||||
|
Picker("Sidebar", selection: $playerSidebar) {
|
||||||
|
#if os(macOS)
|
||||||
|
Text("Show sidebar").tag(PlayerSidebarSetting.always)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if os(iOS)
|
||||||
|
Text("Show sidebar when space permits").tag(PlayerSidebarSetting.whenFits)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
Text("Hide sidebar").tag(PlayerSidebarSetting.never)
|
||||||
|
}
|
||||||
|
.labelsHidden()
|
||||||
|
|
||||||
|
#if os(iOS)
|
||||||
|
.pickerStyle(.automatic)
|
||||||
|
#elseif os(tvOS)
|
||||||
|
.pickerStyle(.inline)
|
||||||
|
#endif
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user