Skip to content

Commit 4d91c3d

Browse files
committed
move the Settings button to the main screen
1 parent 0f08caa commit 4d91c3d

File tree

4 files changed

+8
-30
lines changed

4 files changed

+8
-30
lines changed

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
import android.support.v7.app.AppCompatActivity;
99
import android.text.Html;
1010
import android.text.method.LinkMovementMethod;
11-
import android.view.Menu;
12-
import android.view.MenuItem;
1311
import android.view.View;
1412
import android.widget.TextView;
1513

@@ -42,24 +40,6 @@ protected void onCreate(Bundle savedInstanceState) {
4240
setupRateUs();
4341
}
4442

45-
@Override
46-
public boolean onCreateOptionsMenu(Menu menu) {
47-
getMenuInflater().inflate(R.menu.menu_about, menu);
48-
return true;
49-
}
50-
51-
@Override
52-
public boolean onOptionsItemSelected(MenuItem item) {
53-
switch (item.getItemId()) {
54-
case R.id.settings:
55-
final Intent intent = new Intent(getApplicationContext(), SettingsActivity.class);
56-
startActivity(intent);
57-
return true;
58-
default:
59-
return super.onOptionsItemSelected(item);
60-
}
61-
}
62-
6343
private void setupEmail() {
6444
final String email = mRes.getString(R.string.email);
6545
final String appName = mRes.getString(R.string.app_name);

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
7676
case R.id.share:
7777
shareText();
7878
return true;
79+
case R.id.settings:
80+
startActivity(new Intent(getApplicationContext(), SettingsActivity.class));
81+
return true;
7982
case R.id.about:
80-
final Intent intent = new Intent(getApplicationContext(), AboutActivity.class);
81-
startActivity(intent);
83+
startActivity(new Intent(getApplicationContext(), AboutActivity.class));
8284
return true;
8385
default:
8486
return super.onOptionsItemSelected(item);

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
android:icon="@mipmap/share"
1212
android:title="@string/share"
1313
app:showAsAction="ifRoom"/>
14+
<item
15+
android:id="@+id/settings"
16+
android:title="@string/settings"
17+
app:showAsAction="never"/>
1418
<item
1519
android:id="@+id/about"
1620
android:title="@string/about"

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

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)