move to contentview

add homeView
respect show completed events in home
archive view
move inot contentview
new mac icon
remove mac icons from the variants

MacNearFuture/MacNearFutureApp.swift

@@ -10,35 +10,15 @@ import SwiftUI
 
 @main
 struct NearFutureApp: App {
+	@StateObject var viewModel: EventViewModel = EventViewModel()
 	@StateObject var settingsModel: SettingsViewModel = SettingsViewModel()
 	
 	var body: some Scene {
 		WindowGroup {
-			NavigationSplitView {
-				List {
-					NavigationLink {
-						
-					} label: {
-						Image(systemName: "house")
-						Text("Home")
-					}
-					NavigationLink {
-						
-					} label: {
-						Image(systemName: "tray.full")
-						Text("Archive")
-					}
-				}
-			} detail: {
 			ContentView(
-					viewModel: EventViewModel(),
+				viewModel: viewModel,
 				settingsModel: settingsModel
 			)
-
-			}
-			.tint(settingsModel.settings.tint.color)
-			.frame(minWidth: 450, minHeight: 550)
-			.containerBackground(.ultraThinMaterial, for: .window)
 		}
 		.defaultSize(width: 550, height: 650)
 		.commands {

MacNearFuture/Views/ArchiveView.swift

@@ -0,0 +1,33 @@
+//
+//  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

@@ -8,16 +8,37 @@
 import SwiftUI
 
 struct ContentView: View {
-	@ObservedObject var viewModel: EventViewModel
-	@ObservedObject var settingsModel: SettingsViewModel
+	@StateObject var viewModel: EventViewModel
+	@StateObject var settingsModel: SettingsViewModel
 	
     var body: some View {
-		ScrollView {
-			ForEach(viewModel.events) { event in
-				EventListView(viewModel: viewModel, event: event)
+		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")
 				}
 			}
-		.scrollContentBackground(.hidden)
+		} detail: {
+			
+		}
+		.tint(settingsModel.settings.tint.color)
+		.frame(minWidth: 450, minHeight: 550)
+		.containerBackground(.ultraThinMaterial, for: .window)
     }
 }
 

MacNearFuture/Views/HomeView.swift

@@ -0,0 +1,37 @@
+//
+//  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

@@ -15,11 +15,9 @@
 		A90D49452DDE1C7600781124 /* Tints.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A90D49432DDE1C1100781124 /* Tints.xcassets */; };
 		A90D49462DDE1C7A00781124 /* Tints.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A90D49432DDE1C1100781124 /* Tints.xcassets */; };
 		A90D494B2DDE2C2900781124 /* AddEventView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A949F83C2DCAABE00064DCA0 /* AddEventView.swift */; };
-		A90D494F2DDE2C8500781124 /* EditEventViewMac.swift in Sources */ = {isa = PBXBuildFile; fileRef = A90D494E2DDE2C8500781124 /* EditEventViewMac.swift */; };
 		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 */; };
-		A90D49582DDE2DBD00781124 /* EventListViewMac.swift in Sources */ = {isa = PBXBuildFile; fileRef = A90D49572DDE2DBD00781124 /* EventListViewMac.swift */; };
 		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 */; };
@@ -52,6 +50,10 @@
 		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 /* EditEventViewMac.swift in Sources */ = {isa = PBXBuildFile; fileRef = A98C20C92DE730740008D61C /* EditEventViewMac.swift */; };
+		A98C20CE2DE7308E0008D61C /* ArchiveView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A98C20CD2DE7308E0008D61C /* ArchiveView.swift */; };
+		A98C20D02DE731BD0008D61C /* HomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A98C20CF2DE731BD0008D61C /* HomeView.swift */; };
 		A9FC7EEA2D2823920020D75B /* NearFutureWidgets.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9FC7EE92D28238A0020D75B /* NearFutureWidgets.swift */; };
 /* End PBXBuildFile section */
 
@@ -85,9 +87,7 @@
 		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>"; };
-		A90D494E2DDE2C8500781124 /* EditEventViewMac.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = EditEventViewMac.swift; path = MacNearFuture/Views/EditEventViewMac.swift; sourceTree = SOURCE_ROOT; };
 		A90D49512DDE2D0000781124 /* Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
-		A90D49572DDE2DBD00781124 /* EventListViewMac.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventListViewMac.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>"; };
@@ -121,6 +121,10 @@
 		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 /* EditEventViewMac.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditEventViewMac.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>"; };
 		A9FC7EE92D28238A0020D75B /* NearFutureWidgets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NearFutureWidgets.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -175,8 +179,10 @@
 			isa = PBXGroup;
 			children = (
 				A90D49332DDE0FAF00781124 /* ContentViewMac.swift */,
