diff options
Diffstat (limited to 'app/src/main/res')
16 files changed, 40 insertions, 129 deletions
diff --git a/app/src/main/res/layout/activity_filter.xml b/app/src/main/res/layout/activity_filter.xml deleted file mode 100644 index 47f4976..0000000 --- a/app/src/main/res/layout/activity_filter.xml +++ /dev/null @@ -1,32 +0,0 @@ -<!-- - RSSin - Clever RSS reader for Android - Copyright (C) 2015 Randy Wanga, Jos Craaijo, Joep Bernards, Camil Staps - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ---> -<LinearLayout 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" -tools:context="org.rssin.android.HomeScreenActivity"> - <!-- A RecyclerView with some commonly used attributes --> - - <android.support.v7.widget.RecyclerView - android:id="@+id/filter_feeditems" - android:scrollbars="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent"/> - - </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/activity_unified_inbox.xml b/app/src/main/res/layout/activity_unified_inbox.xml deleted file mode 100644 index 75635c7..0000000 --- a/app/src/main/res/layout/activity_unified_inbox.xml +++ /dev/null @@ -1,28 +0,0 @@ -<!-- - RSSin - Clever RSS reader for Android - Copyright (C) 2015 Randy Wanga, Jos Craaijo, Joep Bernards, Camil Staps - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ---> -<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:padding="0dp" tools:context=".UnifiedInboxActivity"> - <android.support.v7.widget.RecyclerView - android:id="@+id/unified_inbox_feeditems" - android:scrollbars="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent"/> -</RelativeLayout> diff --git a/app/src/main/res/layout/fragment_home_screen.xml b/app/src/main/res/layout/fragment_feeditems_list.xml index 7c6f9c3..7c6f9c3 100644 --- a/app/src/main/res/layout/fragment_home_screen.xml +++ b/app/src/main/res/layout/fragment_feeditems_list.xml diff --git a/app/src/main/res/menu/menu_article.xml b/app/src/main/res/menu/article.xml index d5760a6..57c861a 100644 --- a/app/src/main/res/menu/menu_article.xml +++ b/app/src/main/res/menu/article.xml @@ -16,7 +16,8 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> -<menu xmlns:android="http://schemas.android.com/apk/res/android" +<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.ArticleActivity"> diff --git a/app/src/main/res/menu/menu_feeds.xml b/app/src/main/res/menu/feeds.xml index 3421003..3421003 100644 --- a/app/src/main/res/menu/menu_feeds.xml +++ b/app/src/main/res/menu/feeds.xml diff --git a/app/src/main/res/menu/menu_filter.xml b/app/src/main/res/menu/filter.xml index 5399c03..8ffd091 100644 --- a/app/src/main/res/menu/menu_filter.xml +++ b/app/src/main/res/menu/filter.xml @@ -16,9 +16,17 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> -<menu xmlns:android="http://schemas.android.com/apk/res/android" +<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.HomeScreenActivity"> - <item android:id="@+id/action_settings" android:title="@string/action_settings" - android:orderInCategory="100" app:showAsAction="ifRoom" android:icon="@drawable/ic_action_action_settings" /> + xmlns:tools="http://schemas.android.com/tools" + tools:context="org.rssin.android.HomeScreenActivity"> + + <item + android:id="@+id/action_settings" + android:title="@string/action_settings" + android:orderInCategory="100" + app:showAsAction="ifRoom" + android:icon="@drawable/ic_action_action_settings" /> + </menu> diff --git a/app/src/main/res/menu/menu_filter_settings.xml b/app/src/main/res/menu/filter_settings.xml index 5a5d2a6..5a5d2a6 100644 --- a/app/src/main/res/menu/menu_filter_settings.xml +++ b/app/src/main/res/menu/filter_settings.xml diff --git a/app/src/main/res/menu/menu_filters.xml b/app/src/main/res/menu/filters.xml index 75ecf6a..75ecf6a 100644 --- a/app/src/main/res/menu/menu_filters.xml +++ b/app/src/main/res/menu/filters.xml diff --git a/app/src/main/res/menu/global.xml b/app/src/main/res/menu/global.xml index edabef3..4c4ef76 100644 --- a/app/src/main/res/menu/global.xml +++ b/app/src/main/res/menu/global.xml @@ -16,8 +16,15 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> -<menu xmlns:android="http://schemas.android.com/apk/res/android"
-xmlns:app="http://schemas.android.com/apk/res-auto">
-<item android:id="@+id/action_settings" android:title="@string/action_settings"
- android:orderInCategory="100" app:showAsAction="ifRoom" android:icon="@drawable/ic_action_action_settings" />
+<menu + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + + <item + android:id="@+id/action_settings" + android:title="@string/action_settings" + android:orderInCategory="100" + app:showAsAction="ifRoom" + android:icon="@drawable/ic_action_action_settings" /> + </menu>
\ No newline at end of file diff --git a/app/src/main/res/menu/home_screen.xml b/app/src/main/res/menu/home_screen.xml index d96e91f..8ffd091 100644 --- a/app/src/main/res/menu/home_screen.xml +++ b/app/src/main/res/menu/home_screen.xml @@ -16,10 +16,17 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> -<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.HomeScreenActivity">
- <item android:id="@+id/action_settings" android:title="@string/action_settings"
- android:orderInCategory="100" app:showAsAction="ifRoom" android:icon="@drawable/ic_action_action_settings" />
-</menu>
+<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.HomeScreenActivity"> + + <item + android:id="@+id/action_settings" + android:title="@string/action_settings" + android:orderInCategory="100" + app:showAsAction="ifRoom" + android:icon="@drawable/ic_action_action_settings" /> + +</menu> diff --git a/app/src/main/res/values-large/refs.xml b/app/src/main/res/values-large/refs.xml deleted file mode 100644 index ff9e2f0..0000000 --- a/app/src/main/res/values-large/refs.xml +++ /dev/null @@ -1,22 +0,0 @@ -<!-- - RSSin - Clever RSS reader for Android - Copyright (C) 2015 Randy Wanga, Jos Craaijo, Joep Bernards, Camil Staps - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ---> -<resources>
-
-
-</resources>
\ No newline at end of file diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml index 592b509..8d0e635 100644 --- a/app/src/main/res/values-w820dp/dimens.xml +++ b/app/src/main/res/values-w820dp/dimens.xml @@ -17,8 +17,5 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> <resources> - <!-- Example customization of dimensions originally defined in res/values/dimens.xml - (such as screen margins) for screens with more than 820dp of available width. This - would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). --> <dimen name="activity_horizontal_margin">64dp</dimen> </resources> diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index f311337..a7d343b 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -17,7 +17,6 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> <resources> - <!-- Default screen margins, per the Android Design guidelines. --> <dimen name="activity_horizontal_margin">16dp</dimen> <dimen name="activity_vertical_margin">16dp</dimen> @@ -28,8 +27,6 @@ <dimen name="font_size_normal">16sp</dimen> <dimen name="font_size_small">14sp</dimen> - <!-- Per the design guidelines, navigation drawers should be between 240dp and 320dp: - https://developer.android.com/design/patterns/navigation-drawer.html --> <dimen name="navigation_drawer_width">300dp</dimen> <dimen name="card_margin">8dp</dimen> diff --git a/app/src/main/res/values/feeds.xml b/app/src/main/res/values/feeds.xml index 18a072b..1838092 100644 --- a/app/src/main/res/values/feeds.xml +++ b/app/src/main/res/values/feeds.xml @@ -17,6 +17,7 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --> <resources> + <!-- These feeds are loaded into the reader by default --> <string-array name="default_feeds"> <item>http://feeds.bbci.co.uk/news/politics/rss.xml</item> <item>http://feeds.bbci.co.uk/news/science_and_environment/rss.xml</item> diff --git a/app/src/main/res/values/refs.xml b/app/src/main/res/values/refs.xml deleted file mode 100644 index ff9e2f0..0000000 --- a/app/src/main/res/values/refs.xml +++ /dev/null @@ -1,22 +0,0 @@ -<!-- - RSSin - Clever RSS reader for Android - Copyright (C) 2015 Randy Wanga, Jos Craaijo, Joep Bernards, Camil Staps - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ---> -<resources>
-
-
-</resources>
\ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index eb83cd4..5554027 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -24,7 +24,4 @@ </style> <color name="loading">#ffc400</color> - <color name="warning">#ff9900</color> - <color name="error">#e32d2d</color> - <color name="info">#5ccbf7</color> </resources> |