Put settings/exit back in menus, take out of drawer

9 files changed, 66 insertions, 4 deletions

diff --git a/res/menu/chat.xml b/res/menu/chat.xml
index 67c13587..c8ea860a 100644
--- a/res/menu/chat.xml
+++ b/res/menu/chat.xml
@@ -6,4 +6,14 @@
 		android:icon="@drawable/action_refresh"
 		android:title="@string/menu.refresh"
 		compat:showAsAction="always|withText"/>
+
+	<item
+		android:id="@+id/menu_settings"
+		android:icon="@drawable/action_settings"
+		android:title="@string/menu.settings"/>
+
+	<item
+		android:id="@+id/menu_exit"
+		android:icon="@drawable/action_exit"
+		android:title="@string/menu.exit"/>
 </menu>
\ No newline at end of file
diff --git a/res/menu/main.xml b/res/menu/main.xml
index b0385836..4b13b3c1 100644
--- a/res/menu/main.xml
+++ b/res/menu/main.xml
@@ -26,4 +26,13 @@
 		android:id="@+id/menu_changelog"
 		android:title="@string/changelog_full_title"/>
 
+	<item
+		android:id="@+id/menu_settings"
+		android:icon="@drawable/action_settings"
+		android:title="@string/menu.settings"/>
+
+	<item
+		android:id="@+id/menu_exit"
+		android:icon="@drawable/action_exit"
+		android:title="@string/menu.exit"/>
 </menu>
diff --git a/res/menu/nowplaying.xml b/res/menu/nowplaying.xml
index 6b87dc76..2fad22d2 100644
--- a/res/menu/nowplaying.xml
+++ b/res/menu/nowplaying.xml
@@ -32,4 +32,9 @@
 	<item
         android:id="@+id/menu_toggle_now_playing"
         android:title="@string/download.show_downloading"/>
+
+	<item
+		android:id="@+id/menu_exit"
+		android:icon="@drawable/action_exit"
+		android:title="@string/menu.exit"/>
 </menu>
diff --git a/res/menu/nowplaying_offline.xml b/res/menu/nowplaying_offline.xml
index 3800c013..3faa8d97 100644
--- a/res/menu/nowplaying_offline.xml
+++ b/res/menu/nowplaying_offline.xml
@@ -24,7 +24,7 @@
         android:id="@+id/menu_toggle_timer"
         android:title="@string/download.start_timer"/>
 		
-	<item 
+	<item
 		android:id="@+id/menu_exit"
 		android:icon="@drawable/action_exit"
 		android:title="@string/menu.exit"/>
diff --git a/res/menu/select_artist.xml b/res/menu/select_artist.xml
index 2cc04541..1346343b 100644
--- a/res/menu/select_artist.xml
+++ b/res/menu/select_artist.xml
@@ -18,4 +18,14 @@
 		android:icon="@drawable/action_search"
 		android:title="@string/menu.search"
 		compat:showAsAction="ifRoom|withText"/>
+
+	<item
+		android:id="@+id/menu_settings"
+		android:icon="@drawable/action_settings"
+		android:title="@string/menu.settings"/>
+
+	<item
+		android:id="@+id/menu_exit"
+		android:icon="@drawable/action_exit"
+		android:title="@string/menu.exit"/>
 </menu>
diff --git a/res/menu/select_playlist.xml b/res/menu/select_playlist.xml
index ee134377..68904502 100644
--- a/res/menu/select_playlist.xml
+++ b/res/menu/select_playlist.xml
@@ -12,4 +12,14 @@
 		android:icon="@drawable/action_search"
 		android:title="@string/menu.search"
 		compat:showAsAction="always|withText"/>
+
+	<item
+		android:id="@+id/menu_settings"
+		android:icon="@drawable/action_settings"
+		android:title="@string/menu.settings"/>
+
+	<item
+		android:id="@+id/menu_exit"
+		android:icon="@drawable/action_exit"
+		android:title="@string/menu.exit"/>
 </menu>
diff --git a/res/menu/select_podcasts.xml b/res/menu/select_podcasts.xml
index ce0a2bb6..6311eaca 100644
--- a/res/menu/select_podcasts.xml
+++ b/res/menu/select_podcasts.xml
@@ -16,4 +16,14 @@
 		android:id="@+id/menu_check"
 		android:icon="@drawable/action_refresh"
 		android:title="@string/menu.check_podcasts"/>
+
+	<item
+		android:id="@+id/menu_settings"
+		android:icon="@drawable/action_settings"
+		android:title="@string/menu.settings"/>
+
+	<item
+		android:id="@+id/menu_exit"
+		android:icon="@drawable/action_exit"
+		android:title="@string/menu.exit"/>
 </menu>
\ No newline at end of file
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 0d33ddf5..6b958df3 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -7,8 +7,15 @@
 		<item>@string/button_bar.podcasts</item>
 		<item>@string/button_bar.chat</item>
 		<item>@string/button_bar.now_playing</item>
-		<item>@string/main.settings</item>
-		<item>@string/menu.exit</item>
+	</string-array>
+
+	<string-array name="drawerItemsDescriptions">
+		<item>Home</item>
+		<item>Library</item>
+		<item>Playlists</item>
+		<item>Podcasts</item>
+		<item>Chat</item>
+		<item>Now Playing</item>
 	</string-array>
 
     <string-array name="themeValues">
diff --git a/src/github/daneren2005/dsub/activity/SubsonicActivity.java b/src/github/daneren2005/dsub/activity/SubsonicActivity.java
index 34ce6fde..03183637 100644
--- a/src/github/daneren2005/dsub/activity/SubsonicActivity.java
+++ b/src/github/daneren2005/dsub/activity/SubsonicActivity.java
@@ -66,7 +66,7 @@ public class SubsonicActivity extends ActionBarActivity implements OnItemSelecte
 	private static final String TAG = SubsonicActivity.class.getSimpleName();

 	private static ImageLoader IMAGE_LOADER;

 	protected static String theme;

-	private static String[] drawerItemsDescriptions = {"Home", "Library", "Playlists", "Podcasts", "Chat", "Now Playing", "Settings", "Exit"};

+	private static String[] drawerItemsDescriptions;

 	private static String[] drawerItems;

 	private boolean destroyed = false;

 	private boolean finished = false;

@@ -139,6 +139,7 @@ public class SubsonicActivity extends ActionBarActivity implements OnItemSelecte
 

 		if(drawerItems == null) {

 			drawerItems = getResources().getStringArray(R.array.drawerItems);

+			drawerItemsDescriptions = getResources().getStringArray(R.array.drawerItemsDescriptions);

 			

 			SharedPreferences prefs = Util.getPreferences(this);

 			// Selectively remove chat listing: [4]