From 4fc2bbd78655a942849e4c5c5a2149e31dbf1792 Mon Sep 17 00:00:00 2001 From: Adith Date: Mon, 14 Oct 2024 04:34:39 +1100 Subject: [PATCH] new preference category --- .../fr/free/nrw/commons/settings/Prefs.java | 2 + .../commons/settings/SettingsFragment.java | 46 ++++++++++++++++++- app/src/main/res/values/strings.xml | 1 + app/src/main/res/xml/preferences.xml | 8 ++++ 4 files changed, 56 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/fr/free/nrw/commons/settings/Prefs.java b/app/src/main/java/fr/free/nrw/commons/settings/Prefs.java index 334214347..d0451e24c 100644 --- a/app/src/main/java/fr/free/nrw/commons/settings/Prefs.java +++ b/app/src/main/java/fr/free/nrw/commons/settings/Prefs.java @@ -8,6 +8,8 @@ public class Prefs { public static final String UPLOADS_SHOWING = "uploadsshowing"; public static final String MANAGED_EXIF_TAGS = "managed_exif_tags"; public static final String DESCRIPTION_LANGUAGE = "languageDescription"; + public static final String SECONDARY_LANGUAGE = "languageSecondary"; + public static final String APP_UI_LANGUAGE = "appUiLanguage"; public static final String KEY_THEME_VALUE = "appThemePref"; diff --git a/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java b/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java index 94e799aa2..fee322644 100644 --- a/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java @@ -79,6 +79,7 @@ public class SettingsFragment extends PreferenceFragmentCompat { private ListPreference themeListPreference; private Preference descriptionLanguageListPreference; + private Preference descriptionSecondaryLanguageListPreference; private Preference appUiLanguageListPreference; private String keyLanguageListPreference; private TextView recentLanguagesTextView; @@ -152,6 +153,7 @@ public class SettingsFragment extends PreferenceFragmentCompat { appUiLanguageListPreference.setOnPreferenceClickListener(new OnPreferenceClickListener() { @Override public boolean onPreferenceClick(Preference preference) { + System.out.println("Clicked appui"); prepareAppLanguages(appUiLanguageListPreference.getKey()); return true; } @@ -178,6 +180,28 @@ public class SettingsFragment extends PreferenceFragmentCompat { } }); + descriptionSecondaryLanguageListPreference = findPreference("descriptionSecondaryLanguagePref"); + assert descriptionSecondaryLanguageListPreference != null; + keyLanguageListPreference = descriptionSecondaryLanguageListPreference.getKey(); + languageCode = getCurrentLanguageCode(keyLanguageListPreference); + assert languageCode != null; + if (languageCode.equals("")) { + // If current language code is empty, means none selected by user yet so use phone local + descriptionSecondaryLanguageListPreference.setSummary(Locale.getDefault().getDisplayLanguage()); + } else { + // If any language is selected by user previously, use it + Locale defLocale = createLocale(languageCode); + descriptionSecondaryLanguageListPreference.setSummary(defLocale.getDisplayLanguage(defLocale)); + } + descriptionSecondaryLanguageListPreference.setOnPreferenceClickListener(new OnPreferenceClickListener() { + @Override + public boolean onPreferenceClick(Preference preference) { + System.out.println("clickedseco"); + prepareAppLanguages(descriptionSecondaryLanguageListPreference.getKey()); + return true; + } + }); + Preference betaTesterPreference = findPreference("becomeBetaTester"); betaTesterPreference.setOnPreferenceClickListener(preference -> { Utils.handleWebUrl(getActivity(), Uri.parse(getResources().getString(R.string.beta_opt_in_link))); @@ -205,6 +229,7 @@ public class SettingsFragment extends PreferenceFragmentCompat { findPreference("useAuthorName").setEnabled(false); findPreference("displayNearbyCardView").setEnabled(false); findPreference("descriptionDefaultLanguagePref").setEnabled(false); + findPreference("descriptionSecondaryLanguagePref").setEnabled(false); findPreference("displayLocationPermissionForCardView").setEnabled(false); findPreference(CampaignView.CAMPAIGNS_DEFAULT_PREFERENCE).setEnabled(false); findPreference("managed_exif_tags").setEnabled(false); @@ -278,6 +303,8 @@ public class SettingsFragment extends PreferenceFragmentCompat { */ private void prepareAppLanguages(final String keyListPreference) { + System.out.println("gets to prepare app languages"); + // Gets current language code from shared preferences final String languageCode = getCurrentLanguageCode(keyListPreference); final List recentLanguages = recentLanguagesDao.getRecentLanguages(); @@ -300,7 +327,16 @@ public class SettingsFragment extends PreferenceFragmentCompat { } else { selectedLanguages.put(0, languageCode); } + } else if (keyListPreference.equals("descriptionSecondaryLanguagePref")) { + + assert languageCode != null; + if (languageCode.equals("")) { + selectedLanguages.put(0, Locale.getDefault().getLanguage()); + + } else { + selectedLanguages.put(0, languageCode); } + } LanguagesAdapter languagesAdapter = new LanguagesAdapter( getActivity(), @@ -368,9 +404,12 @@ public class SettingsFragment extends PreferenceFragmentCompat { getActivity().recreate(); final Intent intent = new Intent(getActivity(), MainActivity.class); startActivity(intent); - }else { + }else if(keyListPreference.equals("descriptionDefaultLanguagePref")){ descriptionLanguageListPreference.setSummary(defLocale.getDisplayLanguage(defLocale)); } + else{ + descriptionSecondaryLanguageListPreference.setSummary(defLocale.getDisplayLanguage(defLocale)); + } dialog.dismiss(); } }); @@ -496,6 +535,8 @@ public class SettingsFragment extends PreferenceFragmentCompat { defaultKvStore.putString(Prefs.APP_UI_LANGUAGE, userSelectedValue); } else if (preferenceKey.equals("descriptionDefaultLanguagePref")) { defaultKvStore.putString(Prefs.DESCRIPTION_LANGUAGE, userSelectedValue); + } else if (preferenceKey.equals("descriptionSecondaryLanguagePref")) { + defaultKvStore.putString(Prefs.SECONDARY_LANGUAGE, userSelectedValue); } } @@ -511,6 +552,9 @@ public class SettingsFragment extends PreferenceFragmentCompat { if (preferenceKey.equals("descriptionDefaultLanguagePref")) { return defaultKvStore.getString(Prefs.DESCRIPTION_LANGUAGE, ""); } + if (preferenceKey.equals("descriptionSecondaryLanguagePref")) { + return defaultKvStore.getString(Prefs.SECONDARY_LANGUAGE, ""); + } return null; } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0c6be3129..9cf667e46 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -544,6 +544,7 @@ Upload your first media by tapping on the add button. Why should %1$s be deleted? %1$s is uploaded by: %2$s Default description language + Secondary Description Language Nominating for deletion Success Nominated %1$s for deletion. diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 8ac890545..aeca0d45c 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -25,12 +25,20 @@ app:singleLineTitle="false" android:title="@string/app_ui_language" /> + + + +