浏览代码

no need to pass DcContext to ContactCell's update method anymore

cyberta 5 年之前
父节点
当前提交
f3fece478d

+ 3 - 3
deltachat-ios/Controller/ChatListController.swift

@@ -177,7 +177,7 @@ class ChatListController: UITableViewController {
             guard let deaddropCell = tableView.dequeueReusableCell(withIdentifier: deadDropCellReuseIdentifier, for: indexPath) as? ContactCell else {
                 break
             }
-            deaddropCell.updateCell(dcContext: dcContext, cellViewModel: cellData)
+            deaddropCell.updateCell(cellViewModel: cellData)
             return deaddropCell
         case .chat(let chatData):
             let chatId = chatData.chatId
@@ -185,13 +185,13 @@ class ChatListController: UITableViewController {
                 return getArchiveCell(title: dcContext.getChat(chatId: chatId).name)
             } else if let chatCell = tableView.dequeueReusableCell(withIdentifier: chatCellReuseIdentifier, for: indexPath) as? ContactCell {
                 // default chatCell
-                chatCell.updateCell(dcContext: dcContext, cellViewModel: cellData)
+                chatCell.updateCell(cellViewModel: cellData)
                 return chatCell
             }
         case .contact:
             safe_assert(viewModel.searchActive)
             if let contactCell = tableView.dequeueReusableCell(withIdentifier: contactCellReuseIdentifier, for: indexPath) as? ContactCell {
-                contactCell.updateCell(dcContext: dcContext, cellViewModel: cellData)
+                contactCell.updateCell(cellViewModel: cellData)
                 return contactCell
             }
         }

+ 1 - 1
deltachat-ios/Controller/GroupChatDetailViewController.swift

@@ -259,7 +259,7 @@ extension GroupChatDetailViewController: UITableViewDelegate, UITableViewDataSou
                 chatId: context.getChatIdByContactId(contactId)
             )
             let cellViewModel = ContactCellViewModel(contactData: cellData)
-            contactCell.updateCell(dcContext: context, cellViewModel: cellViewModel)
+            contactCell.updateCell(cellViewModel: cellViewModel)
             return contactCell
         case .chatActions:
             if row == chatActionsRowArchiveChat {

+ 2 - 2
deltachat-ios/Controller/NewChatViewController.swift

@@ -186,7 +186,7 @@ class NewChatViewController: UITableViewController {
                 let cell = tableView.dequeueReusableCell(withIdentifier: "contactCell", for: indexPath)
                 if let contactCell = cell as? ContactCell {
                     let contactCellViewModel = self.contactViewModelBy(row: indexPath.row)
-                    contactCell.updateCell(dcContext: dcContext, cellViewModel: contactCellViewModel)
+                    contactCell.updateCell(cellViewModel: contactCellViewModel)
                 }
                 return cell
             } else {
@@ -201,7 +201,7 @@ class NewChatViewController: UITableViewController {
             let cell = tableView.dequeueReusableCell(withIdentifier: "contactCell", for: indexPath)
             if let contactCell = cell as? ContactCell {
                 let contactCellViewModel = self.contactViewModelBy(row: indexPath.row)
-                contactCell.updateCell(dcContext: dcContext, cellViewModel: contactCellViewModel)
+                contactCell.updateCell(cellViewModel: contactCellViewModel)
             }
             return cell
         }

+ 2 - 2
deltachat-ios/View/ContactCell.swift

@@ -231,7 +231,7 @@ class ContactCell: UITableViewCell {
     }
 
     // use this update-method to update cell in cellForRowAt whenever it is possible - other set-methods will be set private in progress
-    func updateCell(dcContext: DcContext, cellViewModel: AvatarCellViewModel) {
+    func updateCell(cellViewModel: AvatarCellViewModel) {
 
         // subtitle
         subtitleLabel.attributedText = cellViewModel.subtitle.boldAt(indexes: cellViewModel.subtitleHighlightIndexes, fontSize: subtitleLabel.font.pointSize)
@@ -252,7 +252,7 @@ class ContactCell: UITableViewCell {
             titleLabel.attributedText = cellViewModel.title.boldAt(indexes: cellViewModel.titleHighlightIndexes, fontSize: titleLabel.font.pointSize)
 
         case .chat(let chatData):
-            let chat = dcContext.getChat(chatId: chatData.chatId)
+            let chat = DcContext.getInstance().getChat(chatId: chatData.chatId)
 
             // text bold if chat contains unread messages - otherwise hightlight search results if needed
             if chatData.unreadMessages > 0 {

+ 1 - 1
deltachat-ios/ViewModel/ContactDetailViewModel.swift

@@ -117,7 +117,7 @@ class ContactDetailViewModel: ContactDetailViewModelProtocol {
 
         let cellData = ChatCellData(chatId: chatId, summary: summary, unreadMessages: unreadMessages)
         let cellViewModel = ChatCellViewModel(dcContext: context, chatData: cellData)
-        cell.updateCell(dcContext: context, cellViewModel: cellViewModel)
+        cell.updateCell(cellViewModel: cellViewModel)
     }
 
     func titleFor(section: Int) -> String? {