From 860cdb05e2e6e92817ca76e40d5d9a9d8b3ec79b Mon Sep 17 00:00:00 2001 From: LucasGGamerM Date: Tue, 5 Sep 2023 14:25:20 -0300 Subject: [PATCH] feat: add no alt text and sensitive media warning to images without preview --- .../ui/displayitems/FileStatusDisplayItem.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FileStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FileStatusDisplayItem.java index 9e6fddef9..0a2782267 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FileStatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FileStatusDisplayItem.java @@ -66,17 +66,25 @@ public class FileStatusDisplayItem extends StatusDisplayItem{ @Override public void onBind(FileStatusDisplayItem item) { Uri url = Uri.parse(getUrl()); - title.setText(item.attachment.description != null - ? item.attachment.description - : url.getLastPathSegment()); if(!item.attachment.type.isImage()) { + title.setText(item.attachment.description != null + ? item.attachment.description + : url.getLastPathSegment()); + title.setEllipsize(item.attachment.description != null ? TextUtils.TruncateAt.END : TextUtils.TruncateAt.MIDDLE); domain.setText(url.getHost()); + icon.setImageDrawable(context.getDrawable(R.drawable.ic_fluent_attach_24_regular)); } else { + title.setText(item.attachment.description != null + ? item.attachment.description + : context.getString(R.string.sk_no_alt_text)); title.setSingleLine(false); - domain.setVisibility(View.GONE); + + domain.setText(item.status.sensitive ? context.getString(R.string.sensitive_content_explain) : null); + domain.setVisibility(item.status.sensitive ? View.VISIBLE : View.GONE); + icon.setImageDrawable(context.getDrawable(R.drawable.ic_fluent_image_24_regular)); } }