Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add dynamic hoursRemaining when under a day to cutoff #322

Merged
merged 3 commits into from
Feb 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions Nudge/UI/ContentView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -92,6 +93,7 @@ struct ContentView: View {
viewObserved.allowButtons = false
}
viewObserved.daysRemaining = Utils().getNumberOfDaysBetween()
viewObserved.hoursRemaining = Utils().getNumberOfHoursBetween()
}
}

Expand Down
16 changes: 8 additions & 8 deletions Nudge/UI/SimpleMode/SimpleMode.swift
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,19 @@ 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))
if 0 >= viewObserved.daysRemaining && !Utils().demoModeEnabled() {
Text("Hours Remaining To Update:".localized(desiredLanguage: getDesiredLanguage()))
Spacer()
Text(String(viewObserved.hoursRemaining))
.foregroundColor(.red)
.font(.title2)
.fontWeight(.bold)
} else {
Text("Days Remaining To Update:".localized(desiredLanguage: getDesiredLanguage()))
Spacer()
Text(String(viewObserved.daysRemaining))
.font(.title2)
.fontWeight(.bold)
.foregroundColor(.secondary)
}
}

Expand Down
12 changes: 7 additions & 5 deletions Nudge/UI/StandardMode/LeftSide.swift
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,17 @@ struct StandardModeLeftSide: View {
.foregroundColor(.secondary)
}

