Skip to content

Refactor OverrideActivationModal to simplify duration handling #740

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

Open
codebymini wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Refactor OverrideActivationModal to simplify duration handling #740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a36dc7
Refactor OverrideActivationModal to simplify duration handling and ma…
codebymini Aug 14, 2026
8d948bf
Fix duration handling in OverrideActivationModal to use zero for inde…
codebymini Aug 14, 2026
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
2 changes: 1 addition & 1 deletion LoopFollow/Remote/LoopAPNS/LoopAPNSService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,7 @@ class LoopAPNSService {
"alert": alertText,
]

if let duration = duration, duration > 0 {
if let duration = duration {
payload["override-duration-minutes"] = Int(duration / 60)
}

Expand Down
89 changes: 39 additions & 50 deletions LoopFollow/Remote/LoopAPNS/OverridePresetsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,10 +215,11 @@ struct OverrideActivationModal: View {

// Initialize state based on preset duration
if preset.duration == 0 {
// Indefinite override - allow user to choose
// Indefinite override defaults to indefinite.
_enableIndefinitely = State(initialValue: true)
_durationHours = State(initialValue: 1.0)
} else {
// Override with predefined duration - use preset duration
// Predefined-duration override defaults to the preset duration, but remains editable.
_enableIndefinitely = State(initialValue: false)
_durationHours = State(initialValue: preset.duration / 3600)
}
Expand Down Expand Up @@ -251,69 +252,57 @@ struct OverrideActivationModal: View {
.foregroundColor(.secondary)
}

// Only show duration for overrides with predefined duration
if preset.duration != 0 {
Text("Duration: \(preset.durationDescription)")
.font(.subheadline)
.foregroundColor(.secondary)
}
Text("Preset: \(preset.durationDescription)")
.font(.subheadline)
.foregroundColor(.secondary)
}
.padding(.top)

Spacer()

// Duration Settings (only show for overrides without predefined duration)
if preset.duration == 0 {
VStack(spacing: 16) {
// Duration Input (only show when not indefinite)
if !enableIndefinitely {
VStack(spacing: 8) {
HStack {
Text("Duration")
.font(.headline)
Spacer()
Text(formatDuration(durationHours))
.font(.headline)
.foregroundColor(.blue)
}

Slider(value: $durationHours, in: 0.25 ... 24.0, step: 0.25)
.accentColor(.blue)
HStack {
Text("15m")
.font(.caption)
.foregroundColor(.secondary)
.frame(width: 80, alignment: .leading)
Spacer()
Text("24h")
.font(.caption)
.foregroundColor(.secondary)
.frame(width: 80, alignment: .trailing)
}
// Duration Settings (available for all overrides)
VStack(spacing: 16) {
// Duration Input (only show when not indefinite)
if !enableIndefinitely {
VStack(spacing: 8) {
HStack {
Text("Duration")
.font(.headline)
Spacer()
Text(formatDuration(durationHours))
.font(.headline)
.foregroundColor(.blue)
}
.padding(.horizontal)
}

// Indefinitely Toggle
HStack {
Toggle("Enable indefinitely", isOn: $enableIndefinitely)
Spacer()
Slider(value: $durationHours, in: 0.25 ... 24.0, step: 0.25)
.accentColor(.blue)
HStack {
Text("15m")
.font(.caption)
.foregroundColor(.secondary)
.frame(width: 80, alignment: .leading)
Spacer()
Text("24h")
.font(.caption)
.foregroundColor(.secondary)
.frame(width: 80, alignment: .trailing)
}
}
.padding(.horizontal)
}

// Indefinitely Toggle
HStack {
Toggle("Enable indefinitely", isOn: $enableIndefinitely)
Spacer()
}
.padding(.horizontal)
}

// Action Buttons
VStack(spacing: 12) {
Button(action: {
let duration: TimeInterval?
if preset.duration == 0 {
// For indefinite overrides, use user selection
duration = enableIndefinitely ? nil : (durationHours * 3600)
} else {
// For overrides with predefined duration, use preset duration
duration = preset.duration
}
let duration: TimeInterval? = enableIndefinitely ? 0 : (durationHours * 3600)
onActivate(duration)
}) {
Text("Activate Override")
Expand Down
Loading