Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2026-04-10 17:46:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deduplicate time formatting and clean up unused code

Browse Source 
Extract shared TimeInterval.formattedAsTimestamp replacing 8 identical
formatTime/formattedTime implementations across player views. Remove
unused currentTime parameter from GestureSeekPreviewView. Consolidate
duplicated geometry math in MacOSControlBar into seekPreviewPosition().
This commit is contained in:
Arkadiusz Fal
2026-03-28 14:09:25 +01:00
parent e50817c043
commit 44f3cbb9f3
12 changed files with 68 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,7 +160,7 @@ struct TVPlayerProgressBar: View {
.foregroundStyle(.red)
}
} else {
Text(formatTime(displayTime))
Text(displayTime.formattedAsTimestamp)
.monospacedDigit()
.font(.subheadline)
.fontWeight(isScrubbing ? .semibold : .regular)
@@ -184,7 +184,7 @@ struct TVPlayerProgressBar: View {
// Remaining time (only for non-live)
if !isLive {
Text("-\(formatTime(max(0, duration - displayTime)))")
Text("-\(max(0, duration - displayTime).formattedAsTimestamp)")
.monospacedDigit()
.font(.subheadline)
.foregroundStyle(.white.opacity(0.7))
@@ -202,7 +202,7 @@ struct TVPlayerProgressBar: View {
.transition(.scale.combined(with: .opacity))
} else {
// Fallback when no storyboard available
Text(formatTime(scrubTime ?? currentTime))
Text((scrubTime ?? currentTime).formattedAsTimestamp)
.font(.system(size: 48, weight: .medium))
.monospacedDigit()
.foregroundStyle(.white)
@@ -329,19 +329,6 @@ struct TVPlayerProgressBar: View {
}
}
// MARK: - Formatting
private func formatTime(_ time: TimeInterval) -> String {
let totalSeconds = Int(max(0, time))
let hours = totalSeconds / 3600
let minutes = (totalSeconds % 3600) / 60
let seconds = totalSeconds % 60
if hours > 0 {
return String(format: "%d:%02d:%02d", hours, minutes, seconds)
}
return String(format: "%d:%02d", minutes, seconds)
}
}
// MARK: - Pan Gesture View

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

@@ -23,19 +23,6 @@ struct TVSeekPreviewView: View {
chapters.last { $0.startTime <= seekTime }
}
private var formattedTime: String {
let totalSeconds = Int(seekTime)
let hours = totalSeconds / 3600
let minutes = (totalSeconds % 3600) / 60
let seconds = totalSeconds % 60
if hours > 0 {
return String(format: "%d:%02d:%02d", hours, minutes, seconds)
} else {
return String(format: "%d:%02d", minutes, seconds)
}
}
private let thumbnailWidth: CGFloat = 320
var body: some View {
@@ -69,7 +56,7 @@ struct TVSeekPreviewView: View {
}
// Timestamp overlaid at bottom center (larger for TV)
Text(formattedTime)
Text(seekTime.formattedAsTimestamp)
.font(.system(size: 36, weight: .medium))
.monospacedDigit()
.foregroundStyle(.white)