From 5349b23f5479999f18de4765f885a3b7f921ea95 Mon Sep 17 00:00:00 2001
From: Ethan Pippin <ethanpippin2343@gmail.com>
Date: Fri, 20 Aug 2021 07:50:47 -0700
Subject: [PATCH 1/3] Add positive time ticker

---
 JellyfinPlayer/VideoPlayer.storyboard | 29 +++++++++++++-----
 JellyfinPlayer/VideoPlayer.swift      | 44 +++++++++++++++------------
 2 files changed, 46 insertions(+), 27 deletions(-)

diff --git a/JellyfinPlayer/VideoPlayer.storyboard b/JellyfinPlayer/VideoPlayer.storyboard
index 22e3c3b3..25bca725 100644
--- a/JellyfinPlayer/VideoPlayer.storyboard
+++ b/JellyfinPlayer/VideoPlayer.storyboard
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19115.3" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_5" orientation="landscape" appearance="light"/>
     <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19107.5"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
         <capability name="Image references" minToolsVersion="12.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
@@ -30,7 +29,7 @@
                                 <rect key="frame" x="0.0" y="0.0" width="896" height="414"/>
                                 <subviews>
                                     <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" minValue="0.0" maxValue="1" translatesAutoresizingMaskIntoConstraints="NO" id="e9f-8l-RdN" userLabel="SeekSlider">
-                                        <rect key="frame" x="50" y="355" width="689" height="31"/>
+                                        <rect key="frame" x="133" y="355" width="630" height="31"/>
                                         <color key="tintColor" red="0.66666666666666663" green="0.36078431372549019" blue="0.76470588235294112" alpha="1" colorSpace="calibratedRGB"/>
                                         <color key="thumbTintColor" red="0.66666666666666663" green="0.36078431372549019" blue="0.76470588235294112" alpha="1" colorSpace="calibratedRGB"/>
                                         <connections>
@@ -39,7 +38,7 @@
                                             <action selector="seekSliderValueChanged:" destination="Y6W-OH-hqX" eventType="valueChanged" id="tfF-Zl-CdU"/>
                                         </connections>
                                     </slider>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="-:--:--" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qft-iu-f1z">
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="-:--:--" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qft-iu-f1z" userLabel="Time Left Text">
                                         <rect key="frame" x="766" y="353" width="91" height="34"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="91" id="LbL-h0-EYA"/>
@@ -49,6 +48,16 @@
                                         <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <nil key="highlightedColor"/>
                                     </label>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="-:--:--" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="knf-PP-UIS" userLabel="Time Text">
+                                        <rect key="frame" x="39" y="353" width="91" height="34"/>
+                                        <constraints>
+                                            <constraint firstAttribute="width" constant="91" id="FcP-Mk-OIL"/>
+                                            <constraint firstAttribute="height" constant="34" id="yXx-PI-kXn"/>
+                                        </constraints>
+                                        <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="18"/>
+                                        <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="t2L-Oz-fe9" userLabel="MainActionButton">
                                         <rect key="frame" x="406.66666666666669" y="165.66666666666666" width="83" height="83"/>
                                         <constraints>
@@ -156,13 +165,16 @@
                                     <constraint firstItem="o8N-R1-DhT" firstAttribute="centerY" secondItem="riN-y1-ABZ" secondAttribute="centerY" id="Hs5-Bc-iPB"/>
                                     <constraint firstAttribute="bottom" secondItem="qft-iu-f1z" secondAttribute="bottom" constant="27" id="NPi-py-0qd"/>
                                     <constraint firstItem="rLx-SN-RHr" firstAttribute="leading" secondItem="Qcb-Fb-qZl" secondAttribute="leading" constant="30" id="Oe7-LK-6Tl"/>
+                                    <constraint firstItem="e9f-8l-RdN" firstAttribute="leading" secondItem="knf-PP-UIS" secondAttribute="trailing" constant="5" id="ShK-80-ij1"/>
                                     <constraint firstItem="t2L-Oz-fe9" firstAttribute="centerY" secondItem="Qcb-Fb-qZl" secondAttribute="centerY" id="TOk-sG-UXV"/>
+                                    <constraint firstItem="knf-PP-UIS" firstAttribute="leading" secondItem="Qcb-Fb-qZl" secondAttribute="leading" constant="39" id="XNC-Q4-nE0"/>
                                     <constraint firstItem="o8N-R1-DhT" firstAttribute="centerX" secondItem="t2L-Oz-fe9" secondAttribute="centerX" id="a5g-8U-9S5"/>
                                     <constraint firstAttribute="bottom" secondItem="qft-iu-f1z" secondAttribute="bottom" constant="27" id="aOB-Uz-cbQ"/>
