From b630996db2c4c03fdb48b9b5e24026790a1fcb11 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Sun, 1 Feb 2026 13:04:07 -0600 Subject: [PATCH] Signed-off-by: Matt Bruce --- .../Features/Clock/Models/ClockStyle.swift | 10 ---------- .../Features/Clock/State/ClockViewModel.swift | 2 -- .../Features/Clock/Views/ClockView.swift | 1 - .../Components/ClockDisplayContainer.swift | 2 -- .../Settings/AdvancedAppearanceSection.swift | 19 ------------------- .../Views/Components/TimeDisplayView.swift | 9 --------- .../Shared/Design/AppConstants.swift | 1 - .../Shared/Design/Fonts/FontUtils.swift | 2 -- 8 files changed, 46 deletions(-) diff --git a/TheNoiseClock/Features/Clock/Models/ClockStyle.swift b/TheNoiseClock/Features/Clock/Models/ClockStyle.swift index e376f18..1f8686c 100644 --- a/TheNoiseClock/Features/Clock/Models/ClockStyle.swift +++ b/TheNoiseClock/Features/Clock/Models/ClockStyle.swift @@ -23,8 +23,6 @@ class ClockStyle: Codable, Equatable { var digitColorHex: String = AppConstants.Defaults.digitColorHex var randomizeColor: Bool = false var glowIntensity: Double = AppConstants.Defaults.glowIntensity - var digitScale: Double = AppConstants.Defaults.digitScale - var stretched: Bool = true var backgroundHex: String = AppConstants.Defaults.backgroundColorHex // MARK: - Color Theme Settings @@ -68,8 +66,6 @@ class ClockStyle: Codable, Equatable { case digitColorHex case randomizeColor case glowIntensity - case digitScale - case stretched case backgroundHex case selectedColorTheme case nightModeEnabled @@ -107,8 +103,6 @@ class ClockStyle: Codable, Equatable { self.digitColorHex = try container.decodeIfPresent(String.self, forKey: .digitColorHex) ?? self.digitColorHex self.randomizeColor = try container.decodeIfPresent(Bool.self, forKey: .randomizeColor) ?? self.randomizeColor self.glowIntensity = try container.decodeIfPresent(Double.self, forKey: .glowIntensity) ?? self.glowIntensity - self.digitScale = try container.decodeIfPresent(Double.self, forKey: .digitScale) ?? self.digitScale - self.stretched = try container.decodeIfPresent(Bool.self, forKey: .stretched) ?? self.stretched self.backgroundHex = try container.decodeIfPresent(String.self, forKey: .backgroundHex) ?? self.backgroundHex self.selectedColorTheme = try container.decodeIfPresent(String.self, forKey: .selectedColorTheme) ?? self.selectedColorTheme self.nightModeEnabled = try container.decodeIfPresent(Bool.self, forKey: .nightModeEnabled) ?? self.nightModeEnabled @@ -151,8 +145,6 @@ class ClockStyle: Codable, Equatable { try container.encode(digitColorHex, forKey: .digitColorHex) try container.encode(randomizeColor, forKey: .randomizeColor) try container.encode(glowIntensity, forKey: .glowIntensity) - try container.encode(digitScale, forKey: .digitScale) - try container.encode(stretched, forKey: .stretched) try container.encode(backgroundHex, forKey: .backgroundHex) try container.encode(selectedColorTheme, forKey: .selectedColorTheme) try container.encode(nightModeEnabled, forKey: .nightModeEnabled) @@ -445,8 +437,6 @@ class ClockStyle: Codable, Equatable { lhs.digitColorHex == rhs.digitColorHex && lhs.randomizeColor == rhs.randomizeColor && lhs.glowIntensity == rhs.glowIntensity && - lhs.digitScale == rhs.digitScale && - lhs.stretched == rhs.stretched && lhs.backgroundHex == rhs.backgroundHex && lhs.selectedColorTheme == rhs.selectedColorTheme && lhs.nightModeEnabled == rhs.nightModeEnabled && diff --git a/TheNoiseClock/Features/Clock/State/ClockViewModel.swift b/TheNoiseClock/Features/Clock/State/ClockViewModel.swift index ace4203..db953f1 100644 --- a/TheNoiseClock/Features/Clock/State/ClockViewModel.swift +++ b/TheNoiseClock/Features/Clock/State/ClockViewModel.swift @@ -87,8 +87,6 @@ class ClockViewModel { style.forceHorizontalMode = newStyle.forceHorizontalMode style.digitColorHex = newStyle.digitColorHex style.glowIntensity = newStyle.glowIntensity - style.digitScale = newStyle.digitScale - style.stretched = newStyle.stretched style.clockOpacity = newStyle.clockOpacity style.fontFamily = newStyle.fontFamily style.fontWeight = newStyle.fontWeight diff --git a/TheNoiseClock/Features/Clock/Views/ClockView.swift b/TheNoiseClock/Features/Clock/Views/ClockView.swift index 03b623c..ba80b8d 100644 --- a/TheNoiseClock/Features/Clock/Views/ClockView.swift +++ b/TheNoiseClock/Features/Clock/Views/ClockView.swift @@ -56,7 +56,6 @@ struct ClockView: View { .padding(.trailing, symmetricInset) } .frame(width: screenWidth, height: screenHeight) - .border(.purple, width: 3) // Debug: Full screen ZStack .overlay(alignment: .bottomLeading) { if Self.debugShowSafeAreas { safeAreaDebugInfo( diff --git a/TheNoiseClock/Features/Clock/Views/Components/ClockDisplayContainer.swift b/TheNoiseClock/Features/Clock/Views/Components/ClockDisplayContainer.swift index e08dc96..f883203 100644 --- a/TheNoiseClock/Features/Clock/Views/Components/ClockDisplayContainer.swift +++ b/TheNoiseClock/Features/Clock/Views/Components/ClockDisplayContainer.swift @@ -31,8 +31,6 @@ struct ClockDisplayContainer: View { showAmPm: style.showAmPm, digitColor: style.effectiveDigitColor, glowIntensity: style.glowIntensity, - manualScale: style.digitScale, - stretched: style.stretched, clockOpacity: style.clockOpacity, fontFamily: style.fontFamily, fontWeight: style.fontWeight, diff --git a/TheNoiseClock/Features/Clock/Views/Components/Settings/AdvancedAppearanceSection.swift b/TheNoiseClock/Features/Clock/Views/Components/Settings/AdvancedAppearanceSection.swift index 962601d..578b349 100644 --- a/TheNoiseClock/Features/Clock/Views/Components/Settings/AdvancedAppearanceSection.swift +++ b/TheNoiseClock/Features/Clock/Views/Components/Settings/AdvancedAppearanceSection.swift @@ -27,25 +27,6 @@ struct AdvancedAppearanceSection: View { accentColor: AppAccent.primary ) - SettingsToggle( - title: "Stretched (Auto‑Fit)", - subtitle: "Fit the clock to available space", - isOn: $style.stretched, - accentColor: AppAccent.primary - ) - - if !style.stretched { - SettingsSlider( - title: "Size", - subtitle: "Manual scaling when auto‑fit is off", - value: $style.digitScale, - in: 0.0...1.0, - step: 0.01, - format: SliderFormat.percentage, - accentColor: AppAccent.primary - ) - } - SettingsSlider( title: "Glow", subtitle: "Adjust the glow intensity", diff --git a/TheNoiseClock/Features/Clock/Views/Components/TimeDisplayView.swift b/TheNoiseClock/Features/Clock/Views/Components/TimeDisplayView.swift index f46bafc..8a139bc 100644 --- a/TheNoiseClock/Features/Clock/Views/Components/TimeDisplayView.swift +++ b/TheNoiseClock/Features/Clock/Views/Components/TimeDisplayView.swift @@ -30,8 +30,6 @@ struct TimeDisplayView: View { let showAmPm: Bool let digitColor: Color let glowIntensity: Double - let manualScale: Double - let stretched: Bool let clockOpacity: Double let fontFamily: FontFamily let fontWeight: Font.Weight @@ -116,9 +114,6 @@ struct TimeDisplayView: View { let dotSpacing = portrait ? fontSize * Layout.dotSpacingPortraitMultiplier : fontSize * Layout.dotSpacingLandscapeMultiplier - - // Simple scaling - let the content size naturally and apply manual scale - let finalScale = stretched ? 1.0 : CGFloat(max(0.1, min(manualScale, 1.0))) // Time display with consistent centering and stable layout return Group { @@ -179,8 +174,6 @@ struct TimeDisplayView: View { } } .offset(y: portraitMode && forceHorizontalMode ? -containerSize.height * 0.10 : 0) // Push up in horizontal mode - .scaleEffect(finalScale, anchor: .center) - .animation(.smooth(duration: Design.Animation.standard), value: finalScale) .animation(.smooth(duration: Design.Animation.standard), value: showSeconds) // Smooth animation for seconds toggle .minimumScaleFactor(0.1) .clipped() // Prevent overflow beyond bounds @@ -340,8 +333,6 @@ struct TimeDisplayView: View { showAmPm: true, digitColor: .white, glowIntensity: 0.2, - manualScale: 1.0, - stretched: true, clockOpacity: 1.0, fontFamily: .verdana, fontWeight: .medium, diff --git a/TheNoiseClock/Shared/Design/AppConstants.swift b/TheNoiseClock/Shared/Design/AppConstants.swift index 4986f41..63def5a 100644 --- a/TheNoiseClock/Shared/Design/AppConstants.swift +++ b/TheNoiseClock/Shared/Design/AppConstants.swift @@ -50,7 +50,6 @@ enum AppConstants { static let digitColorHex = "#FFFFFF" static let backgroundColorHex = "#000000" static let glowIntensity = 0.6 - static let digitScale = 1.0 static let clockOpacity = 0.5 static let overlayOpacity = 0.5 static let minFontSize = 20.0 diff --git a/TheNoiseClock/Shared/Design/Fonts/FontUtils.swift b/TheNoiseClock/Shared/Design/Fonts/FontUtils.swift index a70fbdf..f2487d4 100644 --- a/TheNoiseClock/Shared/Design/Fonts/FontUtils.swift +++ b/TheNoiseClock/Shared/Design/Fonts/FontUtils.swift @@ -236,8 +236,6 @@ private struct TestContentView: View { showAmPm: true, digitColor: .primary, glowIntensity: 0.5, - manualScale: 1.0, - stretched: false, clockOpacity: 1.0, fontFamily: font, fontWeight: fontWeight,