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

Only display unencrypted rooms which we can use with the chat view.

Browse Source
This commit is contained in:
David Langley
2021-09-21 08:06:27 +01:00
parent 0e62e9b80d
commit 3bc582c8b5
4 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/View/TemplateRoomChat.swift
View File

@@ -68,9 +68,11 @@ struct TemplateRoomChat: View {
.accessibility(identifier: "loadingProgress")
} else if case .failedToInitialize = viewModel.viewState.roomInitializationStatus {
Text("Sorry, We failed to load the room.")
.foregroundColor(theme.colors.primaryContent)
.accessibility(identifier: "errorMessage")
} else if viewModel.viewState.bubbles.isEmpty {
Text("There are no messages in this room yet.")
.foregroundColor(theme.colors.primaryContent)
.accessibility(identifier: "errorMessage")
} else {
bubbleList

6
RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/MatrixSDK/TemplateRoomListService.swift
View File

@@ -34,7 +34,11 @@ class TemplateRoomListService: TemplateRoomListServiceProtocol {
init(session: MXSession) {
self.session = session
self.roomsSubject = CurrentValueSubject(session.rooms.map(TemplateRoomListRoom.init(mxRoom:)))
let unencryptedRooms = session.rooms
.filter(\.summary.isEncrypted)
.map(TemplateRoomListRoom.init(mxRoom:))
self.roomsSubject = CurrentValueSubject(unencryptedRooms)
}
}

3
RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/View/TemplateRoomList.swift
View File

@@ -31,7 +31,7 @@ struct TemplateRoomList: View {
var body: some View {
listContent
.navigationTitle("Rooms")
.navigationTitle("Unencrypted Rooms")
.toolbar {
ToolbarItem(placement: .primaryAction) {
Button(VectorL10n.done) {
@@ -45,6 +45,7 @@ struct TemplateRoomList: View {
var listContent: some View {
if viewModel.viewState.rooms.isEmpty {
Text("No Rooms")
.foregroundColor(theme.colors.primaryContent)
.accessibility(identifier: "errorMessage")
} else {
ScrollView{

17
RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModel.swift
View File

@@ -38,22 +38,21 @@ class TemplateRoomListViewModel: TemplateRoomListViewModelType, TemplateRoomList
init(templateRoomListService: TemplateRoomListServiceProtocol) {
self.templateRoomListService = templateRoomListService
super.init(initialViewState: Self.defaultState(templateRoomListService: templateRoomListService))
templateRoomListService.roomsSubject
.map(TemplateRoomListStateAction.updateRooms)
.receive(on: DispatchQueue.main)
.sink(receiveValue: { [weak self] action in
self?.dispatch(action:action)
})
.store(in: &cancellables)
startObservingRooms()
}
private static func defaultState(templateRoomListService: TemplateRoomListServiceProtocol) -> TemplateRoomListViewState {
return TemplateRoomListViewState(rooms: templateRoomListService.roomsSubject.value)
}
private func startObservingRooms() {
let roomsUpdatePublisher = templateRoomListService.roomsSubject
.map(TemplateRoomListStateAction.updateRooms)
.eraseToAnyPublisher()
dispatch(actionPublisher: roomsUpdatePublisher)
}
// MARK: - Public
override func process(viewAction: TemplateRoomListViewAction) {