Hide header decorations when no subtitle or description is set.

This commit is contained in:
Alex Hart
2024-01-11 09:48:27 -04:00
parent 64dbb77e63
commit 72f6b15dba
3 changed files with 8 additions and 6 deletions

View File

@@ -13,6 +13,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.ConstraintLayout; import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import androidx.core.view.ViewKt;
import org.signal.core.util.DimensionUnit; import org.signal.core.util.DimensionUnit;
import org.signal.core.util.concurrent.SignalExecutors; import org.signal.core.util.concurrent.SignalExecutors;
@@ -128,6 +129,8 @@ public class ConversationHeaderView extends ConstraintLayout {
binding.messageRequestInfoOutline.setVisibility(View.VISIBLE); binding.messageRequestInfoOutline.setVisibility(View.VISIBLE);
binding.messageRequestDivider.setVisibility(View.INVISIBLE); binding.messageRequestDivider.setVisibility(View.INVISIBLE);
} }
hideDecoratorsIfContentIsNotPresent();
} }
public void hideSubtitle() { public void hideSubtitle() {
@@ -146,7 +149,11 @@ public class ConversationHeaderView extends ConstraintLayout {
binding.messageRequestDescription.setMovementMethod(enable ? LongClickMovementMethod.getInstance(getContext()) : null); 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.messageRequestInfoOutline.setVisibility(View.GONE);
binding.messageRequestDivider.setVisibility(View.GONE); binding.messageRequestDivider.setVisibility(View.GONE);
} }

View File

@@ -623,10 +623,6 @@ class ConversationAdapterV2(
} }
conversationBanner.setDescription(HtmlCompat.fromHtml(description, 0), R.drawable.symbol_group_light_20) conversationBanner.setDescription(HtmlCompat.fromHtml(description, 0), R.drawable.symbol_group_light_20)
} }
if (recipient.isReleaseNotes) {
conversationBanner.hideDecorations()
}
} }
} }

View File

@@ -281,7 +281,6 @@ private fun AboutRow(
endIcon: Painter? = null, endIcon: Painter? = null,
onClick: (() -> Unit)? = null onClick: (() -> Unit)? = null
) { ) {
val padHorizontal = if (onClick != null) 19.dp else 32.dp val padHorizontal = if (onClick != null) 19.dp else 32.dp
val padVertical = if (onClick != null) 4.dp else 6.dp val padVertical = if (onClick != null) 4.dp else 6.dp