asdkjlf

add migration, if events dont have notifs
fix runtime error about bg threads by using await MainActor.run
add cancelallnotifs
bump version

Config.xcconfig

@@ -12,6 +12,6 @@ TEAM_ID = 8JGND254B7
 BUNDLE_ID = com.neon443.NearFuture
 BUNDLE_ID_WIDGETS = com.neon443.NearFuture.widgets
 GROUP_ID  = group.NearFuture
-VERSION = 3.2.1
+VERSION = 4.0.0
 NAME = Near Future
-BUILD_NUMBER = 5
+BUILD_NUMBER = 0

NearFuture.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 70;
+	objectVersion = 56;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -11,17 +11,22 @@
 		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 */; };
-		A920C2B82D2401A300E4F9B1 /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A920C2B42D2401A100E4F9B1 /* SettingsView.swift */; };
-		A920C2BB2D2401A400E4F9B1 /* AddEventView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A920C2B72D2401A300E4F9B1 /* AddEventView.swift */; };
 		A920C2BE2D24021A00E4F9B1 /* SFSymbolsPicker in Frameworks */ = {isa = PBXBuildFile; productRef = A920C2BD2D24021A00E4F9B1 /* SFSymbolsPicker */; };
-		A920C2C12D2403CA00E4F9B1 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A920C2C02D2403CA00E4F9B1 /* ContentView.swift */; };
-		A93BC0942D2B18A3002E8BBD /* StatsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A93BC0932D2B18A3002E8BBD /* StatsView.swift */; };
-		A973B26C2DC551310028F8A2 /* ImportView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A973B26B2DC551310028F8A2 /* ImportView.swift */; };
-		A973B2702DC552EB0028F8A2 /* ExportView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A973B26F2DC552EB0028F8A2 /* ExportView.swift */; };
-		A973B2712DC553050028F8A2 /* ExportView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A973B26F2DC552EB0028F8A2 /* ExportView.swift */; };
-		A977CC922DBBB48000DED8C0 /* ArchiveView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A977CC912DBBB48000DED8C0 /* ArchiveView.swift */; };
-		A977CC9A2DBD74FE00DED8C0 /* HelpView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A977CC992DBD74FE00DED8C0 /* HelpView.swift */; };
-		A979F57F2D26B1300094C0B3 /* EditEventView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A979F57E2D26B1300094C0B3 /* EditEventView.swift */; };
+		A949F8322DCAAA8A0064DCA0 /* NearFutureIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = A949F8312DCAAA8A0064DCA0 /* NearFutureIcon.png */; };
+		A949F84B2DCAABE00064DCA0 /* ArchiveView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A949F83A2DCAABE00064DCA0 /* ArchiveView.swift */; };
+		A949F84C2DCAABE00064DCA0 /* AddEventView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A949F83C2DCAABE00064DCA0 /* AddEventView.swift */; };
+		A949F84D2DCAABE00064DCA0 /* EditEventView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A949F83D2DCAABE00064DCA0 /* EditEventView.swift */; };
+		A949F84E2DCAABE00064DCA0 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A949F83F2DCAABE00064DCA0 /* ContentView.swift */; };
+		A949F84F2DCAABE00064DCA0 /* EventListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A949F8402DCAABE00064DCA0 /* EventListView.swift */; };
+		A949F8502DCAABE00064DCA0 /* HelpView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A949F8412DCAABE00064DCA0 /* HelpView.swift */; };
+		A949F8512DCAABE00064DCA0 /* ExportView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A949F8432DCAABE00064DCA0 /* ExportView.swift */; };
+		A949F8522DCAABE00064DCA0 /* iCloudSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A949F8442DCAABE00064DCA0 /* iCloudSettingsView.swift */; };
+		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 */; };
 		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 */; };
@@ -29,8 +34,6 @@
 		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 /* Item.swift in Sources */ = {isa = PBXBuildFile; fileRef = A920C28B2D24011400E4F9B1 /* Item.swift */; };
-		A985104E2DB256430013D5FF /* iCloudSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A985104D2DB256430013D5FF /* iCloudSettingsView.swift */; };
-		A98510502DB263F00013D5FF /* EventListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A985104F2DB263F00013D5FF /* EventListView.swift */; };
 		A9FC7EEA2D2823920020D75B /* NearFutureWidgets.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9FC7EE92D28238A0020D75B /* NearFutureWidgets.swift */; };
 /* End PBXBuildFile section */
 
