felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-20 00:24:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'gil/SP1_space_creation' into gil/5231_SP3-1_Update_room_settings_for_Spaces

Browse Source 
# Conflicts:
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoomCoordinator.swift
#	RiotSwiftUI/Modules/Spaces/MatrixItemChooser/View/MatrixItemChooser.swift
This commit is contained in:
Gil Eluard
2022-02-21 15:27:05 +01:00
parent b53fae2f2b dacbaea946
commit b6fca44b8f
25 changed files with 181 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RiotSwiftUI/Modules/Spaces/MatrixItemChooser/View/MatrixItemChooser.swift
+16 -13
View File
@@ -31,23 +31,30 @@ struct MatrixItemChooser: View {
@Environment(\.theme) private var theme: ThemeSwiftUI
private var spacerHeight: CGFloat {
if viewModel.viewState.title != nil || viewModel.viewState.message != nil {
return 24
} else {
return 8
}
}
// MARK: Public
@ViewBuilder
var body: some View {
listContent
.background(Color.clear)
.modifier(WaitOverlay(allowUserInteraction: false, message: .constant(viewModel.viewState.loadingText), isLoading: .constant(viewModel.viewState.loading)))
.alert(isPresented: .constant(viewModel.viewState.error != nil), content: {
Alert(title: Text(MatrixKitL10n.error), message: Text(viewModel.viewState.error ?? ""), dismissButton: .cancel(Text(MatrixKitL10n.ok)))
})
.modifier(WaitOverlay(isLoading: .constant(viewModel.viewState.loading)))
.alert(isPresented: .constant(viewModel.viewState.error != nil)) {
Alert(title: Text(VectorL10n.error), message: Text(viewModel.viewState.error ?? ""), dismissButton: .cancel(Text(VectorL10n.ok)))
}
}
// MARK: Private
@ViewBuilder
private var listContent: some View {
ScrollView{
ScrollView {
headerView
LazyVStack(spacing: 0) {
ForEach(viewModel.viewState.sections) { section in
@@ -104,15 +111,11 @@ struct MatrixItemChooser: View {
.padding(.horizontal)
.accessibility(identifier: "messageText")
}
if viewModel.viewState.title != nil || viewModel.viewState.message != nil {
Spacer().frame(height: 24)
} else {
Spacer().frame(height: 8)
}
Spacer().frame(height: spacerHeight)
SearchBar(placeholder: VectorL10n.searchDefaultPlaceholder, text: $searchText)
.onChange(of: searchText, perform: { value in
.onChange(of: searchText) { value in
viewModel.send(viewAction: .searchTextChanged(searchText))
})
}
}
}
}