Merge pull request #5 from phucbm/feat/menu-bar-time-to-reset

feat(app): show time-to-reset in menu bar badge

Author: phucbm

app/Sources/AccountsManager.swift

@@ -8,6 +8,7 @@ class AccountsManager: ObservableObject {
     @Published var isLoading: Bool = false
     @Published var openAtLogin: Bool = false
     @Published var shortcutEnabled: Bool = true
+    @Published var showResetTime: Bool = true
     @Published var isAccessibilityEnabled: Bool = false
     @Published var animationSeed: UUID = UUID()
 
@@ -53,11 +54,15 @@ class AccountsManager: ObservableObject {
         shortcutEnabled = UserDefaults.standard.object(forKey: "shortcut_enabled") == nil
             ? true
             : UserDefaults.standard.bool(forKey: "shortcut_enabled")
+        showResetTime = UserDefaults.standard.object(forKey: "show_reset_time") == nil
+            ? true
+            : UserDefaults.standard.bool(forKey: "show_reset_time")
     }
 
     func saveSettings() {
         UserDefaults.standard.set(openAtLogin, forKey: "open_at_login")
         UserDefaults.standard.set(shortcutEnabled, forKey: "shortcut_enabled")
+        UserDefaults.standard.set(showResetTime, forKey: "show_reset_time")
         UserDefaults.standard.synchronize()
     }
 

app/Sources/AppDelegate.swift

@@ -85,10 +85,12 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
 
         let attrs: [NSAttributedString.Key: Any] = [.font: font]
 
+        let showReset = accountsManager.showResetTime
         let texts: [String] = accounts.map { account in
             let letter = String(account.label.prefix(1)).uppercased()
             let pct = account.hasFetchedData ? "\(Int(account.sessionPercentage * 100))%" : "--"
-            return "\(letter) \(pct)"
+            let reset = showReset ? timeToReset(account.sessionResetsAt) : ""
+            return reset.isEmpty ? "\(letter) \(pct)" : "\(letter) \(pct) \(reset)"
         }
         let widths = texts.map { ($0 as NSString).size(withAttributes: attrs).width + hPad * 2 }
         let totalWidth = widths.reduce(0, +) + CGFloat(max(0, accounts.count - 1)) * spacing
@@ -112,6 +114,15 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
         return image
     }
 
+    private func timeToReset(_ date: Date?) -> String {
+        guard let date = date else { return "" }
+        let secs = date.timeIntervalSinceNow
+        guard secs > 0 else { return "" }
+        let h = Int(secs) / 3600
+        let m = (Int(secs) % 3600) / 60
+        return h > 0 ? "\(h)h\(m)m" : "\(m)m"
+    }
+
     // MARK: - Panel Setup
 
     private func defaultPanelFrame() -> NSRect {

app/Sources/Views/SettingsSection.swift

@@ -34,6 +34,26 @@ struct SettingsSection: View {
 
             Rectangle().fill(T.ink.opacity(0.08)).frame(height: T.border)
 
+            settingRow(
+                title: "Show Reset Time",
+                subtitle: "Display time until session resets in the menu bar (e.g. P 40% 1h20m)"
+            ) {
+                Toggle("", isOn: Binding(
+                    get: { accountsManager.showResetTime },
+                    set: { v in
+                        accountsManager.showResetTime = v
+                        accountsManager.saveSettings()
+                        (NSApplication.shared.delegate as? AppDelegate)?.refreshMenuBar()
+                    }
+                ))
+                .toggleStyle(.switch)
+                .labelsHidden()
+                .scaleEffect(0.75)
+                .frame(height: 20)
+            }
+
+            Rectangle().fill(T.ink.opacity(0.08)).frame(height: T.border)
+
             settingRow(
                 title: "Keyboard Shortcut (⌘U)",
                 subtitle: "Toggle popup from anywhere. Disable if it conflicts with other apps."