@@ -73,15 +76,23 @@
 		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>"; };
-		A920C2B42D2401A100E4F9B1 /* SettingsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = "<group>"; };
-		A920C2B72D2401A300E4F9B1 /* AddEventView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AddEventView.swift; sourceTree = "<group>"; };
-		A920C2C02D2403CA00E4F9B1 /* ContentView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
-		A93BC0932D2B18A3002E8BBD /* StatsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatsView.swift; sourceTree = "<group>"; };
-		A973B26B2DC551310028F8A2 /* ImportView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImportView.swift; sourceTree = "<group>"; };
-		A973B26F2DC552EB0028F8A2 /* ExportView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExportView.swift; sourceTree = "<group>"; };
-		A977CC912DBBB48000DED8C0 /* ArchiveView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArchiveView.swift; sourceTree = "<group>"; };
-		A977CC992DBD74FE00DED8C0 /* HelpView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HelpView.swift; sourceTree = "<group>"; };
-		A979F57E2D26B1300094C0B3 /* EditEventView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditEventView.swift; 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>"; };
+		A949F8302DCAAA640064DCA0 /* NearFutureIconTint.pxd */ = {isa = PBXFileReference; lastKnownFileType = file; path = NearFutureIconTint.pxd; sourceTree = "<group>"; };
+		A949F8312DCAAA8A0064DCA0 /* NearFutureIcon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = NearFutureIcon.png; path = Assets.xcassets/AppIcon.appiconset/NearFutureIcon.png; sourceTree = "<group>"; };
+		A949F83A2DCAABE00064DCA0 /* ArchiveView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArchiveView.swift; sourceTree = "<group>"; };
+		A949F83C2DCAABE00064DCA0 /* AddEventView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddEventView.swift; sourceTree = "<group>"; };
+		A949F83D2DCAABE00064DCA0 /* EditEventView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditEventView.swift; sourceTree = "<group>"; };
+		A949F83F2DCAABE00064DCA0 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
+		A949F8402DCAABE00064DCA0 /* EventListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventListView.swift; sourceTree = "<group>"; };
+		A949F8412DCAABE00064DCA0 /* HelpView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HelpView.swift; sourceTree = "<group>"; };
+		A949F8432DCAABE00064DCA0 /* ExportView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExportView.swift; sourceTree = "<group>"; };
+		A949F8442DCAABE00064DCA0 /* iCloudSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iCloudSettingsView.swift; sourceTree = "<group>"; };
+		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>"; };
 		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>"; };
@@ -97,16 +108,10 @@
 		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; };
-		A985104D2DB256430013D5FF /* iCloudSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iCloudSettingsView.swift; sourceTree = "<group>"; };
-		A985104F2DB263F00013D5FF /* EventListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventListView.swift; sourceTree = "<group>"; };
 		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 PBXFileSystemSynchronizedRootGroup section */
-		A980FC382D93FB2B006A778F /* NearFutureTests */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = NearFutureTests; sourceTree = "<group>"; };
-/* End PBXFileSystemSynchronizedRootGroup section */
-
 /* Begin PBXFrameworksBuildPhase section */
 		A920C2812D24011300E4F9B1 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
@@ -139,9 +144,10 @@
 			isa = PBXGroup;
 			children = (
 				A90FDE222DC0D4310012790C /* Config.xcconfig */,
+				A949F8002DCAA0340064DCA0 /* Resources */,
 				A920C2862D24011400E4F9B1 /* NearFuture */,
 				A979F6082D270AF00094C0B3 /* NearFutureWidgets */,
-				A980FC382D93FB2B006A778F /* NearFutureTests */,
+				A949F8582DCAAD670064DCA0 /* NearFutureTests */,
 				A979F6032D270AF00094C0B3 /* Frameworks */,
 				A920C2852D24011400E4F9B1 /* Products */,
 			);
