Merge branch 'app'

4 files changed, 23 insertions, 33 deletions

diff --git a/app/src/main/res/layout/activity_filter_settings.xml b/app/src/main/res/layout/activity_filter_settings.xml
index 4f3b177..7c8e265 100644
--- a/app/src/main/res/layout/activity_filter_settings.xml
+++ b/app/src/main/res/layout/activity_filter_settings.xml
@@ -4,40 +4,12 @@
     tools:context="org.rssin.android.FilterSettingsActivity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="0dp"
+    android:paddingRight="0dp"
+    android:paddingTop="0dp"
+    android:paddingBottom="0dp"
     android:orientation="vertical">
 
-    <TextView
-        android:id="@+id/filter_settings_title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textSize="22sp" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="6dp"
-        android:paddingBottom="6dp"
-        android:orientation="horizontal">
-
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/filter_settings_edit_keywords"
-            android:onClick="openKeywordsDialog"/>
-
-        <TextView
-            android:id="@+id/filter_settings_keywords"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:scrollbars="horizontal"
-            android:maxLines="1"/>
-
-        </LinearLayout>
-
     <ListView
         android:id="@+id/filter_settings_feeds_list"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_filter_settings_keywords.xml b/app/src/main/res/layout/fragment_filter_settings_feeds.xml
index 418129e..418129e 100644
--- a/app/src/main/res/layout/fragment_filter_settings_keywords.xml
+++ b/app/src/main/res/layout/fragment_filter_settings_feeds.xml
diff --git a/app/src/main/res/menu/menu_filter_settings.xml b/app/src/main/res/menu/menu_filter_settings.xml
new file mode 100644
index 0000000..9384597
--- /dev/null
+++ b/app/src/main/res/menu/menu_filter_settings.xml
@@ -0,0 +1,14 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context=".FilterSettingsActivity">
+
+    <item
+        android:id="@+id/action_feeds"
+        android:title="@string/action_feeds"
+        android:orderInCategory="100"
+        app:showAsAction="ifRoom" />
+
+</menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7bd62cc..e5af898 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -5,7 +5,11 @@
     <string name="action_filters">Filters</string>
 
     <string name="title_activity_filters">Filters</string>
-    <string name="title_activity_filter_settings">Filter Settings</string>
+    <string name="title_activity_filter_settings">Filter</string>
 
     <string name="filter_settings_edit_keywords">Edit</string>
+    <string name="filter_settings_feeds">Feeds</string>
+    <string name="filter_settings_edit_feeds_positive">Apply</string>
+    <string name="filter_settings_edit_feeds_negative">Cancel</string>
+    <string name="action_feeds">Feeds</string>
 </resources>