fix sendable warnings

MacNearFuture/AboutView.swift

@@ -1,40 +0,0 @@
-//
-//  AboutView.swift
-//  MacNearFuture
-//
-//  Created by neon443 on 28/05/2025.
-//
-
-import SwiftUI
-
-struct AboutView: View {
-	var body: some View {
-		VStack(alignment: .center) {
-			Image(nsImage: #imageLiteral(resourceName: "NearFutureIcon.png"))
-				.resizable()
-				.scaledToFit()
-				.frame(width: 100)
-				.clipShape(RoundedRectangle(cornerRadius: 25))
-			Text("Near Future")
-				.bold()
-				.monospaced()
-				.font(.title)
-			Text("Version " + getVersion() + " (\(getBuildID()))")
-				.padding(.bottom)
-			Text("© 2024-2025 neon443, Inc")
-				.padding(.bottom)
-			Link("Developer Website", destination: URL(string: "https://neon443.xyz")!)
-		}
-		.padding()
-		.padding()
-		.containerBackground(.ultraThinMaterial, for: .window)
-		.toolbar(removing: .title)
-		.toolbarBackground(.hidden, for: .windowToolbar)
-		.windowMinimizeBehavior(.disabled)
-		.windowFullScreenBehavior(.disabled)
-	}
-}
-
-#Preview {
-    AboutView()
-}

MacNearFuture/MacNearFuture.entitlements

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>com.apple.developer.icloud-container-identifiers</key>
-	<array/>
-	<key>com.apple.developer.ubiquity-kvstore-identifier</key>
-	<string>$(TeamIdentifierPrefix)$(CFBundleIdentifier)</string>
-	<key>com.apple.security.app-sandbox</key>
-	<true/>
-	<key>com.apple.security.application-groups</key>
-	<array>
-		<string>group.NearFuture</string>
-	</array>
-	<key>com.apple.security.files.user-selected.read-only</key>
-	<true/>
-</dict>
-</plist>

MacNearFuture/MacNearFutureApp.swift

@@ -1,66 +0,0 @@
-//
-//  MacNearFutureApp.swift
-//  MacNearFuture
-//
-//  Created by neon443 on 21/05/2025.
-//
-
-import Foundation
-import SwiftUI
-
-@main
-struct NearFutureApp: App {
-	@Environment(\.openWindow) var openWindow
-	@StateObject var viewModel: EventViewModel = EventViewModel()
-	@StateObject var settingsModel: SettingsViewModel = SettingsViewModel()
-	
-	var body: some Scene {
-		WindowGroup {
-			ContentView(
-				viewModel: viewModel,
-				settingsModel: settingsModel
-			)
-		}
-		.defaultSize(width: 550, height: 650)
-		.commands {
-			CommandGroup(replacing: CommandGroupPlacement.appInfo) {
-					Button("about nf") {
-						openWindow(id: "about")
-					}
-				}
-			NearFutureCommands()
-		}
-		
-		WindowGroup("edit Event", for: Event.ID.self) { $eventID in
-			EditEventView(
-				viewModel: viewModel,
-				event: Binding(
-					get: {
-						viewModel.events.first(where: {$0.id == eventID}) ?? viewModel.template
-					},
-					set: { newValue in
-						if let eventIndex = viewModel.events.firstIndex(where: {
-							$0.id == eventID
-						}) {
-							viewModel.events[eventIndex] = newValue
-						}
-						viewModel.saveEvents()
-					}
-				)
-			)
-		}
-		.restorationBehavior(.disabled)
-		
-		Window("About Near Future", id: "about") {
-			AboutView()
-		}
-		.windowBackgroundDragBehavior(.enabled)
-		.windowResizability(.contentSize)
-		.restorationBehavior(.disabled)
-		.defaultPosition(UnitPoint.center)
-		
-		Settings {
-			Text("wip")
-		}
-	}
-}

MacNearFuture/NFCommands.swift

@@ -1,17 +0,0 @@
-//
-//  NFCommands.swift
-//  MacNearFuture
-//
-//  Created by neon443 on 21/05/2025.
-//
-
-import Foundation
-import SwiftUI
-
-struct NearFutureCommands: Commands {
-	var body: some Commands {
-		CommandGroup(after: CommandGroupPlacement.appInfo) {
-			Text("hi")
-		}
-	}
-}

MacNearFuture/Views/ArchiveView.swift

@@ -1,33 +0,0 @@
-//
-//  ArchiveView.swift
-//  MacNearFuture
-//
-//  Created by neon443 on 28/05/2025.
-//
-
-import SwiftUI
-
-struct ArchiveView: View {
-	@StateObject var viewModel: EventViewModel
-	@StateObject var settingsModel: SettingsViewModel
-	
-	var filteredEvents: [Event] {
-		return viewModel.events.filter { $0.complete }
-	}
-	
-	var body: some View {
-		ScrollView {
-			ForEach(filteredEvents) { event in
-				EventListView(viewModel: viewModel, event: event)
-			}
-		}
-		.scrollContentBackground(.hidden)
-	}
-}
-
-#Preview {
-	ArchiveView(
-		viewModel: dummyEventViewModel(),
-		settingsModel: dummySettingsViewModel()
-	)
-}

MacNearFuture/Views/ContentViewMac.swift

@@ -1,59 +0,0 @@
-//
-//  ContentView.swift
-//  MacNearFuture
-//
-//  Created by neon443 on 21/05/2025.
-//
-
-import SwiftUI
-
-struct ContentView: View {
-	@StateObject var viewModel: EventViewModel
-	@StateObject var settingsModel: SettingsViewModel
-	
-    var body: some View {
-		NavigationSplitView(preferredCompactColumn: .constant(.sidebar)) {
-			List {
-				NavigationLink {
-					HomeView(
-						viewModel: viewModel,
-						settingsModel: settingsModel
-					)
-				} label: {
-					Image(systemName: "house")
-					Text("Home")
-				}
-				NavigationLink {
-					ArchiveView(
-						viewModel: viewModel,
-						settingsModel: settingsModel
-					)
-				} label: {
-					Image(systemName: "tray.full")
-					Text("Archive")
-				}
-				NavigationLink {
-					SettingsView(
-						viewModel: viewModel,
-						settingsModel: settingsModel
-					)
-				} label: {
-					Image(systemName: "gear")
-					Text("Settings")
-				}
-			}
-		} detail: {
-			
-		}
-		.tint(settingsModel.settings.tint.color)
-		.frame(minWidth: 450, minHeight: 550)
-		.containerBackground(.ultraThinMaterial, for: .window)
-    }
-}
-
-#Preview {
-	ContentView(
-		viewModel: dummyEventViewModel(),
-		settingsModel: dummySettingsViewModel()
-	)
-}

MacNearFuture/Views/EventListViewMac.swift

@@ -1,185 +0,0 @@
-//
-//  EventListView.swift
-//  MacNearFuture
-//
-//  Created by neon443 on 21/05/2025.
-//
-
-import SwiftUI
-
-struct EventListView: View {
-	@ObservedObject var viewModel: EventViewModel
-	@State var event: Event
-	
-	@State var largeTick: Bool = false
-	@State var hovering: Bool = false
-	
-	@Environment(\.openWindow) var openWindow
-	
-	var body: some View {
-		ZStack {
-			Color.black.opacity(hovering ? 0.5 : 0.0)
-			HStack {
-				RoundedRectangle(cornerRadius: 5)
-					.frame(width: 7)
-					.foregroundStyle(
-						event.color.color.opacity(
-							event.complete ? 0.5 : 1
-						)
-					)
-				VStack(alignment: .leading) {
-					HStack {
-						Image(systemName: event.symbol)
-							.resizable()
-							.scaledToFit()
-							.frame(width: 20, height: 20)
-							.shadow(radius: 5)
-							.foregroundStyle(
-								.one.opacity(
-									event.complete ? 0.5 : 1
-								)
-							)
-						Text("\(event.name)")
-							.bold()
-							.foregroundStyle(.one)
-							.strikethrough(event.complete)
-							.multilineTextAlignment(.leading)
-					}
-					if !event.notes.isEmpty {
-						Text(event.notes)
-							.foregroundStyle(.one.opacity(0.8))
-							.multilineTextAlignment(.leading)
-					}
-					Text(
-						event.date.formatted(
-							date: .long,
-							time: .shortened
-						)
-					)
-					.foregroundStyle(
-						.one.opacity(
-							event.complete ? 0.5 : 1
-						)
-					)
-					if event.recurrence != .none {
-						Text("Occurs \(event.recurrence.rawValue)")
-							.font(.subheadline)
-							.foregroundStyle(
-								.one.opacity(event.complete ? 0.5 : 1))
-					}
-				}
-				Spacer()
-				VStack {
-					Text("\(daysUntilEvent(event.date).long)")
-						.multilineTextAlignment(.trailing)
-						.foregroundStyle(event.date.timeIntervalSinceNow < 0 ? .red : .one)
-				}
-				Button() {
-					withAnimation {
-						event.complete.toggle()
-					}
-					let eventToModify = viewModel.events.firstIndex() { currEvent in
-						currEvent.id == event.id
-					}
-					if let eventToModify = eventToModify {
-						viewModel.events[eventToModify] = event
-						viewModel.saveEvents()
-					}
-				} label: {
-					if event.complete {
-						ZStack {
-							Circle()
-								.foregroundStyle(.green)
-							Image(systemName: "checkmark")
-								.resizable()
-								.foregroundStyle(.white)
-								.scaledToFit()
-								.bold()
-								.frame(width: 15)
-						}
-					} else {
-						Image(systemName: "circle")
-							.resizable()
-							.scaledToFit()
-							.foregroundStyle(event.color.color)
-					}
-				}
-				.onHover() { hovering in
-					withAnimation {
-						largeTick.toggle()
-					}
-				}
-				.buttonStyle(.borderless)
-				.scaleEffect(largeTick ? 1.5 : 1)
-				.frame(maxWidth: 20)
-				.shadow(radius: 5)
-				.padding(.trailing, 15)
-				.animation(
-					.spring(response: 0.2, dampingFraction: 0.75, blendDuration: 2),
-					value: largeTick
-				)
-				.apply {
-					if #available(iOS 17, *) {
-						$0.sensoryFeedback(.success, trigger: event.complete)
-					}
-				}
-			}
-			.transition(.opacity)
-			.fixedSize(horizontal: false, vertical: true)
-		}
-		.onHover { isHovering in
-			withAnimation {
-				hovering.toggle()
-			}
-		}
-		.onTapGesture {
-			openWindow(value: event.id)
-		}
-		.contextMenu() {
-			Button(role: .destructive) {
-				let eventToModify = viewModel.events.firstIndex() { currEvent in
-					currEvent.id == event.id
-				}
-				if let eventToModify = eventToModify {
-					viewModel.events.remove(at: eventToModify)
-					viewModel.saveEvents()
-				}
-			} label: {
-				Label("Delete", systemImage: "trash")
-			}
-		}
-	}
-}
-
-#Preview("EventListView") {
-	let vm = dummyEventViewModel()
-	ZStack {
-		Color.black
-		VStack {
-			ForEach(0..<50) { _ in
-				Rectangle()
-					.foregroundStyle(randomColor().opacity(0.5))
-					.padding(-10)
-			}
-			.ignoresSafeArea(.all)
-			.blur(radius: 5)
-		}
-		VStack {
-			ForEach(vm.events) { event in
-				EventListView(
-					viewModel: vm,
-					event: event
-				)
-			}
-		}
-		.padding(.horizontal, 10)
-	}
-}
-
-
-#Preview {
-	EventListView(
-		viewModel: dummyEventViewModel(),
-		event: dummyEventViewModel().template
-	)
-}

MacNearFuture/Views/Events/AddEventView.swift

@@ -1,199 +0,0 @@
-//
-//  AddEventView.swift
-//  MacNearFuture
-//
-//  Created by neon443 on 11/06/2025.
-//
-
-import SwiftUI
-import SFSymbolsPicker
-
-struct AddEventView: View {
-	@ObservedObject var viewModel: EventViewModel
-	
-	@Binding var event: Event
-	
-	@State var adding: Bool
-	@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
-	}
-	
-	@Environment(\.dismiss) var dismiss
-	
-	var body: some View {
-		ZStack {
-			if !adding {
-				backgroundGradient
-			}
-			List {
-				Section(
-					header:
-						Text("Event Details")
-						.font(.headline)
-						.foregroundColor(.accentColor)
-				) {
-					// name & symbol
-					HStack(spacing: 5) {
-						Button() {
-							isSymbolPickerPresented.toggle()
-						} label: {
-							Image(systemName: event.symbol)
-								.resizable()
-								.scaledToFit()
-								.frame(width: 20, height: 20)
-								.foregroundStyle(event.color.color)
-						}
-						.frame(width: 20)
-						.buttonStyle(.borderless)
-						.sheet(isPresented: $isSymbolPickerPresented) {
-							SymbolsPicker(
-								selection: $event.symbol,
-								title: "Choose a Symbol",
-								searchLabel: "Search...",
-								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)
-							Spacer()
-							Button() {
-								event.date = Date()
-							} label: {
-								Image(systemName: "arrow.uturn.left")
-									.resizable()
-									.scaledToFit()
-							}
-							.buttonStyle(BorderlessButtonStyle())
-							.frame(width: 20)
-						}
-						
-						DatePicker(
-							"",
-							selection: $event.date,
-							displayedComponents: .hourAndMinute
-						)
-						
-						// 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" : "")")
-				.toolbar {
-					ToolbarItem() {
-						if adding {
-							Button() {
-								resetAddEventView()
-								dismiss()
-							} label: {
-								Image(systemName: "xmark")
-									.resizable()
-									.scaledToFit()
-									.frame(width: 30)
-							}
-						}
-					}
-					ToolbarItem/*(placement: .topBarTrailing)*/ {
-						if adding {
-							Button {
-								viewModel.addEvent(
-									newEvent: event
-								)
-								bye.toggle()
-								resetAddEventView()
-							} label: {
-								Text("Save")
-									.font(.headline)
-									.cornerRadius(10)
-									.buttonStyle(BorderedProminentButtonStyle())
-							}
-							.tint(.accent)
-							.apply {
-								if #available(iOS 17, *) {
-									$0.sensoryFeedback(.success, trigger: bye)
-								}
-							}
-							.disabled(event.name.isEmpty)
-							.onTapGesture {
-								if event.name.isEmpty {
-									showNeedsNameAlert.toggle()
-								}
-							}
-							.alert("Missing Name", isPresented: $showNeedsNameAlert) {
-								Button("OK", role: .cancel) {
-									showNeedsNameAlert.toggle()
-									focusedField = .Name
-								}
-							} message: {
-								Text("Give your Event a name before saving.")
-							}
-							if event.name.isEmpty {
-								HStack {
-									Image(systemName: "exclamationmark")
-										.foregroundStyle(.red)
-									Text("Give your event a name.")
-								}
-							}
-						}
-					}
-				}
-			}
-			.scrollContentBackground(.hidden)
-			.presentationDragIndicator(.visible)
-		}
-	}
-	func resetAddEventView() {
-		//reset addeventView
-		event = viewModel.template
-		dismiss()
-	}
-	
-}
-
-#Preview {
-	let vm = dummyEventViewModel()
-	Color.orange
-		.ignoresSafeArea(.all)
-		.sheet(isPresented: .constant(true)) {
-			AddEventView(
-				viewModel: vm,
-				event: .constant(vm.template),
-				adding: true
-			)
-		}
-}

MacNearFuture/Views/Events/EditEventView.swift

