Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

improved tweet translation dialog

This commit is contained in:
Mariotaku Lee 2017-10-01 18:51:51 +08:00
parent a85e073740
commit f139272d7c
No known key found for this signature in database
GPG Key ID: 15C10F89D7C33535
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
twidere/src/.google.commit-id
View File

@ -1 +1 @@
9d56ddc3f75f85630e6f00578aaa4cfd146bf80c
8de8d16dba7791addfdde208bbadd16504af90d1

2
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/TranslationDestinationDialogFragment.kt
View File

@ -30,6 +30,7 @@ import org.mariotaku.ktextension.Bundle
import org.mariotaku.ktextension.getTypedArray
import org.mariotaku.ktextension.mapToArray
import org.mariotaku.ktextension.set
import org.mariotaku.twidere.R
import org.mariotaku.twidere.constant.translationDestinationKey
import org.mariotaku.twidere.extension.applyTheme
import org.mariotaku.twidere.extension.onShow
@ -47,6 +48,7 @@ class TranslationDestinationDialogFragment : BaseDialogFragment() {
val languages = arguments.getTypedArray<DisplayLanguage>(EXTRA_LANGUAGES).sortedArrayWith(LanguageComparator())
val selectedLanguage = preferences[translationDestinationKey] ?: arguments.getString(EXTRA_SELECTED_LANGUAGE)
val selectedIndex = languages.indexOfFirst { selectedLanguage == it.code }
builder.setTitle(R.string.title_translate_to)
builder.setSingleChoiceItems(languages.mapToArray { it.name }, selectedIndex) { _, which ->
currentIndex.set(which)
}

7
twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/status/DetailStatusViewHolder.kt
View File

@ -335,14 +335,16 @@ class DetailStatusViewHolder(
val lang = status.lang
if (CheckUtils.isValidLocale(lang) && account.isOfficial(context)) {
val locale = Locale(lang)
translateContainer.visibility = View.VISIBLE
if (translation != null) {
translateLabelView.text = context.getString(R.string.label_translation)
val locale = Locale(translation.translatedLang)
translateLabelView.text = context.getString(R.string.label_translated_to_language,
locale.displayLanguage)
translateResultView.visibility = View.VISIBLE
translateChangeLanguageView.visibility = View.VISIBLE
translateResultView.text = translation.text
} else {
val locale = Locale(lang)
translateLabelView.text = context.getString(R.string.label_translate_from_language,
locale.displayLanguage)
translateResultView.visibility = View.GONE
@ -484,6 +486,7 @@ class DetailStatusViewHolder(
locationView.textSize = textSize * 0.85f
itemView.timeSource.textSize = textSize * 0.85f
translateLabelView.textSize = textSize * 0.85f
translateChangeLanguageView.textSize = textSize * 0.85f
translateResultView.textSize = textSize * 1.05f
itemView.countsUsersHeightHolder.count.textSize = textSize * 1.25f

2
twidere/src/main/res/values/strings.xml
View File

@ -573,6 +573,7 @@
<string name="label_statuses_retweets_replies">Tweets, retweets and replies</string>
<string name="label_streaming_service">Streaming service</string>
<string name="label_translate_from_language">Translate from <xliff:g id="language">%s</xliff:g></string>
<string name="label_translated_to_language">Translated to <xliff:g id="language">%s</xliff:g></string>
<string name="label_translation">Translation</string>
<string name="label_username">Username</string>
<string name="label_video">Video</string>
@ -1263,6 +1264,7 @@
<string name="title_summary_line_format"><xliff:g id="title">%1$s</xliff:g>: <xliff:g id="summary">%2$s</xliff:g></string>
<string name="title_sync">Data sync</string>
<string name="title_sync_settings">Sync settings</string>
<string name="title_translate_to">Translate to…</string>
<string name="title_unpin_status_confirm">Unpin tweet</string>
<string name="title_user">User</string>
<string name="title_user_colors">User colors</string>