Update for Big Sur & SwiftUI 2 (#128)

Secretive/Views/ContentView.swift

@@ -3,146 +3,189 @@ import SecretKit
 import Brief
 
 struct ContentView<UpdaterType: UpdaterProtocol, AgentStatusCheckerType: AgentStatusCheckerProtocol>: View {
-    
-    @ObservedObject var storeList: SecretStoreList
-    @ObservedObject var updater: UpdaterType
-    @ObservedObject var agentStatusChecker: AgentStatusCheckerType
-    var runSetupBlock: (() -> Void)?
 
-    @State private var active: AnySecret.ID?
-    @State private var showingDeletion = false
-    @State private var deletingSecret: AnySecret?
-    
+    @Binding var showingCreation: Bool
+    @Binding var runningSetup: Bool
+    @Binding var hasRunSetup: Bool
+
+    @EnvironmentObject private var storeList: SecretStoreList
+    @EnvironmentObject private var updater: UpdaterType
+    @EnvironmentObject private var agentStatusChecker: AgentStatusCheckerType
+
+    @State private var selectedUpdate: Release?
+    @State private var showingAppPathNotice = false
+
     var body: some View {
         VStack {
-            if updater.update != nil {
-                updateNotice()
-            }
-            if !agentStatusChecker.running {
-                agentNotice()
-            }
             if storeList.anyAvailable {
-            NavigationView {
-                List(selection: $active) {
-                    ForEach(storeList.stores) { store in
-                        if store.isAvailable {
-                            Section(header: Text(store.name)) {
-                                if store.secrets.isEmpty {
-                                    if store is AnySecretStoreModifiable {
-                                        NavigationLink(destination: EmptyStoreModifiableView(), tag: Constants.emptyStoreModifiableTag, selection: self.$active) {
-                                            Text("No Secrets")
-                                        }
-                                    } else {
-                                        NavigationLink(destination: EmptyStoreView(), tag: Constants.emptyStoreTag, selection: self.$active) {
-                                            Text("No Secrets")
-                                        }
-                                    }
-                                } else {
-                                    ForEach(store.secrets) { secret in
-                                        NavigationLink(destination: SecretDetailView(secret: secret), tag: secret.id, selection: self.$active) {
-                                            Text(secret.name)
-                                        }.contextMenu {
-                                            if store is AnySecretStoreModifiable {
-                                                Button(action: { self.delete(secret: secret) }) {
-                                                    Text("Delete")
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }.onAppear {
-                    self.active = self.nextDefaultSecret
-                }
-                .listStyle(SidebarListStyle())
-                .frame(minWidth: 100, idealWidth: 240)
-            }
-            .navigationViewStyle(DoubleColumnNavigationViewStyle())
-            .sheet(isPresented: $showingDeletion) {
-                if self.storeList.modifiableStore != nil {
-                    DeleteSecretView(secret: self.deletingSecret!, store: self.storeList.modifiableStore!) { deleted in
-                        self.showingDeletion = false
-                        if deleted {
-                            self.active = self.nextDefaultSecret
-                        }
-                    }
-                }
-            }
+                StoreListView(showingCreation: $showingCreation)
             } else {
                 NoStoresView()
             }
-        }.frame(minWidth: 640, minHeight: 320)
+        }
+        .sheet(isPresented: $showingCreation) {
+            if let modifiable = storeList.modifiableStore {
+                CreateSecretView(store: modifiable, showing: $showingCreation)
+            }
+        }
+        .frame(minWidth: 640, minHeight: 320)
+        .toolbar {
+            updateNotice
+            setupNotice
+            appPathNotice
+            newItem
+        }
     }
 
-    func updateNotice() -> some View {
-        guard let update = updater.update else { return AnyView(Spacer()) }
-        let severity: NoticeView.Severity
+}
+
+extension ContentView {
+
+    var updateNotice: ToolbarItem<Void, AnyView> {
+        guard let update = updater.update else {
+            return ToolbarItem { AnyView(EmptyView()) }
+        }
+        let color: Color
         let text: String
         if update.critical {
-            severity = .critical
             text = "Critical Security Update Required"
+            color = .red
         } else {
-            severity = .advisory
             text = "Update Available"
+            color = .orange
         }
-        return AnyView(NoticeView(text: text, severity: severity, actionTitle: "Update") {
-            NSWorkspace.shared.open(update.html_url)
-        })
-    }
-
-    func agentNotice() -> some View {
-        NoticeView(text: "Secret Agent isn't running. Run setup again to fix.", severity: .advisory, actionTitle: "Run Setup") {
-            self.runSetupBlock?()
+        return ToolbarItem {
+            AnyView(
+                Button(action: {
+                    selectedUpdate = update
+                }, label: {
+                    Text(text)
+                        .font(.headline)
+                        .foregroundColor(.white)
+                })
+                .background(color)
+                .cornerRadius(5)
+                .popover(item: $selectedUpdate, attachmentAnchor: .point(.bottom), arrowEdge: .bottom) { update in
+                    UpdateDetailView(update: update)
+                }
+            )
         }
     }
 
-    func delete<SecretType: Secret>(secret: SecretType) {
-        deletingSecret = AnySecret(secret)
-        self.showingDeletion = true
+    var newItem: ToolbarItem<Void, AnyView> {
+        guard storeList.modifiableStore?.isAvailable ?? false else {
+            return ToolbarItem { AnyView(EmptyView()) }
+        }
+        return ToolbarItem {
+            AnyView(
+                Button(action: {
+                    showingCreation = true
+                }, label: {
+                    Image(systemName: "plus")
+                })
+            )
+        }
     }
 
-    var nextDefaultSecret: AnyHashable? {
-        let fallback: AnyHashable
-        if self.storeList.modifiableStore?.isAvailable ?? false {
-            fallback = Constants.emptyStoreModifiableTag
-        } else {
-            fallback = Constants.emptyStoreTag
+    var setupNotice: ToolbarItem<Void, AnyView> {
+        return ToolbarItem {
+            AnyView(
+                Group {
+                    if runningSetup || !hasRunSetup || !agentStatusChecker.running  {
+                        Button(action: {
+                            runningSetup = true
+                        }, label: {
+                            Group {
+                                if hasRunSetup && !agentStatusChecker.running {
+                                    Text("Secret Agent Is Not Running")
+                                } else {
+                                    Text("Setup Secretive")
+                                }
+                            }
+                            .font(.headline)
+                            .foregroundColor(.white)
+                        })
+                        .background(Color.orange)
+                        .cornerRadius(5)
+                    } else {
+                        EmptyView()
+                    }
+                }
+                .sheet(isPresented: $runningSetup) {
+                    SetupView(visible: $runningSetup, setupComplete: $hasRunSetup)
+                }
+            )
         }
-        return self.storeList.stores.compactMap(\.secrets.first).first?.id ?? fallback
     }
-    
+
+    var appPathNotice: ToolbarItem<Void, AnyView> {
+        let controller = ApplicationDirectoryController()
+        guard !controller.isInApplicationsDirectory else {
+            return ToolbarItem { AnyView(EmptyView()) }
+        }
+        return ToolbarItem {
+            AnyView(
+                Button(action: {
+                    showingAppPathNotice = true
+                }, label: {
+                    Group {
+                        Text("Secretive Is Not in Applications Folder")
+                    }
+                    .font(.headline)
+                    .foregroundColor(.white)
+                })
+                .background(Color.orange)
+                .cornerRadius(5)
+                .popover(isPresented: $showingAppPathNotice, attachmentAnchor: .point(.bottom), arrowEdge: .bottom) {
+                    VStack {
+                        Image(systemName: "exclamationmark.triangle")
+                            .resizable()
+                            .aspectRatio(contentMode: .fit)
+                            .frame(width: 64)
+                        Text("Secretive needs to be in your Applications folder to work properly. Please move it and relaunch.")
+                            .frame(maxWidth: 300)
+                    }
+                    .padding()
+                }
+            )
+        }
+    }
+
 }
 
-private enum Constants {
-    static let emptyStoreModifiableTag: AnyHashable = "emptyStoreModifiableTag"
-    static let emptyStoreTag: AnyHashable = "emptyStoreModifiableTag"
-}
-
-
 #if DEBUG
 
 struct ContentView_Previews: PreviewProvider {
+
+    private static let storeList: SecretStoreList = {
+        let list = SecretStoreList()
+        list.add(store: SecureEnclave.Store())
+        list.add(store: SmartCard.Store())
+        return list
+    }()
+    private static let agentStatusChecker = AgentStatusChecker()
+    private static let justUpdatedChecker = JustUpdatedChecker()
+
+    @State var hasRunSetup = false
+    @State private var showingSetup = false
+    @State private var showingCreation = false
+
     static var previews: some View {
         Group {
-            ContentView(storeList: Preview.storeList(stores: [Preview.Store(numberOfRandomSecrets: 0)],
-                                                     modifiableStores: [Preview.StoreModifiable(numberOfRandomSecrets: 0)]),
-                        updater: PreviewUpdater(),
-                        agentStatusChecker: PreviewAgentStatusChecker())
-            ContentView(storeList: Preview.storeList(stores: [Preview.Store()], modifiableStores: [Preview.StoreModifiable()]), updater: PreviewUpdater(),
-                        agentStatusChecker: PreviewAgentStatusChecker())
-            ContentView(storeList: Preview.storeList(stores: [Preview.Store()]), updater: PreviewUpdater(),
-                        agentStatusChecker: PreviewAgentStatusChecker())
-            ContentView(storeList: Preview.storeList(modifiableStores: [Preview.StoreModifiable()]), updater: PreviewUpdater(),
-                        agentStatusChecker: PreviewAgentStatusChecker())
-            ContentView(storeList: Preview.storeList(stores: [Preview.Store(numberOfRandomSecrets: 0)], modifiableStores: [Preview.StoreModifiable(numberOfRandomSecrets: 0)]), updater: PreviewUpdater(update: .advisory),
-                        agentStatusChecker: PreviewAgentStatusChecker())
-            ContentView(storeList: Preview.storeList(stores: [Preview.Store(numberOfRandomSecrets: 0)], modifiableStores: [Preview.StoreModifiable(numberOfRandomSecrets: 0)]), updater: PreviewUpdater(update: .critical),
-                        agentStatusChecker: PreviewAgentStatusChecker())
-            ContentView(storeList: Preview.storeList(stores: [Preview.Store(numberOfRandomSecrets: 0)], modifiableStores: [Preview.StoreModifiable(numberOfRandomSecrets: 0)]), updater: PreviewUpdater(update: .critical),
-                        agentStatusChecker: PreviewAgentStatusChecker(running: false))
+            // Empty on modifiable and nonmodifiable
+            ContentView<PreviewUpdater, AgentStatusChecker>(showingCreation: .constant(false), runningSetup: .constant(false), hasRunSetup: .constant(true))
+                .environmentObject(Preview.storeList(stores: [Preview.Store(numberOfRandomSecrets: 0)], modifiableStores: [Preview.StoreModifiable(numberOfRandomSecrets: 0)]))
+                .environmentObject(PreviewUpdater())
+                .environmentObject(agentStatusChecker)
+
+            // 5 items on modifiable and nonmodifiable
+            ContentView<PreviewUpdater, AgentStatusChecker>(showingCreation: .constant(false), runningSetup: .constant(false), hasRunSetup: .constant(true))
+                .environmentObject(Preview.storeList(stores: [Preview.Store()], modifiableStores: [Preview.StoreModifiable()]))
+                .environmentObject(PreviewUpdater())
+                .environmentObject(agentStatusChecker)
         }
+        .environmentObject(agentStatusChecker)
+
     }
 }
 

Secretive/Views/CopyableView.swift

@@ -0,0 +1,135 @@
+import SwiftUI
+
+struct CopyableView: View {
+
+    var title: String
+    var image: Image
+    var text: String
+
+    @State private var interactionState: InteractionState = .normal
+
+    var body: some View {
+        VStack(alignment: .leading) {
+            HStack {
+                image
+                    .renderingMode(.template)
+                    .imageScale(.large)
+                    .foregroundColor(primaryTextColor)
+                Text(title)
+                    .font(.headline)
+                    .foregroundColor(primaryTextColor)
+                Spacer()
+                if interactionState != .normal {
+                    Text(hoverText)
+                        .bold()
+                        .textCase(.uppercase)
+                        .foregroundColor(secondaryTextColor)
+                        .transition(.opacity)
+                }
+
+            }
+            .padding(EdgeInsets(top: 20, leading: 20, bottom: 10, trailing: 20))
+            Divider()
+            Text(text)
+                .fixedSize(horizontal: false, vertical: true)
+                .foregroundColor(primaryTextColor)
+                .padding(EdgeInsets(top: 10, leading: 20, bottom: 20, trailing: 20))
+                .multilineTextAlignment(.leading)
+                .font(.system(.body, design: .monospaced))
+        }
+        .background(backgroundColor)
+        .frame(minWidth: 150, maxWidth: .infinity)
+        .cornerRadius(10)
+        .onHover { hovering in
+            withAnimation {
+                interactionState = hovering ? .hovering : .normal
+            }
+        }
+        .onDrag {
+            NSItemProvider(item: NSData(data: text.data(using: .utf8)!), typeIdentifier: kUTTypeUTF8PlainText as String)
+        }
+        .onTapGesture {
+            copy()
+            withAnimation {
+                interactionState = .clicking
+            }
+        }
+        .gesture(
+            TapGesture()
+                .onEnded {
+                    withAnimation {
+                        interactionState = .normal
+                    }
+                }
+        )
+    }
+
+    var hoverText: String {
+        switch interactionState {
+        case .hovering:
+            return "Click to Copy"
+        case .clicking:
+            return "Copied"
+        case .normal:
+            fatalError()
+        }
+    }
+
+    var backgroundColor: Color {
+        let color: NSColor
+        switch interactionState {
+        case .normal:
+            color = .windowBackgroundColor
+        case .hovering:
+            color = .unemphasizedSelectedContentBackgroundColor
+        case .clicking:
+            color = .selectedContentBackgroundColor
+        }
+        return Color(color)
+    }
+
+    var primaryTextColor: Color {
+        let color: NSColor
+        switch interactionState {
+        case .normal, .hovering:
+            color = .textColor
+        case .clicking:
+            color = .white
+        }
+        return Color(color)
+    }
+
+    var secondaryTextColor: Color {
+        let color: NSColor
+        switch interactionState {
+        case .normal, .hovering:
+            color = .secondaryLabelColor
+        case .clicking:
+            color = .white
+        }
+        return Color(color)
+    }
+
+    func copy() {
+        NSPasteboard.general.declareTypes([.string], owner: nil)
+        NSPasteboard.general.setString(text, forType: .string)
+    }
+
+    private enum InteractionState {
+        case normal, hovering, clicking
+    }
+
+}
+
+#if DEBUG
+
+struct CopyableView_Previews: PreviewProvider {
+    static var previews: some View {
+        Group {
+            CopyableView(title: "Title", image: Image(systemName: "figure.wave"), text: "Hello world.")
+            CopyableView(title: "Title", 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. ")
+        }
+    }
+}
+
+#endif

Secretive/Views/CreateSecretView.swift

@@ -1,15 +1,14 @@
 import SwiftUI
 import SecretKit
 
-struct CreateSecretView: View {
+struct CreateSecretView<StoreType: SecretStoreModifiable>: View {
     
-    @ObservedObject var store: AnySecretStoreModifiable
-    
-    @State var name = ""
-    @State var requiresAuthentication = true
-    
-    var dismissalBlock: () -> ()
+    @ObservedObject var store: StoreType
+    @Binding var showing: Bool
     
+    @State private var name = ""
+    @State private var requiresAuthentication = true
+
     var body: some View {
         VStack {
             HStack {
@@ -33,22 +32,22 @@ struct CreateSecretView: View {
                         Spacer()
                     }
                 }
-                .onExitCommand(perform: dismissalBlock)
             }
             HStack {
                 Spacer()
-                Button(action: dismissalBlock) {
-                    Text("Cancel")
+                Button("Cancel") {
+                    showing = false
                 }
-                Button(action: save) {
-                    Text("Create")
-                }.disabled(name.isEmpty)
+                .keyboardShortcut(.cancelAction)
+                Button("Create", action: save)
+                    .disabled(name.isEmpty)
+                    .keyboardShortcut(.defaultAction)
             }
         }.padding()
     }
     
     func save() {
         try! store.create(name: name, requiresAuthentication: requiresAuthentication)
-        dismissalBlock()
+        showing = false
     }
 }

Secretive/Views/DeleteSecretView.swift

@@ -2,20 +2,13 @@ import SwiftUI
 import SecretKit
 
 struct DeleteSecretView<StoreType: SecretStoreModifiable>: View {
-    
-    let secret: StoreType.SecretType
+
     @ObservedObject var store: StoreType
-    
-    @State var confirm = ""
-    
-    private var dismissalBlock: (Bool) -> ()
-    
-    init(secret: StoreType.SecretType, store: StoreType, dismissalBlock: @escaping (Bool) -> ()) {
-        self.secret = secret
-        self.store = store
-        self.dismissalBlock = dismissalBlock
-    }
-    
+    let secret: StoreType.SecretType
+    var dismissalBlock: (Bool) -> ()
+
+    @State private var confirm = ""
+
     var body: some View {
         VStack {
             HStack {
@@ -38,24 +31,27 @@ struct DeleteSecretView<StoreType: SecretStoreModifiable>: View {
                     }
                 }
                 .onExitCommand {
-                    self.dismissalBlock(false)
+                    dismissalBlock(false)
                 }
             }
             HStack {
                 Spacer()
-                Button(action: delete) {
-                    Text("Delete")
-                }.disabled(confirm != secret.name)
-                Button(action: { self.dismissalBlock(false) }) {
-                    Text("Don't Delete")
+                Button("Delete", action: delete)
+                    .disabled(confirm != secret.name)
+                    .keyboardShortcut(.delete)
+                Button("Don't Delete") {
+                    dismissalBlock(false)
                 }
+                .keyboardShortcut(.cancelAction)
             }
-        }.padding()
+        }
+        .padding()
         .frame(minWidth: 400)
     }
     
     func delete() {
         try! store.delete(secret: secret)
-        self.dismissalBlock(true)
+        dismissalBlock(true)
     }
+
 }

Secretive/Views/EmptyStoreView.swift

@@ -1,6 +1,34 @@
 import SwiftUI
+import SecretKit
 
 struct EmptyStoreView: View {
+
+    @ObservedObject var store: AnySecretStore
+    @Binding var activeSecret: AnySecret.ID?
+
+    var body: some View {
+        if store is AnySecretStoreModifiable {
+            NavigationLink(destination: EmptyStoreModifiableView(), tag: Constants.emptyStoreModifiableTag, selection: $activeSecret) {
+                Text("No Secrets")
+            }
+        } else {
+            NavigationLink(destination: EmptyStoreImmutableView(), tag: Constants.emptyStoreTag, selection: $activeSecret) {
+                Text("No Secrets")
+            }
+        }
+    }
+}
+
+extension EmptyStoreView {
+    
+    enum Constants {
+        static let emptyStoreModifiableTag: AnyHashable = "emptyStoreModifiableTag"
+        static let emptyStoreTag: AnyHashable = "emptyStoreModifiableTag"
+    }
+
+}
+
+struct EmptyStoreImmutableView: View {
     
     var body: some View {
         VStack {
@@ -48,7 +76,7 @@ struct EmptyStoreModifiableView: View {
 struct EmptyStoreModifiableView_Previews: PreviewProvider {
     static var previews: some View {
         Group {
-            EmptyStoreView()
+            EmptyStoreImmutableView()
             EmptyStoreModifiableView()
         }
     }

Secretive/Views/NoStoresView.swift

@@ -1,29 +1,23 @@
-//
-//  NoStoresView.swift
-//  Secretive
-//
-//  Created by Max Goedjen on 3/20/20.
-//  Copyright © 2020 Max Goedjen. All rights reserved.
-//
-
 import SwiftUI
 
 struct NoStoresView: View {
+
     var body: some View {
         VStack {
             Text("No Secure Storage Available").bold()
             Text("Your Mac doesn't have a Secure Enclave, and there's not a compatible Smart Card inserted.")
-            Button(action: {
-                NSWorkspace.shared.open(URL(string: "https://www.yubico.com/products/compare-yubikey-5-series/")!)
-            }) {
-                Text("If you're looking to add one to your Mac, the YubiKey 5 Series are great.")
-            }
+            Link("If you're looking to add one to your Mac, the YubiKey 5 Series are great.", destination: URL(string: "https://www.yubico.com/products/compare-yubikey-5-series/")!)
         }.padding()
     }
+    
 }
 
+#if DEBUG
+
 struct NoStoresView_Previews: PreviewProvider {
     static var previews: some View {
         NoStoresView()
     }
 }
+
+#endif

Secretive/Views/NoticeView.swift

@@ -1,57 +0,0 @@
-import Foundation
-import SwiftUI
-
-struct NoticeView: View {
-
-    let text: String
-    let severity: Severity
-    let actionTitle: String?
-    let action: (() -> Void)?
-
-    var body: some View {
-        HStack {
-            Text(text).bold()
-            Spacer()
-            if action != nil {
-                Button(action: action!) {
-                    Text(actionTitle!)
-                }
-            }
-            }.padding().background(color)
-    }
-
-    var color: Color {
-        switch severity {
-        case .advisory:
-            return Color.orange
-        case .critical:
-            return Color.red
-        }
-    }
-
-}
-
-extension NoticeView {
-
-    enum Severity {
-        case advisory, critical
-    }
-
-}
-
-#if DEBUG
-
-struct NoticeView_Previews: PreviewProvider {
-    static var previews: some View {
-        Group {
-            NoticeView(text: "Agent Not Running", severity: .advisory, actionTitle: "Run Setup") {
-                print("OK")
-            }
-            NoticeView(text: "Critical Security Update Required", severity: .critical, actionTitle: "Update") {
-                print("OK")
-            }
-        }
-    }
-}
-
-#endif

Secretive/Views/SecretDetailView.swift

@@ -2,58 +2,34 @@ import SwiftUI
 import SecretKit
 
 struct SecretDetailView<SecretType: Secret>: View {
-
+    
     @State var secret: SecretType
-    let keyWriter = OpenSSHKeyWriter()
 
+    private let keyWriter = OpenSSHKeyWriter()
+    
     var body: some View {
         Form {
             Section {
-                GroupBox(label: Text("Fingerprint")) {
-                    HStack {
-                        Text(keyWriter.openSSHFingerprint(secret: secret))
-                        Spacer()
-                    }
-                        .frame(minWidth: 150, maxWidth: .infinity)
-                        .padding()
-                }.onDrag {
-                    return NSItemProvider(item: NSData(data: self.keyWriter.openSSHFingerprint(secret: self.secret).data(using: .utf8)!), typeIdentifier: kUTTypeUTF8PlainText as String)
-                }
-                Spacer().frame(height: 10)
-                GroupBox(label: Text("Public Key")) {
-                    VStack {
-                        Text(keyWriter.openSSHString(secret: secret))
-                            .multilineTextAlignment(.leading)
-                            .frame(minWidth: 150, maxWidth: .infinity)
-                        HStack {
-                            Spacer()
-                            Button(action: copy) {
-                                Text("Copy")
-                            }
-                        }
-                    }
-                    .padding()
-                }
-                .onDrag {
-                    return NSItemProvider(item: NSData(data: self.keyString.data(using: .utf8)!), typeIdentifier: kUTTypeUTF8PlainText as String)
-                }
+                CopyableView(title: "Fingerprint", image: Image(systemName: "touchid"), text: keyWriter.openSSHFingerprint(secret: secret))
+                Spacer()
+                    .frame(height: 20)
+                CopyableView(title: "Public Key", image: Image(systemName: "key"), text: keyWriter.openSSHString(secret: secret))
                 Spacer()
             }
-        }.padding()
-            .frame(minHeight: 150, maxHeight: .infinity)
-
+        }
+        .padding()
+        .frame(minHeight: 200, maxHeight: .infinity)
     }
-
+    
     var keyString: String {
         keyWriter.openSSHString(secret: secret)
     }
-
+    
     func copy() {
         NSPasteboard.general.declareTypes([.string], owner: nil)
         NSPasteboard.general.setString(keyString, forType: .string)
     }
-
-
+    
 }
 
 #if DEBUG

Secretive/Views/SecretListView.swift

@@ -0,0 +1,40 @@
+import SwiftUI
+import SecretKit
+
+struct SecretListView: View {
+
+    @ObservedObject var store: AnySecretStore
+    @Binding var activeSecret: AnySecret.ID?
+    @Binding var deletingSecret: AnySecret?
+
+    var deletedSecret: (AnySecret) -> Void
+
+    var body: some View {
+        ForEach(store.secrets) { secret in
+            NavigationLink(destination: SecretDetailView(secret: secret), tag: secret.id, selection: $activeSecret) {
+                Text(secret.name)
+            }.contextMenu {
+                if store is AnySecretStoreModifiable {
+                    Button(action: { delete(secret: secret) }) {
+                        Text("Delete")
+                    }
+                }
+            }
+            .sheet(item: $deletingSecret) { secret in
+                if let modifiable = store as? AnySecretStoreModifiable {
+                    DeleteSecretView(store: modifiable, secret: secret) { deleted in
+                        deletingSecret = nil
+                        if deleted {
+                            deletedSecret(AnySecret(secret))
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    func delete<SecretType: Secret>(secret: SecretType) {
+        deletingSecret = AnySecret(secret)
+    }
+
+}

Secretive/Views/SetupView.swift

@@ -1,145 +1,295 @@
-import Foundation
 import SwiftUI
 
 struct SetupView: View {
-    
-    var completion: ((Bool) -> Void)?
-    
+
+    @State var stepIndex = 0
+    @Binding var visible: Bool
+    @Binding var setupComplete: Bool
+
     var body: some View {
-        Form {
-            SetupStepView<Spacer>(text: "Secretive needs to install a helper app to sign requests when the main app isn't running. This app is called \"SecretAgent\" and you might see it in Activity Manager from time to time.",
-                                  index: 1,
-                                  nestedView: nil,
-                                  actionText: "Install") {
-                                    self.installLaunchAgent()
-            }
-            SetupStepView(text: "Add this line to your shell config (.bashrc or .zshrc) telling SSH to talk to SecretAgent when it wants to authenticate. Drag this into your config file.",
-                          index: 2,
-                          nestedView: SetupStepCommandView(text: Constants.socketPrompt),
-                          actionText: "Added") {
-                            self.markAsDone()
-            }
-            HStack {
-                Spacer()
-                Button(action: { self.completion?(true) }) {
-                    Text("Finish")
+        GeometryReader { proxy in
+            VStack {
+                StepView(numberOfSteps: 3, currentStep: stepIndex, width: proxy.size.width)
+                GeometryReader { _ in
+                    HStack(spacing: 0) {
+                        SecretAgentSetupView(buttonAction: advance)
+                            .frame(width: proxy.size.width)
+                        SSHAgentSetupView(buttonAction: advance)
+                            .frame(width: proxy.size.width)
+                        UpdaterExplainerView {
+                            visible = false
+                            setupComplete = true
+                        }
+                        .frame(width: proxy.size.width)
+                    }
+                    .offset(x: -proxy.size.width * CGFloat(stepIndex), y: 0)
                 }
-                .padding()
             }
-        }.frame(minWidth: 640, minHeight: 400)
+        }
+        .frame(idealWidth: 500, idealHeight: 500)
     }
-    
+
+
+    func advance() {
+        withAnimation(.spring()) {
+            stepIndex += 1
+        }
+    }
+
 }
 
-struct SetupStepView<NestedViewType: View>: View {
-    
-    let text: String
-    let index: Int
-    let nestedView: NestedViewType?
-    @State var completed = false
-    let actionText: String
-    let action: (() -> Bool)
-    
+struct StepView: View {
+
+    let numberOfSteps: Int
+    let currentStep: Int
+
+    // Ideally we'd have a geometry reader inside this view doing this for us, but that crashes on 11.0b7
+    let width: CGFloat
+
     var body: some View {
-        Section {
+        ZStack(alignment: .leading) {
+            Rectangle()
+                .foregroundColor(.blue)
+                .frame(height: 5)
+            Rectangle()
+                .foregroundColor(.green)
+                .frame(width: max(0, ((width - (Constants.padding * 2)) / CGFloat(numberOfSteps - 1)) * CGFloat(currentStep) - (Constants.circleWidth / 2)), height: 5)
+                .animation(.spring())
             HStack {
-                ZStack {
-                    if completed {
-                        Circle().foregroundColor(.green)
-                            .frame(width: 30, height: 30)
-                        Text("✓")
-                            .foregroundColor(.white)
-                            .bold()
-                    } else {
-                        Circle().foregroundColor(.blue)
-                            .frame(width: 30, height: 30)
-                        Text(String(describing: index))
-                            .foregroundColor(.white)
-                            .bold()
+                ForEach(0..<numberOfSteps) { index in
+                    ZStack {
+                        if currentStep > index {
+                            Circle()
+                                .foregroundColor(.green)
+                                .frame(width: Constants.circleWidth, height: Constants.circleWidth)
+                            Text("✓")
+                                .foregroundColor(.white)
+                                .bold()
+                        } else {
+                            Circle()
+                                .foregroundColor(.blue)
+                                .frame(width: Constants.circleWidth, height: Constants.circleWidth)
+                            if currentStep == index {
+                                Circle()
+                                    .strokeBorder(Color.white, lineWidth: 3)
+                                    .frame(width: Constants.circleWidth, height: Constants.circleWidth)
+                            }
+                            Text(String(describing: index + 1))
+                                .foregroundColor(.white)
+                                .bold()
+                        }
+                    }
+                    if index < numberOfSteps - 1 {
+                        Spacer(minLength: 30)
                     }
                 }
-                .padding()
-                VStack {
-                    Text(text)
-                        .opacity(completed ? 0.5 : 1)
-                        .lineLimit(nil)
-                    if nestedView != nil {
-                        nestedView!.padding()
-                    }
-                }
-                .padding()
-                Button(action: {
-                    self.completed = self.action()
-                }) {
-                    Text(actionText)
-                }.disabled(completed)
-                    .padding()
             }
-        }
+        }.padding(Constants.padding)
     }
+
 }
 
-struct SetupStepCommandView: View {
-    
-    let text: String
-    
-    var body: some View {
-        VStack(alignment: .leading) {
-            Text(text)
-                .lineLimit(nil)
-                .font(.system(.caption, design: .monospaced))
-                .multilineTextAlignment(.leading)
-                .frame(minHeight: 50)
-            HStack {
-                Spacer()
-                Button(action: copy) {
-                    Text("Copy")
-                }
-            }
-        }
-        .padding()
-        .background(Color(white: 0, opacity: 0.10))
-        .cornerRadius(10)
-        .onDrag {
-            return NSItemProvider(item: NSData(data: self.text.data(using: .utf8)!), typeIdentifier: kUTTypeUTF8PlainText as String)
-            
-        }
-    }
-    
-    func copy() {
-        NSPasteboard.general.declareTypes([.string], owner: nil)
-        NSPasteboard.general.setString(text, forType: .string)
-    }
-    
-}
+extension StepView {
 
-extension SetupView {
-    
-    func installLaunchAgent() -> Bool {
-        LaunchAgentController().install()
-    }
-    
-    func markAsDone() -> Bool {
-        return true
-    }
-    
-}
-
-extension SetupView {
-    
     enum Constants {
-        static let socketPath = (NSHomeDirectory().replacingOccurrences(of: "com.maxgoedjen.Secretive.Host", with: "com.maxgoedjen.Secretive.SecretAgent") as NSString).appendingPathComponent("socket.ssh") as String
-        static let socketPrompt = "export SSH_AUTH_SOCK=\(socketPath)"
+
+        static let padding: CGFloat = 15
+        static let circleWidth: CGFloat = 30
+
     }
-    
+
+}
+
+struct SetupStepView<Content> : View where Content : View {
+
+    let title: String
+    let image: Image
+    let bodyText: String
+    let buttonTitle: String
+    let buttonAction: () -> Void
+    let content: Content
+
+    init(title: String, image: Image, bodyText: String, buttonTitle: String, buttonAction: @escaping () -> Void = {}, @ViewBuilder content: () -> Content) {
+        self.title = title
+        self.image = image
+        self.bodyText = bodyText
+        self.buttonTitle = buttonTitle
+        self.buttonAction = buttonAction
+        self.content = content()
+    }
+
+    var body: some View {
+        VStack {
+            Text(title)
+                .font(.title)
+            Spacer()
+            image
+                .resizable()
+                .aspectRatio(contentMode: .fit)
+                .frame(width: 64)
+            Spacer()
+            Text(bodyText)
+                .multilineTextAlignment(.center)
+            Spacer()
+            content
+            Spacer()
+            Button(buttonTitle) {
+                buttonAction()
+            }
+        }.padding()
+    }
+
+}
+
+struct SecretAgentSetupView: View {
+
+    let buttonAction: () -> Void
+
+    var body: some View {
+        SetupStepView(title: "Setup Secret Agent",
+                      image: Image(nsImage: NSApp.applicationIconImage),
+                      bodyText: "Secretive needs to set up a helper app to work properly. It will sign requests from SSH clients in the background, so you don't need to keep the main Secretive app open.",
+                      buttonTitle: "Install",
+                      buttonAction: install) {
+            (Text("This helper app is called ") + Text("Secret Agent").bold().underline() + Text(" and you may see it in Activity Manager from time to time."))
+                .multilineTextAlignment(.center)
+        }
+    }
+
+    func install() {
+        _ = LaunchAgentController().install()
+        buttonAction()
+    }
+
+}
+
+struct SSHAgentSetupView: View {
+
+    let buttonAction: () -> Void
+
+    private static let controller = ShellConfigurationController()
+    @State private var selectedShellInstruction: ShellConfigInstruction = controller.shellInstructions.first!
+
+    var body: some View {
+        SetupStepView(title: "Configure your SSH Agent",
+                      image: Image(systemName: "terminal"),
+                      bodyText: "Add this line to your shell config telling SSH to talk to Secret Agent when it wants to authenticate. Secretive can either do this for you automatically, or you can copy and paste this into your config file.",
+                      buttonTitle: "I Added it Manually",
+                      buttonAction: buttonAction) {
+            Picker(selection: $selectedShellInstruction, label: EmptyView()) {
+                ForEach(SSHAgentSetupView.controller.shellInstructions) { instruction in
+                    Text(instruction.shell)
+                        .tag(instruction)
+                        .padding()
+                }
+            }.pickerStyle(SegmentedPickerStyle())
+            CopyableView(title: "Add to \(selectedShellInstruction.shellConfigPath)", image: Image(systemName: "greaterthan.square"), text: selectedShellInstruction.text)
+            Button("Add it For Me") {
+                let controller = ShellConfigurationController()
+                if controller.addToShell(shellInstructions: selectedShellInstruction) {
+                    buttonAction()
+                }
+            }
+        }
+    }
+
+}
+
+class Delegate: NSObject, NSOpenSavePanelDelegate {
+
+    private let name: String
+
+    init(name: String) {
+        self.name = name
+    }
+
+    func panel(_ sender: Any, shouldEnable url: URL) -> Bool {
+        return url.lastPathComponent == name
+    }
+
+}
+
+struct UpdaterExplainerView: View {
+
+    let buttonAction: () -> Void
+
+    var body: some View {
+        SetupStepView(title: "Updates",
+                      image: Image(systemName: "dot.radiowaves.left.and.right"),
+                      bodyText: "Secretive will periodically check with GitHub to see if there's a new release. If you see any network requests to GitHub, that's why.",
+                      buttonTitle: "Okay",
+                      buttonAction: buttonAction) {
+            Link("Read more about this here.", destination: SetupView.Constants.updaterFAQURL)
+        }
+    }
+
+}
+
+extension SetupView {
+
+    enum Constants {
+        static let updaterFAQURL = URL(string: "https://github.com/maxgoedjen/secretive/blob/main/FAQ.md#whats-this-network-request-to-github")!
+    }
+
+}
+
+struct ShellConfigInstruction: Identifiable, Hashable {
+
+    var shell: String
+    var shellConfigDirectory: String
+    var shellConfigFilename: String
+    var text: String
+
+    var id: String {
+        shell
+    }
+
+    var shellConfigPath: String {
+        return (shellConfigDirectory as NSString).appendingPathComponent(shellConfigFilename)
+    }
+
 }
 
 #if DEBUG
 
 struct SetupView_Previews: PreviewProvider {
+
     static var previews: some View {
-        SetupView()
+        Group {
+            SetupView(visible: .constant(true), setupComplete: .constant(false))
+        }
     }
+
+}
+
+struct SecretAgentSetupView_Previews: PreviewProvider {
+
+    static var previews: some View {
+        Group {
+            SecretAgentSetupView(buttonAction: {})
+        }
+    }
+
+}
+
+struct SSHAgentSetupView_Previews: PreviewProvider {
+
+    static var previews: some View {
+        Group {
+            SSHAgentSetupView(buttonAction: {})
+        }
+    }
+
+}
+
+struct UpdaterExplainerView_Previews: PreviewProvider {
+
+    static var previews: some View {
+        Group {
+            UpdaterExplainerView(buttonAction: {})
+        }
+    }
+    
 }
 
 #endif

Secretive/Views/StoreListView.swift

@@ -0,0 +1,53 @@
+import SwiftUI
+import SecretKit
+
+struct StoreListView: View {
+
+    @Binding var showingCreation: Bool
+    
+    @State private var activeSecret: AnySecret.ID?
+    @State private var deletingSecret: AnySecret?
+
+    @EnvironmentObject private var storeList: SecretStoreList
+
+    var body: some View {
+        NavigationView {
+            List(selection: $activeSecret) {
+                ForEach(storeList.stores) { store in
+                    if store.isAvailable {
+                        Section(header: Text(store.name)) {
+                            if store.secrets.isEmpty {
+                                EmptyStoreView(store: store, activeSecret: $activeSecret)
+                            } else {
+                                SecretListView(store: store, activeSecret: $activeSecret, deletingSecret: $deletingSecret, deletedSecret: { _ in
+                                    activeSecret = nextDefaultSecret
+                                })
+                            }
+                        }
+                    }
+                }
+            }
+            .listStyle(SidebarListStyle())
+            .onAppear {
+                activeSecret = nextDefaultSecret
+            }
+            .frame(minWidth: 100, idealWidth: 240)
+        }
+
+    }
+
+}
+
+extension StoreListView {
+
+    var nextDefaultSecret: AnyHashable? {
+        let fallback: AnyHashable
+        if storeList.modifiableStore?.isAvailable ?? false {
+            fallback = EmptyStoreView.Constants.emptyStoreModifiableTag
+        } else {
+            fallback = EmptyStoreView.Constants.emptyStoreTag
+        }
+        return storeList.stores.compactMap(\.secrets.first).first?.id ?? fallback
+    }
+    
+}

Secretive/Views/UpdateView.swift

@@ -0,0 +1,61 @@
+import SwiftUI
+import Brief
+
+struct UpdateDetailView<UpdaterType: Updater>: View {
+
+    @EnvironmentObject var updater: UpdaterType
+
+    let update: Release
+
+    var body: some View {
+        VStack {
+            Text("Secretive \(update.name)").font(.title)
+            GroupBox(label: Text("Release Notes")) {
+                ScrollView {
+                    attributedBody
+                }
+            }
+            HStack {
+                if !update.critical {
+                    Button("Ignore") {
+                        updater.ignore(release: update)
+                    }
+                    Spacer()
+                }
+                Button("Update") {
+                    NSWorkspace.shared.open(update.html_url)
+                }
+                .keyboardShortcut(.defaultAction)
+            }
+            
+        }
+        .padding()
+        .frame(maxWidth: 500)
+    }
+
+    var attributedBody: Text {
+        var text = Text("")
+        for line in update.body.split(whereSeparator: \.isNewline) {
+            let attributed: Text
+            let split = line.split(separator: " ")
+            let unprefixed = split.dropFirst().joined()
+            if let prefix = split.first {
+                switch prefix {
+                case "#":
+                    attributed = Text(unprefixed).font(.title) + Text("\n")
+                case "##":
+                    attributed = Text(unprefixed).font(.title2) + Text("\n")
+                case "###":
+                    attributed = Text(unprefixed).font(.title3) + Text("\n")
+                default:
+                    attributed = Text(line) + Text("\n\n")
+                }
+            } else {
+                attributed = Text(line) + Text("\n\n")
+            }
+            text = text + attributed
+        }
+        return text
+    }
+
+}