#162 Start of convert to pull out drawer

10 files changed, 30 insertions, 66 deletions

diff --git a/res/layout/abstract_activity.xml b/res/layout/abstract_activity.xml
new file mode 100644
index 00000000..ed16c695
--- /dev/null
+++ b/res/layout/abstract_activity.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>

+<android.support.v4.widget.DrawerLayout

+	xmlns:android="http://schemas.android.com/apk/res/android"

+	android:id="@+id/drawer_layout"

+	android:layout_width="match_parent"

+	android:layout_height="match_parent">

+	<!-- The main content view -->

+	<FrameLayout

+		android:id="@+id/content_frame"

+		android:layout_width="match_parent"

+		android:layout_height="match_parent" />

+	<!-- The navigation drawer -->

+	<ListView android:id="@+id/left_drawer"

+			  android:layout_width="240dp"

+			  android:layout_height="match_parent"

+			  android:layout_gravity="start"

+			  android:choiceMode="singleChoice"

+			  android:divider="@android:color/transparent"

+			  android:dividerHeight="0dp"

+			  android:background="?android:windowBackground"/>

+</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
diff --git a/res/menu/chat.xml b/res/menu/chat.xml
index 685aba18..67c13587 100644
--- a/res/menu/chat.xml
+++ b/res/menu/chat.xml
@@ -6,14 +6,4 @@
 		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 1390b68b..213dbf1c 100644
--- a/res/menu/main.xml
+++ b/res/menu/main.xml
@@ -31,14 +31,4 @@
 		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 ae411240..6b87dc76 100644
--- a/res/menu/nowplaying.xml
+++ b/res/menu/nowplaying.xml
@@ -32,9 +32,4 @@
 	<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/select_artist.xml b/res/menu/select_artist.xml
index 3c694cd2..2cc04541 100644
--- a/res/menu/select_artist.xml
+++ b/res/menu/select_artist.xml
@@ -18,14 +18,4 @@
 		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_genres.xml b/res/menu/select_genres.xml
index 7ce7f1a0..ad2756d6 100644
--- a/res/menu/select_genres.xml
+++ b/res/menu/select_genres.xml
@@ -6,14 +6,4 @@
 		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/select_playlist.xml b/res/menu/select_playlist.xml
index 4c4cc302..ee134377 100644
--- a/res/menu/select_playlist.xml
+++ b/res/menu/select_playlist.xml
@@ -12,14 +12,4 @@
 		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 6c1ffa07..ce0a2bb6 100644
--- a/res/menu/select_podcasts.xml
+++ b/res/menu/select_podcasts.xml
@@ -16,14 +16,4 @@
 		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 4b0d440f..0e856e08 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+	<string-array name="drawerItems">
+		<item>@string/button_bar.home</item>
+		<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="themeValues">
         <item>light</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3721109e..579acf3a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -27,7 +27,7 @@
     <string name="button_bar.browse">Library</string>

     <string name="button_bar.search">Search</string>

     <string name="button_bar.playlists">Playlists</string>

-    <string name="button_bar.now_playing">Playing</string>

+    <string name="button_bar.now_playing">Now Playing</string>

 	<string name="button_bar.podcasts">Podcasts</string>

 	<string name="button_bar.chat">Chat</string>