From 07305a6ed2b066f1ba5cae82ac8af352d4ebf2a7 Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Wed, 20 May 2015 11:30:49 +0200
Subject: FilterSettingsActivity

---
 .../main/res/layout/activity_filter_settings.xml   | 47 +++++++++++++++++++---
 app/src/main/res/layout/activity_filters.xml       | 15 ++++---
 app/src/main/res/layout/activity_filters_item.xml  | 19 ---------
 .../layout/fragment_filter_settings_keywords.xml   | 13 ++++++
 app/src/main/res/layout/item_filter.xml            | 19 +++++++++
 .../main/res/layout/item_filter_settings_feed.xml  | 19 +++++++++
 .../res/layout/item_filter_settings_keyword.xml    | 13 ++++++
 7 files changed, 115 insertions(+), 30 deletions(-)
 delete mode 100644 app/src/main/res/layout/activity_filters_item.xml
 create mode 100644 app/src/main/res/layout/fragment_filter_settings_keywords.xml
 create mode 100644 app/src/main/res/layout/item_filter.xml
 create mode 100644 app/src/main/res/layout/item_filter_settings_feed.xml
 create mode 100644 app/src/main/res/layout/item_filter_settings_keyword.xml

(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 6fb9932..4f3b177 100644
--- a/app/src/main/res/layout/activity_filter_settings.xml
+++ b/app/src/main/res/layout/activity_filter_settings.xml
@@ -1,9 +1,46 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    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"
-    tools:context="org.rssin.android.FilterSettingsActivity">
+    android:orientation="vertical">
 
-</RelativeLayout>
+    <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"
+        android:layout_height="match_parent"></ListView>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/activity_filters.xml b/app/src/main/res/layout/activity_filters.xml
index 521a319..700e939 100644
--- a/app/src/main/res/layout/activity_filters.xml
+++ b/app/src/main/res/layout/activity_filters.xml
@@ -1,9 +1,12 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" 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"
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="0dp"
+    android:paddingRight="0dp"
+    android:paddingTop="0dp"
+    android:paddingBottom="0dp"
     tools:context="org.rssin.android.FiltersActivity">
 
     <ListView
diff --git a/app/src/main/res/layout/activity_filters_item.xml b/app/src/main/res/layout/activity_filters_item.xml
deleted file mode 100644
index 99fbb19..0000000
--- a/app/src/main/res/layout/activity_filters_item.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-
-    <TextView android:id="@+id/filter_item_title"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:textSize="22sp"
-        android:padding="10dp"/>
-
-    <TextView android:id="@+id/filter_item_keywords"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:padding="10dp"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_filter_settings_keywords.xml b/app/src/main/res/layout/fragment_filter_settings_keywords.xml
new file mode 100644
index 0000000..418129e
--- /dev/null
+++ b/app/src/main/res/layout/fragment_filter_settings_keywords.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ListView
+        android:id="@+id/filter_settings_keywords_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"></ListView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_filter.xml b/app/src/main/res/layout/item_filter.xml
new file mode 100644
index 0000000..99fbb19
--- /dev/null
+++ b/app/src/main/res/layout/item_filter.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+
+    <TextView android:id="@+id/filter_item_title"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:textSize="22sp"
+        android:padding="10dp"/>
+
+    <TextView android:id="@+id/filter_item_keywords"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:padding="10dp"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_filter_settings_feed.xml b/app/src/main/res/layout/item_filter_settings_feed.xml
new file mode 100644
index 0000000..7512330
--- /dev/null
+++ b/app/src/main/res/layout/item_filter_settings_feed.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+
+    <TextView android:id="@+id/filter_settings_feed_item_title"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:textSize="22sp"
+        android:padding="10dp"/>
+
+    <TextView android:id="@+id/filter_settings_feed_item_url"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:padding="10dp"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_filter_settings_keyword.xml b/app/src/main/res/layout/item_filter_settings_keyword.xml
new file mode 100644
index 0000000..ad9a231
--- /dev/null
+++ b/app/src/main/res/layout/item_filter_settings_keyword.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+
+    <TextView android:id="@+id/filter_settings_keyword_item_title"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:padding="10dp"/>
+
+</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3