swift/Beam
swift/Beam
1
0
Fork 0
mirror of https://github.com/element-hq/element-x-ios.git synced 2025-03-10 21:39:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add UserIndicator.disableInteractiveDismiss (#993)

Browse Source
This commit is contained in:
Alfonso Grillo 2023-05-31 12:56:58 +02:00 committed by GitHub
parent 30c39130fc
commit 87075eecfd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ElementX/Sources/Other/UserIndicator/UserIndicator.swift
View File

@ -17,9 +17,13 @@
import Combine
import Foundation
enum UserIndicatorType {
enum UserIndicatorType: Equatable {
case toast
case modal
case modal(interactiveDismissDisabled: Bool)
static var modal: Self {
.modal(interactiveDismissDisabled: false)
}
}
struct UserIndicator: Equatable, Identifiable {
@ -51,4 +55,13 @@ struct UserIndicator: Equatable, Identifiable {
return progress.publisher.eraseToAnyPublisher()
}
}
var interactiveDismissDisabled: Bool {
switch type {
case .toast:
return false
case .modal(let interactiveDismissDisabled):
return interactiveDismissDisabled
}
}
}

1
ElementX/Sources/Other/UserIndicator/UserIndicatorModalView.swift
View File

@ -54,6 +54,7 @@ struct UserIndicatorModalView: View {
.frame(maxWidth: .infinity, maxHeight: .infinity)
.background(.black.opacity(0.1))
.ignoresSafeArea()
.interactiveDismissDisabled(indicator.interactiveDismissDisabled)
}
}

2
ElementX/Sources/Screens/CreateRoom/CreateRoomViewModel.swift
View File

@ -168,7 +168,7 @@ class CreateRoomViewModel: CreateRoomViewModelType, CreateRoomViewModelProtocol
private func showLoadingIndicator() {
userIndicatorController?.submitIndicator(UserIndicator(id: Self.loadingIndicatorIdentifier,
type: .modal,
type: .modal(interactiveDismissDisabled: true),
title: L10n.commonLoading,
persistent: true))
}

10
ElementX/Sources/Screens/RoomDetailsEditScreen/RoomDetailsEditScreenViewModel.swift
View File

@ -80,7 +80,10 @@ class RoomDetailsEditScreenViewModel: RoomDetailsEditScreenViewModelType, RoomDe
defer {
userIndicatorController.retractIndicatorWithId(userIndicatorID)
}
userIndicatorController.submitIndicator(UserIndicator(id: userIndicatorID, type: .modal, title: L10n.commonLoading, persistent: true))
userIndicatorController.submitIndicator(UserIndicator(id: userIndicatorID,
type: .modal(interactiveDismissDisabled: true),
title: L10n.commonLoading,
persistent: true))
let mediaResult = await mediaPreprocessor.processMedia(at: url)
@ -101,7 +104,10 @@ class RoomDetailsEditScreenViewModel: RoomDetailsEditScreenViewModelType, RoomDe
defer {
userIndicatorController.retractIndicatorWithId(userIndicatorID)
}
userIndicatorController.submitIndicator(UserIndicator(id: userIndicatorID, type: .modal, title: L10n.screenRoomDetailsUpdatingRoom, persistent: true))
userIndicatorController.submitIndicator(UserIndicator(id: userIndicatorID,
type: .modal(interactiveDismissDisabled: true),
title: L10n.screenRoomDetailsUpdatingRoom,
persistent: true))
do {
try await withThrowingTaskGroup(of: Void.self) { group in