mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2024-06-14 11:19:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Editor: Properly close window on Catalyst

Browse source
This commit is contained in:
Thomas Ricouard 2023-10-27 11:39:02 +02:00
parent 5a52eb50e9
commit 3f3ea4ff68
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Packages/Status/Sources/Status/Editor/StatusEditorView.swift
View file

@ -19,6 +19,7 @@ public struct StatusEditorView: View {
@Environment(Client.self) private var client
@Environment(CurrentAccount.self) private var currentAccount
@Environment(\.dismiss) private var dismiss
@Environment(\.dismissWindow) private var dismissWindow
@Environment(\.modelContext) private var context
@State private var viewModel: StatusEditorViewModel
@ -88,7 +89,7 @@ public struct StatusEditorView: View {
viewModel.preferences = preferences
viewModel.prepareStatusText()
if !client.isAuth {
dismiss()
close()
NotificationCenter.default.post(name: .shareSheetClose,
object: nil)
}
@ -140,7 +141,7 @@ public struct StatusEditorView: View {
if viewModel.shouldDisplayDismissWarning {
isDismissAlertPresented = true
} else {
dismiss()
close()
NotificationCenter.default.post(name: .shareSheetClose,
object: nil)
}
@ -153,13 +154,13 @@ public struct StatusEditorView: View {
isPresented: $isDismissAlertPresented,
actions: {
Button("status.draft.delete", role: .destructive) {
dismiss()
close()
NotificationCenter.default.post(name: .shareSheetClose,
object: nil)
}
Button("status.draft.save") {
context.insert(Draft(content: viewModel.statusText.string))
dismiss()
close()
NotificationCenter.default.post(name: .shareSheetClose,
object: nil)
}
@ -211,7 +212,7 @@ public struct StatusEditorView: View {
private func postStatus() async {
let status = await viewModel.postStatus()
if status != nil {
dismiss()
close()
SoundEffectManager.shared.playSound(of: .tootSent)
NotificationCenter.default.post(name: .shareSheetClose,
object: nil)
@ -289,4 +290,12 @@ public struct StatusEditorView: View {
)
}
}
private func close() {
if ProcessInfo.processInfo.isMacCatalystApp {
dismissWindow()
} else {
dismiss()
}
}
}