add dynamic hoursRemaining when under a day to cutoff

macadmins · Feb 22, 2022 · 768f5cb · 768f5cb · dan-snelson · Feb 22, 2022
1 parent bf04912
commit 768f5cb
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 16 deletions.
diff --git a/Nudge/UI/ContentView.swift b/Nudge/UI/ContentView.swift
@@ -23,6 +23,7 @@ class ViewState: ObservableObject {
     @Published var hasLoggedPastRequiredInstallationDate = false
     @Published var hasLoggedRequireDualQuitButtons = false
     @Published var hasLoggedRequireMajorUgprade = false
+    @Published var hoursRemaining = Utils().getNumberOfHoursBetween()
     @Published var lastRefreshTime = Utils().getInitialDate()
     @Published var requireDualQuitButtons = false
     @Published var shouldExit = false
@@ -92,6 +93,7 @@ struct ContentView: View {
             viewObserved.allowButtons = false
         }
         viewObserved.daysRemaining = Utils().getNumberOfDaysBetween()
+        viewObserved.hoursRemaining = Utils().getNumberOfHoursBetween()
     }
 }
 

diff --git a/Nudge/UI/SimpleMode/SimpleMode.swift b/Nudge/UI/SimpleMode/SimpleMode.swift
@@ -41,19 +41,27 @@ struct SimpleMode: View {
                         .fontWeight(.bold)
                 }
 
-                // Days Remaining
+                // Days or Hours Remaining
                 HStack(spacing: 3.5) {
-                    Text("Days Remaining To Update:".localized(desiredLanguage: getDesiredLanguage()))
-                        .font(.title2)
-                    if viewObserved.daysRemaining <= 0 && !Utils().demoModeEnabled() {
-                        Text(String(viewObserved.daysRemaining))
-                            .foregroundColor(.red)
-                            .font(.title2)
-                            .fontWeight(.bold)
+                    if 24 >= viewObserved.hoursRemaining {
+                        Text("Days Remaining To Update:".localized(desiredLanguage: getDesiredLanguage()))
+                    } else {
+                        Text("Hours Remaining To Update:".localized(desiredLanguage: getDesiredLanguage()))
+                    }
+                    Spacer()
+                    if 0 >= viewObserved.daysRemaining && !Utils().demoModeEnabled() {
+                        if 24 >= viewObserved.hoursRemaining {
+                            Text(String(viewObserved.daysRemaining))
+                                .foregroundColor(.red)
+                                .fontWeight(.bold)
+                        } else {
+                            Text(String(viewObserved.hoursRemaining))
+                                .foregroundColor(.red)
+                                .fontWeight(.bold)
+                        }
                     } else {
                         Text(String(viewObserved.daysRemaining))
-                            .font(.title2)
-                            .fontWeight(.bold)
+                            .foregroundColor(.secondary)
                     }
                 }
 

diff --git a/Nudge/UI/StandardMode/LeftSide.swift b/Nudge/UI/StandardMode/LeftSide.swift
@@ -60,14 +60,24 @@ struct StandardModeLeftSide: View {
                             .foregroundColor(.secondary)
                     }
 
-                    // Days Remaining
+                    // Days or Hours Remaining
                     HStack{
-                        Text("Days Remaining To Update:".localized(desiredLanguage: getDesiredLanguage()))
+                        if 24 >= viewObserved.hoursRemaining {
+                            Text("Days Remaining To Update:".localized(desiredLanguage: getDesiredLanguage()))
+                        } else {
+                            Text("Hours Remaining To Update:".localized(desiredLanguage: getDesiredLanguage()))
+                        }
                         Spacer()
-                        if viewObserved.daysRemaining <= 0 && !Utils().demoModeEnabled() {
-                            Text(String(viewObserved.daysRemaining))
-                                .foregroundColor(.red)
-                                .fontWeight(.bold)
+                        if 0 >= viewObserved.daysRemaining && !Utils().demoModeEnabled() {
+                            if 24 >= viewObserved.hoursRemaining {
+                                Text(String(viewObserved.daysRemaining))
+                                    .foregroundColor(.red)
+                                    .fontWeight(.bold)
+                            } else {
+                                Text(String(viewObserved.hoursRemaining))
+                                    .foregroundColor(.red)
+                                    .fontWeight(.bold)
+                            }
                         } else {
                             Text(String(viewObserved.daysRemaining))
                                 .foregroundColor(.secondary)

diff --git a/Nudge/Utilities/Utils.swift b/Nudge/Utilities/Utils.swift
@@ -300,6 +300,9 @@ struct Utils {
     }
 
     func getNumberOfHoursBetween() -> Int {
+        if Utils().demoModeEnabled() {
+            return 24
+        }
         return Int(requiredInstallationDate.timeIntervalSince(getCurrentDate()) / 3600 )
     }