Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

When a toot is translated the service used is displayed, also if using Google the 'Powered by...' TextView is clickable and directs you to "https://translate.google.com/", the same way as when using Yandex.

This commit is contained in:
PhotonQyv 2017-08-28 11:12:41 +01:00
parent 2287f12d19
commit f043098e2a
2 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
View File

@ -205,6 +205,7 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
holder.status_spoiler = (TextView) convertView.findViewById(R.id.status_spoiler);
holder.status_spoiler_button = (Button) convertView.findViewById(R.id.status_spoiler_button);
holder.yandex_translate = (TextView) convertView.findViewById(R.id.yandex_translate);
holder.google_translate = (TextView) convertView.findViewById(R.id.google_translate);
holder.status_replies = (LinearLayout) convertView.findViewById(R.id.status_replies);
holder.status_replies_profile_pictures = (LinearLayout) convertView.findViewById(R.id.status_replies_profile_pictures);
holder.status_replies_text = (TextView) convertView.findViewById(R.id.status_replies_text);
@ -310,10 +311,25 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
holder.status_translate.setVisibility(View.GONE);
}
if( translator == Helper.TRANS_YANDEX)
holder.yandex_translate.setVisibility(View.VISIBLE);
else
holder.yandex_translate.setVisibility(View.GONE);
switch (translator)
{
case Helper.TRANS_NONE:
holder.yandex_translate.setVisibility(View.GONE);
holder.google_translate.setVisibility(View.GONE);
break;
case Helper.TRANS_YANDEX:
holder.google_translate.setVisibility(View.GONE);
holder.yandex_translate.setVisibility(View.VISIBLE);
break;
case Helper.TRANS_GOOGLE:
holder.yandex_translate.setVisibility(View.GONE);
holder.google_translate.setVisibility(View.VISIBLE);
break;
default:
holder.yandex_translate.setVisibility(View.GONE);
holder.google_translate.setVisibility(View.GONE);
break;
}
holder.status_translate.setOnClickListener(new View.OnClickListener() {
@Override
@ -363,7 +379,6 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
new YandexQuery(StatusListAdapter.this).getYandexTextview(position, text, currentLocale);
else if( translator == Helper.TRANS_GOOGLE)
new GoogleTranslateQuery(StatusListAdapter.this).getGoogleTextview(position, text, currentLocale);
}else {
status.setTranslationShown(!status.isTranslationShown());
statusListAdapter.notifyDataSetChanged();
@ -381,6 +396,13 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
context.startActivity(browserIntent);
}
});
holder.google_translate.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://translate.google.com/"));
context.startActivity(browserIntent);
}
});
//Toot was translated and user asked to see it
if( status.isTranslationShown()){
holder.status_content.setVisibility(View.GONE);
@ -1031,6 +1053,7 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
LinearLayout status_container3;
LinearLayout main_container;
TextView yandex_translate;
TextView google_translate;
LinearLayout status_replies;
LinearLayout status_replies_profile_pictures;

8
app/src/main/res/layout/drawer_status.xml
View File

@ -196,6 +196,14 @@
android:text="Powered by Yandex.Translate"
android:layout_height="wrap_content"
tools:ignore="HardcodedText" />
<TextView
android:id="@+id/google_translate"
android:layout_width="match_parent"
android:padding="2dp"
android:gravity="end"
android:text="Powered by Google Translate"
android:layout_height="wrap_content"
tools:ignore="HardcodedText" />
</LinearLayout>
<LinearLayout