fix: progress bar and animation with 5.2

JohanDegraeve · Jun 9, 2024 · a35c6c5 · a35c6c5
1 parent 5a1dbde
commit a35c6c5
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/xdrip/View Controllers/Root View Controller/RootViewController.swift b/xdrip/View Controllers/Root View Controller/RootViewController.swift
@@ -2766,7 +2766,7 @@ final class RootViewController: UIViewController, ObservableObject {
 
 
             // disable the chart animation if it's just a normal update, enable it if the call comes from didAppear()
-            if animate {
+            if animate && UserDefaults.standard.animateProgressBar {
                 self.pieChartOutlet.animDuration = ConstantsStatistics.pieChartAnimationSpeed
             } else {
                 self.pieChartOutlet.animDuration = 0
@@ -3147,7 +3147,12 @@ final class RootViewController: UIViewController, ObservableObject {
                         } else {
 
                             // fill in the labels to show sensor time elapsed and max age
-                            dataSourceSensorCurrentAgeOutlet.text = sensorStartDate?.daysAndHoursAgo()
+                            if UserDefaults.standard.reverseProgressBar {
+                                dataSourceSensorCurrentAgeOutlet.text = sensorTimeLeftInMinutes.minutesToDaysAndHours()
+                            } else {
+                                dataSourceSensorCurrentAgeOutlet.text = sensorStartDate?.daysAndHoursAgo()
+                            }
+
 
                             dataSourceSensorMaxAgeOutlet.text = " / " + sensorMaxAgeInMinutes.minutesToDaysAndHours()
 
@@ -3157,7 +3162,11 @@ final class RootViewController: UIViewController, ObservableObject {
                 } else {
 
                     // fill in the labels to show sensor time elapsed and max age
-                    dataSourceSensorCurrentAgeOutlet.text = sensorStartDate?.daysAndHoursAgo()
+                    if UserDefaults.standard.reverseProgressBar {
+                        dataSourceSensorCurrentAgeOutlet.text = sensorTimeLeftInMinutes.minutesToDaysAndHours()
+                    } else {
+                        dataSourceSensorCurrentAgeOutlet.text = sensorStartDate?.daysAndHoursAgo()
+                    }
 
                     dataSourceSensorMaxAgeOutlet.text = " / " + sensorMaxAgeInMinutes.minutesToDaysAndHours()