From 1c929d8c3970a292ab26af3869dd0f11370a9533 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Reimar=20D=C3=B6ffinger?= <Reimar.Doeffinger@gmx.de>
Date: Sat, 14 Apr 2018 21:03:00 +0200
Subject: [PATCH] Reorder menu items to be more logical.

Mostly follows suggestion in issue #59.
---
 .../dictionary/DictionaryActivity.java        |  4 +--
 .../dictionary/DictionaryApplication.java     | 31 ++++++-------------
 .../dictionary/DictionaryManagerActivity.java | 12 +++++++
 3 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index b017e9c..eb3b2a2 100644
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -974,8 +974,6 @@ public class DictionaryActivity extends ActionBarActivity {
             }
         });
 
-        application.onCreateGlobalOptionsMenu(this, menu);
-
         {
             final MenuItem dictionaryManager = menu.add(getString(R.string.dictionaryManager));
             MenuItemCompat.setShowAsAction(dictionaryManager, MenuItem.SHOW_AS_ACTION_NEVER);
@@ -1046,6 +1044,8 @@ public class DictionaryActivity extends ActionBarActivity {
             });
         }
 
+        application.onCreateGlobalOptionsMenu(this, menu);
+
         return true;
     }
 
diff --git a/src/com/hughes/android/dictionary/DictionaryApplication.java b/src/com/hughes/android/dictionary/DictionaryApplication.java
index f11a7e3..acd6d18 100644
--- a/src/com/hughes/android/dictionary/DictionaryApplication.java
+++ b/src/com/hughes/android/dictionary/DictionaryApplication.java
@@ -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,17 +233,6 @@ 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() {
-            public boolean onMenuItemClick(final MenuItem menuItem) {
-                PreferenceActivity.prefsMightHaveChanged = true;
-                final Intent intent = new Intent(c, PreferenceActivity.class);
-                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() {
@@ -254,13 +245,11 @@ public enum DictionaryApplication {
             }
         });
 
-        final MenuItem browserDownload = menu.add(c.getString(R.string.browserDownload));
-        MenuItemCompat.setShowAsAction(browserDownload, MenuItem.SHOW_AS_ACTION_NEVER);
-        browserDownload.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("https://github.com/rdoeffinger/Dictionary/releases/v0.2-dictionaries"));
+                final Intent intent = new Intent(c, AboutActivity.class);
                 context.startActivity(intent);
                 return false;
             }
diff --git a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
index 694f8da..2bbe1fc 100644
--- a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
@@ -499,6 +499,18 @@ public class DictionaryManagerActivity extends ActionBarActivity {
             }
         });
 
+        final MenuItem browserDownload = menu.add(getString(R.string.browserDownload));
+        MenuItemCompat.setShowAsAction(browserDownload, MenuItem.SHOW_AS_ACTION_NEVER);
+        browserDownload.setOnMenuItemClickListener(new MenuItem.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"));
+                startActivity(intent);
+                return false;
+            }
+        });
+
         application.onCreateGlobalOptionsMenu(this, menu);
         return true;
     }
-- 
2.43.0