external/secretive
1
0
Fork 0
mirror of https://github.com/maxgoedjen/secretive.git synced 2025-04-19 05:52:12 +00:00
Code Issues Projects Releases Wiki Activity

Fix deletion.

Browse Source
This commit is contained in:
Max Goedjen 2020-09-10 17:08:42 -07:00
parent 33a8d680d3
commit 6a24a66627
No known key found for this signature in database
GPG Key ID: E58C21DD77B9B8E8
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Secretive/Views/ContentView.swift
View File

@ -11,7 +11,6 @@ struct ContentView<UpdaterType: UpdaterProtocol, AgentStatusCheckerType: AgentSt
@State private var active: AnySecret.ID? @State private var active: AnySecret.ID?
@State private var showingCreation = false @State private var showingCreation = false
@State private var showingDeletion = false
@State private var deletingSecret: AnySecret? @State private var deletingSecret: AnySecret?
var body: some View { var body: some View {
@ -51,16 +50,14 @@ struct ContentView<UpdaterType: UpdaterProtocol, AgentStatusCheckerType: AgentSt
}.onAppear { }.onAppear {
self.active = self.nextDefaultSecret self.active = self.nextDefaultSecret
} }
.listStyle(SidebarListStyle())
.frame(minWidth: 100, idealWidth: 240) .frame(minWidth: 100, idealWidth: 240)
} .sheet(item: $deletingSecret) { secret in
.navigationViewStyle(DoubleColumnNavigationViewStyle()) if self.storeList.modifiableStore != nil {
.sheet(isPresented: $showingDeletion) { DeleteSecretView(secret: secret, store: self.storeList.modifiableStore!) { deleted in
if self.storeList.modifiableStore != nil { self.deletingSecret = nil
DeleteSecretView(secret: self.deletingSecret!, store: self.storeList.modifiableStore!) { deleted in if deleted {
self.showingDeletion = false self.active = self.nextDefaultSecret
if deleted { }
self.active = self.nextDefaultSecret
} }
} }
} }
@ -74,14 +71,13 @@ struct ContentView<UpdaterType: UpdaterProtocol, AgentStatusCheckerType: AgentSt
self.showingCreation = false self.showingCreation = false
} }
} }
.frame(minWidth: 640, minHeight: 320) .frame(minWidth: 640, minHeight: 320)
.toolbar { .toolbar {
// if updater.update != nil { // if updater.update != nil {
// updateNotice() // updateNotice()
// } // }
// if !agentStatusChecker.running { // if !agentStatusChecker.running {
// agentNotice() // agentNotice()z
// } // }
ToolbarItem { ToolbarItem {
Button(action: { Button(action: {
@ -133,7 +129,6 @@ struct ContentView<UpdaterType: UpdaterProtocol, AgentStatusCheckerType: AgentSt
func delete<SecretType: Secret>(secret: SecretType) { func delete<SecretType: Secret>(secret: SecretType) {
deletingSecret = AnySecret(secret) deletingSecret = AnySecret(secret)
self.showingDeletion = true
} }
var nextDefaultSecret: AnyHashable? { var nextDefaultSecret: AnyHashable? {