external/secretive
1
0
Fork 0
mirror of https://github.com/maxgoedjen/secretive.git synced 2026-03-26 02:57:22 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into fix_115

Browse Source
This commit is contained in:
Max Goedjen
2020-07-04 15:51:19 -07:00
committed by GitHub
parent 736f5d38d1 bc25576c1f
commit d3f326fa81
34 changed files with 613 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Secretive/Views/ContentView.swift
View File

@@ -9,9 +9,9 @@ struct ContentView<UpdaterType: UpdaterProtocol, AgentStatusCheckerType: AgentSt
@ObservedObject var agentStatusChecker: AgentStatusCheckerType
var runSetupBlock: (() -> Void)?
@State fileprivate var active: AnySecret.ID?
@State fileprivate var showingDeletion = false
@State fileprivate var deletingSecret: AnySecret?
@State private var active: AnySecret.ID?
@State private var showingDeletion = false
@State private var deletingSecret: AnySecret?
var body: some View {
VStack {
@@ -110,12 +110,12 @@ struct ContentView<UpdaterType: UpdaterProtocol, AgentStatusCheckerType: AgentSt
} else {
fallback = Constants.emptyStoreTag
}
return self.storeList.stores.compactMap { $0.secrets.first }.first?.id ?? fallback
return self.storeList.stores.compactMap(\.secrets.first).first?.id ?? fallback
}
}
fileprivate enum Constants {
private enum Constants {
static let emptyStoreModifiableTag: AnyHashable = "emptyStoreModifiableTag"
static let emptyStoreTag: AnyHashable = "emptyStoreModifiableTag"
}

2
Secretive/Views/DeleteSecretView.swift
View File

@@ -8,7 +8,7 @@ struct DeleteSecretView<StoreType: SecretStoreModifiable>: View {
@State var confirm = ""
fileprivate var dismissalBlock: (Bool) -> ()
private var dismissalBlock: (Bool) -> ()
init(secret: StoreType.SecretType, store: StoreType, dismissalBlock: @escaping (Bool) -> ()) {
self.secret = secret

3
Secretive/Views/SetupView.swift
View File

@@ -1,6 +1,5 @@
import Foundation
import SwiftUI
import ServiceManagement
struct SetupView: View {
@@ -117,7 +116,7 @@ struct SetupStepCommandView: View {
extension SetupView {
func installLaunchAgent() -> Bool {
SMLoginItemSetEnabled("com.maxgoedjen.Secretive.SecretAgent" as CFString, true)
LaunchAgentController().install()
}
func markAsDone() -> Bool {