mirror of
https://github.com/yattee/yattee.git
synced 2026-10-23 13:12:53 +00:00
c33d125553
Phase 2 of the player panels redesign: - New "Details Panel" screen in Player Controls settings: page reorder/enable list with per-page editor (info element toggles), and a default panel visibility picker (hidden/visible/remember). - PlayerControlsSettingsViewModel gains panelSettings bindings with the usual debounced-save flow; the last enabled page cannot be disabled. - Built-in presets bumped to v9 with explicit default panelSettings. - The preset's default visibility now drives the wide-layout panel on player open and on entering landscape, replacing the hard hidden resets; "remember" restores the new detailsPanelLastVisible setting recorded on user toggles. Applied once per expanded player session (flag on NavigationCoordinator survives re-mounts). - WideScreenPlayerLayout picks up external visibility writes so the async-loaded default reaches the mounted layout. - Unit tests for PanelSettings Codable compatibility (round-trip, old JSON, unknown page types/discriminators/enum values); removed stale PlayerInfoTab tests left from Phase 1.
352 lines
13 KiB
Swift
352 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 = 9
|
|
|
|
// 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,
|
|
panelSettings: .default
|
|
)
|
|
}
|
|
|
|
/// 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(),
|
|
panelSettings: .default
|
|
)
|
|
}
|
|
|
|
/// 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,
|
|
panelSettings: .default
|
|
)
|
|
}
|
|
|
|
/// 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(),
|
|
panelSettings: .default
|
|
)
|
|
}
|
|
|
|
/// All built-in presets for the given device class.
|
|
static func allBuiltIn(for deviceClass: DeviceClass = .current) -> [LayoutPreset] {
|
|
[defaultPreset(for: deviceClass), minimalPreset(for: deviceClass)]
|
|
}
|
|
}
|