diff --git a/app/src/main/java/com/simplemobiletools/notes/activities/AboutActivity.java b/app/src/main/java/com/simplemobiletools/notes/activities/AboutActivity.java index d28c9145..86811289 100644 --- a/app/src/main/java/com/simplemobiletools/notes/activities/AboutActivity.java +++ b/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); diff --git a/app/src/main/java/com/simplemobiletools/notes/activities/MainActivity.java b/app/src/main/java/com/simplemobiletools/notes/activities/MainActivity.java index c98fbc10..e33b88c3 100644 --- a/app/src/main/java/com/simplemobiletools/notes/activities/MainActivity.java +++ b/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(intent); + startActivity(new Intent(getApplicationContext(), AboutActivity.class)); return true; default: return super.onOptionsItemSelected(item); diff --git a/app/src/main/res/menu/menu.xml b/app/src/main/res/menu/menu.xml index 0051c511..714ebcec 100644 --- a/app/src/main/res/menu/menu.xml +++ b/app/src/main/res/menu/menu.xml @@ -11,6 +11,10 @@ android:icon="@mipmap/share" android:title="@string/share" app:showAsAction="ifRoom"/> + - - -