Skip to content

Add configurable break allowances and reset policies #512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
michaelmvh wants to merge 1 commit into from
Closed

Add configurable break allowances and reset policies #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 35 additions & 5 deletions Foqos/Components/BlockedProfileView/BlockedProfileDraft.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@ final class BlockedProfileDraft: ObservableObject {
@Published var enableReminder: Bool
@Published var enableBreaks: Bool
@Published var breakTimeInMinutes: Int
@Published var allowMultipleBreaks: Bool
@Published var breakAllowanceMode: BreakAllowanceMode
@Published var breakCountLimit: Int
@Published var isBreakCountUnlimited: Bool
@Published var breakResetHour: Int
@Published var breakResetMinute: Int
@Published var breakResetPolicy: BreakResetPolicy
@Published var enableStrictMode: Bool
@Published var enableBlockAppInstallation: Bool
@Published var reminderTimeInMinutes: Int
Expand Down Expand Up @@ -49,7 +54,12 @@ final class BlockedProfileDraft: ObservableObject {
enableLiveActivity = profile?.enableLiveActivity ?? false
enableBreaks = profile?.enableBreaks ?? false
breakTimeInMinutes = profile?.breakTimeInMinutes ?? 15
allowMultipleBreaks = profile?.allowMultipleBreaks ?? false
breakAllowanceMode = profile?.breakAllowanceMode ?? .perBreak
breakCountLimit = profile?.breakCountLimit ?? 1
isBreakCountUnlimited = profile?.isBreakCountUnlimited ?? false
breakResetHour = profile?.breakResetHour ?? 0
breakResetMinute = profile?.breakResetMinute ?? 0
breakResetPolicy = profile?.breakResetPolicy ?? .daily
enableStrictMode = profile?.enableStrictMode ?? false
enableBlockAppInstallation = profile?.enableBlockAppInstallation ?? false
enableAllowMode = profile?.enableAllowMode ?? false
Expand Down Expand Up @@ -130,7 +140,13 @@ final class BlockedProfileDraft: ObservableObject {
customReminderMessage: customReminderMessage,
enableBreaks: enableTimedBreaksToSave,
breakTimeInMinutes: breakTimeInMinutes,
allowMultipleBreaks: enableTimedBreaksToSave && allowMultipleBreaks,
allowMultipleBreaks: enableTimedBreaksToSave && permitsMultipleBreaksPerPeriod,
breakAllowanceMode: breakAllowanceMode,
breakCountLimit: breakCountLimit,
isBreakCountUnlimited: isBreakCountUnlimited,
breakResetHour: breakResetHour,
breakResetMinute: breakResetMinute,
breakResetPolicy: breakResetPolicy,
enableStrictMode: enableStrictMode,
enableBlockAppInstallation: enableBlockAppInstallation,
enableAllowMode: enableAllowMode,
Expand Down Expand Up @@ -161,7 +177,13 @@ final class BlockedProfileDraft: ObservableObject {
customReminderMessage: customReminderMessage,
enableBreaks: enableTimedBreaksToSave,
breakTimeInMinutes: breakTimeInMinutes,
allowMultipleBreaks: enableTimedBreaksToSave && allowMultipleBreaks,
allowMultipleBreaks: enableTimedBreaksToSave && permitsMultipleBreaksPerPeriod,
breakAllowanceMode: breakAllowanceMode,
breakCountLimit: breakCountLimit,
isBreakCountUnlimited: isBreakCountUnlimited,
breakResetHour: breakResetHour,
breakResetMinute: breakResetMinute,
breakResetPolicy: breakResetPolicy,
enableStrictMode: enableStrictMode,
enableBlockAppInstallation: enableBlockAppInstallation,
enableAllowMode: enableAllowMode,
Expand All @@ -183,7 +205,6 @@ final class BlockedProfileDraft: ObservableObject {
private func enforceStrategyPolicies() {
if !selectedStrategyAllowsTimedBreaks {
enableBreaks = false
allowMultipleBreaks = false
}

if !selectedStrategySupportsAllowMode && enableAllowMode {
Expand All @@ -192,6 +213,15 @@ final class BlockedProfileDraft: ObservableObject {
}
}

private var permitsMultipleBreaksPerPeriod: Bool {
switch breakAllowanceMode {
case .perBreak:
return isBreakCountUnlimited || breakCountLimit > 1
case .cumulative:
return true
}
}

private func ensureSavedStartSettings() {
guard !askForStartSettings, strategyData == nil,
let settingsKind = StrategyStartSettingsKind(strategy: selectedStrategy)
Expand Down
Loading