Add user defaults setting for format style

Closes #71
josh · Apr 23, 2024 · 8d9e3eb · 8d9e3eb
1 parent 5ea5482
commit 8d9e3eb
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 5 deletions.
diff --git a/Aware/macOS/MenuBar.swift b/Aware/macOS/MenuBar.swift
@@ -20,6 +20,7 @@ struct MenuBar: Scene {
     // User configurable idle time in seconds (defaults to 2 minutes)
     @AppStorage("userIdleSeconds") private var userIdleSeconds: Int = 120
 
+    @AppStorage("formatStyle") private var timerFormatStyle: TimerFormatStyle.Style = .condensedAbbreviated
     @AppStorage("showSeconds") private var showSeconds: Bool = false
 
     var userIdle: Duration {
@@ -30,21 +31,21 @@ struct MenuBar: Scene {
         MenuBarExtra {
             MenuBarContentView()
         } label: {
-            TimerMenuBarLabel(userIdle: userIdle, showSeconds: showSeconds)
+            TimerMenuBarLabel(userIdle: userIdle, timerFormatStyle: timerFormatStyle, showSeconds: showSeconds)
         }
     }
 }
 
 struct TimerMenuBarLabel: View {
     let userIdle: Duration
-
-    var showSeconds: Bool = false
+    var timerFormatStyle: TimerFormatStyle.Style
+    var showSeconds: Bool
 
     /// Set text refresh rate to 60 seconds, when minutes are shown
     private var textRefreshRate: TimeInterval { showSeconds ? 1.0 : 60.0 }
 
     private var timerFormat: TimerFormatStyle {
-        TimerFormatStyle(style: .condensedAbbreviated, includeSeconds: showSeconds)
+        TimerFormatStyle(style: timerFormatStyle, includeSeconds: showSeconds)
     }
 
     @State private var timerState = TimerState()

diff --git a/Aware/visionOS/Settings.bundle/Root.plist b/Aware/visionOS/Settings.bundle/Root.plist
@@ -4,6 +4,34 @@
 <dict>
 	<key>PreferenceSpecifiers</key>
 	<array>
+		<dict>
+			<key>Type</key>
+			<string>PSMultiValueSpecifier</string>
+			<key>Title</key>
+			<string>Format Style</string>
+			<key>Key</key>
+			<string>formatStyle</string>
+			<key>DefaultValue</key>
+			<string>condensedAbbreviated</string>
+			<key>Values</key>
+			<array>
+				<string>abbreviated</string>
+				<string>condensedAbbreviated</string>
+				<string>narrow</string>
+				<string>wide</string>
+				<string>spellOut</string>
+				<string>digits</string>
+			</array>
+			<key>Titles</key>
+			<array>
+				<string>1 hr, 15 min</string>
+				<string>1h 15m</string>
+				<string>1hr 15min</string>
+				<string>1 hour, 15 minutes</string>
+				<string>one hour, fifteen minutes</string>
+				<string>1:15</string>
+			</array>
+		</dict>
 		<dict>
 			<key>Type</key>
 			<string>PSToggleSwitchSpecifier</string>

diff --git a/Aware/visionOS/TimerView.swift b/Aware/visionOS/TimerView.swift
@@ -13,6 +13,7 @@ struct TimerView: View {
     @State private var timerState = TimerState()
 
     @AppStorage("showSeconds") private var showSeconds: Bool = false
+    @AppStorage("formatStyle") private var timerFormatStyle: TimerFormatStyle.Style = .condensedAbbreviated
     @AppStorage("glassBackground") private var glassBackground: Bool = true
 
     @AppStorage("backgroundTaskInterval") private var backgroundTaskInterval: Int = 300
@@ -24,7 +25,7 @@ struct TimerView: View {
     private var textRefreshRate: TimeInterval { showSeconds ? 1.0 : 60.0 }
 
     private var timerFormat: TimerFormatStyle {
-        TimerFormatStyle(style: .condensedAbbreviated, includeSeconds: showSeconds)
+        TimerFormatStyle(style: timerFormatStyle, includeSeconds: showSeconds)
     }
 
     private var activityMonitor: ActivityMonitor {