@@ -1,41 +0,0 @@
-//
-//  EditEventView.swift
-//  NearFuture
-//
-//  Created by neon443 on 21/05/2025.
-//
-
-import SwiftUI
-
-struct EditEventView: View {
-	@Environment(\.dismiss) var dismiss
-	@ObservedObject var viewModel: EventViewModel
-	@Binding var event: Event
-	
-	var body: some View {
-		AddEventView(
-			viewModel: viewModel,
-			event: $event,
-			adding: false //bc we editing existing event
-		)
-		.navigationTitle("Edit Event")
-		.toolbar {
-			ToolbarItem(placement: .primaryAction) {
-				Button() {
-					dismiss()
-				} label: {
-					Text("Done")
-						.bold()
-				}
-				.disabled(event.name == "")
-			}
-		}
-	}
-}
-
-#Preview {
-	EditEventView(
-		viewModel: dummyEventViewModel(),
-		event: .constant(dummyEventViewModel().template)
-	)
-}

MacNearFuture/Views/HomeView.swift

@@ -1,37 +0,0 @@
-//
-//  HomeView.swift
-//  MacNearFuture
-//
-//  Created by neon443 on 28/05/2025.
-//
-
-import SwiftUI
-
-struct HomeView: View {
-	@StateObject var viewModel: EventViewModel
-	@StateObject var settingsModel: SettingsViewModel
-	
-	var filteredEvents: [Event] {
-		switch settingsModel.settings.showCompletedInHome {
-		case true:
-			return viewModel.events
-		case false:
-			return viewModel.events.filter { !$0.complete }
-		}
-	}
-    var body: some View {
-		ScrollView {
-			ForEach(filteredEvents) { event in
-				EventListView(viewModel: viewModel, event: event)
-			}
-		}
-		.scrollContentBackground(.hidden)
-    }
-}
-
-#Preview {
-	HomeView(
-		viewModel: dummyEventViewModel(),
-		settingsModel: dummySettingsViewModel()
-	)
-}

NearFuture.xcodeproj/project.pbxproj

@@ -7,27 +7,11 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		A90D49382DDE0FAF00781124 /* ContentViewMac.swift in Sources */ = {isa = PBXBuildFile; fileRef = A90D49332DDE0FAF00781124 /* ContentViewMac.swift */; };
-		A90D493D2DDE10B200781124 /* NearFutureIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = A949F8312DCAAA8A0064DCA0 /* NearFutureIcon.png */; };
-		A90D493E2DDE10CF00781124 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A920C28D2D24011A00E4F9B1 /* Assets.xcassets */; };
-		A90D49422DDE114100781124 /* Events.swift in Sources */ = {isa = PBXBuildFile; fileRef = A920C28B2D24011400E4F9B1 /* Events.swift */; };
-		A90D49442DDE1C7600781124 /* Tints.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A90D49432DDE1C1100781124 /* Tints.xcassets */; };
-		A90D49452DDE1C7600781124 /* Tints.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A90D49432DDE1C1100781124 /* Tints.xcassets */; };
-		A90D49462DDE1C7A00781124 /* Tints.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A90D49432DDE1C1100781124 /* Tints.xcassets */; };
-		A90D49522DDE2D0000781124 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = A90D49512DDE2D0000781124 /* Extensions.swift */; };
-		A90D49532DDE2D0000781124 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = A90D49512DDE2D0000781124 /* Extensions.swift */; };
-		A90D49562DDE2D5800781124 /* SFSymbolsPicker in Frameworks */ = {isa = PBXBuildFile; productRef = A90D49552DDE2D5800781124 /* SFSymbolsPicker */; };
-		A90D495B2DDE2EDB00781124 /* MacNearFutureApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = A90D495A2DDE2EDB00781124 /* MacNearFutureApp.swift */; };
-		A90D495E2DDE3C7400781124 /* NFCommands.swift in Sources */ = {isa = PBXBuildFile; fileRef = A90D495D2DDE3C7400781124 /* NFCommands.swift */; };
-		A90D495F2DDE3C7400781124 /* NFCommands.swift in Sources */ = {isa = PBXBuildFile; fileRef = A90D495D2DDE3C7400781124 /* NFCommands.swift */; };
-		A90D49612DDE626300781124 /* Settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = A90D49602DDE626300781124 /* Settings.swift */; };
-		A90D49622DDE626300781124 /* Settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = A90D49602DDE626300781124 /* Settings.swift */; };
-		A90D49632DDE626300781124 /* Settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = A90D49602DDE626300781124 /* Settings.swift */; };
 		A914FA4B2DD26C6800856265 /* HomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A914FA4A2DD26C0F00856265 /* HomeView.swift */; };
 		A914FA4D2DD2768900856265 /* WhatsNewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A914FA4C2DD2768900856265 /* WhatsNewView.swift */; };
 		A914FA4F2DD276D200856265 /* AboutView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A914FA4E2DD276D200856265 /* AboutView.swift */; };
 		A920C2882D24011400E4F9B1 /* NearFutureApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = A920C2872D24011400E4F9B1 /* NearFutureApp.swift */; };
-		A920C28C2D24011400E4F9B1 /* Events.swift in Sources */ = {isa = PBXBuildFile; fileRef = A920C28B2D24011400E4F9B1 /* Events.swift */; };
+		A920C28C2D24011400E4F9B1 /* Item.swift in Sources */ = {isa = PBXBuildFile; fileRef = A920C28B2D24011400E4F9B1 /* Item.swift */; };
 		A920C28E2D24011A00E4F9B1 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A920C28D2D24011A00E4F9B1 /* Assets.xcassets */; };
 		A920C2922D24011A00E4F9B1 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A920C2912D24011A00E4F9B1 /* Preview Assets.xcassets */; };
 		A920C2BE2D24021A00E4F9B1 /* SFSymbolsPicker in Frameworks */ = {isa = PBXBuildFile; productRef = A920C2BD2D24021A00E4F9B1 /* SFSymbolsPicker */; };
@@ -43,25 +27,16 @@
 		A949F8532DCAABE00064DCA0 /* ImportView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A949F8452DCAABE00064DCA0 /* ImportView.swift */; };
 		A949F8542DCAABE00064DCA0 /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A949F8462DCAABE00064DCA0 /* SettingsView.swift */; };
 		A949F8552DCAABE00064DCA0 /* StatsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A949F8482DCAABE00064DCA0 /* StatsView.swift */; };
+		A949F8562DCAABE00064DCA0 /* ExportView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A949F8432DCAABE00064DCA0 /* ExportView.swift */; };
+		A949F8592DCAAD670064DCA0 /* NearFutureTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A949F8572DCAAD670064DCA0 /* NearFutureTests.swift */; };
 		A949F85F2DCABB420064DCA0 /* Buttons.swift in Sources */ = {isa = PBXBuildFile; fileRef = A949F85D2DCABB420064DCA0 /* Buttons.swift */; };
-		A95E9ED32DFC703200ED655F /* iCloudSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A949F8442DCAABE00064DCA0 /* iCloudSettingsView.swift */; };
-		A95E9ED82DFC742B00ED655F /* AccentIcon.swift in Sources */ = {isa = PBXBuildFile; fileRef = A95E9ED72DFC742B00ED655F /* AccentIcon.swift */; };
-		A95E9ED92DFC742B00ED655F /* AccentIcon.swift in Sources */ = {isa = PBXBuildFile; fileRef = A95E9ED72DFC742B00ED655F /* AccentIcon.swift */; };
-		A95E9EDA2DFC742B00ED655F /* AccentIcon.swift in Sources */ = {isa = PBXBuildFile; fileRef = A95E9ED72DFC742B00ED655F /* AccentIcon.swift */; };
-		A95E9EE32DFC775300ED655F /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A949F8462DCAABE00064DCA0 /* SettingsView.swift */; };
-		A95E9EE42DFC77D400ED655F /* ImportView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A949F8452DCAABE00064DCA0 /* ImportView.swift */; };
-		A95E9EE52DFC77E200ED655F /* ExportView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A949F8432DCAABE00064DCA0 /* ExportView.swift */; };
+		A979F6052D270AF00094C0B3 /* WidgetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A979F6042D270AF00094C0B3 /* WidgetKit.framework */; };
+		A979F6072D270AF00094C0B3 /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A979F6062D270AF00094C0B3 /* SwiftUI.framework */; };
 		A979F60A2D270AF00094C0B3 /* NearFutureWidgetsBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = A979F6092D270AF00094C0B3 /* NearFutureWidgetsBundle.swift */; };
 		A979F60C2D270AF00094C0B3 /* NearFutureWidgetsLiveActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = A979F60B2D270AF00094C0B3 /* NearFutureWidgetsLiveActivity.swift */; };
 		A979F6102D270AF90094C0B3 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A979F60F2D270AF80094C0B3 /* Assets.xcassets */; };
 		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 /* 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 */; };
-		A9B78B942DF9F3CF00647399 /* AddEventView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9B78B932DF9F3CF00647399 /* AddEventView.swift */; };
+		A979F6182D2714310094C0B3 /* Item.swift in Sources */ = {isa = PBXBuildFile; fileRef = A920C28B2D24011400E4F9B1 /* Item.swift */; };
 		A9FC7EEA2D2823920020D75B /* NearFutureWidgets.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9FC7EE92D28238A0020D75B /* NearFutureWidgets.swift */; };
 /* End PBXBuildFile section */
 
@@ -73,12 +48,12 @@
 			remoteGlobalIDString = A979F6012D270AF00094C0B3;
 			remoteInfo = NearFutureWidgetsExtension;
 		};
-		A98C20D12DE732B10008D61C /* PBXContainerItemProxy */ = {
+		A980FC3B2D93FB2B006A778F /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = A920C27C2D24011300E4F9B1 /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = A979F6012D270AF00094C0B3;
-			remoteInfo = NearFutureWidgetsExtension;
+			remoteGlobalIDString = A920C2832D24011300E4F9B1;
+			remoteInfo = NearFuture;
 		};
 /* End PBXContainerItemProxy section */
 
@@ -97,24 +72,15 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		A90D491F2DDE08E400781124 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
-		A90D49262DDE0FA400781124 /* Near Future.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Near Future.app"; sourceTree = BUILT_PRODUCTS_DIR; };
-		A90D49332DDE0FAF00781124 /* ContentViewMac.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentViewMac.swift; sourceTree = "<group>"; };
-		A90D49342DDE0FAF00781124 /* MacNearFuture.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = MacNearFuture.entitlements; sourceTree = "<group>"; };
-		A90D49432DDE1C1100781124 /* Tints.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Tints.xcassets; sourceTree = "<group>"; };
-		A90D49512DDE2D0000781124 /* Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
-		A90D495A2DDE2EDB00781124 /* MacNearFutureApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = MacNearFutureApp.swift; path = MacNearFuture/MacNearFutureApp.swift; sourceTree = SOURCE_ROOT; };
-		A90D495D2DDE3C7400781124 /* NFCommands.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NFCommands.swift; sourceTree = "<group>"; };
-		A90D49602DDE626300781124 /* Settings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Settings.swift; sourceTree = "<group>"; };
-		A90D49652DDE658100781124 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		A90FDE222DC0D4310012790C /* Config.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Config.xcconfig; sourceTree = "<group>"; };
 		A914FA4A2DD26C0F00856265 /* HomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeView.swift; sourceTree = "<group>"; };
 		A914FA4C2DD2768900856265 /* WhatsNewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = WhatsNewView.swift; path = NearFuture/Views/Settings/WhatsNewView.swift; sourceTree = SOURCE_ROOT; };
 		A914FA4E2DD276D200856265 /* AboutView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AboutView.swift; path = NearFuture/Views/Misc/AboutView.swift; sourceTree = SOURCE_ROOT; };
 		A920C2842D24011400E4F9B1 /* NearFuture.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = NearFuture.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		A920C2872D24011400E4F9B1 /* NearFutureApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NearFutureApp.swift; sourceTree = "<group>"; };
-		A920C28B2D24011400E4F9B1 /* Events.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Events.swift; sourceTree = "<group>"; };
+		A920C28B2D24011400E4F9B1 /* Item.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Item.swift; sourceTree = "<group>"; };
 		A920C28D2D24011A00E4F9B1 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+		A920C28F2D24011A00E4F9B1 /* NearFuture.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = NearFuture.entitlements; sourceTree = "<group>"; };
 		A920C2912D24011A00E4F9B1 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
 		A949F82E2DCAAA640064DCA0 /* NearFutureIcon.pxd */ = {isa = PBXFileReference; lastKnownFileType = file; path = NearFutureIcon.pxd; sourceTree = "<group>"; };
 		A949F82F2DCAAA640064DCA0 /* NearFutureIconDark.pxd */ = {isa = PBXFileReference; lastKnownFileType = file; path = NearFutureIconDark.pxd; sourceTree = "<group>"; };
