From b7b5037b867352ee5e90d0e04c616875b7986e1a Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Wed, 10 Jun 2015 18:27:23 +0200
Subject: Cleanup xml

---
 app/src/main/res/menu/article.xml              | 45 ++++++++++++++++++++++++++
 app/src/main/res/menu/feeds.xml                | 32 ++++++++++++++++++
 app/src/main/res/menu/filter.xml               | 32 ++++++++++++++++++
 app/src/main/res/menu/filter_settings.xml      | 37 +++++++++++++++++++++
 app/src/main/res/menu/filters.xml              | 32 ++++++++++++++++++
 app/src/main/res/menu/global.xml               | 15 ++++++---
 app/src/main/res/menu/home_screen.xml          | 21 ++++++++----
 app/src/main/res/menu/menu_article.xml         | 44 -------------------------
 app/src/main/res/menu/menu_feeds.xml           | 32 ------------------
 app/src/main/res/menu/menu_filter.xml          | 24 --------------
 app/src/main/res/menu/menu_filter_settings.xml | 37 ---------------------
 app/src/main/res/menu/menu_filters.xml         | 32 ------------------
 12 files changed, 203 insertions(+), 180 deletions(-)
 create mode 100644 app/src/main/res/menu/article.xml
 create mode 100644 app/src/main/res/menu/feeds.xml
 create mode 100644 app/src/main/res/menu/filter.xml
 create mode 100644 app/src/main/res/menu/filter_settings.xml
 create mode 100644 app/src/main/res/menu/filters.xml
 delete mode 100644 app/src/main/res/menu/menu_article.xml
 delete mode 100644 app/src/main/res/menu/menu_feeds.xml
 delete mode 100644 app/src/main/res/menu/menu_filter.xml
 delete mode 100644 app/src/main/res/menu/menu_filter_settings.xml
 delete mode 100644 app/src/main/res/menu/menu_filters.xml

(limited to 'app/src/main/res/menu')

