fix: Recipient names fill the available space

Infomaniak · Jan 31, 2024 · 4f6176a · 4f6176a
1 parent 2e3a06c
commit 4f6176a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/Mail/Components/ThreadCell/ThreadCell.swift b/Mail/Components/ThreadCell/ThreadCell.swift
@@ -147,7 +147,7 @@ struct ThreadCell: View {
                 .accessibilityLabel(additionalAccessibilityLabel)
                 .accessibilityHidden(additionalAccessibilityLabel.isEmpty)
 
-            ThreadCellCheckboxView(
+            ThreadCellAvatarCheckboxView(
                 accentColor: accentColor,
                 density: density,
                 isSelected: isSelected,

diff --git a/...s/ThreadCell/ThreadCellCheckboxView.swift → ...adCell/ThreadCellAvatarCheckboxView.swift b/...s/ThreadCell/ThreadCellCheckboxView.swift → ...adCell/ThreadCellAvatarCheckboxView.swift
@@ -19,7 +19,7 @@
 import MailCore
 import SwiftUI
 
-struct ThreadCellCheckboxView: View {
+struct ThreadCellAvatarCheckboxView: View {
     @EnvironmentObject private var mailboxManager: MailboxManager
 
     let accentColor: AccentColor
@@ -54,7 +54,7 @@ struct ThreadCellCheckboxView: View {
 }
 
 #Preview {
-    ThreadCellCheckboxView(
+    ThreadCellAvatarCheckboxView(
         accentColor: .pink,
         density: .large,
         isSelected: false,

diff --git a/Mail/Components/ThreadCell/ThreadCellHeaderView.swift b/Mail/Components/ThreadCell/ThreadCellHeaderView.swift
@@ -29,26 +29,29 @@ struct ThreadCellHeaderView: View, Equatable {
 
     var body: some View {
         HStack(spacing: UIPadding.small) {
-            if showDraftPrefix {
-                Text("\(MailResourcesStrings.Localizable.draftPrefix)")
-                    .textStyle(.bodyMediumError)
+            HStack(spacing: UIPadding.small) {
+                if showDraftPrefix {
+                    Text("\(MailResourcesStrings.Localizable.draftPrefix)")
+                        .textStyle(.bodyMediumError)
+                        .lineLimit(1)
+                        .layoutPriority(1)
+                }
+
+                Text(recipientsTitle)
+                    .textStyle(.bodyMedium)
                     .lineLimit(1)
-                    .layoutPriority(1)
-            }
-
-            Text(recipientsTitle)
-                .textStyle(.bodyMedium)
-                .lineLimit(1)
 
-            if messageCount > 1 {
-                ThreadCountIndicatorView(messagesCount: messageCount, hasUnseenMessages: prominentMessageCount)
-                    .accessibilityHidden(true)
+                if messageCount > 1 {
+                    ThreadCountIndicatorView(messagesCount: messageCount, hasUnseenMessages: prominentMessageCount)
+                        .accessibilityHidden(true)
+                }
             }
+            .frame(maxWidth: .infinity, alignment: .leading)
 
             Text(formattedDate)
                 .textStyle(.bodySmallSecondary)
                 .lineLimit(1)
-                .frame(maxWidth: .infinity, alignment: .trailing)
+                .layoutPriority(1)
                 .accessibilityHidden(true)
         }
     }