mirror of
https://github.com/yattee/yattee.git
synced 2026-07-20 14:22:02 +00:00
ca67d480ca
Playback menu seek items now follow the durations from the active player controls preset instead of hardcoded 10s/30s labels. AppEnvironment caches the active preset's center settings (refreshed on preset change notifications) so menu commands can read them synchronously. Add secondary seek durations (default 30s) to CenterSectionSettings, configurable on macOS in Seek Durations settings, used by Shift+arrows in the player and Cmd+Shift+arrows in the Playback menu. Also let Cmd-based key equivalents pass through the player keyboard monitor so menu shortcuts (e.g. Cmd+Option+arrow previous/next video) work while the player window has focus, and unify macOS built-in preset primary seek at 10s to match iOS/tvOS (built-in presets version 8).
348 lines
13 KiB
Swift
348 lines
13 KiB
Swift
//
|
|
// BuiltInPresets.swift
|
|
// Yattee
|
|
//
|
|
// Factory methods for built-in layout presets.
|
|
//
|
|
|
|
import Foundation
|
|
|
|
extension LayoutPreset {
|
|
/// Bump this version whenever any built-in preset definition changes.
|
|
/// On launch, the app compares this against the last-applied version
|
|
/// and replaces stale built-in presets with fresh copies from code.
|
|
static let builtInPresetsVersion = 8
|
|
|
|
// MARK: - Built-in Preset IDs
|
|
|
|
/// Stable UUIDs for built-in presets to ensure consistency across devices.
|
|
private enum BuiltInID {
|
|
static let defaultPreset = UUID(uuidString: "00000000-0000-0000-0000-000000000001")!
|
|
static let minimalPreset = UUID(uuidString: "00000000-0000-0000-0000-000000000002")!
|
|
}
|
|
|
|
// MARK: - Built-in Presets
|
|
|
|
/// Default preset with balanced controls for general use.
|
|
static func defaultPreset(for deviceClass: DeviceClass = .current) -> LayoutPreset {
|
|
LayoutPreset(
|
|
id: BuiltInID.defaultPreset,
|
|
name: String(localized: "controls.preset.default"),
|
|
createdAt: Date(timeIntervalSince1970: 0),
|
|
updatedAt: Date(timeIntervalSince1970: 0),
|
|
isBuiltIn: true,
|
|
deviceClass: deviceClass,
|
|
layout: deviceClass == .macOS ? macOSDefaultLayout() : standardDefaultLayout()
|
|
)
|
|
}
|
|
|
|
/// Default layout for iOS/tvOS (touch-oriented overlay controls).
|
|
private static func standardDefaultLayout() -> PlayerControlsLayout {
|
|
// Top buttons: titleAuthor (wideOnly), spacer, orientationLock, close
|
|
let topButtons: [ControlButtonConfiguration] = [
|
|
ControlButtonConfiguration(
|
|
buttonType: .titleAuthor,
|
|
visibilityMode: .wideOnly
|
|
),
|
|
.flexibleSpacer(),
|
|
ControlButtonConfiguration(
|
|
buttonType: .contextMenu,
|
|
visibilityMode: .wideOnly
|
|
),
|
|
.defaultConfiguration(for: .orientationLock),
|
|
.defaultConfiguration(for: .close)
|
|
]
|
|
|
|
// Bottom buttons: time, queue (wideOnly), playNext (wideOnly), spacer, contextMenu (wideOnly), settings, PiP, fullscreen
|
|
let bottomButtons: [ControlButtonConfiguration] = [
|
|
ControlButtonConfiguration(
|
|
buttonType: .timeDisplay,
|
|
settings: .timeDisplay(TimeDisplaySettings(format: .currentAndTotal))
|
|
),
|
|
ControlButtonConfiguration(
|
|
buttonType: .queue,
|
|
visibilityMode: .wideOnly
|
|
),
|
|
ControlButtonConfiguration(
|
|
buttonType: .playNext,
|
|
visibilityMode: .wideOnly
|
|
),
|
|
.flexibleSpacer(),
|
|
.defaultConfiguration(for: .settings),
|
|
.defaultConfiguration(for: .pictureInPicture),
|
|
.defaultConfiguration(for: .fullscreen)
|
|
]
|
|
|
|
// Center: all enabled, 10s seek, left=volume, right=brightness
|
|
let centerSettings = CenterSectionSettings(
|
|
showPlayPause: true,
|
|
showSeekBackward: true,
|
|
showSeekForward: true,
|
|
seekBackwardSeconds: 10,
|
|
seekForwardSeconds: 10,
|
|
leftSlider: .volume,
|
|
rightSlider: .brightness
|
|
)
|
|
|
|
// Global: plain style, medium buttons, system font
|
|
let globalSettings = GlobalLayoutSettings(
|
|
style: .plain,
|
|
buttonSize: .medium,
|
|
fontStyle: .system,
|
|
systemControlsMode: .seek,
|
|
systemControlsSeekDuration: .tenSeconds,
|
|
volumeMode: .mpv
|
|
)
|
|
|
|
// Gestures: tap 2x1 with seek, seek enabled, panscan with snap
|
|
let gesturesSettings = GesturesSettings(
|
|
tapGestures: TapGesturesSettings(
|
|
isEnabled: true,
|
|
layout: .horizontalSplit,
|
|
zoneConfigurations: [
|
|
TapZoneConfiguration(position: .left, action: .seekBackward(seconds: 10)),
|
|
TapZoneConfiguration(position: .right, action: .seekForward(seconds: 10))
|
|
]
|
|
),
|
|
seekGesture: SeekGestureSettings(isEnabled: false),
|
|
panscanGesture: PanscanGestureSettings(isEnabled: true, snapToEnds: true)
|
|
)
|
|
|
|
// Player pill: queue, previous, play/pause, next, close
|
|
let playerPillSettings = PlayerPillSettings(
|
|
visibility: .portraitOnly,
|
|
buttons: [
|
|
ControlButtonConfiguration(buttonType: .queue),
|
|
ControlButtonConfiguration(buttonType: .playPrevious),
|
|
ControlButtonConfiguration(buttonType: .playPause),
|
|
ControlButtonConfiguration(buttonType: .playNext),
|
|
ControlButtonConfiguration(buttonType: .close)
|
|
]
|
|
)
|
|
|
|
// Mini player: show video, tap for PiP
|
|
let miniPlayerSettings = MiniPlayerSettings()
|
|
|
|
return PlayerControlsLayout(
|
|
topSection: LayoutSection(buttons: topButtons),
|
|
centerSettings: centerSettings,
|
|
bottomSection: LayoutSection(buttons: bottomButtons),
|
|
globalSettings: globalSettings,
|
|
progressBarSettings: ProgressBarSettings(),
|
|
gesturesSettings: gesturesSettings,
|
|
playerPillSettings: playerPillSettings,
|
|
miniPlayerSettings: miniPlayerSettings
|
|
)
|
|
}
|
|
|
|
/// Default layout for macOS, mirroring the QuickTime-style control bar:
|
|
/// top bar with title/author, keep-on-top pin and close; capsule row with
|
|
/// volume slider, transport and trailing actions around flexible spacers.
|
|
private static func macOSDefaultLayout() -> PlayerControlsLayout {
|
|
let topButtons: [ControlButtonConfiguration] = [
|
|
.defaultConfiguration(for: .titleAuthor),
|
|
.flexibleSpacer(),
|
|
.defaultConfiguration(for: .keepOnTop),
|
|
.defaultConfiguration(for: .close)
|
|
]
|
|
|
|
let bottomButtons: [ControlButtonConfiguration] = [
|
|
ControlButtonConfiguration(
|
|
buttonType: .volume,
|
|
settings: .slider(SliderSettings(sliderBehavior: .alwaysVisible))
|
|
),
|
|
.flexibleSpacer(),
|
|
.defaultConfiguration(for: .queue),
|
|
.defaultConfiguration(for: .playPrevious),
|
|
.defaultConfiguration(for: .playPause),
|
|
.defaultConfiguration(for: .playNext),
|
|
.flexibleSpacer(),
|
|
.defaultConfiguration(for: .contextMenu),
|
|
.defaultConfiguration(for: .settings),
|
|
.defaultConfiguration(for: .pictureInPicture),
|
|
.defaultConfiguration(for: .fullscreen)
|
|
]
|
|
|
|
// On macOS center settings only drive seek amounts (keyboard arrows
|
|
// and default seek buttons).
|
|
let centerSettings = CenterSectionSettings(
|
|
showPlayPause: true,
|
|
showSeekBackward: true,
|
|
showSeekForward: true,
|
|
seekBackwardSeconds: 10,
|
|
seekForwardSeconds: 10,
|
|
leftSlider: .disabled,
|
|
rightSlider: .disabled
|
|
)
|
|
|
|
let globalSettings = GlobalLayoutSettings(
|
|
style: .plain,
|
|
buttonSize: .medium,
|
|
fontStyle: .system,
|
|
systemControlsMode: .seek,
|
|
systemControlsSeekDuration: .tenSeconds,
|
|
volumeMode: .mpv
|
|
)
|
|
|
|
return PlayerControlsLayout(
|
|
topSection: LayoutSection(buttons: topButtons),
|
|
centerSettings: centerSettings,
|
|
bottomSection: LayoutSection(buttons: bottomButtons),
|
|
globalSettings: globalSettings,
|
|
progressBarSettings: ProgressBarSettings(),
|
|
gesturesSettings: nil,
|
|
playerPillSettings: nil,
|
|
miniPlayerSettings: MiniPlayerSettings()
|
|
)
|
|
}
|
|
|
|
/// Minimal preset with stripped-down controls for distraction-free playback.
|
|
static func minimalPreset(for deviceClass: DeviceClass = .current) -> LayoutPreset {
|
|
LayoutPreset(
|
|
id: BuiltInID.minimalPreset,
|
|
name: String(localized: "controls.preset.minimal"),
|
|
createdAt: Date(timeIntervalSince1970: 0),
|
|
updatedAt: Date(timeIntervalSince1970: 0),
|
|
isBuiltIn: true,
|
|
deviceClass: deviceClass,
|
|
layout: deviceClass == .macOS ? macOSMinimalLayout() : standardMinimalLayout()
|
|
)
|
|
}
|
|
|
|
/// Minimal layout for iOS/tvOS.
|
|
private static func standardMinimalLayout() -> PlayerControlsLayout {
|
|
let topButtons: [ControlButtonConfiguration] = [
|
|
.flexibleSpacer(),
|
|
.defaultConfiguration(for: .close)
|
|
]
|
|
|
|
let bottomButtons: [ControlButtonConfiguration] = [
|
|
ControlButtonConfiguration(
|
|
buttonType: .timeDisplay,
|
|
settings: .timeDisplay(TimeDisplaySettings(format: .currentAndTotal))
|
|
),
|
|
.flexibleSpacer(),
|
|
.defaultConfiguration(for: .settings),
|
|
.defaultConfiguration(for: .pictureInPicture),
|
|
.defaultConfiguration(for: .fullscreen)
|
|
]
|
|
|
|
let centerSettings = CenterSectionSettings(
|
|
showPlayPause: true,
|
|
showSeekBackward: true,
|
|
showSeekForward: true,
|
|
seekBackwardSeconds: 10,
|
|
seekForwardSeconds: 10,
|
|
leftSlider: .disabled,
|
|
rightSlider: .disabled
|
|
)
|
|
|
|
let globalSettings = GlobalLayoutSettings(
|
|
style: .plain,
|
|
buttonSize: .medium,
|
|
fontStyle: .system,
|
|
systemControlsMode: .seek,
|
|
systemControlsSeekDuration: .tenSeconds,
|
|
volumeMode: .mpv
|
|
)
|
|
|
|
let gesturesSettings = GesturesSettings(
|
|
tapGestures: TapGesturesSettings(
|
|
isEnabled: true,
|
|
layout: .horizontalSplit,
|
|
zoneConfigurations: [
|
|
TapZoneConfiguration(position: .left, action: .seekBackward(seconds: 10)),
|
|
TapZoneConfiguration(position: .right, action: .seekForward(seconds: 10))
|
|
]
|
|
),
|
|
seekGesture: SeekGestureSettings(isEnabled: false),
|
|
panscanGesture: PanscanGestureSettings(isEnabled: true, snapToEnds: true)
|
|
)
|
|
|
|
let playerPillSettings = PlayerPillSettings(
|
|
visibility: .never,
|
|
buttons: [
|
|
ControlButtonConfiguration(buttonType: .queue),
|
|
ControlButtonConfiguration(buttonType: .playPrevious),
|
|
ControlButtonConfiguration(buttonType: .playPause),
|
|
ControlButtonConfiguration(buttonType: .playNext),
|
|
ControlButtonConfiguration(buttonType: .close)
|
|
]
|
|
)
|
|
|
|
let miniPlayerSettings = MiniPlayerSettings()
|
|
|
|
let progressBarSettings = ProgressBarSettings(
|
|
showChapters: false,
|
|
sponsorBlockSettings: SponsorBlockSegmentSettings(showSegments: false)
|
|
)
|
|
|
|
return PlayerControlsLayout(
|
|
topSection: LayoutSection(buttons: topButtons),
|
|
centerSettings: centerSettings,
|
|
bottomSection: LayoutSection(buttons: bottomButtons),
|
|
globalSettings: globalSettings,
|
|
progressBarSettings: progressBarSettings,
|
|
gesturesSettings: gesturesSettings,
|
|
playerPillSettings: playerPillSettings,
|
|
miniPlayerSettings: miniPlayerSettings
|
|
)
|
|
}
|
|
|
|
/// Minimal layout for macOS: bare play/pause and settings in the capsule,
|
|
/// close-only top bar, no chapters or SponsorBlock markers.
|
|
private static func macOSMinimalLayout() -> PlayerControlsLayout {
|
|
let topButtons: [ControlButtonConfiguration] = [
|
|
.flexibleSpacer(),
|
|
.defaultConfiguration(for: .close)
|
|
]
|
|
|
|
let bottomButtons: [ControlButtonConfiguration] = [
|
|
.flexibleSpacer(),
|
|
.defaultConfiguration(for: .playPause),
|
|
.flexibleSpacer(),
|
|
.defaultConfiguration(for: .settings)
|
|
]
|
|
|
|
let centerSettings = CenterSectionSettings(
|
|
showPlayPause: true,
|
|
showSeekBackward: true,
|
|
showSeekForward: true,
|
|
seekBackwardSeconds: 10,
|
|
seekForwardSeconds: 10,
|
|
leftSlider: .disabled,
|
|
rightSlider: .disabled
|
|
)
|
|
|
|
let globalSettings = GlobalLayoutSettings(
|
|
style: .plain,
|
|
buttonSize: .medium,
|
|
fontStyle: .system,
|
|
systemControlsMode: .seek,
|
|
systemControlsSeekDuration: .tenSeconds,
|
|
volumeMode: .mpv
|
|
)
|
|
|
|
let progressBarSettings = ProgressBarSettings(
|
|
showChapters: false,
|
|
sponsorBlockSettings: SponsorBlockSegmentSettings(showSegments: false)
|
|
)
|
|
|
|
return PlayerControlsLayout(
|
|
topSection: LayoutSection(buttons: topButtons),
|
|
centerSettings: centerSettings,
|
|
bottomSection: LayoutSection(buttons: bottomButtons),
|
|
globalSettings: globalSettings,
|
|
progressBarSettings: progressBarSettings,
|
|
gesturesSettings: nil,
|
|
playerPillSettings: nil,
|
|
miniPlayerSettings: MiniPlayerSettings()
|
|
)
|
|
}
|
|
|
|
/// All built-in presets for the given device class.
|
|
static func allBuiltIn(for deviceClass: DeviceClass = .current) -> [LayoutPreset] {
|
|
[defaultPreset(for: deviceClass), minimalPreset(for: deviceClass)]
|
|
}
|
|
}
|