From a5303a2e010bc42a3e18621e3e819e238409fab8 Mon Sep 17 00:00:00 2001 From: Mariotaku Lee Date: Wed, 17 May 2017 16:11:32 +0800 Subject: [PATCH] improved quote status dialog improved retweet icon state --- .../model/ParcelableStatusExtensions.kt | 15 ++++ .../status/AbsStatusDialogFragment.kt | 2 +- .../status/FavoriteConfirmDialogFragment.kt | 2 +- .../status/RetweetQuoteDialogFragment.kt | 69 +++++++++---------- .../org/mariotaku/twidere/util/MenuUtils.kt | 3 - .../twidere/view/holder/StatusViewHolder.kt | 6 -- .../main/res-localized/values-ar/strings.xml | 2 +- .../main/res-localized/values-ast/strings.xml | 2 +- .../main/res-localized/values-ca/strings.xml | 2 +- .../main/res-localized/values-de/strings.xml | 2 +- .../main/res-localized/values-es/strings.xml | 2 +- .../main/res-localized/values-fa/strings.xml | 2 +- .../main/res-localized/values-fi/strings.xml | 2 +- .../main/res-localized/values-fr/strings.xml | 2 +- .../main/res-localized/values-gl/strings.xml | 2 +- .../main/res-localized/values-hr/strings.xml | 2 +- .../main/res-localized/values-hu/strings.xml | 2 +- .../main/res-localized/values-in/strings.xml | 2 +- .../main/res-localized/values-it/strings.xml | 2 +- .../main/res-localized/values-ja/strings.xml | 2 +- .../main/res-localized/values-ko/strings.xml | 2 +- .../main/res-localized/values-nl/strings.xml | 2 +- .../main/res-localized/values-no/strings.xml | 2 +- .../main/res-localized/values-pt/strings.xml | 2 +- .../main/res-localized/values-ru/strings.xml | 2 +- .../main/res-localized/values-sv/strings.xml | 2 +- .../main/res-localized/values-th/strings.xml | 2 +- .../main/res-localized/values-tr/strings.xml | 2 +- .../main/res-localized/values-uk/strings.xml | 2 +- .../res-localized/values-zh-rCN/strings.xml | 2 +- .../res-localized/values-zh-rHK/strings.xml | 2 +- .../main/res-localized/values-zh/strings.xml | 2 +- twidere/src/main/res/values/strings.xml | 2 +- 33 files changed, 76 insertions(+), 75 deletions(-) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/ParcelableStatusExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/ParcelableStatusExtensions.kt index 65b30c5ea..ef1eaf870 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/ParcelableStatusExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/ParcelableStatusExtensions.kt @@ -1,8 +1,10 @@ package org.mariotaku.twidere.extension.model import org.mariotaku.ktextension.addAllTo +import org.mariotaku.microblog.library.mastodon.annotation.StatusVisibility import org.mariotaku.twidere.model.* import org.mariotaku.twidere.util.UriUtils +import org.mariotaku.twidere.util.Utils val ParcelableStatus.originalId: String @@ -62,6 +64,19 @@ inline val ParcelableStatus.quoted_user_acct: String? get() = if (account_key.ho "$quoted_user_screen_name@${quoted_user_key?.host}" } +inline val ParcelableStatus.is_my_retweet: Boolean + get() = Utils.isMyRetweet(account_key, retweeted_by_user_key, my_retweet_id) + +inline val ParcelableStatus.can_retweet: Boolean + get() { + if (user_is_protected) return false + return when (extras?.visibility) { + StatusVisibility.PRIVATE -> false + StatusVisibility.DIRECT -> false + else -> true + } + } + fun ParcelableStatus.toSummaryLine(): ParcelableActivity.SummaryLine { val result = ParcelableActivity.SummaryLine() result.key = user_key diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/AbsStatusDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/AbsStatusDialogFragment.kt index 44cd9ce8c..d03954f03 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/AbsStatusDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/AbsStatusDialogFragment.kt @@ -139,7 +139,7 @@ abstract class AbsStatusDialogFragment : BaseDialogFragment() { protected abstract fun Builder.setupAlertDialog() - protected abstract fun AlertDialog.onStatusLoaded(details: AccountDetails, status: ParcelableStatus, + protected abstract fun AlertDialog.onStatusLoaded(account: AccountDetails, status: ParcelableStatus, savedInstanceState: Bundle?) companion object { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/FavoriteConfirmDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/FavoriteConfirmDialogFragment.kt index 20ff9bee7..bde27fa2e 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/FavoriteConfirmDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/FavoriteConfirmDialogFragment.kt @@ -57,7 +57,7 @@ class FavoriteConfirmDialogFragment : AbsStatusDialogFragment() { setNegativeButton(android.R.string.cancel, null) } - override fun AlertDialog.onStatusLoaded(details: AccountDetails, status: ParcelableStatus, + override fun AlertDialog.onStatusLoaded(account: AccountDetails, status: ParcelableStatus, savedInstanceState: Bundle?) { val positiveButton = getButton(BUTTON_POSITIVE) if (preferences[iWantMyStarsBackKey]) { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/RetweetQuoteDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/RetweetQuoteDialogFragment.kt index 4d8dc1400..73124192d 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/RetweetQuoteDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/RetweetQuoteDialogFragment.kt @@ -42,16 +42,16 @@ import org.mariotaku.twidere.annotation.AccountType import org.mariotaku.twidere.constant.IntentConstants.* import org.mariotaku.twidere.constant.quickSendKey import org.mariotaku.twidere.extension.applyTheme +import org.mariotaku.twidere.extension.model.can_retweet +import org.mariotaku.twidere.extension.model.is_my_retweet import org.mariotaku.twidere.extension.model.textLimit import org.mariotaku.twidere.fragment.BaseDialogFragment import org.mariotaku.twidere.model.* import org.mariotaku.twidere.model.draft.QuoteStatusActionExtras import org.mariotaku.twidere.provider.TwidereDataStore.Drafts import org.mariotaku.twidere.service.LengthyOperationsService -import org.mariotaku.twidere.util.Analyzer import org.mariotaku.twidere.util.EditTextEnterHandler import org.mariotaku.twidere.util.LinkCreator -import org.mariotaku.twidere.util.Utils.isMyRetweet import org.mariotaku.twidere.util.view.SimpleTextWatcher import org.mariotaku.twidere.view.ComposeEditText import org.mariotaku.twidere.view.StatusTextCountView @@ -82,14 +82,14 @@ class RetweetQuoteDialogFragment : AbsStatusDialogFragment() { setNeutralButton(R.string.action_quote, null) } - override fun AlertDialog.onStatusLoaded(details: AccountDetails, status: ParcelableStatus, + override fun AlertDialog.onStatusLoaded(account: AccountDetails, status: ParcelableStatus, savedInstanceState: Bundle?) { - textCountView.maxLength = details.textLimit + textCountView.maxLength = account.textLimit - val useQuote = useQuote(!status.user_is_protected, details) + val canQuoteRetweet = canQuoteRetweet(account) - commentContainer.visibility = if (useQuote) View.VISIBLE else View.GONE - editComment.account = details + commentContainer.visibility = if (canQuoteRetweet) View.VISIBLE else View.GONE + editComment.account = account val enterHandler = EditTextEnterHandler.attach(editComment, object : EditTextEnterHandler.EnterListener { override fun shouldCallListener(): Boolean { @@ -97,7 +97,7 @@ class RetweetQuoteDialogFragment : AbsStatusDialogFragment() { } override fun onHitEnter(): Boolean { - if (retweetOrQuote(details, status, showProtectedConfirm)) { + if (retweetOrQuote(account, status, showProtectedConfirm)) { dismiss() return true } @@ -107,7 +107,7 @@ class RetweetQuoteDialogFragment : AbsStatusDialogFragment() { enterHandler.addTextChangedListener(object : SimpleTextWatcher { override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) { - updateTextCount(dialog, s, status, details) + dialog.updateTextCount(s, status, account) } }) @@ -118,18 +118,10 @@ class RetweetQuoteDialogFragment : AbsStatusDialogFragment() { } getButton(DialogInterface.BUTTON_POSITIVE).setOnClickListener { - var dismissDialog = false - if (editComment.length() > 0) { - dismissDialog = retweetOrQuote(details, status, showProtectedConfirm) - } else if (isMyRetweet(status)) { - twitterWrapper.cancelRetweetAsync(details.key, status.id, status.my_retweet_id) - dismissDialog = true - } else if (useQuote(!status.user_is_protected, details)) { - dismissDialog = retweetOrQuote(details, status, showProtectedConfirm) - } else { - Analyzer.logException(IllegalStateException(status.toString())) - } - if (dismissDialog) { + if (status.is_my_retweet) { + twitterWrapper.cancelRetweetAsync(account.key, status.id, status.my_retweet_id) + dismiss() + } else if (retweetOrQuote(account, status, showProtectedConfirm)) { dismiss() } } @@ -146,7 +138,7 @@ class RetweetQuoteDialogFragment : AbsStatusDialogFragment() { } editComment.setSelection(editComment.length()) - updateTextCount(dialog, editComment.text, status, details) + dialog.updateTextCount(editComment.text, status, account) } override fun onCancel(dialog: DialogInterface?) { @@ -169,24 +161,24 @@ class RetweetQuoteDialogFragment : AbsStatusDialogFragment() { } } - private fun updateTextCount(dialog: DialogInterface, s: CharSequence, status: ParcelableStatus, - credentials: AccountDetails) { - if (dialog !is AlertDialog) return - val positiveButton = dialog.getButton(AlertDialog.BUTTON_POSITIVE) ?: return - if (s.isNotEmpty()) { - positiveButton.setText(R.string.comment) - positiveButton.isEnabled = true - } else if (isMyRetweet(status)) { + private fun DialogInterface.updateTextCount(s: CharSequence, status: ParcelableStatus, account: AccountDetails) { + if (this !is AlertDialog) return + val positiveButton = getButton(AlertDialog.BUTTON_POSITIVE) ?: return + + if (status.is_my_retweet) { positiveButton.setText(R.string.action_cancel_retweet) positiveButton.isEnabled = true - } else if (useQuote(false, credentials)) { - positiveButton.setText(R.string.action_retweet) + } else if (canQuoteRetweet(account)) { + if (editComment.empty) { + positiveButton.setText(R.string.action_retweet) + } else { + positiveButton.setText(R.string.action_comment) + } positiveButton.isEnabled = true } else { positiveButton.setText(R.string.action_retweet) - positiveButton.isEnabled = !status.user_is_protected + positiveButton.isEnabled = status.can_retweet } - val textCountView = dialog.findViewById(R.id.commentTextCount) as StatusTextCountView textCountView.textCount = validator.getTweetLength(s.toString()) } @@ -196,7 +188,7 @@ class RetweetQuoteDialogFragment : AbsStatusDialogFragment() { val twitter = twitterWrapper val dialog = dialog ?: return false val editComment = dialog.findViewById(R.id.editComment) as EditText - if (useQuote(editComment.length() > 0, account)) { + if (canQuoteRetweet(account) && !editComment.empty) { val quoteOriginalStatus = dialog.quoteOriginal.isChecked var commentText: String @@ -250,8 +242,11 @@ class RetweetQuoteDialogFragment : AbsStatusDialogFragment() { return true } - private fun useQuote(preCondition: Boolean, account: AccountDetails): Boolean { - return preCondition || AccountType.FANFOU == account.type + private fun canQuoteRetweet(account: AccountDetails): Boolean { + return when (account.type) { + AccountType.FANFOU, AccountType.TWITTER -> true + else -> false + } } private fun Dialog.saveToDrafts() { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/MenuUtils.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/MenuUtils.kt index e05ec45a2..9d8d9b20f 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/MenuUtils.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/MenuUtils.kt @@ -146,16 +146,13 @@ object MenuUtils { when (status.extras?.visibility) { StatusVisibility.PRIVATE -> { - retweet.isEnabled = false retweet.setActionIcon(context, R.drawable.ic_action_lock) } StatusVisibility.DIRECT -> { - retweet.isEnabled = false retweet.setActionIcon(context, R.drawable.ic_action_message) retweet.setIcon(R.drawable.ic_action_message) } else -> { - retweet.isEnabled = true retweet.setActionIcon(context, R.drawable.ic_action_retweet) } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/StatusViewHolder.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/StatusViewHolder.kt index 7416a2348..d833b37ba 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/StatusViewHolder.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/StatusViewHolder.kt @@ -397,19 +397,13 @@ class StatusViewHolder(private val adapter: IStatusesAdapter<*>, itemView: View) when (status.extras?.visibility) { StatusVisibility.PRIVATE -> { - retweetButton.isEnabled = false retweetIcon.setImageResource(R.drawable.ic_action_lock) - retweetIcon.isEnabled = false } StatusVisibility.DIRECT -> { - retweetButton.isEnabled = false retweetIcon.setImageResource(R.drawable.ic_action_message) - retweetIcon.isEnabled = false } else -> { - retweetButton.isEnabled = true retweetIcon.setImageResource(R.drawable.ic_action_retweet) - retweetIcon.isEnabled = true } } diff --git a/twidere/src/main/res-localized/values-ar/strings.xml b/twidere/src/main/res-localized/values-ar/strings.xml index c70c34539..fda10d169 100644 --- a/twidere/src/main/res-localized/values-ar/strings.xml +++ b/twidere/src/main/res-localized/values-ar/strings.xml @@ -137,7 +137,7 @@ اضغط على المحتوى للتكوين إغلاق لوحة الحسابات اللون - تعليق + تعليق بطاقات مختصرة عرض بطاقات أكثر على الشاشة اكتب الان diff --git a/twidere/src/main/res-localized/values-ast/strings.xml b/twidere/src/main/res-localized/values-ast/strings.xml index 1086be7f1..a7711d646 100644 --- a/twidere/src/main/res-localized/values-ast/strings.xml +++ b/twidere/src/main/res-localized/values-ast/strings.xml @@ -202,7 +202,7 @@ Avisos combinaos Los avisos amosaránse de mou separtáu Agruparánse los avisos - Comentar + Comentar Comentariu… Tarxetes compautes Amuesa más tarxetes na pantalla diff --git a/twidere/src/main/res-localized/values-ca/strings.xml b/twidere/src/main/res-localized/values-ca/strings.xml index 6f465b790..ec03b4a94 100644 --- a/twidere/src/main/res-localized/values-ca/strings.xml +++ b/twidere/src/main/res-localized/values-ca/strings.xml @@ -116,7 +116,7 @@ Notificacions combinades Les notificacions es mostraran per separat Els notificacions es mostraran agrupades - Comentari + Comentari Comentari… Targetes més compactes Fa que es vegin més piulades per pàgina diff --git a/twidere/src/main/res-localized/values-de/strings.xml b/twidere/src/main/res-localized/values-de/strings.xml index d762f1093..fa3d4f1ec 100644 --- a/twidere/src/main/res-localized/values-de/strings.xml +++ b/twidere/src/main/res-localized/values-de/strings.xml @@ -205,7 +205,7 @@ Kombinierte Benachrichtigungen Benachrichtigungen werden getrennt angezeigt Benachrichtigungen werden zusammengefasst - Kommentar + Kommentar Kommentar… Kompakte Karten Mehr Karten anzeigen diff --git a/twidere/src/main/res-localized/values-es/strings.xml b/twidere/src/main/res-localized/values-es/strings.xml index d00d4b69f..e268ade1a 100644 --- a/twidere/src/main/res-localized/values-es/strings.xml +++ b/twidere/src/main/res-localized/values-es/strings.xml @@ -206,7 +206,7 @@ Notificaciones combinadas Las notificaciones serán mostradas por separado Las notificaciones estarán agrupadas - Comentario + Comentario Comentario… Compactar tarjetas Visualizar más tarjetas en pantalla diff --git a/twidere/src/main/res-localized/values-fa/strings.xml b/twidere/src/main/res-localized/values-fa/strings.xml index ac4bd1a42..207f26162 100644 --- a/twidere/src/main/res-localized/values-fa/strings.xml +++ b/twidere/src/main/res-localized/values-fa/strings.xml @@ -203,7 +203,7 @@ آگهی‌های ترکیبی آگهی‌ها به صورت تکی نمایش داده خواهند شد آگهی‌ها دسته‌بندی خواهند شد - نظر + نظر نظر… کارت‌های فشرده نمایش کارت‌های بیش‌تر روی صفحه diff --git a/twidere/src/main/res-localized/values-fi/strings.xml b/twidere/src/main/res-localized/values-fi/strings.xml index 5eb6f7c3e..0263d49f4 100644 --- a/twidere/src/main/res-localized/values-fi/strings.xml +++ b/twidere/src/main/res-localized/values-fi/strings.xml @@ -116,7 +116,7 @@ Yhdistetyt ilmoitukset Ilmoitukset esitetään erillään Ilmoitukset ryhmitellään - Kommentti + Kommentti Kommentti… Tiiviit kortit Näytä ruudulla enemmän kortteja diff --git a/twidere/src/main/res-localized/values-fr/strings.xml b/twidere/src/main/res-localized/values-fr/strings.xml index 590578e30..2f04b46ba 100644 --- a/twidere/src/main/res-localized/values-fr/strings.xml +++ b/twidere/src/main/res-localized/values-fr/strings.xml @@ -205,7 +205,7 @@ Notifications combinées Les notifications seront affichées séparément Les notifications seront groupées - Commenter + Commenter Commenter… Cartes compactes Afficher plus de cartes à l\'écran diff --git a/twidere/src/main/res-localized/values-gl/strings.xml b/twidere/src/main/res-localized/values-gl/strings.xml index 6a55caec1..13081ef65 100644 --- a/twidere/src/main/res-localized/values-gl/strings.xml +++ b/twidere/src/main/res-localized/values-gl/strings.xml @@ -206,7 +206,7 @@ Notificacións combinadas As notificacións amosaranse separadamente Agruparanse as notificacións - Comentar + Comentar Comentar… Compactar cartóns Amosa máis cartóns na pantalla diff --git a/twidere/src/main/res-localized/values-hr/strings.xml b/twidere/src/main/res-localized/values-hr/strings.xml index ed847e35c..241da1de9 100644 --- a/twidere/src/main/res-localized/values-hr/strings.xml +++ b/twidere/src/main/res-localized/values-hr/strings.xml @@ -99,7 +99,7 @@ Očisti sve tweetove, profile, poruke. Podaci o vašem računu neće biti izgubljeni. Očisti povijest pretraživanja Boja - Komentirat + Komentirat Komentiraj… Kompaktne kartice Prikaži više kartice na zaslonu diff --git a/twidere/src/main/res-localized/values-hu/strings.xml b/twidere/src/main/res-localized/values-hu/strings.xml index b7846d4cc..93d8e92c4 100644 --- a/twidere/src/main/res-localized/values-hu/strings.xml +++ b/twidere/src/main/res-localized/values-hu/strings.xml @@ -128,7 +128,7 @@ Egyesített értesítések Elkülönítve jelennek meg az értesítések Csoportosítva jelennek meg az értesítések - Megjegyzés + Megjegyzés Megjegyzés… Kompakt kártyák Több kártya megjelenítése a képernyőn diff --git a/twidere/src/main/res-localized/values-in/strings.xml b/twidere/src/main/res-localized/values-in/strings.xml index 1849ad678..8620f9b65 100644 --- a/twidere/src/main/res-localized/values-in/strings.xml +++ b/twidere/src/main/res-localized/values-in/strings.xml @@ -179,7 +179,7 @@ Notifikasi digabungkan Notifikasi akan ditampilkan terpisah Notifikasi akan digrupkan - Komentar + Komentar Komentar... Kartu compact Tampilkan kartu lebih banyak diff --git a/twidere/src/main/res-localized/values-it/strings.xml b/twidere/src/main/res-localized/values-it/strings.xml index 69b4397b9..b301f18cf 100644 --- a/twidere/src/main/res-localized/values-it/strings.xml +++ b/twidere/src/main/res-localized/values-it/strings.xml @@ -113,7 +113,7 @@ Notifiche raggruppate Le notifiche saranno mostrate separatamente Le notifiche saranno raggruppate - Commenta + Commenta Commento… Schede compatte Visualizza più schede sullo schermo diff --git a/twidere/src/main/res-localized/values-ja/strings.xml b/twidere/src/main/res-localized/values-ja/strings.xml index 0fd941067..7d9712ae9 100644 --- a/twidere/src/main/res-localized/values-ja/strings.xml +++ b/twidere/src/main/res-localized/values-ja/strings.xml @@ -206,7 +206,7 @@ 合併された通知 通知を個別表示 通知をグループ化 - コメント + コメント コメント… カードのコンパクト化 画面あたりのカード表示数を増やせます。 diff --git a/twidere/src/main/res-localized/values-ko/strings.xml b/twidere/src/main/res-localized/values-ko/strings.xml index acc109f6e..1573c3521 100644 --- a/twidere/src/main/res-localized/values-ko/strings.xml +++ b/twidere/src/main/res-localized/values-ko/strings.xml @@ -205,7 +205,7 @@ 알림 합치기 알림들이 따로따로 표시됩니다. 알림들이 합쳐서 표시됩니다. - 코멘트 + 코멘트 코멘트… 작은 카드 화면에 더 많은 카드를 표시합니다. diff --git a/twidere/src/main/res-localized/values-nl/strings.xml b/twidere/src/main/res-localized/values-nl/strings.xml index c6869b109..5f438b78b 100644 --- a/twidere/src/main/res-localized/values-nl/strings.xml +++ b/twidere/src/main/res-localized/values-nl/strings.xml @@ -113,7 +113,7 @@ Gecombineerde meldingen Meldingen zullen los van elkaar worden weergegeven Meldingen zullen gegroepeerd worden - Opmerking + Opmerking Opmerking maken… Compacte kaarten Toon meer kaarten op het scherm diff --git a/twidere/src/main/res-localized/values-no/strings.xml b/twidere/src/main/res-localized/values-no/strings.xml index 809a6fdac..f2d32b1ab 100644 --- a/twidere/src/main/res-localized/values-no/strings.xml +++ b/twidere/src/main/res-localized/values-no/strings.xml @@ -108,7 +108,7 @@ Kombinerte varsler Varsler vises separat Varsler grupperes - Kommenter + Kommenter Kommenter… Kompakte kort Vis flere kort på skjermen diff --git a/twidere/src/main/res-localized/values-pt/strings.xml b/twidere/src/main/res-localized/values-pt/strings.xml index 2cddd2656..a6d7686b2 100644 --- a/twidere/src/main/res-localized/values-pt/strings.xml +++ b/twidere/src/main/res-localized/values-pt/strings.xml @@ -179,7 +179,7 @@ Notificações agrupadas Notificações serão mostradas separadamente Notificações serão agrupadas - Comentar + Comentar Comentar… Compactar cartões Exibir mais cartões na tela diff --git a/twidere/src/main/res-localized/values-ru/strings.xml b/twidere/src/main/res-localized/values-ru/strings.xml index 3db128687..b015e21af 100644 --- a/twidere/src/main/res-localized/values-ru/strings.xml +++ b/twidere/src/main/res-localized/values-ru/strings.xml @@ -132,7 +132,7 @@ Объединенные уведомления Уведомления будут показаны раздельно Уведомления будут сгруппированы - Комментировать + Комментировать Комментарий… Компактный вид карточек Отображать на экране больше карточек diff --git a/twidere/src/main/res-localized/values-sv/strings.xml b/twidere/src/main/res-localized/values-sv/strings.xml index 15633f213..be089fff5 100644 --- a/twidere/src/main/res-localized/values-sv/strings.xml +++ b/twidere/src/main/res-localized/values-sv/strings.xml @@ -197,7 +197,7 @@ Kombinerade notifieringar Notifieringar kommer att visas separat Notifieringar kommer att grupperas - Kommentar + Kommentar Kommentar... Kompakta kort Visa fler kort på skärmen diff --git a/twidere/src/main/res-localized/values-th/strings.xml b/twidere/src/main/res-localized/values-th/strings.xml index 3712f9b8a..168b65db1 100644 --- a/twidere/src/main/res-localized/values-th/strings.xml +++ b/twidere/src/main/res-localized/values-th/strings.xml @@ -203,7 +203,7 @@ การแจ้งเตือนที่ถูกจัดกลุ่ม แยกการแจ้งเตือนออกจากกันเป็นอันๆ รวมการแจ้งเตือนเป็นกลุ่มเดียวกัน - แสดงความเห็น + แสดงความเห็น ความคิดเห็น... ขนาดกะทัดรัด แสดงการ์ดเยอะๆ บนหน้าจอ diff --git a/twidere/src/main/res-localized/values-tr/strings.xml b/twidere/src/main/res-localized/values-tr/strings.xml index cf56fcb3d..454ec3f09 100644 --- a/twidere/src/main/res-localized/values-tr/strings.xml +++ b/twidere/src/main/res-localized/values-tr/strings.xml @@ -116,7 +116,7 @@ Kombine bildirimleri Bildirimler ayrı ayrı görüntülenir Bildirimler gruplandırılarak görüntülenir - Yorum + Yorum Yorum… Kompak kartlar Ekranda daha fazla kart görüntüle diff --git a/twidere/src/main/res-localized/values-uk/strings.xml b/twidere/src/main/res-localized/values-uk/strings.xml index dbb12bede..a736b0d92 100644 --- a/twidere/src/main/res-localized/values-uk/strings.xml +++ b/twidere/src/main/res-localized/values-uk/strings.xml @@ -117,7 +117,7 @@ Груповані сповіщення Сповіщення відображаються окремо Сповіщення групуються - Коментувати + Коментувати Коментувати… Компактні картки Відображати більше карток на екрані diff --git a/twidere/src/main/res-localized/values-zh-rCN/strings.xml b/twidere/src/main/res-localized/values-zh-rCN/strings.xml index e8b481045..d80b9cfa6 100644 --- a/twidere/src/main/res-localized/values-zh-rCN/strings.xml +++ b/twidere/src/main/res-localized/values-zh-rCN/strings.xml @@ -206,7 +206,7 @@ 合并通知 通知将会分开显示 通知将会被分组 - 评论 + 评论 评论… 紧凑卡片视图 在屏幕中显示更多卡片 diff --git a/twidere/src/main/res-localized/values-zh-rHK/strings.xml b/twidere/src/main/res-localized/values-zh-rHK/strings.xml index 8207ab2c8..d34b71dfe 100644 --- a/twidere/src/main/res-localized/values-zh-rHK/strings.xml +++ b/twidere/src/main/res-localized/values-zh-rHK/strings.xml @@ -206,7 +206,7 @@ 已合併的通知 通知將分開顯示 通知將被分組 - 評論 + 評論 評論… 緊湊卡片視圖 在螢幕上顯示更多卡片 diff --git a/twidere/src/main/res-localized/values-zh/strings.xml b/twidere/src/main/res-localized/values-zh/strings.xml index 8207ab2c8..d34b71dfe 100644 --- a/twidere/src/main/res-localized/values-zh/strings.xml +++ b/twidere/src/main/res-localized/values-zh/strings.xml @@ -206,7 +206,7 @@ 已合併的通知 通知將分開顯示 通知將被分組 - 評論 + 評論 評論… 緊湊卡片視圖 在螢幕上顯示更多卡片 diff --git a/twidere/src/main/res/values/strings.xml b/twidere/src/main/res/values/strings.xml index cfe6d7a62..41b148310 100644 --- a/twidere/src/main/res/values/strings.xml +++ b/twidere/src/main/res/values/strings.xml @@ -231,7 +231,7 @@ Notifications will be displayed separately Notifications will be grouped - Comment + Comment Comment… Compact cards