From 0e94dd654124a9c80eabb0707213f833e3a80df2 Mon Sep 17 00:00:00 2001 From: Max Goedjen Date: Wed, 3 Sep 2025 01:07:18 -0700 Subject: [PATCH 1/2] Previews --- .../Views/Secrets/EmptyStoreView.swift | 15 ++++------ .../Views/Secrets/NoStoresView.swift | 9 ++---- .../Secretive/Views/Views/ContentView.swift | 30 +++++++------------ .../Secretive/Views/Views/CopyableView.swift | 19 +++++------- 4 files changed, 25 insertions(+), 48 deletions(-) diff --git a/Sources/Secretive/Views/Secrets/EmptyStoreView.swift b/Sources/Secretive/Views/Secrets/EmptyStoreView.swift index 3f0bd81..2552443 100644 --- a/Sources/Secretive/Views/Secrets/EmptyStoreView.swift +++ b/Sources/Secretive/Views/Secrets/EmptyStoreView.swift @@ -57,15 +57,10 @@ struct EmptyStoreModifiableView: View { } } -#if DEBUG -struct EmptyStoreModifiableView_Previews: PreviewProvider { - static var previews: some View { - Group { - EmptyStoreImmutableView() - EmptyStoreModifiableView() - } - } +#Preview { + EmptyStoreImmutableView() +} +#Preview { + EmptyStoreModifiableView() } - -#endif diff --git a/Sources/Secretive/Views/Secrets/NoStoresView.swift b/Sources/Secretive/Views/Secrets/NoStoresView.swift index 497138d..fd31ddf 100644 --- a/Sources/Secretive/Views/Secrets/NoStoresView.swift +++ b/Sources/Secretive/Views/Secrets/NoStoresView.swift @@ -13,12 +13,7 @@ struct NoStoresView: View { } -#if DEBUG - -struct NoStoresView_Previews: PreviewProvider { - static var previews: some View { - NoStoresView() - } +#Preview { + NoStoresView() } -#endif diff --git a/Sources/Secretive/Views/Views/ContentView.swift b/Sources/Secretive/Views/Views/ContentView.swift index 933013d..d37f624 100644 --- a/Sources/Secretive/Views/Views/ContentView.swift +++ b/Sources/Secretive/Views/Views/ContentView.swift @@ -198,25 +198,17 @@ extension ContentView { } -#if DEBUG -struct ContentView_Previews: PreviewProvider { - - static var previews: some View { - Group { - // Empty on modifiable and nonmodifiable - ContentView(showingCreation: .constant(false), runningSetup: .constant(false), hasRunSetup: .constant(true)) - .environment(Preview.storeList(stores: [Preview.Store(numberOfRandomSecrets: 0)], modifiableStores: [Preview.StoreModifiable(numberOfRandomSecrets: 0)])) - .environment(PreviewUpdater()) - - // 5 items on modifiable and nonmodifiable - ContentView(showingCreation: .constant(false), runningSetup: .constant(false), hasRunSetup: .constant(true)) - .environment(Preview.storeList(stores: [Preview.Store()], modifiableStores: [Preview.StoreModifiable()])) - .environment(PreviewUpdater()) - } - - } +#Preview { + // Empty on modifiable and nonmodifiable + ContentView(showingCreation: .constant(false), runningSetup: .constant(false), hasRunSetup: .constant(true)) + .environment(Preview.storeList(stores: [Preview.Store(numberOfRandomSecrets: 0)], modifiableStores: [Preview.StoreModifiable(numberOfRandomSecrets: 0)])) + .environment(PreviewUpdater()) } -#endif - +#Preview { + // 5 items on modifiable and nonmodifiable + ContentView(showingCreation: .constant(false), runningSetup: .constant(false), hasRunSetup: .constant(true)) + .environment(Preview.storeList(stores: [Preview.Store()], modifiableStores: [Preview.StoreModifiable()])) + .environment(PreviewUpdater()) +} diff --git a/Sources/Secretive/Views/Views/CopyableView.swift b/Sources/Secretive/Views/Views/CopyableView.swift index 23855f6..c36af4b 100644 --- a/Sources/Secretive/Views/Views/CopyableView.swift +++ b/Sources/Secretive/Views/Views/CopyableView.swift @@ -163,17 +163,12 @@ fileprivate struct BackgroundViewModifier: ViewModifier { } -#if DEBUG - -struct CopyableView_Previews: PreviewProvider { - static var previews: some View { - Group { - CopyableView(title: .secretDetailSha256FingerprintLabel, image: Image(systemName: "figure.wave"), text: "Hello world.") - .padding() - CopyableView(title: .secretDetailSha256FingerprintLabel, image: Image(systemName: "figure.wave"), text: "Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. ") - .padding() - } - } +#Preview { + CopyableView(title: .secretDetailSha256FingerprintLabel, image: Image(systemName: "figure.wave"), text: "Hello world.") + .padding() } -#endif +#Preview { + CopyableView(title: .secretDetailSha256FingerprintLabel, image: Image(systemName: "figure.wave"), text: "Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. Long text. ") + .padding() +} From 89bb2a8d47a4325b53bbad16c9c5034138e5e332 Mon Sep 17 00:00:00 2001 From: Max Goedjen Date: Wed, 3 Sep 2025 01:10:14 -0700 Subject: [PATCH 2/2] Temporarily disable. --- .../Views/Secrets/CreateSecretView.swift | 6 ++--- .../Views/Secrets/SecretDetailView.swift | 6 ++--- .../Views/Views/AgentStatusView.swift | 16 ++++++------ .../Secretive/Views/Views/ContentView.swift | 26 +++++++++---------- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Sources/Secretive/Views/Secrets/CreateSecretView.swift b/Sources/Secretive/Views/Secrets/CreateSecretView.swift index bd317ae..cbe4afe 100644 --- a/Sources/Secretive/Views/Secrets/CreateSecretView.swift +++ b/Sources/Secretive/Views/Secrets/CreateSecretView.swift @@ -146,6 +146,6 @@ struct CreateSecretView: View { } -#Preview { - CreateSecretView(store: Preview.StoreModifiable()) { _ in } -} +//#Preview { +// CreateSecretView(store: Preview.StoreModifiable()) { _ in } +//} diff --git a/Sources/Secretive/Views/Secrets/SecretDetailView.swift b/Sources/Secretive/Views/Secrets/SecretDetailView.swift index d9081ac..679ed70 100644 --- a/Sources/Secretive/Views/Secrets/SecretDetailView.swift +++ b/Sources/Secretive/Views/Secrets/SecretDetailView.swift @@ -37,6 +37,6 @@ struct SecretDetailView: View { } -#Preview { - SecretDetailView(secret: Preview.Secret(name: "Demonstration Secret")) -} +//#Preview { +// SecretDetailView(secret: Preview.Secret(name: "Demonstration Secret")) +//} diff --git a/Sources/Secretive/Views/Views/AgentStatusView.swift b/Sources/Secretive/Views/Views/AgentStatusView.swift index 28139fe..50b50c9 100644 --- a/Sources/Secretive/Views/Views/AgentStatusView.swift +++ b/Sources/Secretive/Views/Views/AgentStatusView.swift @@ -143,11 +143,11 @@ struct AgentNotRunningView: View { } -#Preview { - AgentStatusView() - .environment(\.agentStatusChecker, PreviewAgentStatusChecker(running: false)) -} -#Preview { - AgentStatusView() - .environment(\.agentStatusChecker, PreviewAgentStatusChecker(running: true, process: .current)) -} +//#Preview { +// AgentStatusView() +// .environment(\.agentStatusChecker, PreviewAgentStatusChecker(running: false)) +//} +//#Preview { +// AgentStatusView() +// .environment(\.agentStatusChecker, PreviewAgentStatusChecker(running: true, process: .current)) +//} diff --git a/Sources/Secretive/Views/Views/ContentView.swift b/Sources/Secretive/Views/Views/ContentView.swift index d37f624..33e8c87 100644 --- a/Sources/Secretive/Views/Views/ContentView.swift +++ b/Sources/Secretive/Views/Views/ContentView.swift @@ -199,16 +199,16 @@ extension ContentView { } -#Preview { - // Empty on modifiable and nonmodifiable - ContentView(showingCreation: .constant(false), runningSetup: .constant(false), hasRunSetup: .constant(true)) - .environment(Preview.storeList(stores: [Preview.Store(numberOfRandomSecrets: 0)], modifiableStores: [Preview.StoreModifiable(numberOfRandomSecrets: 0)])) - .environment(PreviewUpdater()) -} - -#Preview { - // 5 items on modifiable and nonmodifiable - ContentView(showingCreation: .constant(false), runningSetup: .constant(false), hasRunSetup: .constant(true)) - .environment(Preview.storeList(stores: [Preview.Store()], modifiableStores: [Preview.StoreModifiable()])) - .environment(PreviewUpdater()) -} +//#Preview { +// // Empty on modifiable and nonmodifiable +// ContentView(showingCreation: .constant(false), runningSetup: .constant(false), hasRunSetup: .constant(true)) +// .environment(Preview.storeList(stores: [Preview.Store(numberOfRandomSecrets: 0)], modifiableStores: [Preview.StoreModifiable(numberOfRandomSecrets: 0)])) +// .environment(PreviewUpdater()) +//} +// +//#Preview { +// // 5 items on modifiable and nonmodifiable +// ContentView(showingCreation: .constant(false), runningSetup: .constant(false), hasRunSetup: .constant(true)) +// .environment(Preview.storeList(stores: [Preview.Store()], modifiableStores: [Preview.StoreModifiable()])) +// .environment(PreviewUpdater()) +//}