Skip to content
This repository has been archived by the owner on Oct 28, 2024. It is now read-only.

Commit

Permalink
feat(status): translate poll options
Browse files Browse the repository at this point in the history
  • Loading branch information
@FineFindus
FineFindus committed Nov 1, 2023
1 parent 24677ea commit 6c9db5c
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 25 deletions.
33 changes: 13 additions & 20 deletions mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ protected void updatePoll(String itemID, Status status, Poll poll){
spoilerFooterIndex=spoilerItem.contentItems.indexOf(pollItems.get(pollItems.size()-1));
}
pollItems.clear();
StatusDisplayItem.buildPollItems(itemID, this, poll, pollItems);
StatusDisplayItem.buildPollItems(itemID, this, poll, status, pollItems);
if(spoilerItem!=null){
spoilerItem.contentItems.subList(spoilerFirstOptionIndex, spoilerFooterIndex+1).clear();
spoilerItem.contentItems.addAll(spoilerFirstOptionIndex, pollItems);
Expand Down Expand Up @@ -858,30 +858,15 @@ 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);
imgLoader.bindViewHolder((ImageLoaderRecyclerAdapter) list.getAdapter(), text, text.getAbsoluteAdapterPosition());
}else{
notifyItemChanged(itemID, TextStatusDisplayItem.class);
}
updateTranslation(itemID);
}

@Override
public void onError(ErrorResponse error){
if(getActivity()==null)
return;
status.translationState=Status.TranslationState.HIDDEN;
TextStatusDisplayItem.Holder text=findHolderOfType(itemID, TextStatusDisplayItem.Holder.class);
if(text!=null){
text.updateTranslation(true);
}else{
notifyItemChanged(itemID, TextStatusDisplayItem.class);
}
updateTranslation(itemID);
new M3AlertDialogBuilder(getActivity())
.setTitle(R.string.error)
.setMessage(R.string.translation_failed)
Expand All @@ -893,6 +878,10 @@ public void onError(ErrorResponse error){
}
}
}
updateTranslation(itemID);
}

private void updateTranslation(String itemID) {
TextStatusDisplayItem.Holder text=findHolderOfType(itemID, TextStatusDisplayItem.Holder.class);
if(text!=null){
text.updateTranslation(true);
Expand All @@ -905,9 +894,13 @@ public void onError(ErrorResponse error){
if (media!=null) {
media.rebind();
}
}

private void updateTranslation() {}
for(int i=0;i<list.getChildCount();i++){
if(list.getChildViewHolder(list.getChildAt(i)) instanceof PollOptionStatusDisplayItem.Holder item){
item.rebind();
}
}
}

public void rebuildAllDisplayItems(){
displayItems.clear();
Expand Down
10 changes: 10 additions & 0 deletions mastodon/src/main/java/org/joinmastodon/android/model/Translation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,19 @@ public class Translation extends BaseModel{
public String detectedSourceLanguage;
public String provider;
public MediaAttachment[] mediaAttachments;
public PollTranslation poll;

public static class MediaAttachment {
public String id;
public String description;
}

public static class PollTranslation {
public String id;
public PollOption[] options;
}

public static class PollOption {
public String title;
}
}
16 changes: 14 additions & 2 deletions ...n/src/main/java/org/joinmastodon/android/ui/displayitems/PollOptionStatusDisplayItem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import org.joinmastodon.android.R;
import org.joinmastodon.android.fragments.BaseStatusListFragment;
import org.joinmastodon.android.model.Poll;
import org.joinmastodon.android.model.Status;
import org.joinmastodon.android.ui.OutlineProviders;
import org.joinmastodon.android.ui.text.HtmlParser;
import org.joinmastodon.android.ui.utils.CustomEmojiHelper;
Expand All @@ -23,19 +24,23 @@

public class PollOptionStatusDisplayItem extends StatusDisplayItem{
private CharSequence text;
private CharSequence translatedText;
public final Poll.Option option;
private CustomEmojiHelper emojiHelper=new CustomEmojiHelper();
private boolean showResults;
private float votesFraction; // 0..1
private boolean isMostVoted;
private final int optionIndex;
public final Poll poll;
public final Status status;

public PollOptionStatusDisplayItem(String parentID, Poll poll, int optionIndex, BaseStatusListFragment parentFragment){

public PollOptionStatusDisplayItem(String parentID, Poll poll, int optionIndex, BaseStatusListFragment parentFragment, Status status){
super(parentID, parentFragment);
this.optionIndex=optionIndex;
option=poll.options.get(optionIndex);
this.poll=poll;
this.status=status;
text=HtmlParser.parseCustomEmoji(option.title, poll.emojis);
emojiHelper.setText(text);
showResults=poll.isExpired() || poll.voted;
Expand Down Expand Up @@ -84,7 +89,14 @@ public Holder(Activity activity, ViewGroup parent){

@Override
public void onBind(PollOptionStatusDisplayItem item){
text.setText(item.text);
if (item.status.translation != null && item.status.translationState == Status.TranslationState.SHOWN) {
if(item.translatedText==null){
item.translatedText=item.status.translation.poll.options[item.optionIndex].title;
}
text.setText(item.translatedText);
} else {
text.setText(item.text);
}
percent.setVisibility(item.showResults ? View.VISIBLE : View.GONE);
itemView.setClickable(!item.showResults);
icon.setImageDrawable(itemView.getContext().getDrawable(item.poll.multiple ?
Expand Down
6 changes: 3 additions & 3 deletions mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ else if(statusForContent.sensitive && AccountSessionManager.get(accountID).getLo
}
}
if(statusForContent.poll!=null){
buildPollItems(parentID, fragment, statusForContent.poll, contentItems);
buildPollItems(parentID, fragment, statusForContent.poll, status, contentItems);
}
if(statusForContent.card!=null && statusForContent.mediaAttachments.isEmpty()){
contentItems.add(new LinkCardStatusDisplayItem(parentID, fragment, statusForContent));
Expand Down Expand Up @@ -339,10 +339,10 @@ else if(statusForContent.sensitive && AccountSessionManager.get(accountID).getLo
);
}

public static void buildPollItems(String parentID, BaseStatusListFragment fragment, Poll poll, List<StatusDisplayItem> items){
public static void buildPollItems(String parentID, BaseStatusListFragment fragment, Poll poll, Status status, List<StatusDisplayItem> items){
int i=0;
for(Poll.Option opt:poll.options){
items.add(new PollOptionStatusDisplayItem(parentID, poll, i, fragment));
items.add(new PollOptionStatusDisplayItem(parentID, poll, i, fragment, status));
i++;
}
items.add(new PollFooterStatusDisplayItem(parentID, fragment, poll));
Expand Down

0 comments on commit 6c9db5c

Please sign in to comment.