From 72f6b15dba1c6a0b854dcf51f6470bac04a1e661 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Thu, 11 Jan 2024 09:48:27 -0400
Subject: [PATCH] Hide header decorations when no subtitle or description is
 set.

---
 .../securesms/conversation/ConversationHeaderView.java   | 9 ++++++++-
 .../securesms/conversation/v2/ConversationAdapterV2.kt   | 4 ----
 .../securesms/recipients/ui/about/AboutSheet.kt          | 1 -
 3 files changed, 8 insertions(+), 6 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 95c80937fb..6baf455bb0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationHeaderView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationHeaderView.java
@@ -13,6 +13,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.content.ContextCompat;
+import androidx.core.view.ViewKt;
 
 import org.signal.core.util.DimensionUnit;
 import org.signal.core.util.concurrent.SignalExecutors;
@@ -128,6 +129,8 @@ public class ConversationHeaderView extends ConstraintLayout {
       binding.messageRequestInfoOutline.setVisibility(View.VISIBLE);
       binding.messageRequestDivider.setVisibility(View.INVISIBLE);
     }
+
+    hideDecoratorsIfContentIsNotPresent();
   }
 
   public void hideSubtitle() {
@@ -146,7 +149,11 @@ public class ConversationHeaderView extends ConstraintLayout {
     binding.messageRequestDescription.setMovementMethod(enable ? LongClickMovementMethod.getInstance(getContext()) : null);
   }
 
-  public void hideDecorations() {
+  private void hideDecoratorsIfContentIsNotPresent() {
+    if (ViewKt.isVisible(binding.messageRequestSubtitle) || ViewKt.isVisible(binding.messageRequestDescription)) {
+      return;
+    }
+
     binding.messageRequestInfoOutline.setVisibility(View.GONE);
     binding.messageRequestDivider.setVisibility(View.GONE);
   }
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 5da169ca30..5ec574ca43 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
@@ -623,10 +623,6 @@ class ConversationAdapterV2(
         }
         conversationBanner.setDescription(HtmlCompat.fromHtml(description, 0), R.drawable.symbol_group_light_20)
       }
-
-      if (recipient.isReleaseNotes) {
-        conversationBanner.hideDecorations()
-      }
     }
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/about/AboutSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/about/AboutSheet.kt
index 703dd59813..660a426018 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/about/AboutSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/about/AboutSheet.kt
@@ -281,7 +281,6 @@ private fun AboutRow(
   endIcon: Painter? = null,
   onClick: (() -> Unit)? = null
 ) {
-
   val padHorizontal = if (onClick != null) 19.dp else 32.dp
   val padVertical = if (onClick != null) 4.dp else 6.dp