@@ -131,30 +97,28 @@
 		A949F8452DCAABE00064DCA0 /* ImportView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImportView.swift; sourceTree = "<group>"; };
 		A949F8462DCAABE00064DCA0 /* SettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = "<group>"; };
 		A949F8482DCAABE00064DCA0 /* StatsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatsView.swift; sourceTree = "<group>"; };
+		A949F8572DCAAD670064DCA0 /* NearFutureTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NearFutureTests.swift; sourceTree = "<group>"; };
 		A949F85D2DCABB420064DCA0 /* Buttons.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Buttons.swift; sourceTree = "<group>"; };
-		A95E9ED72DFC742B00ED655F /* AccentIcon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccentIcon.swift; sourceTree = "<group>"; };
+		A979F58B2D2700680094C0B3 /* NearFutureWidgetsBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NearFutureWidgetsBundle.swift; sourceTree = "<group>"; };
+		A979F58D2D2700680094C0B3 /* NearFutureWidgetsLiveActivity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NearFutureWidgetsLiveActivity.swift; sourceTree = "<group>"; };
+		A979F58F2D2700680094C0B3 /* NearFutureWidgets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NearFutureWidgets.swift; sourceTree = "<group>"; };
+		A979F5912D2700680094C0B3 /* AppIntent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppIntent.swift; sourceTree = "<group>"; };
+		A979F5932D27006D0094C0B3 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+		A979F5952D27006D0094C0B3 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		A979F6022D270AF00094C0B3 /* NearFutureWidgetsExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = NearFutureWidgetsExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
+		A979F6042D270AF00094C0B3 /* WidgetKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WidgetKit.framework; path = System/Library/Frameworks/WidgetKit.framework; sourceTree = SDKROOT; };
+		A979F6062D270AF00094C0B3 /* SwiftUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftUI.framework; path = System/Library/Frameworks/SwiftUI.framework; sourceTree = SDKROOT; };
 		A979F6092D270AF00094C0B3 /* NearFutureWidgetsBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NearFutureWidgetsBundle.swift; sourceTree = "<group>"; };
 		A979F60B2D270AF00094C0B3 /* NearFutureWidgetsLiveActivity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NearFutureWidgetsLiveActivity.swift; sourceTree = "<group>"; };
 		A979F60F2D270AF80094C0B3 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
-		A98C20C92DE730740008D61C /* EditEventView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditEventView.swift; sourceTree = "<group>"; };
-		A98C20CA2DE730740008D61C /* EventListViewMac.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventListViewMac.swift; sourceTree = "<group>"; };
-		A98C20CD2DE7308E0008D61C /* ArchiveView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArchiveView.swift; sourceTree = "<group>"; };
-		A98C20CF2DE731BD0008D61C /* HomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeView.swift; sourceTree = "<group>"; };
-		A98C20D32DE7339E0008D61C /* AboutView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutView.swift; sourceTree = "<group>"; };
-		A9B78B932DF9F3CF00647399 /* AddEventView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddEventView.swift; sourceTree = "<group>"; };
+		A979F6112D270AF90094C0B3 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		A980FC302D920097006A778F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		A980FC372D93FB2B006A778F /* NearFutureTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NearFutureTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		A9C05E412D2805D7007DC497 /* NearFutureWidgetsExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = NearFutureWidgetsExtension.entitlements; sourceTree = "<group>"; };
 		A9FC7EE92D28238A0020D75B /* NearFutureWidgets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NearFutureWidgets.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
-		A90D49232DDE0FA400781124 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				A90D49562DDE2D5800781124 /* SFSymbolsPicker in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		A920C2812D24011300E4F9B1 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -164,6 +128,15 @@
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		A979F5FF2D270AF00094C0B3 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A979F6072D270AF00094C0B3 /* SwiftUI.framework in Frameworks */,
+				A979F6052D270AF00094C0B3 /* WidgetKit.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A980FC342D93FB2B006A778F /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -173,68 +146,15 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		A90D49202DDE0A3B00781124 /* Model */ = {
-			isa = PBXGroup;
-			children = (
-				A920C28B2D24011400E4F9B1 /* Events.swift */,
-				A90D49602DDE626300781124 /* Settings.swift */,
-				A95E9ED72DFC742B00ED655F /* AccentIcon.swift */,
-			);
-			path = Model;
-			sourceTree = "<group>";
-		};
-		A90D49362DDE0FAF00781124 /* MacNearFuture */ = {
-			isa = PBXGroup;
-			children = (
-				A90D495A2DDE2EDB00781124 /* MacNearFutureApp.swift */,
-				A98C20D32DE7339E0008D61C /* AboutView.swift */,
-				A90D495D2DDE3C7400781124 /* NFCommands.swift */,
-				A90D493F2DDE10EC00781124 /* Views */,
-				A90D49342DDE0FAF00781124 /* MacNearFuture.entitlements */,
-			);
-			path = MacNearFuture;
-			sourceTree = "<group>";
-		};
-		A90D493F2DDE10EC00781124 /* Views */ = {
-			isa = PBXGroup;
-			children = (
-				A90D49332DDE0FAF00781124 /* ContentViewMac.swift */,
-				A98C20CF2DE731BD0008D61C /* HomeView.swift */,
-				A98C20CA2DE730740008D61C /* EventListViewMac.swift */,
-				A98C20CD2DE7308E0008D61C /* ArchiveView.swift */,
-				A98C20C82DE730420008D61C /* Events */,
-			);
-			path = Views;
-			sourceTree = "<group>";
-		};
-		A90D49412DDE112700781124 /* Shared */ = {
-			isa = PBXGroup;
-			children = (
-				A920C2872D24011400E4F9B1 /* NearFutureApp.swift */,
-				A90D49512DDE2D0000781124 /* Extensions.swift */,
-				A90D49202DDE0A3B00781124 /* Model */,
-			);
-			path = Shared;
-			sourceTree = "<group>";
-		};
-		A90D49542DDE2D5800781124 /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
 		A920C27B2D24011300E4F9B1 = {
 			isa = PBXGroup;
 			children = (
-				A90D491F2DDE08E400781124 /* README.md */,
 				A90FDE222DC0D4310012790C /* Config.xcconfig */,
-				A90D49412DDE112700781124 /* Shared */,
-				A920C2862D24011400E4F9B1 /* NearFuture */,
-				A90D49362DDE0FAF00781124 /* MacNearFuture */,
 				A949F8002DCAA0340064DCA0 /* Resources */,
+				A920C2862D24011400E4F9B1 /* NearFuture */,
 				A979F6082D270AF00094C0B3 /* NearFutureWidgets */,
-				A90D49542DDE2D5800781124 /* Frameworks */,
+				A949F8582DCAAD670064DCA0 /* NearFutureTests */,
+				A979F6032D270AF00094C0B3 /* Frameworks */,
 				A920C2852D24011400E4F9B1 /* Products */,
 			);
 			sourceTree = "<group>";
@@ -244,7 +164,7 @@
 			children = (
 				A920C2842D24011400E4F9B1 /* NearFuture.app */,
 				A979F6022D270AF00094C0B3 /* NearFutureWidgetsExtension.appex */,
-				A90D49262DDE0FA400781124 /* Near Future.app */,
+				A980FC372D93FB2B006A778F /* NearFutureTests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -252,7 +172,11 @@
 		A920C2862D24011400E4F9B1 /* NearFuture */ = {
 			isa = PBXGroup;
 			children = (
+				A920C2872D24011400E4F9B1 /* NearFutureApp.swift */,
+				A920C28B2D24011400E4F9B1 /* Item.swift */,
 				A949F84A2DCAABE00064DCA0 /* Views */,
+				A980FC302D920097006A778F /* Info.plist */,
+				A920C28F2D24011A00E4F9B1 /* NearFuture.entitlements */,
 				A920C2902D24011A00E4F9B1 /* Preview Content */,
 			);
 			path = NearFuture;
@@ -261,6 +185,7 @@
 		A920C2902D24011A00E4F9B1 /* Preview Content */ = {
 			isa = PBXGroup;
 			children = (
+				A979F58A2D2700680094C0B3 /* NearFutureWidgets */,
 				A920C2912D24011A00E4F9B1 /* Preview Assets.xcassets */,
 			);
 			path = "Preview Content";
@@ -271,7 +196,6 @@
 			children = (
 				A949F8312DCAAA8A0064DCA0 /* NearFutureIcon.png */,
 				A920C28D2D24011A00E4F9B1 /* Assets.xcassets */,
-				A90D49432DDE1C1100781124 /* Tints.xcassets */,
 				A949F82E2DCAAA640064DCA0 /* NearFutureIcon.pxd */,
 				A949F82F2DCAAA640064DCA0 /* NearFutureIconDark.pxd */,
 				A949F8302DCAAA640064DCA0 /* NearFutureIconTint.pxd */,
@@ -299,9 +223,10 @@
 		A949F8422DCAABE00064DCA0 /* Home */ = {
 			isa = PBXGroup;
 			children = (
-				A914FA4A2DD26C0F00856265 /* HomeView.swift */,
+				A949F83F2DCAABE00064DCA0 /* ContentView.swift */,
 				A949F8402DCAABE00064DCA0 /* EventListView.swift */,
 				A949F8412DCAABE00064DCA0 /* HelpView.swift */,
+				A914FA4A2DD26C0F00856265 /* HomeView.swift */,
 			);
 			path = Home;
 			sourceTree = "<group>";
@@ -329,7 +254,6 @@
 		A949F84A2DCAABE00064DCA0 /* Views */ = {
 			isa = PBXGroup;
 			children = (
-				A949F83F2DCAABE00064DCA0 /* ContentView.swift */,
 				A949F8422DCAABE00064DCA0 /* Home */,
 				A949F83E2DCAABE00064DCA0 /* Events */,
 				A949F83B2DCAABE00064DCA0 /* Archive */,
@@ -340,6 +264,14 @@
 			path = Views;
 			sourceTree = "<group>";
 		};
+		A949F8582DCAAD670064DCA0 /* NearFutureTests */ = {
+			isa = PBXGroup;
+			children = (
+				A949F8572DCAAD670064DCA0 /* NearFutureTests.swift */,
+			);
+			path = NearFutureTests;
+			sourceTree = "<group>";
+		};
 		A949F85E2DCABB420064DCA0 /* Misc */ = {
 			isa = PBXGroup;
 			children = (
@@ -349,6 +281,28 @@
 			path = Misc;
 			sourceTree = "<group>";
 		};
+		A979F58A2D2700680094C0B3 /* NearFutureWidgets */ = {
+			isa = PBXGroup;
+			children = (
+				A979F58B2D2700680094C0B3 /* NearFutureWidgetsBundle.swift */,
+				A979F58D2D2700680094C0B3 /* NearFutureWidgetsLiveActivity.swift */,
+				A979F58F2D2700680094C0B3 /* NearFutureWidgets.swift */,
+				A979F5912D2700680094C0B3 /* AppIntent.swift */,
+				A979F5932D27006D0094C0B3 /* Assets.xcassets */,
+				A979F5952D27006D0094C0B3 /* Info.plist */,
+			);
+			path = NearFutureWidgets;
+			sourceTree = "<group>";
+		};
+		A979F6032D270AF00094C0B3 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				A979F6042D270AF00094C0B3 /* WidgetKit.framework */,
+				A979F6062D270AF00094C0B3 /* SwiftUI.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 		A979F6082D270AF00094C0B3 /* NearFutureWidgets */ = {
 			isa = PBXGroup;
 			children = (
@@ -356,45 +310,15 @@
 				A979F6092D270AF00094C0B3 /* NearFutureWidgetsBundle.swift */,
 				A979F60B2D270AF00094C0B3 /* NearFutureWidgetsLiveActivity.swift */,
 				A979F60F2D270AF80094C0B3 /* Assets.xcassets */,
-				A90D49652DDE658100781124 /* Info.plist */,
+				A979F6112D270AF90094C0B3 /* Info.plist */,
+				A9C05E412D2805D7007DC497 /* NearFutureWidgetsExtension.entitlements */,
 			);
 			path = NearFutureWidgets;
 			sourceTree = "<group>";
 		};
-		A98C20C82DE730420008D61C /* Events */ = {
-			isa = PBXGroup;
-			children = (
-				A9B78B932DF9F3CF00647399 /* AddEventView.swift */,
-				A98C20C92DE730740008D61C /* EditEventView.swift */,
-			);
-			path = Events;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		A90D49252DDE0FA400781124 /* MacNearFuture */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = A90D492F2DDE0FA600781124 /* Build configuration list for PBXNativeTarget "MacNearFuture" */;
-			buildPhases = (
-				A90D49222DDE0FA400781124 /* Sources */,
-				A90D49232DDE0FA400781124 /* Frameworks */,
-				A90D49242DDE0FA400781124 /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				A98C20D22DE732B10008D61C /* PBXTargetDependency */,
-				A90D494D2DDE2C6000781124 /* PBXTargetDependency */,
-			);
-			name = MacNearFuture;
-			packageProductDependencies = (
-				A90D49552DDE2D5800781124 /* SFSymbolsPicker */,
-			);
-			productName = MacNearFuture;
-			productReference = A90D49262DDE0FA400781124 /* Near Future.app */;
-			productType = "com.apple.product-type.application";
-		};
 		A920C2832D24011300E4F9B1 /* NearFuture */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = A920C2AB2D24011B00E4F9B1 /* Build configuration list for PBXNativeTarget "NearFuture" */;
@@ -434,6 +358,26 @@
 			productReference = A979F6022D270AF00094C0B3 /* NearFutureWidgetsExtension.appex */;
 			productType = "com.apple.product-type.app-extension";
 		};
+		A980FC362D93FB2B006A778F /* NearFutureTests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = A980FC3D2D93FB2B006A778F /* Build configuration list for PBXNativeTarget "NearFutureTests" */;
+			buildPhases = (
+				A980FC332D93FB2B006A778F /* Sources */,
+				A980FC342D93FB2B006A778F /* Frameworks */,
+				A980FC352D93FB2B006A778F /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				A980FC3C2D93FB2B006A778F /* PBXTargetDependency */,
+			);
+			name = NearFutureTests;
+			packageProductDependencies = (
+			);
+			productName = NearFutureTests;
+			productReference = A980FC372D93FB2B006A778F /* NearFutureTests.xctest */;
+			productType = "com.apple.product-type.bundle.unit-test";
+		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
@@ -441,18 +385,19 @@
 			isa = PBXProject;
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
-				LastSwiftUpdateCheck = 1640;
+				LastSwiftUpdateCheck = 1620;
 				LastUpgradeCheck = 1630;
 				TargetAttributes = {
-					A90D49252DDE0FA400781124 = {
-						CreatedOnToolsVersion = 16.4;
-					};
 					A920C2832D24011300E4F9B1 = {
 						CreatedOnToolsVersion = 15.4;
 					};
 					A979F6012D270AF00094C0B3 = {
 						CreatedOnToolsVersion = 15.4;
 					};
+					A980FC362D93FB2B006A778F = {
+						CreatedOnToolsVersion = 16.2;
+						TestTargetID = A920C2832D24011300E4F9B1;
+					};
 				};
 			};
 			buildConfigurationList = A920C27F2D24011300E4F9B1 /* Build configuration list for PBXProject "NearFuture" */;
@@ -472,28 +417,17 @@
 			projectRoot = "";
 			targets = (
 				A920C2832D24011300E4F9B1 /* NearFuture */,
-				A90D49252DDE0FA400781124 /* MacNearFuture */,
 				A979F6012D270AF00094C0B3 /* NearFutureWidgetsExtension */,
+				A980FC362D93FB2B006A778F /* NearFutureTests */,
 			);
 		};
 /* End PBXProject section */
 
 /* Begin PBXResourcesBuildPhase section */
-		A90D49242DDE0FA400781124 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				A90D49452DDE1C7600781124 /* Tints.xcassets in Resources */,
-				A90D493E2DDE10CF00781124 /* Assets.xcassets in Resources */,
-				A90D493D2DDE10B200781124 /* NearFutureIcon.png in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		A920C2822D24011300E4F9B1 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				A90D49442DDE1C7600781124 /* Tints.xcassets in Resources */,
 				A920C2922D24011A00E4F9B1 /* Preview Assets.xcassets in Resources */,
 				A949F8322DCAAA8A0064DCA0 /* NearFutureIcon.png in Resources */,
 				A920C28E2D24011A00E4F9B1 /* Assets.xcassets in Resources */,
@@ -504,58 +438,36 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				A90D49462DDE1C7A00781124 /* Tints.xcassets in Resources */,
 				A979F6102D270AF90094C0B3 /* Assets.xcassets in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		A980FC352D93FB2B006A778F /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
-		A90D49222DDE0FA400781124 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				A95E9EE32DFC775300ED655F /* SettingsView.swift in Sources */,
-				A95E9EE42DFC77D400ED655F /* ImportView.swift in Sources */,
-				A98C20CB2DE730740008D61C /* EventListViewMac.swift in Sources */,
-				A95E9ED92DFC742B00ED655F /* AccentIcon.swift in Sources */,
-				A98C20CC2DE730740008D61C /* EditEventView.swift in Sources */,
-				A90D495E2DDE3C7400781124 /* NFCommands.swift in Sources */,
-				A95E9EE52DFC77E200ED655F /* ExportView.swift in Sources */,
-				A98C20D42DE7339E0008D61C /* AboutView.swift in Sources */,
-				A98C20CE2DE7308E0008D61C /* ArchiveView.swift in Sources */,
-				A98C20D02DE731BD0008D61C /* HomeView.swift in Sources */,
-				A90D495B2DDE2EDB00781124 /* MacNearFutureApp.swift in Sources */,
-				A9B78B942DF9F3CF00647399 /* AddEventView.swift in Sources */,
-				A90D49522DDE2D0000781124 /* Extensions.swift in Sources */,
-				A90D49422DDE114100781124 /* Events.swift in Sources */,
-				A90D49382DDE0FAF00781124 /* ContentViewMac.swift in Sources */,
-				A90D49622DDE626300781124 /* Settings.swift in Sources */,
-				A95E9ED32DFC703200ED655F /* iCloudSettingsView.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		A920C2802D24011300E4F9B1 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				A920C28C2D24011400E4F9B1 /* Events.swift in Sources */,
+				A920C28C2D24011400E4F9B1 /* Item.swift in Sources */,
 				A949F84B2DCAABE00064DCA0 /* ArchiveView.swift in Sources */,
 				A914FA4F2DD276D200856265 /* AboutView.swift in Sources */,
 				A949F84C2DCAABE00064DCA0 /* AddEventView.swift in Sources */,
 				A914FA4B2DD26C6800856265 /* HomeView.swift in Sources */,
 				A949F84D2DCAABE00064DCA0 /* EditEventView.swift in Sources */,
 				A949F84E2DCAABE00064DCA0 /* ContentView.swift in Sources */,
-				A90D49612DDE626300781124 /* Settings.swift in Sources */,
-				A90D495F2DDE3C7400781124 /* NFCommands.swift in Sources */,
 				A949F84F2DCAABE00064DCA0 /* EventListView.swift in Sources */,
 				A949F8502DCAABE00064DCA0 /* HelpView.swift in Sources */,
 				A949F85F2DCABB420064DCA0 /* Buttons.swift in Sources */,
 				A914FA4D2DD2768900856265 /* WhatsNewView.swift in Sources */,
 				A949F8512DCAABE00064DCA0 /* ExportView.swift in Sources */,
-				A95E9ED82DFC742B00ED655F /* AccentIcon.swift in Sources */,
-				A90D49532DDE2D0000781124 /* Extensions.swift in Sources */,
 				A949F8522DCAABE00064DCA0 /* iCloudSettingsView.swift in Sources */,
 				A949F8532DCAABE00064DCA0 /* ImportView.swift in Sources */,
 				A949F8542DCAABE00064DCA0 /* SettingsView.swift in Sources */,
@@ -568,98 +480,39 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				A979F6182D2714310094C0B3 /* Events.swift in Sources */,
+				A979F6182D2714310094C0B3 /* Item.swift in Sources */,
 				A979F60A2D270AF00094C0B3 /* NearFutureWidgetsBundle.swift in Sources */,
-				A95E9EDA2DFC742B00ED655F /* AccentIcon.swift in Sources */,
 				A9FC7EEA2D2823920020D75B /* NearFutureWidgets.swift in Sources */,
 				A979F60C2D270AF00094C0B3 /* NearFutureWidgetsLiveActivity.swift in Sources */,
-				A90D49632DDE626300781124 /* Settings.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A980FC332D93FB2B006A778F /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A949F8592DCAAD670064DCA0 /* NearFutureTests.swift in Sources */,
+				A949F8562DCAABE00064DCA0 /* ExportView.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
-		A90D494D2DDE2C6000781124 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			productRef = A90D494C2DDE2C6000781124 /* SFSymbolsPicker */;
-		};
 		A979F6132D270AF90094C0B3 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			platformFilter = ios;
 			target = A979F6012D270AF00094C0B3 /* NearFutureWidgetsExtension */;
 			targetProxy = A979F6122D270AF90094C0B3 /* PBXContainerItemProxy */;
 		};
-		A98C20D22DE732B10008D61C /* PBXTargetDependency */ = {
+		A980FC3C2D93FB2B006A778F /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = A979F6012D270AF00094C0B3 /* NearFutureWidgetsExtension */;
-			targetProxy = A98C20D12DE732B10008D61C /* PBXContainerItemProxy */;
+			target = A920C2832D24011300E4F9B1 /* NearFuture */;
+			targetProxy = A980FC3B2D93FB2B006A778F /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
-		A90D49302DDE0FA600781124 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = A90FDE222DC0D4310012790C /* Config.xcconfig */;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "bloo blue green pink purple red yellow";
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
-				CODE_SIGN_ENTITLEMENTS = MacNearFuture/MacNearFuture.entitlements;
-				CODE_SIGN_STYLE = Automatic;
-				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = "$(BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = 8JGND254B7;
-				ENABLE_HARDENED_RUNTIME = YES;
-				ENABLE_PREVIEWS = YES;
-				GENERATE_INFOPLIST_FILE = YES;
-				INFOPLIST_KEY_NSHumanReadableCopyright = "";
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/../Frameworks",
-				);
-				MACOSX_DEPLOYMENT_TARGET = 15;
-				MARKETING_VERSION = "$(VERSION)";
-				PRODUCT_BUNDLE_IDENTIFIER = com.neon443.NearFuture;
-				PRODUCT_NAME = "Near Future";
-				REGISTER_APP_GROUPS = YES;
-				SDKROOT = macosx;
-				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
-			};
-			name = Debug;
-		};
-		A90D49312DDE0FA600781124 /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = A90FDE222DC0D4310012790C /* Config.xcconfig */;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "bloo blue green pink purple red yellow";
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
-				CODE_SIGN_ENTITLEMENTS = MacNearFuture/MacNearFuture.entitlements;
-				CODE_SIGN_STYLE = Automatic;
-				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = "$(BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = 8JGND254B7;
-				ENABLE_HARDENED_RUNTIME = YES;
-				ENABLE_PREVIEWS = YES;
-				GENERATE_INFOPLIST_FILE = YES;
-				INFOPLIST_KEY_NSHumanReadableCopyright = "";
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/../Frameworks",
-				);
-				MACOSX_DEPLOYMENT_TARGET = 15;
-				MARKETING_VERSION = "$(VERSION)";
-				PRODUCT_BUNDLE_IDENTIFIER = com.neon443.NearFuture;
-				PRODUCT_NAME = "Near Future";
-				REGISTER_APP_GROUPS = YES;
-				SDKROOT = macosx;
-				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
-			};
-			name = Release;
-		};
 		A920C2A92D24011B00E4F9B1 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -807,7 +660,8 @@
 				ENABLE_HARDENED_RUNTIME = NO;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
