mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-02 12:07:55 +00:00
Various tweaks (#1129)
* Fixes #1121 - Hide the loading indicator after the logout task finishes * Manually restart the sync only when entering the `error` state * Use stopSync instead of the roomListService directly on client deinit * Replace WeakClientProxyWrapper with callback based delegate * Fix homescreen user avatar not automatically updating * Replace default Build SDK profile with reldbg, which is fast but also doesn't crash * Always show the loading indicator when the room list is not in a `running` state * Implement delayed user indicator presentations through the normal API * Fix the unit tests * Replace UserIndicatorController delayedIndicators dictionary with a plain set
This commit is contained in:
@@ -21,6 +21,7 @@ class UserIndicatorController: ObservableObject, UserIndicatorControllerProtocol
|
||||
|
||||
private var dismisalTimer: Timer?
|
||||
private var displayTimes = [String: Date]()
|
||||
private var delayedIndicators = Set<String>()
|
||||
|
||||
var nonPersistentDisplayDuration = 2.5
|
||||
var minimumDisplayDuration = 0.5
|
||||
@@ -51,12 +52,27 @@ class UserIndicatorController: ObservableObject, UserIndicatorControllerProtocol
|
||||
)
|
||||
}
|
||||
|
||||
func submitIndicator(_ indicator: UserIndicator) {
|
||||
func submitIndicator(_ indicator: UserIndicator, delay: Duration?) {
|
||||
if let index = indicatorQueue.firstIndex(where: { $0.id == indicator.id }) {
|
||||
indicatorQueue[index] = indicator
|
||||
} else {
|
||||
retractIndicatorWithId(indicator.id)
|
||||
indicatorQueue.append(indicator)
|
||||
if let delay {
|
||||
delayedIndicators.insert(indicator.id)
|
||||
Timer.scheduledTimer(withTimeInterval: Double(delay.components.seconds), repeats: false) { [weak self] _ in
|
||||
guard let self else { return }
|
||||
|
||||
guard delayedIndicators.contains(indicator.id) else {
|
||||
return
|
||||
}
|
||||
|
||||
retractIndicatorWithId(indicator.id)
|
||||
indicatorQueue.append(indicator)
|
||||
delayedIndicators.remove(indicator.id)
|
||||
}
|
||||
} else {
|
||||
retractIndicatorWithId(indicator.id)
|
||||
indicatorQueue.append(indicator)
|
||||
}
|
||||
}
|
||||
|
||||
displayTimes[indicator.id] = .now
|
||||
@@ -69,6 +85,8 @@ class UserIndicatorController: ObservableObject, UserIndicatorControllerProtocol
|
||||
}
|
||||
|
||||
func retractIndicatorWithId(_ id: String) {
|
||||
delayedIndicators.remove(id)
|
||||
|
||||
guard let displayTime = displayTimes[id], abs(displayTime.timeIntervalSinceNow) <= minimumDisplayDuration else {
|
||||
indicatorQueue.removeAll { $0.id == id }
|
||||
return
|
||||
|
||||
@@ -18,19 +18,14 @@ import Foundation
|
||||
|
||||
// sourcery: AutoMockable
|
||||
protocol UserIndicatorControllerProtocol: CoordinatorProtocol {
|
||||
func submitIndicator(_ indicator: UserIndicator)
|
||||
func submitIndicator(_ indicator: UserIndicator, delay: Duration?)
|
||||
func retractIndicatorWithId(_ id: String)
|
||||
func retractAllIndicators()
|
||||
var alertInfo: AlertInfo<UUID>? { get set }
|
||||
}
|
||||
|
||||
extension UserIndicatorControllerProtocol {
|
||||
/// Allows to submit a delayed indicator, this returns a Task so that it's also possible to cancel the action
|
||||
func submitIndicator(_ indicator: UserIndicator, delay: Duration) -> Task<Void, Never> {
|
||||
Task { @MainActor in
|
||||
try? await Task.sleep(for: delay)
|
||||
guard !Task.isCancelled else { return }
|
||||
submitIndicator(indicator)
|
||||
}
|
||||
func submitIndicator(_ indicator: UserIndicator) {
|
||||
submitIndicator(indicator, delay: nil)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user