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

Use thread protocol when possible

Browse Source
This commit is contained in:
ismailgulek
2022-02-10 16:48:27 +03:00
parent 200a1623ce
commit ff28bd7657
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Threads/ThreadList/ThreadListCoordinator.swift
+2 -2
View File
@@ -65,11 +65,11 @@ extension ThreadListCoordinator: ThreadListViewModelCoordinatorDelegate {
self.delegate?.threadListCoordinatorDidLoadThreads(self)
}
func threadListViewModelDidSelectThread(_ viewModel: ThreadListViewModelProtocol, thread: MXThread) {
func threadListViewModelDidSelectThread(_ viewModel: ThreadListViewModelProtocol, thread: MXThreadProtocol) {
self.delegate?.threadListCoordinatorDidSelectThread(self, thread: thread)
}
func threadListViewModelDidSelectThreadViewInRoom(_ viewModel: ThreadListViewModelProtocol, thread: MXThread) {
func threadListViewModelDidSelectThreadViewInRoom(_ viewModel: ThreadListViewModelProtocol, thread: MXThreadProtocol) {
self.delegate?.threadListCoordinatorDidSelectRoom(self, roomId: thread.roomId, eventId: thread.id)
}
Riot/Modules/Threads/ThreadList/ThreadListCoordinatorProtocol.swift
+1 -1
View File
@@ -20,7 +20,7 @@ import Foundation
protocol ThreadListCoordinatorDelegate: AnyObject {
func threadListCoordinatorDidLoadThreads(_ coordinator: ThreadListCoordinatorProtocol)
func threadListCoordinatorDidSelectThread(_ coordinator: ThreadListCoordinatorProtocol, thread: MXThread)
func threadListCoordinatorDidSelectThread(_ coordinator: ThreadListCoordinatorProtocol, thread: MXThreadProtocol)
func threadListCoordinatorDidSelectRoom(_ coordinator: ThreadListCoordinatorProtocol, roomId: String, eventId: String)
func threadListCoordinatorDidCancel(_ coordinator: ThreadListCoordinatorProtocol)
}
Riot/Modules/Threads/ThreadList/ThreadListViewModel.swift
+6 -6
View File
@@ -26,12 +26,12 @@ final class ThreadListViewModel: ThreadListViewModelProtocol {
private let session: MXSession
private let roomId: String
private var threads: [MXThread] = []
private var threads: [MXThreadProtocol] = []
private var eventFormatter: MXKEventFormatter?
private var roomState: MXRoomState?
private var currentOperation: MXHTTPOperation?
private var longPressedThread: MXThread?
private var longPressedThread: MXThreadProtocol?
// MARK: Public
@@ -144,7 +144,7 @@ final class ThreadListViewModel: ThreadListViewModelProtocol {
// MARK: - Private
private func model(forThread thread: MXThread) -> ThreadModel {
private func model(forThread thread: MXThreadProtocol) -> ThreadModel {
let rootAvatarViewData: AvatarViewData?
let rootMessageSender: MXUser?
let lastAvatarViewData: AvatarViewData?
@@ -199,7 +199,7 @@ final class ThreadListViewModel: ThreadListViewModelProtocol {
notificationStatus: notificationStatus)
}
private func rootMessageText(forThread thread: MXThread) -> NSAttributedString? {
private func rootMessageText(forThread thread: MXThreadProtocol) -> NSAttributedString? {
guard let eventFormatter = eventFormatter else {
return nil
}
@@ -229,7 +229,7 @@ final class ThreadListViewModel: ThreadListViewModelProtocol {
error: formatterError)
}
private func lastMessageTextAndTime(forThread thread: MXThread) -> (NSAttributedString?, String?) {
private func lastMessageTextAndTime(forThread thread: MXThreadProtocol) -> (NSAttributedString?, String?) {
guard let eventFormatter = eventFormatter else {
return (nil, nil)
}
@@ -323,7 +323,7 @@ final class ThreadListViewModel: ThreadListViewModelProtocol {
private func actionShare() {
guard let thread = longPressedThread,
let index = threads.firstIndex(of: thread) else {
let index = threads.firstIndex(where: { thread.id == $0.id }) else {
return
}
if let permalink = MXTools.permalink(toEvent: thread.id, inRoom: thread.roomId),
Riot/Modules/Threads/ThreadList/ThreadListViewModelProtocol.swift
+2 -2
View File
@@ -24,8 +24,8 @@ protocol ThreadListViewModelViewDelegate: AnyObject {
protocol ThreadListViewModelCoordinatorDelegate: AnyObject {
func threadListViewModelDidLoadThreads(_ viewModel: ThreadListViewModelProtocol)
func threadListViewModelDidSelectThread(_ viewModel: ThreadListViewModelProtocol, thread: MXThread)
func threadListViewModelDidSelectThreadViewInRoom(_ viewModel: ThreadListViewModelProtocol, thread: MXThread)
func threadListViewModelDidSelectThread(_ viewModel: ThreadListViewModelProtocol, thread: MXThreadProtocol)
func threadListViewModelDidSelectThreadViewInRoom(_ viewModel: ThreadListViewModelProtocol, thread: MXThreadProtocol)
func threadListViewModelDidCancel(_ viewModel: ThreadListViewModelProtocol)
}
Riot/Modules/Threads/ThreadList/Views/Cell/ThreadModel.swift
+1 -1
View File
@@ -32,7 +32,7 @@ enum ThreadNotificationStatus {
case notified
case highlighted
init(withThread thread: MXThread) {
init(withThread thread: MXThreadProtocol) {
if thread.highlightCount > 0 {
self = .highlighted
} else if thread.isParticipated && thread.notificationCount > 0 {