Преглед изворни кода

scroll to correct message when tapping a search result

B. Petersen пре 4 година
родитељ
комит
d54e7ea518

+ 1 - 0
DcShare/ViewModel/ChatListViewModel.swift

@@ -89,6 +89,7 @@ class ChatListViewModel: NSObject {
             dcContext: dcContext,
             chatData: ChatCellData(
                 chatId: chatId,
+                highlightMsgId: nil,
                 summary: summary,
                 unreadMessages: unreadMessages
             ),

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

@@ -245,7 +245,7 @@ class ChatListController: UITableViewController {
             if chatId == DC_CHAT_ID_ARCHIVED_LINK {
                 showArchive()
             } else {
-                showChat(chatId: chatId)
+                showChat(chatId: chatId, highlightedMsg: chatData.highlightMsgId)
             }
         case .contact(let contactData):
             let contactId = contactData.contactId

+ 2 - 0
deltachat-ios/ViewModel/ChatListViewModel.swift

@@ -227,6 +227,7 @@ private extension ChatListViewModel {
             dcContext: dcContext,
             chatData: ChatCellData(
                 chatId: chatId,
+                highlightMsgId: nil,
                 summary: summary,
                 unreadMessages: unreadMessages
             ),
@@ -246,6 +247,7 @@ private extension ChatListViewModel {
             dcContext: dcContext,
             chatData: ChatCellData(
                 chatId: chatId,
+                highlightMsgId: msgId,
                 summary: summary,
                 unreadMessages: unreadMessages
             )

+ 1 - 0
deltachat-ios/ViewModel/ContactCellViewModel.swift

@@ -23,6 +23,7 @@ struct ContactCellData {
 
 struct ChatCellData {
     let chatId: Int
+    let highlightMsgId: Int?
     let summary: DcLot
     let unreadMessages: Int
 }

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

@@ -146,7 +146,7 @@ class ContactDetailViewModel {
         let chatId = sharedChats.getChatId(index: index)
         let summary = sharedChats.getSummary(index: index)
         let unreadMessages = context.getUnreadMessages(chatId: chatId)
-        let cellData = ChatCellData(chatId: chatId, summary: summary, unreadMessages: unreadMessages)
+        let cellData = ChatCellData(chatId: chatId, highlightMsgId: nil, summary: summary, unreadMessages: unreadMessages)
         let cellViewModel = ChatCellViewModel(dcContext: context, chatData: cellData)
         cell.updateCell(cellViewModel: cellViewModel)
     }