diff --git a/app/src/main/res/menu/article.xml b/app/src/main/res/menu/article.xml
new file mode 100644
index 0000000..57c861a
--- /dev/null
+++ b/app/src/main/res/menu/article.xml
@@ -0,0 +1,45 @@
+<!--
+    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.
+-->
+<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">
+
+    <item
+        android:id="@+id/article_action_like"
+        android:title="@string/article_action_like"
+        android:orderInCategory="100"
+        android:icon="@drawable/ic_action_action_thumb_up"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/article_action_dislike"
+        android:title="@string/article_action_dislike"
+        android:orderInCategory="100"
+        android:icon="@drawable/ic_action_action_thumb_down"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/article_action_share"
+        android:title="@string/menu_article_share"
+        android:orderInCategory="100"
+        android:icon="@drawable/ic_share_white_24dp"
+        app:showAsAction="ifRoom" />
+</menu>
diff --git a/app/src/main/res/menu/feeds.xml b/app/src/main/res/menu/feeds.xml
new file mode 100644
index 0000000..3421003
--- /dev/null
+++ b/app/src/main/res/menu/feeds.xml
@@ -0,0 +1,32 @@
+<!--
+    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.
+-->
+<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.FeedsActivity">
+
+    <item
+        android:id="@+id/feeds_action_add"
+        android:title="@string/feeds_action_add"
+        android:icon="@drawable/ic_add_white_24dp"
+        android:orderInCategory="100"
+        app:showAsAction="ifRoom" />
+
+</menu>
diff --git a/app/src/main/res/menu/filter.xml b/app/src/main/res/menu/filter.xml
new file mode 100644
index 0000000..8ffd091
--- /dev/null
+++ b/app/src/main/res/menu/filter.xml
@@ -0,0 +1,32 @@
+<!--
+    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.
+-->
+<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/menu/filter_settings.xml b/app/src/main/res/menu/filter_settings.xml
new file mode 100644
index 0000000..5a5d2a6
--- /dev/null
+++ b/app/src/main/res/menu/filter_settings.xml
@@ -0,0 +1,37 @@
+<!--
+    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.
+-->
+<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=".FilterSettingsActivity">
+
+    <item
+        android:id="@+id/filter_settings_action_title"
+        android:title="@string/filter_settings_action_title"
+        app:showAsAction="ifRoom"
+        android:icon="@drawable/ic_action_editor_border_color"/>
+
+    <item
+        android:id="@+id/filter_settings_action_delete"
+        android:title="@string/filter_settings_action_delete"
+        app:showAsAction="ifRoom"
+        android:icon="@drawable/ic_action_action_delete"/>
+
+</menu>
diff --git a/app/src/main/res/menu/filters.xml b/app/src/main/res/menu/filters.xml
new file mode 100644
index 0000000..75ecf6a
--- /dev/null
+++ b/app/src/main/res/menu/filters.xml
@@ -0,0 +1,32 @@
+<!--
+    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.
+-->
+<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=".FilterSettingsActivity">
+
+    <item
+        android:id="@+id/filters_action_add"
+        android:title="@string/filters_action_add"
+        android:icon="@drawable/ic_add_white_24dp"
+        android:orderInCategory="100"
+        app:showAsAction="ifRoom" />
+
+</menu>
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/menu/menu_article.xml b/app/src/main/res/menu/menu_article.xml
deleted file mode 100644
index d5760a6..0000000
--- a/app/src/main/res/menu/menu_article.xml
+++ /dev/null
@@ -1,44 +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.
--->
-<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">
-
-    <item
-        android:id="@+id/article_action_like"
-        android:title="@string/article_action_like"
-        android:orderInCategory="100"
-        android:icon="@drawable/ic_action_action_thumb_up"
-        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/article_action_dislike"
-        android:title="@string/article_action_dislike"
-        android:orderInCategory="100"
-        android:icon="@drawable/ic_action_action_thumb_down"
-        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/article_action_share"
-        android:title="@string/menu_article_share"
-        android:orderInCategory="100"
-        android:icon="@drawable/ic_share_white_24dp"
-        app:showAsAction="ifRoom" />
-</menu>
diff --git a/app/src/main/res/menu/menu_feeds.xml b/app/src/main/res/menu/menu_feeds.xml
deleted file mode 100644
index 3421003..0000000
--- a/app/src/main/res/menu/menu_feeds.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.
--->
-<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.FeedsActivity">
-
-    <item
-        android:id="@+id/feeds_action_add"
-        android:title="@string/feeds_action_add"
-        android:icon="@drawable/ic_add_white_24dp"
-        android:orderInCategory="100"
-        app:showAsAction="ifRoom" />
-
-</menu>
diff --git a/app/src/main/res/menu/menu_filter.xml b/app/src/main/res/menu/menu_filter.xml
deleted file mode 100644
index 5399c03..0000000
--- a/app/src/main/res/menu/menu_filter.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<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/menu/menu_filter_settings.xml b/app/src/main/res/menu/menu_filter_settings.xml
deleted file mode 100644
index 5a5d2a6..0000000
--- a/app/src/main/res/menu/menu_filter_settings.xml
+++ /dev/null
@@ -1,37 +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.
--->
-<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=".FilterSettingsActivity">
-
-    <item
-        android:id="@+id/filter_settings_action_title"
-        android:title="@string/filter_settings_action_title"
-        app:showAsAction="ifRoom"
-        android:icon="@drawable/ic_action_editor_border_color"/>
-
-    <item
-        android:id="@+id/filter_settings_action_delete"
-        android:title="@string/filter_settings_action_delete"
-        app:showAsAction="ifRoom"
-        android:icon="@drawable/ic_action_action_delete"/>
-
-</menu>
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 75ecf6a..0000000
--- a/app/src/main/res/menu/menu_filters.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.
--->
-<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=".FilterSettingsActivity">
-
-    <item
-        android:id="@+id/filters_action_add"
-        android:title="@string/filters_action_add"
-        android:icon="@drawable/ic_add_white_24dp"
-        android:orderInCategory="100"
-        app:showAsAction="ifRoom" />
-
-</menu>
-- 
cgit v1.2.3