Fastest and only macOS Dictation app with on-device STT and custom trained AI enhancement model. Windows, iOS testflight! Android, Linux waitlist open! A local Wispr Flow alternative. Follow https://x.com/fluidvoiceapp for more
Add option to exclude weekends from streak calculation
altic-dev80c2cf2d4b61
diff --git a/Sources/Fluid/Persistence/SettingsStore.swift b/Sources/Fluid/Persistence/SettingsStore.swiftindex 4460dc83..60c91832 100644--- a/Sources/Fluid/Persistence/SettingsStore.swift+++ b/Sources/Fluid/Persistence/SettingsStore.swift@@ -114,6 +114,9 @@ final class SettingsStore: ObservableObject {// "" => use empty system prompt// other => use custom default prompt textstatic let defaultDictationPromptOverride = "DefaultDictationPromptOverride"++ // Streak Settings+ static let weekendsDontBreakStreak = "WeekendsDontBreakStreak"}// MARK: - Dictation Prompt Profiles (Multi-prompt)@@ -1158,6 +1161,18 @@ final class SettingsStore: ObservableObject {}}+ /// When enabled, weekends (Saturday/Sunday) don't break the usage streak+ var weekendsDontBreakStreak: Bool {+ get {+ let value = self.defaults.object(forKey: Keys.weekendsDontBreakStreak)+ return value as? Bool ?? true // Default to true (weekends don't break streak)+ }+ set {+ objectWillChange.send()+ self.defaults.set(newValue, forKey: Keys.weekendsDontBreakStreak)+ }+ }+// MARK: - Custom Dictation Prompt/// Custom system prompt for dictation mode. When empty, uses the default built-in prompt.diff --git a/Sources/Fluid/Persistence/TranscriptionHistoryStore.swift b/Sources/Fluid/Persistence/TranscriptionHistoryStore.swiftindex fe6a6687..79939b80 100644--- a/Sources/Fluid/Persistence/TranscriptionHistoryStore.swift+++ b/Sources/Fluid/Persistence/TranscriptionHistoryStore.swift@@ -284,7 +284,15 @@ extension TranscriptionHistoryStore {/// Current streak (consecutive days including today or yesterday)var currentStreak: Int {let calendar = Calendar.current- let days = self.activeDays+ let skipWeekends = SettingsStore.shared.weekendsDontBreakStreak++ // Filter out weekend days if setting is enabled (so weekend usage doesn't interfere)+ let days: [Date]+ if skipWeekends {+ days = self.activeDays.filter { !calendar.isDateInWeekend($0) }+ } else {+ days = self.activeDays+ }guard !days.isEmpty else { return 0 }@@ -293,22 +301,54 @@ extension TranscriptionHistoryStore {return 0}- // Must have activity today or yesterday to have an active streak- guard let firstActiveDay = days.first,- firstActiveDay == today || firstActiveDay == yesterday- else {- return 0+ // Find the most recent "valid" day (skip weekends if setting enabled)+ var checkDay = today+ if skipWeekends {+ // Find the last weekday (today or before)+ while calendar.isDateInWeekend(checkDay) {+ guard let prev = calendar.date(byAdding: .day, value: -1, to: checkDay) else { break }+ checkDay = prev+ }}+ // Must have activity on a recent valid day to have an active streak+ guard let firstActiveDay = days.first else { return 0 }++ // Check if the first active day is recent enough (today, yesterday, or last valid weekday)+ let isRecent: Bool+ if skipWeekends {+ // Find previous weekday from today+ var lastValidDay = today+ while calendar.isDateInWeekend(lastValidDay) {+ guard let prev = calendar.date(byAdding: .day, value: -1, to: lastValidDay) else { break }+ lastValidDay = prev+ }+ // Allow one weekday gap (the previous weekday before lastValidDay)+ guard let prevWeekday = self.previousWeekday(before: lastValidDay, calendar: calendar) else {+ isRecent = firstActiveDay == lastValidDay+ return isRecent ? 1 : 0+ }+ isRecent = firstActiveDay == lastValidDay || firstActiveDay == prevWeekday+ } else {+ isRecent = firstActiveDay == today || firstActiveDay == yesterday+ }++ guard isRecent else { return 0 }+var streak = 1var previousDay = firstActiveDayfor day in days.dropFirst() {- guard let expectedPrevious = calendar.date(byAdding: .day, value: -1, to: previousDay) else {- break+ let expectedPrevious: Date?+ if skipWeekends {+ expectedPrevious = self.previousWeekday(before: previousDay, calendar: calendar)+ } else {+ expectedPrevious = calendar.date(byAdding: .day, value: -1, to: previousDay)}- if day == expectedPrevious {+ guard let expected = expectedPrevious else { break }++ if day == expected {streak += 1previousDay = day} else {@@ -319,10 +359,27 @@ extension TranscriptionHistoryStore {return streak}+ /// Helper: get the previous weekday (skipping weekends)+ private func previousWeekday(before date: Date, calendar: Calendar) -> Date? {+ var candidate = calendar.date(byAdding: .day, value: -1, to: date)+ while let c = candidate, calendar.isDateInWeekend(c) {+ candidate = calendar.date(byAdding: .day, value: -1, to: c)+ }+ return candidate+ }+/// Best streak ever achievedvar bestStreak: Int {let calendar = Calendar.current- let days = self.activeDays.sorted() // oldest first for this calculation+ let skipWeekends = SettingsStore.shared.weekendsDontBreakStreak++ // Filter out weekend days if setting is enabled (so weekend usage doesn't interfere)+ let days: [Date]+ if skipWeekends {+ days = self.activeDays.filter { !calendar.isDateInWeekend($0) }.sorted()+ } else {+ days = self.activeDays.sorted() // oldest first for this calculation+ }guard !days.isEmpty else { return 0 }@@ -331,11 +388,14 @@ extension TranscriptionHistoryStore {var previousDay = days[0]for day in days.dropFirst() {- guard let expectedNext = calendar.date(byAdding: .day, value: 1, to: previousDay) else {- break+ let expectedNext: Date?+ if skipWeekends {+ expectedNext = self.nextWeekday(after: previousDay, calendar: calendar)+ } else {+ expectedNext = calendar.date(byAdding: .day, value: 1, to: previousDay)}- if day == expectedNext {+ if let expected = expectedNext, day == expected {currentStreakCount += 1maxStreak = max(maxStreak, currentStreakCount)} else {@@ -347,6 +407,15 @@ extension TranscriptionHistoryStore {return maxStreak}+ /// Helper: get the next weekday (skipping weekends)+ private func nextWeekday(after date: Date, calendar: Calendar) -> Date? {+ var candidate = calendar.date(byAdding: .day, value: 1, to: date)+ while let c = candidate, calendar.isDateInWeekend(c) {+ candidate = calendar.date(byAdding: .day, value: 1, to: c)+ }+ return candidate+ }+// MARK: - Daily Activity Data (for charts)/// Daily word counts for the last N daysdiff --git a/Sources/Fluid/UI/SettingsView.swift b/Sources/Fluid/UI/SettingsView.swiftindex 698f70f6..4b40e42c 100644--- a/Sources/Fluid/UI/SettingsView.swift+++ b/Sources/Fluid/UI/SettingsView.swift@@ -509,6 +509,16 @@ struct SettingsView: View {)Divider().opacity(0.2)+ self.optionToggleRow(+ title: "Weekends Don't Break Streak",+ description: "Skip Saturday and Sunday when calculating usage streaks. Perfect for weekday-only users.",+ isOn: Binding(+ get: { SettingsStore.shared.weekendsDontBreakStreak },+ set: { SettingsStore.shared.weekendsDontBreakStreak = $0 }+ )+ )+ Divider().opacity(0.2)+self.optionToggleRow(title: "GAAV Mode",description: "Remove first letter capitalization and trailing period. Useful for search queries, form fields, or casual text.\nFeature requested by MaxGaav.",