aboutsummaryrefslogtreecommitdiff
path: root/app/src
diff options
context:
space:
mode:
Diffstat (limited to 'app/src')
-rw-r--r--app/src/main/java/org/rssin/android/FiltersActivity.java23
-rw-r--r--app/src/main/java/org/rssin/android/UnifiedInboxActivity.java9
-rw-r--r--app/src/main/res/menu/menu_filters.xml7
-rw-r--r--app/src/main/res/menu/menu_unified_inbox.xml3
-rw-r--r--app/src/main/res/values/strings.xml1
5 files changed, 9 insertions, 34 deletions
diff --git a/app/src/main/java/org/rssin/android/FiltersActivity.java b/app/src/main/java/org/rssin/android/FiltersActivity.java
index 254020f..2932c68 100644
--- a/app/src/main/java/org/rssin/android/FiltersActivity.java
+++ b/app/src/main/java/org/rssin/android/FiltersActivity.java
@@ -56,29 +56,6 @@ public class FiltersActivity extends ActionBarActivity {
}
}
-
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- // Inflate the menu; this adds items to the action bar if it is present.
- getMenuInflater().inflate(R.menu.menu_filters, menu);
- return true;
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- // Handle action bar item clicks here. The action bar will
- // automatically handle clicks on the Home/Up button, so long
- // as you specify a parent activity in AndroidManifest.xml.
- int id = item.getItemId();
-
- //noinspection SimplifiableIfStatement
- if (id == R.id.action_settings) {
- return true;
- }
-
- return super.onOptionsItemSelected(item);
- }
-
private static class FilterAdapter extends ArrayAdapter<Filter> {
Context context;
diff --git a/app/src/main/java/org/rssin/android/UnifiedInboxActivity.java b/app/src/main/java/org/rssin/android/UnifiedInboxActivity.java
index dbe1c89..952228f 100644
--- a/app/src/main/java/org/rssin/android/UnifiedInboxActivity.java
+++ b/app/src/main/java/org/rssin/android/UnifiedInboxActivity.java
@@ -15,9 +15,6 @@ public class UnifiedInboxActivity extends ActionBarActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_unified_inbox);
-
- Intent intent = new Intent(this, FiltersActivity.class);
- startActivity(intent);
}
@@ -37,7 +34,11 @@ public class UnifiedInboxActivity extends ActionBarActivity {
//noinspection SimplifiableIfStatement
if (id == R.id.action_settings) {
- return true;
+ Intent intent = new Intent(this, SettingsActivity.class);
+ startActivity(intent);
+ } else if (id == R.id.action_filters) {
+ Intent intent = new Intent(this, FiltersActivity.class);
+ startActivity(intent);
}
return super.onOptionsItemSelected(item);
diff --git a/app/src/main/res/menu/menu_filters.xml b/app/src/main/res/menu/menu_filters.xml
deleted file mode 100644
index 0f6a87f..0000000
--- a/app/src/main/res/menu/menu_filters.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools"
- tools:context="org.rssin.android.FiltersActivity">
- <item android:id="@+id/action_settings" android:title="@string/action_settings"
- android:orderInCategory="100" app:showAsAction="never" />
-</menu>
diff --git a/app/src/main/res/menu/menu_unified_inbox.xml b/app/src/main/res/menu/menu_unified_inbox.xml
index 2c72c6d..2800171 100644
--- a/app/src/main/res/menu/menu_unified_inbox.xml
+++ b/app/src/main/res/menu/menu_unified_inbox.xml
@@ -1,6 +1,9 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" tools:context=".UnifiedInboxActivity">
+
<item android:id="@+id/action_settings" android:title="@string/action_settings"
android:orderInCategory="100" app:showAsAction="never" />
+ <item android:id="@+id/action_filters" android:title="@string/action_filters"
+ android:orderInCategory="100" app:showAsAction="never" />
</menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e3e9d33..db20033 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,5 +3,6 @@
<string name="hello_world">Hello world!</string>
<string name="action_settings">Settings</string>
+ <string name="action_filters">Filters</string>
<string name="title_activity_filters">Filters</string>
</resources>