From c1f96e5bd3987cdd5e9ea8a298bdfcaa8ab8c28f Mon Sep 17 00:00:00 2001
From: Michelle Tang <mtang@signal.org>
Date: Wed, 19 Mar 2025 11:18:38 -0400
Subject: [PATCH] Fix conversation header position.

---
 .../conversation/ConversationHeaderView.java  |  3 +++
 .../conversation/v2/ConversationAdapterV2.kt  |  2 +-
 .../res/layout/conversation_header_view.xml   |  3 +++
 .../conversation_item_thread_header.xml       | 26 +++++--------------
 app/src/main/res/values/dimens.xml            |  1 +
 5 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationHeaderView.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationHeaderView.java
index 073ed83989..96995672f3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationHeaderView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationHeaderView.java
@@ -307,6 +307,9 @@ public class ConversationHeaderView extends ConstraintLayout {
     if (getBackground() != null) {
       ViewUtil.setPaddingTop(binding.messageRequestInfo, 0);
       ViewUtil.setPaddingBottom(binding.messageRequestInfo, getContext().getResources().getDimensionPixelOffset(R.dimen.conversation_header_padding));
+      int margin = getContext().getResources().getDimensionPixelOffset(R.dimen.conversation_header_margin);
+      ViewUtil.setLeftMargin(this, margin);
+      ViewUtil.setRightMargin(this, margin);
     }
 
     int padding = visibleCount == 1 ? getContext().getResources().getDimensionPixelOffset(R.dimen.conversation_header_padding) : getContext().getResources().getDimensionPixelOffset(R.dimen.conversation_header_padding_expanded);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2.kt
index 324015ea89..b7e7f03ccf 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2.kt
@@ -531,7 +531,7 @@ class ConversationAdapterV2(
   }
 
   inner class ThreadHeaderViewHolder(itemView: View) : MappingViewHolder<ThreadHeader>(itemView) {
-    private val conversationBanner: ConversationHeaderView = itemView.findViewById(R.id.header)
+    private val conversationBanner: ConversationHeaderView = itemView as ConversationHeaderView
 
     override fun bind(model: ThreadHeader) {
       val (recipient, groupInfo, sharedGroups, messageRequestState) = model.recipientInfo
diff --git a/app/src/main/res/layout/conversation_header_view.xml b/app/src/main/res/layout/conversation_header_view.xml
index cf72915338..1d7d66dda8 100644
--- a/app/src/main/res/layout/conversation_header_view.xml
+++ b/app/src/main/res/layout/conversation_header_view.xml
@@ -89,10 +89,13 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
+        android:textAlignment="center"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
         android:textAppearance="@style/Signal.Text.MessageRequest.Subtitle"
         app:layout_constraintTop_toBottomOf="@id/message_request_title"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         tools:text="Hangin' on the web" />
 
     <View
diff --git a/app/src/main/res/layout/conversation_item_thread_header.xml b/app/src/main/res/layout/conversation_item_thread_header.xml
index 724eb4bb4e..113d533c22 100644
--- a/app/src/main/res/layout/conversation_item_thread_header.xml
+++ b/app/src/main/res/layout/conversation_item_thread_header.xml
@@ -1,22 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2023 Signal Messenger, LLC
-  ~ SPDX-License-Identifier: AGPL-3.0-only
-  -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<?xml version="1.0" encoding="utf-8"?>
+<org.thoughtcrime.securesms.conversation.ConversationHeaderView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <org.thoughtcrime.securesms.conversation.ConversationHeaderView
-        android:id="@+id/header"
-        android:layout_gravity="center_horizontal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="32dp"
-        android:paddingTop="22dp"
-        android:paddingBottom="4dp"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:viewBindingIgnore="true" />
-
-</FrameLayout>
\ No newline at end of file
+    android:layout_height="wrap_content"
+    android:paddingTop="22dp"
+    android:paddingBottom="4dp"
+    app:layout_constraintTop_toTopOf="parent"
+    tools:viewBindingIgnore="true" />
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 0f55059214..be25faad4e 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -249,5 +249,6 @@
     <dimen name="conversation_header_padding">24dp</dimen>
     <dimen name="conversation_header_padding_expanded">32dp</dimen>
     <dimen name="conversation_header_max_size">308dp</dimen>
+    <dimen name="conversation_header_margin">40dp</dimen>
 
 </resources>