mirror of
https://github.com/signalapp/Signal-Android.git
synced 2025-12-22 20:18:36 +00:00
Hide header decorations when no subtitle or description is set.
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
@@ -623,10 +623,6 @@ class ConversationAdapterV2(
|
||||
}
|
||||
conversationBanner.setDescription(HtmlCompat.fromHtml(description, 0), R.drawable.symbol_group_light_20)
|
||||
}
|
||||
|
||||
if (recipient.isReleaseNotes) {
|
||||
conversationBanner.hideDecorations()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user