No OneTemporary
Actions

Size

6 KB

Subscribers

None

View Options

	diff --git a/Shared/WriteFreely_MultiPlatformApp.swift b/Shared/WriteFreely_MultiPlatformApp.swift
	index 5b71d5d..2b249d3 100644
	--- a/Shared/WriteFreely_MultiPlatformApp.swift
	+++ b/Shared/WriteFreely_MultiPlatformApp.swift
	@@ -1,120 +1,120 @@
	import SwiftUI

	@main
	struct CheckForDebugModifier {
	static func main() {
	#if os(macOS)
	if NSEvent.modifierFlags.contains(.shift) {
	print("Debug launch detected")
	// Run debug-mode launch code here
	} else {
	print("Normal launch detected")
	// Don't do anything
	}
	#endif
	WriteFreely_MultiPlatformApp.main()
	}
	}

	struct WriteFreely_MultiPlatformApp: App {
	@StateObject private var model = WriteFreelyModel()

	#if os(macOS)
	@State private var selectedTab = 0
	#endif

	var body: some Scene {
	WindowGroup {
	ContentView()
	.onAppear(perform: {
	if let lastDraft = model.editor.fetchLastDraftFromUserDefaults() {
	self.model.selectedPost = lastDraft
	} else {
	createNewLocalPost()
	}
	})
	.environmentObject(model)
	.environment(\.managedObjectContext, LocalStorageManager.persistentContainer.viewContext)
	// .preferredColorScheme(preferences.selectedColorScheme) // See PreferencesModel for info.
	}
	.commands {
	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()
	- PostCommands(post: model.selectedPost)
	+ PostCommands(model: model)
	CommandGroup(after: .help) {
	Button("Visit Support Forum") {
	#if os(macOS)
	NSWorkspace().open(model.helpURL)
	#else
	UIApplication.shared.open(model.helpURL)
	#endif
	}
	}
	}

	#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)
	}
	.frame(minWidth: 300, maxWidth: 300, minHeight: 200, maxHeight: 200)
	.padding()
	// .preferredColorScheme(preferences.selectedColorScheme) // See PreferencesModel for info.
	}
	#endif
	}

	private func createNewLocalPost() {
	withAnimation {
	self.model.selectedPost = nil
	}
	let managedPost = WFAPost(context: LocalStorageManager.persistentContainer.viewContext)
	managedPost.createdDate = Date()
	managedPost.title = ""
	managedPost.body = ""
	managedPost.status = PostStatus.local.rawValue
	managedPost.collectionAlias = nil
	switch model.preferences.font {
	case 1:
	managedPost.appearance = "sans"
	case 2:
	managedPost.appearance = "wrap"
	default:
	managedPost.appearance = "serif"
	}
	if let languageCode = Locale.current.languageCode {
	managedPost.language = languageCode
	managedPost.rtl = Locale.characterDirection(forLanguage: languageCode) == .rightToLeft
	}
	withAnimation {
	self.model.selectedPost = managedPost
	}
	}
	}
	diff --git a/macOS/Navigation/PostCommands.swift b/macOS/Navigation/PostCommands.swift
	index 2ba460b..8b81d07 100644
	--- a/macOS/Navigation/PostCommands.swift
	+++ b/macOS/Navigation/PostCommands.swift
	@@ -1,19 +1,38 @@
	import SwiftUI

	struct PostCommands: Commands {
	- @State var post: WFAPost?
	+ @ObservedObject var model: WriteFreelyModel
	+
	+ @FetchRequest(
	+ entity: WFACollection.entity(),
	+ sortDescriptors: [NSSortDescriptor(keyPath: \WFACollection.title, ascending: true)]
	+ ) var collections: FetchedResults<WFACollection>

	var body: some Commands {
	CommandMenu("Post") {
	- Button("Publish…") {
	- print("Published active post (not really): '\(post?.title ?? "untitled")'")
	- }
	- Button("Move…") {
	- print("Moved active post (not really): '\(post?.title ?? "untitled")'")
	- }
	- Button("Copy Link To Post") {
	- print("Copied URL to post (not really): '\(post?.title ?? "untitled")'")
	+ Group {
	+ Button("Publish…") {
	+ print("Clicked 'Publish…' for post '\(model.selectedPost?.title ?? "untitled")'")
	+ }
	+ .disabled(true)
	+ Button("Move…") {
	+ print("Clicked 'Move…' for post '\(model.selectedPost?.title ?? "untitled")'")
	+ }
	+ .disabled(true)
	+ Button(action: sendPostUrlToPasteboard, label: { Text("Copy Link To Published Post") })
	+ .disabled(model.selectedPost?.status == PostStatus.local.rawValue)
	}
	+ .disabled(model.selectedPost == nil \|\| !model.account.isLoggedIn)
	}
	}
	+
	+ private func sendPostUrlToPasteboard() {
	+ guard let activePost = model.selectedPost else { return }
	+ guard let postId = activePost.postId else { return }
	+ guard let urlString = activePost.slug != nil ?
	+ "\(model.account.server)/\((activePost.collectionAlias)!)/\((activePost.slug)!)" :
	+ "\(model.account.server)/\((postId))" else { return }
	+ NSPasteboard.general.clearContents()
	+ NSPasteboard.general.setString(urlString, forType: .string)
	+ }
	}

File Metadata

Mime Type: text/x-diff
Expires: Sat, May 17, 8:35 AM (1 d, 13 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 3241226

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions