From 2685db8fe94f4704988e27880d5f3f381bfa798d Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Mon, 3 Dec 2018 16:42:41 +0100
Subject: [PATCH] global_options.xml: Move 'report issue' from about screen to
 global menu.

---
 .../ic_ladybug_grey600_24dp.xml               |  9 +++++++
 oeffi/res/menu/global_options.xml             | 15 +++++++----
 oeffi/res/values-de/strings.xml               |  5 ++--
 oeffi/res/values/strings.xml                  |  5 ++--
 oeffi/res/xml/about.xml                       |  4 ---
 .../de/schildbach/oeffi/AboutActivity.java    |  5 ----
 .../schildbach/oeffi/OeffiMainActivity.java   | 25 +++++++++++--------
 7 files changed, 38 insertions(+), 30 deletions(-)
 create mode 100644 oeffi/res/drawable-anydpi/ic_ladybug_grey600_24dp.xml

diff --git a/oeffi/res/drawable-anydpi/ic_ladybug_grey600_24dp.xml b/oeffi/res/drawable-anydpi/ic_ladybug_grey600_24dp.xml
new file mode 100644
index 0000000..8dd1d71
--- /dev/null
+++ b/oeffi/res/drawable-anydpi/ic_ladybug_grey600_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="24dp" >
+    <path
+        android:fillColor="#FF757575"
+        android:pathData="M12,5C12.74,5 13.47,5.1 14.15,5.29L15.78,2.46C16.06,2 16.67,1.82 17.15,2.1C17.63,2.37 17.79,3 17.5,3.46L16,6.07C17.22,6.78 18.23,7.79 18.93,9H5.07C5.77,7.79 6.78,6.78 8,6.07L6.5,3.46C6.21,3 6.37,2.37 6.85,2.1C7.33,1.82 7.94,2 8.22,2.46L9.85,5.29C10.53,5.1 11.26,5 12,5M20,13C20,17.17 16.82,20.59 12.75,20.97V10.5H19.6C19.86,11.29 20,12.13 20,13M4,13C4,12.13 4.14,11.29 4.4,10.5H11.25V20.97C7.18,20.59 4,17.17 4,13Z" />
+</vector>
\ No newline at end of file
diff --git a/oeffi/res/menu/global_options.xml b/oeffi/res/menu/global_options.xml
index 01c7657..90d3519 100644
--- a/oeffi/res/menu/global_options.xml
+++ b/oeffi/res/menu/global_options.xml
@@ -16,6 +16,16 @@
         android:icon="@drawable/ic_oeffi_plans"
         android:title="@string/plans_activity_title"
         android:titleCondensed="@string/global_options_plans_comment"/>
+    <item
+        android:id="@+id/global_options_donate"
+        android:icon="@drawable/ic_cash_multiple_grey600_24dp"
+        android:orderInCategory="999"
+        android:title="@string/global_options_donate_title"/>
+    <item
+        android:id="@+id/global_options_report_bug"
+        android:icon="@drawable/ic_ladybug_grey600_24dp"
+        android:orderInCategory="999"
+        android:title="@string/global_options_report_bug_title"/>
     <item
         android:id="@+id/global_options_preferences"
         android:icon="@drawable/ic_settings_grey600_24dp"
@@ -26,10 +36,5 @@
         android:icon="@drawable/ic_info_outline_grey600_24dp"
         android:orderInCategory="999"
         android:title="@string/global_options_about_title"/>
-    <item
-        android:id="@+id/global_options_donate"
-        android:icon="@drawable/ic_cash_multiple_grey600_24dp"
-        android:orderInCategory="999"
-        android:title="@string/global_options_donate_title"/>
 
 </menu>
\ No newline at end of file
diff --git a/oeffi/res/values-de/strings.xml b/oeffi/res/values-de/strings.xml
index ecedf59..357e830 100644
--- a/oeffi/res/values-de/strings.xml
+++ b/oeffi/res/values-de/strings.xml
@@ -27,9 +27,10 @@
     <string name="global_options_stations_comment">Abfahrtszeiten und Verspätungen</string>
     <string name="global_options_directions_comment">Von Tür zu Tür</string>
     <string name="global_options_plans_comment">Für den groben Überblick</string>
+    <string name="global_options_donate_title">Spenden</string>
+    <string name="global_options_report_bug_title">Fehler melden</string>
     <string name="global_options_preferences_title">Einstellungen</string>
     <string name="global_options_about_title">Über Öffi</string>
-    <string name="global_options_donate_title">Spenden</string>
 
     <!-- preferences -->
     <string name="global_preferences_title">Allgemein</string>
@@ -56,8 +57,6 @@
     <string name="about_faq_summary">https://oeffi.schildbach.de/faq.html</string>
     <string name="about_feedback_title">Feedback</string>
     <string name="about_market_rate_title">Öffi bewerten oder rezensieren</string>
-    <string name="about_report_bug_title">Fehler melden</string>
-    <string name="about_report_bug_summary">Feedback geben.</string>
     <string name="about_community_googleplus_title">Google+ Community</string>
     <string name="about_community_googleplus_summary">Diskussionen über die App.</string>
     <string name="about_donate_title">Spenden</string>