-                                    <constraint firstItem="qft-iu-f1z" firstAttribute="leading" secondItem="e9f-8l-RdN" secondAttribute="trailing" constant="29" id="auL-Vv-ZMV"/>
+                                    <constraint firstItem="qft-iu-f1z" firstAttribute="leading" secondItem="e9f-8l-RdN" secondAttribute="trailing" constant="5" id="auL-Vv-ZMV"/>
                                     <constraint firstItem="bYM-Xp-bZO" firstAttribute="top" secondItem="An8-jF-FAY" secondAttribute="top" id="cVS-eI-vv2"/>
-                                    <constraint firstItem="e9f-8l-RdN" firstAttribute="leading" secondItem="Qcb-Fb-qZl" secondAttribute="leading" constant="52" id="ed3-xq-0Ug"/>
                                     <constraint firstItem="t2L-Oz-fe9" firstAttribute="leading" secondItem="bYM-Xp-bZO" secondAttribute="trailing" constant="118.5" id="fci-L5-1f6"/>
+                                    <constraint firstItem="e9f-8l-RdN" firstAttribute="centerX" secondItem="Qcb-Fb-qZl" secondAttribute="centerX" id="jFy-Sb-aYi"/>
+                                    <constraint firstAttribute="bottom" secondItem="knf-PP-UIS" secondAttribute="bottom" constant="27" id="nLN-ju-9qC"/>
                                     <constraint firstItem="o8N-R1-DhT" firstAttribute="leading" secondItem="rLx-SN-RHr" secondAttribute="trailing" constant="16" id="qnV-Qf-y9m"/>
                                     <constraint firstItem="rLx-SN-RHr" firstAttribute="top" secondItem="Qcb-Fb-qZl" secondAttribute="top" constant="22" id="v4G-B1-7y6"/>
                                 </constraints>
@@ -197,7 +209,8 @@
                         <outlet property="mainActionButton" destination="t2L-Oz-fe9" id="nQR-2e-64l"/>
                         <outlet property="playerSettingsButton" destination="riN-y1-ABZ" id="I6r-z9-Jy2"/>
                         <outlet property="seekSlider" destination="e9f-8l-RdN" id="b3H-tn-TPG"/>
-                        <outlet property="timeText" destination="qft-iu-f1z" id="pAX-J3-I53"/>
+                        <outlet property="timeLeftText" destination="qft-iu-f1z" id="cSg-fO-9nF"/>
+                        <outlet property="timeText" destination="knf-PP-UIS" id="KhK-BX-rqT"/>
                         <outlet property="titleLabel" destination="o8N-R1-DhT" id="E7D-iU-bMi"/>
                         <outlet property="upNextView" destination="CY9-gw-dv8" id="BP6-bc-6Vk"/>
                         <outlet property="videoContentView" destination="Tsh-rC-BwO" id="5uR-No-wLy"/>
diff --git a/JellyfinPlayer/VideoPlayer.swift b/JellyfinPlayer/VideoPlayer.swift
index cb76ed87..3a7f21e6 100644
--- a/JellyfinPlayer/VideoPlayer.swift
+++ b/JellyfinPlayer/VideoPlayer.swift
@@ -34,6 +34,7 @@ class PlayerViewController: UIViewController, GCKDiscoveryManagerListener, GCKRe
 
     @IBOutlet weak var upNextView: UIView!
     @IBOutlet weak var timeText: UILabel!
+    @IBOutlet weak var timeLeftText: UILabel!
     @IBOutlet weak var videoContentView: UIView!
     @IBOutlet weak var videoControlsView: UIView!
     @IBOutlet weak var seekSlider: UISlider!