-				INFOPLIST_KEY_CFBundleDisplayName = "Near Future";
+				INFOPLIST_FILE = NearFuture/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = "$(NAME)";
 				INFOPLIST_KEY_ITSAppUsesNonExemptEncryption = NO;
 				"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES;
 				"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphonesimulator*]" = YES;
@@ -833,8 +687,8 @@
 				REGISTER_APP_GROUPS = YES;
 				SDKROOT = auto;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
-				SUPPORTS_MACCATALYST = NO;
-				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SUPPORTS_MACCATALYST = YES;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
 				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
@@ -859,7 +713,8 @@
 				ENABLE_HARDENED_RUNTIME = NO;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
-				INFOPLIST_KEY_CFBundleDisplayName = "Near Future";
+				INFOPLIST_FILE = NearFuture/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = "$(NAME)";
 				INFOPLIST_KEY_ITSAppUsesNonExemptEncryption = NO;
 				"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES;
 				"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphonesimulator*]" = YES;
@@ -882,8 +737,8 @@
 				REGISTER_APP_GROUPS = YES;
 				SDKROOT = auto;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
-				SUPPORTS_MACCATALYST = NO;
-				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SUPPORTS_MACCATALYST = YES;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
 				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
@@ -903,7 +758,7 @@
 				CURRENT_PROJECT_VERSION = "$(BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = "$(TEAM_ID)";
 				GENERATE_INFOPLIST_FILE = YES;
-				INFOPLIST_FILE = "$(SRCROOT)/NearFutureWidgets/Info.plist";
+				INFOPLIST_FILE = NearFutureWidgets/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = NearFutureWidgets;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				IPHONEOS_DEPLOYMENT_TARGET = 17;
@@ -923,9 +778,8 @@
 				REGISTER_APP_GROUPS = YES;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
-				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
-				SUPPORTS_MACCATALYST = NO;
-				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -945,7 +799,7 @@
 				CURRENT_PROJECT_VERSION = "$(BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = "$(TEAM_ID)";
 				GENERATE_INFOPLIST_FILE = YES;
-				INFOPLIST_FILE = "$(SRCROOT)/NearFutureWidgets/Info.plist";
+				INFOPLIST_FILE = NearFutureWidgets/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = NearFutureWidgets;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				IPHONEOS_DEPLOYMENT_TARGET = 17;
@@ -961,9 +815,8 @@
 				REGISTER_APP_GROUPS = YES;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
-				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
-				SUPPORTS_MACCATALYST = NO;
-				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -972,18 +825,61 @@
 			};
 			name = Release;
 		};
+		A980FC3E2D93FB2B006A778F /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = A90FDE222DC0D4310012790C /* Config.xcconfig */;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				GENERATE_INFOPLIST_FILE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 16;
+				MACOSX_DEPLOYMENT_TARGET = 13;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = dev.neon443.NearFutureTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = auto;
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = YES;
+				SWIFT_EMIT_LOC_STRINGS = NO;
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/NearFuture.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/NearFuture";
+				XROS_DEPLOYMENT_TARGET = 1;
+			};
+			name = Debug;
+		};
+		A980FC3F2D93FB2B006A778F /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = A90FDE222DC0D4310012790C /* Config.xcconfig */;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				GENERATE_INFOPLIST_FILE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 16;
+				MACOSX_DEPLOYMENT_TARGET = 13;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = dev.neon443.NearFutureTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = auto;
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = YES;
+				SWIFT_EMIT_LOC_STRINGS = NO;
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/NearFuture.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/NearFuture";
+				XROS_DEPLOYMENT_TARGET = 1;
+			};
+			name = Release;
+		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		A90D492F2DDE0FA600781124 /* Build configuration list for PBXNativeTarget "MacNearFuture" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				A90D49302DDE0FA600781124 /* Debug */,
-				A90D49312DDE0FA600781124 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
 		A920C27F2D24011300E4F9B1 /* Build configuration list for PBXProject "NearFuture" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
@@ -1011,6 +907,15 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		A980FC3D2D93FB2B006A778F /* Build configuration list for PBXNativeTarget "NearFutureTests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				A980FC3E2D93FB2B006A778F /* Debug */,
+				A980FC3F2D93FB2B006A778F /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 /* End XCConfigurationList section */
 
 /* Begin XCRemoteSwiftPackageReference section */
@@ -1025,16 +930,6 @@
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		A90D494C2DDE2C6000781124 /* SFSymbolsPicker */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = A920C2BC2D24021900E4F9B1 /* XCRemoteSwiftPackageReference "SFSymbolsPicker" */;
-			productName = SFSymbolsPicker;
-		};
-		A90D49552DDE2D5800781124 /* SFSymbolsPicker */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = A920C2BC2D24021900E4F9B1 /* XCRemoteSwiftPackageReference "SFSymbolsPicker" */;
-			productName = SFSymbolsPicker;
-		};
 		A920C2BD2D24021A00E4F9B1 /* SFSymbolsPicker */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = A920C2BC2D24021900E4F9B1 /* XCRemoteSwiftPackageReference "SFSymbolsPicker" */;

NearFuture.xcodeproj/xcshareddata/xcschemes/MacNearFuture.xcscheme

@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1640"
-   version = "1.7">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES"
-      buildArchitectures = "Automatic">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "A90D49252DDE0FA400781124"
-               BuildableName = "Near Future.app"
-               BlueprintName = "MacNearFuture"
-               ReferencedContainer = "container:NearFuture.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      shouldAutocreateTestPlan = "YES">
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "A90D49252DDE0FA400781124"
-            BuildableName = "Near Future.app"
-            BlueprintName = "MacNearFuture"
-            ReferencedContainer = "container:NearFuture.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "A90D49252DDE0FA400781124"
-            BuildableName = "Near Future.app"
-            BlueprintName = "MacNearFuture"
-            ReferencedContainer = "container:NearFuture.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

NearFuture.xcodeproj/xcuserdata/neon443.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -4,29 +4,19 @@
 <dict>
 	<key>SchemeUserState</key>
 	<dict>
-		<key>MacNearFuture.xcscheme_^#shared#^_</key>
+		<key>NearFuture.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
 			<integer>1</integer>
 		</dict>
-		<key>NearFuture.xcscheme_^#shared#^_</key>
+		<key>NearFutureWidgetsExtension.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
 			<integer>0</integer>
 		</dict>
-		<key>NearFutureWidgetsExtension.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>2</integer>
-		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>
 	<dict>
-		<key>A90D49252DDE0FA400781124</key>
-		<dict>
-			<key>primary</key>
-			<true/>
-		</dict>
 		<key>A920C2832D24011300E4F9B1</key>
 		<dict>
 			<key>primary</key>

NearFuture/Home/EventListView.swift

@@ -0,0 +1,170 @@
+//
+//  EventListView.swift
+//  NearFuture
+//
+//  Created by neon443 on 18/04/2025.
+//
+
+import SwiftUI
+import SwiftData
+
+struct EventListView: View {
+	@ObservedObject var viewModel: EventViewModel
+	@State var event: Event
+	
+	var body: some View {
+		NavigationLink() {
+			EditEventView(
+				viewModel: viewModel,
+				event: $event
+			)
+		} label: {
+			ZStack {
+				HStack {
+					RoundedRectangle(cornerRadius: 5)
+						.frame(width: 7)
+						.foregroundStyle(
+							event.color.color.opacity(
+								event.complete ? 0.5 : 1
+							)
+						)
+					VStack(alignment: .leading) {
+						HStack {
+							Image(systemName: event.symbol)
+								.resizable()
+								.scaledToFit()
+								.frame(width: 20, height: 20)
+								.shadow(radius: 5)
+								.foregroundStyle(
+									.one.opacity(
+										event.complete ? 0.5 : 1
+									)
+								)
+							Text("\(event.name)")
+								.font(.headline)
+								.foregroundStyle(.one)
+								.strikethrough(event.complete)
+								.multilineTextAlignment(.leading)
+						}
+						if !event.notes.isEmpty {
+							Text(event.notes)
+								.font(.subheadline)
+								.foregroundStyle(.one.opacity(0.8))
+								.multilineTextAlignment(.leading)
+						}
+						Text(
+							event.date.formatted(
+								date: .long,
+								time: .shortened
+							)
+						)
+						.font(.subheadline)
+						.foregroundStyle(
+							.one.opacity(
+								event.complete ? 0.5 : 1
+							)
+						)
+						if event.recurrence != .none {
+							Text("Occurs \(event.recurrence.rawValue)")
+								.font(.subheadline)
+								.foregroundStyle(
+									.one.opacity(event.complete ? 0.5 : 1))
+						}
+					}
+					Spacer()
+					VStack {
+						Text("\(daysUntilEvent(event.date).long)")
+							.font(.subheadline)
+							.foregroundStyle(.one)
+					}
+					Button() {
+						withAnimation {
+							event.complete.toggle()
+						}
+						let eventToModify = viewModel.events.firstIndex() { currEvent in
+							currEvent.id == event.id
+						}
+						if let eventToModify = eventToModify {
+							viewModel.events[eventToModify] = event
+							viewModel.saveEvents()
+						}
+					} label: {
+						if event.complete {
+							ZStack {
+								Circle()
+									.foregroundStyle(.green)
+								Image(systemName: "checkmark")
+									.resizable()
+									.foregroundStyle(.white)
+									.scaledToFit()
+									.bold()
+									.frame(width: 15)
+							}
+						} else {
+							Image(systemName: "circle")
+								.resizable()
+								.scaledToFit()
+								.foregroundStyle(event.color.color)
+						}
+					}
+					.buttonStyle(.borderless)
+					.frame(maxWidth: 25, maxHeight: 25)
+					.shadow(radius: 5)
+					.padding(.trailing, 5)
+				}
+				.padding(.vertical, 5)
+				.background(.ultraThinMaterial)
+				.overlay(
+					RoundedRectangle(cornerRadius: 10)
+						.stroke(
+							.one.opacity(appearance == .dark ? 0.5 : 1),
+							lineWidth: 1
+						)
+				)
+				.clipShape(
+					RoundedRectangle(cornerRadius: 10)
+				)
+				.fixedSize(horizontal: false, vertical: true)
+			}
+			.transition(.opacity)
+			.contextMenu() {
+				Button(role: .destructive) {
+					let eventToModify = viewModel.events.firstIndex() { currEvent in
+						currEvent.id == event.id
+					}
+					if let eventToModify = eventToModify {
+						viewModel.events.remove(at: eventToModify)
+						viewModel.saveEvents()
+					}
+				} label: {
+					Label("Delete", systemImage: "trash")
+				}
+			}
+		}
+	}
+}
+
+#Preview("EventListView") {
+	let vm = dummyEventViewModel()
+	ZStack {
+		Color.black
+		VStack {
+			ForEach(0..<50) { _ in
+				Rectangle()
+					.foregroundStyle(randomColor().opacity(0.5))
+					.padding(-10)
+			}
+			.ignoresSafeArea(.all)
+			.blur(radius: 5)
+		}
+		VStack {
+			ForEach(vm.events) { event in
+				EventListView(
+					viewModel: vm,
+					event: event
+				)
+			}
+		}
+		.padding(.horizontal, 10)
+	}
+}

NearFuture/Info.plist

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>AppIntents</key>
+	<array>
+		<string>com.neon443.NearFuture.CompleteEvent</string>
+	</array>
+</dict>
+</plist>

NearFuture/Item.swift

@@ -11,9 +11,6 @@ import SwiftUI
 import WidgetKit
 import UserNotifications
 import AppIntents
-#if canImport(AppKit)
-import AppKit
-#endif
 
 //@Model
 //final class Item {
