add new buttons

MacNearFuture/MacNearFutureApp.swift

@@ -36,7 +36,7 @@ struct NearFutureApp: App {
 				viewModel: viewModel,
 				event: Binding(
 					get: {
-						viewModel.events.first(where: {$0.id == eventID})!
+						viewModel.events.first(where: {$0.id == eventID}) ?? viewModel.template
 					},
 					set: { newValue in
 						if let eventIndex = viewModel.events.firstIndex(where: {
@@ -49,6 +49,7 @@ struct NearFutureApp: App {
 				)
 			)
 		}
+		.restorationBehavior(.disabled)
 		
 		Window("About Near Future", id: "about") {
 			AboutView()

NearFuture/Views/Events/AddEventView.swift

@@ -40,6 +40,7 @@ struct AddEventView: View {
 			}
 			NavigationStack {
 				Form {
+					LazyVStack {
 						Section(
 							header:
 								Text("Event Details")
@@ -141,24 +142,40 @@ struct AddEventView: View {
 							)
 						}
 					}
+				}
 				.scrollContentBackground(.hidden)
 				.navigationTitle("\(adding ? "Add Event" : "")")
 				//				.navigationBarTitleDisplayMode(.inline)
 				.toolbar {
-					ToolbarItem(/*placement: .topBarLeading*/) {
+#if canImport(UIKit)
+					ToolbarItem(placement: .topBarLeading) {
 						if adding {
 							Button() {
 								resetAddEventView()
 								dismiss()
 							} label: {
-								Image(systemName: "xmark.circle.fill")
+								Image(systemName: "xmark")
-									.symbolRenderingMode(.hierarchical)
 									.resizable()
 									.scaledToFit()
 									.frame(width: 30)
 							}
 						}
 					}
+#else
+					ToolbarItem() {
+						if adding {
+							Button() {
+								resetAddEventView()
+								dismiss()
+							} label: {
+								Image(systemName: "xmark")
+									.resizable()
+									.scaledToFit()
+									.frame(width: 30)
+							}
+						}
+					}
+#endif
 					ToolbarItem/*(placement: .topBarTrailing)*/ {
 						if adding {
 							Button {
@@ -182,6 +199,7 @@ struct AddEventView: View {
 									.cornerRadius(10)
 									.buttonStyle(BorderedProminentButtonStyle())
 							}
+							.tint(.accent)
 							.apply {
 								if #available(iOS 17, *) {
 									$0.sensoryFeedback(.success, trigger: bye)

NearFuture/Views/Misc/Buttons.swift

@@ -34,10 +34,6 @@ struct AddEventButton: View {
 		Button() {
 			showingAddEventView.toggle()
 		} label: {
-			ZStack {
-				Circle()
-					.frame(width: 33)
-					.foregroundStyle(.one)
 			Image(systemName: "plus")
 				.resizable()
 				.scaledToFit()
@@ -47,7 +43,6 @@ struct AddEventButton: View {
 		}
 	}
 }
-}
 
 #Preview {
 	MagicClearButton(text: .constant("s"))

Resources/NearFuture.icon/icon.json

@@ -0,0 +1,50 @@
+{
+  "fill" : {
+    "linear-gradient" : [
+      "display-p3:0.12307,0.73184,0.43944,1.00000",
+      "display-p3:0.12142,0.28022,0.58006,1.00000"
+    ]
+  },
+  "groups" : [
+    {
+      "layers" : [
+        {
+          "fill" : {
+            "automatic-gradient" : "display-p3:1.00000,0.30347,0.00000,1.00000"
+          },
+          "image-name" : "Rounded Rectangle.png",
+          "name" : "Rounded Rectangle",
+          "position" : {
+            "scale" : 1,
+            "translation-in-points" : [
+              -466.2265625,
+              37.9921875
+            ]
+          }
+        },
+        {
+          "fill" : {
+            "automatic-gradient" : "display-p3:0.96611,0.36599,0.00000,1.00000"
+          },
+          "hidden" : false,
+          "image-name" : "Oval copy.png",
+          "name" : "Oval copy"
+        }
+      ],
+      "shadow" : {
+        "kind" : "neutral",
+        "opacity" : 0.5
+      },
+      "translucency" : {
+        "enabled" : true,
+        "value" : 0.5
+      }
+    }
+  ],
+  "supported-platforms" : {
+    "circles" : [
+      "watchOS"
+    ],
+    "squares" : "shared"
+  }
+}