asset catalog: add mac &watchos icons

MacNearFuture/MacNearFutureApp.swift

@@ -43,11 +43,6 @@ struct NearFutureApp: App {
 		.defaultSize(width: 550, height: 650)
 		.commands {
 			NearFutureCommands()
-			Menu("hi") {
-				Button("hi") {
-					
-				}
-			}
 		}
 		
 		Window("About Near Future", id: "about") {

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

@@ -31,54 +31,70 @@
       "size" : "1024x1024"
     },
     {
+      "filename" : "NearFutureIcon16.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "16x16"
     },
     {
+      "filename" : "NearFutureIcon32.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "16x16"
     },
     {
+      "filename" : "NearFutureIcon32.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "32x32"
     },
     {
+      "filename" : "NearFutureIcon64.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "32x32"
     },
     {
+      "filename" : "NearFutureIcon128.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "128x128"
     },
     {
+      "filename" : "NearFutureIcon256.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "128x128"
     },
     {
+      "filename" : "NearFutureIcon256.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "256x256"
     },
     {
+      "filename" : "NearFutureIcon512.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "256x256"
     },
     {
+      "filename" : "NearFutureIcon512.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "512x512"
     },
     {
+      "filename" : "NearFutureIcon.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "512x512"
+    },
+    {
+      "filename" : "NearFutureIcon.png",
+      "idiom" : "universal",
+      "platform" : "watchos",
+      "size" : "1024x1024"
     }
   ],
   "info" : {

Shared/Model/Events.swift

@@ -526,7 +526,7 @@ func getDevice() -> (sf: String, label: String) {
 	return (sf: "iphone", label: "iPhone")
 	#elseif canImport(AppKit)
 	
-	return (sf: "", label: "")
+	return (sf: "desktopcomputer", label: "Mac")
 	#endif
 }
 

Shared/Model/Settings.swift

@@ -12,10 +12,10 @@ import AppKit
 #endif
 
 struct NFSettings: Codable, Equatable {
-	var showCompletedInHome: Bool
+	var showCompletedInHome: Bool = false
-	var tint: ColorCodable
+	var tint: ColorCodable = ColorCodable(.accentColor)
-	var showWhatsNew: Bool
+	var showWhatsNew: Bool = true
-	var prevAppVersion: String
+	var prevAppVersion: String = getVersion()+getBuildID()
 }
 
 class AccentIcon {
@@ -53,21 +53,7 @@ class AccentIcon {
 }
 
 class SettingsViewModel: ObservableObject {
-#if canImport(UIKit)
+	@Published var settings: NFSettings = NFSettings()
-	@Published var settings: NFSettings = NFSettings(
-		showCompletedInHome: false,
-		tint: ColorCodable(uiColor: UIColor(named: "AccentColor")!),
-		showWhatsNew: true,
-		prevAppVersion: getVersion()+getBuildID()
-	)
-#elseif canImport(AppKit)
-	@Published var settings: NFSettings = NFSettings(
-		showCompletedInHome: false,
-		tint: ColorCodable(nsColor: NSColor(named: "AccentColor")!),
-		showWhatsNew: true,
-		prevAppVersion: getVersion()+getBuildID()
-	)
-#endif
 	
 	@Published var notifsGranted: Bool = false