@@ -102,16 +103,26 @@ class PlayerViewController: UIViewController, GCKDiscoveryManagerListener, GCKRe
     @IBAction func seekSliderValueChanged(_ sender: Any) {
         let videoDuration: Double = Double(manifest.runTimeTicks! / Int64(10_000_000))
         let secondsScrubbedTo = round(Double(seekSlider.value) * videoDuration)
-        let scrubRemaining = videoDuration - secondsScrubbedTo
-        let remainingTime = scrubRemaining
-        let hours = floor(remainingTime / 3600)
-        let minutes = (remainingTime.truncatingRemainder(dividingBy: 3600)) / 60
-        let seconds = (remainingTime.truncatingRemainder(dividingBy: 3600)).truncatingRemainder(dividingBy: 60)
+        let secondsScrubbedRemaining = videoDuration - secondsScrubbedTo
+        
+        timeText.text = calculateTimeText(from: secondsScrubbedTo)
+        timeLeftText.text = calculateTimeText(from: secondsScrubbedRemaining)
+    }
+    
+    private func calculateTimeText(from duration: Double) -> String {
+        let hours = floor(duration / 3600)
+        let minutes = (duration.truncatingRemainder(dividingBy: 3600)) / 60
+        let seconds = (duration.truncatingRemainder(dividingBy: 3600)).truncatingRemainder(dividingBy: 60)
+        
+        let timeText: String
+        
         if hours != 0 {
-            timeText.text = "\(Int(hours)):\(String(Int(floor(minutes))).leftPad(toWidth: 2, withString: "0")):\(String(Int(floor(seconds))).leftPad(toWidth: 2, withString: "0"))"
+            timeText = "\(Int(hours)):\(String(Int(floor(minutes))).leftPad(toWidth: 2, withString: "0")):\(String(Int(floor(seconds))).leftPad(toWidth: 2, withString: "0"))"
         } else {
-            timeText.text = "\(String(Int(floor(minutes))).leftPad(toWidth: 2, withString: "0")):\(String(Int(floor(seconds))).leftPad(toWidth: 2, withString: "0"))"
+            timeText = "\(String(Int(floor(minutes))).leftPad(toWidth: 2, withString: "0")):\(String(Int(floor(seconds))).leftPad(toWidth: 2, withString: "0"))"
         }
+        
+        return timeText
     }
 
     @IBAction func seekSliderEnd(_ sender: Any) {
@@ -791,17 +802,11 @@ extension PlayerViewController: GCKGenericChannelDelegate {
         }
 
         if isSeeking == false {
-            let remainingTime = (manifest.runTimeTicks! - Int64(remotePositionTicks))/10_000_000
-            let hours = remainingTime / 3600
-            let minutes = (remainingTime % 3600) / 60
-            let seconds = (remainingTime % 3600) % 60
-            var timeTextStr = ""
-            if hours != 0 {
-                timeTextStr = "\(Int(hours)):\(String(Int((minutes))).leftPad(toWidth: 2, withString: "0")):\(String(Int((seconds))).leftPad(toWidth: 2, withString: "0"))"
-            } else {
-                timeTextStr = "\(String(Int((minutes))).leftPad(toWidth: 2, withString: "0")):\(String(Int((seconds))).leftPad(toWidth: 2, withString: "0"))"
-            }
-            timeText.text = timeTextStr
+            let positiveSeconds = Double(remotePositionTicks/10_000_000)
+            let remainingSeconds = Double((manifest.runTimeTicks! - Int64(remotePositionTicks))/10_000_000)
+            
+            timeText.text = calculateTimeText(from: positiveSeconds)
+            timeLeftText.text = calculateTimeText(from: remainingSeconds)
 
             let playbackProgress = Float(remotePositionTicks) / Float(manifest.runTimeTicks!)
             seekSlider.setValue(playbackProgress, animated: true)
@@ -984,7 +989,8 @@ extension PlayerViewController: VLCMediaPlayerDelegate {
                 }
             }
 
-            timeText.text = String(mediaPlayer.remainingTime.stringValue.dropFirst())
+            timeText.text = mediaPlayer.time.stringValue
+            timeLeftText.text = String(mediaPlayer.remainingTime.stringValue.dropFirst())
 
             if CACurrentMediaTime() - controlsAppearTime > 5 {
                 self.smallNextUpView()

From de8f418c71a9411f35947d7f3db23f0008f01cbe Mon Sep 17 00:00:00 2001
From: Ele7o <superkokono@gmail.com>
Date: Sat, 21 Aug 2021 01:39:15 -0400
Subject: [PATCH 2/3] Added translation using Weblate (Vietnamese)

---
 Translations/vi.lproj/Localizable.strings | Bin 0 -> 4 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 Translations/vi.lproj/Localizable.strings

diff --git a/Translations/vi.lproj/Localizable.strings b/Translations/vi.lproj/Localizable.strings
new file mode 100644
index 0000000000000000000000000000000000000000..ed60b89c47319bc2c37b5775c777dddd6a16d56b
GIT binary patch
literal 4
LcmezWkBb2S2Mz)V

literal 0
HcmV?d00001


From 5adc27c2ce1136d6973427e3bcc257ad0bf28dde Mon Sep 17 00:00:00 2001
From: Jakob Tormalm <dualthrowaway@gmail.com>
Date: Sat, 21 Aug 2021 05:32:37 -0400
Subject: [PATCH 3/3] Added translation using Weblate (Swedish)

---
 Translations/sv.lproj/Localizable.strings | Bin 0 -> 4 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 Translations/sv.lproj/Localizable.strings

diff --git a/Translations/sv.lproj/Localizable.strings b/Translations/sv.lproj/Localizable.strings
new file mode 100644
index 0000000000000000000000000000000000000000..ed60b89c47319bc2c37b5775c777dddd6a16d56b
GIT binary patch
literal 4
LcmezWkBb2S2Mz)V

literal 0
HcmV?d00001