Added navigation drawer to audio player, fixed DownloadService notification

2 files changed, 188 insertions, 168 deletions

diff --git a/res/layout/audioplayer_activity.xml b/res/layout/audioplayer_activity.xml
index 9b501fbdb..dd09271a4 100644
--- a/res/layout/audioplayer_activity.xml
+++ b/res/layout/audioplayer_activity.xml
@@ -1,173 +1,193 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
-    android:background="?attr/non_transparent_background"
-    android:orientation="vertical" >
-
-    <RelativeLayout
-        android:id="@+id/navBar"
-        android:layout_width="fill_parent"
-        android:layout_height="60dp"
-        android:layout_alignParentTop="true" >
-
-        <ImageButton
-            android:id="@+id/butNavLeft"
-            android:contentDescription="@string/show_shownotes_label"
-            android:layout_width="60dp"
-            android:layout_height="match_parent"
-            android:layout_alignParentLeft="true"
-            android:background="?attr/borderless_button"
-            android:padding="4dp" />
-
-        <ImageButton
-            android:id="@+id/butNavRight"
-            android:contentDescription="@string/show_chapters_label"
-            android:layout_width="60dp"
-            android:layout_height="match_parent"
-            android:layout_alignParentRight="true"
-            android:background="?attr/borderless_button"
-            android:padding="4dp" />
-
-        <TextView
-            android:id="@+id/txtvTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:layout_marginLeft="8dp"
-            android:layout_marginRight="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_toLeftOf="@id/butNavRight"
-            android:layout_toRightOf="@id/butNavLeft"
-            android:ellipsize="marquee"
-            android:marqueeRepeatLimit="marquee_forever"
-            android:maxLines="1"
-            android:textColor="?android:attr/textColorPrimary"
-            android:textSize="@dimen/text_size_small"
-            android:textStyle="bold" />
-
-        <TextView
-            android:id="@+id/txtvFeed"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/txtvTitle"
-            android:layout_marginLeft="8dp"
-            android:layout_marginRight="8dp"
-            android:layout_toLeftOf="@id/butNavRight"
-            android:layout_toRightOf="@id/butNavLeft"
-            android:ellipsize="marquee"
-            android:marqueeRepeatLimit="marquee_forever"
-            android:maxLines="1"
-            android:textColor="?android:attr/textColorSecondary"
-            android:textSize="@dimen/text_size_small" />
-    </RelativeLayout>
-
-    <View
-        android:id="@+id/navBarDivider"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_below="@id/navBar"
-        android:background="@color/bright_blue" />
-
-    <RelativeLayout
-        android:id="@+id/player_control"
-        android:layout_width="match_parent"
-        android:layout_height="80dp"
-        android:layout_alignParentBottom="true"
-        android:background="?attr/overlay_background" >
-
-        <ImageButton
-            android:id="@+id/butPlay"
-            android:contentDescription="@string/pause_label"
-            android:layout_width="80dp"
-            android:layout_height="match_parent"
-            android:layout_centerHorizontal="true"
-            android:background="?attr/borderless_button"
-            android:src="?attr/av_pause" />
-
-        <ImageButton
-            android:id="@+id/butRev"
-            android:contentDescription="@string/rewind_label"
-            android:layout_width="80dp"
-            android:layout_height="match_parent"
-            android:layout_toLeftOf="@id/butPlay"
-            android:background="?attr/borderless_button"
-            android:src="?attr/av_rewind" />
-
-        <ImageButton
-            android:id="@+id/butFF"
-            android:contentDescription="@string/fast_forward_label"
-            android:layout_width="80dp"
-            android:layout_height="match_parent"
-            android:layout_toRightOf="@id/butPlay"
-            android:background="?attr/borderless_button"
-            android:src="?attr/av_fast_forward" />
-
-        <Button
-            android:id="@+id/butPlaybackSpeed"
-            android:contentDescription="@string/set_playback_speed_label"
-            android:layout_width="80dp"
-            android:layout_height="match_parent"
-            android:layout_toRightOf="@id/butFF"
-            android:background="?attr/borderless_button"
-            android:src="?attr/av_fast_forward"
-            android:textColor="@color/gray"
-            android:textSize="@dimen/text_size_medium"
-            android:visibility="gone" />
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:id="@+id/playtime_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/player_control"
-        android:layout_alignParentLeft="true"
-        android:background="?attr/overlay_drawable" >
-
-        <TextView
-            android:id="@+id/txtvPosition"
-            android:layout_width="wrap_content"
+    android:layout_height="match_parent">
+
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                    android:id="@+id/content"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="?attr/non_transparent_background"
+                    android:orientation="vertical">
+
+        <RelativeLayout
+            android:id="@+id/navBar"
+            android:layout_width="fill_parent"
+            android:layout_height="60dp"
+            android:layout_alignParentTop="true">
+
+            <ImageButton
+                android:id="@+id/butNavLeft"
+                android:contentDescription="@string/show_shownotes_label"
+                android:layout_width="60dp"
+                android:layout_height="match_parent"
+                android:layout_alignParentLeft="true"
+                android:background="?attr/borderless_button"
+                android:padding="4dp"/>
+
+            <ImageButton
+                android:id="@+id/butNavRight"
+                android:contentDescription="@string/show_chapters_label"
+                android:layout_width="60dp"
+                android:layout_height="match_parent"
+                android:layout_alignParentRight="true"
+                android:background="?attr/borderless_button"
+                android:padding="4dp"/>
+
+            <TextView
+                android:id="@+id/txtvTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="8dp"
+                android:layout_marginRight="8dp"
+                android:layout_marginTop="8dp"
+                android:layout_toLeftOf="@id/butNavRight"
+                android:layout_toRightOf="@id/butNavLeft"
+                android:ellipsize="marquee"
+                android:marqueeRepeatLimit="marquee_forever"
+                android:maxLines="1"
+                android:textColor="?android:attr/textColorPrimary"
+                android:textSize="@dimen/text_size_small"
+                android:textStyle="bold"/>
+
+            <TextView
+                android:id="@+id/txtvFeed"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/txtvTitle"
+                android:layout_marginLeft="8dp"
+                android:layout_marginRight="8dp"
+                android:layout_toLeftOf="@id/butNavRight"
+                android:layout_toRightOf="@id/butNavLeft"
+                android:ellipsize="marquee"
+                android:marqueeRepeatLimit="marquee_forever"
+                android:maxLines="1"
+                android:textColor="?android:attr/textColorSecondary"
+                android:textSize="@dimen/text_size_small"/>
+        </RelativeLayout>
+
+        <View
+            android:id="@+id/navBarDivider"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@id/navBar"
+            android:background="@color/bright_blue"/>
+
+        <RelativeLayout
+            android:id="@+id/player_control"
+            android:layout_width="match_parent"
+            android:layout_height="80dp"
+            android:layout_alignParentBottom="true"
+            android:background="?attr/overlay_background">
+
+            <ImageButton
+                android:id="@+id/butPlay"
+                android:contentDescription="@string/pause_label"
+                android:layout_width="80dp"
+                android:layout_height="match_parent"
+                android:layout_centerHorizontal="true"
+                android:background="?attr/borderless_button"
+                android:src="?attr/av_pause"/>
+
+            <ImageButton
+                android:id="@+id/butRev"
+                android:contentDescription="@string/rewind_label"
+                android:layout_width="80dp"
+                android:layout_height="match_parent"
+                android:layout_toLeftOf="@id/butPlay"
+                android:background="?attr/borderless_button"
+                android:src="?attr/av_rewind"/>
+
+            <ImageButton
+                android:id="@+id/butFF"
+                android:contentDescription="@string/fast_forward_label"
+                android:layout_width="80dp"
+                android:layout_height="match_parent"
+                android:layout_toRightOf="@id/butPlay"
+                android:background="?attr/borderless_button"
+                android:src="?attr/av_fast_forward"/>
+
+            <Button
+                android:id="@+id/butPlaybackSpeed"
+                android:contentDescription="@string/set_playback_speed_label"
+                android:layout_width="80dp"
+                android:layout_height="match_parent"
+                android:layout_toRightOf="@id/butFF"
+                android:background="?attr/borderless_button"
+                android:src="?attr/av_fast_forward"
+                android:textColor="@color/gray"
+                android:textSize="@dimen/text_size_medium"
+                android:visibility="gone"/>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/playtime_layout"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_above="@id/player_control"
             android:layout_alignParentLeft="true"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="8dp"
-            android:layout_marginTop="16dp"
-            android:text="@string/position_default_label"
-            android:textColor="?android:attr/textColorSecondary"
-            android:textSize="@dimen/text_size_micro" />
-
-        <TextView
-            android:id="@+id/txtvLength"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentTop="true"
-            android:layout_centerVertical="true"
-            android:layout_marginRight="8dp"
-            android:layout_marginTop="16dp"
-            android:text="@string/position_default_label"
-            android:textColor="?android:attr/textColorSecondary"
-            android:textSize="@dimen/text_size_micro" />
-
-        <SeekBar
-            android:id="@+id/sbPosition"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="8dp"
-            android:layout_marginRight="8dp"
-            android:layout_marginTop="16dp"
-            android:layout_toLeftOf="@id/txtvLength"
-            android:layout_toRightOf="@id/txtvPosition"
-            android:max="500" />
-    </RelativeLayout>
+            android:background="?attr/overlay_drawable">
+
+            <TextView
+                android:id="@+id/txtvPosition"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="8dp"
+                android:layout_marginTop="16dp"
+                android:text="@string/position_default_label"
+                android:textColor="?android:attr/textColorSecondary"
+                android:textSize="@dimen/text_size_micro"/>
+
+            <TextView
+                android:id="@+id/txtvLength"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentTop="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="8dp"
+                android:layout_marginTop="16dp"
+                android:text="@string/position_default_label"
+                android:textColor="?android:attr/textColorSecondary"
+                android:textSize="@dimen/text_size_micro"/>
+
+            <SeekBar
+                android:id="@+id/sbPosition"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="8dp"
+                android:layout_marginRight="8dp"
+                android:layout_marginTop="16dp"
+                android:layout_toLeftOf="@id/txtvLength"
+                android:layout_toRightOf="@id/txtvPosition"
+                android:max="500"/>
+        </RelativeLayout>
+
+        <FrameLayout
+            android:id="@+id/contentView"
+            android:layout_width="match_parent"
+            android:layout_height="0px"
+            android:layout_above="@id/playtime_layout"
+            android:layout_below="@id/navBarDivider">
+        </FrameLayout>
 
-    <FrameLayout
-        android:id="@+id/contentView"
-        android:layout_width="match_parent"
-        android:layout_height="0px"
-        android:layout_above="@id/playtime_layout"
-        android:layout_below="@id/navBarDivider" >
-    </FrameLayout>
+    </RelativeLayout>
 
-</RelativeLayout>
\ No newline at end of file
+    <ListView
+        android:id="@+id/nav_list"
+        android:layout_width="@dimen/drawer_width"
+        android:layout_height="match_parent"
+        android:layout_gravity="start"
+        android:choiceMode="singleChoice"
+        android:background="?attr/nav_drawer_background"
+        android:scrollbarStyle="outsideOverlay"
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp"/>
+
+</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
diff --git a/res/layout/main.xml b/res/layout/main.xml
index 229b03255..cfd59b87c 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -28,7 +28,7 @@
 
     <ListView
         android:id="@+id/nav_list"
-        android:layout_width="280dp"
+        android:layout_width="@dimen/drawer_width"
         android:layout_height="match_parent"
         android:layout_gravity="start"
         android:choiceMode="singleChoice"