empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix bug where description would overwrite subtitle of conversation header.

Browse source
This commit is contained in:
Alex Hart 2024-01-04 11:32:40 -04:00
parent f1ee168657
commit 67ff0892d5
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationHeaderView.java
View file

@ -14,6 +14,7 @@ import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.core.content.ContextCompat;
import org.signal.core.util.DimensionUnit;
import org.signal.core.util.StringUtil;
import org.signal.core.util.concurrent.SignalExecutors;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.components.emoji.EmojiTextView;
@ -94,17 +95,22 @@ public class ConversationHeaderView extends ConstraintLayout {
}
public void setSubtitle(@NonNull CharSequence subtitle, @DrawableRes int iconRes) {
if (TextUtils.isEmpty(subtitle)) {
hideSubtitle();
return;
}
binding.messageRequestSubtitle.setText(prependIcon(subtitle, iconRes));
binding.messageRequestSubtitle.setVisibility(View.VISIBLE);
}
public void setDescription(@Nullable CharSequence description, @DrawableRes int iconRes) {
if (description == null) {
if (TextUtils.isEmpty(description)) {
hideDescription();
return;
}
binding.messageRequestSubtitle.setText(prependIcon(description, iconRes));
binding.messageRequestDescription.setText(prependIcon(description, iconRes));
binding.messageRequestDescription.setVisibility(View.VISIBLE);
}

1
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapterV2.kt
View file

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