Strip day/night brightness schedule for separate PR, hide clock options when unused

nstefanelli · nstefanelli · commit 7a2ccebec52e · 2026-03-10T21:03:48.000-04:00
- Remove TimeOfDay struct, brightnessScheduleEnabled, dayBrightness, nightBrightness,
  dayStartTime, nightStartTime settings
- Remove isNightTime(), scheduleBrightnessUpdate(), brightnessTimer from KioskModeManager
- Remove TimeOfDayPicker and schedule UI from KioskSettingsView
- Remove scheduleCheckInterval from KioskConstants
- Remove related L10n keys and tests
- Simplify brightness to manual-only (applyBrightness)
- Clock options section now only shows when screensaver is enabled and mode is clock
diff --git a/Sources/App/Kiosk/KioskConstants.swift b/Sources/App/Kiosk/KioskConstants.swift
@@ -19,13 +19,6 @@ public enum KioskConstants {
         public static let pixelShift: TimeInterval = 1.0
     }
 
-    // MARK: - Timing Intervals
-
-    public enum Timing {
-        /// Schedule check interval for brightness changes
-        public static let scheduleCheckInterval: TimeInterval = 60
-    }
-
     // MARK: - UI Dimensions
 
     public enum UI {
diff --git a/Sources/App/Kiosk/KioskModeManager.swift b/Sources/App/Kiosk/KioskModeManager.swift
@@ -77,7 +77,6 @@ public final class KioskModeManager: ObservableObject {
 
     private var cancellables = Set<AnyCancellable>()
     private var idleTimer: Timer?
-    private var brightnessTimer: Timer?
     private var pixelShiftTimer: Timer?
     private var originalBrightness: Float?
     private var preScreensaverBrightness: CGFloat?
@@ -167,7 +166,6 @@ public final class KioskModeManager: ObservableObject {
 
     deinit {
         idleTimer?.invalidate()
-        brightnessTimer?.invalidate()
         pixelShiftTimer?.invalidate()
         saveDebounceTimer?.invalidate()
         cancellables.forEach { $0.cancel() }
@@ -200,8 +198,8 @@ public final class KioskModeManager: ObservableObject {
             Current.Log.info("Screen auto-lock disabled")
         }
 
-        // Apply settings
-        applyBrightnessSchedule()
+        // Apply brightness
+        applyBrightness()
         startIdleTimer()
 
         onKioskModeChange?(true)
@@ -233,7 +231,6 @@ public final class KioskModeManager: ObservableObject {
 
         // Stop timers
         stopIdleTimer()
-        stopBrightnessTimer()
         stopPixelShiftTimer()
 
         // Hide screensaver if active
@@ -299,9 +296,9 @@ public final class KioskModeManager: ObservableObject {
 
         hideScreensaver(source: source)
 
-        // Restore brightness: use schedule if enabled, otherwise restore pre-screensaver level
+        // Restore brightness: use managed level if enabled, otherwise restore pre-screensaver level
         if settings.brightnessControlEnabled {
-            applyBrightnessSchedule()
+            applyBrightness()
         } else if let savedBrightness = preScreensaverBrightness {
             UIScreen.main.brightness = savedBrightness
         }
@@ -422,44 +419,13 @@ public final class KioskModeManager: ObservableObject {
         sleepScreen()
     }
 
-    // MARK: - Brightness Schedule
+    // MARK: - Brightness
 
-    private func applyBrightnessSchedule() {
+    private func applyBrightness() {
         guard settings.brightnessControlEnabled else { return }
 
-        let brightness: Float
-        if settings.brightnessScheduleEnabled {
-            brightness = isNightTime() ? settings.nightBrightness : settings.dayBrightness
-        } else {
-            brightness = settings.manualBrightness
-        }
-
-        currentBrightness = brightness
-        UIScreen.main.brightness = CGFloat(brightness)
-
-        // Schedule next brightness change if schedule is enabled
-        if settings.brightnessScheduleEnabled {
-            scheduleBrightnessUpdate()
-        }
-    }
-
-    private func scheduleBrightnessUpdate() {
-        stopBrightnessTimer()
-
-        // Check every minute for schedule changes
-        brightnessTimer = Timer.scheduledTimer(
-            withTimeInterval: KioskConstants.Timing.scheduleCheckInterval,
-            repeats: true
-        ) { [weak self] _ in
-            Task { @MainActor [weak self] in
-                self?.applyBrightnessSchedule()
-            }
-        }
-    }
-
-    private func stopBrightnessTimer() {
-        brightnessTimer?.invalidate()
-        brightnessTimer = nil
+        currentBrightness = settings.manualBrightness
+        UIScreen.main.brightness = CGFloat(settings.manualBrightness)
     }
 
     // MARK: - Pixel Shift Timer
@@ -487,25 +453,6 @@ public final class KioskModeManager: ObservableObject {
         notifyObserversOfPixelShift()
     }
 
-    // MARK: - Time Utilities
-
-    private func isNightTime() -> Bool {
-        let now = Calendar.current.dateComponents([.hour, .minute], from: Current.date())
-        let currentTime = TimeOfDay(hour: now.hour ?? 0, minute: now.minute ?? 0)
-
-        let dayStart = settings.dayStartTime
-        let nightStart = settings.nightStartTime
-
-        // If day starts before night in 24h time (normal case: day 07:00, night 22:00)
-        if dayStart.isBefore(nightStart) {
-            // Night time is: before day start OR at/after night start
-            return currentTime.isBefore(dayStart) || !currentTime.isBefore(nightStart)
-        } else {
-            // If night starts before day in 24h time (e.g., night 02:00, day 06:00)
-            return !currentTime.isBefore(nightStart) && currentTime.isBefore(dayStart)
-        }
-    }
-
     // MARK: - Settings Persistence
 
     private static func loadSettings() -> KioskSettings {
@@ -524,13 +471,10 @@ public final class KioskModeManager: ObservableObject {
     }
 
     private func settingsDidChange(from oldValue: KioskSettings, to newValue: KioskSettings) {
-        // Reapply brightness if schedule settings changed
-        if oldValue.brightnessScheduleEnabled != newValue.brightnessScheduleEnabled ||
-            oldValue.dayBrightness != newValue.dayBrightness ||
-            oldValue.nightBrightness != newValue.nightBrightness ||
-            oldValue.manualBrightness != newValue.manualBrightness {
+        // Reapply brightness if setting changed
+        if oldValue.manualBrightness != newValue.manualBrightness {
             if isKioskModeActive {
-                applyBrightnessSchedule()
+                applyBrightness()
             }
         }
 
diff --git a/Sources/App/Kiosk/KioskSettings.swift b/Sources/App/Kiosk/KioskSettings.swift
@@ -73,21 +73,6 @@ public struct KioskSettings: Codable, Equatable {
     /// Manual brightness level (0.0 - 1.0)
     public var manualBrightness: Float = 0.8
 
-    /// Enable day/night brightness schedule
-    public var brightnessScheduleEnabled: Bool = false
-
-    /// Daytime brightness level (0.0 - 1.0)
-    public var dayBrightness: Float = 0.8
-
-    /// Nighttime brightness level (0.0 - 1.0)
-    public var nightBrightness: Float = 0.3
-
-    /// Time when day brightness starts (hour, minute)
-    public var dayStartTime: TimeOfDay = .init(hour: 7, minute: 0)
-
-    /// Time when night brightness starts (hour, minute)
-    public var nightStartTime: TimeOfDay = .init(hour: 22, minute: 0)
-
     // MARK: - Screensaver
 
     /// Enable screensaver
@@ -142,29 +127,6 @@ public struct KioskSettings: Codable, Equatable {
     public var secretExitGestureTaps: Int = 3
 }
 
-// MARK: - Supporting Types
-
-public struct TimeOfDay: Codable, Equatable {
-    public var hour: Int
-    public var minute: Int
-
-    public init(hour: Int, minute: Int) {
-        self.hour = hour
-        self.minute = minute
-    }
-
-    public var asDateComponents: DateComponents {
-        DateComponents(hour: hour, minute: minute)
-    }
-
-    public func isBefore(_ other: TimeOfDay) -> Bool {
-        if hour != other.hour {
-            return hour < other.hour
-        }
-        return minute < other.minute
-    }
-}
-
 // MARK: - Enums
 
 public enum ScreensaverMode: String, Codable, CaseIterable {
diff --git a/Sources/App/Kiosk/Settings/KioskSettingsView.swift b/Sources/App/Kiosk/Settings/KioskSettingsView.swift
@@ -50,7 +50,9 @@ public struct KioskSettingsView: View {
             coreSettingsSection
             brightnessSection
             screensaverSection
-            clockOptionsSection
+            if settings.screensaverEnabled, settings.screensaverMode == .clock {
+                clockOptionsSection
+            }
         }
         .navigationTitle(L10n.Kiosk.title)
         .toolbar {
@@ -262,36 +264,6 @@ public struct KioskSettingsView: View {
                         .font(.caption)
                     Slider(value: $settings.manualBrightness, in: 0.1 ... 1.0, step: 0.05)
                 }
-
-                Toggle(isOn: $settings.brightnessScheduleEnabled) {
-                    Label(L10n.Kiosk.Brightness.schedule, systemSymbol: .clock)
-                }
-
-                if settings.brightnessScheduleEnabled {
-                    VStack(alignment: .leading) {
-                        Text(L10n.Kiosk.Brightness.day(Int(settings.dayBrightness * 100)))
-                            .font(.caption)
-                        Slider(value: $settings.dayBrightness, in: 0.1 ... 1.0, step: 0.05)
-                    }
-
-                    VStack(alignment: .leading) {
-                        Text(L10n.Kiosk.Brightness.night(Int(settings.nightBrightness * 100)))
-                            .font(.caption)
-                        Slider(value: $settings.nightBrightness, in: 0.05 ... 1.0, step: 0.05)
-                    }
-
-                    HStack {
-                        Text(L10n.Kiosk.Brightness.dayStarts)
-                        Spacer()
-                        TimeOfDayPicker(time: $settings.dayStartTime)
-                    }
-
-                    HStack {
-                        Text(L10n.Kiosk.Brightness.nightStarts)
-                        Spacer()
-                        TimeOfDayPicker(time: $settings.nightStartTime)
-                    }
-                }
             }
         } header: {
             Text(L10n.Kiosk.Brightness.section)
@@ -414,37 +386,6 @@ public struct KioskSettingsView: View {
     }
 }
 
-// MARK: - Time of Day Picker
-
-struct TimeOfDayPicker: View {
-    @Binding var time: TimeOfDay
-
-    var body: some View {
-        HStack {
-            Picker(L10n.Kiosk.Time.hour, selection: $time.hour) {
-                ForEach(0 ..< 24, id: \.self) { hour in
-                    Text(String(format: "%02d", hour)).tag(hour)
-                }
-            }
-            .pickerStyle(.wheel)
-            .frame(width: 60)
-            .clipped()
-
-            Text(":")
-
-            Picker(L10n.Kiosk.Time.minute, selection: $time.minute) {
-                ForEach([0, 15, 30, 45], id: \.self) { minute in
-                    Text(String(format: "%02d", minute)).tag(minute)
-                }
-            }
-            .pickerStyle(.wheel)
-            .frame(width: 60)
-            .clipped()
-        }
-        .frame(height: 100)
-    }
-}
-
 // MARK: - Preview
 
 #Preview {
diff --git a/Sources/App/Resources/en.lproj/Localizable.strings b/Sources/App/Resources/en.lproj/Localizable.strings
@@ -1566,11 +1566,6 @@ Home Assistant is open source, advocates for privacy and runs locally in your ho
 "kiosk.brightness.section" = "Brightness";
 "kiosk.brightness.control" = "Brightness Control";
 "kiosk.brightness.manual" = "Manual Brightness: %d%%";
-"kiosk.brightness.schedule" = "Day/Night Schedule";
-"kiosk.brightness.day" = "Day Brightness: %d%%";
-"kiosk.brightness.night" = "Night Brightness: %d%%";
-"kiosk.brightness.day_starts" = "Day starts";
-"kiosk.brightness.night_starts" = "Night starts";
 
 "kiosk.screensaver.section" = "Screensaver";
 "kiosk.screensaver.toggle" = "Screensaver";
@@ -1608,5 +1603,3 @@ Home Assistant is open source, advocates for privacy and runs locally in your ho
 "kiosk.corner.bottom_left" = "Bottom Left";
 "kiosk.corner.bottom_right" = "Bottom Right";
 
-"kiosk.time.hour" = "Hour";
-"kiosk.time.minute" = "Minute";
diff --git a/Sources/Shared/Resources/Swiftgen/Strings.swift b/Sources/Shared/Resources/Swiftgen/Strings.swift
@@ -1712,24 +1712,10 @@ public enum L10n {
     public enum Brightness {
       /// Brightness Control
       public static var control: String { return L10n.tr("Localizable", "kiosk.brightness.control") }
-      /// Day Brightness: %d%%
-      public static func day(_ p1: Int) -> String {
-        return L10n.tr("Localizable", "kiosk.brightness.day", p1)
-      }
-      /// Day starts
-      public static var dayStarts: String { return L10n.tr("Localizable", "kiosk.brightness.day_starts") }
       /// Manual Brightness: %d%%
       public static func manual(_ p1: Int) -> String {
         return L10n.tr("Localizable", "kiosk.brightness.manual", p1)
       }
-      /// Night Brightness: %d%%
-      public static func night(_ p1: Int) -> String {
-        return L10n.tr("Localizable", "kiosk.brightness.night", p1)
-      }
-      /// Night starts
-      public static var nightStarts: String { return L10n.tr("Localizable", "kiosk.brightness.night_starts") }
-      /// Day/Night Schedule
-      public static var schedule: String { return L10n.tr("Localizable", "kiosk.brightness.schedule") }
       /// Brightness
       public static var section: String { return L10n.tr("Localizable", "kiosk.brightness.section") }
     }
@@ -1853,12 +1839,6 @@ public enum L10n {
       /// Wake on Touch
       public static var wakeOnTouch: String { return L10n.tr("Localizable", "kiosk.security.wake_on_touch") }
     }
-    public enum Time {
-      /// Hour
-      public static var hour: String { return L10n.tr("Localizable", "kiosk.time.hour") }
-      /// Minute
-      public static var minute: String { return L10n.tr("Localizable", "kiosk.time.minute") }
-    }
   }
 
   public enum LegacyActions {
diff --git a/Tests/App/Kiosk/KioskSettings.test.swift b/Tests/App/Kiosk/KioskSettings.test.swift
