diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/activity_filter_settings.xml | 46 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_filters.xml | 15 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_unified_inbox.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_filter_settings_keywords.xml | 13 | ||||
| -rw-r--r-- | app/src/main/res/layout/item_filter.xml (renamed from app/src/main/res/layout/activity_filters_item.xml) | 0 | ||||
| -rw-r--r-- | app/src/main/res/layout/item_filter_settings_feed.xml | 19 | ||||
| -rw-r--r-- | app/src/main/res/layout/item_filter_settings_keyword.xml | 13 | ||||
| -rw-r--r-- | app/src/main/res/menu/menu_filters.xml | 7 | ||||
| -rw-r--r-- | app/src/main/res/menu/menu_unified_inbox.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 6 |
10 files changed, 108 insertions, 17 deletions
diff --git a/app/src/main/res/layout/activity_filter_settings.xml b/app/src/main/res/layout/activity_filter_settings.xml new file mode 100644 index 0000000..4f3b177 --- /dev/null +++ b/app/src/main/res/layout/activity_filter_settings.xml @@ -0,0 +1,46 @@ +<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" + 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" + 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_unified_inbox.xml b/app/src/main/res/layout/activity_unified_inbox.xml index 1f25ce7..5c56465 100644 --- a/app/src/main/res/layout/activity_unified_inbox.xml +++ b/app/src/main/res/layout/activity_unified_inbox.xml @@ -5,7 +5,4 @@ android:paddingTop="@dimen/activity_vertical_margin" android:paddingBottom="@dimen/activity_vertical_margin" tools:context=".UnifiedInboxActivity"> - <TextView android:text="@string/hello_world" android:layout_width="wrap_content" - android:layout_height="wrap_content" /> - </RelativeLayout> 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/activity_filters_item.xml b/app/src/main/res/layout/item_filter.xml index 99fbb19..99fbb19 100644 --- a/app/src/main/res/layout/activity_filters_item.xml +++ b/app/src/main/res/layout/item_filter.xml 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 diff --git a/app/src/main/res/menu/menu_filters.xml b/app/src/main/res/menu/menu_filters.xml deleted file mode 100644 index 0f6a87f..0000000 --- a/app/src/main/res/menu/menu_filters.xml +++ /dev/null @@ -1,7 +0,0 @@ -<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="org.rssin.android.FiltersActivity"> - <item android:id="@+id/action_settings" android:title="@string/action_settings" - android:orderInCategory="100" app:showAsAction="never" /> -</menu> diff --git a/app/src/main/res/menu/menu_unified_inbox.xml b/app/src/main/res/menu/menu_unified_inbox.xml index 2c72c6d..2800171 100644 --- a/app/src/main/res/menu/menu_unified_inbox.xml +++ b/app/src/main/res/menu/menu_unified_inbox.xml @@ -1,6 +1,9 @@ <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=".UnifiedInboxActivity"> + <item android:id="@+id/action_settings" android:title="@string/action_settings" android:orderInCategory="100" app:showAsAction="never" /> + <item android:id="@+id/action_filters" android:title="@string/action_filters" + android:orderInCategory="100" app:showAsAction="never" /> </menu> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e3e9d33..7bd62cc 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,7 +1,11 @@ <resources> <string name="app_name">RSSin</string> - <string name="hello_world">Hello world!</string> <string name="action_settings">Settings</string> + <string name="action_filters">Filters</string> + <string name="title_activity_filters">Filters</string> + <string name="title_activity_filter_settings">Filter Settings</string> + + <string name="filter_settings_edit_keywords">Edit</string> </resources> |