move the Settings button to the main screen

app/src/main/java/com/simplemobiletools/notes/activities/AboutActivity.java

@@ -8,8 +8,6 @@ import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.text.Html;
 import android.text.method.LinkMovementMethod;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.view.View;
 import android.widget.TextView;
 
@@ -42,24 +40,6 @@ public class AboutActivity extends AppCompatActivity {
         setupRateUs();
     }
 
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.menu_about, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.settings:
-                final Intent intent = new Intent(getApplicationContext(), SettingsActivity.class);
-                startActivity(intent);
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
-        }
-    }
-
     private void setupEmail() {
         final String email = mRes.getString(R.string.email);
         final String appName = mRes.getString(R.string.app_name);

app/src/main/java/com/simplemobiletools/notes/activities/MainActivity.java

@@ -76,9 +76,11 @@ public class MainActivity extends AppCompatActivity {
             case R.id.share:
                 shareText();
                 return true;
+            case R.id.settings:
+                startActivity(new Intent(getApplicationContext(), SettingsActivity.class));
+                return true;
             case R.id.about:
-                final Intent intent = new Intent(getApplicationContext(), AboutActivity.class);
+                startActivity(new Intent(getApplicationContext(), AboutActivity.class));
-                startActivity(intent);
                 return true;
             default:
                 return super.onOptionsItemSelected(item);

app/src/main/res/menu/menu.xml

@@ -11,6 +11,10 @@
         android:icon="@mipmap/share"
         android:title="@string/share"
         app:showAsAction="ifRoom"/>
+    <item
+        android:id="@+id/settings"
+        android:title="@string/settings"
+        app:showAsAction="never"/>
     <item
         android:id="@+id/about"
         android:title="@string/about"

app/src/main/res/menu/menu_about.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/settings"
-        android:title="@string/settings"
-        app:showAsAction="never"/>
-</menu>