Add hideDeferralCount preferences

macadmins · Jul 28, 2021 · a2008e6 · a2008e6
1 parent 73cec7d
commit a2008e6
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 8 deletions.
diff --git a/Example Assets/com.github.macadmins.Nudge.json b/Example Assets/com.github.macadmins.Nudge.json
@@ -54,6 +54,7 @@
     "fallbackLanguage": "en",
     "forceFallbackLanguage": false,
     "forceScreenShotIcon": false,
+    "hideDeferralCount": false,
     "iconDarkPath": "/somewhere/logoDark.png",
     "iconLightPath": "/somewhere/logoLight.png",
     "screenShotDarkPath": "/somewhere/screenShotDark.png",

diff --git a/Example Assets/com.github.macadmins.Nudge.mobileconfig b/Example Assets/com.github.macadmins.Nudge.mobileconfig
@@ -110,6 +110,8 @@
           <false/>
           <key>forceScreenShotIcon</key>
           <false/>
+          <key>hideDeferralCount</key>
+          <false/>
           <key>iconDarkPath</key>
           <string>/somewhere/logoDark.png</string>
           <key>iconLightPath</key>

diff --git a/Example Assets/com.github.macadmins.Nudge.umad.json b/Example Assets/com.github.macadmins.Nudge.umad.json
@@ -66,6 +66,7 @@
     "fallbackLanguage": "en",
     "forceFallbackLanguage": false,
     "forceScreenShotIcon": false,
+    "hideDeferralCount": false,
     "iconDarkPath": "/somewhere/logoDark.png",
     "iconLightPath": "/somewhere/logoLight.png",
     "screenShotDarkPath": "/somewhere/screenShotDark.png",

diff --git a/Example Assets/com.github.macadmins.Nudge.umad.mobileconfig b/Example Assets/com.github.macadmins.Nudge.umad.mobileconfig
@@ -131,6 +131,8 @@
           <false/>
           <key>forceScreenShotIcon</key>
           <false/>
+          <key>hideDeferralCount</key>
+          <false/>
           <key>iconDarkPath</key>
           <string>/somewhere/logoDark.png</string>
           <key>iconLightPath</key>

diff --git a/Nudge/Preferences/PreferencesStructure.swift b/Nudge/Preferences/PreferencesStructure.swift
@@ -365,7 +365,7 @@ extension UserExperience {
 // MARK: - UserInterface
 struct UserInterface: Codable {
     var fallbackLanguage: String?
-    var forceFallbackLanguage, forceScreenShotIcon: Bool?
+    var forceFallbackLanguage, forceScreenShotIcon, hideDeferralCount: Bool?
     var iconDarkPath, iconLightPath, screenShotDarkPath, screenShotLightPath: String?
     var simpleMode, singleQuitButton: Bool?
     var umadElements: [UmadElement]?
@@ -394,6 +394,7 @@ extension UserInterface {
         fallbackLanguage: String?? = nil,
         forceFallbackLanguage: Bool?? = nil,
         forceScreenShotIcon: Bool?? = nil,
+        hideDeferralCount: Bool?? = nil,
         iconDarkPath: String?? = nil,
         iconLightPath: String?? = nil,
         screenShotDarkPath: String?? = nil,
@@ -407,6 +408,7 @@ extension UserInterface {
             fallbackLanguage: fallbackLanguage ?? self.fallbackLanguage,
             forceFallbackLanguage: forceFallbackLanguage ?? self.forceFallbackLanguage,
             forceScreenShotIcon: forceScreenShotIcon ?? self.forceScreenShotIcon,
+            hideDeferralCount: hideDeferralCount ?? self.hideDeferralCount,
             iconDarkPath: iconDarkPath ?? self.iconDarkPath,
             iconLightPath: iconLightPath ?? self.iconLightPath,
             screenShotDarkPath: screenShotDarkPath ?? self.screenShotDarkPath,

diff --git a/Nudge/UI/SimpleMode/SimpleMode.swift b/Nudge/UI/SimpleMode/SimpleMode.swift
@@ -91,14 +91,16 @@ struct SimpleMode: View {
                     }
                 }
 
-                // Maybe make this default to hidden with a pref to enable
                 // Deferred Count
-                HStack {
-                    Text("Deferred Count:".localized(desiredLanguage: getDesiredLanguage()))
-                        .font(.title3)
-                    Text(String(self.deferralCountUI))
-                        .font(.title3)
-                        .fontWeight(.bold)
+                // Show by default, allow to be hidden via preference
+                if !Utils().hideDeferralCount() {
+                    HStack {
+                        Text("Deferred Count:".localized(desiredLanguage: getDesiredLanguage()))
+                            .font(.title3)
+                        Text(String(self.deferralCountUI))
+                            .font(.title3)
+                            .fontWeight(.bold)
+                    }
                 }
 
                 // actionButton

diff --git a/Nudge/Utilities/Preferences.swift b/Nudge/Utilities/Preferences.swift
@@ -183,6 +183,14 @@ func forceScreenShotIconMode() -> Bool {
     }
 }
 
+func hideDeferralCount() -> Bool {
+    if Utils().hideDeferralCount() {
+        return true
+    } else {
+        return userInterfaceProfile?["hideDeferralCount"] as? Bool ?? nudgeJSONPreferences?.userInterface?.hideDeferralCount ?? false
+    }
+}
+
 func simpleMode() -> Bool {
     if Utils().simpleModeEnabled() {
         return true

diff --git a/Nudge/Utilities/Utils.swift b/Nudge/Utilities/Utils.swift
@@ -305,6 +305,15 @@ struct Utils {
         }
     }
 
+    func hideDeferralCount() -> Bool {
+        let hideDeferralCount = CommandLine.arguments.contains("-hide-deferral-count")
+        if hideDeferralCount {
+            let msg = "-hide-deferral-count argument passed"
+            uiLog.debug("\(msg, privacy: .public)")
+        }
+        return hideDeferralCount
+    }
+
     func openMoreInfo() {
         guard let url = URL(string: aboutUpdateURL) else {
             return