fix group conversation layout

wireapp · Feb 21, 2025 · f1b8d69 · f1b8d69
1 parent 7fcb9e9
commit f1b8d69
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 13 deletions.
diff --git a/WireUI/Sources/WireConversationUI/Views/MessageCell.swift b/WireUI/Sources/WireConversationUI/Views/MessageCell.swift
@@ -19,7 +19,7 @@
 import SwiftUI
 import WireFoundation
 
-public final class MessageCell: UITableViewCell {
+public final class MessageCell: UITableViewCell { // TODO: this probably has to be moved out of WireConversationUI (no generics supported)
 
     public var message = Message() {
         didSet {
@@ -51,18 +51,23 @@ public final class MessageCell: UITableViewCell {
 
     private func updateContent() {
         contentConfiguration = UIHostingConfiguration {
-            MessageContentView(message: message, layout: messageLayout)
-                .swipeActions(edge: .leading) {
-                    Button {
-                        print("swipe")
-                    } label: {
-                        Label("Favorite", systemImage: "arrowshape.turn.up.backward.fill")
-                    }
+            MessageContentView(
+                message: message,
+                layout: messageLayout,
+                accountImageViewContent: { Circle().fill(.red) }
+            )
+            .swipeActions(edge: .leading) {
+                Button {
+                    print("swipe")
+                } label: {
+                    Label("Favorite", systemImage: "arrowshape.turn.up.backward.fill")
                 }
-                .environment(\.wireAccentColor, wireAccentColor)
-                .environment(\.wireAccentColorMapping, wireAccentColorMapping)
+            }
+            .environment(\.wireAccentColor, wireAccentColor)
+            .environment(\.wireAccentColorMapping, wireAccentColorMapping)
         }
     }
+
 }
 
 
@@ -81,14 +86,16 @@ public func MessageCellPreview() -> UIViewController {
     ) { tableView, indexPath, itemID in
         let cell = tableView.dequeueReusableCell(withIdentifier: "MessageCell", for: indexPath)
         if let cell = cell as? MessageCell {
+            cell.messageLayout = .groupConversation
             cell.message = Message(
                 id: .init(itemID),
-                attributedText: AttributedString("Hello, World!")
+                attributedText: AttributedString("Hello,\nWorld!")
             )
         }
         return cell
     }
     tableViewController.tableView.dataSource = dataSource
+    tableViewController.tableView.separatorStyle = .none
 
     var snapshot = dataSource.snapshot()
     snapshot.appendSections([.single])

diff --git a/WireUI/Sources/WireConversationUI/Views/MessageContentView.swift b/WireUI/Sources/WireConversationUI/Views/MessageContentView.swift
@@ -18,12 +18,55 @@
 
 import SwiftUI
 
-struct MessageContentView: View {
+struct MessageContentView<
+    AccountImageView: View
+>: View {
+
+    let accountImageViewDiameter: CGFloat = 32
 
     var message: Message
     var layout: MessageLayout
+    var accountImageViewContent: () -> AccountImageView
 
     var body: some View {
-        Text(message.attributedText)
+        switch layout {
+        case .oneOnOneConversation:
+            oneOnOneConversationContent()
+        case .groupConversation:
+            groupConversationContent()
+        }
     }
+
+    @ViewBuilder
+    private func oneOnOneConversationContent() -> some View {
+        HStack(alignment: .top) {
+
+            accountImageViewContent()
+                .frame(width: accountImageViewDiameter, height: accountImageViewDiameter)
+
+            VStack {
+                Text(message.attributedText)
+            }
+
+        }
+    }
+
+    @ViewBuilder
+    private func groupConversationContent() -> some View {
+        Grid(alignment: .topLeading) {
+            GridRow(alignment: .center) {
+                accountImageViewContent()
+                    .frame(width: accountImageViewDiameter, height: accountImageViewDiameter)
+                Text(verbatim: "sender-name")
+                    .frame(minHeight: accountImageViewDiameter)
+            }
+            GridRow {
+                Color.clear
+                    .gridCellUnsizedAxes([.horizontal, .vertical])
+                Text(message.attributedText)
+                    .fixedSize(horizontal: false, vertical: true)
+            }
+        }
+    }
+
 }