From ee2e05c5239fe8dc525184eb15334b3c2432bc8d Mon Sep 17 00:00:00 2001 From: neon443 <69979447+neon443@users.noreply.github.com> Date: Wed, 11 Jun 2025 18:49:09 +0100 Subject: [PATCH] fix the cooked addeventview --- ...EventViewMac.swift => EditEventView.swift} | 0 NearFuture.xcodeproj/project.pbxproj | 8 +- NearFuture/Views/Events/AddEventView.swift | 106 +++++++++--------- 3 files changed, 57 insertions(+), 57 deletions(-) rename MacNearFuture/Views/Events/{EditEventViewMac.swift => EditEventView.swift} (100%) diff --git a/MacNearFuture/Views/Events/EditEventViewMac.swift b/MacNearFuture/Views/Events/EditEventView.swift similarity index 100% rename from MacNearFuture/Views/Events/EditEventViewMac.swift rename to MacNearFuture/Views/Events/EditEventView.swift diff --git a/NearFuture.xcodeproj/project.pbxproj b/NearFuture.xcodeproj/project.pbxproj index e80895a..eb20a9b 100644 --- a/NearFuture.xcodeproj/project.pbxproj +++ b/NearFuture.xcodeproj/project.pbxproj @@ -50,7 +50,7 @@ A979F6142D270AF90094C0B3 /* NearFutureWidgetsExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = A979F6022D270AF00094C0B3 /* NearFutureWidgetsExtension.appex */; platformFilter = ios; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; A979F6182D2714310094C0B3 /* Events.swift in Sources */ = {isa = PBXBuildFile; fileRef = A920C28B2D24011400E4F9B1 /* Events.swift */; }; A98C20CB2DE730740008D61C /* EventListViewMac.swift in Sources */ = {isa = PBXBuildFile; fileRef = A98C20CA2DE730740008D61C /* EventListViewMac.swift */; }; - A98C20CC2DE730740008D61C /* EditEventViewMac.swift in Sources */ = {isa = PBXBuildFile; fileRef = A98C20C92DE730740008D61C /* EditEventViewMac.swift */; }; + A98C20CC2DE730740008D61C /* EditEventView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A98C20C92DE730740008D61C /* EditEventView.swift */; }; A98C20CE2DE7308E0008D61C /* ArchiveView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A98C20CD2DE7308E0008D61C /* ArchiveView.swift */; }; A98C20D02DE731BD0008D61C /* HomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A98C20CF2DE731BD0008D61C /* HomeView.swift */; }; A98C20D42DE7339E0008D61C /* AboutView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A98C20D32DE7339E0008D61C /* AboutView.swift */; }; @@ -129,7 +129,7 @@ A979F6092D270AF00094C0B3 /* NearFutureWidgetsBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NearFutureWidgetsBundle.swift; sourceTree = ""; }; A979F60B2D270AF00094C0B3 /* NearFutureWidgetsLiveActivity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NearFutureWidgetsLiveActivity.swift; sourceTree = ""; }; A979F60F2D270AF80094C0B3 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - A98C20C92DE730740008D61C /* EditEventViewMac.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditEventViewMac.swift; sourceTree = ""; }; + A98C20C92DE730740008D61C /* EditEventView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditEventView.swift; sourceTree = ""; }; A98C20CA2DE730740008D61C /* EventListViewMac.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventListViewMac.swift; sourceTree = ""; }; A98C20CD2DE7308E0008D61C /* ArchiveView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArchiveView.swift; sourceTree = ""; }; A98C20CF2DE731BD0008D61C /* HomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeView.swift; sourceTree = ""; }; @@ -356,7 +356,7 @@ isa = PBXGroup; children = ( A9B78B932DF9F3CF00647399 /* AddEventView.swift */, - A98C20C92DE730740008D61C /* EditEventViewMac.swift */, + A98C20C92DE730740008D61C /* EditEventView.swift */, ); path = Events; sourceTree = ""; @@ -508,7 +508,7 @@ buildActionMask = 2147483647; files = ( A98C20CB2DE730740008D61C /* EventListViewMac.swift in Sources */, - A98C20CC2DE730740008D61C /* EditEventViewMac.swift in Sources */, + A98C20CC2DE730740008D61C /* EditEventView.swift in Sources */, A90D495E2DDE3C7400781124 /* NFCommands.swift in Sources */, A98C20D42DE7339E0008D61C /* AboutView.swift in Sources */, A98C20CE2DE7308E0008D61C /* ArchiveView.swift in Sources */, diff --git a/NearFuture/Views/Events/AddEventView.swift b/NearFuture/Views/Events/AddEventView.swift index e15c4f0..6904860 100644 --- a/NearFuture/Views/Events/AddEventView.swift +++ b/NearFuture/Views/Events/AddEventView.swift @@ -59,60 +59,60 @@ struct AddEventView: View { autoDismiss: true) .presentationDetents([.medium]) } - - // dscription - ZStack { - TextField("Event Notes", text: $event.notes) - .textFieldStyle(RoundedBorderTextFieldStyle()) - .padding(.trailing, event.notes.isEmpty ? 0 : 30) - .animation(.spring, value: event.notes) - .focused($focusedField, equals: Field.Notes) - .submitLabel(.done) - .onSubmit { - focusedField = nil - } - // MagicClearButton(text: $eventNotes) - } - - - // date picker - HStack { - Spacer() - DatePicker("", selection: $event.date, displayedComponents: .date) - .datePickerStyle(.wheel) - Spacer() - Button() { - event.date = Date() - } label: { - Image(systemName: "arrow.uturn.left") - .resizable() - .scaledToFit() - } - .buttonStyle(BorderlessButtonStyle()) - .frame(width: 20) - } - - DatePicker( - "", - selection: $event.date, - displayedComponents: .hourAndMinute - ) - .datePickerStyle(.wheel) - - // re-ocurrence Picker - Picker("Recurrence", selection: $event.recurrence) { - ForEach(Event.RecurrenceType.allCases, id: \.self) { recurrence in - Text(recurrence.rawValue.capitalized) - } - } - .pickerStyle(SegmentedPickerStyle()) - Text( - describeOccurrence( - date: event.date, - recurrence: event.recurrence - ) - ) } + + // dscription + ZStack { + TextField("Event Notes", text: $event.notes) + .textFieldStyle(RoundedBorderTextFieldStyle()) + .padding(.trailing, event.notes.isEmpty ? 0 : 30) + .animation(.spring, value: event.notes) + .focused($focusedField, equals: Field.Notes) + .submitLabel(.done) + .onSubmit { + focusedField = nil + } + // MagicClearButton(text: $eventNotes) + } + + + // date picker + HStack { + Spacer() + DatePicker("", selection: $event.date, displayedComponents: .date) + .datePickerStyle(.wheel) + Spacer() + Button() { + event.date = Date() + } label: { + Image(systemName: "arrow.uturn.left") + .resizable() + .scaledToFit() + } + .buttonStyle(BorderlessButtonStyle()) + .frame(width: 20) + } + + DatePicker( + "", + selection: $event.date, + displayedComponents: .hourAndMinute + ) + .datePickerStyle(.wheel) + + // re-ocurrence Picker + Picker("Recurrence", selection: $event.recurrence) { + ForEach(Event.RecurrenceType.allCases, id: \.self) { recurrence in + Text(recurrence.rawValue.capitalized) + } + } + .pickerStyle(SegmentedPickerStyle()) + Text( + describeOccurrence( + date: event.date, + recurrence: event.recurrence + ) + ) } .scrollContentBackground(.hidden) .navigationTitle("\(adding ? "Add Event" : "")")