@@ -162,19 +168,8 @@
 			children = (
 				A920C2872D24011400E4F9B1 /* NearFutureApp.swift */,
 				A920C28B2D24011400E4F9B1 /* Item.swift */,
-				A920C2C02D2403CA00E4F9B1 /* ContentView.swift */,
-				A985104F2DB263F00013D5FF /* EventListView.swift */,
-				A920C2B72D2401A300E4F9B1 /* AddEventView.swift */,
-				A979F57E2D26B1300094C0B3 /* EditEventView.swift */,
-				A977CC912DBBB48000DED8C0 /* ArchiveView.swift */,
-				A93BC0932D2B18A3002E8BBD /* StatsView.swift */,
-				A977CC992DBD74FE00DED8C0 /* HelpView.swift */,
-				A920C2B42D2401A100E4F9B1 /* SettingsView.swift */,
-				A973B26B2DC551310028F8A2 /* ImportView.swift */,
-				A973B26F2DC552EB0028F8A2 /* ExportView.swift */,
-				A985104D2DB256430013D5FF /* iCloudSettingsView.swift */,
+				A949F84A2DCAABE00064DCA0 /* Views */,
 				A980FC302D920097006A778F /* Info.plist */,
-				A920C28D2D24011A00E4F9B1 /* Assets.xcassets */,
 				A920C28F2D24011A00E4F9B1 /* NearFuture.entitlements */,
 				A920C2902D24011A00E4F9B1 /* Preview Content */,
 			);
@@ -190,6 +185,93 @@
 			path = "Preview Content";
 			sourceTree = "<group>";
 		};
