Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2026-05-12 10:25:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Let tvOS chapter capsule grow with its title

Browse Source
This commit is contained in:
Arkadiusz Fal
2026-04-15 20:21:51 +02:00
parent 851c7e2ebf
commit d4f8cade90
2 changed files with 58 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Yattee/Views/Player/tvOS/TVPlayerProgressBar.swift
View File

@@ -215,22 +215,25 @@ struct TVPlayerProgressBar: View {
if isScrubbing {
let seekTime = scrubTime ?? currentTime
let currentChapter = showChapters ? chapters.last(where: { $0.startTime <= seekTime }) : nil
// Panel is 320 thumbnail + 4pt horizontal padding * 2 = 328, plus shadow.
// Use a slightly larger value for x-clamping to keep shadow inside screen.
let previewWidth: CGFloat = 344
// Panel height (thumbnail 180 + 6pt vertical padding * 2 = 192) plus
// optional chapter capsule (~36pt) and 8pt VStack spacing.
let previewHeight: CGFloat = currentChapter != nil ? 244 : 200
let halfWidth = previewWidth / 2
let clampedX = max(halfWidth, min(geometry.size.width - halfWidth, geometry.size.width * progress))
let yPosition = -previewHeight / 2 - 16
// Storyboard panel is 320 thumbnail + 4pt horizontal padding * 2 = 328, plus shadow.
// Use a slightly larger clamp width so the shadow stays on screen.
let panelWidth: CGFloat = 344
// Panel height: thumbnail 180 + 4pt vertical padding * 2 = 188 (round up for shadow).
let panelHeight: CGFloat = 200
let capsuleSpacing: CGFloat = 8
// Approximate capsule height (24pt text + 6pt padding * 2 + shadow) — used only
// for vertical positioning, not for layout sizing.
let capsuleApproxHeight: CGFloat = 44
VStack(spacing: 8) {
if let currentChapter {
TVChapterCapsuleView(title: currentChapter.title)
.frame(maxWidth: 320)
}
let xTarget = geometry.size.width * progress
let halfPanel = panelWidth / 2
let clampedPanelX = max(halfPanel, min(geometry.size.width - halfPanel, xTarget))
let panelCenterY = -panelHeight / 2 - 16
let capsuleCenterY = -panelHeight - 16 - capsuleSpacing - capsuleApproxHeight / 2
ZStack {
// Storyboard panel — follows scrub handle, tight horizontal clamp.
Group {
if let storyboard {
TVSeekPreviewView(
storyboard: storyboard,
@@ -250,7 +253,16 @@ struct TVPlayerProgressBar: View {
}
}
.fixedSize()
.position(x: clampedX, y: yPosition)
.position(x: clampedPanelX, y: panelCenterY)
// Chapter capsule — sized to its title (up to screen width minus margin),
// positioned to follow the scrub handle and clamped to stay on screen.
if let currentChapter {
TVChapterCapsuleView(title: currentChapter.title)
.positioned(xTarget: xTarget, availableWidth: geometry.size.width)
.position(x: geometry.size.width / 2, y: capsuleCenterY)
}
}
.transition(.scale.combined(with: .opacity))
.allowsHitTesting(false)
}

15
Yattee/Views/Player/tvOS/TVSeekPreviewView.swift
View File

@@ -28,6 +28,21 @@ struct TVChapterCapsuleView: View {
)
.shadow(radius: 4)
}
/// Returns this capsule horizontally positioned so its center follows `xTarget`
/// and clamped to stay within `margin` of each edge of `availableWidth`. The
/// capsule keeps its intrinsic text width (single-line, truncated if it cannot
/// fit). Wrap the result in `.position(...)` to place it vertically; it occupies
/// the full `availableWidth` horizontally.
func positioned(xTarget: CGFloat, availableWidth: CGFloat, margin: CGFloat = 40) -> some View {
self
.alignmentGuide(.leading) { d in
let targetLeading = xTarget - d.width / 2
let clampedLeading = max(margin, min(availableWidth - d.width - margin, targetLeading))
return -clampedLeading
}
.frame(width: availableWidth, alignment: .leading)
}
}
/// Preview thumbnail displayed during scrubbing on tvOS.