Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Do not show the CHANGELOG translation prompt in English #3862

Merged
merged 2 commits into from Mar 3, 2021
Merged

Do not show the CHANGELOG translation prompt in English #3862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab00ec4
Do not show the CHANGELOG translation prompt in English
naivekook Feb 28, 2021
5b0ff49
Update app/src/main/java/openfoodfacts/github/scrachx/openfood/featur…
naivekook Mar 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 10 additions & 3 deletions ...src/main/java/openfoodfacts/github/scrachx/openfood/features/changelog/ChangelogDialog.kt
View file
Open in desktop
Expand Up @@ -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
Expand All @@ -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) {

Expand Down Expand Up @@ -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() {
Expand Down
10 changes: 6 additions & 4 deletions app/src/main/res/layout/fragment_changelog.xml
View file
Open in desktop
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical">

<TextView
Expand Down Expand Up @@ -32,10 +32,12 @@
android:clickable="true"
android:focusable="true"
android:gravity="center"
tools:text="@string/changelog_translation_help"
android:textColor="?android:textColorLink"
android:textSize="@dimen/font_normal"
android:textStyle="normal" />
android:textStyle="normal"
android:visibility="gone"
tools:text="@string/changelog_translation_help"
tools:visibility="visible" />

<Button
android:id="@+id/changelog_button_close"
Expand All @@ -46,4 +48,4 @@
android:layout_margin="@dimen/padding_normal"
android:background="@drawable/rounded_button"
android:text="@string/got_it" />
</LinearLayout>
</LinearLayout>