toggle duration of graph day/week/month, keep up to a month worth, and rev version to 0.3

Author: mattorb

Keyjam.xcodeproj/project.pbxproj

@@ -264,7 +264,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 0.2;
+				MARKETING_VERSION = 0.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.mattorb.Keyjam;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -291,7 +291,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 0.2;
+				MARKETING_VERSION = 0.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.mattorb.Keyjam;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;

Keyjam/KeyjamMenuBar.swift

@@ -6,6 +6,7 @@ struct KeyjamMenuBar: Scene {
   @Environment(StreakRepository.self) var keyCount
   @Environment(StreakCoordinator.self) var coordinator
 
+  @State private var selectedTimeScope: StreakChartTimeScope = .day
   @State private var launchAtLogin = false
   @State private var newAppName: String = ""
   @AppStorage(Settings.trackedApps) private var trackedApps: [String] = []
@@ -26,7 +27,18 @@ struct KeyjamMenuBar: Scene {
   }
 
   private var recentStreakEvents: [StreakEvent] {
-    keyCount.getRecentStreakEvents()
+    // Convert TimeScope to days for the repository method
+    let days: Int
+    switch selectedTimeScope {
+    case .day:
+      days = 1
+    case .week:
+      days = 7
+    case .month:
+      days = 30
+    }
+
+    return keyCount.getRecentStreakEvents(days: days)
   }
 
   private var streakStats: String {
@@ -80,12 +92,20 @@ struct KeyjamMenuBar: Scene {
       Text("Statistics")
         .font(.headline)
 
-      Text("Current key streak: \(keyCount.keyCount)")
+      HStack {
+        Text("Current key streak: \(keyCount.keyCount)")
+        Spacer()
+        if !recentStreakEvents.isEmpty {
+          Text("Highest: \(recentStreakEvents.map { $0.streakCount }.max() ?? 0)")
+            .foregroundColor(Color.teal)
+        }
+      }
+
       Text(streakStats)
         .font(.caption)
         .foregroundColor(.secondary)
 
-      StreakChartView(streakEvents: recentStreakEvents)
+      StreakChartView(streakEvents: recentStreakEvents, timeScope: $selectedTimeScope)
         .padding(.vertical, 5)
     }
   }

Keyjam/streak/StreakChartView.swift

@@ -4,6 +4,7 @@ import SwiftUI
 // MARK: - Main View
 struct StreakChartView: View {
   let streakEvents: [StreakEvent]
+  @Binding var timeScope: StreakChartTimeScope
   @State private var selectedEvent: StreakEvent?
   @State private var hoverLocation: CGPoint?
   @State private var chartSize: CGSize = .zero
@@ -30,9 +31,15 @@ struct StreakChartView: View {
       Spacer()
 
       if !streakEvents.isEmpty {
-        Text("Highest: \(maxStreakCount)")
-          .font(.caption)
-          .foregroundColor(Color.teal)
+        Picker("", selection: $timeScope) {
+          ForEach(StreakChartTimeScope.allCases) { scope in
+            Text(scope.rawValue).tag(scope)
+          }
+        }
+        .pickerStyle(.menu)
+        .labelsHidden()
+        .frame(width: 70)
+        .controlSize(.small)
       }
     }
   }
@@ -401,19 +408,25 @@ enum TrendDirection {
   VStack(spacing: 20) {
     Text("Upward Trend")
       .font(.headline)
-    StreakChartView(streakEvents: createSampleData(startValue: 10, endValue: 50, count: 10, now: Date(), calendar: Calendar.current))
-      .padding()
-      .background(Color.primary.opacity(0.1))
-      .cornerRadius(8)
-      .shadow(radius: 2)
+    StreakChartView(
+      streakEvents: createSampleData(startValue: 10, endValue: 50, count: 10, now: Date(), calendar: Calendar.current),
+      timeScope: .constant(.day)
+    )
+    .padding()
+    .background(Color.primary.opacity(0.1))
+    .cornerRadius(8)
+    .shadow(radius: 2)
 
     Text("Downward Trend")
       .font(.headline)
-    StreakChartView(streakEvents: createSampleData(startValue: 50, endValue: 10, count: 10, now: Date(), calendar: Calendar.current))
-      .padding()
-      .background(Color.primary.opacity(0.1))
-      .cornerRadius(8)
-      .shadow(radius: 2)
+    StreakChartView(
+      streakEvents: createSampleData(startValue: 50, endValue: 10, count: 10, now: Date(), calendar: Calendar.current),
+      timeScope: .constant(.day)
+    )
+    .padding()
+    .background(Color.primary.opacity(0.1))
+    .cornerRadius(8)
+    .shadow(radius: 2)
   }
   .padding()
 }
@@ -441,3 +454,11 @@ private func createSampleData(
 
   return sampleData.sorted { $0.timestamp < $1.timestamp }
 }
+
+enum StreakChartTimeScope: String, CaseIterable, Identifiable {
+  case day = "Day"
+  case week = "Week"
+  case month = "Month"
+
+  var id: String { rawValue }
+}

Keyjam/streak/StreakRepository.swift

@@ -6,7 +6,8 @@ final class StreakRepository {
   private(set) var mouseBreak: Int = 0
   private(set) var streakEvents: [StreakEvent] = []
 
-  private let maxStoredEvents = 100
+  // Maximum age of stored events (one month)
+  private let maxEventAge: TimeInterval = 30 * 24 * 60 * 60  // 30 days in seconds
 
   init() {
     loadStreakEvents()
@@ -36,24 +37,29 @@ final class StreakRepository {
     let event = StreakEvent(streakCount: count)
     streakEvents.append(event)
 
-    // Limit the number of stored events
-    if streakEvents.count > maxStoredEvents {
-      streakEvents.sort { $0.timestamp > $1.timestamp }  // Sort by timestamp descending
-      streakEvents = Array(streakEvents.prefix(maxStoredEvents))
-    }
+    // Clean up old events
+    removeExpiredEvents()
 
     saveStreakEvents()
   }
 
+  private func removeExpiredEvents() {
+    let cutoffDate = Date().addingTimeInterval(-maxEventAge)
+    streakEvents = streakEvents.filter { $0.timestamp >= cutoffDate }
+  }
+
   private func loadStreakEvents() {
     streakEvents = FileManager.loadStreakEvents()
+
+    // Remove any expired events during load
+    removeExpiredEvents()
   }
 
   private func saveStreakEvents() {
     FileManager.saveStreakEvents(streakEvents)
   }
 
-  // Returns streak events for the last 7 days
+  // Returns streak events for the specified time period
   func getRecentStreakEvents(days: Int = 7) -> [StreakEvent] {
     let calendar = Calendar.current
     let startDate = calendar.date(byAdding: .day, value: -days, to: Date()) ?? Date()