From 998577e947ef80085cf41675d612d9ea778ac6f6 Mon Sep 17 00:00:00 2001 From: Michael Freno Date: Sun, 11 Jan 2026 16:29:04 -0500 Subject: [PATCH] fix: previews actually reflect state --- Gaze/Views/Containers/OnboardingContainerView.swift | 6 ++++-- Gaze/Views/Containers/SettingsWindowView.swift | 6 ++++-- Gaze/Views/Reminders/BlinkReminderView.swift | 8 ++------ Gaze/Views/Setup/BlinkSetupView.swift | 3 ++- Gaze/Views/Setup/PostureSetupView.swift | 3 ++- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Gaze/Views/Containers/OnboardingContainerView.swift b/Gaze/Views/Containers/OnboardingContainerView.swift index c9aa863..9905319 100644 --- a/Gaze/Views/Containers/OnboardingContainerView.swift +++ b/Gaze/Views/Containers/OnboardingContainerView.swift @@ -58,7 +58,8 @@ struct OnboardingContainerView: View { BlinkSetupView( enabled: $blinkEnabled, - intervalMinutes: $blinkIntervalMinutes + intervalMinutes: $blinkIntervalMinutes, + subtleReminderSize: subtleReminderSize ) .tag(2) .tabItem { @@ -67,7 +68,8 @@ struct OnboardingContainerView: View { PostureSetupView( enabled: $postureEnabled, - intervalMinutes: $postureIntervalMinutes + intervalMinutes: $postureIntervalMinutes, + subtleReminderSize: subtleReminderSize ) .tag(3) .tabItem { diff --git a/Gaze/Views/Containers/SettingsWindowView.swift b/Gaze/Views/Containers/SettingsWindowView.swift index a4186f5..6c0dd60 100644 --- a/Gaze/Views/Containers/SettingsWindowView.swift +++ b/Gaze/Views/Containers/SettingsWindowView.swift @@ -57,7 +57,8 @@ struct SettingsWindowView: View { BlinkSetupView( enabled: $blinkEnabled, - intervalMinutes: $blinkIntervalMinutes + intervalMinutes: $blinkIntervalMinutes, + subtleReminderSize: subtleReminderSize ) .tag(1) .tabItem { @@ -66,7 +67,8 @@ struct SettingsWindowView: View { PostureSetupView( enabled: $postureEnabled, - intervalMinutes: $postureIntervalMinutes + intervalMinutes: $postureIntervalMinutes, + subtleReminderSize: subtleReminderSize ) .tag(2) .tabItem { diff --git a/Gaze/Views/Reminders/BlinkReminderView.swift b/Gaze/Views/Reminders/BlinkReminderView.swift index 6d41905..a4036e3 100644 --- a/Gaze/Views/Reminders/BlinkReminderView.swift +++ b/Gaze/Views/Reminders/BlinkReminderView.swift @@ -42,9 +42,10 @@ struct BlinkReminderView: View { .scaleEffect(scale) .shadow(color: .black.opacity(0.2), radius: 5, x: 0, y: 2) } + Spacer() } .opacity(opacity) - .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top) + .frame(maxWidth: .infinity, maxHeight: .infinity) .padding(.top, screenHeight * 0.05) .onAppear { startAnimation() @@ -78,8 +79,3 @@ struct BlinkReminderView: View { BlinkReminderView(sizePercentage: 15.0, onDismiss: {}) .frame(width: 800, height: 600) } - -#Preview("Blink Reminder") { - BlinkReminderView(sizePercentage: 15.0, onDismiss: {}) - .frame(width: 800, height: 600) -} diff --git a/Gaze/Views/Setup/BlinkSetupView.swift b/Gaze/Views/Setup/BlinkSetupView.swift index 830fa37..b2f3594 100644 --- a/Gaze/Views/Setup/BlinkSetupView.swift +++ b/Gaze/Views/Setup/BlinkSetupView.swift @@ -11,6 +11,7 @@ import AppKit struct BlinkSetupView: View { @Binding var enabled: Bool @Binding var intervalMinutes: Int + var subtleReminderSize: ReminderSize = .medium @State private var previewWindowController: NSWindowController? var body: some View { @@ -139,7 +140,7 @@ struct BlinkSetupView: View { window.collectionBehavior = [.canJoinAllSpaces, .fullScreenAuxiliary] window.acceptsMouseMovedEvents = true - let contentView = BlinkReminderView(sizePercentage: 15.0) { [weak window] in + let contentView = BlinkReminderView(sizePercentage: subtleReminderSize.percentage) { [weak window] in window?.close() } diff --git a/Gaze/Views/Setup/PostureSetupView.swift b/Gaze/Views/Setup/PostureSetupView.swift index f8f6792..80616c6 100644 --- a/Gaze/Views/Setup/PostureSetupView.swift +++ b/Gaze/Views/Setup/PostureSetupView.swift @@ -11,6 +11,7 @@ import SwiftUI struct PostureSetupView: View { @Binding var enabled: Bool @Binding var intervalMinutes: Int + var subtleReminderSize: ReminderSize = .medium @State private var previewWindowController: NSWindowController? var body: some View { @@ -141,7 +142,7 @@ struct PostureSetupView: View { window.collectionBehavior = [.canJoinAllSpaces, .fullScreenAuxiliary] window.acceptsMouseMovedEvents = true - let contentView = PostureReminderView(sizePercentage: 10.0) { [weak window] in + let contentView = PostureReminderView(sizePercentage: subtleReminderSize.percentage) { [weak window] in window?.close() }