Compare commits

..
7 Commits
14 changed files with 146 additions and 112 deletions
+2 -2
View File
@@ -35,8 +35,8 @@ jobs:
| grep -q 'com.apple.security.network.server' | grep -q 'com.apple.security.network.server'
- name: Smoke test local API - name: Smoke test local API
run: | run: |
defaults write owen.meetingnotes muteDeckAPIEnabled -bool true defaults write net.jamesbone.meetingnotes muteDeckAPIEnabled -bool true
defaults write owen.meetingnotes muteDeckAPIPort -int 19880 defaults write net.jamesbone.meetingnotes muteDeckAPIPort -int 19880
"$RUNNER_TEMP/DerivedData/Build/Products/Release/Meetingnotes.app/Contents/MacOS/Meetingnotes" >"$RUNNER_TEMP/meetingnotes.log" 2>&1 & "$RUNNER_TEMP/DerivedData/Build/Products/Release/Meetingnotes.app/Contents/MacOS/Meetingnotes" >"$RUNNER_TEMP/meetingnotes.log" 2>&1 &
app_pid=$! app_pid=$!
trap 'kill "$app_pid" 2>/dev/null || true' EXIT trap 'kill "$app_pid" 2>/dev/null || true' EXIT
+4 -4
View File
@@ -276,7 +276,7 @@
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES; COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 15; CURRENT_PROJECT_VERSION = 20;
DEVELOPMENT_ASSET_PATHS = "\"meetingnotes/Preview Content\""; DEVELOPMENT_ASSET_PATHS = "\"meetingnotes/Preview Content\"";
DEVELOPMENT_TEAM = G9LVHZAJNX; DEVELOPMENT_TEAM = G9LVHZAJNX;
ENABLE_HARDENED_RUNTIME = YES; ENABLE_HARDENED_RUNTIME = YES;
@@ -290,7 +290,7 @@
"@executable_path/../Frameworks", "@executable_path/../Frameworks",
); );
MACOSX_DEPLOYMENT_TARGET = 15.0; MACOSX_DEPLOYMENT_TARGET = 15.0;
MARKETING_VERSION = 1.1.3; MARKETING_VERSION = 1.1.8;
ONLY_ACTIVE_ARCH = NO; ONLY_ACTIVE_ARCH = NO;
OTHER_SWIFT_FLAGS = "$(inherited) -D ENABLE_TCC_SPI"; OTHER_SWIFT_FLAGS = "$(inherited) -D ENABLE_TCC_SPI";
PRODUCT_BUNDLE_IDENTIFIER = net.jamesbone.meetingnotes; PRODUCT_BUNDLE_IDENTIFIER = net.jamesbone.meetingnotes;
@@ -312,7 +312,7 @@
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES; COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 15; CURRENT_PROJECT_VERSION = 20;
DEVELOPMENT_ASSET_PATHS = "\"meetingnotes/Preview Content\""; DEVELOPMENT_ASSET_PATHS = "\"meetingnotes/Preview Content\"";
DEVELOPMENT_TEAM = G9LVHZAJNX; DEVELOPMENT_TEAM = G9LVHZAJNX;
ENABLE_HARDENED_RUNTIME = YES; ENABLE_HARDENED_RUNTIME = YES;
@@ -326,7 +326,7 @@
"@executable_path/../Frameworks", "@executable_path/../Frameworks",
); );
MACOSX_DEPLOYMENT_TARGET = 15.0; MACOSX_DEPLOYMENT_TARGET = 15.0;
MARKETING_VERSION = 1.1.3; MARKETING_VERSION = 1.1.8;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_SWIFT_FLAGS = "$(inherited) -D ENABLE_TCC_SPI"; OTHER_SWIFT_FLAGS = "$(inherited) -D ENABLE_TCC_SPI";
PRODUCT_BUNDLE_IDENTIFIER = net.jamesbone.meetingnotes; PRODUCT_BUNDLE_IDENTIFIER = net.jamesbone.meetingnotes;
+26 -16
View File
@@ -183,9 +183,13 @@ final class AudioManager: NSObject, ObservableObject {
throw NSError(domain: "AudioManager", code: -1, userInfo: [NSLocalizedDescriptionKey: "Unsupported microphone format"]) throw NSError(domain: "AudioManager", code: -1, userInfo: [NSLocalizedDescriptionKey: "Unsupported microphone format"])
} }
inputNode.installTap(onBus: 0, bufferSize: 1024, format: inputFormat) { [weak self] buffer, _ in inputNode.installTap(onBus: 0, bufferSize: 1024, format: inputFormat) { [weak self] buffer, _ in
guard let self, buffer.frameLength > 0 else { return } guard let self else { return }
self.updateAudioLevel(buffer, source: .mic) self.processAudioBuffer(
self.processAudioBuffer(buffer, converter: converter, targetFormat: targetFormat, source: .mic) { buffer },
converter: converter,
targetFormat: targetFormat,
source: .mic
)
} }
audioEngine.prepare() audioEngine.prepare()
try audioEngine.start() try audioEngine.start()
@@ -303,11 +307,13 @@ final class AudioManager: NSObject, ObservableObject {
throw NSError(domain: "AudioManager", code: -1, userInfo: [NSLocalizedDescriptionKey: "Unsupported system audio format"]) throw NSError(domain: "AudioManager", code: -1, userInfo: [NSLocalizedDescriptionKey: "Unsupported system audio format"])
} }
try tap.run(on: tapQueue) { [weak self] _, inputData, _, _, _ in try tap.run(on: tapQueue) { [weak self] _, inputData, _, _, _ in
guard let self, guard let self else { return }
let buffer = AVAudioPCMBuffer(pcmFormat: inputFormat, bufferListNoCopy: inputData, deallocator: nil), self.processAudioBuffer(
buffer.frameLength > 0 else { return } { AVAudioPCMBuffer(pcmFormat: inputFormat, bufferListNoCopy: inputData, deallocator: nil) },
self.updateAudioLevel(buffer, source: .system) converter: converter,
self.processAudioBuffer(buffer, converter: converter, targetFormat: targetFormat, source: .system) targetFormat: targetFormat,
source: .system
)
} invalidationHandler: { [weak self] _ in } invalidationHandler: { [weak self] _ in
guard let self, !self.isRestartingSystemTap, self.isRecording else { return } guard let self, !self.isRestartingSystemTap, self.isRecording else { return }
Task { await self.restartSystemAudioTap() } Task { await self.restartSystemAudioTap() }
@@ -315,11 +321,20 @@ final class AudioManager: NSObject, ObservableObject {
} }
private func processAudioBuffer( private func processAudioBuffer(
_ inputBuffer: AVAudioPCMBuffer, _ inputBufferProvider: () -> AVAudioPCMBuffer?,
converter: AVAudioConverter, converter: AVAudioConverter,
targetFormat: AVAudioFormat, targetFormat: AVAudioFormat,
source: AudioSource source: AudioSource
) { ) {
// Keep callback-owned buffers alive until conversion finishes. Teardown
// takes this same lock before invalidating the Core Audio process tap.
audioFileLock.lock()
defer { audioFileLock.unlock() }
guard isAcceptingAudio,
let inputBuffer = inputBufferProvider(),
inputBuffer.frameLength > 0 else { return }
updateAudioLevel(inputBuffer, source: source)
let ratio = targetFormat.sampleRate / inputBuffer.format.sampleRate let ratio = targetFormat.sampleRate / inputBuffer.format.sampleRate
let capacity = max(1, AVAudioFrameCount(ceil(Double(inputBuffer.frameLength) * ratio))) let capacity = max(1, AVAudioFrameCount(ceil(Double(inputBuffer.frameLength) * ratio)))
guard let outputBuffer = AVAudioPCMBuffer(pcmFormat: targetFormat, frameCapacity: capacity) else { return } guard let outputBuffer = AVAudioPCMBuffer(pcmFormat: targetFormat, frameCapacity: capacity) else { return }
@@ -336,11 +351,6 @@ final class AudioManager: NSObject, ObservableObject {
} }
guard status != .error, conversionError == nil, outputBuffer.frameLength > 0 else { return } guard status != .error, conversionError == nil, outputBuffer.frameLength > 0 else { return }
audioFileLock.lock()
defer { audioFileLock.unlock() }
guard isAcceptingAudio else {
return
}
do { do {
switch source { switch source {
case .mic: case .mic:
@@ -378,8 +388,8 @@ final class AudioManager: NSObject, ObservableObject {
pendingMicRestart = nil pendingMicRestart = nil
AudioLevelManager.shared.updateRecordingState(false) AudioLevelManager.shared.updateRecordingState(false)
// Stop new writes and wait for any callback already writing before // Stop new callbacks and wait for any active conversion/write before
// AVAudioFile is finalized and released. // invalidating callback-owned buffers or finalizing AVAudioFile.
audioFileLock.lock() audioFileLock.lock()
isAcceptingAudio = false isAcceptingAudio = false
audioFileLock.unlock() audioFileLock.unlock()
@@ -269,6 +269,19 @@ class LocalStorageManager {
return templates.sorted { $0.title < $1.title } return templates.sorted { $0.title < $1.title }
} }
func preferredTemplateID(in templates: [NoteTemplate]? = nil) -> UUID? {
let availableTemplates = templates ?? loadTemplates()
if let selectedTemplateID = UserDefaultsManager.shared.selectedTemplateId,
availableTemplates.contains(where: { $0.id == selectedTemplateID }) {
return selectedTemplateID
}
let fallbackTemplateID = availableTemplates.first(where: { $0.title == "Standard Meeting" })?.id
?? availableTemplates.first?.id
UserDefaultsManager.shared.selectedTemplateId = fallbackTemplateID
return fallbackTemplateID
}
/// Deletes a template from local storage /// Deletes a template from local storage
/// - Parameter template: The template to delete /// - Parameter template: The template to delete
+1 -1
View File
@@ -38,7 +38,7 @@ struct MeetingnotesApp: App {
ContentView() ContentView()
.frame(minWidth: 700, minHeight: 400) .frame(minWidth: 700, minHeight: 400)
} }
.windowResizability(.contentSize) .windowResizability(.automatic)
.defaultSize(width: 1000, height: 600) .defaultSize(width: 1000, height: 600)
.commands { .commands {
CommandGroup(after: .appInfo) { CommandGroup(after: .appInfo) {
+2 -4
View File
@@ -244,7 +244,7 @@ private final class LocalRecordingController {
return statusPayload() return statusPayload()
} }
let meeting = Meeting() let meeting = Meeting(templateId: LocalStorageManager.shared.preferredTemplateID())
guard LocalStorageManager.shared.saveMeeting(meeting) else { guard LocalStorageManager.shared.saveMeeting(meeting) else {
throw LocalRecordingError.saveFailed throw LocalRecordingError.saveFailed
} }
@@ -288,9 +288,7 @@ private final class LocalRecordingController {
meeting.transcriptChunks = chunks meeting.transcriptChunks = chunks
let templates = LocalStorageManager.shared.loadTemplates() let templates = LocalStorageManager.shared.loadTemplates()
if meeting.templateId == nil { if meeting.templateId == nil {
meeting.templateId = UserDefaultsManager.shared.selectedTemplateId meeting.templateId = LocalStorageManager.shared.preferredTemplateID(in: templates)
?? templates.first(where: { $0.title == "Standard Meeting" })?.id
?? templates.first?.id
} }
_ = LocalStorageManager.shared.saveMeeting(meeting) _ = LocalStorageManager.shared.saveMeeting(meeting)
NotificationCenter.default.post(name: .meetingSaved, object: meeting) NotificationCenter.default.post(name: .meetingSaved, object: meeting)
@@ -68,11 +68,11 @@ class MeetingListViewModel: ObservableObject {
} }
func createNewMeeting() -> Meeting { func createNewMeeting() -> Meeting {
let newMeeting = Meeting() let newMeeting = Meeting(templateId: LocalStorageManager.shared.preferredTemplateID())
meetings.insert(newMeeting, at: 0) meetings.insert(newMeeting, at: 0)
_ = LocalStorageManager.shared.saveMeeting(newMeeting) _ = LocalStorageManager.shared.saveMeeting(newMeeting)
// Track meeting creation event // Track meeting creation event
PostHogSDK.shared.capture("meeting_created") PostHogSDK.shared.capture("meeting_created")
return newMeeting return newMeeting
} }
} }
+6 -24
View File
@@ -54,15 +54,6 @@ class MeetingViewModel: ObservableObject {
private let recordingSessionManager = RecordingSessionManager.shared private let recordingSessionManager = RecordingSessionManager.shared
private var cancellables = Set<AnyCancellable>() private var cancellables = Set<AnyCancellable>()
private var isNewMeeting = false
// Computed property to check if meeting is empty
var isEmpty: Bool {
return meeting.transcriptChunks.isEmpty &&
meeting.userNotes.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty &&
meeting.generatedNotes.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty &&
meeting.title.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
}
init(meeting: Meeting = Meeting()) { init(meeting: Meeting = Meeting()) {
// Load the latest version of the meeting from storage if it exists // Load the latest version of the meeting from storage if it exists
@@ -76,9 +67,6 @@ class MeetingViewModel: ObservableObject {
// Detect if this is a new meeting based on content, not storage existence
isNewMeeting = isEmpty
// Set initial tab based on notes existence // Set initial tab based on notes existence
if !self.meeting.generatedNotes.isEmpty { if !self.meeting.generatedNotes.isEmpty {
selectedTab = .enhancedNotes selectedTab = .enhancedNotes
@@ -228,11 +216,13 @@ class MeetingViewModel: ObservableObject {
func loadTemplates() { func loadTemplates() {
templates = LocalStorageManager.shared.loadTemplates() templates = LocalStorageManager.shared.loadTemplates()
// Load per-meeting template or default to Standard Meeting // Keep an existing meeting's template, otherwise use the configured default.
if let meetingTemplateId = meeting.templateId { if let meetingTemplateId = meeting.templateId,
templates.contains(where: { $0.id == meetingTemplateId }) {
selectedTemplateId = meetingTemplateId selectedTemplateId = meetingTemplateId
} else if let defaultTemplate = templates.first(where: { $0.title == "Standard Meeting" }) { } else {
selectedTemplateId = defaultTemplate.id selectedTemplateId = LocalStorageManager.shared.preferredTemplateID(in: templates)
meeting.templateId = selectedTemplateId
} }
} }
@@ -331,12 +321,4 @@ class MeetingViewModel: ObservableObject {
} }
} }
func deleteIfEmpty() {
if isEmpty && !isRecording && !isProcessing {
print("🗑️ Auto-deleting empty meeting")
deleteMeeting()
} else {
saveMeeting()
}
}
} }
@@ -52,24 +52,7 @@ class SettingsViewModel: ObservableObject {
func loadTemplates() { func loadTemplates() {
templates = LocalStorageManager.shared.loadTemplates() templates = LocalStorageManager.shared.loadTemplates()
settings.selectedTemplateId = LocalStorageManager.shared.preferredTemplateID(in: templates)
// Validate that the selected template still exists
if let selectedId = settings.selectedTemplateId {
if !templates.contains(where: { $0.id == selectedId }) {
// Selected template was deleted, clear the selection
settings.selectedTemplateId = nil
}
}
// If no template is selected, select the first default template
if settings.selectedTemplateId == nil {
if let defaultTemplate = templates.first(where: { $0.title == "Standard Meeting" }) {
settings.selectedTemplateId = defaultTemplate.id
} else if let firstTemplate = templates.first {
// Fallback to first available template
settings.selectedTemplateId = firstTemplate.id
}
}
} }
func saveSettings(showMessage: Bool = true) { func saveSettings(showMessage: Bool = true) {
@@ -4,6 +4,7 @@ import SwiftUI
@MainActor @MainActor
class TemplatesViewModel: ObservableObject { class TemplatesViewModel: ObservableObject {
@Published var templates: [NoteTemplate] = [] @Published var templates: [NoteTemplate] = []
@Published private(set) var defaultTemplateID: UUID? = nil
@Published var isLoading = false @Published var isLoading = false
@Published var errorMessage: String? @Published var errorMessage: String?
@@ -14,8 +15,14 @@ class TemplatesViewModel: ObservableObject {
func loadTemplates() { func loadTemplates() {
isLoading = true isLoading = true
templates = LocalStorageManager.shared.loadTemplates() templates = LocalStorageManager.shared.loadTemplates()
defaultTemplateID = LocalStorageManager.shared.preferredTemplateID(in: templates)
isLoading = false isLoading = false
} }
func setDefaultTemplate(_ template: NoteTemplate) {
UserDefaultsManager.shared.selectedTemplateId = template.id
defaultTemplateID = template.id
}
func saveTemplate(_ template: NoteTemplate) { func saveTemplate(_ template: NoteTemplate) {
if LocalStorageManager.shared.saveTemplate(template) { if LocalStorageManager.shared.saveTemplate(template) {
@@ -42,4 +49,4 @@ class TemplatesViewModel: ObservableObject {
] ]
) )
} }
} }
+3 -2
View File
@@ -445,8 +445,9 @@ struct MeetingDetailContentView: View {
Text("Are you sure you want to delete this meeting? This action cannot be undone.") Text("Are you sure you want to delete this meeting? This action cannot be undone.")
} }
.onDisappear { .onDisappear {
// Auto-delete empty meetings when leaving, otherwise save // A failed recording may still be empty. Keep it until the user
viewModel.deleteIfEmpty() // explicitly deletes it so app updates cannot erase history.
viewModel.saveMeeting()
} }
} }
+6
View File
@@ -144,6 +144,12 @@ struct SettingsView: View {
Text("Create and manage note templates") Text("Create and manage note templates")
.font(.caption) .font(.caption)
.foregroundColor(.secondary) .foregroundColor(.secondary)
Picker("Default template", selection: $viewModel.settings.selectedTemplateId) {
ForEach(viewModel.templates) { template in
Text(template.title).tag(Optional(template.id))
}
}
Button { Button {
navigationPath.append("templates") navigationPath.append("templates")
+32 -29
View File
@@ -36,13 +36,13 @@ struct TemplateEditView: View {
TextEditor(text: $template.context) TextEditor(text: $template.context)
.scrollContentBackground(.hidden) .scrollContentBackground(.hidden)
.padding(8) .padding(8)
.background(Color.gray.opacity(0.05)) .frame(height: 140)
.cornerRadius(8) .background(Color.secondary.opacity(0.06))
.frame(minHeight: 100) .overlay {
.overlay( RoundedRectangle(cornerRadius: 6)
RoundedRectangle(cornerRadius: 8) .stroke(Color.secondary.opacity(0.25), lineWidth: 1)
.stroke(Color.gray.opacity(0.3), lineWidth: 1) }
) .clipShape(RoundedRectangle(cornerRadius: 6))
} }
// Sections // Sections
@@ -55,14 +55,12 @@ struct TemplateEditView: View {
Spacer() Spacer()
Button { Button {
withAnimation { template.sections.append(
template.sections.append( TemplateSection(
TemplateSection( title: "New Section",
title: "New Section", description: "Description of this section"
description: "Description of this section"
)
) )
} )
} label: { } label: {
HStack(spacing: 4) { HStack(spacing: 4) {
Image(systemName: "plus") Image(systemName: "plus")
@@ -77,29 +75,27 @@ struct TemplateEditView: View {
.font(.caption) .font(.caption)
.foregroundColor(.secondary) .foregroundColor(.secondary)
ForEach(template.sections.indices, id: \.self) { index in ForEach($template.sections) { $section in
VStack(alignment: .leading, spacing: 8) { VStack(alignment: .leading, spacing: 8) {
HStack { HStack {
VStack(alignment: .leading, spacing: 8) { VStack(alignment: .leading, spacing: 8) {
TextField("Section Title", text: $template.sections[index].title) TextField("Section Title", text: $section.title)
.textFieldStyle(.roundedBorder) .textFieldStyle(.roundedBorder)
TextEditor(text: $template.sections[index].description) TextEditor(text: $section.description)
.scrollContentBackground(.hidden) .scrollContentBackground(.hidden)
.padding(8) .padding(8)
.background(Color.gray.opacity(0.05)) .frame(height: 90)
.cornerRadius(8) .background(Color.secondary.opacity(0.06))
.frame(minHeight: 60) .overlay {
.overlay( RoundedRectangle(cornerRadius: 6)
RoundedRectangle(cornerRadius: 8) .stroke(Color.secondary.opacity(0.25), lineWidth: 1)
.stroke(Color.gray.opacity(0.3), lineWidth: 1) }
) .clipShape(RoundedRectangle(cornerRadius: 6))
} }
Button { Button {
withAnimation { template.sections.removeAll { $0.id == section.id }
let _ = template.sections.remove(at: index)
}
} label: { } label: {
Image(systemName: "trash") Image(systemName: "trash")
.foregroundColor(.red) .foregroundColor(.red)
@@ -131,12 +127,19 @@ struct TemplateEditView: View {
} }
.buttonStyle(.plain) .buttonStyle(.plain)
.padding(.top) .padding(.top)
.disabled(template.title.isEmpty || template.sections.isEmpty) .disabled(!canSave)
} }
.padding(24) .padding(24)
} }
.navigationTitle("Edit Template") .navigationTitle("Edit Template")
} }
private var canSave: Bool {
let hasTitle = !template.title.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
let hasInstructions = !template.context.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
|| !template.sections.isEmpty
return hasTitle && hasInstructions
}
} }
#Preview { #Preview {
@@ -152,4 +155,4 @@ struct TemplateEditView: View {
) )
) { _ in } ) { _ in }
} }
} }
+40 -9
View File
@@ -2,21 +2,21 @@ import SwiftUI
struct TemplateListView: View { struct TemplateListView: View {
@StateObject private var viewModel = TemplatesViewModel() @StateObject private var viewModel = TemplatesViewModel()
@Environment(\.dismiss) private var dismiss @State private var editingTemplate: NoteTemplate?
var body: some View { var body: some View {
List { List {
ForEach(viewModel.templates) { template in ForEach(viewModel.templates) { template in
HStack { HStack {
NavigationLink(destination: TemplateEditView(template: template) { updatedTemplate in Button {
viewModel.saveTemplate(updatedTemplate) presentEditor(for: template)
}) { } label: {
VStack(alignment: .leading, spacing: 4) { VStack(alignment: .leading, spacing: 4) {
HStack { HStack {
Text(template.title) Text(template.title)
.font(.headline) .font(.headline)
if template.isDefault { if template.isDefault {
Text("Default") Text("Built-in")
.font(.caption) .font(.caption)
.padding(.horizontal, 6) .padding(.horizontal, 6)
.padding(.vertical, 2) .padding(.vertical, 2)
@@ -36,8 +36,18 @@ struct TemplateListView: View {
} }
.padding(.vertical, 4) .padding(.vertical, 4)
} }
.buttonStyle(.plain)
Spacer() Spacer()
Button {
viewModel.setDefaultTemplate(template)
} label: {
Image(systemName: viewModel.defaultTemplateID == template.id ? "star.fill" : "star")
.foregroundColor(viewModel.defaultTemplateID == template.id ? .accentColor : .secondary)
}
.buttonStyle(.plain)
.help(viewModel.defaultTemplateID == template.id ? "Default template" : "Use as default template")
if !template.isDefault { if !template.isDefault {
Button(role: .destructive) { Button(role: .destructive) {
@@ -50,6 +60,14 @@ struct TemplateListView: View {
} }
} }
.contextMenu { .contextMenu {
if viewModel.defaultTemplateID != template.id {
Button {
viewModel.setDefaultTemplate(template)
} label: {
Label("Use as Default", systemImage: "star")
}
}
if !template.isDefault { if !template.isDefault {
Button(role: .destructive) { Button(role: .destructive) {
viewModel.deleteTemplate(template) viewModel.deleteTemplate(template)
@@ -70,9 +88,9 @@ struct TemplateListView: View {
.navigationTitle("Note Templates") .navigationTitle("Note Templates")
.toolbar { .toolbar {
ToolbarItem(placement: .primaryAction) { ToolbarItem(placement: .primaryAction) {
NavigationLink(destination: TemplateEditView(template: viewModel.createNewTemplate()) { updatedTemplate in Button {
viewModel.saveTemplate(updatedTemplate) presentEditor(for: viewModel.createNewTemplate())
}) { } label: {
Image(systemName: "plus") Image(systemName: "plus")
} }
} }
@@ -89,9 +107,22 @@ struct TemplateListView: View {
} message: { } message: {
Text(viewModel.errorMessage ?? "") Text(viewModel.errorMessage ?? "")
} }
.sheet(item: $editingTemplate) { template in
NavigationStack {
TemplateEditView(template: template) { updatedTemplate in
viewModel.saveTemplate(updatedTemplate)
}
}
.frame(minWidth: 680, minHeight: 620)
}
}
private func presentEditor(for template: NoteTemplate) {
guard editingTemplate == nil else { return }
editingTemplate = template
} }
} }
#Preview { #Preview {
TemplateListView() TemplateListView()
} }