]> gitweb.fperrin.net Git - Dictionary.git/blobdiff - src/com/hughes/android/dictionary/DictionaryApplication.java
Add menu item to download dictionaries in browser.
[Dictionary.git] / src / com / hughes / android / dictionary / DictionaryApplication.java
index ea0d0b11df619cfe8d597c30c8ea6a5a1229aa4b..f11a7e3595d4c1747866f7a637099288afff715e 100644 (file)
@@ -36,6 +36,7 @@ import android.widget.ImageView.ScaleType;
 import android.widget.LinearLayout;
 import android.widget.Toast;
 
+import com.hughes.android.dictionary.CollatorWrapper;
 import com.hughes.android.dictionary.DictionaryInfo.IndexInfo;
 import com.hughes.android.dictionary.engine.Dictionary;
 import com.hughes.android.dictionary.engine.Language;
@@ -43,7 +44,6 @@ import com.hughes.android.dictionary.engine.Language.LanguageResources;
 import com.hughes.android.dictionary.engine.TransliteratorManager;
 import com.hughes.android.util.PersistentObjectCache;
 import com.hughes.util.ListUtil;
-import java.text.Collator;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -58,7 +58,10 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
-public class DictionaryApplication extends Application {
+public enum DictionaryApplication {
+    INSTANCE;
+
+    private Context appContext;
 
     static final String LOG = "QuickDicApp";
 
@@ -120,171 +123,6 @@ public class DictionaryApplication extends Application {
         final int normalRowBg;
     }
 
-    // Useful:
-    // http://www.loc.gov/standards/iso639-2/php/code_list.php
-    public static final Map<String, LanguageResources> isoCodeToResources = new HashMap<String, LanguageResources>();
-    static {
-        isoCodeToResources.put("AF", new LanguageResources("Afrikaans", R.string.AF,
-                               R.drawable.flag_of_south_africa));
-        isoCodeToResources.put("SQ", new LanguageResources("Albanian", R.string.SQ,
-                               R.drawable.flag_of_albania));
-        isoCodeToResources.put("AR",
-                               new LanguageResources("Arabic", R.string.AR, R.drawable.arabic));
-        isoCodeToResources.put("HY", new LanguageResources("Armenian", R.string.HY,
-                               R.drawable.flag_of_armenia));
-        isoCodeToResources.put("BE", new LanguageResources("Belarusian", R.string.BE,
-                               R.drawable.flag_of_belarus));
-        isoCodeToResources.put("BN", new LanguageResources("Bengali", R.string.BN));
-        isoCodeToResources.put("BS", new LanguageResources("Bosnian", R.string.BS,
-                               R.drawable.flag_of_bosnia_and_herzegovina));
-        isoCodeToResources.put("BG", new LanguageResources("Bulgarian", R.string.BG,
-                               R.drawable.flag_of_bulgaria));
-        isoCodeToResources.put("MY", new LanguageResources("Burmese", R.string.MY,
-                               R.drawable.flag_of_myanmar));
-        isoCodeToResources.put("ZH", new LanguageResources("Chinese", R.string.ZH,
-                               R.drawable.flag_of_the_peoples_republic_of_china));
-        isoCodeToResources.put("cmn", new LanguageResources("Mandarin", R.string.cmn,
-                               R.drawable.flag_of_the_peoples_republic_of_china));
-        isoCodeToResources.put("yue", new LanguageResources("Cantonese", R.string.yue,
-                               R.drawable.flag_of_hong_kong));
-        isoCodeToResources.put("CA", new LanguageResources("Catalan", R.string.CA));
-        isoCodeToResources.put("HR", new LanguageResources("Croatian", R.string.HR,
-                               R.drawable.flag_of_croatia));
-        isoCodeToResources.put("CS", new LanguageResources("Czech", R.string.CS,
-                               R.drawable.flag_of_the_czech_republic));
-        isoCodeToResources.put("DA", new LanguageResources("Danish", R.string.DA,
-                               R.drawable.flag_of_denmark));
-        isoCodeToResources.put("NL", new LanguageResources("Dutch", R.string.NL,
-                               R.drawable.flag_of_the_netherlands));
-        isoCodeToResources.put("EN", new LanguageResources("English", R.string.EN,
-                               R.drawable.flag_of_the_united_kingdom));
-        isoCodeToResources.put("EO", new LanguageResources("Esperanto", R.string.EO,
-                               R.drawable.flag_of_esperanto));
-        isoCodeToResources.put("ET", new LanguageResources("Estonian", R.string.ET,
-                               R.drawable.flag_of_estonia));
-        isoCodeToResources.put("FI", new LanguageResources("Finnish", R.string.FI,
-                               R.drawable.flag_of_finland));
-        isoCodeToResources.put("FR", new LanguageResources("French", R.string.FR,
-                               R.drawable.flag_of_france));
-        isoCodeToResources.put("DE", new LanguageResources("German", R.string.DE,
-                               R.drawable.flag_of_germany));
-        isoCodeToResources.put("EL", new LanguageResources("Greek", R.string.EL,
-                               R.drawable.flag_of_greece));
-        isoCodeToResources.put("grc", new LanguageResources("Ancient Greek", R.string.grc));
-        isoCodeToResources.put("haw", new LanguageResources("Hawaiian", R.string.haw,
-                               R.drawable.flag_of_hawaii));
-        isoCodeToResources.put("HE", new LanguageResources("Hebrew", R.string.HE,
-                               R.drawable.flag_of_israel));
-        isoCodeToResources.put("HI", new LanguageResources("Hindi", R.string.HI, R.drawable.hindi));
-        isoCodeToResources.put("HU", new LanguageResources("Hungarian", R.string.HU,
-                               R.drawable.flag_of_hungary));
-        isoCodeToResources.put("IS", new LanguageResources("Icelandic", R.string.IS,
-                               R.drawable.flag_of_iceland));
-        isoCodeToResources.put("ID", new LanguageResources("Indonesian", R.string.ID,
-                               R.drawable.flag_of_indonesia));
-        isoCodeToResources.put("GA", new LanguageResources("Irish", R.string.GA,
-                               R.drawable.flag_of_ireland));
-        isoCodeToResources.put("GD", new LanguageResources("Scottish Gaelic", R.string.GD,
-                               R.drawable.flag_of_scotland));
-        isoCodeToResources.put("GV", new LanguageResources("Manx", R.string.GV,
-                               R.drawable.flag_of_the_isle_of_man));
-        isoCodeToResources.put("IT", new LanguageResources("Italian", R.string.IT,
-                               R.drawable.flag_of_italy));
-        isoCodeToResources.put("LA", new LanguageResources("Latin", R.string.LA));
-        isoCodeToResources.put("LV", new LanguageResources("Latvian", R.string.LV,
-                               R.drawable.flag_of_latvia));
-        isoCodeToResources.put("LT", new LanguageResources("Lithuanian", R.string.LT,
-                               R.drawable.flag_of_lithuania));
-        isoCodeToResources.put("JA", new LanguageResources("Japanese", R.string.JA,
-                               R.drawable.flag_of_japan));
-        isoCodeToResources.put("KO", new LanguageResources("Korean", R.string.KO,
-                               R.drawable.flag_of_south_korea));
-        isoCodeToResources.put("KU", new LanguageResources("Kurdish", R.string.KU));
-        isoCodeToResources.put("MS", new LanguageResources("Malay", R.string.MS,
-                               R.drawable.flag_of_malaysia));
-        isoCodeToResources.put("MI", new LanguageResources("Maori", R.string.MI,
-                               R.drawable.flag_of_new_zealand));
-        isoCodeToResources.put("MN", new LanguageResources("Mongolian", R.string.MN,
-                               R.drawable.flag_of_mongolia));
-        isoCodeToResources.put("NE", new LanguageResources("Nepali", R.string.NE,
-                               R.drawable.flag_of_nepal));
-        isoCodeToResources.put("NO", new LanguageResources("Norwegian", R.string.NO,
-                               R.drawable.flag_of_norway));
-        isoCodeToResources.put("FA", new LanguageResources("Persian", R.string.FA,
-                               R.drawable.flag_of_iran));
-        isoCodeToResources.put("PL", new LanguageResources("Polish", R.string.PL,
-                               R.drawable.flag_of_poland));
-        isoCodeToResources.put("PT", new LanguageResources("Portuguese", R.string.PT,
-                               R.drawable.flag_of_portugal));
-        isoCodeToResources.put("PA", new LanguageResources("Punjabi", R.string.PA));
-        isoCodeToResources.put("RO", new LanguageResources("Romanian", R.string.RO,
-                               R.drawable.flag_of_romania));
-        isoCodeToResources.put("RU", new LanguageResources("Russian", R.string.RU,
-                               R.drawable.flag_of_russia));
-        isoCodeToResources.put("SA", new LanguageResources("Sanskrit", R.string.SA));
-        isoCodeToResources.put("SR", new LanguageResources("Serbian", R.string.SR,
-                               R.drawable.flag_of_serbia));
-        isoCodeToResources.put("SK", new LanguageResources("Slovak", R.string.SK,
-                               R.drawable.flag_of_slovakia));
-        isoCodeToResources.put("SL", new LanguageResources("Slovenian", R.string.SL,
-                               R.drawable.flag_of_slovenia));
-        isoCodeToResources.put("SO", new LanguageResources("Somali", R.string.SO,
-                               R.drawable.flag_of_somalia));
-        isoCodeToResources.put("ES", new LanguageResources("Spanish", R.string.ES,
-                               R.drawable.flag_of_spain));
-        isoCodeToResources.put("SW", new LanguageResources("Swahili", R.string.SW));
-        isoCodeToResources.put("SV", new LanguageResources("Swedish", R.string.SV,
-                               R.drawable.flag_of_sweden));
-        isoCodeToResources.put("TL", new LanguageResources("Tagalog", R.string.TL));
-        isoCodeToResources.put("TG", new LanguageResources("Tajik", R.string.TG,
-                               R.drawable.flag_of_tajikistan));
-        isoCodeToResources.put("TH", new LanguageResources("Thai", R.string.TH,
-                               R.drawable.flag_of_thailand));
-        isoCodeToResources.put("BO", new LanguageResources("Tibetan", R.string.BO));
-        isoCodeToResources.put("TR", new LanguageResources("Turkish", R.string.TR,
-                               R.drawable.flag_of_turkey));
-        isoCodeToResources.put("UK", new LanguageResources("Ukrainian", R.string.UK,
-                               R.drawable.flag_of_ukraine));
-        isoCodeToResources.put("UR", new LanguageResources("Urdu", R.string.UR));
-        isoCodeToResources.put("VI", new LanguageResources("Vietnamese", R.string.VI,
-                               R.drawable.flag_of_vietnam));
-        isoCodeToResources.put("CI", new LanguageResources("Welsh", R.string.CI,
-                               R.drawable.flag_of_wales_2));
-        isoCodeToResources.put("YI", new LanguageResources("Yiddish", R.string.YI));
-        isoCodeToResources.put("ZU", new LanguageResources("Zulu", R.string.ZU));
-        isoCodeToResources.put("AZ", new LanguageResources("Azeri", R.string.AZ,
-                               R.drawable.flag_of_azerbaijan));
-        isoCodeToResources.put("EU", new LanguageResources("Basque", R.string.EU,
-                               R.drawable.flag_of_the_basque_country));
-        isoCodeToResources.put("BR", new LanguageResources("Breton", R.string.BR));
-        isoCodeToResources.put("MR", new LanguageResources("Marathi", R.string.MR));
-        isoCodeToResources.put("FO", new LanguageResources("Faroese", R.string.FO));
-        isoCodeToResources.put("GL", new LanguageResources("Galician", R.string.GL,
-                               R.drawable.flag_of_galicia));
-        isoCodeToResources.put("KA", new LanguageResources("Georgian", R.string.KA,
-                               R.drawable.flag_of_georgia));
-        isoCodeToResources.put("HT", new LanguageResources("Haitian Creole", R.string.HT,
-                               R.drawable.flag_of_haiti));
-        isoCodeToResources.put("LB", new LanguageResources("Luxembourgish", R.string.LB,
-                               R.drawable.flag_of_luxembourg));
-        isoCodeToResources.put("MK", new LanguageResources("Macedonian", R.string.MK,
-                               R.drawable.flag_of_macedonia));
-        isoCodeToResources.put("LO", new LanguageResources("Lao", R.string.LO,
-                               R.drawable.flag_of_laos));
-        isoCodeToResources.put("ML", new LanguageResources("Malayalam", R.string.ML));
-        isoCodeToResources.put("SL", new LanguageResources("Slovenian", R.string.SL,
-                               R.drawable.flag_of_slovenia));
-        isoCodeToResources.put("TA", new LanguageResources("Tamil", R.string.TA));
-        isoCodeToResources.put("SH", new LanguageResources("Serbo-Croatian", R.string.SH));
-        isoCodeToResources.put("SD", new LanguageResources("Sindhi", R.string.SD));
-
-        // Hack to allow lower-case ISO codes to work:
-        for (final String isoCode : new ArrayList<String>(isoCodeToResources.keySet())) {
-            isoCodeToResources.put(isoCode.toLowerCase(), isoCodeToResources.get(isoCode));
-        }
-
-    }
-
     public static final class DictionaryConfig implements Serializable {
         private static final long serialVersionUID = -1444177164708201263L;
         // User-ordered list, persisted, just the ones that are/have been
@@ -304,7 +142,7 @@ public class DictionaryApplication extends Application {
 
     DictionaryConfig dictionaryConfig = null;
 
-    int languageButtonPixels = -1;
+    public int languageButtonPixels = -1;
 
     static synchronized void staticInit(final Context context) {
         if (DOWNLOADABLE_UNCOMPRESSED_FILENAME_NAME_TO_DICTIONARY_INFO != null) {
@@ -316,7 +154,7 @@ public class DictionaryApplication extends Application {
         try {
             String line;
             while ((line = reader.readLine()) != null) {
-                if (line.startsWith("#") || line.length() == 0) {
+                if (line.length() == 0 || line.charAt(0) == '#') {
                     continue;
                 }
                 final DictionaryInfo dictionaryInfo = new DictionaryInfo(line);
@@ -333,18 +171,21 @@ public class DictionaryApplication extends Application {
 
     private File dictDir;
 
-    @Override
-    public void onCreate() {
-        super.onCreate();
+    public synchronized void init(Context c) {
+        if (appContext != null) {
+            assert c == appContext;
+            return;
+        }
+        appContext = c;
         Log.d("QuickDic", "Application: onCreate");
         TransliteratorManager.init(null, threadBackground);
-        staticInit(getApplicationContext());
+        staticInit(appContext);
 
         languageButtonPixels = (int) TypedValue.applyDimension(
-                                   TypedValue.COMPLEX_UNIT_DIP, 60, getResources().getDisplayMetrics());
+                                   TypedValue.COMPLEX_UNIT_DIP, 60, appContext.getResources().getDisplayMetrics());
 
         // Load the dictionaries we know about.
-        dictionaryConfig = PersistentObjectCache.init(getApplicationContext()).read(
+        dictionaryConfig = PersistentObjectCache.init(appContext).read(
                                C.DICTIONARY_CONFIGS, DictionaryConfig.class);
         if (dictionaryConfig == null) {
             dictionaryConfig = new DictionaryConfig();
@@ -354,59 +195,72 @@ public class DictionaryApplication extends Application {
         }
 
         // Theme stuff.
-        setTheme(getSelectedTheme().themeId);
-        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        appContext.setTheme(getSelectedTheme().themeId);
+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(appContext);
         prefs.registerOnSharedPreferenceChangeListener(new OnSharedPreferenceChangeListener() {
             @Override
             public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
                                                   String key) {
                 Log.d("QuickDic", "prefs changed: " + key);
-                if (key.equals(getString(R.string.themeKey))) {
-                    setTheme(getSelectedTheme().themeId);
+                if (key.equals(appContext.getString(R.string.themeKey))) {
+                    appContext.setTheme(getSelectedTheme().themeId);
                 }
             }
         });
     }
 
-    public void onCreateGlobalOptionsMenu(
+    public static void onCreateGlobalOptionsMenu(
         final Context context, final Menu menu) {
-        final MenuItem about = menu.add(getString(R.string.about));
+        final Context c = context.getApplicationContext();
+        final MenuItem about = menu.add(c.getString(R.string.about));
         MenuItemCompat.setShowAsAction(about, MenuItem.SHOW_AS_ACTION_NEVER);
         about.setOnMenuItemClickListener(new OnMenuItemClickListener() {
             public boolean onMenuItemClick(final MenuItem menuItem) {
-                final Intent intent = new Intent(getApplicationContext(), AboutActivity.class);
+                final Intent intent = new Intent(c, AboutActivity.class);
                 context.startActivity(intent);
                 return false;
             }
         });
 
-        final MenuItem help = menu.add(getString(R.string.help));
+        final MenuItem help = menu.add(c.getString(R.string.help));
         MenuItemCompat.setShowAsAction(help, MenuItem.SHOW_AS_ACTION_NEVER);
         help.setOnMenuItemClickListener(new OnMenuItemClickListener() {
             public boolean onMenuItemClick(final MenuItem menuItem) {
-                context.startActivity(HtmlDisplayActivity.getHelpLaunchIntent(getApplicationContext()));
+                context.startActivity(HtmlDisplayActivity.getHelpLaunchIntent(c));
                 return false;
             }
         });
 
-        final MenuItem preferences = menu.add(getString(R.string.settings));
+        final MenuItem preferences = menu.add(c.getString(R.string.settings));
         MenuItemCompat.setShowAsAction(preferences, MenuItem.SHOW_AS_ACTION_NEVER);
         preferences.setOnMenuItemClickListener(new OnMenuItemClickListener() {
             public boolean onMenuItemClick(final MenuItem menuItem) {
                 PreferenceActivity.prefsMightHaveChanged = true;
-                final Intent intent = new Intent(getApplicationContext(), PreferenceActivity.class);
+                final Intent intent = new Intent(c, PreferenceActivity.class);
                 context.startActivity(intent);
                 return false;
             }
         });
 
-        final MenuItem reportIssue = menu.add(getString(R.string.reportIssue));
+        final MenuItem reportIssue = menu.add(c.getString(R.string.reportIssue));
         MenuItemCompat.setShowAsAction(reportIssue, MenuItem.SHOW_AS_ACTION_NEVER);
         reportIssue.setOnMenuItemClickListener(new OnMenuItemClickListener() {
             public boolean onMenuItemClick(final MenuItem menuItem) {
                 final Intent intent = new Intent(Intent.ACTION_VIEW);
                 intent.setData(Uri
-                               .parse("http://github.com/rdoeffinger/Dictionary/issues"));
+                               .parse("https://github.com/rdoeffinger/Dictionary/issues"));
+                context.startActivity(intent);
+                return false;
+            }
+        });
+
+        final MenuItem browserDownload = menu.add(c.getString(R.string.browserDownload));
+        MenuItemCompat.setShowAsAction(browserDownload, MenuItem.SHOW_AS_ACTION_NEVER);
+        browserDownload.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+            public boolean onMenuItemClick(final MenuItem menuItem) {
+                final Intent intent = new Intent(Intent.ACTION_VIEW);
+                intent.setData(Uri
+                               .parse("https://github.com/rdoeffinger/Dictionary/releases/v0.2-dictionaries"));
                 context.startActivity(intent);
                 return false;
             }
@@ -423,20 +277,20 @@ public class DictionaryApplication extends Application {
         }
         File efd = null;
         try {
-            efd = getApplicationContext().getExternalFilesDir(null);
+            efd = appContext.getExternalFilesDir(null);
         } catch (Exception e) {
         }
         if (efd != null) {
             efd.mkdirs();
             if (!dictDir.isDirectory() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-                getApplicationContext().getExternalFilesDirs(null);
+                appContext.getExternalFilesDirs(null);
             }
             if (efd.isDirectory() && efd.canWrite() && checkFileCreate(efd)) {
                 return efd.getAbsolutePath();
             }
         }
         if (!dictDir.isDirectory() && !dictDir.mkdirs()) {
-            return getApplicationContext().getFilesDir().getAbsolutePath();
+            return appContext.getFilesDir().getAbsolutePath();
         }
         return dir;
     }
@@ -444,15 +298,15 @@ public class DictionaryApplication extends Application {
     public synchronized File getDictDir() {
         // This metaphor doesn't work, because we've already reset
         // prefsMightHaveChanged.
-        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-        String dir = prefs.getString(getString(R.string.quickdicDirectoryKey), "");
+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(appContext);
+        String dir = prefs.getString(appContext.getString(R.string.quickdicDirectoryKey), "");
         if (dir.isEmpty()) {
             dir = selectDefaultDir();
         }
         dictDir = new File(dir);
         dictDir.mkdirs();
         if (!dictDir.isDirectory() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            getApplicationContext().getExternalFilesDirs(null);
+            appContext.getExternalFilesDirs(null);
         }
         return dictDir;
     }
@@ -469,8 +323,8 @@ public class DictionaryApplication extends Application {
     }
 
     public File getWordListFile() {
-        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-        String file = prefs.getString(getString(R.string.wordListFileKey), "");
+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(appContext);
+        String file = prefs.getString(appContext.getString(R.string.wordListFileKey), "");
         if (file.isEmpty()) {
             return new File(getDictDir(), "wordList.txt");
         }
@@ -478,8 +332,8 @@ public class DictionaryApplication extends Application {
     }
 
     public Theme getSelectedTheme() {
-        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-        final String theme = prefs.getString(getString(R.string.themeKey), "themeLight");
+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(appContext);
+        final String theme = prefs.getString(appContext.getString(R.string.themeKey), "themeLight");
         if (theme.equals("themeLight")) {
             return Theme.LIGHT;
         } else {
@@ -495,21 +349,6 @@ public class DictionaryApplication extends Application {
     String defaultLangName = null;
     final Map<String, String> fileToNameCache = new HashMap<String, String>();
 
-    public String isoCodeToLocalizedLanguageName(final String isoCode) {
-        String lang = new Locale(isoCode).getDisplayLanguage();
-        if (!lang.equals("") && !lang.equals(isoCode))
-        {
-            return lang;
-        }
-        final Language.LanguageResources languageResources = isoCodeToResources
-                .get(isoCode);
-        if (languageResources != null)
-        {
-            lang = getApplicationContext().getString(languageResources.nameId);
-        }
-        return lang;
-    }
-
     public List<IndexInfo> sortedIndexInfos(List<IndexInfo> indexInfos) {
         // Hack to put the default locale first in the name.
         if (indexInfos.size() > 1 &&
@@ -529,7 +368,7 @@ public class DictionaryApplication extends Application {
             defaultLangName = null;
         }
         if (defaultLangName == null) {
-            defaultLangName = isoCodeToLocalizedLanguageName(defaultLangISO2);
+            defaultLangName = IsoUtils.INSTANCE.isoCodeToLocalizedLanguageName(appContext, defaultLangISO2);
         }
 
         String name = fileToNameCache.get(uncompressedFilename);
@@ -548,7 +387,7 @@ public class DictionaryApplication extends Application {
                     nameBuilder.append("-");
                 }
                 nameBuilder
-                .append(isoCodeToLocalizedLanguageName(sortedIndexInfos.get(i).shortName));
+                .append(IsoUtils.INSTANCE.isoCodeToLocalizedLanguageName(appContext, sortedIndexInfos.get(i).shortName));
             }
             name = nameBuilder.toString();
         } else {
@@ -558,25 +397,6 @@ public class DictionaryApplication extends Application {
         return name;
     }
 
-    public View createButton(final Context context, final DictionaryInfo dictionaryInfo,
-                             final IndexInfo indexInfo) {
-        LanguageResources languageResources = isoCodeToResources.get(indexInfo.shortName);
-        View result;
-
-        if (languageResources == null || languageResources.flagId <= 0) {
-            Button button = new Button(context);
-            button.setText(indexInfo.shortName);
-            result = button;
-        } else {
-            ImageButton button = new ImageButton(context);
-            button.setImageResource(languageResources.flagId);
-            button.setScaleType(ScaleType.FIT_CENTER);
-            result = button;
-        }
-        result.setLayoutParams(new LinearLayout.LayoutParams(languageButtonPixels, languageButtonPixels * 2 / 3));
-        return result;
-    }
-
     public synchronized void moveDictionaryToTop(final DictionaryInfo dictionaryInfo) {
         dictionaryConfig.dictionaryFilesOrdered.remove(dictionaryInfo.uncompressedFilename);
         dictionaryConfig.dictionaryFilesOrdered.add(0, dictionaryInfo.uncompressedFilename);
@@ -597,7 +417,7 @@ public class DictionaryApplication extends Application {
         PersistentObjectCache.getInstance().write(C.DICTIONARY_CONFIGS, dictionaryConfig);
     }
 
-    final Comparator collator = USE_COLLATOR ? Collator.getInstance() : String.CASE_INSENSITIVE_ORDER;
+    final Comparator collator = USE_COLLATOR ? CollatorWrapper.getInstance() : String.CASE_INSENSITIVE_ORDER;
     final Comparator<String> uncompressedFilenameComparator = new Comparator<String>() {
         @Override
         public int compare(String uncompressedFilename1, String uncompressedFilename2) {