mirror of
https://github.com/writeas/writefreely-swiftui-multiplatform.git
synced 2024-11-15 01:11:02 +00:00
549ad3039f
* 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 https://github.com/sparkle-project/Sparkle/issues/2056 for more details.
Bug introduced by commit:
671b0540ac
* 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
147 lines
5.1 KiB
Swift
147 lines
5.1 KiB
Swift
import SwiftUI
|
|
|
|
#if os(macOS)
|
|
import Sparkle
|
|
#endif
|
|
|
|
@main
|
|
struct CheckForDebugModifier {
|
|
static func main() {
|
|
#if os(macOS)
|
|
if NSEvent.modifierFlags.contains(.shift) {
|
|
// Clear the launch-to-last-draft values to load a new draft.
|
|
UserDefaults.shared.setValue(false, forKey: WFDefaults.showAllPostsFlag)
|
|
UserDefaults.shared.setValue(nil, forKey: WFDefaults.selectedCollectionURL)
|
|
UserDefaults.shared.setValue(nil, forKey: WFDefaults.lastDraftURL)
|
|
} else {
|
|
// No-op
|
|
}
|
|
#endif
|
|
WriteFreely_MultiPlatformApp.main()
|
|
}
|
|
}
|
|
|
|
struct WriteFreely_MultiPlatformApp: App {
|
|
@StateObject private var model = WriteFreelyModel.shared
|
|
|
|
#if os(macOS)
|
|
@NSApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
|
|
@StateObject var updaterViewModel = MacUpdatesViewModel()
|
|
@State private var selectedTab = 0
|
|
#endif
|
|
|
|
var body: some Scene {
|
|
WindowGroup {
|
|
ContentView()
|
|
.onAppear(perform: {
|
|
if model.editor.showAllPostsFlag {
|
|
DispatchQueue.main.async {
|
|
self.model.selectedCollection = nil
|
|
self.model.showAllPosts = true
|
|
showLastDraftOrCreateNewLocalPost()
|
|
}
|
|
} else {
|
|
DispatchQueue.main.async {
|
|
self.model.selectedCollection = model.editor.fetchSelectedCollectionFromAppStorage()
|
|
self.model.showAllPosts = false
|
|
showLastDraftOrCreateNewLocalPost()
|
|
}
|
|
}
|
|
})
|
|
.environmentObject(model)
|
|
.environment(\.managedObjectContext, LocalStorageManager.standard.container.viewContext)
|
|
// .preferredColorScheme(preferences.selectedColorScheme) // See PreferencesModel for info.
|
|
}
|
|
.commands {
|
|
#if os(macOS)
|
|
CommandGroup(after: .appInfo) {
|
|
CheckForUpdatesView(updaterViewModel: updaterViewModel)
|
|
}
|
|
#endif
|
|
CommandGroup(replacing: .newItem, addition: {
|
|
Button("New Post") {
|
|
createNewLocalPost()
|
|
}
|
|
.keyboardShortcut("n", modifiers: [.command])
|
|
})
|
|
CommandGroup(after: .newItem) {
|
|
Button("Refresh Posts") {
|
|
DispatchQueue.main.async {
|
|
model.fetchUserCollections()
|
|
model.fetchUserPosts()
|
|
}
|
|
}
|
|
.disabled(!model.account.isLoggedIn)
|
|
.keyboardShortcut("r", modifiers: [.command])
|
|
}
|
|
SidebarCommands()
|
|
#if os(macOS)
|
|
PostCommands(model: model)
|
|
#endif
|
|
CommandGroup(after: .help) {
|
|
Button("Visit Support Forum") {
|
|
#if os(macOS)
|
|
NSWorkspace().open(model.helpURL)
|
|
#else
|
|
UIApplication.shared.open(model.helpURL)
|
|
#endif
|
|
}
|
|
}
|
|
ToolbarCommands()
|
|
TextEditingCommands()
|
|
}
|
|
|
|
#if os(macOS)
|
|
Settings {
|
|
TabView(selection: $selectedTab) {
|
|
MacAccountView()
|
|
.environmentObject(model)
|
|
.tabItem {
|
|
Image(systemName: "person.crop.circle")
|
|
Text("Account")
|
|
}
|
|
.tag(0)
|
|
MacPreferencesView(preferences: model.preferences)
|
|
.tabItem {
|
|
Image(systemName: "gear")
|
|
Text("Preferences")
|
|
}
|
|
.tag(1)
|
|
MacUpdatesView(updaterViewModel: updaterViewModel)
|
|
.tabItem {
|
|
Image(systemName: "arrow.down.circle")
|
|
Text("Updates")
|
|
}
|
|
.tag(2)
|
|
}
|
|
.frame(minWidth: 500, maxWidth: 500, minHeight: 200)
|
|
.padding()
|
|
// .preferredColorScheme(preferences.selectedColorScheme) // See PreferencesModel for info.
|
|
}
|
|
#endif
|
|
}
|
|
|
|
private func showLastDraftOrCreateNewLocalPost() {
|
|
if model.editor.lastDraftURL != nil {
|
|
self.model.selectedPost = model.editor.fetchLastDraftFromAppStorage()
|
|
} else {
|
|
createNewLocalPost()
|
|
}
|
|
}
|
|
|
|
private func createNewLocalPost() {
|
|
withAnimation {
|
|
// Un-set the currently selected post
|
|
self.model.selectedPost = nil
|
|
}
|
|
// Create the new-post managed object
|
|
let managedPost = model.editor.generateNewLocalPost(withFont: model.preferences.font)
|
|
withAnimation {
|
|
// Set it as the selectedPost
|
|
DispatchQueue.main.asyncAfter(deadline: .now()) {
|
|
self.model.selectedPost = managedPost
|
|
}
|
|
}
|
|
}
|
|
}
|