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/FilterSettingsActivity.java22
-rw-r--r--app/src/main/res/menu/menu_filter_settings.xml9
-rw-r--r--app/src/main/res/values/strings.xml4
3 files changed, 25 insertions, 10 deletions
diff --git a/app/src/main/java/org/rssin/android/FilterSettingsActivity.java b/app/src/main/java/org/rssin/android/FilterSettingsActivity.java
index 8d59a3b..bfe9261 100644
--- a/app/src/main/java/org/rssin/android/FilterSettingsActivity.java
+++ b/app/src/main/java/org/rssin/android/FilterSettingsActivity.java
@@ -94,12 +94,22 @@ public class FilterSettingsActivity extends ActionBarActivity {
public boolean onOptionsItemSelected(MenuItem item) {
int id = item.getItemId();
- if (id == R.id.filter_settings_action_feeds) {
- openFeedsDialog();
- return true;
- } else if (id == R.id.filter_settings_action_title) {
- openTitleDialog();
- return true;
+ switch (id) {
+ case R.id.filter_settings_action_feeds:
+ openFeedsDialog();
+ return true;
+ case R.id.filter_settings_action_title:
+ openTitleDialog();
+ return true;
+ case R.id.filter_settings_action_delete:
+ filtersList.getFilters().remove(filter);
+ try {
+ filtersList.save();
+ finish();
+ } catch (IOException e) {
+ Toast.makeText(this, getResources().getString(R.string.error_delete_filter), Toast.LENGTH_SHORT).show();
+ }
+ return true;
}
return super.onOptionsItemSelected(item);
diff --git a/app/src/main/res/menu/menu_filter_settings.xml b/app/src/main/res/menu/menu_filter_settings.xml
index a6a518b..848c9df 100644
--- a/app/src/main/res/menu/menu_filter_settings.xml
+++ b/app/src/main/res/menu/menu_filter_settings.xml
@@ -8,13 +8,16 @@
<item
android:id="@+id/filter_settings_action_feeds"
android:title="@string/filter_settings_action_feeds"
- android:orderInCategory="100"
app:showAsAction="ifRoom" />
<item
android:id="@+id/filter_settings_action_title"
- android:title="@string/filter_settinsg_action_title"
- android:orderInCategory="100"
+ android:title="@string/filter_settings_action_title"
app:showAsAction="ifRoom" />
+ <item
+ android:id="@+id/filter_settings_action_delete"
+ android:title="@string/filter_settings_action_delete"
+ app:showAsAction="never" />
+
</menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5db8c1d..e545ac2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -16,8 +16,10 @@
<string name="filter_settings_feeds">Feeds</string>
<string name="filter_settings_add_keyword">Add</string>
<string name="filter_settings_action_feeds">Feeds</string>
- <string name="filter_settinsg_action_title">Title</string>
+ <string name="filter_settings_action_title">Title</string>
+ <string name="filter_settings_action_delete">Delete</string>
<string name="error_save_filters">Couldn\'t save filter</string>
<string name="error_load_filters">Couldn\'t load filters</string>
+ <string name="error_delete_filter">Couldn\'t delete filter</string>
</resources>