+		A949F8002DCAA0340064DCA0 /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				A949F8312DCAAA8A0064DCA0 /* NearFutureIcon.png */,
+				A920C28D2D24011A00E4F9B1 /* Assets.xcassets */,
+				A949F82E2DCAAA640064DCA0 /* NearFutureIcon.pxd */,
+				A949F82F2DCAAA640064DCA0 /* NearFutureIconDark.pxd */,
+				A949F8302DCAAA640064DCA0 /* NearFutureIconTint.pxd */,
+			);
+			path = Resources;
+			sourceTree = "<group>";
+		};
+		A949F83B2DCAABE00064DCA0 /* Archive */ = {
+			isa = PBXGroup;
+			children = (
+				A949F83A2DCAABE00064DCA0 /* ArchiveView.swift */,
+			);
+			path = Archive;
+			sourceTree = "<group>";
+		};
+		A949F83E2DCAABE00064DCA0 /* Events */ = {
+			isa = PBXGroup;
+			children = (
+				A949F83C2DCAABE00064DCA0 /* AddEventView.swift */,
+				A949F83D2DCAABE00064DCA0 /* EditEventView.swift */,
+			);
+			path = Events;
+			sourceTree = "<group>";
+		};
+		A949F8422DCAABE00064DCA0 /* Home */ = {
+			isa = PBXGroup;
+			children = (
+				A949F83F2DCAABE00064DCA0 /* ContentView.swift */,
+				A949F8402DCAABE00064DCA0 /* EventListView.swift */,
+				A949F8412DCAABE00064DCA0 /* HelpView.swift */,
+			);
+			path = Home;
+			sourceTree = "<group>";
+		};
+		A949F8472DCAABE00064DCA0 /* Settings */ = {
+			isa = PBXGroup;
+			children = (
+				A949F8462DCAABE00064DCA0 /* SettingsView.swift */,
+				A949F8442DCAABE00064DCA0 /* iCloudSettingsView.swift */,
+				A949F8452DCAABE00064DCA0 /* ImportView.swift */,
+				A949F8432DCAABE00064DCA0 /* ExportView.swift */,
+			);
+			path = Settings;
+			sourceTree = "<group>";
+		};
+		A949F8492DCAABE00064DCA0 /* Stats */ = {
+			isa = PBXGroup;
+			children = (
+				A949F8482DCAABE00064DCA0 /* StatsView.swift */,
+			);
+			path = Stats;
+			sourceTree = "<group>";
+		};
+		A949F84A2DCAABE00064DCA0 /* Views */ = {
+			isa = PBXGroup;
+			children = (
+				A949F8422DCAABE00064DCA0 /* Home */,
+				A949F83E2DCAABE00064DCA0 /* Events */,
+				A949F83B2DCAABE00064DCA0 /* Archive */,
+				A949F85E2DCABB420064DCA0 /* Misc */,
+				A949F8492DCAABE00064DCA0 /* Stats */,
+				A949F8472DCAABE00064DCA0 /* Settings */,
+			);
+			path = Views;
+			sourceTree = "<group>";
+		};
+		A949F8582DCAAD670064DCA0 /* NearFutureTests */ = {
+			isa = PBXGroup;
+			children = (
+				A949F8572DCAAD670064DCA0 /* NearFutureTests.swift */,
+			);
+			path = NearFutureTests;
+			sourceTree = "<group>";
+		};
+		A949F85E2DCABB420064DCA0 /* Misc */ = {
+			isa = PBXGroup;
+			children = (
+				A949F85D2DCABB420064DCA0 /* Buttons.swift */,
+			);
+			path = Misc;
+			sourceTree = "<group>";
+		};
 		A979F58A2D2700680094C0B3 /* NearFutureWidgets */ = {
 			isa = PBXGroup;
 			children = (
@@ -280,9 +362,6 @@
 			dependencies = (
 				A980FC3C2D93FB2B006A778F /* PBXTargetDependency */,
 			);
-			fileSystemSynchronizedGroups = (
-				A980FC382D93FB2B006A778F /* NearFutureTests */,
-			);
 			name = NearFutureTests;
 			packageProductDependencies = (
 			);
@@ -341,6 +420,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				A920C2922D24011A00E4F9B1 /* Preview Assets.xcassets in Resources */,
+				A949F8322DCAAA8A0064DCA0 /* NearFutureIcon.png in Resources */,
 				A920C28E2D24011A00E4F9B1 /* Assets.xcassets in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -367,19 +447,20 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				A920C2BB2D2401A400E4F9B1 /* AddEventView.swift in Sources */,
-				A973B26C2DC551310028F8A2 /* ImportView.swift in Sources */,
-				A98510502DB263F00013D5FF /* EventListView.swift in Sources */,
-				A920C2C12D2403CA00E4F9B1 /* ContentView.swift in Sources */,
-				A973B2712DC553050028F8A2 /* ExportView.swift in Sources */,
-				A920C2B82D2401A300E4F9B1 /* SettingsView.swift in Sources */,
-				A977CC9A2DBD74FE00DED8C0 /* HelpView.swift in Sources */,
 				A920C28C2D24011400E4F9B1 /* Item.swift in Sources */,
+				A949F84B2DCAABE00064DCA0 /* ArchiveView.swift in Sources */,
+				A949F84C2DCAABE00064DCA0 /* AddEventView.swift in Sources */,
+				A949F84D2DCAABE00064DCA0 /* EditEventView.swift in Sources */,
+				A949F84E2DCAABE00064DCA0 /* ContentView.swift in Sources */,
+				A949F84F2DCAABE00064DCA0 /* EventListView.swift in Sources */,
+				A949F8502DCAABE00064DCA0 /* HelpView.swift in Sources */,
+				A949F85F2DCABB420064DCA0 /* Buttons.swift in Sources */,
+				A949F8512DCAABE00064DCA0 /* ExportView.swift in Sources */,
+				A949F8522DCAABE00064DCA0 /* iCloudSettingsView.swift in Sources */,
+				A949F8532DCAABE00064DCA0 /* ImportView.swift in Sources */,
+				A949F8542DCAABE00064DCA0 /* SettingsView.swift in Sources */,
+				A949F8552DCAABE00064DCA0 /* StatsView.swift in Sources */,
 				A920C2882D24011400E4F9B1 /* NearFutureApp.swift in Sources */,
-				A93BC0942D2B18A3002E8BBD /* StatsView.swift in Sources */,
-				A977CC922DBBB48000DED8C0 /* ArchiveView.swift in Sources */,
-				A979F57F2D26B1300094C0B3 /* EditEventView.swift in Sources */,
-				A985104E2DB256430013D5FF /* iCloudSettingsView.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -398,7 +479,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				A973B2702DC552EB0028F8A2 /* ExportView.swift in Sources */,
+				A949F8592DCAAD670064DCA0 /* NearFutureTests.swift in Sources */,
+				A949F8562DCAABE00064DCA0 /* ExportView.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -582,10 +664,10 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				REGISTER_APP_GROUPS = NO;
+				REGISTER_APP_GROUPS = YES;
 				SDKROOT = auto;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
-				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MACCATALYST = YES;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
 				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -630,10 +712,10 @@
 				OTHER_LDFLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				REGISTER_APP_GROUPS = NO;
+				REGISTER_APP_GROUPS = YES;
 				SDKROOT = auto;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
-				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MACCATALYST = YES;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
 				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -662,6 +744,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
+				MACOSX_DEPLOYMENT_TARGET = 14;
 				MARKETING_VERSION = "$(VERSION)";
 				OTHER_LDFLAGS = (
 					"-Xlinker",
@@ -669,10 +752,11 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_WIDGETS)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				REGISTER_APP_GROUPS = YES;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
-				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MACCATALYST = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -700,13 +784,15 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
+				MACOSX_DEPLOYMENT_TARGET = 14;
 				MARKETING_VERSION = "$(VERSION)";
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_WIDGETS)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				REGISTER_APP_GROUPS = YES;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
-				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MACCATALYST = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";

NearFuture/Item.swift

@@ -9,6 +9,7 @@ import Foundation
 import SwiftData
 import SwiftUI
 import WidgetKit
+import UserNotifications
 
 //@Model
 //final class Item {
@@ -113,6 +114,7 @@ class SettingsViewModel: ObservableObject {
 		showCompletedInHome: false,
 		tint: ColorCodable(uiColor: UIColor(named: "AccentColor")!)
 	)
+	@Published var notifsGranted: Bool = false
 	
 	@Published var accentChoices: [Color] = [
 		Color(UIColor(named: "uiColors/red")!),
@@ -127,6 +129,12 @@ class SettingsViewModel: ObservableObject {
 	init(load: Bool = true) {
 		if load {
 			loadSettings()
+			Task {
+				let requestResult = await requestNotifs()
+				await MainActor.run {
+					self.notifsGranted = requestResult
+				}
+			}
 		}
 	}
 	
@@ -221,6 +229,43 @@ class EventViewModel: ObservableObject {
 		updateSyncStatus()
 	}
 	
+	func getNotifs() async -> [UNNotificationRequest] {
+		return await UNUserNotificationCenter.current().pendingNotificationRequests()
+	}
+	
+	func checkPendingNotifs(_ pending: [UNNotificationRequest]) {
+		var eventUUIDs = events.map({$0.id.uuidString})
+		for req in pending {
+			//match the notif to an event
+			if let index = events.firstIndex(where: {$0.id.uuidString == req.identifier}) {
+				if let remove = eventUUIDs.firstIndex(where: {$0 == req.identifier}) {
+					eventUUIDs.remove(at: remove)
+				}
+				let components = getDateComponents(events[index].date)
+				//check the notif matches event details
+				if req.content.title == events[index].name,
+				   req.content.subtitle == events[index].notes,
+				   req.trigger == UNCalendarNotificationTrigger(dateMatching: components, repeats: false) {
+					//if it does, make sure the notif delets if u complete the veent
+					if events[index].complete {
+						cancelNotif(req.identifier)
+					}
+				} else {
+					cancelNotif(req.identifier)
+					scheduleEventNotif(events[index])
+				}
+			} else {
+				//cancel if the event is deleted
+				cancelNotif(req.identifier)
+			}
+		}
+		for uuid in eventUUIDs {
+			if let event = events.first(where: {$0.id.uuidString == uuid}) {
+				scheduleEventNotif(event)
+			}
+		}
+	}
+	
 	// save to local and icloud
 	func saveEvents() {
 		let encoder = JSONEncoder()
@@ -233,6 +278,9 @@ class EventViewModel: ObservableObject {
 			
 			updateSyncStatus()
 			loadEvents()
+			Task {
+				await checkPendingNotifs(getNotifs())
+			}
 			WidgetCenter.shared.reloadAllTimelines()//reload all widgets when saving events
 			objectWillChange.send()
 		}
@@ -252,6 +300,7 @@ class EventViewModel: ObservableObject {
 	
 	func addEvent(newEvent: Event) {
 		events.append(newEvent)
+		scheduleEventNotif(newEvent)
 		saveEvents() //sync with icloud
 	}
 	
@@ -325,6 +374,7 @@ class EventViewModel: ObservableObject {
 		UserDefaults.standard.removeObject(forKey: "events")
 		appGroupUserDefaults.removeObject(forKey: "events")
 		events.removeAll()
+		cancelAllNotifs()
 		updateSyncStatus()
 	}
 	
@@ -332,6 +382,7 @@ class EventViewModel: ObservableObject {
 		icloudStore.removeObject(forKey: "events")
 		icloudStore.synchronize()
 		icloudData.removeAll()
+		cancelAllNotifs()
 		updateSyncStatus()
 	}
 	
@@ -347,6 +398,7 @@ class EventViewModel: ObservableObject {
 		}
 		
 		events.removeAll()
+		cancelAllNotifs()
 		updateSyncStatus()
 	}
 	
@@ -357,6 +409,7 @@ class EventViewModel: ObservableObject {
 		}
 		icloudStore.synchronize()
 		icloudData.removeAll()
+		cancelAllNotifs()
 		updateSyncStatus()
 	}
 }
@@ -423,3 +476,43 @@ func plu(_ inp: Int) -> String {
 public enum importError: Error {
 	case invalidB64
 }
+
+func requestNotifs() async -> Bool {
+	let result = try? await UNUserNotificationCenter.current().requestAuthorization(options: [.alert, .badge, .carPlay, .sound])
+	return result ?? false
+}
+
+func scheduleNotif(title: String, sub: String, date: Date, id: String = UUID().uuidString) {
+	let content = UNMutableNotificationContent()
+	content.title = title
+	content.subtitle = sub
+	content.sound = .default
+	
+	let identifier = id
+	let dateComponents = getDateComponents(date)
+	
+	let trigger = UNCalendarNotificationTrigger(dateMatching: dateComponents, repeats: false)
+	let request = UNNotificationRequest(identifier: identifier, content: content, trigger: trigger)
+	UNUserNotificationCenter.current().add(request)
+}
+
+func scheduleEventNotif(_ event: Event) {
+	scheduleNotif(
+		title: event.name,
+		sub: event.notes,
+		date: event.date,
+		id: event.id.uuidString
+	)
+}
+
+func getDateComponents(_ date: Date) -> DateComponents {
+	return Calendar.current.dateComponents([.year, .month, .day, .hour, .minute], from: date)
+}
+
+func cancelNotif(_ id: String) {
+	UNUserNotificationCenter.current().removePendingNotificationRequests(withIdentifiers: [id])
+}
+
+func cancelAllNotifs() {
+	UNUserNotificationCenter.current().removeAllPendingNotificationRequests()
+}

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/Views/Events/AddEventView.swift

@@ -59,6 +59,7 @@ struct AddEventView: View {
 								title: "Choose a Symbol",
 								searchLabel: "Search...",
 								autoDismiss: true)
+							.presentationDetents([.medium])
 							.apply {
 								if #available(iOS 16.4, *) {
 									$0.presentationBackground(.ultraThinMaterial)
@@ -214,26 +215,6 @@ struct AddEventView: View {
 	}
 	
 }
-struct MagicClearButton: View {
-	@Binding var text: String
-	var body: some View {
-		HStack {
-			Spacer()
-			Button {
-				text = ""
-			} label: {
-				Image(systemName: "xmark.circle.fill")
-					.resizable()
-					.scaledToFit()
-					.frame(width: text.isEmpty ? 0 : 25)
-					.symbolRenderingMode(.hierarchical)
-					.padding(.trailing, -5)
-					.animation(.spring, value: text.isEmpty)
-			}
-			.buttonStyle(.borderless)
-		}
-	}
-}
 
 #Preview {
 	let vm = dummyEventViewModel()

NearFuture/Views/Home/ContentView.swift

@@ -6,6 +6,7 @@
 //
 
 import SwiftUI
+import UserNotifications
 import SwiftData
 
 enum Field {
@@ -54,7 +55,7 @@ struct ContentView: View {
 	
 	@FocusState private var focusedField: Field?
 	@FocusState private var focusedTab: Tab?
-	
+
 	var body: some View {
 		TabView {
 			NavigationStack {
@@ -62,17 +63,25 @@ struct ContentView: View {
 					backgroundGradient
 					VStack {
 						ZStack {
-							SearchBar(searchInput: $searchInput)
-								.focused($focusedField, equals: Field.Search)
-								.onSubmit {
-									focusedField = nil
-								}
+							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 {
@@ -161,42 +170,6 @@ struct ContentView: View {
 	)
 }
 
-struct SearchBar: View {
-	@Binding var searchInput: String
-	
-	var body: some View {
-		TextField(
-			"\(Image(systemName: "magnifyingglass")) Search",
-			text: $searchInput
-		)
-		.padding(.trailing, searchInput.isEmpty ? 0 : 30)
-		.animation(.spring, value: searchInput)
-		.textFieldStyle(RoundedBorderTextFieldStyle())
-		.submitLabel(.done)
-	}
-}
-
-struct AddEventButton: View {
-	@Binding var showingAddEventView: Bool
-	var body: some View {
-		Button() {
-			showingAddEventView.toggle()
-		} label: {
-			ZStack {
-				Circle()
-					.frame(width: 33)
-					.foregroundStyle(.one)
-				Image(systemName: "plus")
-					.resizable()
-					.scaledToFit()
-					.frame(width: 15)
-					.bold()
-					.foregroundStyle(.two)
-			}
-		}
-	}
-}
-
 extension View {
 	var appearance: ColorScheme {
 		return UITraitCollection.current.userInterfaceStyle == .dark ? .dark : .light

NearFuture/Views/Home/EventListView.swift

@@ -0,0 +1,169 @@
+//
+//  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)
+			}
+			.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/Views/Home/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/Views/Misc/Buttons.swift

@@ -0,0 +1,58 @@
+//
+//  MagicClearButton.swift
+//  NearFuture
+//
+//  Created by neon443 on 06/05/2025.
+//
+
+import SwiftUI
+
+struct MagicClearButton: View {
+	@Binding var text: String
+	var body: some View {
+		HStack {
+			Spacer()
+			Button {
+				text = ""
+			} label: {
+				Image(systemName: "xmark.circle.fill")
+					.resizable()
+					.scaledToFit()
+					.frame(width: text.isEmpty ? 0 : 25)
+					.symbolRenderingMode(.hierarchical)
+					.padding(.trailing, -5)
+					.animation(.spring, value: text.isEmpty)
+			}
+			.buttonStyle(.borderless)
+		}
+	}
+}
+
+struct AddEventButton: View {
+	@Binding var showingAddEventView: Bool
+	var body: some View {
+		Button() {
+			showingAddEventView.toggle()
+		} label: {
+			ZStack {
+				Circle()
+					.frame(width: 33)
+					.foregroundStyle(.one)
+				Image(systemName: "plus")
+					.resizable()
+					.scaledToFit()
+					.frame(width: 15)
+					.bold()
+					.foregroundStyle(.two)
+			}
+		}
+	}
+}
+
+#Preview {
+	MagicClearButton(text: .constant("s"))
+}
+
+#Preview {
+	AddEventButton(showingAddEventView: .constant(false))
+}

NearFuture/Views/Settings/SettingsView.swift

@@ -67,6 +67,25 @@ struct SettingsView: View {
 							}
 						}
 					}
+					NavigationLink() {
+						List {
+							if !settingsModel.notifsGranted {
+								Button("Request Notifications") {
+									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)
+							}
+						}
+					} label: {
+						Image(systemName: "bell.badge.fill")
+						Text("Notifications")
+					}
 					NavigationLink() {
 						iCloudSettingsView(
 							viewModel: viewModel,
@@ -130,13 +149,11 @@ struct SettingsView: View {
 					}
 					Section("About") {
 						VStack {
-							if let image = UIImage(named: getAppIcon()) {
-								Image(uiImage: image)
-									.resizable()
-									.scaledToFit()
-									.frame(width: 100)
-									.clipShape(RoundedRectangle(cornerRadius: 25))
-							}
+                            Image(uiImage: #imageLiteral(resourceName: "NearFutureIcon.png"))
+                                .resizable()
+                                .scaledToFit()
+                                .frame(width: 100)
+                                .clipShape(RoundedRectangle(cornerRadius: 25))
 							Text("Near Future")
 								.bold()
 								.monospaced()
@@ -168,17 +185,6 @@ struct SettingsView: View {
 	)
 }
 
-func getAppIcon() -> String {
-	let bundle = Bundle.main
-	guard let icons = bundle.object(forInfoDictionaryKey: "CFBundleIcons") as? [String: Any],
-		  let primaryIcon = icons["CFBundlePrimaryIcon"] as? [String: Any],
-		  let iconFiles = primaryIcon["CFBundleIconFiles"] as? [String],
-		  let iconFileName = iconFiles.last else {
-		fatalError("hell na where ur icon")
-	}
-	return iconFileName
-}
-
 func getVersion() -> String {
 	guard let version = Bundle.main.infoDictionary?["CFBundleShortVersionString"] else {
 		fatalError("no bundle id wtf lol")

NearFutureWidgets/NearFutureWidgetsLiveActivity.swift

@@ -5,76 +5,76 @@
 //  Created by Nihaal Sharma on 02/01/2025.
 //
 
-import ActivityKit
+//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
-    }
+//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
+//}
 
-    // 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")
+//    }
+//}
 
-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
-}
+//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
+//}