writefreely/swiftui-multiplatform
2
0
Fork 0
mirror of https://github.com/writeas/writefreely-swiftui-multiplatform.git synced 2024-11-15 01:11:02 +00:00
Code Issues Releases Wiki Activity

Revert "Add error handling to Mac app"

Browse Source 
This reverts commit b1a8b8b29c.
This commit is contained in:
Angelo Stavrow 2022-05-31 07:36:43 -04:00
parent b1a8b8b29c
commit fd37a163b9
No known key found for this signature in database
GPG Key ID: 1A49C7064E060EEE
5 changed files with 2 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Shared/WriteFreely_MultiPlatformApp.swift
View File

@ -115,7 +115,6 @@ struct WriteFreely_MultiPlatformApp: App {
} }
.tag(2) .tag(2)
} }
.withErrorHandling()
.frame(minWidth: 500, maxWidth: 500, minHeight: 200) .frame(minWidth: 500, maxWidth: 500, minHeight: 200)
.padding() .padding()
// .preferredColorScheme(preferences.selectedColorScheme) // See PreferencesModel for info. // .preferredColorScheme(preferences.selectedColorScheme) // See PreferencesModel for info.

11
macOS/PostEditor/PostEditorView.swift
View File

@ -2,7 +2,6 @@ import SwiftUI
struct PostEditorView: View { struct PostEditorView: View {
@EnvironmentObject var model: WriteFreelyModel @EnvironmentObject var model: WriteFreelyModel
@EnvironmentObject var errorHandling: ErrorHandling
@ObservedObject var post: WFAPost @ObservedObject var post: WFAPost
@State private var isHovering: Bool = false @State private var isHovering: Bool = false
@ -39,16 +38,6 @@ struct PostEditorView: View {
LocalStorageManager.standard.saveContext() LocalStorageManager.standard.saveContext()
} }
}) })
.onChange(of: model.hasError) { value in
if value {
if let error = model.currentError {
self.errorHandling.handle(error: error)
} else {
self.errorHandling.handle(error: AppError.genericError())
}
model.hasError = false
}
}
.onDisappear(perform: { .onDisappear(perform: {
DispatchQueue.main.async { DispatchQueue.main.async {
model.editor.clearLastDraft() model.editor.clearLastDraft()

11
macOS/Settings/MacAccountView.swift
View File

@ -2,22 +2,11 @@ import SwiftUI
struct MacAccountView: View { struct MacAccountView: View {
@EnvironmentObject var model: WriteFreelyModel @EnvironmentObject var model: WriteFreelyModel
@EnvironmentObject var errorHandling: ErrorHandling
var body: some View { var body: some View {
Form { Form {
AccountView() AccountView()
} }
.onChange(of: model.hasError) { value in
if value {
if let error = model.currentError {
self.errorHandling.handle(error: error)
} else {
self.errorHandling.handle(error: AppError.genericError())
}
model.hasError = false
}
}
} }
} }

13
macOS/Settings/MacPreferencesView.swift
View File

@ -1,9 +1,6 @@
import SwiftUI import SwiftUI
struct MacPreferencesView: View { struct MacPreferencesView: View {
@EnvironmentObject var model: WriteFreelyModel
@EnvironmentObject var errorHandling: ErrorHandling
@ObservedObject var preferences: PreferencesModel @ObservedObject var preferences: PreferencesModel
var body: some View { var body: some View {
@ -11,16 +8,6 @@ struct MacPreferencesView: View {
PreferencesView(preferences: preferences) PreferencesView(preferences: preferences)
Spacer() Spacer()
} }
.onChange(of: model.hasError) { value in
if value {
if let error = model.currentError {
self.errorHandling.handle(error: error)
} else {
self.errorHandling.handle(error: AppError.genericError())
}
model.hasError = false
}
}
} }
} }

13
macOS/Settings/MacUpdatesView.swift
View File

@ -2,9 +2,6 @@ import SwiftUI
import Sparkle import Sparkle
struct MacUpdatesView: View { struct MacUpdatesView: View {
@EnvironmentObject var model: WriteFreelyModel
@EnvironmentObject var errorHandling: ErrorHandling
@ObservedObject var updaterViewModel: MacUpdatesViewModel @ObservedObject var updaterViewModel: MacUpdatesViewModel
@AppStorage(WFDefaults.automaticallyChecksForUpdates, store: UserDefaults.shared) @AppStorage(WFDefaults.automaticallyChecksForUpdates, store: UserDefaults.shared)
@ -84,16 +81,6 @@ that can cause crashes and data loss.
.onChange(of: subscribeToBetaUpdates) { _ in .onChange(of: subscribeToBetaUpdates) { _ in
updaterViewModel.toggleAllowedChannels() updaterViewModel.toggleAllowedChannels()
} }
.onChange(of: model.hasError) { value in
if value {
if let error = model.currentError {
self.errorHandling.handle(error: error)
} else {
self.errorHandling.handle(error: AppError.genericError())
}
model.hasError = false
}
}
} }
} }