From 4381a3135450540d5de3cb2667871b764f3d345f Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Mon, 25 Mar 2019 14:22:56 +0100 Subject: [PATCH] Remove language management --- .../pokeranalytics/android/ui/fragment/SettingsFragment.kt | 6 ------ .../android/ui/view/rowrepresentable/SettingRow.kt | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt index 56fe2d9c..01b9db14 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt @@ -20,7 +20,6 @@ import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.rowrepresentable.SettingRow -import net.pokeranalytics.android.util.LocaleUtils import net.pokeranalytics.android.util.Preferences import net.pokeranalytics.android.util.URL import net.pokeranalytics.android.util.extensions.openContactMail @@ -57,7 +56,6 @@ class SettingsFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, Sta override fun stringForRow(row: RowRepresentable): String { return when (row) { SettingRow.VERSION -> BuildConfig.VERSION_NAME + if (BuildConfig.DEBUG) " DEBUG" else "" - SettingRow.LANGUAGE -> LocaleUtils.getCurrentLocale(requireContext()).displayLanguage SettingRow.CURRENCY -> Currency.getInstance(Preferences.getCurrencyLocale(this.parentActivity)).symbol else -> "" } @@ -94,10 +92,6 @@ class SettingsFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, Sta SettingRow.RATE_APP -> parentActivity.openPlayStorePage() SettingRow.CONTACT_US -> parentActivity.openContactMail(R.string.contact) SettingRow.BUG_REPORT -> parentActivity.openContactMail(R.string.bug_report_subject) - SettingRow.LANGUAGE -> { - LocaleUtils.setCurrentLocale(requireContext(), "fr") - activity?.recreate() - } SettingRow.CURRENCY -> CurrenciesActivity.newInstanceForResult(this@SettingsFragment, SettingsFragment.REQUEST_CODE_CURRENCY) SettingRow.FOLLOW_US -> { when (position) { diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SettingRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SettingRow.kt index 8df2b381..fa9f8a97 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SettingRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SettingRow.kt @@ -50,7 +50,7 @@ enum class SettingRow : RowRepresentable { rows.addAll(arrayListOf(FOLLOW_US)) rows.add(CustomizableRowRepresentable(customViewType = RowViewType.HEADER_TITLE, resId = R.string.preferences)) - rows.addAll(arrayListOf(LANGUAGE, CURRENCY)) + rows.addAll(arrayListOf(CURRENCY)) rows.add( CustomizableRowRepresentable(