@@ -42,44 +39,21 @@ struct Event: Identifiable, Codable, Equatable, Animatable {
 
 struct ColorCodable: Codable, Equatable {
 	init(_ color: Color) {
-		var r: CGFloat = 0, g: CGFloat = 0, b: CGFloat = 0, a: CGFloat = 1
-		
-#if canImport(UIKit)
 		let uiColor = UIColor(color)
+		var r: CGFloat = 0, g: CGFloat = 0, b: CGFloat = 0, a: CGFloat = 1.0
 		uiColor.getRed(&r, green: &g, blue: &b, alpha: &a)
-#elseif canImport(AppKit)
-		let nscolor = NSColor(color).usingColorSpace(.deviceRGB)
-		nscolor!.getRed(&r, green: &g, blue: &b, alpha: &a)
-#endif
 		
-		self = ColorCodable(
-			red: r,
-			green: g,
-			blue: b
-		)
+		self.red = Double(r)
+		self.green = Double(g)
+		self.blue = Double(b)
 	}
-#if canImport(UIKit)
 	init(uiColor: UIColor) {
 		var r: CGFloat = 0, g: CGFloat = 0, b: CGFloat = 0, a: CGFloat = 1.0
 		uiColor.getRed(&r, green: &g, blue: &b, alpha: &a)
-		self = ColorCodable(
-			red: r,
-			green: g,
-			blue: b
-		)
+		self.red = Double(r)
+		self.green = Double(g)
+		self.blue = Double(b)
 	}
-#elseif canImport(AppKit)
-	init(nsColor: NSColor) {
-		var r: CGFloat = 0, g: CGFloat = 0, b: CGFloat = 0, a: CGFloat = 1.0
-		let nsColor = nsColor.usingColorSpace(.deviceRGB)
-		nsColor!.getRed(&r, green: &g, blue: &b, alpha: &a)
-		self = ColorCodable(
-			red: r,
-			green: g,
-			blue: b
-		)
-	}
-#endif
 	init(red: Double, green: Double, blue: Double) {
 		self.red = red
 		self.green = green
@@ -119,18 +93,114 @@ func daysUntilEvent(_ eventDate: Date) -> (long: String, short: String) {
 	if days < 0 {
 		//past
 		return (
-			"\(-days)\nday\(plu(days)) ago",
+			"\(-days) day\(plu(days)) ago",
 			"\(days)d"
 		)
 	} else {
 		//future
 		return (
-			"\(days)\nday\(plu(days))",
+			"\(days) day\(plu(days))",
 			"\(days)d"
 		)
 	}
 }
 
+struct Settings: Codable, Equatable {
+	var showCompletedInHome: Bool
+	var tint: ColorCodable
+	var showWhatsNew: Bool
+	var prevAppVersion: String
+}
+
+struct AccentIcon {
+	var icon: UIImage
+	var color: Color
+	var name: String
+	init(_ colorName: String) {
+		if colorName == "orange" {
+			self.icon = UIImage(named: "AppIcon")!
+		} else {
+			self.icon = UIImage(named: colorName)!
+		}
+		self.color = Color(uiColor: UIColor(named: "uiColors/\(colorName)")!)
+		self.name = colorName
+	}
+}
+
+class SettingsViewModel: ObservableObject {
+	@Published var settings: Settings = Settings(
+		showCompletedInHome: false,
+		tint: ColorCodable(uiColor: UIColor(named: "AccentColor")!),
+		showWhatsNew: true,
+		prevAppVersion: getVersion()+getBuildID()
+	)
+	@Published var notifsGranted: Bool = false
+	
+	@Published var colorChoices: [AccentIcon] = []
+	
+	let accentChoices: [String] = [
+		"red",
+		"orange",
+		"yellow",
+		"green",
+		"blue",
+		"bloo",
+		"purple",
+		"pink"
+	]
+	
+	@Published var device: (sf: String, label: String)
+	
+	init(load: Bool = true) {
+		self.device = getDevice()
+		if load {
+			loadSettings()
+			Task {
+				let requestResult = await requestNotifs()
+				await MainActor.run {
+					self.notifsGranted = requestResult
+				}
+			}
+		}
+	}
+	
+	func changeTint(to: String) {
+		if let uicolor = UIColor(named: "uiColors/\(to)") {
+			self.settings.tint = ColorCodable(uiColor: uicolor)
+			saveSettings()
+		}
+	}
+	
+	let appGroupSettingsStore = UserDefaults(suiteName: "group.NearFuture") ?? UserDefaults.standard
+	let icSettStore = NSUbiquitousKeyValueStore.default
+	
+	func loadSettings() {
+		let decoder = JSONDecoder()
+		if let icSettings = icSettStore.data(forKey: "settings") {
+			if let decodedSetts = try? decoder.decode(Settings.self, from: icSettings) {
+				self.settings = decodedSetts
+			}
+		} else if let savedData = appGroupSettingsStore.data(forKey: "settings") {
+			if let decodedSetts = try? decoder.decode(Settings.self, from: savedData) {
+				self.settings = decodedSetts
+			}
+		}
+		if self.settings.prevAppVersion != getVersion()+getBuildID() {
+			self.settings.showWhatsNew = true
+		}
+	}
+	
+	func saveSettings() {
+		let encoder = JSONEncoder()
+		if let encoded = try? encoder.encode(settings) {
+			appGroupSettingsStore.set(encoded, forKey: "settings")
+			icSettStore.set(encoded, forKey: "settings")
+			icSettStore.synchronize()
+			loadSettings()
+		}
+	}
+}
+
 class EventViewModel: ObservableObject, @unchecked Sendable {
 	@Published var events: [Event] = []
 	@Published var icloudData: [Event] = []
@@ -162,31 +232,11 @@ class EventViewModel: ObservableObject, @unchecked Sendable {
 	@Published var localEventCount: Int = 0
 	@Published var syncStatus: String = "Not Synced"
 	
-	@Published var hasUbiquitous: Bool = false
-	@Published var lastSyncWasSuccessful: Bool = false
-	@Published var lastSyncWasNormalAgo: Bool = false
-	@Published var localCountEqualToiCloud: Bool = false
-	@Published var icloudCountEqualToLocal: Bool = false
-	
-	var iCloudStatusColor: Color {
-		let allTrue = hasUbiquitous && lastSyncWasSuccessful && lastSyncWasNormalAgo && localCountEqualToiCloud && icloudCountEqualToLocal
-		let someTrue = hasUbiquitous || lastSyncWasSuccessful || lastSyncWasNormalAgo || localCountEqualToiCloud || icloudCountEqualToLocal
-		
-		if allTrue {
-			return .green
-		} else if someTrue {
-			return .orange
-		} else {
-			return .red
-		}
-	}
-	
 	init(load: Bool = true) {
 		self.editableTemplate = template
 		if load {
 			loadEvents()
 		}
-//		AudioServicesPlaySystemSound(kSystemSoundID_Vibrate)
 	}
 	
 	//appgroup or regular userdefaults
@@ -265,8 +315,8 @@ class EventViewModel: ObservableObject, @unchecked Sendable {
 			
 			updateSyncStatus()
 			loadEvents()
-			Task.detached {
-				await self.checkPendingNotifs(self.getNotifs())
+			Task {
+				await checkPendingNotifs(getNotifs())
 			}
 			WidgetCenter.shared.reloadAllTimelines()//reload all widgets when saving events
 			objectWillChange.send()
@@ -342,32 +392,20 @@ class EventViewModel: ObservableObject, @unchecked Sendable {
 		return ""
 	}
 	
-	func importEvents(_ imported: String, replace: Bool) throws {
+	func importEvents(_ imported: String) throws {
 		guard let data = Data(base64Encoded: imported) else {
 			throw importError.invalidB64
 		}
 		let decoder = JSONDecoder()
 		do {
 			let decoded = try decoder.decode([Event].self, from: data)
-			if replace {
-				self.events = decoded
-			} else {
-				self.events = self.events + decoded
-			}
+			self.events = decoded
 			saveEvents()
 		} catch {
 			throw error
 		}
 	}
 	
-	func updateiCStatus() {
-		hasUbiquitous = hasUbiquitousKeyValueStore()
-		lastSyncWasSuccessful = syncStatus.contains("Success")
-		lastSyncWasNormalAgo = lastSync?.timeIntervalSinceNow.isNormal ?? false
-		localCountEqualToiCloud = localEventCount == icloudEventCount
-		icloudCountEqualToLocal = icloudEventCount == localEventCount
-	}
-	
 	//MARK: Danger Zone
 	func dangerClearLocalData() {
 		UserDefaults.standard.removeObject(forKey: "events")
@@ -413,7 +451,7 @@ class EventViewModel: ObservableObject, @unchecked Sendable {
 	}
 }
 
-class dummyEventViewModel: EventViewModel, @unchecked Sendable{
+class dummyEventViewModel: EventViewModel, @unchecked Sendable {
 	var template2: Event
 	override init(load: Bool = false) {
 		self.template2 = Event(
@@ -542,7 +580,6 @@ func getBuildID() -> String {
 }
 
 func getDevice() -> (sf: String, label: String) {
-	#if canImport(UIKit)
 	let asi = ProcessInfo().isiOSAppOnMac
 	let model = UIDevice().model
 	if asi {
@@ -553,10 +590,6 @@ func getDevice() -> (sf: String, label: String) {
 		return (sf: model.lowercased(), label: model)
 	}
 	return (sf: "iphone", label: "iPhone")
-	#elseif canImport(AppKit)
-	
-	return (sf: "desktopcomputer", label: "Mac")
-	#endif
 }
 
 extension Event: AppEntity {

NearFuture/Misc/HelpView.swift

@@ -0,0 +1,112 @@
+//
+//  ArchiveHelp.swift
+//  NearFuture
+//
+//  Created by neon443 on 26/04/2025.
+//
+
+
+import SwiftUI
+
+enum HelpType {
+	case Search
+	case Archive
+}
+
+struct HelpView: View {
+	/// initialises a Search HelpView
+	/// 
+	init(searchInput: Binding<String>, focusedField: Field?) {
+		_searchInput = searchInput
+		self.helpType = .Search
+		_showAddEvent = .constant(false)
+	}
+	
+	/// initialises an Archive HelpView
+	/// 
+	init(showAddEvent: Binding<Bool>) {
+		_showAddEvent = showAddEvent
+		self.helpType = .Archive
+		_searchInput = .constant("")
+		self.focusedField = nil
+	}
+	
+	@Binding var searchInput: String
+	@FocusState var focusedField: Field?
+	
+	@Binding var showAddEvent: Bool
+	
+	var helpType: HelpType
+	var details: (
+		symbol: String,
+		title: String,
+		body: String,
+		buttonAction: () -> (),
+		buttonSymbol: String,
+		buttonText: String
+	) {
+		switch helpType {
+		case .Search:
+			return (
+				symbol: "questionmark.app.dashed",
+				title: "Looking for something?",
+				body: "Tip: The Search bar searches event names and notes.",
+				buttonAction: {
+					searchInput = ""
+					focusedField = nil
+				},
+				buttonSymbol: "xmark",
+				buttonText: "Clear Filters"
+			)
+		case .Archive:
+			return (
+				symbol: "eyes",
+				title: "Nothing to see here...",
+				body: "The Archive contains events that have been marked as complete.",
+				buttonAction: {
+					showAddEvent.toggle()
+				},
+				buttonSymbol: "plus",
+				buttonText: "Create an event"
+			)
+		}
+	}
+	var body: some View {
+		List {
+			ZStack {
+				Color(.tintColor)
+					.opacity(0.4)
+					.padding(.horizontal, -15)
+					.blur(radius: 5)
+				HStack {
+					Image(systemName: details.symbol)
+						.resizable()
+						.scaledToFit()
+						.frame(width: 30, height: 30)
+						.padding(.trailing)
+					Text(details.title)
+						.bold()
+						.font(.title2)
+				}
+			}
+			.listRowSeparator(.hidden)
+			Text(details.body)
+			Button() {
+				details.buttonAction()
+			} label: {
+				HStack {
+					Image(systemName: details.buttonSymbol)
+						.bold()
+					Text(details.buttonText)
+				}
+				.foregroundStyle(Color.accentColor)
+			}
+		}
+		.scrollContentBackground(.hidden)
+	}
+}
+
+#Preview {
+	HelpView(searchInput: .constant(""), focusedField: nil)
+	HelpView(showAddEvent: .constant(false))
+}

NearFuture/NearFuture.entitlements

@@ -2,6 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>aps-environment</key>
+	<string>development</string>
+	<key>com.apple.developer.aps-environment</key>
+	<string>development</string>
 	<key>com.apple.developer.icloud-container-identifiers</key>
 	<array/>
 	<key>com.apple.developer.ubiquity-kvstore-identifier</key>

NearFuture/NearFutureApp.swift

@@ -0,0 +1,36 @@
+//
+//  NearFutureApp.swift
+//  NearFuture
+//
+//  Created by neon443 on 24/12/2024.
+//
+
+import SwiftUI
+import SwiftData
+
+@main
+struct NearFutureApp: App {
+//    var sharedModelContainer: ModelContainer = {
+//        let schema = Schema([
+//            Item.self,
+//        ])
+//        let modelConfiguration = ModelConfiguration(schema: schema, isStoredInMemoryOnly: false)
+//
+//        do {
+//            return try ModelContainer(for: schema, configurations: [modelConfiguration])
+//        } catch {
+//            fatalError("Could not create ModelContainer: \(error)")
+//        }
+//    }()
+	@StateObject var settingsModel: SettingsViewModel = SettingsViewModel()
+    var body: some Scene {
+        WindowGroup {
+			ContentView(
+				viewModel: EventViewModel(),
+				settingsModel: settingsModel
+			)
+			.tint(settingsModel.settings.tint.color)
+        }
+//        .modelContainer(sharedModelContainer)
+    }
+}

NearFuture/Preview Content/NearFutureWidgets/AppIntent.swift

@@ -0,0 +1,18 @@
+//
+//  AppIntent.swift
+//  NearFutureWidgets
+//
+//  Created by neon443 on 02/01/2025.
+//
+
+import WidgetKit
+import AppIntents
+
+struct ConfigurationAppIntent: WidgetConfigurationIntent {
+    static var title: LocalizedStringResource = "Configuration"
+    static var description = IntentDescription("This is an example widget.")
+
+    // An example configurable parameter.
+    @Parameter(title: "Favorite Emoji", default: "😃")
+    var favoriteEmoji: String
+}

NearFuture/Preview Content/NearFutureWidgets/Assets.xcassets/AccentColor.colorset/Contents.json

@@ -0,0 +1,11 @@
+{
+  "colors" : [
+    {
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

NearFuture/Preview Content/NearFutureWidgets/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -0,0 +1,13 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

NearFuture/Preview Content/NearFutureWidgets/Assets.xcassets/WidgetBackground.colorset/Contents.json

@@ -0,0 +1,11 @@
+{
+  "colors" : [
+    {
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

NearFuture/Preview Content/NearFutureWidgets/Info.plist

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSExtension</key>
+	<dict>
+		<key>NSExtensionPointIdentifier</key>
+		<string>com.apple.widgetkit-extension</string>
+	</dict>
+</dict>
+</plist>

NearFuture/Preview Content/NearFutureWidgets/NearFutureWidgets.swift

@@ -0,0 +1,84 @@
+//
+//  NearFutureWidgets.swift
+//  NearFutureWidgets
+//
+//  Created by neon443 on 02/01/2025.
+//
+
+import WidgetKit
+import SwiftUI
+
+struct Provider: AppIntentTimelineProvider {
+    func placeholder(in context: Context) -> SimpleEntry {
+        SimpleEntry(date: Date(), configuration: ConfigurationAppIntent())
+    }
+
+    func snapshot(for configuration: ConfigurationAppIntent, in context: Context) async -> SimpleEntry {
+        SimpleEntry(date: Date(), configuration: configuration)
+    }
+    
+    func timeline(for configuration: ConfigurationAppIntent, in context: Context) async -> Timeline<SimpleEntry> {
+        var entries: [SimpleEntry] = []
+
+        // Generate a timeline consisting of five entries an hour apart, starting from the current date.
+        let currentDate = Date()
+        for hourOffset in 0 ..< 5 {
+            let entryDate = Calendar.current.date(byAdding: .hour, value: hourOffset, to: currentDate)!
+            let entry = SimpleEntry(date: entryDate, configuration: configuration)
+            entries.append(entry)
+        }
+
+        return Timeline(entries: entries, policy: .atEnd)
+    }
+}
+
+struct SimpleEntry: TimelineEntry {
+    let date: Date
+    let configuration: ConfigurationAppIntent
+}
+
+struct NearFutureWidgetsEntryView : View {
+    var entry: Provider.Entry
+
+    var body: some View {
+        VStack {
+            Text("Time:")
+            Text(entry.date, style: .time)
+
+            Text("Favorite Emoji:")
+            Text(entry.configuration.favoriteEmoji)
+        }
+    }
+}
+
+struct NearFutureWidgets: Widget {
+    let kind: String = "NearFutureWidgets"
+
+    var body: some WidgetConfiguration {
+        AppIntentConfiguration(kind: kind, intent: ConfigurationAppIntent.self, provider: Provider()) { entry in
+            NearFutureWidgetsEntryView(entry: entry)
+                .containerBackground(.fill.tertiary, for: .widget)
+        }
+    }
+}
+
+extension ConfigurationAppIntent {
+    fileprivate static var smiley: ConfigurationAppIntent {
+        let intent = ConfigurationAppIntent()
+        intent.favoriteEmoji = "😀"
+        return intent
+    }
+    
+    fileprivate static var starEyes: ConfigurationAppIntent {
+        let intent = ConfigurationAppIntent()
+        intent.favoriteEmoji = "🤩"
+        return intent
+    }
+}
+
+#Preview(as: .systemSmall) {
+    NearFutureWidgets()
+} timeline: {
+    SimpleEntry(date: .now, configuration: .smiley)
+    SimpleEntry(date: .now, configuration: .starEyes)
+}

NearFuture/Preview Content/NearFutureWidgets/NearFutureWidgetsBundle.swift

@@ -0,0 +1,17 @@
+//
+//  NearFutureWidgetsBundle.swift
+//  NearFutureWidgets
+//
+//  Created by neon443 on 02/01/2025.
+//
+
+import WidgetKit
+import SwiftUI
+
+@main
+struct NearFutureWidgetsBundle: WidgetBundle {
+    var body: some Widget {
+        NearFutureWidgets()
+        NearFutureWidgetsLiveActivity()
+    }
+}

NearFuture/Preview Content/NearFutureWidgets/NearFutureWidgetsLiveActivity.swift

@@ -0,0 +1,80 @@
+//
+//  NearFutureWidgetsLiveActivity.swift
+//  NearFutureWidgets
+//
+//  Created by neon443 on 02/01/2025.
+//
+
+import ActivityKit
+import WidgetKit
+import SwiftUI
+
+struct NearFutureWidgetsAttributes: ActivityAttributes {
+    public struct ContentState: Codable, Hashable {
+        // Dynamic stateful properties about your activity go here!
+        var emoji: String
+    }
+
+    // Fixed non-changing properties about your activity go here!
+    var name: String
+}
+
+struct NearFutureWidgetsLiveActivity: Widget {
+    var body: some WidgetConfiguration {
+        ActivityConfiguration(for: NearFutureWidgetsAttributes.self) { context in
+            // Lock screen/banner UI goes here
+            VStack {
+                Text("Hello \(context.state.emoji)")
+            }
+            .activityBackgroundTint(Color.cyan)
+            .activitySystemActionForegroundColor(Color.black)
+
+        } dynamicIsland: { context in
+            DynamicIsland {
+                // Expanded UI goes here.  Compose the expanded UI through
+                // various regions, like leading/trailing/center/bottom
+                DynamicIslandExpandedRegion(.leading) {
+                    Text("Leading")
+                }
+                DynamicIslandExpandedRegion(.trailing) {
+                    Text("Trailing")
+                }
+                DynamicIslandExpandedRegion(.bottom) {
+                    Text("Bottom \(context.state.emoji)")
+                    // more content
+                }
+            } compactLeading: {
+                Text("L")
+            } compactTrailing: {
+                Text("T \(context.state.emoji)")
+            } minimal: {
+                Text(context.state.emoji)
+            }
+            .widgetURL(URL(string: "http://www.apple.com"))
+            .keylineTint(Color.red)
+        }
+    }
+}
+
+extension NearFutureWidgetsAttributes {
+    fileprivate static var preview: NearFutureWidgetsAttributes {
+        NearFutureWidgetsAttributes(name: "World")
+    }
+}
+
+extension NearFutureWidgetsAttributes.ContentState {
+    fileprivate static var smiley: NearFutureWidgetsAttributes.ContentState {
+        NearFutureWidgetsAttributes.ContentState(emoji: "😀")
+     }
+     
+     fileprivate static var starEyes: NearFutureWidgetsAttributes.ContentState {
+         NearFutureWidgetsAttributes.ContentState(emoji: "🤩")
+     }
+}
+
+#Preview("Notification", as: .content, using: NearFutureWidgetsAttributes.preview) {
+   NearFutureWidgetsLiveActivity()
+} contentStates: {
+    NearFutureWidgetsAttributes.ContentState.smiley
+    NearFutureWidgetsAttributes.ContentState.starEyes
+}

NearFuture/Views/Archive/ArchiveView.swift

@@ -11,8 +11,7 @@ struct ArchiveView: View {
 	@ObservedObject var viewModel: EventViewModel
 	@State var showAddEvent: Bool = false
 	var filteredEvents: [Event] {
-		let filteredEvents = viewModel.events.filter({$0.complete})
-		return filteredEvents.reversed()
+		return viewModel.events.filter() {$0.complete}
 	}
 	var body: some View {
 		NavigationStack {
@@ -50,7 +49,14 @@ struct ArchiveView: View {
 		.sheet(isPresented: $showAddEvent) {
 			AddEventView(
 				viewModel: viewModel,
-				event: $viewModel.editableTemplate,
+				eventName: $viewModel.editableTemplate.name,
+				eventComplete: $viewModel.editableTemplate.complete,
+				eventCompleteDesc: $viewModel.editableTemplate.completeDesc,
+				eventSymbol: $viewModel.editableTemplate.symbol,
+				eventColor: $viewModel.editableTemplate.color.colorBind,
+				eventNotes: $viewModel.editableTemplate.notes,
+				eventDate: $viewModel.editableTemplate.date,
+				eventRecurrence: $viewModel.editableTemplate.recurrence,
 				adding: true
 			)
 		}

NearFuture/Views/Events/AddEventView.swift

@@ -11,11 +11,18 @@ import SFSymbolsPicker
 struct AddEventView: View {
 	@ObservedObject var viewModel: EventViewModel
 	
-	@Binding var event: Event
+	@Binding var eventName: String
+	@Binding var eventComplete: Bool
+	@Binding var eventCompleteDesc: String
+	@Binding var eventSymbol: String
+	@Binding var eventColor: Color
+	@Binding var eventNotes: String
+	@Binding var eventDate: Date
+	@Binding var eventRecurrence: Event.RecurrenceType
 	
 	@State var adding: Bool
 	@State var showNeedsNameAlert: Bool = false
-	@State var isSymbolPickerPresented: Bool = false
+	@State var isSymbolPickerPresented = false
 	
 	@State private var bye: Bool = false
 	
@@ -32,7 +39,7 @@ struct AddEventView: View {
 				backgroundGradient
 			}
 			NavigationStack {
-				List {
+				Form {
 					Section(
 						header:
 							Text("Event Details")
@@ -44,49 +51,66 @@ struct AddEventView: View {
 							Button() {
 								isSymbolPickerPresented.toggle()
 							} label: {
-								Image(systemName: event.symbol)
+								Image(systemName: eventSymbol)
 									.resizable()
 									.scaledToFit()
 									.frame(width: 20, height: 20)
-									.foregroundStyle(event.color.color)
+									.foregroundStyle(eventColor)
 							}
 							.frame(width: 20)
 							.buttonStyle(.borderless)
 							.sheet(isPresented: $isSymbolPickerPresented) {
 								SymbolsPicker(
-									selection: $event.symbol,
+									selection: $eventSymbol,
 									title: "Choose a Symbol",
 									searchLabel: "Search...",
 									autoDismiss: true)
 								.presentationDetents([.medium])
+								.apply {
+									if #available(iOS 16.4, *) {
+										$0.presentationBackground(.ultraThinMaterial)
+									}
+								}
+							}
+							ColorPicker("", selection: $eventColor, supportsOpacity: false)
+								.fixedSize()
+							ZStack {
+								TextField("Event Name", text: $eventName)
+									.textFieldStyle(RoundedBorderTextFieldStyle())
+									.padding(.trailing, eventName.isEmpty ? 0 : 30)
+									.animation(.spring, value: eventName)
+									.focused($focusedField, equals: Field.Name)
+									.submitLabel(.next)
+									.onSubmit {
+										focusedField = .Notes
+									}
+								MagicClearButton(text: $eventName)
 							}
-							TextField("Event Name", text: $event.name)
-								.textFieldStyle(.roundedBorder)
 						}
 						
 						// dscription
 						ZStack {
-							TextField("Event Notes", text: $event.notes)
+							TextField("Event Notes", text: $eventNotes)
 								.textFieldStyle(RoundedBorderTextFieldStyle())
-								.padding(.trailing, event.notes.isEmpty ? 0 : 30)
-								.animation(.spring, value: event.notes)
+								.padding(.trailing, eventNotes.isEmpty ? 0 : 30)
+								.animation(.spring, value: eventNotes)
 								.focused($focusedField, equals: Field.Notes)
 								.submitLabel(.done)
 								.onSubmit {
 									focusedField = nil
 								}
-							//							MagicClearButton(text: $eventNotes)
+							MagicClearButton(text: $eventNotes)
 						}
 						
 						
 						// date picker
 						HStack {
 							Spacer()
-							DatePicker("", selection: $event.date, displayedComponents: .date)
-								.datePickerStyle(.wheel)
+							DatePicker("", selection: $eventDate, displayedComponents: .date)
+								.datePickerStyle(WheelDatePickerStyle())
 							Spacer()
 							Button() {
-								event.date = Date()
+								eventDate = Date()
 							} label: {
 								Image(systemName: "arrow.uturn.left")
 									.resizable()
@@ -98,12 +122,12 @@ struct AddEventView: View {
 						
 						DatePicker(
 							"",
-							selection: $event.date,
+							selection: $eventDate,
 							displayedComponents: .hourAndMinute
 						)
 						
 						// re-ocurrence Picker
-						Picker("Recurrence", selection: $event.recurrence) {
+						Picker("Recurrence", selection: $eventRecurrence) {
 							ForEach(Event.RecurrenceType.allCases, id: \.self) { recurrence in
 								Text(recurrence.rawValue.capitalized)
 							}
@@ -111,12 +135,13 @@ struct AddEventView: View {
 						.pickerStyle(SegmentedPickerStyle())
 						Text(
 							describeOccurrence(
-								date: event.date,
-								recurrence: event.recurrence
+								date: eventDate,
+								recurrence: eventRecurrence
 							)
 						)
 					}
 				}
+				.scrollContentBackground(.hidden)
 				.navigationTitle("\(adding ? "Add Event" : "")")
 				.navigationBarTitleDisplayMode(.inline)
 				.toolbar {
@@ -126,19 +151,28 @@ struct AddEventView: View {
 								resetAddEventView()
 								dismiss()
 							} label: {
-								Image(systemName: "xmark")
+								Image(systemName: "xmark.circle.fill")
+									.symbolRenderingMode(.hierarchical)
 									.resizable()
 									.scaledToFit()
 									.frame(width: 30)
-									.tint(.one)
 							}
 						}
 					}
-					ToolbarItem() {
+					ToolbarItem(placement: .topBarTrailing) {
 						if adding {
 							Button {
 								viewModel.addEvent(
-									newEvent: event
+									newEvent: Event(
+										name: eventName,
+										complete: eventComplete,
+										completeDesc: eventCompleteDesc,
+										symbol: eventSymbol,
+										color: ColorCodable(eventColor),
+										notes: eventNotes,
+										date: eventDate,
+										recurrence: eventRecurrence
+									)
 								)
 								bye.toggle()
 								resetAddEventView()
@@ -148,15 +182,14 @@ struct AddEventView: View {
 									.cornerRadius(10)
 									.buttonStyle(BorderedProminentButtonStyle())
 							}
-							.tint(.accent)
 							.apply {
 								if #available(iOS 17, *) {
 									$0.sensoryFeedback(.success, trigger: bye)
 								}
 							}
-							.disabled(event.name.isEmpty)
+							.disabled(eventName.isEmpty)
 							.onTapGesture {
-								if event.name.isEmpty {
+								if eventName.isEmpty {
 									showNeedsNameAlert.toggle()
 								}
 							}
@@ -168,18 +201,36 @@ struct AddEventView: View {
 							} message: {
 								Text("Give your Event a name before saving.")
 							}
+							if eventName.isEmpty {
+								HStack {
+									Image(systemName: "exclamationmark")
+										.foregroundStyle(.red)
+									Text("Give your event a name.")
+								}
+							}
 						}
 					}
 				}
 			}
-			.scrollContentBackground(.hidden)
-			.scrollContentBackground(.hidden)
 			.presentationDragIndicator(.visible)
+			.scrollContentBackground(.hidden)
+		}
+		.apply {
+			if #available(iOS 16.4, *) {
+				$0.presentationBackground(.ultraThinMaterial)
+			}
 		}
 	}
 	func resetAddEventView() {
 		//reset addeventView
-		event = viewModel.template
+		eventName = viewModel.template.name
+		eventComplete = viewModel.template.complete
+		eventCompleteDesc = viewModel.template.completeDesc
+		eventSymbol = viewModel.template.symbol
+		eventColor = randomColor()
+		eventNotes = viewModel.template.notes
+		eventDate = viewModel.template.date
+		eventRecurrence = viewModel.template.recurrence
 		dismiss()
 	}
 	
@@ -192,7 +243,14 @@ struct AddEventView: View {
 		.sheet(isPresented: .constant(true)) {
 			AddEventView(
 				viewModel: vm,
-				event: .constant(vm.template),
+				eventName: .constant(vm.template.notes),
+				eventComplete: .constant(vm.template.complete),
+				eventCompleteDesc: .constant(vm.template.completeDesc),
+				eventSymbol: .constant(vm.template.symbol),
+				eventColor: .constant(vm.template.color.color),
+				eventNotes: .constant(vm.template.notes),
+				eventDate: .constant(vm.template.date),
+				eventRecurrence: .constant(vm.template.recurrence),
 				adding: true
 			)
 		}

NearFuture/Views/Events/EditEventView.swift

@@ -28,7 +28,14 @@ struct EditEventView: View {
 	var body: some View {
 		AddEventView(
 			viewModel: viewModel,
-			event: $event,
+			eventName: $event.name,
+			eventComplete: $event.complete,
+			eventCompleteDesc: $event.completeDesc,
+			eventSymbol: $event.symbol,
+			eventColor: $event.color.colorBind,
+			eventNotes: $event.notes,
+			eventDate: $event.date,
+			eventRecurrence: $event.recurrence,
 			adding: false //bc we editing existing event
 		)
 		.navigationTitle("Edit Event")

NearFuture/Views/Home/ContentView.swift

@@ -27,10 +27,10 @@ struct ContentView: View {
 	var body: some View {
 		TabView(selection: $selection) {
 			HomeView(viewModel: viewModel, settingsModel: settingsModel)
-				.tabItem {
-					Label("Home", systemImage: "house")
-				}
-				.tag(Tab.home)
+			.tabItem {
+				Label("Home", systemImage: "house")
+			}
+			.tag(Tab.home)
 			ArchiveView(viewModel: viewModel)
 				.tabItem() {
 					Label("Archive", systemImage: "tray.full")
@@ -64,3 +64,33 @@ struct ContentView: View {
 		settingsModel: dummySettingsViewModel()
 	)
 }
+
+extension View {
+	var backgroundGradient: some View {
+		return LinearGradient(
+			gradient: Gradient(colors: [.bgTop, .two]),
+			startPoint: .top,
+			endPoint: .bottom
+		)
+		.ignoresSafeArea(.all)
+	}
+	
+	func apply<V: View>(@ViewBuilder _ block: (Self) -> V) -> V { block(self) }
+}
+
+extension AnyTransition {
+	static var moveAndFade: AnyTransition {
+		.asymmetric(
+			insertion: .move(edge: .leading),
+			removal: .move(edge: .trailing)
+		)
+		.combined(with: .opacity)
+	}
+	static var moveAndFadeReversed: AnyTransition {
+		.asymmetric(
+			insertion: .move(edge: .trailing),
+			removal: .move(edge: .leading)
+		)
+		.combined(with: .opacity)
+	}
+}

NearFuture/Views/Home/EventListView.swift

@@ -76,7 +76,6 @@ struct EventListView: View {
 						Text("\(daysUntilEvent(event.date).long)")
 							.font(.subheadline)
 							.foregroundStyle(event.date.timeIntervalSinceNow < 0 ? .red : .one)
-							.multilineTextAlignment(.trailing)
 					}
 					Button() {
 						withAnimation {
@@ -120,6 +119,7 @@ struct EventListView: View {
 				}
 				.transition(.opacity)
 				.padding(.vertical, 5)
+				.background(.ultraThinMaterial)
 				.overlay(
 					RoundedRectangle(cornerRadius: 10)
 						.stroke(

NearFuture/Views/Home/HomeView.swift

@@ -5,15 +5,20 @@
 //  Created by neon443 on 12/05/2025.
 //
 
-import SwiftUI
-import AppIntents
+import SwiftUI;import AppIntents
 
 struct HomeView: View {
 	@ObservedObject var viewModel: EventViewModel
 	@ObservedObject var settingsModel: SettingsViewModel
-	
-	@State private var event: Event = dummyEventViewModel().template
-	@State private var showingAddEventView: Bool = false
+	@State private var eventName = ""
+	@State private var eventComplete = false
+	@State private var eventCompleteDesc = ""
+	@State private var eventSymbol = "star"
+	@State private var eventColor: Color = randomColor()
+	@State private var eventNotes = ""
+	@State private var eventDate = Date()
+	@State private var eventRecurrence: Event.RecurrenceType = .none
+	@State private var showingAddEventView = false
 	@State private var searchInput: String = ""
 	@Environment(\.colorScheme) var appearance
 	var darkMode: Bool {
@@ -42,18 +47,36 @@ struct HomeView: View {
 			ZStack {
 				backgroundGradient
 				VStack {
+					ZStack {
+						TextField(
+							"\(Image(systemName: "magnifyingglass")) Search",
+							text: $searchInput
+						)
+						.padding(.trailing, searchInput.isEmpty ? 0 : 30)
+						.animation(.spring, value: searchInput)
+						.textFieldStyle(RoundedBorderTextFieldStyle())
+						.submitLabel(.done)
+						.focused($focusedField, equals: Field.Search)
+						.onSubmit {
+							focusedField = nil
+						}
+						MagicClearButton(text: $searchInput)
+							.onTapGesture {
+								focusedField = nil
+							}
+					}
+					.padding(.horizontal)
+					
 					if filteredEvents.isEmpty && !searchInput.isEmpty {
 						HelpView(searchInput: $searchInput, focusedField: focusedField)
 					} else {
 						ScrollView {
-//							LazyVStack {
-								ForEach(filteredEvents) { event in
-									EventListView(viewModel: viewModel, event: event)
-										.transition(.moveAndFade)
-										.id(event.complete)
-								}
-								.padding(.horizontal)
-//							}
+							ForEach(filteredEvents) { event in
+								EventListView(viewModel: viewModel, event: event)
+									.transition(.moveAndFade)
+									.id(event.complete)
+							}
+							.padding(.horizontal)
 							if filteredEvents.isEmpty {
 								HelpView(
 									searchInput: $searchInput,
@@ -65,7 +88,6 @@ struct HomeView: View {
 						.animation(.default, value: filteredEvents)
 					}
 				}
-				.searchable(text: $searchInput)
 				.navigationTitle("Near Future")
 				.apply {
 					if #available(iOS 17, *) {
@@ -77,7 +99,14 @@ struct HomeView: View {
 				.sheet(isPresented: $showingAddEventView) {
 					AddEventView(
 						viewModel: viewModel,
-						event: $event,
+						eventName: $eventName,
+						eventComplete: $eventComplete,
+						eventCompleteDesc: $eventCompleteDesc,
+						eventSymbol: $eventSymbol,
+						eventColor: $eventColor,
+						eventNotes: $eventNotes,
+						eventDate: $eventDate,
+						eventRecurrence: $eventRecurrence,
 						adding: true //adding event
 					)
 				}

NearFuture/Views/Misc/Buttons.swift

@@ -34,12 +34,17 @@ struct AddEventButton: View {
 		Button() {
 			showingAddEventView.toggle()
 		} label: {
-			Image(systemName: "plus")
-				.resizable()
-				.scaledToFit()
-				.frame(width: 15)
-				.bold()
-				.foregroundStyle(.one)
+			ZStack {
+				Circle()
+					.frame(width: 33)
+					.foregroundStyle(.one)
+				Image(systemName: "plus")
+					.resizable()
+					.scaledToFit()
+					.frame(width: 15)
+					.bold()
+					.foregroundStyle(.two)
+			}
 		}
 	}
 }

NearFuture/Views/Settings/ExportView.swift

@@ -12,11 +12,7 @@ struct ExportView: View {
 	var body: some View {
 		List {
 			Button() {
-				#if canImport(UIKit)
 				UIPasteboard.general.string = viewModel.exportEvents()
-				#else
-				NSPasteboard.general.setString(viewModel.exportEvents(), forType: .string)
-				#endif
 			} label: {
 				Label("Copy Events", systemImage: "document.on.clipboard")
 			}

NearFuture/Views/Settings/ImportView.swift

@@ -15,117 +15,47 @@ struct ImportView: View {
 	@State private var text: String = "Ready..."
 	@State private var fgColor: Color = .yellow
 	
-	@State private var showAlert: Bool = false
-	
-	@State private var replaceCurrentEvents: Bool = false
-	
-	fileprivate func importEvents() {
-		do throws {
-			try viewModel.importEvents(importStr, replace: replaceCurrentEvents)
-			withAnimation {
-				image = "checkmark.circle.fill"
-				text = "Complete"
-				fgColor = .green
-			}
-		} catch importError.invalidB64 {
-			withAnimation {
-				image = "xmark.app.fill"
-				text = "Invalid base64 input."
-				fgColor = .red
-			}
-		} catch {
-			withAnimation {
-				image = "xmark.app.fill"
-				text = error.localizedDescription
-				fgColor = .red
-			}
-		}
-	}
-	
 	var body: some View {
-		ZStack(alignment: .center) {
-			List {
-				Section("Status") {
-					Label(text, systemImage: image)
-						.contentTransition(.numericText())
-						.foregroundStyle(fgColor)
-				}
-				TextField("", text: $importStr)
-				Button() {
+		List {
+			Section("Status") {
+				Label(text, systemImage: image)
+					.contentTransition(.numericText())
+					.foregroundStyle(fgColor)
+			}
+			TextField("", text: $importStr)
+			Button() {
+				do throws {
+					try viewModel.importEvents(importStr)
 					withAnimation {
-						showAlert.toggle()
+						image = "checkmark.circle.fill"
+						text = "Complete"
+						fgColor = .green
 					}
-				} label: {
-					Label("Import", systemImage: "tray.and.arrow.down.fill")
-				}
-				.disabled(importStr.isEmpty)
-				.onAppear() {
-					importStr = ""
-					image = "clock.fill"
-					text = "Ready..."
-					fgColor = .yellow
-				}
-			}
-			.blur(radius: showAlert ? 2 : 0)
-			Group {
-				Rectangle()
-					.frame(maxWidth: .infinity, maxHeight: .infinity)
-					.foregroundStyle(replaceCurrentEvents ? .red.opacity(0.25) : .black.opacity(0.2))
-					.animation(.default, value: replaceCurrentEvents)
-					.ignoresSafeArea()
-				ZStack {
-					Rectangle()
-						.clipShape(RoundedRectangle(cornerRadius: 25))
-					VStack(alignment: .center) {
-						Text("Are you sure?")
-							.font(.largeTitle)
-							.bold()
-							.foregroundStyle(replaceCurrentEvents ? .red : .two)
-							.animation(.default, value: replaceCurrentEvents)
-						Text("This will replace your current events!")
-							.lineLimit(nil)
-							.multilineTextAlignment(.center)
-							.opacity(replaceCurrentEvents ? 1 : 0)
-							.animation(.default, value: replaceCurrentEvents)
-							.foregroundStyle(.two)
-						Toggle("Replace Events", isOn: $replaceCurrentEvents)
-							.foregroundStyle(.two)
-						Spacer()
-						HStack {
-							Button() {
-								withAnimation {
-									showAlert.toggle()
-								}
-								importEvents()
-							} label: {
-								Text("cancel")
-									.font(.title2)
-									.bold()
-							}
-							.buttonStyle(BorderedProminentButtonStyle())
-							
-							Spacer()
-							
-							Button() {
-								withAnimation {
-									showAlert.toggle()
-								}
-								importEvents()
-							} label: {
-								Text("yes")
-									.font(.title2)
-									.bold()
-							}
-							.buttonStyle(BorderedProminentButtonStyle())
-						}
-						.padding()
+				} catch importError.invalidB64 {
+					withAnimation {
+						image = "xmark.app.fill"
+						text = "Invalid base64 input."
+						fgColor = .red
+					}
+				} catch {
+					withAnimation {
+						image = "xmark.app.fill"
+						text = error.localizedDescription
+						fgColor = .red
 					}
-					.padding()
 				}
-				.frame(maxWidth: 250, maxHeight: 250)
+			} label: {
+				Label("Import", systemImage: "tray.and.arrow.down.fill")
+			}
+			.disabled(importStr.isEmpty)
+			.onAppear() {
+				importStr = ""
+				image = "clock.fill"
+				text = "Ready..."
+				fgColor = .yellow
 			}
-			.opacity(showAlert ? 1 : 0)
 		}
+
 	}
 }
 

NearFuture/Views/Settings/SettingsView.swift

@@ -11,10 +11,36 @@ struct SettingsView: View {
 	@ObservedObject var viewModel: EventViewModel
 	@ObservedObject var settingsModel: SettingsViewModel
 	
+	@State private var hasUbiquitous: Bool = false
+	@State private var lastSyncWasSuccessful: Bool = false
+	@State private var lastSyncWasNormalAgo: Bool = false
+	@State private var localCountEqualToiCloud: Bool = false
+	@State private var icloudCountEqualToLocal: Bool = false
 	@State private var importStr: String = ""
 	
+	func updateStatus() {
+		let vm = viewModel
+		hasUbiquitous = vm.hasUbiquitousKeyValueStore()
+		lastSyncWasSuccessful = vm.syncStatus.contains("Success")
+		lastSyncWasNormalAgo = vm.lastSync?.timeIntervalSinceNow.isNormal ?? false
+		localCountEqualToiCloud = vm.localEventCount == vm.icloudEventCount
+		icloudCountEqualToLocal = vm.icloudEventCount == vm.localEventCount
+	}
+	
+	var iCloudStatusColor: Color {
+		let allTrue = hasUbiquitous && lastSyncWasSuccessful && lastSyncWasNormalAgo && localCountEqualToiCloud && icloudCountEqualToLocal
+		let someTrue = hasUbiquitous || lastSyncWasSuccessful || lastSyncWasNormalAgo || localCountEqualToiCloud || icloudCountEqualToLocal
+		
+		if allTrue {
+			return .green
+		} else if someTrue {
+			return .orange
+		} else {
+			return .red
+		}
+	}
+	
 	func changeIcon(to: String) {
-		#if canImport(UIKit)
 		guard UIApplication.shared.supportsAlternateIcons else {
 			print("doesnt tsupport alternate icons")
 			return
@@ -28,7 +54,6 @@ struct SettingsView: View {
 		UIApplication.shared.setAlternateIconName(to) { error in
 			print(error as Any)
 		}
-		#endif
 	}
 	
 	var body: some View {
@@ -39,11 +64,7 @@ struct SettingsView: View {
 					ScrollView(.horizontal) {
 						HStack {
 							ForEach(settingsModel.accentChoices, id: \.self) { choice in
-								#if canImport(UIKit)
 								let color = Color(uiColor: UIColor(named: "uiColors/\(choice)")!)
-								#else
-								let color = Color(nsColor: NSColor(named: "uiColors/\(choice)")!)
-								#endif
 								ZStack {
 									Button() {
 										settingsModel.changeTint(to: choice)
@@ -73,16 +94,13 @@ struct SettingsView: View {
 					NavigationLink() {
 						List {
 							if !settingsModel.notifsGranted {
-								Text("\(Image(systemName: "xmark")) Notifications disabled for Near Future")
-									.foregroundStyle(.red)
 								Button("Request Notifications") {
-									Task.detached {
-										let requestNotifsResult = await requestNotifs()
-										await MainActor.run {
-											settingsModel.notifsGranted = requestNotifsResult
-										}
+									Task {
+										settingsModel.notifsGranted = await requestNotifs()
 									}
 								}
+								Text("\(Image(systemName: "xmark")) Notifications disabled for Near Future")
+									.foregroundStyle(.red)
 							} else {
 								Text("\(Image(systemName: "checkmark")) Notifications enabled for Near Future")
 									.foregroundStyle(.green)
@@ -95,7 +113,13 @@ struct SettingsView: View {
 					NavigationLink() {
 						iCloudSettingsView(
 							viewModel: viewModel,
-							settingsModel: settingsModel
+							settingsModel: settingsModel,
+							hasUbiquitous: $hasUbiquitous,
+							lastSyncWasSuccessful: $lastSyncWasSuccessful,
+							lastSyncWasNormalAgo: $lastSyncWasNormalAgo,
+							localCountEqualToiCloud: $localCountEqualToiCloud,
+							icloudCountEqualToLocal: $icloudCountEqualToLocal,
+							updateStatus: updateStatus
 						)
 					} label: {
 						HStack {
@@ -104,12 +128,12 @@ struct SettingsView: View {
 							Spacer()
 							Circle()
 								.frame(width: 20, height: 20)
-								.foregroundStyle(viewModel.iCloudStatusColor)
+								.foregroundStyle(iCloudStatusColor)
 						}
 					}
 					.onAppear {
 						viewModel.sync()
-						viewModel.updateiCStatus()
+						updateStatus()
 					}
 					NavigationLink() {
 						ImportView(viewModel: viewModel, importStr: $importStr)
@@ -156,13 +180,11 @@ struct SettingsView: View {
 			.scrollContentBackground(.hidden)
 			.navigationTitle("Settings")
 			.apply {
-				#if canImport(UIKit)
 				if #available(iOS 17, *) {
 					$0.toolbarTitleDisplayMode(.inlineLarge)
 				} else {
 					$0.navigationBarTitleDisplayMode(.inline)
 				}
-				#endif
 			}
 		}
 	}

NearFuture/Views/Settings/WhatsNewView.swift

@@ -16,7 +16,7 @@ struct WhatsNewView: View {
 		var title: String
 		var subtitle: String
 	}
-	@State var bye: Bool = false
+	@State var bye = false
 	var whatsNewChunks: [WhatsNewChunk] {
 		return [
 			WhatsNewChunk(
@@ -92,6 +92,11 @@ struct WhatsNewView: View {
 		}
 		.scrollContentBackground(.hidden)
 		.presentationDragIndicator(.visible)
+		.apply {
+			if #available(iOS 16.4, *) {
+				$0.presentationBackground(.ultraThinMaterial)
+			}
+		}
 		.onDisappear {
 			settingsModel.settings.prevAppVersion = getVersion()+getBuildID()
 			settingsModel.saveSettings()

NearFuture/Views/Settings/iCloudSettingsView.swift

@@ -13,13 +13,13 @@ struct iCloudSettingsView: View {
 	@State var showPushAlert: Bool = false
 	@State var showPullAlert: Bool = false
 	
-//	@Binding var hasUbiquitous: Bool
-//	@Binding var lastSyncWasSuccessful: Bool
-//	@Binding var lastSyncWasNormalAgo: Bool
-//	@Binding var localCountEqualToiCloud: Bool
-//	@Binding var icloudCountEqualToLocal: Bool
-//	
-//	var updateStatus: () -> Void
+	@Binding var hasUbiquitous: Bool
+	@Binding var lastSyncWasSuccessful: Bool
+	@Binding var lastSyncWasNormalAgo: Bool
+	@Binding var localCountEqualToiCloud: Bool
+	@Binding var icloudCountEqualToLocal: Bool
+	
+	var updateStatus: () -> Void
 	
 	var body: some View {
 		ZStack {
@@ -55,7 +55,7 @@ struct iCloudSettingsView: View {
 									Button("OK", role: .destructive) {
 										viewModel.replaceiCloudWithLocalData()
 										viewModel.sync()
-										viewModel.updateiCStatus()
+										updateStatus()
 									}
 									Button("Cancel", role: .cancel) {}
 								} message: {
@@ -64,7 +64,7 @@ struct iCloudSettingsView: View {
 								
 								Button() {
 									viewModel.sync()
-									viewModel.updateiCStatus()
+									updateStatus()
 								} label: {
 									Image(systemName: "arrow.triangle.2.circlepath")
 										.resizable()
@@ -87,7 +87,7 @@ struct iCloudSettingsView: View {
 									Button("OK", role: .destructive) {
 										viewModel.replaceLocalWithiCloudData()
 										viewModel.sync()
-										viewModel.updateiCStatus()
+										updateStatus()
 									}
 									Button("Cancel", role: .cancel) {}
 								} message: {
@@ -112,23 +112,23 @@ struct iCloudSettingsView: View {
 					.listRowSeparator(.hidden)
 					.onAppear {
 						viewModel.sync()
-						viewModel.updateiCStatus()
+						updateStatus()
 					}
 					
 					HStack {
 						Circle()
 							.frame(width: 20, height: 20)
-							.foregroundStyle(viewModel.hasUbiquitous ? .green : .red)
+							.foregroundStyle(hasUbiquitous ? .green : .red)
 						Text("iCloud")
 						Spacer()
-						Text("\(viewModel.hasUbiquitous ? "" : "Not ")Working")
+						Text("\(hasUbiquitous ? "" : "Not ")Working")
 							.bold()
 					}
 					
 					HStack {
 						Circle()
 							.frame(width: 20, height: 20)
-							.foregroundStyle(viewModel.lastSyncWasSuccessful ? .green : .red)
+							.foregroundStyle(lastSyncWasSuccessful ? .green : .red)
 						Text("Sync Status")
 						Spacer()
 						Text("\(viewModel.syncStatus)")
@@ -138,7 +138,7 @@ struct iCloudSettingsView: View {
 					HStack {
 						Circle()
 							.frame(width: 20, height: 20)
-							.foregroundStyle(viewModel.lastSyncWasNormalAgo ? .green : .red)
+							.foregroundStyle(lastSyncWasNormalAgo ? .green : .red)
 						Text("Last Sync")
 						Spacer()
 						Text("\(viewModel.lastSync?.formatted(date: .long, time: .standard) ?? "Never")")
@@ -148,7 +148,7 @@ struct iCloudSettingsView: View {
 					HStack {
 						Circle()
 							.frame(width: 20, height: 20)
-							.foregroundStyle(viewModel.localCountEqualToiCloud ? .green : .red)
+							.foregroundStyle(localCountEqualToiCloud ? .green : .red)
 						Text("Local Events")
 						Spacer()
 						Text("\(viewModel.localEventCount)")
@@ -158,7 +158,7 @@ struct iCloudSettingsView: View {
 					HStack {
 						Circle()
 							.frame(width: 20, height: 20)
-							.foregroundStyle(viewModel.icloudCountEqualToLocal ? .green : .red)
+							.foregroundStyle(icloudCountEqualToLocal ? .green : .red)
 						Text("Events in iCloud")
 						Spacer()
 						Text("\(viewModel.icloudEventCount)")
@@ -172,10 +172,11 @@ struct iCloudSettingsView: View {
 			}
 			.refreshable {
 				viewModel.sync()
-				viewModel.updateiCStatus()
+				updateStatus()
 			}
 			.scrollContentBackground(.hidden)
 			.navigationTitle("iCloud")
+			.navigationBarTitleDisplayMode(.inline)
 		}
 	}
 }
@@ -183,6 +184,12 @@ struct iCloudSettingsView: View {
 #Preview("iCloudSettingsView") {
 	iCloudSettingsView(
 		viewModel: dummyEventViewModel(),
-		settingsModel: dummySettingsViewModel()
+		settingsModel: dummySettingsViewModel(),
+		hasUbiquitous: .constant(true),
+		lastSyncWasSuccessful: .constant(true),
+		lastSyncWasNormalAgo: .constant(true),
+		localCountEqualToiCloud: .constant(true),
+		icloudCountEqualToLocal: .constant(true),
+		updateStatus: {}
 	)
 }

NearFutureTests/NearFutureTests.swift

@@ -0,0 +1,16 @@
+//
+//  NearFutureTests.swift
+//  NearFutureTests
+//
+//  Created by neon443 on 26/03/2025.
+//
+
+import Testing
+
+struct NearFutureTests {
+
+    @Test func example() async throws {
+        // Write your test here and use APIs like `#expect(...)` to check expected conditions.
+    }
+
+}

README.md

@@ -11,18 +11,17 @@
 - [x] Event colors
 - [x] Recurrence
 - [x] Search
-- [x] Notifications
-- [ ] Mac App
+- [ ] Notifications
 - [ ] Apple Watch App
 - [x] Home Screen Widgets
 - [ ] Lock Screen Widgets
 - [ ] Later Box
 - [ ] Sort by
 - [ ] Reorder Events
-- [x] Archive
+- [ ] Archive
 - [ ] Collaboration
 - [ ] Autocomplete tasks
-- [x] Settings
+- [ ] Settings
 
 ## Features
 - **Event Creation**: Create events with a name, description, date, recurrence, and an icon

Resources/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -31,70 +31,54 @@
       "size" : "1024x1024"
     },
     {
-      "filename" : "MacNearFutureIcon16.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "16x16"
     },
     {
-      "filename" : "MacNearFutureIcon32.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "16x16"
     },
     {
-      "filename" : "MacNearFutureIcon32.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "32x32"
     },
     {
-      "filename" : "MacNearFutureIcon64.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "32x32"
     },
     {
-      "filename" : "MacNearFutureIcon128.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "128x128"
     },
     {
-      "filename" : "MacNearFutureIcon256.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "128x128"
     },
     {
-      "filename" : "MacNearFutureIcon256.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "256x256"
     },
     {
-      "filename" : "MacNearFutureIcon512.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "256x256"
     },
     {
-      "filename" : "MacNearFutureIcon512.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "512x512"
     },
     {
-      "filename" : "MacNearFutureIcon.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "512x512"
-    },
-    {
-      "filename" : "NearFutureIcon.png",
-      "idiom" : "universal",
-      "platform" : "watchos",
-      "size" : "1024x1024"
     }
   ],
   "info" : {

Resources/Assets.xcassets/bloo.appiconset/Contents.json

@@ -29,12 +29,6 @@
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"
-    },
-    {
-      "filename" : "bloo.png",
-      "idiom" : "universal",
-      "platform" : "watchos",
-      "size" : "1024x1024"
     }
   ],
   "info" : {

Resources/Assets.xcassets/blue.appiconset/Contents.json

@@ -29,12 +29,6 @@
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"
-    },
-    {
-      "filename" : "blue.png",
-      "idiom" : "universal",
-      "platform" : "watchos",
-      "size" : "1024x1024"
     }
   ],
   "info" : {

Resources/Assets.xcassets/green.appiconset/Contents.json

@@ -29,12 +29,6 @@
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"
-    },
-    {
-      "filename" : "green.png",
-      "idiom" : "universal",
-      "platform" : "watchos",
-      "size" : "1024x1024"
     }
   ],
   "info" : {

Resources/Assets.xcassets/pink.appiconset/Contents.json

@@ -29,12 +29,6 @@
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"
-    },
-    {
-      "filename" : "pink.png",
-      "idiom" : "universal",
-      "platform" : "watchos",
-      "size" : "1024x1024"
     }
   ],
   "info" : {

Resources/Assets.xcassets/purple.appiconset/Contents.json

@@ -29,12 +29,6 @@
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"
-    },
-    {
-      "filename" : "purple.png",
-      "idiom" : "universal",
-      "platform" : "watchos",
-      "size" : "1024x1024"
     }
   ],
   "info" : {

Resources/Assets.xcassets/red.appiconset/Contents.json

@@ -29,12 +29,6 @@
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"
-    },
-    {
-      "filename" : "red.png",
-      "idiom" : "universal",
-      "platform" : "watchos",
-      "size" : "1024x1024"
     }
   ],
   "info" : {

Resources/Assets.xcassets/yellow.appiconset/Contents.json

@@ -29,12 +29,6 @@
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"
-    },
-    {
-      "filename" : "yellow.png",
-      "idiom" : "universal",
-      "platform" : "watchos",
-      "size" : "1024x1024"
     }
   ],
   "info" : {

Resources/NearFuture.icon/icon.json

@@ -1,50 +0,0 @@
-{
-  "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"
-  }
-}

Shared/Extensions.swift

@@ -1,39 +0,0 @@
-//
-//  Extension.swift
-//  NearFuture
-//
-//  Created by neon443 on 21/05/2025.
-//
-
-import Foundation
-import SwiftUI
-
-extension View {
-	var backgroundGradient: some View {
-		return LinearGradient(
-			gradient: Gradient(colors: [.bgTop, .two]),
-			startPoint: .top,
-			endPoint: .bottom
-		)
-		.ignoresSafeArea(.all)
-	}
-	
-	func apply<V: View>(@ViewBuilder _ block: (Self) -> V) -> V { block(self) }
-}
-
-extension AnyTransition {
-	static var moveAndFade: AnyTransition {
-		.asymmetric(
-			insertion: .move(edge: .leading),
-			removal: .move(edge: .trailing)
-		)
-		.combined(with: .opacity)
-	}
-	static var moveAndFadeReversed: AnyTransition {
-		.asymmetric(
-			insertion: .move(edge: .trailing),
-			removal: .move(edge: .leading)
-		)
-		.combined(with: .opacity)
-	}
-}

Shared/Model/AccentIcon.swift

@@ -1,47 +0,0 @@
-//
-//  AccentIcon.swift
-//  NearFuture
-//
-//  Created by neon443 on 13/06/2025.
-//
-
-import Foundation
-import SwiftUI
-#if canImport(AppKit)
-import AppKit
-#endif
-
-
-class AccentIcon {
-#if canImport(UIKit)
-	var icon: UIImage
-#elseif canImport(AppKit)
-	var icon: NSImage
-#endif
-	var color: Color
-	var name: String
-	
-	init(_ colorName: String) {
-#if canImport(UIKit)
-		self.icon = UIImage(named: "AppIcon")!
-		self.color = Color(uiColor: UIColor(named: "uiColors/\(colorName)")!)
-#elseif canImport(AppKit)
-		self.icon = NSImage(imageLiteralResourceName: "AppIcon")
-		self.color = Color(nsColor: NSColor(named: "uiColors/\(colorName)")!)
-#endif
-		
-		self.name = colorName
-		
-		if colorName != "orange" {
-			setSelfIcon(to: colorName)
-		}
-	}
-	
-	func setSelfIcon(to name: String) {
-#if canImport(UIKit)
-		self.icon = UIImage(named: name)!
-#elseif canImport(AppKit)
-		self.icon = NSImage(imageLiteralResourceName: name)
-#endif
-	}
-}

Shared/Model/Settings.swift

@@ -1,95 +0,0 @@
-//
-//  Settings.swift
-//  MacNearFuture
-//
-//  Created by neon443 on 21/05/2025.
-//
-
-import Foundation
-import SwiftUI
-#if canImport(AppKit)
-import AppKit
-#endif
-
-struct NFSettings: Codable, Equatable {
-	var showCompletedInHome: Bool = false
-	var tint: ColorCodable = ColorCodable(.accentColor)
-	var showWhatsNew: Bool = true
-	var prevAppVersion: String = getVersion()+getBuildID()
-}
-
-class SettingsViewModel: ObservableObject {
-	@Published var settings: NFSettings = NFSettings()
-	
-	@Published var notifsGranted: Bool = false
-	
-	@Published var colorChoices: [AccentIcon] = []
-	
-	let accentChoices: [String] = [
-		"red",
-		"orange",
-		"yellow",
-		"green",
-		"blue",
-		"bloo",
-		"purple",
-		"pink"
-	]
-	
-	@Published var device: (sf: String, label: String)
-	
-	init(load: Bool = true) {
-		self.device = getDevice()
-		if load {
-			loadSettings()
-			Task.detached {
-				let requestResult = await requestNotifs()
-				await MainActor.run {
-					self.notifsGranted = requestResult
-				}
-			}
-		}
-	}
-	
-	func changeTint(to: String) {
-#if canImport(UIKit)
-		if let uicolor = UIColor(named: "uiColors/\(to)") {
-			self.settings.tint = ColorCodable(uiColor: uicolor)
-			saveSettings()
-		}
-#elseif canImport(AppKit)
-		if let nscolor = NSColor(named: "uiColors/\(to)") {
-			self.settings.tint = ColorCodable(nsColor: nscolor)
-		}
-#endif
-	}
-	
-	let appGroupSettingsStore = UserDefaults(suiteName: "group.NearFuture") ?? UserDefaults.standard
-	let icSettStore = NSUbiquitousKeyValueStore.default
-	
-	func loadSettings() {
-		let decoder = JSONDecoder()
-		if let icSettings = icSettStore.data(forKey: "settings") {
-			if let decodedSetts = try? decoder.decode(NFSettings.self, from: icSettings) {
-				self.settings = decodedSetts
-			}
-		} else if let savedData = appGroupSettingsStore.data(forKey: "settings") {
-			if let decodedSetts = try? decoder.decode(NFSettings.self, from: savedData) {
-				self.settings = decodedSetts
-			}
-		}
-		if self.settings.prevAppVersion != getVersion()+getBuildID() {
-			self.settings.showWhatsNew = true
-		}
-	}
-	
-	func saveSettings() {
-		let encoder = JSONEncoder()
-		if let encoded = try? encoder.encode(settings) {
-			appGroupSettingsStore.set(encoded, forKey: "settings")
-			icSettStore.set(encoded, forKey: "settings")
-			icSettStore.synchronize()
-			loadSettings()
-		}
-	}
-}

Shared/NearFutureApp.swift

@@ -1,23 +0,0 @@
-//
-//  NearFutureApp.swift
-//  NearFuture
-//
-//  Created by neon443 on 24/12/2024.
-//
-
-import SwiftUI
-import SwiftData
-
-@main
-struct NearFutureApp: App {
-	@StateObject var settingsModel: SettingsViewModel = SettingsViewModel()
-	var body: some Scene {
-		WindowGroup {
-			ContentView(
-				viewModel: EventViewModel(),
-				settingsModel: settingsModel
-			)
-			.tint(settingsModel.settings.tint.color)
-		}
-	}
-}