Mastodon/IceCubes
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2025-02-04 00:17:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add a progress indicator when posting a new post

Browse Source
This commit is contained in:
Thomas Ricouard 2024-01-09 16:17:34 +01:00
parent b7e8f63e86
commit 5c1f113c54
5 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Packages/StatusKit/Sources/StatusKit/Editor/MainView.swift
View File

@ -44,6 +44,9 @@ extension StatusEditor {
NavigationStack {
ScrollView {
VStackLayout(spacing: 0) {
if mainSEVM.isPosting {
ProgressView(value: mainSEVM.postingProgress, total: 100.0)
}
EditorView(
viewModel: mainSEVM,
followUpSEVMs: $followUpSEVMs,

1
Packages/StatusKit/Sources/StatusKit/Editor/ToolbarItems.swift
View File

@ -105,7 +105,6 @@ extension StatusEditor {
@discardableResult
private func postStatus(with model: ViewModel, isMainPost: Bool) async -> Status? {
let status = await model.postStatus()
if status != nil, isMainPost {
close()
SoundEffectManager.shared.playSound(.tootSent)

37
Packages/StatusKit/Sources/StatusKit/Editor/ViewModel.swift
View File

@ -87,7 +87,10 @@ extension StatusEditor {
var spoilerOn: Bool = false
var spoilerText: String = ""
var postingProgress: Double = 0.0
var postingTimer: Timer?
var isPosting: Bool = false
var mediaPickers: [PhotosPickerItem] = [] {
didSet {
if mediaPickers.count > 4 {
@ -185,6 +188,19 @@ extension StatusEditor {
func postStatus() async -> Status? {
guard let client else { return nil }
do {
if postingTimer == nil {
Timer.scheduledTimer(withTimeInterval: 0.05, repeats: true) { timer in
Task { @MainActor in
if self.postingProgress < 100 {
self.postingProgress += 0.5
}
if self.postingProgress >= 100 {
self.postingTimer?.invalidate()
self.postingTimer = nil
}
}
}
}
isPosting = true
let postStatus: Status?
var pollData: StatusData.PollData?
@ -204,20 +220,27 @@ extension StatusEditor {
switch mode {
case .new, .replyTo, .quote, .mention, .shareExtension:
postStatus = try await client.post(endpoint: Statuses.postStatus(json: data))
if let postStatus {
StreamWatcher.shared.emmitPostEvent(for: postStatus)
}
case let .edit(status):
postStatus = try await client.put(endpoint: Statuses.editStatus(id: status.id, json: data))
if let postStatus {
StreamWatcher.shared.emmitEditEvent(for: postStatus)
}
}
HapticManager.shared.fireHaptic(.notification(.success))
postingTimer?.invalidate()
postingTimer = nil
if let postStatus {
StreamWatcher.shared.emmitEditEvent(for: postStatus)
HapticManager.shared.fireHaptic(.notification(.success))
withAnimation {
postingProgress = 99.0
}
try await Task.sleep(for: .seconds(0.5))
}
if hasExplicitlySelectedLanguage, let selectedLanguage {
preferences?.markLanguageAsSelected(isoCode: selectedLanguage)
}
isPosting = false
return postStatus
} catch {
if let error = error as? Models.ServerError {

2
Packages/StatusKit/Sources/StatusKit/Row/StatusRowViewModel.swift
View File

@ -280,8 +280,8 @@ import SwiftUI
func delete() async {
do {
_ = try await client.delete(endpoint: Statuses.status(id: status.id))
StreamWatcher.shared.emmitDeleteEvent(for: status.id)
_ = try await client.delete(endpoint: Statuses.status(id: status.id))
} catch {}
}

7
Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowMediaPreviewView.swift
View File

@ -8,6 +8,7 @@ import SwiftUI
@MainActor
public struct StatusRowMediaPreviewView: View {
@Environment(\.isPresented) private var isPresented
@Environment(\.openWindow) private var openWindow
@Environment(\.extraLeadingInset) private var extraLeadingInset: CGFloat
@Environment(\.isCompact) private var isCompact: Bool
@ -31,7 +32,11 @@ public struct StatusRowMediaPreviewView: View {
{
return sceneDelegate.windowWidth * 0.80
}
return sceneDelegate.windowWidth
if isPresented && UIDevice.current.userInterfaceIdiom == .pad {
return sceneDelegate.windowWidth * 0.50
} else {
return sceneDelegate.windowWidth
}
#endif
}