Merge pull request #57 from normalengineering/feat/settings-order

feat: reorder settings

Author: ykisana

Normal/Views/Settings/GeneralSettingsView.swift

@@ -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(
@@ -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