// Days Remaining
// Days or Hours Remaining
HStack{
Text("Days Remaining To Update:".localized(desiredLanguage: getDesiredLanguage()))
Spacer()
if viewObserved.daysRemaining <= 0 && !Utils().demoModeEnabled() {
Text(String(viewObserved.daysRemaining))
if 0 >= viewObserved.daysRemaining && !Utils().demoModeEnabled() {
Text("Hours Remaining To Update:".localized(desiredLanguage: getDesiredLanguage()))
Spacer()
Text(String(viewObserved.hoursRemaining))
.foregroundColor(.red)
.fontWeight(.bold)
} else {
Text("Days Remaining To Update:".localized(desiredLanguage: getDesiredLanguage()))
Spacer()
Text(String(viewObserved.daysRemaining))
.foregroundColor(.secondary)
}
Expand Down
3 changes: 3 additions & 0 deletions Nudge/Utilities/Utils.swift
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,9 @@ struct Utils {
}

func getNumberOfHoursBetween() -> Int {
if Utils().demoModeEnabled() {
return 24
}
return Int(requiredInstallationDate.timeIntervalSince(getCurrentDate()) / 3600 )
}

Expand Down
2 changes: 2 additions & 0 deletions de.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
"Required OS Version:" = "Erforderliche Betriebssystemversion:";
// Days Remaining To update
"Days Remaining To Update:" = "Verbleibende Tage bis zur Aktualisierung:";
// Hours Remaining To Update
"Hours Remaining To Update:" = "Stunden bis zur Aktualisierung:";
// Deferred Count
"Deferred Count:" = "Anzahl Aufschübe:";
// More Info
Expand Down
2 changes: 2 additions & 0 deletions en.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
"Required OS Version:" = "Required OS Version:";
// Days Remaining To Update
"Days Remaining To Update:" = "Days Remaining To Update:";
// Hours Remaining To Update
"Hours Remaining To Update:" = "Hours Remaining To Update:";
// Deferred Count
"Deferred Count:" = "Deferred Count:";
// More Info
Expand Down
2 changes: 2 additions & 0 deletions es.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
"Required OS Version:" = "Versión Requerida Del Sistema Operativo:";
// Days Remaining To Update
"Days Remaining To Update:" = "Días Restantes Para Actualizar:";
// Hours Remaining To Update
"Hours Remaining To Update:" = "Horas Restantes Para Actualizar:";
// Deferred Count
"Deferred Count:" = "Recuento diferido:";
// More Info
Expand Down
2 changes: 2 additions & 0 deletions fr.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
"Required OS Version:" = "Version du système d'exploitation requise :";
// Days Remaining To Update
"Days Remaining To Update:" = "Jours restants :";
// Hours Remaining To Update
"Hours Remaining To Update:" = "Heures restants :";
// Deferred Count
"Deferred Count:" = "Décompte différé :";
// More Info
Expand Down
2 changes: 2 additions & 0 deletions hi.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
"Required OS Version:" = "आवश्यक OS संस्करण:";
// Days Remaining To Update
"Days Remaining To Update:" = "अप्डेट के अवशिष्ट दिन:";
// Hours Remaining To Update
"Hours Remaining To Update:" = "अप्डेट के अवशिष्ट घंटे:";
// Deferred Count
"Deferred Count:" = "विलम्बित करने की संख्या:";
// More Info
Expand Down
2 changes: 2 additions & 0 deletions it.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
"Required OS Version:" = "Sistema operativo richiesto:";
// Days Remaining To Update
"Days Remaining To Update:" = "Giorni rimanenti per l'aggiornamento:";
// Hours Remaining To Update
"Hours Remaining To Update:" = "Ore rimanenti per l'aggiornamento:";
// Deferred Count
"Deferred Count:" = "Conteggio posticipi:";
// More Info
Expand Down
2 changes: 2 additions & 0 deletions ja.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
"Required OS Version:" = "必要とされるOSのバージョン:";
// Days Remaining To Update
"Days Remaining To Update:" = "更新までの残り日数:";
// Hours Remaining To Update
"Hours Remaining To Update:" = "更新までの残り時間:";
// Deferred Count
"Deferred Count:" = "延期した回数:";
// More Info
Expand Down
4 changes: 3 additions & 1 deletion ko.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@
// Required OS Version
"Required OS Version:" = "운영체제의 필수 버전:";
// Days Remaining To Update
"Days Remaining To Update:" = "업데이트까지 남은 시일:";
"Days Remaining To Update:" = "업데이트까지 남은 일수:";
// Hours Remaining To Update
"Hours Remaining To Update:" = "업데이트까지 남은 시간:";
// Deferred Count
"Deferred Count:" = "지연된 횟수:";
// More Info
Expand Down
2 changes: 2 additions & 0 deletions nb.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
"Required OS Version:" = "Påkrevd OS-versjon:";
// Days Remaining To Update
"Days Remaining To Update:" = "Resterende dager:";
// Hours Remaining To Update
"Hours Remaining To Update:" = "Resterende timer:";
// Deferred Count
"Deferred Count:" = "Utsatt antall ganger:";
// More Info
Expand Down
2 changes: 2 additions & 0 deletions nl.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
"Required OS Version:" = "Vereiste OS Versie:";
// Days Remaining To Update
"Days Remaining To Update:" = "Aantal dagen tot update deadline:";
// Hours Remaining To Update
"Hours Remaining To Update:" = "Aantal uren tot update deadline:";
// Deferred Count
"Deferred Count:" = "Aantal keren genegeerd:";
// More Info
Expand Down
2 changes: 2 additions & 0 deletions pt.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
"Required OS Version:" = "Versão Necessária do Sistema Operacional:";
// Days Remaining To Update
"Days Remaining To Update:" = "Dias Restantes Para Atualizar:";
// Hours Remaining To Update
"Hours Remaining To Update:" = "Horas Restantes Para Atualizar:";
// Deferred Count
"Deferred Count:" = "Contagem Adiada:";
// More Info
Expand Down
2 changes: 2 additions & 0 deletions ru.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
"Required OS Version:" = "Требуемая версия:";
// Days Remaining To Update
"Days Remaining To Update:" = "Осталось дней:";
// Hours Remaining To Update
"Hours Remaining To Update:" = "Осталось Часов:";
// Deferred Count
"Deferred Count:" = "Откладывали раз:";
// More Info
Expand Down
2 changes: 2 additions & 0 deletions sv.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
"Required OS Version:" = "Krävd OS-version:";
// Days Remaining To Update
"Days Remaining To Update:" = "Kvarstående dagar:";
// Hours Remaining To Update
"Hours Remaining To Update:" = "Kvarstående timmar:";
// Deferred Count
"Deferred Count:" = "Uppskjuten antal gånger:";
// More Info
Expand Down
2 changes: 2 additions & 0 deletions zh.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
"Required OS Version:" = "需要的系统版本:";
// Days Remaining To Update
"Days Remaining To Update:" = "剩余天数更新:";
// Hours Remaining To Update
"Hours Remaining To Update:" = "剩餘時間更新:";
// Deferred Count
"Deferred Count:" = "已推迟次数:";
// More Info
Expand Down