Fix language spinner

Author: maskara

app/src/main/java/fr/free/nrw/commons/upload/Description.java

@@ -1,7 +1,5 @@
 package fr.free.nrw.commons.upload;
 
-import android.text.TextUtils;
-
 import java.util.List;
 
 /**
@@ -16,36 +14,36 @@ class Description {
     /**
      * @return The language code ie. "en" or "fr"
      */
-    public String getLanguageCode() {
+    String getLanguageCode() {
         return languageCode;
     }
 
     /**
      * @param languageCode The language code ie. "en" or "fr"
      */
-    public void setLanguageCode(String languageCode) {
+    void setLanguageCode(String languageCode) {
         this.languageCode = languageCode;
     }
 
-    public String getDescriptionText() {
+    String getDescriptionText() {
         return descriptionText;
     }
 
-    public void setDescriptionText(String descriptionText) {
+    void setDescriptionText(String descriptionText) {
         this.descriptionText = descriptionText;
     }
 
     /**
      * @return the index of the  language selected in a spinner with {@link SpinnerLanguagesAdapter}
      */
-    public int getSelectedLanguageIndex() {
+    int getSelectedLanguageIndex() {
         return selectedLanguageIndex;
     }
 
     /**
      * @param selectedLanguageIndex the index of the language selected in a spinner with {@link SpinnerLanguagesAdapter}
      */
-    public void setSelectedLanguageIndex(int selectedLanguageIndex) {
+    void setSelectedLanguageIndex(int selectedLanguageIndex) {
         this.selectedLanguageIndex = selectedLanguageIndex;
     }
 
@@ -56,7 +54,7 @@ public void setSelectedLanguageIndex(int selectedLanguageIndex) {
      * @param descriptions the list of descriptions, description is ignored if text is null.
      * @return a string with the pattern of {{en|1=descriptionText}}
      */
-    public static String formatList(List<Description> descriptions) {
+    static String formatList(List<Description> descriptions) {
         StringBuilder descListString = new StringBuilder();
         for (Description description : descriptions) {
             if (!description.isEmpty()) {

app/src/main/java/fr/free/nrw/commons/upload/Language.java

@@ -2,34 +2,7 @@
 
 import java.util.Locale;
 
-import fr.free.nrw.commons.R;
-
 class Language {
-
-    public static int[] languageGroups={R.string.desc_language_Worldwide,
-            R.string.desc_language_America,
-            R.string.desc_language_Europe,
-            R.string.desc_language_Middle_East,
-            R.string.desc_language_Africa,
-            R.string.desc_language_Asia,
-            R.string.desc_language_Pacific };
-    public static int[] languageNames={R.array.desc_languages_Worldwide,
-            R.array.desc_languages_America,
-            R.array.desc_languages_Europe,
-            R.array.desc_languages_Middle_East,
-            R.array.desc_languages_Africa,
-            R.array.desc_languages_Asia,
-            R.array.desc_languages_Pacific
-    };
-    public static int[] languageCodes={R.array.desc_language_codes_Worldwide,
-            R.array.desc_language_codes_America,
-            R.array.desc_language_codes_Europe,
-            R.array.desc_language_codes_Middle_East,
-            R.array.desc_language_codes_Africa,
-            R.array.desc_language_codes_Asia,
-            R.array.desc_language_codes_Pacific
-    };
-
     private Locale locale;
     private boolean isSet = false;
 

app/src/main/java/fr/free/nrw/commons/upload/SpinnerLanguagesAdapter.java

@@ -1,7 +1,6 @@
 package fr.free.nrw.commons.upload;
 
 import android.content.Context;
-import android.content.res.Resources;
 import android.graphics.Color;
 import android.os.Build;
 import android.support.annotation.NonNull;
@@ -15,7 +14,7 @@
 import android.widget.TextView;
 
 import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 
@@ -42,23 +41,18 @@ public SpinnerLanguagesAdapter(@NonNull Context context,
         this.layoutInflater = LayoutInflater.from(context);
         languageNamesList = new ArrayList<>();
         languageCodesList = new ArrayList<>();
-        prepareLanguages(context);
+        prepareLanguages();
         this.selectedLanguages = selectedLanguages;
     }
 
-    private void prepareLanguages(Context context) {
-        Resources resources = context.getResources();
+    private void prepareLanguages() {
         List<Language> languages = getLocaleSupportedByDevice();
 
         for(Language language: languages) {
-            languageNamesList.add(language.getLocale().getDisplayName());
-            languageCodesList.add(language.getLocale().getDisplayScript());
-        }
-        for (int i = 0; i < languages.size(); i++) {
-            languageNamesList.add(resources.getString(Language.languageGroups[i]));
-            languageCodesList.add("");
-            languageNamesList.addAll(Arrays.asList(resources.getStringArray(Language.languageNames[i])));
-            languageCodesList.addAll(Arrays.asList(resources.getStringArray(Language.languageCodes[i])));
+            if(!languageCodesList.contains(language.getLocale().getLanguage())) {
+                languageNamesList.add(language.getLocale().getDisplayName());
+                languageCodesList.add(language.getLocale().getLanguage());
+            }
         }
     }
 
@@ -68,6 +62,9 @@ private List<Language> getLocaleSupportedByDevice() {
         for (Locale locale : localesArray) {
             languages.add(new Language(locale));
         }
+
+        Collections.sort(languages, (language, t1) -> language.getLocale().getDisplayName()
+                .compareTo(t1.getLocale().getDisplayName()));
         return languages;
     }
 
@@ -146,11 +143,11 @@ public void init(int position, boolean isDropDownView) {
         }
     }
 
-    public String getLanguageCode(int position) {
+    String getLanguageCode(int position) {
         return languageCodesList.get(position);
     }
 
-    public int getIndexOfUserDefaultLocale(Context context) {
+    int getIndexOfUserDefaultLocale(Context context) {
         return languageCodesList.indexOf(context.getResources().getConfiguration().locale.getLanguage());
     }