Reorder menu items to be more logical.

[Dictionary.git] / src / com / hughes / android / dictionary / DictionaryApplication.java

diff --git a/src/com/hughes/android/dictionary/DictionaryApplication.java b/src/com/hughes/android/dictionary/DictionaryApplication.java
index 407d097c427c85e57d31138bde9e2af99bd615fe..acd6d18e0d2061d0039b7a63ec05e6c98ebe0842 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryApplication.java
+++ b/src/com/hughes/android/dictionary/DictionaryApplication.java
@@ -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;
@@ -171,7 +171,7 @@ public enum DictionaryApplication {
 
     private File dictDir;
 
-    public void init(Context c) {
+    public synchronized void init(Context c) {
         if (appContext != null) {
             assert c == appContext;
             return;
@@ -212,11 +212,13 @@ public enum DictionaryApplication {
     public static void onCreateGlobalOptionsMenu(
         final Context context, final Menu menu) {
         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() {
+
+        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) {
-                final Intent intent = new Intent(c, AboutActivity.class);
+                PreferenceActivity.prefsMightHaveChanged = true;
+                final Intent intent = new Intent(c, PreferenceActivity.class);
                 context.startActivity(intent);
                 return false;
             }
@@ -231,24 +233,23 @@ public enum DictionaryApplication {
             }
         });
 
-        final MenuItem preferences = menu.add(c.getString(R.string.settings));
-        MenuItemCompat.setShowAsAction(preferences, MenuItem.SHOW_AS_ACTION_NEVER);
-        preferences.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+        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) {
-                PreferenceActivity.prefsMightHaveChanged = true;
-                final Intent intent = new Intent(c, PreferenceActivity.class);
+                final Intent intent = new Intent(Intent.ACTION_VIEW);
+                intent.setData(Uri
+                               .parse("https://github.com/rdoeffinger/Dictionary/issues"));
                 context.startActivity(intent);
                 return false;
             }
         });
 
-        final MenuItem reportIssue = menu.add(c.getString(R.string.reportIssue));
-        MenuItemCompat.setShowAsAction(reportIssue, MenuItem.SHOW_AS_ACTION_NEVER);
-        reportIssue.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+        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(Intent.ACTION_VIEW);
-                intent.setData(Uri
-                               .parse("http://github.com/rdoeffinger/Dictionary/issues"));
+                final Intent intent = new Intent(c, AboutActivity.class);
                 context.startActivity(intent);
                 return false;
             }
@@ -405,7 +406,7 @@ public enum DictionaryApplication {
         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) {