Skip to content

feat: reorder settings #57

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

Merged
ykisana merged 1 commit into from
Oct 6, 2026
Merged

feat: reorder settings #57

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
34 changes: 17 additions & 17 deletions Normal/Views/Settings/GeneralSettingsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,23 @@ struct GeneralSettingsView: View {

private var unblockingSection: some View {
Section {
NavigationLink {
UnblockDurationsView(settings: settings)
} label: {
CountRow(title: "Unblock Durations", count: settings.unblockDurations.count)
}
.accessibilityIdentifier("settings.unblockDurationsLink")

Picker("Default Duration", selection: Binding(
get: { settings.defaultDuration },
set: { settings.defaultDuration = $0 }
)) {
Text("None").tag(TimedUnblockDuration?.none)
ForEach(settings.unblockDurations) { duration in
Text(duration.label).tag(TimedUnblockDuration?.some(duration))
}
}

Picker(
"Default Key",
selection: Binding(
Expand All @@ -60,23 +77,6 @@ struct GeneralSettingsView: View {
}
}

NavigationLink {
UnblockDurationsView(settings: settings)
} label: {
CountRow(title: "Unblock Durations", count: settings.unblockDurations.count)
}
.accessibilityIdentifier("settings.unblockDurationsLink")

Picker("Default Duration", selection: Binding(
get: { settings.defaultDuration },
set: { settings.defaultDuration = $0 }
)) {
Text("None").tag(TimedUnblockDuration?.none)
ForEach(settings.unblockDurations) { duration in
Text(duration.label).tag(TimedUnblockDuration?.some(duration))
}
}

Toggle(
"Live Activity",
isOn: Bindable(settings).showTimedUnblockLiveActivity
Expand Down
Loading