aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/activity_filter_settings.xml3
-rw-r--r--app/src/main/res/layout/fragment_filter_settings_feeds.xml25
-rw-r--r--app/src/main/res/values/strings.xml3
3 files changed, 28 insertions, 3 deletions
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
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e545ac2..7b3dfd7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,6 +15,7 @@
<string name="filter_settings_edit_keywords">Edit</string>
<string name="filter_settings_feeds">Feeds</string>
<string name="filter_settings_add_keyword">Add</string>
+ <string name="filter_settings_add_feed">Add</string>
<string name="filter_settings_action_feeds">Feeds</string>
<string name="filter_settings_action_title">Title</string>
<string name="filter_settings_action_delete">Delete</string>
@@ -22,4 +23,6 @@
<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>
+
+ <string name="error_invalid_url">Invalid URL</string>
</resources>