From 2537460e1694b6116c22eda53e5a1ae7391d52a0 Mon Sep 17 00:00:00 2001 From: LucasGGamerM Date: Sun, 18 Dec 2022 19:43:48 -0300 Subject: [PATCH] Tis broken --- .../android/fragments/BaseStatusListFragment.java | 7 ++++--- .../android/ui/displayitems/HeaderStatusDisplayItem.java | 4 ++-- .../android/ui/displayitems/TextStatusDisplayItem.java | 1 + 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java index 71833634e..ebecd34cd 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java @@ -462,12 +462,13 @@ public abstract class BaseStatusListFragment exten Status status=holder.getItem().status; revealSpoiler(status, holder.getItemID()); } - public void onRevealTranslationClick(HeaderStatusDisplayItem.Holder holder){ + + public void onRevealTranslationClick(HeaderStatusDisplayItem.Holder holder, View v){ Status status=holder.getItem().status; - revealTranslation(status, holder.getItemID()); + revealTranslation(status, holder.getItemID(), v); } - protected void revealTranslation(Status status, String itemID){ + protected void revealTranslation(Status status, String itemID, View v){ status.wantsTranslation=!status.wantsTranslation; TextStatusDisplayItem.Holder text=findHolderOfType(itemID, TextStatusDisplayItem.Holder.class); if(text!=null) diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java index 45846b52b..5f2cebd7d 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java @@ -75,7 +75,7 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{ HtmlParser.parseCustomEmoji(parsedName, user.emojis); emojiHelper.setText(parsedName); if(status!=null){ - hasTranslateToggle=true; + hasTranslateToggle = status.language != ; hasVisibilityToggle=status.sensitive || !TextUtils.isEmpty(status.spoilerText); if(!hasVisibilityToggle && !status.mediaAttachments.isEmpty()){ for(Attachment att:status.mediaAttachments){ @@ -136,7 +136,7 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{ avatar.setClipToOutline(true); more.setOnClickListener(this::onMoreClick); visibility.setOnClickListener(v->item.parentFragment.onVisibilityIconClick(this)); - translate.setOnClickListener(v->item.parentFragment.onRevealTranslationClick(this)); + translate.setOnClickListener(v->item.parentFragment.onRevealTranslationClick(this, v)); optionsMenu=new PopupMenu(activity, more); optionsMenu.inflate(R.menu.post); diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java index 9b70913cb..baf4db83c 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java @@ -108,6 +108,7 @@ public class TextStatusDisplayItem extends StatusDisplayItem{ @Override public void onError(ErrorResponse error){ item.status.wantsTranslation=false; + text.setText(item.text); error.showToast(item.parentFragment.getActivity()); } })