From 13ca0eb4495e1f27f87e3105df96b98c4070d17c Mon Sep 17 00:00:00 2001 From: Max Goedjen Date: Sun, 13 Sep 2020 23:36:08 -0600 Subject: [PATCH] Bit more cleanup --- Secretive/Views/DeleteSecretView.swift | 15 ++++----------- Secretive/Views/SecretListView.swift | 2 +- Secretive/Views/UpdateView.swift | 6 +----- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/Secretive/Views/DeleteSecretView.swift b/Secretive/Views/DeleteSecretView.swift index c336d40..7810c3e 100644 --- a/Secretive/Views/DeleteSecretView.swift +++ b/Secretive/Views/DeleteSecretView.swift @@ -2,20 +2,13 @@ import SwiftUI import SecretKit struct DeleteSecretView: View { - + @ObservedObject var store: StoreType - + let secret: StoreType.SecretType + var dismissalBlock: (Bool) -> () + @State private var confirm = "" - private let secret: StoreType.SecretType - private var dismissalBlock: (Bool) -> () - - init(secret: StoreType.SecretType, store: StoreType, dismissalBlock: @escaping (Bool) -> ()) { - self.secret = secret - self.store = store - self.dismissalBlock = dismissalBlock - } - var body: some View { VStack { HStack { diff --git a/Secretive/Views/SecretListView.swift b/Secretive/Views/SecretListView.swift index 6b3ccdb..34268a4 100644 --- a/Secretive/Views/SecretListView.swift +++ b/Secretive/Views/SecretListView.swift @@ -22,7 +22,7 @@ struct SecretListView: View { } .sheet(item: $deletingSecret) { secret in if let modifiable = store as? AnySecretStoreModifiable { - DeleteSecretView(secret: secret, store: modifiable) { deleted in + DeleteSecretView(store: modifiable, secret: secret) { deleted in deletingSecret = nil if deleted { deletedSecret(AnySecret(secret)) diff --git a/Secretive/Views/UpdateView.swift b/Secretive/Views/UpdateView.swift index 4f5c890..afe620e 100644 --- a/Secretive/Views/UpdateView.swift +++ b/Secretive/Views/UpdateView.swift @@ -5,11 +5,7 @@ struct UpdateDetailView: View { @EnvironmentObject var updater: UpdaterType - private let update: Release - - init(update: Release) { - self.update = update - } + let update: Release var body: some View { VStack {