krissandClaude Sonnet 5
ed6e4ab9ab
Completes Phase 4 (Task 17) -- ContentView now routes between UnlockView
and the vault UI (NavigationStack on iOS, 3-column NavigationSplitView on
macOS) instead of the leftover SwiftData template, finally resolving the
long-standing "cannot find type Item" build break. Vault locks on
scene-background (iOS) / resign-active (macOS).
Fixes two more real bugs surfaced now that everything actually links
together: EntryEditViewModel.save's dismiss closure needed @escaping
(used inside Task {}), and UnlockView's UTType(filenameExtension:)
needed `import UniformTypeIdentifiers`.
Also restores MyPass.entitlements, which had regressed to an empty
App Group array with Keychain Sharing missing entirely since the
"wire up AutoFill extension target" commit -- likely clobbered by
Xcode reconciling capabilities at some point without a rebuild in
between to catch it. Verified clean `xcodebuild` on both iOS Simulator
and macOS destinations, and `swift test` still passes all 18 tests.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01WYqycDFsynHH9VnnK7LNSf
90 lines
2.7 KiB
Swift
90 lines
2.7 KiB
Swift
//
|
|
// UnlockView.swift
|
|
// MyPass
|
|
//
|
|
|
|
import SwiftUI
|
|
import UniformTypeIdentifiers
|
|
import MyPassCore
|
|
|
|
struct UnlockView: View {
|
|
@ObservedObject var vm: UnlockViewModel
|
|
|
|
var body: some View {
|
|
VStack(spacing: 24) {
|
|
Spacer()
|
|
Image(systemName: "lock.shield.fill")
|
|
.font(.system(size: 64))
|
|
.foregroundStyle(.tint)
|
|
Text("MyPass")
|
|
.font(.largeTitle.bold())
|
|
|
|
if vm.hasVault {
|
|
vaultUnlockSection
|
|
} else {
|
|
openFileSection
|
|
}
|
|
|
|
if let msg = vm.errorMessage {
|
|
Text(msg)
|
|
.foregroundStyle(.red)
|
|
.font(.caption)
|
|
.multilineTextAlignment(.center)
|
|
}
|
|
Spacer()
|
|
}
|
|
.padding(32)
|
|
.fileImporter(
|
|
isPresented: $vm.showFilePicker,
|
|
allowedContentTypes: [.init(filenameExtension: "kdbx")!],
|
|
onCompletion: { result in
|
|
if let url = try? result.get() { vm.openFile(url: url) }
|
|
}
|
|
)
|
|
}
|
|
|
|
@ViewBuilder
|
|
private var vaultUnlockSection: some View {
|
|
VStack(spacing: 16) {
|
|
if vm.canUseBiometrics {
|
|
Button(action: vm.unlockWithBiometrics) {
|
|
Label("Use Face ID / Touch ID", systemImage: "faceid")
|
|
.frame(maxWidth: .infinity)
|
|
}
|
|
.buttonStyle(.borderedProminent)
|
|
.disabled(vm.isUnlocking)
|
|
|
|
Text("or enter password")
|
|
.font(.caption)
|
|
.foregroundStyle(.secondary)
|
|
}
|
|
|
|
SecureField("Master Password", text: $vm.password)
|
|
.textFieldStyle(.roundedBorder)
|
|
.onSubmit(vm.unlockWithPassword)
|
|
|
|
Button("Unlock", action: vm.unlockWithPassword)
|
|
.buttonStyle(.bordered)
|
|
.disabled(vm.password.isEmpty || vm.isUnlocking)
|
|
|
|
Button("Choose different file…") { vm.showFilePicker = true }
|
|
.font(.caption)
|
|
.foregroundStyle(.secondary)
|
|
}
|
|
}
|
|
|
|
@ViewBuilder
|
|
private var openFileSection: some View {
|
|
VStack(spacing: 16) {
|
|
Text("No vault selected. Open a .kdbx file to get started.")
|
|
.multilineTextAlignment(.center)
|
|
.foregroundStyle(.secondary)
|
|
Button(action: { vm.showFilePicker = true }) {
|
|
Label("Open KDBX File…", systemImage: "doc.badge.plus")
|
|
.frame(maxWidth: .infinity)
|
|
}
|
|
.buttonStyle(.borderedProminent)
|
|
}
|
|
}
|
|
}
|