revert: restore custom domains toggle (#90)

This reverts commit 0ac8e9b (#87), bringing back Settings.enableCustomDomains,
its Settings row, the App Group mirror and the call-site gating, and dropping
CustomDomainsMigration. #87 never reached the App Store (1.6 is live), so
1.6 users keep their existing toggle state and behaviour.

Author: ykisana

Normal/App/AppContainer.swift

@@ -1,6 +1,8 @@
+import SwiftData
 import SwiftUI
 
 struct AppContainer: View {
+    @Query private var allSettings: [Settings]
     @State private var screenTimeService: ScreenTimeService
     @State private var timedUnblockService: TimedUnblockService
     @State private var nfcService = NFCService.shared
@@ -37,5 +39,14 @@ struct AppContainer: View {
             .environment(emergencyUnblockService)
             .environment(donationService)
             .environment(usageLimitService)
+            .task { mirrorCustomDomainsEnabled() }
+            .onChange(of: allSettings.first?.enableCustomDomains ?? false) { _, enabled in
+                scheduleService.mirrorCustomDomainsEnabled(enabled)
+                screenTimeService.reconcile()
+            }
+    }
+
+    private func mirrorCustomDomainsEnabled() {
+        scheduleService.mirrorCustomDomainsEnabled(allSettings.first?.enableCustomDomains ?? false)
     }
 }

Normal/App/NormalApp.swift

@@ -28,16 +28,13 @@ struct NormalApp: App {
         if (try? context.fetchCount(descriptor)) == 0 {
             let settings = Settings()
             settings.hasCompletedOnboarding = UITestSupport.skipOnboarding
+            settings.enableCustomDomains = UITestSupport.customDomains
             settings.skipBlockWithoutKeyConfirmation = UITestSupport.skipBypassConfirm
             settings.customUnblockDurationSeconds = UITestSupport.unblockDurationSeconds
             settings.defaultUnblockSeconds = UITestSupport.defaultDurationSeconds
             context.insert(settings)
         }
 
-        if !UITestSupport.isActive, !UITestSupport.isUnitTestHost {
-            CustomDomainsMigration.run(context: context, sharedStore: SharedStore())
-        }
-
         if UITestSupport.isActive {
             context.insert(SelectedApps(selection: UITestSupport.mainSelection))
             if !UITestSupport.noKeys {

Normal/App/UITestSupport.swift

@@ -18,6 +18,8 @@ enum UITestSupport {
 
     static let startBlocked = arguments.contains("-uiTestStartBlocked")
 
+    static let customDomains = arguments.contains("-uiTestCustomDomains")
+
     static let seedGroupKey = arguments.contains("-uiTestSeedGroupKey")
 
     static let seedGroupID = UUID(uuidString: "6E0A1C9B-2D4F-4B7A-9C3E-5F8D1A2B3C4D")!

Normal/Intents/AppBlockIntentPerformer.swift

@@ -38,12 +38,12 @@ final class AppBlockIntentPerformer: BlockIntentPerforming {
         let settings = try validatedSettings()
         guard let mainSelection = try context.fetch(FetchDescriptor<SelectedApps>()).first,
               !mainSelection.selection.isEmpty
-              || !mainSelection.customDomains.isEmpty
+              || (settings.enableCustomDomains && !mainSelection.customDomains.isEmpty)
         else { throw BlockIntentError.noAppsSelected }
 
         let status = screenTimeService.blockStatus(
             selection: mainSelection.selection,
-            customDomains: mainSelection.customDomains
+            customDomains: settings.enableCustomDomains ? mainSelection.customDomains : []
         )
         let wasAlreadyBlocked = status == .all && timedUnblockService.activeUnblocks.isEmpty
 
@@ -67,7 +67,7 @@ final class AppBlockIntentPerformer: BlockIntentPerforming {
 
         let status = screenTimeService.blockStatus(
             selection: group.selection,
-            customDomains: group.customDomains
+            customDomains: settings.enableCustomDomains ? group.customDomains : []
         )
         let wasAlreadyBlocked = status == .all && !timedUnblockService.isGroupUnblockActive(groupId: id)
 

Normal/Models/Settings.swift

@@ -15,6 +15,7 @@ final class Settings {
     var defaultTab: AppTab?
     var hideDonateButton: Bool = false
     var showTimedUnblockLiveActivity: Bool = false
+    var enableCustomDomains: Bool = false
     var skipBlockWithoutKeyConfirmation: Bool = false
     var dailyLimitResetMinutes: Int = 0
 

Normal/Modifiers/WidgetActionResponder.swift

@@ -22,6 +22,14 @@ private struct WidgetActionResponder: ViewModifier {
         allSettings.first?.unblockDurations ?? TimedUnblockDuration.presets
     }
 
+    private var customDomainsEnabled: Bool {
+        allSettings.first?.enableCustomDomains ?? false
+    }
+
+    private func customDomains(for group: AppGroup) -> [String] {
+        customDomainsEnabled ? group.customDomains : []
+    }
+
     func body(content: Content) -> some View {
         content
             .protectedAction(
@@ -94,7 +102,7 @@ private struct WidgetActionResponder: ViewModifier {
                 duration: duration,
                 groupId: group.id,
                 selection: group.selection,
-                customDomains: group.customDomains,
+                customDomains: customDomains(for: group),
                 screenTimeService: screenTimeService
             )
         } else {

Normal/Resources/Localizable.xcstrings

@@ -701,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.",
@@ -1559,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

Normal/Services/BlockActions.swift

@@ -10,7 +10,7 @@ enum BlockActions {
         timedUnblockService.clearAll()
         screenTimeService.blockAll(
             selection: mainSelection.selection,
-            customDomains: mainSelection.customDomains,
+            customDomains: settings.enableCustomDomains ? mainSelection.customDomains : [],
             blockAllPreventsAppDelete: settings.blockAllPreventsAppDelete
         )
     }
@@ -21,7 +21,7 @@ enum BlockActions {
         screenTimeService: any ScreenTimeProviding,
         timedUnblockService: TimedUnblockService
     ) {
-        let customDomains = group.customDomains
+        let customDomains = settings.enableCustomDomains ? group.customDomains : []
         if timedUnblockService.isGroupUnblockActive(groupId: group.id) {
             timedUnblockService.cancelGroup(groupId: group.id)
         }

Normal/Services/CustomDomainsMigration.swift

@@ -64,6 +64,10 @@ final class ScheduleService {
             .hasSameWindow(as: makeDeviceSchedule(for: schedule)) == true
     }
 
+    func mirrorCustomDomainsEnabled(_ enabled: Bool) {
+        sharedStore.setCustomDomainsEnabled(enabled)
+    }
+
     func remove(
         _ schedule: BlockSchedule,
         remaining: [BlockSchedule],