-				A90D49572DDE2DBD00781124 /* EventListViewMac.swift */,
-				A90D494E2DDE2C8500781124 /* EditEventViewMac.swift */,
+				A98C20CF2DE731BD0008D61C /* HomeView.swift */,
+				A98C20CA2DE730740008D61C /* EventListViewMac.swift */,
+				A98C20CD2DE7308E0008D61C /* ArchiveView.swift */,
+				A98C20C82DE730420008D61C /* Modification */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -335,6 +341,14 @@
 			path = NearFutureWidgets;
 			sourceTree = "<group>";
 		};
+		A98C20C82DE730420008D61C /* Modification */ = {
+			isa = PBXGroup;
+			children = (
+				A98C20C92DE730740008D61C /* EditEventViewMac.swift */,
+			);
+			path = Modification;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -480,15 +494,17 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				A98C20CB2DE730740008D61C /* EventListViewMac.swift in Sources */,
+				A98C20CC2DE730740008D61C /* EditEventViewMac.swift in Sources */,
 				A90D494B2DDE2C2900781124 /* AddEventView.swift in Sources */,
 				A90D495E2DDE3C7400781124 /* NFCommands.swift in Sources */,
+				A98C20CE2DE7308E0008D61C /* ArchiveView.swift in Sources */,
+				A98C20D02DE731BD0008D61C /* HomeView.swift in Sources */,
 				A90D495B2DDE2EDB00781124 /* MacNearFutureApp.swift in Sources */,
 				A90D49522DDE2D0000781124 /* Extensions.swift in Sources */,
 				A90D49422DDE114100781124 /* Events.swift in Sources */,
 				A90D49382DDE0FAF00781124 /* ContentViewMac.swift in Sources */,
 				A90D49622DDE626300781124 /* Settings.swift in Sources */,
-				A90D494F2DDE2C8500781124 /* EditEventViewMac.swift in Sources */,
-				A90D49582DDE2DBD00781124 /* EventListViewMac.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

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

@@ -31,61 +31,61 @@
       "size" : "1024x1024"
     },
     {
-      "filename" : "NearFutureIcon16.png",
+      "filename" : "MacNearFutureIcon16.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "16x16"
     },
     {
-      "filename" : "NearFutureIcon32.png",
+      "filename" : "MacNearFutureIcon32.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "16x16"
     },
     {
-      "filename" : "NearFutureIcon32.png",
+      "filename" : "MacNearFutureIcon32.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "32x32"
     },
     {
-      "filename" : "NearFutureIcon64.png",
+      "filename" : "MacNearFutureIcon64.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "32x32"
     },
     {
-      "filename" : "NearFutureIcon128.png",
+      "filename" : "MacNearFutureIcon128.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "128x128"
     },
     {
-      "filename" : "NearFutureIcon256.png",
+      "filename" : "MacNearFutureIcon256.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "128x128"
     },
     {
-      "filename" : "NearFutureIcon256.png",
+      "filename" : "MacNearFutureIcon256.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "256x256"
     },
     {
-      "filename" : "NearFutureIcon512.png",
+      "filename" : "MacNearFutureIcon512.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "256x256"
     },
     {
-      "filename" : "NearFutureIcon512.png",
+      "filename" : "MacNearFutureIcon512.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "512x512"
     },
     {
-      "filename" : "NearFutureIcon.png",
+      "filename" : "MacNearFutureIcon.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "512x512"

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

@@ -30,66 +30,6 @@
       "platform" : "ios",
       "size" : "1024x1024"
     },
-    {
-      "filename" : "bloo16.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "16x16"
-    },
-    {
-      "filename" : "bloo32.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "16x16"
-    },
-    {
-      "filename" : "bloo32.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "32x32"
-    },
-    {
-      "filename" : "bloo64.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "32x32"
-    },
-    {
-      "filename" : "bloo128.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "128x128"
-    },
-    {
-      "filename" : "bloo256.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "128x128"
-    },
-    {
-      "filename" : "bloo256.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "256x256"
-    },
-    {
-      "filename" : "bloo512.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "256x256"
-    },
-    {
-      "filename" : "bloo512.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "512x512"
-    },
-    {
-      "filename" : "bloo.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "512x512"
-    },
     {
       "filename" : "bloo.png",
       "idiom" : "universal",

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

@@ -30,66 +30,6 @@
       "platform" : "ios",
       "size" : "1024x1024"
     },
-    {
-      "filename" : "blue16.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "16x16"
-    },
-    {
-      "filename" : "blue32.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "16x16"
-    },
-    {
-      "filename" : "blue32.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "32x32"
-    },
-    {
-      "filename" : "blue64.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "32x32"
-    },
-    {
-      "filename" : "blue128.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "128x128"
-    },
-    {
-      "filename" : "blue256.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "128x128"
-    },
-    {
-      "filename" : "blue256.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "256x256"
-    },
-    {
-      "filename" : "blue512.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "256x256"
-    },
-    {
-      "filename" : "blue512.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "512x512"
-    },
-    {
-      "filename" : "blue.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "512x512"
-    },
     {
       "filename" : "blue.png",
       "idiom" : "universal",

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

@@ -30,66 +30,6 @@
       "platform" : "ios",
       "size" : "1024x1024"
     },
-    {
-      "filename" : "green16.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "16x16"
-    },
-    {
-      "filename" : "green32.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "16x16"
-    },
-    {
-      "filename" : "green32.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "32x32"
-    },
-    {
-      "filename" : "green64.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "32x32"
-    },
-    {
-      "filename" : "green128.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "128x128"
-    },
-    {
-      "filename" : "green256.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "128x128"
-    },
-    {
-      "filename" : "green256.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "256x256"
-    },
-    {
-      "filename" : "green512.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "256x256"
-    },
-    {
-      "filename" : "green512.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "512x512"
-    },
-    {
-      "filename" : "green.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "512x512"
-    },
     {
       "filename" : "green.png",
       "idiom" : "universal",

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

@@ -30,66 +30,6 @@
       "platform" : "ios",
       "size" : "1024x1024"
     },
-    {
-      "filename" : "pink16.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "16x16"
-    },
-    {
-      "filename" : "pink32.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "16x16"
-    },
-    {
-      "filename" : "pink32.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "32x32"
-    },
-    {
-      "filename" : "pink64.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "32x32"
-    },
-    {
-      "filename" : "pink128.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "128x128"
-    },
-    {
-      "filename" : "pink256.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "128x128"
-    },
-    {
-      "filename" : "pink256.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "256x256"
-    },
-    {
-      "filename" : "pink512.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "256x256"
-    },
-    {
-      "filename" : "pink512.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "512x512"
-    },
-    {
-      "filename" : "pink.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "512x512"
-    },
     {
       "filename" : "pink.png",
       "idiom" : "universal",

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

@@ -30,66 +30,6 @@
       "platform" : "ios",
       "size" : "1024x1024"
     },
-    {
-      "filename" : "purple16.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "16x16"
-    },
-    {
-      "filename" : "purple32.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "16x16"
-    },
-    {
-      "filename" : "purple32.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "32x32"
-    },
-    {
-      "filename" : "purple64.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "32x32"
-    },
-    {
-      "filename" : "purple128.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "128x128"
-    },
-    {
-      "filename" : "purple256.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "128x128"
-    },
-    {
-      "filename" : "purple256.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "256x256"
-    },
-    {
-      "filename" : "purple512.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "256x256"
-    },
-    {
-      "filename" : "purple512.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "512x512"
-    },
-    {
-      "filename" : "purple.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "512x512"
-    },
     {
       "filename" : "purple.png",
       "idiom" : "universal",

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

@@ -30,66 +30,6 @@
       "platform" : "ios",
       "size" : "1024x1024"
     },
-    {
-      "filename" : "red16.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "16x16"
-    },
-    {
-      "filename" : "red32.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "16x16"
-    },
-    {
-      "filename" : "red32.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "32x32"
-    },
-    {
-      "filename" : "red64.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "32x32"
-    },
-    {
-      "filename" : "red128.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "128x128"
-    },
-    {
-      "filename" : "red256.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "128x128"
-    },
-    {
-      "filename" : "red256.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "256x256"
-    },
-    {
-      "filename" : "red512.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "256x256"
-    },
-    {
-      "filename" : "red512.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "512x512"
-    },
-    {
-      "filename" : "red.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "512x512"
-    },
     {
       "filename" : "red.png",
       "idiom" : "universal",

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

@@ -30,66 +30,6 @@
       "platform" : "ios",
       "size" : "1024x1024"
     },
-    {
-      "filename" : "yellow16.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "16x16"
-    },
-    {
-      "filename" : "yellow32.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "16x16"
-    },
-    {
-      "filename" : "yellow32.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "32x32"
-    },
-    {
-      "filename" : "yellow64.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "32x32"
-    },
-    {
-      "filename" : "yellow128.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "128x128"
-    },
-    {
-      "filename" : "yellow256.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "128x128"
-    },
-    {
-      "filename" : "yellow256.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "256x256"
-    },
-    {
-      "filename" : "yellow512.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "256x256"
-    },
-    {
-      "filename" : "yellow512.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "512x512"
-    },
-    {
-      "filename" : "yellow.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "512x512"
-    },
     {
       "filename" : "yellow.png",
       "idiom" : "universal",