From b9d5fd1dd32b4e1d6a34423f4898cce6c444e2cc Mon Sep 17 00:00:00 2001 From: Vladimir Tanakov Date: Thu, 4 Mar 2021 01:21:12 +0300 Subject: [PATCH] feat: do not show the changelogtranslation prompt in English (#3862) Co-authored-by: VaiTon --- .../openfood/features/changelog/ChangelogDialog.kt | 13 ++++++++++--- app/src/main/res/layout/fragment_changelog.xml | 10 ++++++---- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/changelog/ChangelogDialog.kt b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/changelog/ChangelogDialog.kt index f3858047916c..fe26caf4ecd6 100644 --- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/changelog/ChangelogDialog.kt +++ b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/changelog/ChangelogDialog.kt @@ -9,6 +9,7 @@ import android.view.WindowManager import android.widget.TextView import androidx.appcompat.app.AppCompatActivity import androidx.core.content.pm.PackageInfoCompat +import androidx.core.view.isVisible import androidx.fragment.app.DialogFragment import androidx.preference.PreferenceManager import androidx.recyclerview.widget.LinearLayoutManager @@ -21,6 +22,7 @@ import openfoodfacts.github.scrachx.openfood.customtabs.CustomTabActivityHelper import openfoodfacts.github.scrachx.openfood.customtabs.CustomTabsHelper import openfoodfacts.github.scrachx.openfood.customtabs.WebViewFallback import openfoodfacts.github.scrachx.openfood.utils.LocaleHelper.getLocaleFromContext +import java.util.Locale class ChangelogDialog : DialogFragment(R.layout.fragment_changelog) { @@ -86,9 +88,14 @@ class ChangelogDialog : DialogFragment(R.layout.fragment_changelog) { } private fun setupTranslationHelpLabel() { - val language = getLocaleFromContext(context).displayLanguage - translationHelpLabel.text = getString(R.string.changelog_translation_help, language) - translationHelpLabel.setOnClickListener { openDailyFoodFacts() } + val locale = getLocaleFromContext(context) + if (locale.language.startsWith(Locale.ENGLISH.language)) { + translationHelpLabel.isVisible = false + } else { + translationHelpLabel.text = getString(R.string.changelog_translation_help, locale.displayLanguage) + translationHelpLabel.isVisible = true + translationHelpLabel.setOnClickListener { openDailyFoodFacts() } + } } private fun applyWindowTweaks() { diff --git a/app/src/main/res/layout/fragment_changelog.xml b/app/src/main/res/layout/fragment_changelog.xml index fc21b6bf6deb..29a83123c465 100644 --- a/app/src/main/res/layout/fragment_changelog.xml +++ b/app/src/main/res/layout/fragment_changelog.xml @@ -1,8 +1,8 @@ + android:textStyle="normal" + android:visibility="gone" + tools:text="@string/changelog_translation_help" + tools:visibility="visible" />