aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res/menu
diff options
context:
space:
mode:
authorCamil Staps2015-06-10 18:27:23 +0200
committerCamil Staps2015-06-10 18:27:23 +0200
commitb7b5037b867352ee5e90d0e04c616875b7986e1a (patch)
tree47eb42b5ca13e035ca82eab3f19bf7e9b995efa9 /app/src/main/res/menu
parentMerge branch 'master' of github:camilstaps/RSSin (diff)
Cleanup xml
Diffstat (limited to 'app/src/main/res/menu')
-rw-r--r--app/src/main/res/menu/article.xml (renamed from app/src/main/res/menu/menu_article.xml)3
-rw-r--r--app/src/main/res/menu/feeds.xml (renamed from app/src/main/res/menu/menu_feeds.xml)0
-rw-r--r--app/src/main/res/menu/filter.xml (renamed from app/src/main/res/menu/menu_filter.xml)16
-rw-r--r--app/src/main/res/menu/filter_settings.xml (renamed from app/src/main/res/menu/menu_filter_settings.xml)0
-rw-r--r--app/src/main/res/menu/filters.xml (renamed from app/src/main/res/menu/menu_filters.xml)0
-rw-r--r--app/src/main/res/menu/global.xml15
-rw-r--r--app/src/main/res/menu/home_screen.xml21
7 files changed, 39 insertions, 16 deletions
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>