Improved subtitle info in pinned messages view (#594)

Author: martinmitrevski

CHANGELOG.md

@@ -4,6 +4,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 # Upcoming
 
 ### 🔄 Changed
+- Improved subtitle info in pinned messages view [#594](https://github.com/GetStream/stream-chat-swiftui/pull/594)
 
 ### 🐞 Fixed
 - Typing users did not update reliably in the message list [#591](https://github.com/GetStream/stream-chat-swiftui/pull/591)

Sources/StreamChatSwiftUI/ChatChannel/ChannelInfo/PinnedMessagesView.swift

@@ -25,7 +25,7 @@ public struct PinnedMessagesView: View {
                 ScrollView {
                     LazyVStack(spacing: 0) {
                         ForEach(viewModel.pinnedMessages) { message in
-                            PinnedMessageView(message: message)
+                            PinnedMessageView(message: message, channel: viewModel.channel)
                             Divider()
                         }
                     }
@@ -52,6 +52,7 @@ struct PinnedMessageView: View {
     private let avatarSize = CGSize(width: 56, height: 56)
 
     var message: ChatMessage
+    var channel: ChatChannel
 
     var body: some View {
         HStack {
@@ -66,7 +67,7 @@ struct PinnedMessageView: View {
                     .foregroundColor(Color(colors.text))
 
                 HStack {
-                    Text(message.adjustedText)
+                    Text(pinnedMessageSubtitle)
                         .font(fonts.footnote)
                         .foregroundColor(Color(colors.textLowEmphasis))
 
@@ -80,4 +81,11 @@ struct PinnedMessageView: View {
         }
         .padding(.all, 8)
     }
+    
+    private var pinnedMessageSubtitle: String {
+        if message.poll != nil {
+            return "📊 \(L10n.Channel.Item.poll)"
+        }
+        return channel.attachmentPreviewText(for: message) ?? message.adjustedText
+    }
 }

Sources/StreamChatSwiftUI/ChatChannel/ChannelInfo/PinnedMessagesViewModel.swift

@@ -9,7 +9,7 @@ import SwiftUI
 /// View model for the `PinnedMessagesView`.
 public class PinnedMessagesViewModel: ObservableObject {
 
-    private let channel: ChatChannel
+    let channel: ChatChannel
 
     @Published var pinnedMessages: [ChatMessage]
 

Sources/StreamChatSwiftUI/ChatChannelList/ChatChannelListItem.swift

@@ -326,7 +326,7 @@ extension ChatChannel {
     /// The message preview text in case it contains attachments.
     /// - Parameter previewMessage: The preview message of the channel.
     /// - Returns: A string representing the message preview text.
-    private func attachmentPreviewText(for previewMessage: ChatMessage) -> String? {
+    func attachmentPreviewText(for previewMessage: ChatMessage) -> String? {
         guard let attachment = previewMessage.allAttachments.first, !previewMessage.isDeleted else {
             return nil
         }

Sources/StreamChatSwiftUI/Generated/L10n.swift

@@ -87,6 +87,8 @@ internal enum L10n {
       internal static var muted: String { L10n.tr("Localizable", "channel.item.muted") }
       /// Photo
       internal static var photo: String { L10n.tr("Localizable", "channel.item.photo") }
+      /// Poll
+      internal static var poll: String { L10n.tr("Localizable", "channel.item.poll") }
       /// %@ created:
       internal static func pollSomeoneCreated(_ p1: Any) -> String {
         return L10n.tr("Localizable", "channel.item.poll-someone-created", String(describing: p1))

Sources/StreamChatSwiftUI/Resources/en.lproj/Localizable.strings

@@ -196,4 +196,5 @@
 "channel.item.audio" = "Audio";
 "channel.item.photo" = "Photo";
 "channel.item.video" = "Video";
+"channel.item.poll" = "Poll";
 "channel.item.voice-message" = "Voice Message";

StreamChatSwiftUITests/Tests/ChatChannel/ChannelInfo/PinnedMessagesView_Tests.swift

@@ -30,6 +30,84 @@ class PinnedMessagesView_Tests: StreamChatTestCase {
         // Then
         assertSnapshot(matching: view, as: .image(perceptualPrecision: precision))
     }
+    
+    func test_pinnedMessagesView_imageSnapshot() {
+        // Given
+        let pinnedMessage = ChatMessage.mock(
+            id: .unique,
+            cid: .unique,
+            text: "",
+            author: .mock(id: .unique, name: "Test User"),
+            attachments: ChatChannelTestHelpers.imageAttachments,
+            pinDetails: MessagePinDetails(
+                pinnedAt: Date(),
+                pinnedBy: .mock(id: .unique),
+                expiresAt: nil
+            )
+        )
+        let channel = ChatChannel.mockDMChannel(
+            pinnedMessages: [pinnedMessage]
+        )
+
+        // When
+        let view = PinnedMessagesView(channel: channel)
+            .applyDefaultSize()
+
+        // Then
+        assertSnapshot(matching: view, as: .image(perceptualPrecision: precision))
+    }
+    
+    func test_pinnedMessagesView_videoSnapshot() {
+        // Given
+        let pinnedMessage = ChatMessage.mock(
+            id: .unique,
+            cid: .unique,
+            text: "",
+            author: .mock(id: .unique, name: "Test User"),
+            attachments: ChatChannelTestHelpers.videoAttachments,
+            pinDetails: MessagePinDetails(
+                pinnedAt: Date(),
+                pinnedBy: .mock(id: .unique),
+                expiresAt: nil
+            )
+        )
+        let channel = ChatChannel.mockDMChannel(
+            pinnedMessages: [pinnedMessage]
+        )
+
+        // When
+        let view = PinnedMessagesView(channel: channel)
+            .applyDefaultSize()
+
+        // Then
+        assertSnapshot(matching: view, as: .image(perceptualPrecision: precision))
+    }
+    
+    func test_pinnedMessagesView_pollSnapshot() {
+        // Given
+        let pinnedMessage = ChatMessage.mock(
+            id: .unique,
+            cid: .unique,
+            text: "",
+            author: .mock(id: .unique, name: "Test User"),
+            pinDetails: MessagePinDetails(
+                pinnedAt: Date(),
+                pinnedBy: .mock(id: .unique),
+                expiresAt: nil
+            ),
+            poll: .mock()
+        )
+        let channel = ChatChannel.mockDMChannel(
+            pinnedMessages: [pinnedMessage]
+        )
+
+        // When
+        let view = PinnedMessagesView(channel: channel)
+            .applyDefaultSize()
+
+        // Then
+        assertSnapshot(matching: view, as: .image(perceptualPrecision: precision))
+    }
 
     func test_pinnedMessagesView_emptySnapshot() {
         // Given