mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-02 21:33:26 +00:00
RoomMemberDetailsScreen (#727)
* generated files * Revert "generated files" This reverts commit f62c1dbcd9e505083ad4ff17532e2c054e253187. * renaming files to RoomMembersList * completed the renaming of the list files * added generated files * basic setup of the view and the mock * added a new mock with a avatar * share/copy link * copyUserLink implemented * removed unimplemented tests * block user UI * navigation to room member details added * implemented but we require a sync from the Rust side * adjusted some UI test screens * alert for unblocking * completed * some tests * changelog * some unit tests * improved the tests * removed unused comment * Update ElementX/Sources/Services/Room/RoomProxy.swift Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com> * optional displayName * removing toggle * removed cancel title * Update UnitTests/Sources/RoomMemberDetailsViewModelTests.swift Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com> * removing Group * pr suggestion * better naming * removed capitalizingFirstLetter * Update ElementX/Sources/Other/Extensions/Alert.swift Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com> * trailing closure * removed useless catch clause * naming conformed to ignore --------- Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
This commit is contained in:
@@ -21,7 +21,7 @@ protocol AlertItem {
|
||||
}
|
||||
|
||||
extension View {
|
||||
func alert<Item, Actions, Message>(item: Binding<Item?>, actions: (Item) -> Actions, message: (Item) -> Message) -> some View where Item: AlertItem, Actions: View, Message: View {
|
||||
func alert<Item, Actions, Message>(item: Binding<Item?>, @ViewBuilder actions: (Item) -> Actions, @ViewBuilder message: (Item) -> Message) -> some View where Item: AlertItem, Actions: View, Message: View {
|
||||
let binding = Binding<Bool>(get: {
|
||||
item.wrappedValue != nil
|
||||
}, set: { newValue in
|
||||
@@ -32,7 +32,7 @@ extension View {
|
||||
return alert(item.wrappedValue?.title ?? "", isPresented: binding, presenting: item.wrappedValue, actions: actions, message: message)
|
||||
}
|
||||
|
||||
func alert<Item, Actions>(item: Binding<Item?>, actions: (Item) -> Actions) -> some View where Item: AlertItem, Actions: View {
|
||||
func alert<Item, Actions>(item: Binding<Item?>, @ViewBuilder actions: (Item) -> Actions) -> some View where Item: AlertItem, Actions: View {
|
||||
let binding = Binding<Bool>(get: {
|
||||
item.wrappedValue != nil
|
||||
}, set: { newValue in
|
||||
@@ -43,3 +43,29 @@ extension View {
|
||||
return alert(item.wrappedValue?.title ?? "", isPresented: binding, presenting: item.wrappedValue, actions: actions)
|
||||
}
|
||||
}
|
||||
|
||||
// Only for Alerts that display a simple error message with a message and one or two buttons
|
||||
struct ErrorAlertItem: AlertItem {
|
||||
struct Action {
|
||||
var title: String
|
||||
var action: () -> Void
|
||||
}
|
||||
|
||||
var title = ElementL10n.dialogTitleError
|
||||
var message = ElementL10n.unknownError
|
||||
var cancelAction = Action(title: ElementL10n.ok, action: { })
|
||||
var primaryAction: Action?
|
||||
}
|
||||
|
||||
extension View {
|
||||
func errorAlert(item: Binding<ErrorAlertItem?>) -> some View {
|
||||
alert(item: item) { item in
|
||||
Button(item.cancelAction.title) { item.cancelAction.action() }
|
||||
if let primaryAction = item.primaryAction {
|
||||
Button(primaryAction.title) { primaryAction.action() }
|
||||
}
|
||||
} message: { item in
|
||||
Text(item.message)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
//
|
||||
// Copyright 2023 New Vector Ltd
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
extension Sequence {
|
||||
func asyncMap<T>(_ transform: @escaping (Element) async -> T) async -> [T] {
|
||||
await withTaskGroup(of: T.self) { group in
|
||||
var transformedElements = [T]()
|
||||
|
||||
for element in self {
|
||||
group.addTask {
|
||||
await transform(element)
|
||||
}
|
||||
}
|
||||
|
||||
for await transformedElement in group {
|
||||
transformedElements.append(transformedElement)
|
||||
}
|
||||
|
||||
return transformedElements
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user