From 01116c7fcb2aea492d2ed0db7cbce3c597638935 Mon Sep 17 00:00:00 2001 From: neon443 <69979447+neon443@users.noreply.github.com> Date: Thu, 19 Jun 2025 10:40:52 +0100 Subject: [PATCH] fix modifier uses fix addeventview not compiling --- Config.xcconfig | 2 +- NearFuture/Views/ContentView.swift | 2 +- NearFuture/Views/Events/AddEventView.swift | 10 ++++++---- NearFuture/Views/Settings/WhatsNewView.swift | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Config.xcconfig b/Config.xcconfig index 3f9e6f6..84fcb4b 100644 --- a/Config.xcconfig +++ b/Config.xcconfig @@ -14,4 +14,4 @@ BUNDLE_ID_WIDGETS = com.neon443.NearFuture.widgets GROUP_ID = group.NearFuture VERSION = 5 NAME = Near Future -BUILD_NUMBER = 18 +BUILD_NUMBER = 27 diff --git a/NearFuture/Views/ContentView.swift b/NearFuture/Views/ContentView.swift index a0c3e5a..51e82aa 100644 --- a/NearFuture/Views/ContentView.swift +++ b/NearFuture/Views/ContentView.swift @@ -54,7 +54,7 @@ struct ContentView: View { } .tag(Tab.settings) } - .modifier(hapticHeavy(trigger: tabSelection)) + .hapticHeavy(trigger: tabSelection) .sheet(isPresented: $settingsModel.settings.showWhatsNew) { WhatsNewView(settingsModel: settingsModel) } diff --git a/NearFuture/Views/Events/AddEventView.swift b/NearFuture/Views/Events/AddEventView.swift index f51f8f4..daef751 100644 --- a/NearFuture/Views/Events/AddEventView.swift +++ b/NearFuture/Views/Events/AddEventView.swift @@ -16,8 +16,6 @@ struct AddEventView: View { @State var showNeedsNameAlert: Bool = false @State var isSymbolPickerPresented: Bool = false - @State private var bye: Bool = false - @FocusState private var focusedField: Field? private enum Field { case Name, Notes @@ -152,13 +150,14 @@ struct AddEventView: View { viewModel.addEvent( newEvent: event ) - bye.toggle() resetAddEventView() + #if canImport(UIKit) + UINotificationFeedbackGenerator().notificationOccurred(.success) + #endif } label: { Label("Save", systemImage: "checkmark") } .tint(.accent) - .modifier(hapticSuccess(trigger: bye)) .disabled(event.name.isEmpty) .onTapGesture { if event.name.isEmpty { @@ -180,6 +179,9 @@ struct AddEventView: View { Button() { viewModel.editEvent(event) dismiss() + #if canImport(UIKit) + UINotificationFeedbackGenerator().notificationOccurred(.success) + #endif } label: { Label("Done", systemImage: "checkmark") } diff --git a/NearFuture/Views/Settings/WhatsNewView.swift b/NearFuture/Views/Settings/WhatsNewView.swift index ca709d1..02ede00 100644 --- a/NearFuture/Views/Settings/WhatsNewView.swift +++ b/NearFuture/Views/Settings/WhatsNewView.swift @@ -87,7 +87,7 @@ struct WhatsNewView: View { } .foregroundStyle(.orange) .modifier(glassButton()) - .modifier(hapticHeavy(trigger: bye)) + .hapticHeavy(trigger: bye) } .scrollContentBackground(.hidden) .presentationDragIndicator(.visible)