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

Cleanup, documentation and ui tests.

Browse Source
This commit is contained in:
David Langley
2021-09-20 08:47:28 +01:00
parent 39409f49b4
commit 205bc35285
46 changed files with 414 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModel.swift
+18 -6
View File
@@ -36,16 +36,26 @@ class TemplateRoomChatViewModel: TemplateRoomChatViewModelType, TemplateRoomChat
// MARK: Public
var completion: ((TemplateRoomChatViewModelResult) -> Void)?
var callback: ((TemplateRoomChatViewModelAction) -> Void)?
// MARK: - Setup
init(templateRoomChatService: TemplateRoomChatServiceProtocol) {
self.templateRoomChatService = templateRoomChatService
super.init(initialViewState: Self.defaultState(templateRoomChatService: templateRoomChatService))
setupRoomInitializationObserving()
setupMessageObserving()
}
private func setupRoomInitializationObserving() {
let initializationPublisher = templateRoomChatService
.roomInitializationStatus
.map(TemplateRoomChatStateAction.updateRoomInitializationStatus)
.eraseToAnyPublisher()
dispatch(actionPublisher: initializationPublisher)
}
private func setupMessageObserving() {
let messageActionPublisher = templateRoomChatService
.chatMessagesSubject
@@ -58,7 +68,7 @@ class TemplateRoomChatViewModel: TemplateRoomChatViewModelType, TemplateRoomChat
private static func defaultState(templateRoomChatService: TemplateRoomChatServiceProtocol) -> TemplateRoomChatViewState {
let bubbles = makeBubbles(messages: templateRoomChatService.chatMessagesSubject.value)
let bindings = TemplateRoomChatViewModelBindings(messageInput: "")
return TemplateRoomChatViewState(roomName: templateRoomChatService.roomName, bubbles: bubbles, bindings: bindings)
return TemplateRoomChatViewState(roomInitializationStatus: templateRoomChatService.roomInitializationStatus.value, roomName: templateRoomChatService.roomName, bubbles: bubbles, bindings: bindings)
}
private static func makeBubbles(messages: [TemplateRoomChatMessage]) -> [TemplateRoomChatBubble] {
@@ -71,7 +81,7 @@ class TemplateRoomChatViewModel: TemplateRoomChatViewModelType, TemplateRoomChat
let messageItem = TemplateRoomChatBubbleItem(
id: message.id,
timestamp: message.timestamp,
content: .message(TemplateRoomChatBubbleMessageContent(body: message.body))
content: .message(message.content)
)
if i > 0,
let lastBubbleId = bubbleOrder.last,
@@ -85,7 +95,7 @@ class TemplateRoomChatViewModel: TemplateRoomChatViewModelType, TemplateRoomChat
let item = TemplateRoomChatBubbleItem(
id: message.id,
timestamp: message.timestamp,
content: .message(TemplateRoomChatBubbleMessageContent(body: message.body))
content: .message(message.content)
)
lastBubble.items.append(item)
bubbleMap[lastBubble.id] = lastBubble
@@ -110,13 +120,15 @@ class TemplateRoomChatViewModel: TemplateRoomChatViewModelType, TemplateRoomChat
case .done:
done()
case .sendMessage:
templateRoomChatService.send(message: state.bindings.messageInput)
templateRoomChatService.send(textMessage: state.bindings.messageInput)
dispatch(action: .clearMessageInput)
}
}
override class func reducer(state: inout TemplateRoomChatViewState, action: TemplateRoomChatStateAction) {
switch action {
case .updateRoomInitializationStatus(let status):
state.roomInitializationStatus = status
case .clearMessageInput:
state.bindings.messageInput = ""
case .updateBubbles(let bubbles):
@@ -128,6 +140,6 @@ class TemplateRoomChatViewModel: TemplateRoomChatViewModelType, TemplateRoomChat
// MARK: - Private
private func done() {
completion?(.done)
callback?(.done)
}
}
RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModelProtocol.swift
+1 -1
View File
@@ -17,5 +17,5 @@
import Foundation
protocol TemplateRoomChatViewModelProtocol {
var completion: ((TemplateRoomChatViewModelResult) -> Void)? { get set }
var callback: ((TemplateRoomChatViewModelAction) -> Void)? { get set }
}