Clean up project warnings (#199)

* Set "recommended project settings" for Mac app

* Add default fallback for font typingAttribute

* Clean up linter errors

* Update extension iconset

* Fix spm errors and upgrade sparkle (#203)

* Switch WriteFreely package import from ssh to https

* Sign macOS project target for Development

This fixes a crash-on-launch bug when running Product > Run from Xcode (Product > Archive should work correctly). See sparkle-project/Sparkle#2056 for more details.

Bug introduced by commit:
671b054

* Update Sparkle to v2.0 from official repo

Previously, we forked the repo to the WriteFreely org because Sparkle didn't support tag-based SPM updates. We therefore had to pull from the `master` branch, so forking insulated us from unexpected changes.

As of 2.x Sparkle now allows for tag-based updating via SPM; we'll allow patch updates but stop short of 2.1 until we can vet changes.

* Add MacUpdatesViewModel ObservableObject

* Use MacUpdatesViewModel to handle Sparkle update logic

ActionExtension-iOS/Media.xcassets/AppIconExtension.appiconset/Contents.json

@@ -1,93 +1,109 @@
 {
   "images" : [
     {
+      "filename" : "notification-icon@2x.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "20x20"
     },
     {
+      "filename" : "notification-icon@3x.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "20x20"
     },
     {
+      "filename" : "icon-small@2x.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "29x29"
     },
     {
+      "filename" : "icon-small@3x.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "29x29"
     },
     {
+      "filename" : "icon-40@2x.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "40x40"
     },
     {
+      "filename" : "icon-40@3x.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "40x40"
     },
     {
-      "filename" : "AppIconExtension@2x.png",
+      "filename" : "icon-60@2x.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "60x60"
     },
     {
-      "filename" : "AppIconExtension@3x.png",
+      "filename" : "icon-60@3x.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "60x60"
     },
     {
+      "filename" : "notification-icon~ipad.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "20x20"
     },
     {
+      "filename" : "notification-icon~ipad@2x.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "20x20"
     },
     {
+      "filename" : "icon-small.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "29x29"
     },
     {
+      "filename" : "icon-small@2x-1.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "29x29"
     },
     {
+      "filename" : "icon-40.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "40x40"
     },
     {
+      "filename" : "icon-40@2x-1.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "40x40"
     },
     {
+      "filename" : "icon-76.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "76x76"
     },
     {
+      "filename" : "icon-76@2x.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "76x76"
     },
     {
+      "filename" : "icon-83.5@2x.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "83.5x83.5"
     },
     {
+      "filename" : "ios-marketing.png",
       "idiom" : "ios-marketing",
       "scale" : "1x",
       "size" : "1024x1024"

Shared/Extensions/WriteFreelyModel+APIHandlers.swift

@@ -147,17 +147,8 @@ extension WriteFreelyModel {
                     } else {
                         DispatchQueue.main.async {
                             let managedPost = WFAPost(context: LocalStorageManager.standard.container.viewContext)
-                            managedPost.postId = fetchedPost.postId
-                            managedPost.slug = fetchedPost.slug
-                            managedPost.appearance = fetchedPost.appearance
-                            managedPost.language = fetchedPost.language
-                            managedPost.rtl = fetchedPost.rtl ?? false
-                            managedPost.createdDate = fetchedPost.createdDate
-                            managedPost.updatedDate = fetchedPost.updatedDate
-                            managedPost.title = fetchedPost.title ?? ""
-                            managedPost.body = fetchedPost.body
+                            self.importData(from: fetchedPost, into: managedPost)
                             managedPost.collectionAlias = fetchedPost.collectionAlias
-                            managedPost.status = PostStatus.published.rawValue
                             managedPost.wasDeletedFromServer = false
                         }
                     }
@@ -193,16 +184,7 @@ extension WriteFreelyModel {
             let fetchedPost = try result.get()
             // If this is an updated post, check it against postToUpdate.
             if let updatingPost = self.postToUpdate {
-                updatingPost.appearance = fetchedPost.appearance
-                updatingPost.body = fetchedPost.body
-                updatingPost.createdDate = fetchedPost.createdDate
-                updatingPost.language = fetchedPost.language
-                updatingPost.postId = fetchedPost.postId
-                updatingPost.rtl = fetchedPost.rtl ?? false
-                updatingPost.slug = fetchedPost.slug
-                updatingPost.status = PostStatus.published.rawValue
-                updatingPost.title = fetchedPost.title ?? ""
-                updatingPost.updatedDate = fetchedPost.updatedDate
+                importData(from: fetchedPost, into: updatingPost)
                 DispatchQueue.main.async {
                     LocalStorageManager.standard.saveContext()
                 }
@@ -224,16 +206,7 @@ extension WriteFreelyModel {
                 do {
                     let cachedPostsResults = try LocalStorageManager.standard.container.viewContext.fetch(request)
                     guard let cachedPost = cachedPostsResults.first else { return }
-                    cachedPost.appearance = fetchedPost.appearance
-                    cachedPost.body = fetchedPost.body
-                    cachedPost.createdDate = fetchedPost.createdDate
-                    cachedPost.language = fetchedPost.language
-                    cachedPost.postId = fetchedPost.postId
-                    cachedPost.rtl = fetchedPost.rtl ?? false
-                    cachedPost.slug = fetchedPost.slug
-                    cachedPost.status = PostStatus.published.rawValue
-                    cachedPost.title = fetchedPost.title ?? ""
-                    cachedPost.updatedDate = fetchedPost.updatedDate
+                    importData(from: fetchedPost, into: cachedPost)
                     DispatchQueue.main.async {
                         LocalStorageManager.standard.saveContext()
                     }
@@ -258,16 +231,7 @@ extension WriteFreelyModel {
         do {
             let fetchedPost = try result.get()
             guard let cachedPost = self.selectedPost else { return }
-            cachedPost.appearance = fetchedPost.appearance
-            cachedPost.body = fetchedPost.body
-            cachedPost.createdDate = fetchedPost.createdDate
-            cachedPost.language = fetchedPost.language
-            cachedPost.postId = fetchedPost.postId
-            cachedPost.rtl = fetchedPost.rtl ?? false
-            cachedPost.slug = fetchedPost.slug
-            cachedPost.status = PostStatus.published.rawValue
-            cachedPost.title = fetchedPost.title ?? ""
-            cachedPost.updatedDate = fetchedPost.updatedDate
+            importData(from: fetchedPost, into: cachedPost)
             cachedPost.hasNewerRemoteCopy = false
             DispatchQueue.main.async {
                 LocalStorageManager.standard.saveContext()
@@ -298,4 +262,17 @@ extension WriteFreelyModel {
             print(error)
         }
     }
+
+    private func importData(from fetchedPost: WFPost, into cachedPost: WFAPost) {
+        cachedPost.appearance = fetchedPost.appearance
+        cachedPost.body = fetchedPost.body
+        cachedPost.createdDate = fetchedPost.createdDate
+        cachedPost.language = fetchedPost.language
+        cachedPost.postId = fetchedPost.postId
+        cachedPost.rtl = fetchedPost.rtl ?? false
+        cachedPost.slug = fetchedPost.slug
+        cachedPost.status = PostStatus.published.rawValue
+        cachedPost.title = fetchedPost.title ?? ""
+        cachedPost.updatedDate = fetchedPost.updatedDate
+    }
 }

Shared/LocalStorageManager.swift

@@ -59,7 +59,7 @@ private extension LocalStorageManager {
             container.persistentStoreDescriptions.first!.url = sharedStoreURL
         }
 
-        container.loadPersistentStores { description, error in
+        container.loadPersistentStores { _, error in
             if let error = error {
                 fatalError("Core Data store failed to load with error: \(error)")
             }

Shared/WriteFreely_MultiPlatformApp.swift

@@ -25,8 +25,8 @@ struct WriteFreely_MultiPlatformApp: App {
     @StateObject private var model = WriteFreelyModel.shared
 
     #if os(macOS)
-    // swiftlint:disable:next weak_delegate
     @NSApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
+    @StateObject var updaterViewModel = MacUpdatesViewModel()
     @State private var selectedTab = 0
     #endif
 
@@ -47,25 +47,16 @@ struct WriteFreely_MultiPlatformApp: App {
                             showLastDraftOrCreateNewLocalPost()
                         }
                     }
-//                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-//                        if model.editor.lastDraftURL != nil {
-//                            self.model.selectedPost = model.editor.fetchLastDraftFromAppStorage()
-//                        } else {
-//                            createNewLocalPost()
-//                        }
-//                    }
                 })
                 .environmentObject(model)
                 .environment(\.managedObjectContext, LocalStorageManager.standard.container.viewContext)
 //                .preferredColorScheme(preferences.selectedColorScheme)    // See PreferencesModel for info.
         }
         .commands {
             #if os(macOS)
-            CommandGroup(after: .appInfo, addition: {
-                Button("Check For Updates") {
-                    SUUpdater.shared()?.checkForUpdates(self)
-                }
-            })
+            CommandGroup(after: .appInfo) {
+                CheckForUpdatesView(updaterViewModel: updaterViewModel)
+            }
             #endif
             CommandGroup(replacing: .newItem, addition: {
                 Button("New Post") {
@@ -116,7 +107,7 @@ struct WriteFreely_MultiPlatformApp: App {
                         Text("Preferences")
                     }
                     .tag(1)
-                MacUpdatesView()
+                MacUpdatesView(updaterViewModel: updaterViewModel)
                     .tabItem {
                         Image(systemName: "arrow.down.circle")
                         Text("Updates")