diff options
| author | Size43 | 2015-05-21 15:32:44 +0200 |
|---|---|---|
| committer | Size43 | 2015-05-21 15:32:44 +0200 |
| commit | 34ebdfdc2fd7374b947b7fb6d185f60bd0723b03 (patch) | |
| tree | 11c4241f6534362ac9ca940f6f939ccb7a9aeb68 /app/src/main/res/values | |
| parent | Reduced LOC + FeedSorter sorts by category, author, title and date/time + red... (diff) | |
| parent | Fix saving filters; remove keywords (diff) | |
Merge branch 'master' of https://github.com/camilstaps/RSSin
Diffstat (limited to 'app/src/main/res/values')
| -rw-r--r-- | app/src/main/res/values/dimens.xml | 7 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 12 |
2 files changed, 16 insertions, 3 deletions
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> |