feat: regroup settings and drop footers

Group General settings into Blocking, Unblocking, Websites and Appearance,
remove the static section footers, and show Max Daily Limits as a single
row with its status. Block Adult Websites moves into Blocking, and the
custom websites toggle is relabeled Enable Custom Websites and only shows
a footer while it is disabled.

Author: ykisana

Normal/Resources/Localizable.xcstrings

@@ -98,6 +98,7 @@
     },
     "%lld Max Daily Limits" : {
       "comment" : "Max Daily Limits row in Settings — title. The argument is the number of Max Daily Limits.",
+      "extractionState" : "stale",
       "localizations" : {
         "en" : {
           "variations" : {
@@ -276,10 +277,6 @@
     },
     "Add Shortcuts to your selected apps in Normal so the automation itself can't be easily modified." : {
 
-    },
-    "Adds a section to App Select, allowing you to type custom website domains to block." : {
-      "comment" : "A footer description for the custom domains section in the general settings view.",
-      "isCommentAutoGenerated" : true
     },
     "After %@ of combined use, these stay blocked until %@, even if unblocked with a key. Time already used today counts; if you're already past it, the limit starts at the next reset." : {
       "comment" : "A description of how long a usage limit lasts. The argument is the number of minutes.",
@@ -349,6 +346,10 @@
       "comment" : "The title of a view that allows users to select which family members have access to their devices.",
       "isCommentAutoGenerated" : true
     },
+    "Appearance" : {
+      "comment" : "A heading for the appearance settings in the settings view.",
+      "isCommentAutoGenerated" : true
+    },
     "Apple lets you reset a forgotten Screen Time passcode using the Apple ID you registered. If that's your own account, you can bypass the lock yourself. Which is why it's important to use credentials you don't have easy access to." : {
       "comment" : "An explanation of why using a dummy Apple ID is important.",
       "isCommentAutoGenerated" : true
@@ -403,6 +404,10 @@
     },
     "Block ${group}" : {
 
+    },
+    "Block Adult Websites" : {
+      "comment" : "Title of a toggle that allows the user to block adult content on their devices.",
+      "isCommentAutoGenerated" : true
     },
     "Block All" : {
       "comment" : "A button label that blocks all selected apps.",
@@ -412,10 +417,6 @@
       "comment" : "Title of the intent to block all apps.",
       "isCommentAutoGenerated" : true
     },
-    "Block Custom Websites" : {
-      "comment" : "A toggle that lets the user enable or disable blocking of custom website domains.",
-      "isCommentAutoGenerated" : true
-    },
     "Block Group" : {
       "comment" : "Shortcut title for the \"Block Group\" shortcut.",
       "isCommentAutoGenerated" : true
@@ -447,8 +448,8 @@
       "comment" : "Text displayed in a dialog when all selected apps are blocked.",
       "isCommentAutoGenerated" : true
     },
-    "Blocking All Apps" : {
-      "comment" : "A section header that lists the option to prevent app deletion when blocking all apps.",
+    "Blocking" : {
+      "comment" : "A section in the settings view for toggling blocking-related options.",
       "isCommentAutoGenerated" : true
     },
     "Blocks the apps and websites selected in Normal. Unblocking still requires your key." : {
@@ -553,10 +554,6 @@
       "comment" : "A section header for custom website domain blocking.",
       "isCommentAutoGenerated" : true
     },
-    "Custom domains are currently being blocked. Unblock all apps before disabling this setting." : {
-      "comment" : "A description of the custom domains section.",
-      "isCommentAutoGenerated" : true
-    },
     "Default" : {
       "comment" : "A label displayed next to a timed unblock duration that is set as the user's default.",
       "isCommentAutoGenerated" : true
@@ -573,13 +570,6 @@
       "comment" : "A label for the setting that lets the user choose which tab is selected when the app launches.",
       "isCommentAutoGenerated" : true
     },
-    "Default Page opens when you launch the app. Hiding the Donate button hides it from the main toolbar." : {
-
-    },
-    "Defaults allow to skip selection steps for faster unblocking. Live Activity shows a Lock Screen and Dynamic Island countdown for timed unblocks, for up to 8 hours." : {
-      "comment" : "A description of the default settings.",
-      "isCommentAutoGenerated" : true
-    },
     "Delete" : {
       "comment" : "A button label that deletes an app group.",
       "isCommentAutoGenerated" : true
@@ -711,6 +701,10 @@
     },
     "Enable" : {
 
+    },
+    "Enable Custom Websites" : {
+      "comment" : "A toggle that lets the user enable or disable blocking of custom website domains.",
+      "isCommentAutoGenerated" : true
     },
     "Enable location access in Settings to use your current spot. You can still pick anywhere on the map." : {
       "comment" : "A message explaining that location access is needed to use the user's current location, and that the user can still pick a location on the map.",
@@ -802,15 +796,15 @@
       "comment" : "A bullet point in the \"Pick one option for the passcode and Apple ID\" section of the SettingsBypassGuide view.",
       "isCommentAutoGenerated" : true
     },
-    "Hard cap on daily app use" : {
-      "comment" : "A description of the max daily limit usage.",
-      "isCommentAutoGenerated" : true
-    },
     "Head to our GitHub repository to get started, check out open issues, or submit a pull request." : {
 
     },
     "Here's the technical reason:" : {
 
+    },
+    "Hide Blocked Apps" : {
+      "comment" : "A toggle that allows users to hide blocked apps.",
+      "isCommentAutoGenerated" : true
     },
     "Hide Donate Button" : {
       "comment" : "A toggle that hides the donate button in the settings interface.",
@@ -992,10 +986,6 @@
       "comment" : "A label for the name field in the \"New Group\" sheet.",
       "isCommentAutoGenerated" : true
     },
-    "Navigation & Appearance" : {
-      "comment" : "A section header that lists navigation and appearance settings.",
-      "isCommentAutoGenerated" : true
-    },
     "Needs Update" : {
       "comment" : "A label indicating that a group's app selection needs to be updated.",
       "isCommentAutoGenerated" : true
@@ -1187,9 +1177,6 @@
     "Paused by emergency unblock until %@." : {
       "comment" : "Notice on the Max Daily Limits screen after an emergency unblock. The argument is the reset time."
     },
-    "Paused until %@" : {
-      "comment" : "Max Daily Limits row in Settings — subtitle after an emergency unblock. The argument is the reset time."
-    },
     "per month" : {
       "comment" : "A unit of measurement for a monthly donation.",
       "isCommentAutoGenerated" : true
@@ -1272,10 +1259,6 @@
     "Resets At" : {
       "comment" : "Label for the time Max Daily Limits reset each day."
     },
-    "Resets at %@" : {
-      "comment" : "A description of the next reset time for the usage limits.",
-      "isCommentAutoGenerated" : true
-    },
     "Resets at %@." : {
       "comment" : "A footer that shows when the limit is paused, or when it resets.",
       "isCommentAutoGenerated" : true
@@ -1580,6 +1563,10 @@
       "comment" : "A footer text that appears when \"Select Apps\" is tapped, explaining that unblocking apps is necessary to edit the selection.",
       "isCommentAutoGenerated" : true
     },
+    "Unblock all apps to turn this off." : {
+      "comment" : "A footer explaining why the custom websites toggle is disabled while custom domains are blocked.",
+      "isCommentAutoGenerated" : true
+    },
     "Unblock Durations" : {
       "comment" : "Title of a row that shows the number of unblock durations.",
       "isCommentAutoGenerated" : true
@@ -1664,10 +1651,6 @@
       "comment" : "A welcome message displayed at the top of the onboarding screen.",
       "isCommentAutoGenerated" : true
     },
-    "When enabled 'Block All' and prevent app deletion are linked." : {
-      "comment" : "A footer for the \"Blocking All Apps\" section, explaining that when \"Block All\" and prevent app deletion are enabled, they are linked.",
-      "isCommentAutoGenerated" : true
-    },
     "When enabled, apps cannot be uninstalled from this device." : {
       "comment" : "A footer label explaining the purpose of the toggle.",
       "isCommentAutoGenerated" : true

Normal/Views/Settings/AdultContentToggleView.swift

@@ -5,17 +5,11 @@ struct AdultContentToggleView: View {
     let defaultKeyType: KeyType?
 
     var body: some View {
-        Section {
-            KeyProtectedToggle(
-                title: "Block Adult Websites",
-                isOn: screenTimeService.isAdultContentBlocked,
-                defaultKeyType: defaultKeyType
-            ) { screenTimeService.setAdultContentBlocked($0) }
+        KeyProtectedToggle(
+            title: "Block Adult Websites",
+            isOn: screenTimeService.isAdultContentBlocked,
+            defaultKeyType: defaultKeyType
+        ) { screenTimeService.setAdultContentBlocked($0) }
             .accessibilityIdentifier("settings.blockAdultContentToggle")
-        } header: {
-            Text("Adult Content")
-        } footer: {
-            Text("Uses Apple's web content filter to block adult websites in Safari and other apps. Stays on independently of blocking. Turning it off requires a key.")
-        }
     }
 }

Normal/Views/Settings/GeneralSettingsView.swift

@@ -11,12 +11,9 @@ struct GeneralSettingsView: View {
 
     var body: some View {
         List {
-            unblockingSection
             blockingSection
-            UsageSummaryView()
-            customDomainsSection
-            AdultContentToggleView(defaultKeyType: settings.defaultKeyType)
-            HideBlockedAppsToggleView()
+            unblockingSection
+            websitesSection
             appearanceSection
             aboutSection
             #if DEBUG
@@ -31,19 +28,19 @@ struct GeneralSettingsView: View {
         screenTimeService.hasActiveCustomDomainFilter()
     }
 
-    private var customDomainsSection: some View {
+    private var websitesSection: some View {
         Section {
             Toggle(
-                "Block Custom Websites",
+                "Enable Custom Websites",
                 isOn: Bindable(settings).enableCustomDomains
             )
             .disabled(hasActiveFilter)
         } header: {
-            Text("Custom Domains")
+            Text("Websites")
         } footer: {
-            Text(hasActiveFilter
-                ? "Custom domains are currently being blocked. Unblock all apps before disabling this setting."
-                : "Adds a section to App Select, allowing you to type custom website domains to block.")
+            if hasActiveFilter {
+                Text("Unblock all apps to turn this off.")
+            }
         }
     }
 
@@ -88,28 +85,30 @@ struct GeneralSettingsView: View {
                 "Live Activity",
                 isOn: Bindable(settings).showTimedUnblockLiveActivity
             )
-
-            Toggle(
-                "Skip Block Without Key Confirmation",
-                isOn: Bindable(settings).skipBlockWithoutKeyConfirmation
-            )
         } header: {
             Text("Unblocking")
-        } footer: {
-            Text("Defaults allow to skip selection steps for faster unblocking. Live Activity shows a Lock Screen and Dynamic Island countdown for timed unblocks, for up to 8 hours.")
         }
     }
 
     private var blockingSection: some View {
         Section {
+            UsageSummaryView()
+
+            AdultContentToggleView(defaultKeyType: settings.defaultKeyType)
+
             Toggle(
                 "Prevent App Deletion on Block All",
                 isOn: Bindable(settings).blockAllPreventsAppDelete
             )
+
+            Toggle(
+                "Skip Block Without Key Confirmation",
+                isOn: Bindable(settings).skipBlockWithoutKeyConfirmation
+            )
+
+            HideBlockedAppsToggleView()
         } header: {
-            Text("Blocking All Apps")
-        } footer: {
-            Text("When enabled 'Block All' and prevent app deletion are linked.")
+            Text("Blocking")
         }
     }
 
@@ -132,9 +131,7 @@ struct GeneralSettingsView: View {
                 isOn: Bindable(settings).hideDonateButton
             )
         } header: {
-            Text("Navigation & Appearance")
-        } footer: {
-            Text("Default Page opens when you launch the app. Hiding the Donate button hides it from the main toolbar.")
+            Text("Appearance")
         }
     }
 

Normal/Views/Settings/HideBlockedAppsToggleView.swift

@@ -4,20 +4,14 @@ struct HideBlockedAppsToggleView: View {
     @Environment(ScreenTimeService.self) private var screenTimeService
 
     var body: some View {
-        Section {
-            Toggle(
-                "Hide Blocked Apps",
-                isOn: Binding(
-                    get: { screenTimeService.isHidingBlockedApps },
-                    set: { screenTimeService.setHidingBlockedApps($0) }
-                )
+        Toggle(
+            "Hide Blocked Apps",
+            isOn: Binding(
+                get: { screenTimeService.isHidingBlockedApps },
+                set: { screenTimeService.setHidingBlockedApps($0) }
             )
-            .tint(.accentColor)
-            .accessibilityIdentifier("settings.hideBlockedAppsToggle")
-        } header: {
-            Text("Hidden Apps")
-        } footer: {
-            Text("Individually selected apps are removed from the Home Screen, App Library and Search while blocked. Apps blocked through a category or a daily limit stay blocked but remain visible. When unblocked, apps may reappear in the App Library rather than their original Home Screen spot.")
-        }
+        )
+        .tint(.accentColor)
+        .accessibilityIdentifier("settings.hideBlockedAppsToggle")
     }
 }

Normal/Views/Usage/UsageSummaryView.swift

@@ -11,42 +11,36 @@ struct UsageSummaryView: View {
         let reachedCount = states.values.filter { $0 == .reached }.count
         let worstState = states.values.max() ?? .under
 
-        Section("Max Daily Limits") {
-            NavigationLink {
-                UsageView()
-            } label: {
-                SummaryRow(
-                    systemImage: limits.isEmpty ? "hourglass" : worstState.icon,
-                    tint: limits.isEmpty ? .secondary : worstState.color,
-                    title: title(reachedCount: reachedCount),
-                    subtitle: subtitle(reachedCount: reachedCount, worstState: worstState)
-                )
+        NavigationLink {
+            UsageView()
+        } label: {
+            HStack {
+                Text("Max Daily Limits")
+                    .foregroundStyle(.primary)
+                Spacer()
+                status(reachedCount: reachedCount, worstState: worstState)
             }
-            .accessibilityIdentifier("settings.maxDailyLimitsLink")
         }
+        .accessibilityIdentifier("settings.maxDailyLimitsLink")
     }
 
-    private func title(reachedCount: Int) -> Text {
+    @ViewBuilder
+    private func status(reachedCount: Int, worstState: UsageLimitState) -> some View {
         if limits.isEmpty {
-            return Text("No Max Daily Limits")
+            EmptyView()
+        } else if usageLimitService.isDayOverridden() {
+            Text("Paused")
+                .foregroundStyle(.secondary)
+        } else if reachedCount > 0 {
+            Text("\(reachedCount) of \(limits.count) Reached")
+                .foregroundStyle(worstState.color)
+        } else if worstState == .warning {
+            Text(worstState.label)
+                .foregroundStyle(worstState.color)
+        } else {
+            Text("\(limits.count)")
+                .monospacedDigit()
+                .foregroundStyle(.secondary)
         }
-        if reachedCount > 0 {
-            return Text("\(reachedCount) of \(limits.count) Reached")
-        }
-        return Text("\(limits.count) Max Daily Limits")
-    }
-
-    private func subtitle(reachedCount: Int, worstState: UsageLimitState) -> Text {
-        if limits.isEmpty {
-            return Text("Hard cap on daily app use")
-        }
-        let reset = usageLimitService.nextReset().formatted(date: .omitted, time: .shortened)
-        if usageLimitService.isDayOverridden() {
-            return Text("Paused until \(reset)")
-        }
-        if reachedCount > 0 {
-            return Text("Resets at \(reset)")
-        }
-        return Text(worstState.label)
     }
 }