Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks

Riot/Modules/Threads/ThreadList/ThreadListViewController.swift

@@ -119,7 +119,7 @@ final class ThreadListViewController: UIViewController {
     private func setupViews() {
         let titleView = ThreadRoomTitleView.loadFromNib()
         titleView.mode = .allThreads
-        titleView.configure(withViewModel: viewModel.titleViewModel)
+        titleView.configure(withModel: viewModel.titleModel)
         titleView.updateLayout(for: UIApplication.shared.statusBarOrientation)
         self.titleView = titleView
         navigationItem.leftItemsSupplementBackButton = true
@@ -144,8 +144,8 @@ final class ThreadListViewController: UIViewController {
             renderLoading()
         case .loaded:
             renderLoaded()
-        case .empty(let viewModel):
-            renderEmptyView(withViewModel: viewModel)
+        case .empty(let model):
+            renderEmptyView(withModel: model)
         case .showingFilterTypes:
             renderShowingFilterTypes()
         case .showingLongPressActions(let index):
@@ -178,9 +178,9 @@ final class ThreadListViewController: UIViewController {
         }
     }
     
-    private func renderEmptyView(withViewModel emptyViewModel: ThreadListEmptyModel) {
+    private func renderEmptyView(withModel model: ThreadListEmptyModel) {
         self.activityPresenter.removeCurrentActivityIndicator(animated: true)
-        emptyView.configure(withViewModel: emptyViewModel)
+        emptyView.configure(withModel: model)
         threadsTableView.isHidden = true
         emptyView.isHidden = false
         navigationItem.rightBarButtonItem?.isEnabled = viewModel.selectedFilterType == .myThreads
@@ -332,8 +332,8 @@ extension ThreadListViewController: UITableViewDataSource {
         let cell: ThreadTableViewCell = tableView.dequeueReusableCell(for: indexPath)
         
         cell.update(theme: theme)
-        if let threadVM = viewModel.threadViewModel(at: indexPath.row) {
-            cell.configure(withViewModel: threadVM)
+        if let threadModel = viewModel.threadModel(at: indexPath.row) {
+            cell.configure(withModel: threadModel)
         }
         
         return cell

Riot/Modules/Threads/ThreadList/ThreadListViewModel.swift

@@ -92,14 +92,14 @@ final class ThreadListViewModel: ThreadListViewModelProtocol {
         return threads.count
     }
     
-    func threadViewModel(at index: Int) -> ThreadModel? {
+    func threadModel(at index: Int) -> ThreadModel? {
         guard index < threads.count else {
             return nil
         }
-        return viewModel(forThread: threads[index])
+        return model(forThread: threads[index])
     }
     
-    var titleViewModel: ThreadRoomTitleModel {
+    var titleModel: ThreadRoomTitleModel {
         guard let room = session.room(withRoomId: roomId) else {
             return .empty
         }
@@ -144,7 +144,7 @@ final class ThreadListViewModel: ThreadListViewModelProtocol {
     
     // MARK: - Private
     
-    private func viewModel(forThread thread: MXThread) -> ThreadModel {
+    private func model(forThread thread: MXThread) -> ThreadModel {
         let rootAvatarViewData: AvatarViewData?
         let rootMessageSender: MXUser?
         let lastAvatarViewData: AvatarViewData?
@@ -184,9 +184,9 @@ final class ThreadListViewModel: ThreadListViewModelProtocol {
             lastMessageSender = nil
         }
         
-        let summaryViewModel = ThreadSummaryModel(numberOfReplies: thread.numberOfReplies,
-                                                  lastMessageSenderAvatar: lastAvatarViewData,
-                                                  lastMessageText: lastMessageText)
+        let summaryModel = ThreadSummaryModel(numberOfReplies: thread.numberOfReplies,
+                                              lastMessageSenderAvatar: lastAvatarViewData,
+                                              lastMessageText: lastMessageText)
 
         return ThreadModel(rootMessageSenderUserId: rootMessageSender?.userId,
                            rootMessageSenderAvatar: rootAvatarViewData,
@@ -194,7 +194,7 @@ final class ThreadListViewModel: ThreadListViewModelProtocol {
                            rootMessageText: rootMessageText,
                            rootMessageRedacted: thread.rootMessage?.isRedactedEvent() ?? false,
                            lastMessageTime: lastMessageTime,
-                           summaryViewModel: summaryViewModel)
+                           summaryModel: summaryModel)
     }
     
     private func rootMessageText(forThread thread: MXThread) -> NSAttributedString? {

Riot/Modules/Threads/ThreadList/ThreadListViewModelProtocol.swift

@@ -39,10 +39,10 @@ protocol ThreadListViewModelProtocol {
     
     var viewState: ThreadListViewState { get }
     
-    var titleViewModel: ThreadRoomTitleModel { get }
+    var titleModel: ThreadRoomTitleModel { get }
     var selectedFilterType: ThreadListFilterType { get }
     var numberOfThreads: Int { get }
-    func threadViewModel(at index: Int) -> ThreadModel?
+    func threadModel(at index: Int) -> ThreadModel?
 }
 
 enum ThreadListFilterType {

Riot/Modules/Threads/ThreadList/Views/Cell/ThreadModel.swift

@@ -17,11 +17,11 @@
 import Foundation
 
 struct ThreadModel {
-    var rootMessageSenderUserId: String?
-    var rootMessageSenderAvatar: AvatarViewDataProtocol?
-    var rootMessageSenderDisplayName: String?
-    var rootMessageText: NSAttributedString?
-    var rootMessageRedacted: Bool
-    var lastMessageTime: String?
-    var summaryViewModel: ThreadSummaryModel?
+    let rootMessageSenderUserId: String?
+    let rootMessageSenderAvatar: AvatarViewDataProtocol?
+    let rootMessageSenderDisplayName: String?
+    let rootMessageText: NSAttributedString?
+    let rootMessageRedacted: Bool
+    let lastMessageTime: String?
+    let summaryModel: ThreadSummaryModel?
 }

Riot/Modules/Threads/ThreadList/Views/Cell/ThreadTableViewCell.swift

@@ -47,24 +47,24 @@ class ThreadTableViewCell: UITableViewCell {
         separatorInset = Constants.separatorInset
     }
     
-    func configure(withViewModel viewModel: ThreadModel) {
-        if let rootAvatar = viewModel.rootMessageSenderAvatar {
+    func configure(withModel model: ThreadModel) {
+        if let rootAvatar = model.rootMessageSenderAvatar {
             rootMessageAvatarView.fill(with: rootAvatar)
         } else {
             rootMessageAvatarView.avatarImageView.image = nil
         }
-        configuredSenderId = viewModel.rootMessageSenderUserId
-        configuredRootMessageRedacted = viewModel.rootMessageRedacted
+        configuredSenderId = model.rootMessageSenderUserId
+        configuredRootMessageRedacted = model.rootMessageRedacted
         updateRootMessageSenderColor()
-        rootMessageSenderLabel.text = viewModel.rootMessageSenderDisplayName
-        if let rootMessageText = viewModel.rootMessageText {
+        rootMessageSenderLabel.text = model.rootMessageSenderDisplayName
+        if let rootMessageText = model.rootMessageText {
             updateRootMessageContentAttributes(rootMessageText, color: rootMessageColor)
         } else {
             rootMessageContentLabel.attributedText = nil
         }
-        lastMessageTimeLabel.text = viewModel.lastMessageTime
-        if let summaryViewModel = viewModel.summaryViewModel {
-            summaryView.configure(withViewModel: summaryViewModel)
+        lastMessageTimeLabel.text = model.lastMessageTime
+        if let summaryModel = model.summaryModel {
+            summaryView.configure(withModel: summaryModel)
         }
     }
 

Riot/Modules/Threads/ThreadList/Views/Empty/ThreadListEmptyView.swift

@@ -39,14 +39,14 @@ class ThreadListEmptyView: UIView {
         loadNibContent()
     }
     
-    func configure(withViewModel viewModel: ThreadListEmptyModel) {
-        iconView.image = viewModel.icon
-        titleLabel.text = viewModel.title
-        infoLabel.text = viewModel.info
-        tipLabel.text = viewModel.tip
-        showAllThreadsButton.setTitle(viewModel.showAllThreadsButtonTitle,
+    func configure(withModel model: ThreadListEmptyModel) {
+        iconView.image = model.icon
+        titleLabel.text = model.title
+        infoLabel.text = model.info
+        tipLabel.text = model.tip
+        showAllThreadsButton.setTitle(model.showAllThreadsButtonTitle,
                                       for: .normal)
-        showAllThreadsButton.isHidden = viewModel.showAllThreadsButtonHidden
+        showAllThreadsButton.isHidden = model.showAllThreadsButtonHidden
         
         titleLabel.isHidden = titleLabel.text?.isEmpty ?? true
         infoLabel.isHidden = infoLabel.text?.isEmpty ?? true