diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/activity_filter_settings.xml | 19 | ||||
| -rw-r--r-- | app/src/main/res/layout/item_filter.xml | 8 | ||||
| -rw-r--r-- | app/src/main/res/layout/item_filter_settings_feed.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/layout/item_filter_settings_keyword.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/menu/menu_filter_settings.xml | 10 | ||||
| -rw-r--r-- | app/src/main/res/values/dimens.xml | 7 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 12 |
7 files changed, 51 insertions, 11 deletions
diff --git a/app/src/main/res/layout/activity_filter_settings.xml b/app/src/main/res/layout/activity_filter_settings.xml index 7c8e265..897b02a 100644 --- a/app/src/main/res/layout/activity_filter_settings.xml +++ b/app/src/main/res/layout/activity_filter_settings.xml @@ -10,6 +10,25 @@ android:paddingBottom="0dp" android:orientation="vertical"> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <EditText + android:id="@+id/filter_settings_add_keyword" + android:layout_width="0dip" + android:layout_weight="1" + android:layout_height="wrap_content"/> + + <Button + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/filter_settings_add_keyword" + android:onClick="addKeyword"/> + + </LinearLayout> + <ListView android:id="@+id/filter_settings_feeds_list" android:layout_width="match_parent" diff --git a/app/src/main/res/layout/item_filter.xml b/app/src/main/res/layout/item_filter.xml index 99fbb19..c91a1a5 100644 --- a/app/src/main/res/layout/item_filter.xml +++ b/app/src/main/res/layout/item_filter.xml @@ -3,17 +3,17 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_height="fill_parent" + android:padding="10dp"> <TextView android:id="@+id/filter_item_title" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:textSize="22sp" - android:padding="10dp"/> + android:textSize="@dimen/font_size_large"/> <TextView android:id="@+id/filter_item_keywords" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:padding="10dp"/> + android:textSize="@dimen/font_size_normal"/> </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 index 7512330..65047bf 100644 --- a/app/src/main/res/layout/item_filter_settings_feed.xml +++ b/app/src/main/res/layout/item_filter_settings_feed.xml @@ -8,12 +8,13 @@ <TextView android:id="@+id/filter_settings_feed_item_title" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:textSize="22sp" + android:textSize="@dimen/font_size_large" android:padding="10dp"/> <TextView android:id="@+id/filter_settings_feed_item_url" android:layout_width="fill_parent" android:layout_height="fill_parent" + android:textSize="@dimen/font_size_normal" 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 index ad9a231..36d8c59 100644 --- a/app/src/main/res/layout/item_filter_settings_keyword.xml +++ b/app/src/main/res/layout/item_filter_settings_keyword.xml @@ -8,6 +8,7 @@ <TextView android:id="@+id/filter_settings_keyword_item_title" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:padding="10dp"/> + android:padding="10dp" + android:textSize="@dimen/font_size_normal"/> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/menu/menu_filter_settings.xml b/app/src/main/res/menu/menu_filter_settings.xml index 9384597..a6a518b 100644 --- a/app/src/main/res/menu/menu_filter_settings.xml +++ b/app/src/main/res/menu/menu_filter_settings.xml @@ -6,8 +6,14 @@ tools:context=".FilterSettingsActivity"> <item - android:id="@+id/action_feeds" - android:title="@string/action_feeds" + android:id="@+id/filter_settings_action_feeds" + android:title="@string/filter_settings_action_feeds" + android:orderInCategory="100" + app:showAsAction="ifRoom" /> + + <item + android:id="@+id/filter_settings_action_title" + android:title="@string/filter_settinsg_action_title" android:orderInCategory="100" app:showAsAction="ifRoom" /> diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 47c8224..0121f92 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -2,4 +2,11 @@ <!-- Default screen margins, per the Android Design guidelines. --> <dimen name="activity_horizontal_margin">16dp</dimen> <dimen name="activity_vertical_margin">16dp</dimen> + + <dimen name="listview_item_padding">16dp</dimen> + + <dimen name="font_size_huge">24sp</dimen> + <dimen name="font_size_large">20sp</dimen> + <dimen name="font_size_normal">16sp</dimen> + <dimen name="font_size_small">14sp</dimen> </resources> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e5af898..3481bbc 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4,12 +4,18 @@ <string name="action_settings">Settings</string> <string name="action_filters">Filters</string> + <string name="button_apply">Apply</string> + <string name="button_cancel">Cancel</string> + <string name="title_activity_filters">Filters</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> + <string name="filter_settings_add_keyword">Add</string> + <string name="filter_settings_action_feeds">Feeds</string> + <string name="filter_settinsg_action_title">Title</string> + + <string name="error_save_filters">Couldn\'t save filter</string> + <string name="error_load_filters">Couldn\'t load filters</string> </resources> |