Page MenuHomeMusing Studio
Files F10669133

No OneTemporary
Actions

View Options

diff --git a/Shared/Models/WriteFreelyModel.swift b/Shared/Models/WriteFreelyModel.swift
index 801d842..63b9695 100644
--- a/Shared/Models/WriteFreelyModel.swift
+++ b/Shared/Models/WriteFreelyModel.swift
@@ -1,96 +1,101 @@
import Foundation
import WriteFreely
import Security
import Network
// MARK: - WriteFreelyModel
final class WriteFreelyModel: ObservableObject {
+
+ // MARK: - Models
@Published var account = AccountModel()
@Published var preferences = PreferencesModel()
@Published var posts = PostListModel()
@Published var editor = PostEditorModel()
- @Published var isLoggingIn: Bool = false
- @Published var isProcessingRequest: Bool = false
- @Published var hasNetworkConnection: Bool = true
- @Published var selectedPost: WFAPost?
- @Published var selectedCollection: WFACollection?
- @Published var showAllPosts: Bool = true
- @Published var isPresentingDeleteAlert: Bool = false
- @Published var postToDelete: WFAPost?
- @Published var hasError: Bool = false
- #if os(iOS)
- @Published var isPresentingSettingsView: Bool = false
- #endif
-
- static var shared = WriteFreelyModel()
+ // MARK: - Error handling
+ @Published var hasError: Bool = false
var currentError: Error? {
didSet {
#if DEBUG
print("⚠️ currentError -> didSet \(currentError?.localizedDescription ?? "nil")")
print(" > hasError was: \(self.hasError)")
#endif
DispatchQueue.main.async {
#if DEBUG
print(" > self.currentError != nil: \(self.currentError != nil)")
#endif
self.hasError = self.currentError != nil
#if DEBUG
print(" > hasError is now: \(self.hasError)")
#endif
}
}
}
+ // MARK: - State
+ @Published var isLoggingIn: Bool = false
+ @Published var isProcessingRequest: Bool = false
+ @Published var hasNetworkConnection: Bool = true
+ @Published var selectedPost: WFAPost?
+ @Published var selectedCollection: WFACollection?
+ @Published var showAllPosts: Bool = true
+ @Published var isPresentingDeleteAlert: Bool = false
+ @Published var postToDelete: WFAPost?
+#if os(iOS)
+ @Published var isPresentingSettingsView: Bool = false
+#endif
+
+ static var shared = WriteFreelyModel()
+
// swiftlint:disable line_length
let helpURL = URL(string: "https://discuss.write.as/c/help/5")!
let howToURL = URL(string: "https://discuss.write.as/t/using-the-writefreely-ios-app/1946")!
let reviewURL = URL(string: "https://apps.apple.com/app/id1531530896?action=write-review")!
let licensesURL = URL(string: "https://github.com/writeas/writefreely-swiftui-multiplatform/tree/main/Shared/Resources/Licenses")!
// swiftlint:enable line_length
internal var client: WFClient?
private let defaults = UserDefaults.shared
private let monitor = NWPathMonitor()
private let queue = DispatchQueue(label: "NetworkMonitor")
internal var postToUpdate: WFAPost?
init() {
DispatchQueue.main.async {
self.preferences.appearance = self.defaults.integer(forKey: WFDefaults.colorSchemeIntegerKey)
self.preferences.font = self.defaults.integer(forKey: WFDefaults.defaultFontIntegerKey)
self.account.restoreState()
if self.account.isLoggedIn {
guard let serverURL = URL(string: self.account.server) else {
self.currentError = AccountError.invalidServerURL
return
}
do {
guard let token = try self.fetchTokenFromKeychain(
username: self.account.username,
server: self.account.server
) else {
self.currentError = KeychainError.couldNotFetchAccessToken
return
}
self.account.login(WFUser(token: token, username: self.account.username))
self.client = WFClient(for: serverURL)
self.client?.user = self.account.user
self.fetchUserCollections()
self.fetchUserPosts()
} catch {
self.currentError = KeychainError.couldNotFetchAccessToken
}
}
}
monitor.pathUpdateHandler = { path in
DispatchQueue.main.async {
self.hasNetworkConnection = path.status == .satisfied
}
}
monitor.start(queue: queue)
}
}
diff --git a/WriteFreely-MultiPlatform.xcodeproj/xcuserdata/angelo.xcuserdatad/xcschemes/xcschememanagement.plist b/WriteFreely-MultiPlatform.xcodeproj/xcuserdata/angelo.xcuserdatad/xcschemes/xcschememanagement.plist
deleted file mode 100644
index 155f2da..0000000
--- a/WriteFreely-MultiPlatform.xcodeproj/xcuserdata/angelo.xcuserdatad/xcschemes/xcschememanagement.plist
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>SchemeUserState</key>
- <dict>
- <key>ActionExtension-iOS.xcscheme_^#shared#^_</key>
- <dict>
- <key>orderHint</key>
- <integer>0</integer>
- </dict>
- <key>WriteFreely-MultiPlatform (iOS).xcscheme_^#shared#^_</key>
- <dict>
- <key>orderHint</key>
- <integer>1</integer>
- </dict>
- <key>WriteFreely-MultiPlatform (macOS).xcscheme_^#shared#^_</key>
- <dict>
- <key>orderHint</key>
- <integer>2</integer>
- </dict>
- </dict>
-</dict>
-</plist>

File Metadata

Mime Type
text/x-diff
Expires
Thu, May 15, 3:59 PM (1 d, 14 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3239823

Event Timeline

musing studio · developers