feat(status): translate media attachments

sk22 · Nov 1, 2023 · 24677ea · 24677ea
1 parent c8122aa
commit 24677ea
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 0 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
@@ -858,6 +858,10 @@ public void onSuccess(Translation result){
 										return;
 									status.translation=result;
 									status.translationState=Status.TranslationState.SHOWN;
+									MediaGridStatusDisplayItem.Holder media=findHolderOfType(itemID, MediaGridStatusDisplayItem.Holder.class);
+									if (media!=null) {
+										media.rebind();
+									}
 									TextStatusDisplayItem.Holder text=findHolderOfType(itemID, TextStatusDisplayItem.Holder.class);
 									if(text!=null){
 										text.updateTranslation(true);
@@ -896,8 +900,15 @@ public void onError(ErrorResponse error){
 		}else{
 			notifyItemChanged(itemID, TextStatusDisplayItem.class);
 		}
+
+		MediaGridStatusDisplayItem.Holder media=findHolderOfType(itemID, MediaGridStatusDisplayItem.Holder.class);
+		if (media!=null) {
+			media.rebind();
+		}
 	}
 
+	private void updateTranslation() {}
+
 	public void rebuildAllDisplayItems(){
 		displayItems.clear();
 		for(T item:data){

diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/Translation.java b/mastodon/src/main/java/org/joinmastodon/android/model/Translation.java
@@ -7,4 +7,10 @@ public class Translation extends BaseModel{
 	public String content;
 	public String detectedSourceLanguage;
 	public String provider;
+	public MediaAttachment[] mediaAttachments;
+
+	public static class MediaAttachment {
+		public String id;
+		public String description;
+	}
 }
diff --git a/...on/src/main/java/org/joinmastodon/android/ui/displayitems/MediaGridStatusDisplayItem.java b/...on/src/main/java/org/joinmastodon/android/ui/displayitems/MediaGridStatusDisplayItem.java
@@ -12,6 +12,7 @@
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
 import android.text.TextUtils;
+import android.util.Pair;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
@@ -26,6 +27,7 @@
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.model.Attachment;
 import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.model.Translation;
 import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.PhotoLayoutHelper;
 import org.joinmastodon.android.ui.drawables.SpoilerStripesDrawable;
@@ -38,7 +40,12 @@
 import org.joinmastodon.android.utils.TypedObjectPool;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
 
 import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
 import me.grishka.appkit.imageloader.requests.ImageLoaderRequest;
@@ -52,6 +59,7 @@ public class MediaGridStatusDisplayItem extends StatusDisplayItem{
 	private PhotoLayoutHelper.TiledLayoutResult tiledLayout;
 	private final TypedObjectPool<GridItemType, MediaAttachmentViewController> viewPool;
 	private final List<Attachment> attachments;
+	private final Map<String, Pair<String, String>> translatedAttachments = new HashMap<>();
 	private final ArrayList<ImageLoaderRequest> requests=new ArrayList<>();
 	public final Status status;
 	public String sensitiveTitle;
@@ -189,6 +197,25 @@ public void onBind(MediaGridStatusDisplayItem item){
 					c.btnsWrap.setAlpha(1f);
 				}
 				controllers.add(c);
+
+				if (item.status.translation != null){
+					if(item.status.translationState==Status.TranslationState.SHOWN){
+						if(!item.translatedAttachments.containsKey(att.id)){
+							Optional<Translation.MediaAttachment> translatedAttachment=Arrays.stream(item.status.translation.mediaAttachments).filter(mediaAttachment->mediaAttachment.id.equals(att.id)).findFirst();
+							translatedAttachment.ifPresent(mediaAttachment->{
+								item.translatedAttachments.put(mediaAttachment.id, new Pair<>(att.description, mediaAttachment.description));
+								att.description=mediaAttachment.description;
+							});
+						}else{
+							//SAFETY: must be non-null, as we check if the map contains the attachment before
+							att.description=Objects.requireNonNull(item.translatedAttachments.get(att.id)).second;
+						}
+					}else{
+						if (item.translatedAttachments.containsKey(att.id)) {
+							att.description=Objects.requireNonNull(item.translatedAttachments.get(att.id)).first;
+						}
+					}
+				}
 				c.bind(att, item.status);
 				i++;
 			}