Moved settings

Moved settings:
- Integrated server settings into global settings
- Moved settings out of article list options menu to bottom of drawer
- Moved add-feed item to end of feeds list
- Reorganized options in menu of article list. Now only article related settings are included

Removed wrong usage of id R.id.action_settings in SyncIntervalSelectorActivity.

Signed-off-by: emasty <emasty@gmail.com>

3 files changed, 22 insertions, 18 deletions

diff --git a/News-Android-App/src/main/res/menu/drawer_menu.xml b/News-Android-App/src/main/res/menu/drawer_menu.xml
new file mode 100644
index 00000000..0dd730a6
--- /dev/null
+++ b/News-Android-App/src/main/res/menu/drawer_menu.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/drawer_settings"
+        android:icon="@drawable/ic_settings_black_24dp"
+        android:title="@string/action_settings" />
+</menu>
\ No newline at end of file
diff --git a/News-Android-App/src/main/res/menu/list_footer_menu.xml b/News-Android-App/src/main/res/menu/list_footer_menu.xml
new file mode 100644
index 00000000..5c6dd455
--- /dev/null
+++ b/News-Android-App/src/main/res/menu/list_footer_menu.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/action_add_new_feed"
+        android:icon="@drawable/ic_add_black_24dp"
+        android:title="@string/action_add_new_feed"/>
+
+</menu>
\ No newline at end of file
diff --git a/News-Android-App/src/main/res/menu/news_reader.xml b/News-Android-App/src/main/res/menu/news_reader.xml
index 4fb6089f..d2258408 100644
--- a/News-Android-App/src/main/res/menu/news_reader.xml
+++ b/News-Android-App/src/main/res/menu/news_reader.xml
@@ -29,35 +29,22 @@
         app:showAsAction="never" />
 
     <item
-        android:id="@+id/menu_markAllAsRead"
-        app:showAsAction="never"
-        android:orderInCategory="96"
-        android:title="@string/menu_markAllAsRead"/>
-
-    <item
         android:id="@+id/menu_downloadMoreItems"
         app:showAsAction="never"
-        android:orderInCategory="97"
+        android:orderInCategory="96"
         android:title="@string/menu_downloadMoreItems"/>
 
     <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="98"
-        app:showAsAction="never"
-        android:title="@string/action_settings"/>
-
-
-
-    <item
-        android:id="@+id/action_login"
-        android:orderInCategory="100"
+        android:id="@+id/menu_markAllAsRead"
         app:showAsAction="never"
-        android:title="@string/action_login"/>
+        android:orderInCategory="97"
+        android:title="@string/menu_markAllAsRead"/>
 
     <item
         android:id="@+id/action_add_new_feed"
         android:orderInCategory="101"
         app:showAsAction="never"
+        android:visible="false"
         android:title="@string/action_add_new_feed"/>
 
     <item