Show drafts on the conversation list

signalapp · Mar 2, 2020 · 9be7f6f · 9be7f6f
1 parent 9242870
commit 9be7f6f
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 1 deletion.
diff --git a/Signal/src/ViewControllers/Attachment Keyboard/AttachmentKeyboard.swift b/Signal/src/ViewControllers/Attachment Keyboard/AttachmentKeyboard.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2020 Open Whisper Systems. All rights reserved.
 //
 
 import Foundation

diff --git a/Signal/src/ViewControllers/HomeView/ConversationListCell.m b/Signal/src/ViewControllers/HomeView/ConversationListCell.m
@@ -415,6 +415,20 @@ - (NSAttributedString *)attributedSnippetForThread:(ThreadViewModel *)thread isB
                                                         }]];
         }
         NSString *displayableText = thread.lastMessageText;
+
+        if (thread.draftText.length > 0 && !hasUnreadMessages) {
+            displayableText = thread.draftText;
+
+            [snippetText
+                appendAttributedString:[[NSAttributedString alloc]
+                                           initWithString:NSLocalizedString(@"HOME_VIEW_DRAFT_PREFIX",
+                                                              @"A prefix indicating that a message preview is a draft")
+                                               attributes:@{
+                                                   NSFontAttributeName : self.snippetFont.ows_italic,
+                                                   NSForegroundColorAttributeName : Theme.secondaryTextAndIconColor,
+                                               }]];
+        }
+
         if (displayableText) {
             [snippetText appendAttributedString:[[NSAttributedString alloc]
                                                     initWithString:displayableText

diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings
@@ -1241,6 +1241,9 @@
 /* Placeholder text for search bar which filters conversations. */
 "HOME_VIEW_CONVERSATION_SEARCHBAR_PLACEHOLDER" = "Search";
 
+/* A prefix indicating that a message preview is a draft */
+"HOME_VIEW_DRAFT_PREFIX" = "Draft: ";
+
 /* Format string for a label offering to start a new conversation with your contacts, if you have 1 Signal contact.  Embeds {{The name of 1 of your Signal contacts}}. */
 "HOME_VIEW_FIRST_CONVERSATION_OFFER_1_CONTACT_FORMAT" = "Some of your contacts are already on Signal, including %@.";
 

diff --git a/SignalMessaging/ViewModels/ThreadViewModel.swift b/SignalMessaging/ViewModels/ThreadViewModel.swift
@@ -21,6 +21,7 @@ public class ThreadViewModel: NSObject {
         return !isGroupThread
     }
 
+    @objc public let draftText: String?
     @objc public let lastMessageText: String?
     @objc public let lastMessageForInbox: TSInteraction?
 
@@ -52,6 +53,8 @@ public class ThreadViewModel: NSObject {
         } else {
             self.addedToGroupByName = nil
         }
+
+        self.draftText = thread.currentDraft(with: transaction)
     }
 
     @objc