feat: toggle between duration and time remaining

godly-devotion · Mar 28, 2024 · 45086e1 · 45086e1
1 parent e847002
commit 45086e1
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 16 deletions.
diff --git a/Front Row/Support/Extensions.swift b/Front Row/Support/Extensions.swift
@@ -119,8 +119,19 @@ extension NSSize {
     }
 }
 
-extension Double {
-    var asTimecode: String {
-        Duration.seconds(self).formatted(.time(pattern: .hourMinuteSecond(padHourToLength: 0)))
+extension TimeInterval {
+    /// Returns value as timecode string.
+    /// - Parameter longestTime: Used to determine if hour should be displayed
+    /// - Returns: 0:00 or 0:00:00
+    ///
+    func asTimecode(using longestTime: TimeInterval) -> String {
+        let hasHour = (longestTime / 3600.0) > 1.0
+        if hasHour {
+            return Duration.seconds(self).formatted(
+                .time(pattern: .hourMinuteSecond(padHourToLength: 0)))
+        } else {
+            return Duration.seconds(self).formatted(
+                .time(pattern: .minuteSecond(padMinuteToLength: 2)))
+        }
     }
 }
diff --git a/Front Row/Support/PlayEngine.swift b/Front Row/Support/PlayEngine.swift
@@ -49,6 +49,8 @@ import SwiftUI
 
     private(set) var duration: TimeInterval = 0.0
 
+    private(set) var timeRemaining: TimeInterval = 0.0
+
     private var _isMuted = false
 
     var isMuted: Bool {
@@ -285,9 +287,10 @@ import SwiftUI
             guard let self else { return }
             _currentTime = time.seconds
 
-            guard let seconds = player.currentItem?.duration.seconds else { return }
-            guard !seconds.isNaN && !seconds.isInfinite else { return }
-            duration = seconds
+            guard let duration = player.currentItem?.duration.seconds else { return }
+            guard !duration.isNaN && !duration.isInfinite else { return }
+            self.duration = duration
+            timeRemaining = duration - _currentTime
         }
     }
 

diff --git a/Front Row/Views/PlayerControlsView.swift b/Front Row/Views/PlayerControlsView.swift
@@ -9,7 +9,9 @@ import SwiftUI
 
 struct PlayerControlsView: View {
     @Environment(PlayEngine.self) private var playEngine: PlayEngine
-    private let foregroundColor = Color.white.opacity(0.8)
+    @AppStorage("ShowTimeRemaining") var showTimeRemaining = true
+    private let foregroundColor = Color.white.opacity(0.7)
+    private let disabledControlTextColor = Color(nsColor: NSColor.disabledControlTextColor)
 
     var body: some View {
         @Bindable var playEngine = playEngine
@@ -62,20 +64,34 @@ struct PlayerControlsView: View {
             .disabled(!playEngine.isLoaded)
 
             // MARK: Current time
-            Text(verbatim: playEngine.currentTime.asTimecode)
+            Text(verbatim: playEngine.currentTime.asTimecode(using: playEngine.duration))
                 .font(.system(size: 11))
-                .foregroundStyle(foregroundColor)
-                .frame(width: 50, alignment: .center)
+                .foregroundStyle(playEngine.isLoaded ? foregroundColor : disabledControlTextColor)
+                .frame(minWidth: 50, alignment: .center)
 
             // MARK: Seek slider
             SeekSliderView(value: $playEngine.currentTime, maxValue: playEngine.duration)
                 .disabled(!playEngine.isLoaded)
 
-            // MARK: Time remaining
-            Text(verbatim: playEngine.duration.asTimecode)
-                .font(.system(size: 11))
-                .foregroundStyle(foregroundColor)
-                .frame(width: 50, alignment: .center)
+            // MARK: Time remaining or Duration
+            Text(
+                verbatim: showTimeRemaining
+                    ? "-\(playEngine.timeRemaining.asTimecode(using: playEngine.duration))"
+                    : playEngine.duration.asTimecode(using: playEngine.duration)
+            )
+            .font(.system(size: 11))
+            .foregroundStyle(playEngine.isLoaded ? foregroundColor : disabledControlTextColor)
+            .frame(minWidth: 50, alignment: .center)
+            .onHover { inside in
+                if inside {
+                    NSCursor.pointingHand.push()
+                } else {
+                    NSCursor.pop()
+                }
+            }
+            .onTapGesture {
+                showTimeRemaining.toggle()
+            }
         }
         .padding([.horizontal], 16)
         .padding([.vertical], 8)

diff --git a/Front Row/Views/SeekSliderView.swift b/Front Row/Views/SeekSliderView.swift
@@ -82,7 +82,7 @@ struct SeekSliderView: NSViewRepresentable {
                 knobRect.width,
                 knobHeight)
             let path = NSBezierPath(roundedRect: rect, xRadius: knobRadius, yRadius: knobRadius)
-            NSColor.white.withAlphaComponent(0.8).setFill()
+            NSColor.white.withAlphaComponent(0.7).setFill()
             path.fill()
         }