From 0827a47b82757f7bebf110cb2081dff8551ea38d Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Thu, 21 May 2015 16:28:23 +0200
Subject: Add feeds

---
 .../main/res/layout/activity_filter_settings.xml   |  3 ++-
 .../res/layout/fragment_filter_settings_feeds.xml  | 25 ++++++++++++++++++++--
 2 files changed, 25 insertions(+), 3 deletions(-)

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/activity_filter_settings.xml b/app/src/main/res/layout/activity_filter_settings.xml
index 897b02a..6ee5331 100644
--- a/app/src/main/res/layout/activity_filter_settings.xml
+++ b/app/src/main/res/layout/activity_filter_settings.xml
@@ -19,7 +19,8 @@
             android:id="@+id/filter_settings_add_keyword"
             android:layout_width="0dip"
             android:layout_weight="1"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content"
+            android:maxLines="1"/>
 
         <Button
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/fragment_filter_settings_feeds.xml b/app/src/main/res/layout/fragment_filter_settings_feeds.xml
index 418129e..9c1e1f4 100644
--- a/app/src/main/res/layout/fragment_filter_settings_feeds.xml
+++ b/app/src/main/res/layout/fragment_filter_settings_feeds.xml
@@ -5,9 +5,30 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <EditText
+            android:id="@+id/filter_settings_add_feed"
+            android:layout_width="0dip"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:maxLines="1"
+            android:inputType="textUri"/>
+
+        <Button
+            android:id="@+id/filter_settings_add_feed_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/filter_settings_add_feed"/>
+
+    </LinearLayout>
+
     <ListView
-        android:id="@+id/filter_settings_keywords_list"
+        android:id="@+id/filter_settings_feeds_list"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"></ListView>
+        android:layout_height="match_parent"/>
 
 </LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3