Compact chat list: no You: prefix in one-to-one chats, drafts show in compact group rows

Author: decoder-dev

CHANGELOG.md

@@ -36,7 +36,7 @@
 - Privacy and Security: while loading, the Bio row no longer reads "Groups" and the invites row has its usual title.
 - Extras › More Profile Settings: the custom number no longer runs into its "Number" label; "Accent Saturation" fits on one line.
 - Protected Archive: the fixed archive policy reads "Stay in Archive — Always" instead of repeating "Always".
-- Compact Chat List: the row is centred (it had an empty band under the text), the Archived Chats row is compact too, the unread badge sits on the line of text, and a draft or folder tags no longer spill onto the next row. Compact Message Preview alone gets the same one-line row.
+- Compact Chat List: the row is centred (it had an empty band under the text), the Archived Chats row is compact too, the unread badge sits on the line of text, and a draft or folder tags no longer spill onto the next row. Compact Message Preview alone gets the same one-line row. No "You:" in front of your own message in a one-to-one chat, and a group's draft shows in a compact row.
 - Text fields in settings: a title passed without a colour (Deleted/Edited Message Mark, Number) was black on a dark theme; the title also no longer runs into the text.
 - Appearance › themes: the selected theme has a checkmark, without a disclosure arrow on rows that open nothing.
 - Title Case for the remaining Extras names (Messages and Composer, Calls and Audio, Tab Bar, Avatar Glow, …); "Use System Text Size" and "Wi-Fi" spelled correctly.

Tests/Branding/test_compact_chat_list.py

@@ -19,12 +19,16 @@ def test_either_setting_makes_one_line(self):
         self.assertIn('if singleLinePreview {\n                useInlineAuthorPrefix = true', self.text)
         self.assertIn('if !itemTags.isEmpty || singleLinePreview {\n                authorAttributedString = nil', self.text)
         self.assertIn('if singleLinePreview, !forumThreads.isEmpty {', self.text)
+        # No "You:" in front of your own message in a one-to-one chat, as in the regular row.
+        self.assertIn('if !(singleLinePreview && isOneToOne) {', self.text)
 
     def test_no_second_line_below_the_row(self):
         # Folder tags sit on a line under the text and drafts on an author line; both go in a one-line row.
         self.assertIn('itemTags = singleLinePreview ? [] : peerData.tags', self.text)
         self.assertIn('if !itemTags.isEmpty || singleLinePreview {\n                            let tempAttributedText = foldLineBreaks(draftText)', self.text)
-        media_draft = self.text.split('if inlineAuthorPrefix == nil, let mediaDraftContentType {', 1)[1].split('} else if inlineAuthorPrefix == nil, let draftState', 1)[0]
+        # A group's inline author prefix in a compact row does not hide its draft.
+        self.assertIn('let draftAllowed = inlineAuthorPrefix == nil || (singleLinePreview && !isGroupReferenceRow)', self.text)
+        media_draft = self.text.split('if draftAllowed, let mediaDraftContentType {', 1)[1].split('} else if draftAllowed, let draftState', 1)[0]
         self.assertIn('if singleLinePreview {', media_draft)
         self.assertIn('authorAttributedString = nil', media_draft)
 

submodules/ChatListUI/Sources/Node/ChatListItem.swift

@@ -2943,8 +2943,16 @@ public class ChatListItemNode: ItemListRevealOptionsItemNode {
 
             if useInlineAuthorPrefix && !isLastMessageFiltered {
                 if case let .user(author) = messages.last?.author {
+                    // A one-to-one chat shows no author for your own message (the regular row doesn't either); the
+                    // archive row, which mixes chats, and groups do.
+                    var isOneToOne = messages.last?.id.peerId.namespace == Namespaces.Peer.CloudUser || messages.last?.id.peerId.namespace == Namespaces.Peer.SecretChat
+                    if case .groupReference = item.content {
+                        isOneToOne = false
+                    }
                     if author.id == item.context.account.peerId {
-                        inlineAuthorPrefix = item.presentationData.strings.DialogList_You
+                        if !(singleLinePreview && isOneToOne) {
+                            inlineAuthorPrefix = item.presentationData.strings.DialogList_You
+                        }
                     } else if messages.last?.id.peerId.namespace != Namespaces.Peer.CloudUser && messages.last?.id.peerId.namespace != Namespaces.Peer.SecretChat {
                         inlineAuthorPrefix = EnginePeer.user(author).compactDisplayTitle
                     }
@@ -3087,7 +3095,14 @@ public class ChatListItemNode: ItemListRevealOptionsItemNode {
                         foldedRichTextPreview = nil
                     }
 
-                    if inlineAuthorPrefix == nil, let mediaDraftContentType {
+                    // A draft wins over the last message. Only the archive row's author prefix keeps it out; a compact
+                    // row's prefix is there because the row has one line, not to hide a draft.
+                    var isGroupReferenceRow = false
+                    if case .groupReference = item.content {
+                        isGroupReferenceRow = true
+                    }
+                    let draftAllowed = inlineAuthorPrefix == nil || (singleLinePreview && !isGroupReferenceRow)
+                    if draftAllowed, let mediaDraftContentType {
                         hasDraft = true
                         authorAttributedString = NSAttributedString(string: item.presentationData.strings.DialogList_Draft, font: textFont, textColor: theme.messageDraftTextColor)
 
@@ -3105,7 +3120,7 @@ public class ChatListItemNode: ItemListRevealOptionsItemNode {
                             attributedText = attributedTextWithDraft
                             authorAttributedString = nil
                         }
-                    } else if inlineAuthorPrefix == nil, let draftState = draftState {
+                    } else if draftAllowed, let draftState = draftState {
                         hasDraft = true
                         let draftText = stringWithAppliedEntities(draftState.text, entities: draftState.entities, baseColor: theme.messageTextColor, linkColor: theme.messageTextColor, baseFont: textFont, linkFont: textFont, boldFont: textFont, italicFont: textFont, boldItalicFont: textFont, fixedFont: textFont, blockQuoteFont: textFont, message: nil)