diff --git a/oeffi/res/values/strings.xml b/oeffi/res/values/strings.xml
index 926a43c..a6b7399 100644
--- a/oeffi/res/values/strings.xml
+++ b/oeffi/res/values/strings.xml
@@ -27,9 +27,10 @@
     <string name="global_options_stations_comment">Departure times and delays</string>
     <string name="global_options_directions_comment">From door to door</string>
     <string name="global_options_plans_comment">For a rough overview</string>
+    <string name="global_options_donate_title">Donate</string>
+    <string name="global_options_report_bug_title">Report bug</string>
     <string name="global_options_preferences_title">Preferences</string>
     <string name="global_options_about_title">About Offi</string>
-    <string name="global_options_donate_title">Donate</string>
 
     <!-- global preferences -->
     <string name="global_preferences_title">Common</string>
@@ -56,8 +57,6 @@
     <string name="about_faq_summary">https://oeffi.schildbach.de/faq.html</string>
     <string name="about_feedback_title">Feedback</string>
     <string name="about_market_rate_title">Rate or Review Offi</string>
-    <string name="about_report_bug_title">Report Bug</string>
-    <string name="about_report_bug_summary">Give feedback.</string>
     <string name="about_community_googleplus_title">Google+ Community</string>
     <string name="about_community_googleplus_summary">Discussions about the app.</string>
     <string name="about_donate_title">Donations</string>
diff --git a/oeffi/res/xml/about.xml b/oeffi/res/xml/about.xml
index b2755b2..3ba79e2 100644
--- a/oeffi/res/xml/about.xml
+++ b/oeffi/res/xml/about.xml
@@ -38,10 +38,6 @@
         <Preference
             android:key="about_market_rate"
             android:title="@string/about_market_rate_title" />
-        <Preference
-            android:key="about_report_bug"
-            android:summary="@string/about_report_bug_summary"
-            android:title="@string/about_report_bug_title" />
         <Preference
             android:key="about_community_googleplus"
             android:summary="@string/about_community_googleplus_summary"
diff --git a/oeffi/src/de/schildbach/oeffi/AboutActivity.java b/oeffi/src/de/schildbach/oeffi/AboutActivity.java
index 4851af5..aea46a0 100644
--- a/oeffi/src/de/schildbach/oeffi/AboutActivity.java
+++ b/oeffi/src/de/schildbach/oeffi/AboutActivity.java
@@ -18,7 +18,6 @@
 package de.schildbach.oeffi;
 
 import de.schildbach.oeffi.util.ChangelogDialogBuilder;
-import de.schildbach.oeffi.util.ErrorReporter;
 import de.schildbach.wallet.integration.android.BitcoinIntegration;
 
 import android.content.Intent;
@@ -33,7 +32,6 @@ public class AboutActivity extends PreferenceActivity {
     private static final String KEY_ABOUT_TWITTER = "about_twitter";
     private static final String KEY_ABOUT_CHANGELOG = "about_changelog";
     private static final String KEY_ABOUT_FAQ = "about_faq";
-    private static final String KEY_ABOUT_REPORT_BUG = "about_report_bug";
     private static final String KEY_ABOUT_COMMUNITY_GOOGLEPLUS = "about_community_googleplus";
     private static final String KEY_ABOUT_DONATE_BITCOIN = "about_donate_bitcoin";
     private static final String KEY_ABOUT_DONATE_FLATTR = "about_donate_flattr";
@@ -67,9 +65,6 @@ public class AboutActivity extends PreferenceActivity {
         } else if (KEY_ABOUT_FAQ.equals(key)) {
             startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.about_faq_summary))));
             finish();
-        } else if (KEY_ABOUT_REPORT_BUG.equals(key)) {
-            ErrorReporter.sendBugMail(this);
-            finish();
         } else if (KEY_ABOUT_COMMUNITY_GOOGLEPLUS.equals(key)) {
             startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.COMMUNITY_GOOGLEPLUS_URL)));
             finish();
diff --git a/oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java b/oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java
index 5bc2765..4322aa5 100644
--- a/oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java
+++ b/oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java
@@ -324,16 +324,6 @@ public abstract class OeffiMainActivity extends OeffiActivity {
             return true;
         }
 
-        case R.id.global_options_preferences: {
-            startActivity(new Intent(this, PreferencesActivity.class));
-            return true;
-        }
-
-        case R.id.global_options_about: {
-            startActivity(new Intent(this, AboutActivity.class));
-            return true;
-        }
-
         case R.id.global_options_donate: {
             final PopupMenu popup = new PopupMenu(this, getMyActionBar());
             popup.inflate(R.menu.donate_menu);
@@ -357,6 +347,21 @@ public abstract class OeffiMainActivity extends OeffiActivity {
             popup.show();
             return true;
         }
+
+        case R.id.global_options_report_bug: {
+            ErrorReporter.sendBugMail(this);
+            return true;
+        }
+
+        case R.id.global_options_preferences: {
+            startActivity(new Intent(this, PreferencesActivity.class));
+            return true;
+        }
+
+        case R.id.global_options_about: {
+            startActivity(new Intent(this, AboutActivity.class));
+            return true;
+        }
         }
 
         return false;