From e48d8ecbdc0fec04a1cc91387f5a2d382dcb5729 Mon Sep 17 00:00:00 2001
From: Splitter <splitvisionz@gmail.com>
Date: Mon, 24 Mar 2014 19:33:54 -0400
Subject: [PATCH 01/10] Redesign NowPlaying/Recents & begin cleaning up

Redesign NowPlaying/Recents & begin cleaning up layout/theme code
---
 AndroidManifest.xml                           |   6 +-
 res/drawable-hdpi/transparent_black.9.png     | Bin 0 -> 170 bytes
 res/drawable-hdpi/view_more_now.png           | Bin 0 -> 371 bytes
 res/layout/audio_controls.xml                 | 110 +++---
 res/layout/audio_player.xml                   |  27 +-
 res/layout/bottom_action_bar.xml              |  61 ++-
 res/layout/context_menu.xml                   |  12 +-
 res/layout/custom_action_bar.xml              |  47 ---
 res/layout/gridview_items.xml                 |   9 +-
 res/layout/gridview_items_recent.xml          |  69 ++++
 res/layout/half_and_half.xml                  |   4 +-
 res/layout/listview_items.xml                 |  19 +-
 res/layout/nowplaying_album_art.xml           |   4 +-
 res/layout/shuffle_all.xml                    |   2 +-
 res/layout/tabs.xml                           |   2 +-
 res/values/attrs.xml                          |  36 ++
 res/values/colors.xml                         |   3 +
 res/values/dimens.xml                         |  16 +-
 res/values/strings.xml                        |   5 +-
 res/values/styles.xml                         | 364 +++++++++++++++---
 res/values/themes.xml                         |  45 +++
 .../apolloMod/activities/PlayExternal.java    |   2 +-
 .../adapters/list/RecentlyAddedAdapter.java   |   8 +-
 .../ui/fragments/AudioPlayerFragment.java     |  63 ++-
 .../ui/fragments/BottomActionBarFragment.java |  55 ++-
 .../ui/fragments/base/GridViewFragment.java   |  18 +-
 .../fragments/list/RecentlyAddedFragment.java |  18 +-
 .../apolloMod/ui/widgets/BottomActionBar.java |  16 +-
 .../apolloMod/views/ViewHolderGrid.java       |   1 -
 29 files changed, 736 insertions(+), 286 deletions(-)
 create mode 100644 res/drawable-hdpi/transparent_black.9.png
 create mode 100644 res/drawable-hdpi/view_more_now.png
 delete mode 100644 res/layout/custom_action_bar.xml
 create mode 100644 res/layout/gridview_items_recent.xml
 create mode 100644 res/values/attrs.xml
 create mode 100644 res/values/themes.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9c6db40..6a81780 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -32,7 +32,7 @@
         android:largeHeap="true"
         android:process=":main"
         android:taskAffinity="apollo.task.music"
-        android:theme="@style/ApolloTheme" >
+        android:theme="@style/ApolloTheme.Light" >
         <meta-data
             android:name="android.app.default_searchable"
             android:value=".activities.QueryBrowserActivity" />
@@ -40,7 +40,7 @@
         <activity
             android:name=".activities.QueryBrowserActivity"
             android:exported="true"
-            android:theme="@style/ApolloTheme" >
+            android:theme="@style/ApolloTheme.Light" >
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
                 <action android:name="android.intent.action.MEDIA_SEARCH" />
@@ -102,7 +102,7 @@
             android:excludeFromRecents="true"
             android:noHistory="true"
             android:launchMode="singleTask"
-            android:theme="@style/Theme.Light.Translucent"
+            android:theme="@style/Light.Translucent"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
diff --git a/res/drawable-hdpi/transparent_black.9.png b/res/drawable-hdpi/transparent_black.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..90c0762339e0dc4de43bae657377b8f8712b6c6f
GIT binary patch
literal 170
zcmeAS@N?(olHy`uVBq!ia0vp^+#t-s1|(OmDOUqhY)RhkE)4%caKYZ?lYt_f1s;*b
zKvlvZ%*Zfnjs#GUy~NYkmHi&GsHl>rb=KBUppdzzi(`ny<>Z6|EdLiuFdHaoDzHe*
zl<;8C38=CY%=&LE_>zSU1SZWn*z&~l)odT>qbjak4DZ*mZOl?>$pad};OXk;vd$@?
F2>`%)EBycf

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/view_more_now.png b/res/drawable-hdpi/view_more_now.png
new file mode 100644
index 0000000000000000000000000000000000000000..187c23764b55305fee1ffdefc1825de05c806aeb
GIT binary patch
literal 371
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCwj^(N7l!{JxM1({$v_d#0*}aI
z1_o|n5N2eUHAey{$X?><>&kwQSy)_4_R9;0C<X>b22U5qkc@k8uUmVuIEu7B^iTKk
z5#c%ObEcH>oRm+AA=|o>?hCpNj144f8r8BCdU_gjgIM1_P!Nt3f5-3Ze3AF-^_9!~
zCaZXUny>TF;>Mi%Gv$_5Oqvrw$a9j)O}EXx&m5<LcsJc9r^v7F-e;2G@ql6Xj|0Ij
zjkaqNq-XCqZZhe>iYeYV4)}RKw)B#ITg6oSuApgpC1;P6c!YjtNrle$0H)G;(NC)m
zsLXOmUAyFC=;e%+UM1XrT=`bLF}RUf9&PvHx|M+I17YzUvwX8861aN{yS7*UUMbp_
zCRWmQ`hM8nt1Q3nJm7g>Z+qjG*sKRK*9BjHNwh4T98kl&TvP9{{pCO*VDK<_y85}S
Ib4q9e09^l$uK)l5

literal 0
HcmV?d00001

diff --git a/res/layout/audio_controls.xml b/res/layout/audio_controls.xml
index cfe0147..ce1865c 100644
--- a/res/layout/audio_controls.xml
+++ b/res/layout/audio_controls.xml
@@ -1,77 +1,87 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
-
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingTop="@dimen/audio_player_seek_bar_padding" >
-
-        <SeekBar
-            android:id="@android:id/progress"
-            style="?android:attr/progressBarStyleHorizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="@dimen/audio_player_seek_bar_padding"    
-            android:progressDrawable="@drawable/audio_player_seekbar" 
-            android:thumb="@null" />
-
+        android:paddingTop="@dimen/audio_player_text_padding_top" 
+        android:paddingLeft="@dimen/audio_player_text_padding_left" >
+    
         <TextView
-            android:id="@+id/audio_player_current_time"
-            style="@style/AudioPlayerText"
-            android:layout_alignParentLeft="true"
-            android:layout_below="@android:id/progress"
-            android:paddingLeft="@dimen/audio_player_info_container_padding"
-            android:paddingRight="@dimen/audio_player_info_container_padding"
-            android:textColor="@color/transparent_black"
-            android:textSize="@dimen/text_size_small"
-            android:textStyle="bold" />
-
+            android:id="@+id/audio_player_artist_text"
+            style="?AudioPlayerArtistAlbumText"
+            android:text="@string/artist_page_title"/>        
         <TextView
-            android:id="@+id/audio_player_total_time"
-            style="@style/AudioPlayerText"
-            android:layout_alignParentRight="true"
-            android:layout_below="@android:id/progress"
-            android:paddingLeft="@dimen/audio_player_info_container_padding"
-            android:paddingRight="@dimen/audio_player_info_container_padding"
-            android:textColor="@color/transparent_black"
-            android:textSize="@dimen/text_size_small"
-            android:textStyle="bold" />
+            android:id="@+id/audio_player_artist"
+            android:layout_toRightOf="@id/audio_player_artist_text"
+            style="?AudioPlayerInfoText"/>
+        
+        <TextView
+            android:id="@+id/audio_player_album_text"
+            android:layout_below="@id/audio_player_artist_text"
+            style="?AudioPlayerArtistAlbumText"
+            android:text="@string/album_page_title"/>        
+        <TextView
+            android:id="@+id/audio_player_album"
+            android:layout_toRightOf="@id/audio_player_album_text"
+            android:layout_alignBottom="@id/audio_player_album_text"
+            style="?AudioPlayerInfoText"/>
+        
+        <ImageButton
+            android:id="@+id/view_more"
+            style="?AudioPlayerViewMore"/>
+        
     </RelativeLayout>
-
+        
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="@dimen/audio_player_controls_height"
         android:layout_gravity="bottom"
         android:orientation="horizontal"
-        android:paddingBottom="@dimen/audio_player_button_container_padding" >
-
-        <ImageButton
-            android:id="@+id/audio_player_repeat"
-            style="@style/AudioPlayerButton"
-            android:contentDescription="@string/cd_repeat"
-            android:src="@drawable/apollo_holo_light_repeat_normal" />
-
+        android:paddingTop="@dimen/audio_player_button_container_padding" > 
+        
         <com.andrew.apolloMod.ui.widgets.RepeatingImageButton
             android:id="@+id/audio_player_prev"
-            style="@style/AudioPlayerButton"
-            android:src="@drawable/apollo_holo_light_previous" />
+            style="?AudioPlayerPrevious"/>
 
         <ImageButton
             android:id="@+id/audio_player_play"
-            style="@style/AudioPlayerButton"
-            android:contentDescription="@string/cd_play"
-            android:src="@drawable/apollo_holo_light_pause" />
+            style="?AudioPlayerPlay"/>
 
         <com.andrew.apolloMod.ui.widgets.RepeatingImageButton
             android:id="@+id/audio_player_next"
-            style="@style/AudioPlayerButton"
-            android:src="@drawable/apollo_holo_light_next" />
+            style="?AudioPlayerNext"/>
+
+        <ImageButton
+            android:id="@+id/audio_player_repeat"
+            style="?AudioPlayerRepeat"/>
 
         <ImageButton
             android:id="@+id/audio_player_shuffle"
-            style="@style/AudioPlayerButton"
-            android:contentDescription="@string/cd_shuffle"
-            android:src="@drawable/apollo_holo_light_shuffle_normal" />
+            style="?AudioPlayerShuffle" />
     </LinearLayout>
+    
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/audio_player_seek_padding_top_bottom" 
+        android:paddingBottom="@dimen/audio_player_seek_padding_top_bottom" >
+
+        <TextView
+            android:id="@+id/audio_player_current_time"
+            style="?AudioPlayerTimeText"
+            android:layout_alignParentLeft="true"
+            android:paddingLeft="@dimen/audio_player_info_container_padding"/>
+        
+        <TextView
+            android:id="@+id/audio_player_total_time"
+            style="?AudioPlayerTimeText"
+            android:layout_alignParentRight="true"
+            android:paddingRight="@dimen/audio_player_info_container_padding"/>
+        
+        <SeekBar
+            android:id="@android:id/progress"
+            style="?AudioPlayerSeek"/>
+
+    </RelativeLayout>
 
 </merge>
\ No newline at end of file
diff --git a/res/layout/audio_player.xml b/res/layout/audio_player.xml
index 13df2bc..2cd426c 100644
--- a/res/layout/audio_player.xml
+++ b/res/layout/audio_player.xml
@@ -22,27 +22,26 @@
             android:id="@+id/visualizerView"
             android:layout_width="match_parent"
             android:layout_height="fill_parent"
-            android:layout_above="@+id/audio_player_text_border" />
-       
+            android:layout_above="@+id/audio_player_nowplaying_text" />
+		
+        <TextView
+            android:id="@+id/audio_player_nowplaying_text"
+            style="?AudioPlayerNowPlayingText"/>
+        
    </RelativeLayout>
+   
    <RelativeLayout
         android:id="@+id/audio_player_queue_wrapper"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:background="@color/background_grey"
-        android:visibility="gone" >
+        android:visibility="gone" 
+        style="?AudioPlayerQueueBG">
    </RelativeLayout>
     
     <FrameLayout 
 	    android:id="@+id/colorstrip_bottom"
-	    android:layout_width="match_parent"
-	    android:layout_height="@dimen/colorstrip_height"
-        android:background="@color/holo_blue_dark" />
+		style="?AudioPlayerColorstrip"/>
+    
 	<View
-	    android:layout_width="match_parent"
-	    android:layout_height="@dimen/colorstrip_height"
-	    android:background="@drawable/colorstrip_shadow" 
-	    />		
+	    style="?AudioPlayerColorstripShadow"/>	
+	    	
     <include layout="@layout/audio_controls" />
 </LinearLayout>
diff --git a/res/layout/bottom_action_bar.xml b/res/layout/bottom_action_bar.xml
index c3b8a80..a1319d6 100644
--- a/res/layout/bottom_action_bar.xml
+++ b/res/layout/bottom_action_bar.xml
@@ -2,27 +2,22 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/bottom_action_bar_container"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/bottom_action_bar_height"
-    android:layout_gravity="bottom"
-    android:orientation="vertical" >
+    style="?BottomActionBarWrapper">
 
     <ImageView
         android:id="@+id/bottom_action_bar_info_divider"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/bottom_action_bar_divider_height"
-        android:background="@color/holo_blue_dark"
+	    style="?BottomActionBarDivider"
         tools:ignore="ContentDescription" />
 
     <com.andrew.apolloMod.ui.widgets.BottomActionBar
         android:id="@+id/bottom_action_bar"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@drawable/holo_selector"
-	    android:paddingLeft="@dimen/bottom_action_bar_padding_left"
-	    android:paddingRight="@dimen/bottom_action_bar_padding_left"
-        android:orientation="horizontal" >
+		style="?BottomActionBar">
 
+        <ImageButton
+            android:id="@+id/bottom_action_bar_favorites"
+            style="?BottomActionBarFavorites" 
+            android:visibility="gone"/>        
+            
         <RelativeLayout
         	android:id="@+id/bottom_action_bar_dragview"
 	        android:layout_width="0dp"
@@ -38,49 +33,45 @@
 	            android:contentDescription="@string/cd_bottom_action_bar_album_art"
 	            android:scaleType="fitXY" />
 	
+	
+	            <TextView
+	                android:id="@+id/bottom_action_bar_track_name_only"
+	                style="?BottomActionBarText"
+	                android:gravity="center"
+	                android:layout_width="match_parent"
+	                android:paddingLeft="0dp"
+	                android:visibility="gone"
+	                android:textStyle="bold" />
+	            
 	            <TextView
 	                android:id="@+id/bottom_action_bar_track_name"
-	                style="@style/BottomActionBarText"
+	                style="?BottomActionBarText"
 	                android:layout_toRightOf="@+id/bottom_action_bar_album_art"
-	                android:paddingLeft="@dimen/bottom_action_bar_padding_left"
-	                android:textColor="@color/transparent_black"
-	                android:textSize="@dimen/text_size_micro"
 	                android:textStyle="bold" />
 	
 	            <TextView
 	                android:id="@+id/bottom_action_bar_artist_name"
-	                style="@style/BottomActionBarText"
-	                android:paddingLeft="@dimen/bottom_action_bar_padding_left"
+	                style="?BottomActionBarText"
 	                android:layout_below="@+id/bottom_action_bar_track_name"
-	                android:layout_toRightOf="@+id/bottom_action_bar_album_art"
-	                android:textSize="@dimen/text_size_micro"
-	                android:textColor="@color/transparent_black" />
+	                android:layout_toRightOf="@+id/bottom_action_bar_album_art" />
 	    </RelativeLayout>
         
         <ImageButton
             android:id="@+id/bottom_action_bar_previous"
-            style="@style/BottomActionBarItem"
-            android:contentDescription="@string/cd_previous"
-            android:src="@drawable/apollo_holo_light_previous" />
+            style="?BottomActionBarPrevious"/>
 
         <ImageButton
             android:id="@+id/bottom_action_bar_play"
-            style="@style/BottomActionBarItem"
-            android:contentDescription="@string/cd_play"
-            android:src="@drawable/apollo_holo_light_play" />
+            style="?BottomActionBarPlay" />
 
         <ImageButton
             android:id="@+id/bottom_action_bar_next"
-            style="@style/BottomActionBarItem"
-            android:contentDescription="@string/cd_next"
-            android:src="@drawable/apollo_holo_light_next" />      
+            style="?BottomActionBarNext"/>      
               
         <ImageButton
             android:id="@+id/bottom_action_bar_switch_queue"
-            style="@style/BottomActionBarItem"
-            android:visibility="gone" 
-            android:contentDescription="@string/cd_next"
-            android:src="@drawable/btn_switch_queue" />        
+            style="?BottomActionBarItem"
+            android:visibility="gone"/>"
         
     </com.andrew.apolloMod.ui.widgets.BottomActionBar>
 
diff --git a/res/layout/context_menu.xml b/res/layout/context_menu.xml
index 4682936..6c84058 100644
--- a/res/layout/context_menu.xml
+++ b/res/layout/context_menu.xml
@@ -10,18 +10,10 @@
 
     <ImageView
         android:id="@+id/quick_context_line"
-        android:layout_width="@dimen/quick_context_line_width"
-        android:layout_height="@dimen/quick_context_line_height"
-        android:layout_gravity="center|left"
-        android:background="@color/transparent_black" />
+        style="?ContextMenuLine" />
 
     <ImageView
         android:id="@+id/quick_context_tip"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="center"
-        android:layout_marginRight="@dimen/quick_context_margin_right"
-        android:scaleType="centerInside"
-        android:src="@drawable/dropdown_ic_arrow_normal_holo_light" />
+        style="?ContextMenuArrow"/>
 
 </FrameLayout>
diff --git a/res/layout/custom_action_bar.xml b/res/layout/custom_action_bar.xml
deleted file mode 100644
index 9389ad5..0000000
--- a/res/layout/custom_action_bar.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/action_bar_layout"
-    android:layout_width="96dp"
-    android:layout_height="wrap_content"
-    android:layout_gravity="right|center"
-    android:background="@drawable/holo_selector"
-    android:clickable="true"
-    android:focusable="true" >
-
-    <ImageView
-        android:id="@+id/action_bar_album_art"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentTop="true"
-        tools:ignore="ContentDescription" />
-
-    <TextView
-        android:id="@+id/action_bar_track_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_toLeftOf="@+id/action_bar_album_art"
-        android:ellipsize="end"
-        android:paddingRight="5dp"
-        android:paddingTop="10dp"
-        android:singleLine="true"
-        android:textColor="@color/transparent_black"
-        android:textSize="@dimen/text_size_micro"
-        android:textStyle="bold" />
-
-    <TextView
-        android:id="@+id/action_bar_album_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/action_bar_track_name"
-        android:layout_toLeftOf="@+id/action_bar_album_art"
-        android:ellipsize="end"
-        android:paddingRight="5dp"
-        android:singleLine="true"
-        android:textColor="@color/transparent_black"
-        android:textSize="@dimen/text_size_micro" />
-
-</RelativeLayout>
diff --git a/res/layout/gridview_items.xml b/res/layout/gridview_items.xml
index ecf8dc3..3ea698e 100644
--- a/res/layout/gridview_items.xml
+++ b/res/layout/gridview_items.xml
@@ -14,7 +14,7 @@
 		        android:id="@+id/gridview_image"
 		        android:layout_width="@dimen/gridview_image_width"
 		        android:layout_height="@dimen/gridview_image_height"
-		        android:scaleType="centerCrop" 
+		        android:scaleType="matrix" 
 			    android:background="@drawable/no_art_small"/>
 		     
 		    <LinearLayout
@@ -25,17 +25,14 @@
 		        android:gravity="center_vertical"
 		        android:orientation="vertical">
 		  		       
-				<View
-				    android:id="@+id/gridview_text_border"
-				    style="@style/Topborderline"
-				    />
+				
 				<LinearLayout
 			        android:id="@+id/gridview_info_holder"
 			        android:layout_width="match_parent"
 			        android:layout_height="@dimen/gridview_item_ccontainer_height"
-			        android:background="@color/transparent_black"
 			        android:gravity="center_vertical"
 			        android:orientation="vertical"
+            		android:background="@drawable/transparent_black"
 				    android:paddingLeft="@dimen/gridview_item_ccontainer_padding_left"
 		        	android:paddingRight="@dimen/gridview_item_ccontainer_padding_right" 
 				    >
diff --git a/res/layout/gridview_items_recent.xml b/res/layout/gridview_items_recent.xml
new file mode 100644
index 0000000..8f40020
--- /dev/null
+++ b/res/layout/gridview_items_recent.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    	android:layout_width="fill_parent"
+	    android:layout_height="wrap_content"
+    	android:paddingLeft="@dimen/gridview_item_padding_right_left"
+    	android:paddingRight="@dimen/gridview_item_padding_right_left"
+    	android:paddingBottom="@dimen/gridview_item_padding_bottom">
+	<RelativeLayout
+	    android:layout_width="match_parent"
+	    android:layout_height="@dimen/gridview_recent_item_height"
+	    android:paddingTop="@dimen/listview_items_padding_top_bottom" 
+	    android:paddingBottom="@dimen/listview_items_padding_top_bottom"
+		android:background="@drawable/listview_item_background" 
+	    android:layout_gravity="center_vertical" >
+	 
+	    <com.andrew.apolloMod.views.TrackBrowserImageView
+	        android:id="@+id/gridview_image"
+		    android:layout_width="@dimen/gridview_image_width"
+	        android:layout_height="@dimen/gridview_recent_album_art"
+	        android:layout_alignParentLeft="true"
+	        android:scaleType="matrix" 
+		    android:background="@drawable/no_art_small"/>
+	
+	    <!-- Padding may be set on via code for some tabs -->
+	
+	    <TextView
+	        android:id="@+id/gridview_line_one"
+			style="@style/GridviewShadowedText"
+	        android:layout_width="match_parent"
+	        android:layout_height="wrap_content"
+            android:background="@drawable/transparent_black"
+            android:layout_alignBottom="@+id/gridview_image"
+	        android:ellipsize="end"
+	        android:maxLength="49"
+	        android:padding="4dp"
+	        android:singleLine="true"
+			android:textColor="@color/white"
+	        android:textSize="@dimen/text_size_small" />
+	
+	    <TextView
+	        android:id="@+id/gridview_line_two"
+	        android:layout_width="match_parent"
+	        android:layout_height="wrap_content"
+	        android:layout_below="@+id/gridview_image"
+	        android:ellipsize="end"
+	        android:paddingTop="@dimen/listview_items_padding_small_top"
+	        android:singleLine="true"
+	        android:textColor="@color/light_grey"
+	        android:textSize="@dimen/text_size_micro" />
+	
+	    <ImageView
+	        android:id="@+id/peak_two"
+	        style="@style/PeakMeter"
+            android:layout_alignBottom="@+id/gridview_line_two"
+	        android:layout_height="26dp"
+            android:layout_marginRight="8dp"
+		    android:layout_toLeftOf="@+id/peak_one"/>
+	
+	    <ImageView
+	        android:id="@+id/peak_one"
+	        style="@style/PeakMeter"
+	        android:layout_height="26dp"
+            android:layout_alignBottom="@+id/gridview_line_two"
+            android:layout_alignParentRight="true"/>
+	
+	</RelativeLayout>
+</LinearLayout>
+    
\ No newline at end of file
diff --git a/res/layout/half_and_half.xml b/res/layout/half_and_half.xml
index 2cc6fd3..16b5190 100644
--- a/res/layout/half_and_half.xml
+++ b/res/layout/half_and_half.xml
@@ -20,14 +20,14 @@
                 android:id="@+id/half_artist_image"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/half_and_half_imageheight"
-                android:scaleType="centerCrop" />
+                android:scaleType="matrix" />
 
 			<RelativeLayout
 		        android:id="@+id/half_artist_info_holder"
 		        android:layout_width="match_parent"
 		        android:layout_height="@dimen/half_and_half_text_wrap_height"
 	            android:layout_alignBottom="@+id/half_artist_image"
-		        android:background="@color/transparent_black"
+            	android:background="@drawable/transparent_black"
 		        android:paddingTop="@dimen/gridview_item_ccontainer_padding_left"
 		        android:paddingBottom="@dimen/gridview_item_ccontainer_padding_left"
 			    android:paddingLeft="@dimen/gridview_item_ccontainer_padding_left"
diff --git a/res/layout/listview_items.xml b/res/layout/listview_items.xml
index debdbef..1aefeeb 100644
--- a/res/layout/listview_items.xml
+++ b/res/layout/listview_items.xml
@@ -1,20 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/listview_item_height"
-    android:paddingTop="@dimen/listview_items_padding_top_bottom" 
-    android:paddingBottom="@dimen/listview_items_padding_top_bottom"
-	android:background="@drawable/listview_item_background" 
-    android:layout_gravity="center_vertical" >
+    style="?ListviewItemWrapper" >
  
     <ImageView
         android:id="@+id/listview_item_image"
-        android:layout_width="@dimen/listview_album_art"
-        android:layout_height="@dimen/listview_album_art"
-        android:layout_alignParentLeft="true"
-        android:layout_margin="@dimen/listview_album_margin"
-        android:scaleType="centerCrop" 
-	    android:background="@drawable/no_art_small"/>
+        style="?ListviewItemArt"/>
 
     <!-- Padding may be set on via code for some tabs -->
 
@@ -27,9 +17,9 @@
         android:maxLength="29"
         android:paddingLeft="@dimen/listview_items_padding_left_top"
         android:paddingRight="@dimen/listview_items_padding_right"
-        android:paddingTop="@dimen/listview_items_padding_top_bottom"
+        android:paddingTop="9dp"
         android:singleLine="true"
-        android:textSize="@dimen/text_size_medium" />
+        android:textSize="@dimen/text_size_small_medium" />
 
     <TextView
         android:id="@+id/listview_item_line_two"
@@ -42,6 +32,7 @@
         android:paddingRight="@dimen/listview_items_padding_right"
         android:paddingTop="@dimen/listview_items_padding_small_top"
         android:singleLine="true"
+        android:textColor="@color/light_grey"
         android:textSize="@dimen/text_size_small" />
 
     <include layout="@layout/context_menu" />
diff --git a/res/layout/nowplaying_album_art.xml b/res/layout/nowplaying_album_art.xml
index 5d8661f..fe7c604 100644
--- a/res/layout/nowplaying_album_art.xml
+++ b/res/layout/nowplaying_album_art.xml
@@ -4,11 +4,11 @@
     android:layout_height="match_parent"
     android:orientation="vertical" >
     
-	<ImageView
+	<com.andrew.apolloMod.views.TrackBrowserImageView
             android:id="@+id/audio_player_album_art"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:src="@drawable/no_art_normal"
-            android:scaleType="fitXY" />
+            android:scaleType="matrix" />
 	
 </LinearLayout>
diff --git a/res/layout/shuffle_all.xml b/res/layout/shuffle_all.xml
index dc0e35b..acbfe94 100644
--- a/res/layout/shuffle_all.xml
+++ b/res/layout/shuffle_all.xml
@@ -28,7 +28,7 @@
         android:layout_toRightOf="@+id/shuffle_imageview"
         android:ellipsize="end"
         android:maxLength="29"
-        android:text="Shuffle All"
+        android:text="@string/shuffle_all"
         android:paddingRight="@dimen/listview_items_padding_right"
     	android:layout_marginTop="14dp" 
     	android:layout_marginLeft="31dp" 
diff --git a/res/layout/tabs.xml b/res/layout/tabs.xml
index 67b2c19..bc619dd 100644
--- a/res/layout/tabs.xml
+++ b/res/layout/tabs.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Button xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/tabs"
-    style="@style/Tabs" />
+    style="?Tabs" />
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
new file mode 100644
index 0000000..548e59a
--- /dev/null
+++ b/res/values/attrs.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+		<declare-styleable name="ApolloTheme.Light">
+			<attr name="Tabs" format="reference" />
+    		<attr name="BottomActionBarItem" format="reference" />
+    		<attr name="BottomActionBarText" format="reference" />
+    		<attr name="BottomActionBarDivider" format="reference" />
+    		<attr name="BottomActionBar" format="reference" />
+    		<attr name="BottomActionBarWrapper" format="reference" />
+    		<attr name="BottomActionBarFavorites" format="reference" />
+    		<attr name="BottomActionBarPrevious" format="reference" />
+    		<attr name="BottomActionBarPlay" format="reference" />
+    		<attr name="BottomActionBarNext" format="reference" />
+    		<attr name="BottomActionBarNowQueue" format="reference" />    		
+    		<attr name="AudioPlayerText" format="reference" />
+    		<attr name="AudioPlayerArtistAlbumText" format="reference" />
+    		<attr name="AudioPlayerInfoText" format="reference" />
+    		<attr name="AudioPlayerViewMore" format="reference" />
+    		<attr name="AudioPlayerButton" format="reference" />
+    		<attr name="AudioPlayerTimeText" format="reference" />
+    		<attr name="AudioPlayerNowPlayingText" format="reference" />
+    		<attr name="AudioPlayerQueueBG" format="reference" />
+    		<attr name="AudioPlayerColorstrip" format="reference" />
+    		<attr name="AudioPlayerColorstripShadow" format="reference" />
+    		<attr name="AudioPlayerPrevious" format="reference" />
+    		<attr name="AudioPlayerPlay" format="reference" />
+    		<attr name="AudioPlayerNext" format="reference" />
+    		<attr name="AudioPlayerRepeat" format="reference" />
+    		<attr name="AudioPlayerShuffle" format="reference" />
+    		<attr name="AudioPlayerSeek" format="reference" />
+    		<attr name="ContextMenuLine" format="reference" />
+    		<attr name="ContextMenuArrow" format="reference" />
+    		<attr name="ListviewItemWrapper" format="reference" />
+    		<attr name="ListviewItemArt" format="reference" />
+		</declare-styleable>
+</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index cae3bdc..3b0da2a 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -26,6 +26,9 @@
     <!-- White -->
     <color name="white">#ffffffff</color>
     
+    <!-- Light Grey Text -->
+    <color name="light_grey">#ff888888</color>
+    
     <!-- Quick Queue line seperator -->
     <color name="actionbar_text">#eeffffff</color>
 
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 90d5d7b..8edbf74 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -5,6 +5,7 @@
     <dimen name="text_size_extra_micro">10sp</dimen>
     <dimen name="text_size_micro">12sp</dimen>
     <dimen name="text_size_small">14sp</dimen>
+    <dimen name="text_size_small_medium">15sp</dimen>
     <dimen name="text_size_medium">16sp</dimen>
     <dimen name="text_size_large">18sp</dimen>
 
@@ -36,8 +37,8 @@
     <!-- ListView items -->
     <dimen name="listview_item_height">74dp</dimen>
     <dimen name="listview_items_padding_left_top">9dp</dimen>
-    <dimen name="listview_items_padding_small_top">4dp</dimen>
-    <dimen name="listview_items_padding_gp_top">16dp</dimen>
+    <dimen name="listview_items_padding_small_top">3dp</dimen>
+    <dimen name="listview_items_padding_gp_top">18dp</dimen>
     <dimen name="listview_items_padding_right">50dp</dimen>
     <dimen name="listview_items_padding_top_bottom">5dp</dimen>
     <dimen name="listview_items_padding_left_right">10dp</dimen>
@@ -77,6 +78,8 @@
     <dimen name="header_text_padding_left">15dp</dimen>
 
     <!-- GridView items -->
+    <dimen name="gridview_recent_album_art">67dp</dimen>
+    <dimen name="gridview_recent_item_height">100dp</dimen>
     <dimen name="gridview_image_width">152dp</dimen>
     <dimen name="gridview_image_height">132dp</dimen>
     <dimen name="gridview_item_fullheight">168dp</dimen>
@@ -96,8 +99,13 @@
     <dimen name="audio_player_info_container_padding">16dp</dimen>
     <dimen name="audio_player_artwork_padding">20dp</dimen>
     <dimen name="audio_player_controls_height">56dp</dimen>
-    <dimen name="audio_player_seek_bar_padding">10dp</dimen>
-    <dimen name="audio_player_button_container_padding">2dp</dimen>
+    <dimen name="audio_player_seek_bar_padding">3dp</dimen>
+    <dimen name="audio_player_button_container_padding">20dp</dimen>
+    <dimen name="audio_player_text_padding_top">10dp</dimen>
+    <dimen name="audio_player_text_padding_left">15dp</dimen>
+    <dimen name="audio_player_seek_padding_top_bottom">20dp</dimen>
+    <dimen name="audio_player_nowplaying_padding_top_bottom">12dp</dimen>
+    <dimen name="audio_player_nowplaying_padding_left">17dp</dimen>
 
     <!-- Recent Applications parameters -->
     <!-- How far the thumbnail for a recent app appears from left edge -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d484d2c..33bfafc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -15,9 +15,10 @@
     <string name="cd_play">Play and pause</string>
     <string name="cd_next">Skip forwards</string>
     <string name="cd_shuffle">Shuffle tracks</string>
+    <string name="cd_show_queue">Show now playing queue</string>
 
     <!-- AudioPlayer title -->
-    <string name="nowplaying">Now playing</string>
+    <string name="nowplaying">Now Playing</string>
 
     <!-- Used to indicate the number of albums for an artist -->
     <plurals name="Nalbums">
@@ -54,7 +55,7 @@
 
     <!-- Options MenuItems -->
     <string name="settings">Settings</string>
-    <string name="shuffle_all">Shuffle all</string>
+    <string name="shuffle_all">Shuffle All</string>
     <string name="share">Share</string>
     <string name="play_store">Play Store</string>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 4914031..6159818 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="ApolloTheme" parent="@android:style/Theme.Holo.Light">
-        <item name="android:actionBarStyle">@style/ApolloTheme.BlueActionBar</item>
-    	<item name="android:actionOverflowButtonStyle">@style/ApolloTheme.OverFlow</item>
-    </style>
+    
+	<!-- 
+		GENERAL THEME STYLES
+	-->	    
+    <!--  ActionBar Styles -->
 	<style name="ApolloTheme.OverFlow" parent="@android:style/Widget.Holo.ActionButton.Overflow">
 	    <item name="android:src">@drawable/apollo_holo_dark_overflow</item>
 	</style>
@@ -15,23 +16,8 @@
 	<style name="ApolloTheme.ActionBar.TitleTextStyle" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Title">
 		<item name="android:textColor">@color/actionbar_text</item>
 	</style>
-
-    <!-- Translucent dialog (for @PlayExternal) -->
-    <style name="Theme.Light.Translucent" parent="android:style/Theme.Light.NoTitleBar">
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowIsFloating">true</item>
-        <item name="android:backgroundDimEnabled">false</item>
-    </style>
-    <style name="Theme.Light.Translucent.Dialog" parent="@android:style/Theme.Holo.Light.Dialog">
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:windowContentOverlay">@null</item>
-    </style>
-
-    <!-- Custom tabs -->
-    <style name="Tabs">
+    <!--  Tabs Styles -->
+    <style name="TabsLayout">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">@dimen/tab_height</item>
         <item name="android:background">@drawable/tab</item>
@@ -40,33 +26,297 @@
         <item name="android:paddingLeft">@dimen/tab_padding_left_right</item>
         <item name="android:paddingRight">@dimen/tab_padding_left_right</item>
         <item name="android:paddingTop">@dimen/tab_padding_top_bottom</item>
-        <item name="android:textColor">@color/tab_text_color</item>
-        <item name="android:textSize">@dimen/text_size_micro</item>
-        <item name="android:textStyle">bold</item>
         <item name="android:focusable">true</item>
         <item name="android:focusableInTouchMode">false</item>
         <item name="android:selectAllOnFocus">false</item>
+    </style>    
+    <!-- BottomActionBar Styles-->
+    <style name="BottomActionBarLayout">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
+	    <item name="android:paddingLeft">@dimen/bottom_action_bar_padding_left</item>
+	    <item name="android:paddingRight">@dimen/bottom_action_bar_padding_left</item>
+        <item name="android:orientation">horizontal</item>
     </style>
-
-    <!-- ImageButton in the bottom bar -->
-    <style name="BottomActionBarItem">
+    <style name="BottomActionBarWrapperLayout">        
+    	<item name="android:layout_width">match_parent</item>
+    	<item name="android:layout_height">@dimen/bottom_action_bar_height</item>
+    	<item name="android:layout_gravity">bottom</item>
+    	<item name="android:orientation">vertical</item> 
+    </style>
+    <style name="BottomActionBarItemLayout">
         <item name="android:layout_width">@dimen/bottom_action_bar_item_width</item>
         <item name="android:layout_height">match_parent</item>
         <item name="android:paddingLeft">@dimen/bottom_action_bar_item_padding_left_right</item>
         <item name="android:paddingRight">@dimen/bottom_action_bar_item_padding_left_right</item>
-        <item name="android:background">@drawable/holo_selector</item>
     </style>
-
-    <!-- TextView in the bottom bar -->
-    <style name="BottomActionBarText">
+    <style name="BottomActionBarTextLayout">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:ellipsize">end</item>
         <item name="android:singleLine">true</item>
         <item name="android:paddingTop">3dp</item>
-        <item name="android:textSize">@dimen/text_size_extra_micro</item>
+	    <item name="android:paddingLeft">@dimen/bottom_action_bar_padding_left</item>
+	    <item name="android:textSize">@dimen/text_size_micro</item>
         <item name="android:textAllCaps">true</item>
     </style>
+    <style name="BottomActionBarDividerLayout">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">@dimen/bottom_action_bar_divider_height</item>
+    </style> 	
+    <!-- AudioPlayer Styles -->
+    <style name="AudioPlayerTextLayout">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:ellipsize">marquee</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:focusable">true</item>
+        <item name="android:focusableInTouchMode">true</item>
+        <item name="android:lineSpacingMultiplier">1.2</item>
+        <item name="android:scrollHorizontally">false</item>
+    </style>
+    <style name="AudioPlayerAlbumArtistTextLayout" parent="AudioPlayerTextLayout">        
+        <item name="android:layout_width">70dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_alignParentLeft">true</item>
+        <item name="android:layout_marginTop">0dp</item>
+    </style>
+    <style name="AudioPlayerInfoTextLayout" parent="AudioPlayerTextLayout">  
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginTop">0dp</item>
+        <item name="android:ellipsize">end</item>
+        <item name="android:maxLength">21</item>
+        <item name="android:singleLine">true</item>
+    </style>
+    <style name="AudioPlayerViewMoreLayout" parent="GridviewShadowedText">  
+        <item name="android:layout_alignParentRight">true</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginRight">15dp</item>
+        <item name="android:layout_marginTop">3dp</item>
+	    <item name="android:padding">@dimen/half_and_half_imagebutton_padding</item>
+    </style>    
+    <style name="AudioPlayerButtonLayout">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:layout_weight">1</item>
+    </style>
+    <style name="AudioPlayerTimeTextLayout" parent="AudioPlayerTextLayout">
+        <item name="android:layout_alignBottom">@android:id/progress</item>
+        <item name="android:layout_alignTop">@android:id/progress</item>
+        <item name="android:gravity">center</item>
+    </style>    
+    <style name="AudioPlayerNowPlayingTextLayout">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:paddingTop">@dimen/audio_player_nowplaying_padding_top_bottom</item>
+        <item name="android:paddingBottom">@dimen/audio_player_nowplaying_padding_top_bottom</item>
+        <item name="android:paddingLeft">@dimen/audio_player_nowplaying_padding_left</item>
+        <item name="android:layout_alignBottom">@+id/now_playing_viewpager</item>
+        <item name="android:text">@string/nowplaying</item>
+    </style>    
+    <style name="AudioPlayerQueueBGLayout">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">0dp</item>
+        <item name="android:layout_weight">1</item>
+    </style>
+    <style name="AudioPlayerColorstripLayout">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">@dimen/colorstrip_height</item>
+    </style>
+    <style name="AudioPlayerSeekLayout" parent="android:attr/progressBarStyleHorizontal">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_toLeftOf">@+id/audio_player_total_time</item>
+        <item name="android:layout_toRightOf">@+id/audio_player_current_time</item>
+        <item name="android:paddingTop">@dimen/audio_player_seek_bar_padding</item>
+        <item name="android:thumb">@null</item>
+    </style>
+    <!-- Context Menu Styles -->
+    <style name="ContextMenuLineLayout">
+        <item name="android:layout_width">@dimen/quick_context_line_width</item>
+        <item name="android:layout_height">@dimen/quick_context_line_height</item>
+        <item name="android:layout_gravity">center|left</item>
+    </style>
+    <style name="ContextMenuArrowLayout">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:layout_gravity">center</item>
+        <item name="android:layout_marginRight">@dimen/quick_context_margin_right</item>
+        <item name="android:scaleType">centerInside</item>
+    </style>
+    <!--  Listview Items -->    
+    <style name="ListviewItemWrapperLayout">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">@dimen/listview_item_height</item>
+        <item name="android:paddingTop">@dimen/listview_items_padding_top_bottom</item> 
+        <item name="android:paddingBottom">@dimen/listview_items_padding_top_bottom</item> 
+        <item name="android:layout_gravity">center_vertical</item>
+    </style>   
+    <style name="ListviewItemArtLayout">
+        <item name="android:layout_width">@dimen/listview_album_art</item>
+        <item name="android:layout_height">@dimen/listview_album_art</item>
+        <item name="android:layout_alignParentLeft">true</item> 
+        <item name="android:layout_margin">@dimen/listview_album_margin</item> 
+        <item name="android:scaleType">centerCrop</item> 
+    </style>
+    
+    
+    
+	<!-- 
+		// GENERAL THEME STYLES
+	-->	
+	
+	
+	
+	
+	
+	
+	
+    <!--  *************************************************************** -->
+    
+    
+    
+    
+    
+    
+    
+    
+	<!-- 
+		LIGHT THEME STYLES
+	-->	
+	
+    <!-- Tabs -->
+    <style name="Tabs_Light" parent="TabsLayout">
+        <item name="android:textColor">@color/tab_text_color</item>
+        <item name="android:textSize">@dimen/text_size_micro</item>
+        <item name="android:textStyle">bold</item>
+    </style> 
+    
+	<!-- BottomActionBar -->  
+	<style name="BottomActionBar_Light" parent="BottomActionBarLayout">
+        <item name="android:background">@drawable/holo_selector</item>
+	</style>
+    <style name="BottomActionBarWrapper_Light" parent="BottomActionBarWrapperLayout"></style>
+    <style name="BottomActionBarItem_Light" parent="BottomActionBarItemLayout">
+		<item name="android:background">@drawable/holo_selector</item>
+	</style>    
+    <style name="BottomActionBarText_Light" parent="BottomActionBarTextLayout">
+	    <item name="android:textColor">@color/transparent_black</item>
+    </style>    
+    <style name="BottomActionBarFavorites_Light" parent="BottomActionBarItem_Light">
+        <item name="android:contentDescription">@string/cd_favorite</item>
+        <item name="android:src">@drawable/apollo_holo_light_favorite_normal</item>
+    </style>
+    <style name="BottomActionBarPrevious_Light" parent="BottomActionBarItem_Light">
+        <item name="android:contentDescription">@string/cd_previous</item>
+        <item name="android:src">@drawable/apollo_holo_light_previous</item>
+    </style>
+    <style name="BottomActionBarPlay_Light" parent="BottomActionBarItem_Light">
+        <item name="android:contentDescription">@string/cd_play</item>
+        <item name="android:src">@drawable/apollo_holo_light_play</item>
+    </style>
+    <style name="BottomActionBarNext_Light" parent="BottomActionBarItem_Light">
+        <item name="android:contentDescription">@string/cd_next</item>
+        <item name="android:src">@drawable/apollo_holo_light_next</item>
+    </style>
+    <style name="BottomActionBarNowQueue_Light" parent="BottomActionBarItem_Light">
+        <item name="android:contentDescription">@string/cd_show_queue</item>
+        <item name="android:src">@drawable/btn_switch_queue</item>
+    </style>
+    <style name="BottomActionBarDivider_Light" parent="BottomActionBarDividerLayout">
+        <item name="android:background">@color/holo_blue_dark</item>
+    </style>    
+    
+    <!-- AudioPlayer Styles -->
+    <style name="AudioPlayerText_Light" parent="AudioPlayerTextLayout"></style>
+    <style name="AudioPlayerAlbumArtistText_Light" parent="AudioPlayerAlbumArtistTextLayout">
+        <item name="android:textColor">@color/transparent_black</item>
+        <item name="android:textSize">@dimen/text_size_small</item>
+        <item name="android:textStyle">bold</item>
+    </style>    
+    <style name="AudioPlayerInfoText_Light" parent="AudioPlayerInfoTextLayout">
+        <item name="android:textColor">@color/transparent_black</item>
+        <item name="android:textSize">@dimen/text_size_small</item>
+    </style>    
+    <style name="AudioPlayerViewMore_Light" parent="AudioPlayerViewMoreLayout"> 
+        <item name="android:src">@drawable/view_more_now</item>
+        <item name="android:background">@drawable/holo_selector</item>
+    </style>    
+    <style name="AudioPlayerButton_Light" parent="AudioPlayerButtonLayout">
+        <item name="android:background">@drawable/holo_selector</item>
+    </style>
+    <style name="AudioPlayerTimeText_Light" parent="AudioPlayerTimeTextLayout">
+        <item name="android:textColor">@color/transparent_black</item>
+        <item name="android:textSize">@dimen/text_size_small</item>
+    </style>
+    <style name="AudioPlayerNowPlayingText_Light" parent="AudioPlayerNowPlayingTextLayout">        
+        <item name="android:background">@drawable/transparent_black</item>
+		<item name="android:textColor">@color/white</item>
+		<item name="android:textSize">@dimen/text_size_medium</item>
+    </style>    
+    <style name="AudioPlayerQueueBG_Light" parent="AudioPlayerQueueBGLayout">
+        <item name="android:background">@color/background_grey</item>
+    </style>
+    <style name="AudioPlayerColorstrip_Light" parent="AudioPlayerColorstripLayout">
+        <item name="android:background">@color/holo_blue_dark</item>
+    </style>
+    <style name="AudioPlayerColorstripShadow_Light" parent="AudioPlayerColorstripLayout">
+        <item name="android:background">@drawable/colorstrip_shadow</item>
+    </style>    
+    <style name="AudioPlayerPrevious_Light" parent="AudioPlayerButton_Light">
+        <item name="android:contentDescription">@string/cd_previous</item>
+        <item name="android:src">@drawable/apollo_holo_light_previous</item> 
+    </style>
+    <style name="AudioPlayerPlay_Light" parent="AudioPlayerButton_Light">
+        <item name="android:contentDescription">@string/cd_play</item>
+        <item name="android:src">@drawable/apollo_holo_light_pause</item> 
+    </style>
+    <style name="AudioPlayerNext_Light" parent="AudioPlayerButton_Light">
+        <item name="android:contentDescription">@string/cd_next</item>
+        <item name="android:src">@drawable/apollo_holo_light_next</item> 
+    </style>
+    <style name="AudioPlayerRepeat_Light" parent="AudioPlayerButton_Light">
+        <item name="android:contentDescription">@string/cd_repeat</item>
+        <item name="android:src">@drawable/apollo_holo_light_repeat_normal</item> 
+    </style>
+    <style name="AudioPlayerShuffle_Light" parent="AudioPlayerButton_Light">
+        <item name="android:contentDescription">@string/cd_shuffle</item>
+        <item name="android:src">@drawable/apollo_holo_light_shuffle_normal</item> 
+    </style>
+    <style name="AudioPlayerSeek_Light" parent="AudioPlayerSeekLayout">  
+        <item name="android:progressDrawable">@drawable/audio_player_seekbar</item>
+    </style>
+    
+    <!-- Context Menu Styles -->
+    <style name="ContextMenuLine_Light" parent="ContextMenuLineLayout">
+        <item name="android:background">@color/transparent_black</item>
+    </style>
+    <style name="ContextMenuArrow_Light" parent="ContextMenuArrowLayout">
+        <item name="android:src">@drawable/dropdown_ic_arrow_normal_holo_light</item>
+    </style>
+    
+    <!--  Listview Items -->    
+    <style name="ListviewItemWrapper_Light" parent="ListviewItemWrapperLayout">
+        <item name="android:background">@drawable/listview_item_background</item>
+    </style>
+    <style name="ListviewItemArt_Light" parent="ListviewItemArtLayout">
+        <item name="android:background">@drawable/no_art_small</item>
+    </style>
+    
+	<!-- 
+		// LIGHT THEME STYLES
+	-->	
+    
+    
+    
+    
+    
+    
+    
+
+   
 
     <!-- List separator with a blue underline -->
     <style name="SeparatorTextViewStyle">
@@ -139,7 +389,7 @@
         <item name="android:shadowColor">@color/white</item>
         <item name="android:shadowRadius">1</item>
         <item name="android:textColor">@color/white</item>
-        <item name="android:textSize">@dimen/text_size_medium</item>
+        <item name="android:textSize">@dimen/text_size_small</item>
     </style>
 
     <!-- Now playing indicator -->
@@ -149,20 +399,9 @@
         <item name="android:layout_alignParentRight">true</item>
     </style>
 
-    <!-- TextView in the audio player -->
-    <style name="AudioPlayerText">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:ellipsize">marquee</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:focusable">true</item>
-        <item name="android:focusableInTouchMode">true</item>
-        <item name="android:lineSpacingMultiplier">1.2</item>
-        <item name="android:scrollHorizontally">true</item>
-    </style>
     
     <!--  TextView with drop-shadow and white text -->
-    <style name="ShadowedText" parent="AudioPlayerText">        
+    <style name="ShadowedText" parent="AudioPlayerTextLayout">        
 	    <item name="android:shadowColor">#000000</item>
 	    <item name="android:shadowDx">1</item>
 	    <item name="android:shadowDy">1</item>
@@ -177,21 +416,6 @@
 	    <item name="android:shadowRadius">1.5</item> 
     </style>
 
-    <!--  Black top border  -->
-    <style name="Topborderline"> 
-	    <item name="android:layout_width">match_parent</item>
-	    <item name="android:layout_height">2dp</item>
-	    <item name="android:background">@color/black</item>
-    </style>
-    
-    <!-- ImageButton in the audio player controls -->
-    <style name="AudioPlayerButton">
-        <item name="android:layout_width">0dp</item>
-        <item name="android:layout_height">match_parent</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:background">@drawable/holo_selector</item>
-    </style>
-
     <!-- QuickQueue -->
     <style name="Theme.QuickQueue" parent="@android:style/Theme.Holo.Light">
         <item name="android:windowBackground">@color/transparent</item>
@@ -234,4 +458,24 @@
         <item name="android:src">@drawable/apollo_holo_light_overflow</item>
     </style>
     
+    
+    
+    
+    <!-- Translucent dialog (for @PlayExternal) -->
+    <style name="Light.Translucent" parent="android:style/Theme.Light.NoTitleBar">
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:backgroundDimEnabled">false</item>
+    </style>
+    <style name="Light.Translucent.Dialog" parent="@android:style/Theme.Holo.Light.Dialog">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowContentOverlay">@null</item>
+    </style>
+    
+    
+    
+    
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
new file mode 100644
index 0000000..7bd6305
--- /dev/null
+++ b/res/values/themes.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    
+    <style name="ApolloTheme.Light" parent="@android:style/Theme.Holo.Light">
+        <item name="android:actionBarStyle">@style/ApolloTheme.BlueActionBar</item>
+    	<item name="android:actionOverflowButtonStyle">@style/ApolloTheme.OverFlow</item>
+    	
+    	<item name="Tabs">@style/Tabs_Light</item>
+    	
+    	<item name="BottomActionBarItem">@style/BottomActionBarItem_Light</item>
+    	<item name="BottomActionBarText">@style/BottomActionBarText_Light</item>
+    	<item name="BottomActionBarDivider">@style/BottomActionBarDivider_Light</item>
+    	<item name="BottomActionBar">@style/BottomActionBar_Light</item>
+    	<item name="BottomActionBarWrapper">@style/BottomActionBarWrapper_Light</item>
+    	<item name="BottomActionBarFavorites">@style/BottomActionBarFavorites_Light</item>
+    	<item name="BottomActionBarPrevious">@style/BottomActionBarPrevious_Light</item>
+    	<item name="BottomActionBarPlay">@style/BottomActionBarPlay_Light</item>
+    	<item name="BottomActionBarNext">@style/BottomActionBarNext_Light</item>
+    	<item name="BottomActionBarNowQueue">@style/BottomActionBarNowQueue_Light</item>
+    	
+    	<item name="AudioPlayerText">@style/AudioPlayerText_Light</item>
+    	<item name="AudioPlayerArtistAlbumText">@style/AudioPlayerAlbumArtistText_Light</item>
+    	<item name="AudioPlayerInfoText">@style/AudioPlayerInfoText_Light</item>
+    	<item name="AudioPlayerViewMore">@style/AudioPlayerViewMore_Light</item>
+    	<item name="AudioPlayerButton">@style/AudioPlayerButton_Light</item>
+    	<item name="AudioPlayerTimeText">@style/AudioPlayerTimeText_Light</item>
+    	<item name="AudioPlayerNowPlayingText">@style/AudioPlayerNowPlayingText_Light</item>
+    	<item name="AudioPlayerQueueBG">@style/AudioPlayerQueueBG_Light</item>
+    	<item name="AudioPlayerColorstrip">@style/AudioPlayerColorstrip_Light</item>
+    	<item name="AudioPlayerColorstripShadow">@style/AudioPlayerColorstripShadow_Light</item>
+    	<item name="AudioPlayerPrevious">@style/AudioPlayerPrevious_Light</item>
+    	<item name="AudioPlayerPlay">@style/AudioPlayerPrevious_Light</item>
+    	<item name="AudioPlayerNext">@style/AudioPlayerNext_Light</item>
+    	<item name="AudioPlayerRepeat">@style/AudioPlayerRepeat_Light</item>
+    	<item name="AudioPlayerShuffle">@style/AudioPlayerShuffle_Light</item>
+    	<item name="AudioPlayerSeek">@style/AudioPlayerSeek_Light</item>
+    	
+    	<item name="ContextMenuLine">@style/ContextMenuLine_Light</item>
+    	<item name="ContextMenuArrow">@style/ContextMenuArrow_Light</item>
+    	
+    	<item name="ListviewItemWrapper">@style/ListviewItemWrapper_Light</item>
+    	<item name="ListviewItemArt">@style/ListviewItemArt_Light</item>
+    </style>
+    
+</resources>
diff --git a/src/com/andrew/apolloMod/activities/PlayExternal.java b/src/com/andrew/apolloMod/activities/PlayExternal.java
index 6d1e376..74e3ff0 100644
--- a/src/com/andrew/apolloMod/activities/PlayExternal.java
+++ b/src/com/andrew/apolloMod/activities/PlayExternal.java
@@ -106,7 +106,7 @@ private void play(Uri uri) {
             else {
                 // Show a dialog asking the user for play or queue the song
                 AlertDialog.Builder builder =
-                        new AlertDialog.Builder(this, R.style.Theme_Light_Translucent_Dialog);
+                        new AlertDialog.Builder(this, R.style.Light_Translucent_Dialog);
                 builder.setTitle(R.string.app_name);
                 builder.setMessage(getString(R.string.play_external_question_msg, name));
 
diff --git a/src/com/andrew/apolloMod/ui/adapters/list/RecentlyAddedAdapter.java b/src/com/andrew/apolloMod/ui/adapters/list/RecentlyAddedAdapter.java
index 1157b59..3b5f081 100644
--- a/src/com/andrew/apolloMod/ui/adapters/list/RecentlyAddedAdapter.java
+++ b/src/com/andrew/apolloMod/ui/adapters/list/RecentlyAddedAdapter.java
@@ -7,10 +7,10 @@
 import android.provider.MediaStore.MediaColumns;
 import android.provider.MediaStore.Audio.AudioColumns;
 import com.andrew.apolloMod.helpers.utils.MusicUtils;
-import com.andrew.apolloMod.ui.adapters.base.ListViewAdapter;
+import com.andrew.apolloMod.ui.adapters.base.GridViewAdapter;
 import static com.andrew.apolloMod.Constants.TYPE_ALBUM;
 
-public class RecentlyAddedAdapter extends ListViewAdapter {
+public class RecentlyAddedAdapter extends GridViewAdapter {
 
     public RecentlyAddedAdapter(Context context, int layout, Cursor c, String[] from, int[] to,
             int flags) {
@@ -28,8 +28,6 @@ public void setupViewData( Cursor mCursor ){
         
         mPlayingId = MusicUtils.getCurrentAudioId();
         mCurrentId = mCursor.getLong(mCursor.getColumnIndexOrThrow(BaseColumns._ID));
-
-        mListType = TYPE_ALBUM;
-    	showContextEnabled = false;    	
+        mGridType = TYPE_ALBUM;
     }
 }
diff --git a/src/com/andrew/apolloMod/ui/fragments/AudioPlayerFragment.java b/src/com/andrew/apolloMod/ui/fragments/AudioPlayerFragment.java
index 27cd611..641545d 100644
--- a/src/com/andrew/apolloMod/ui/fragments/AudioPlayerFragment.java
+++ b/src/com/andrew/apolloMod/ui/fragments/AudioPlayerFragment.java
@@ -1,6 +1,10 @@
 
 package com.andrew.apolloMod.ui.fragments;
 
+import static com.andrew.apolloMod.Constants.ARTIST_ID;
+import static com.andrew.apolloMod.Constants.ARTIST_KEY;
+import static com.andrew.apolloMod.Constants.MIME_TYPE;
+import static com.andrew.apolloMod.Constants.NUMALBUMS;
 import static com.andrew.apolloMod.Constants.SIZE_NORMAL;
 import static com.andrew.apolloMod.Constants.SRC_FIRST_AVAILABLE;
 import static com.andrew.apolloMod.Constants.TYPE_ALBUM;
@@ -9,11 +13,17 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.database.Cursor;
+import android.database.DatabaseUtils;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.os.RemoteException;
 import android.os.SystemClock;
+import android.provider.BaseColumns;
+import android.provider.MediaStore.Audio;
+import android.provider.MediaStore.Audio.ArtistColumns;
 import android.support.v4.app.Fragment;
 import android.support.v4.view.ViewPager;
 import android.support.v4.view.ViewPager.SimpleOnPageChangeListener;
@@ -28,6 +38,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 import com.andrew.apolloMod.R;
+import com.andrew.apolloMod.activities.TracksBrowser;
 import com.andrew.apolloMod.cache.ImageInfo;
 import com.andrew.apolloMod.cache.ImageProvider;
 import com.andrew.apolloMod.helpers.utils.ApolloUtils;
@@ -41,14 +52,14 @@
 public class AudioPlayerFragment extends Fragment {
 
     // Total and current time
-    private TextView mTotalTime, mCurrentTime;
+    private TextView mTotalTime, mCurrentTime, mAlbum, mArtist;
 
     // Album art
     private ViewPager mAlbumArtPager;
 
     private AlbumArtPagerAdapter mPagerAdapter;
     // Controls
-    private ImageButton mRepeat, mPlay, mShuffle;
+    private ImageButton mRepeat, mPlay, mShuffle, mViewArtist;
 
     private RepeatingImageButton mPrev, mNext;
 
@@ -71,10 +82,53 @@ public class AudioPlayerFragment extends Fragment {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         root = inflater.inflate(R.layout.audio_player, container, false);
-        
+
         mTotalTime = (TextView)root.findViewById(R.id.audio_player_total_time);
         mCurrentTime = (TextView)root.findViewById(R.id.audio_player_current_time);
 
+        mAlbum = (TextView)root.findViewById(R.id.audio_player_album);
+        mArtist = (TextView)root.findViewById(R.id.audio_player_artist);
+        
+        mViewArtist = (ImageButton)root.findViewById(R.id.view_more);
+
+        mViewArtist.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                String artistName = MusicUtils.getArtistName();
+                String artistId = String.valueOf(MusicUtils.getCurrentArtistId());
+                Bundle bundle = new Bundle();
+                bundle.putString(MIME_TYPE, Audio.Artists.CONTENT_TYPE);
+                bundle.putString(ARTIST_KEY, artistName);
+                String[] projection = {
+                        BaseColumns._ID, ArtistColumns.ARTIST, ArtistColumns.NUMBER_OF_ALBUMS
+                };
+                Uri uri = Audio.Artists.EXTERNAL_CONTENT_URI;   
+                Cursor cursor = null;
+                try{
+                	cursor = getActivity().getContentResolver().query(uri, projection, BaseColumns._ID+ "=" + DatabaseUtils.sqlEscapeString(artistId), null, null);
+                }
+                catch(Exception e){
+                	e.printStackTrace();        	
+                }
+                String artistNumAlbums = null;
+                int mArtistNumAlbumsIndex = cursor.getColumnIndexOrThrow(ArtistColumns.NUMBER_OF_ALBUMS);
+                if(cursor.getCount()>0){
+        	    	cursor.moveToFirst();
+        	    	artistNumAlbums = cursor.getString(mArtistNumAlbumsIndex);	
+        			cursor.close();
+                }
+                bundle.putString(NUMALBUMS, artistNumAlbums);
+                ApolloUtils.setArtistId(artistName, Long.parseLong(artistId), ARTIST_ID, getActivity());   
+
+                bundle.putLong( BaseColumns._ID, Long.parseLong(artistId) );
+                Intent intent = new Intent(Intent.ACTION_VIEW);
+                intent.setClass(getActivity(), TracksBrowser.class);
+                intent.putExtras(bundle);
+                getActivity().startActivity(intent);
+            }
+        });
+        
+
         mRepeat = (ImageButton)root.findViewById(R.id.audio_player_repeat);
         mPrev = (RepeatingImageButton)root.findViewById(R.id.audio_player_prev);
         mPlay = (ImageButton)root.findViewById(R.id.audio_player_play);
@@ -584,6 +638,9 @@ private void updateMusicInfo() {
         mDuration = MusicUtils.getDuration();
         mTotalTime.setText(MusicUtils.makeTimeString(getActivity(), mDuration / 1000));
 
+        mAlbum.setText(albumName);
+        mArtist.setText(artistName);
+        
         ImageInfo mInfo = new ImageInfo();
         mInfo.type = TYPE_ALBUM;
         mInfo.size = SIZE_NORMAL;
diff --git a/src/com/andrew/apolloMod/ui/fragments/BottomActionBarFragment.java b/src/com/andrew/apolloMod/ui/fragments/BottomActionBarFragment.java
index 75213f8..57d5a5e 100644
--- a/src/com/andrew/apolloMod/ui/fragments/BottomActionBarFragment.java
+++ b/src/com/andrew/apolloMod/ui/fragments/BottomActionBarFragment.java
@@ -16,7 +16,10 @@
 import android.view.View.OnClickListener;
 import android.view.animation.AnimationUtils;
 import android.widget.ImageButton;
+import android.widget.ImageView;
 import android.widget.RelativeLayout;
+import android.widget.TextView;
+
 import com.andrew.apolloMod.R;
 import com.andrew.apolloMod.helpers.utils.MusicUtils;
 import com.andrew.apolloMod.service.ApolloService;
@@ -25,18 +28,37 @@
 
 public class BottomActionBarFragment extends Fragment {
 
-	private ImageButton mPrev, mPlay, mNext, mQueue;
+	private ImageButton mPrev, mPlay, mNext, mQueue, mFavs;
+	private ImageView mAlbumImage;
     private BottomActionBar mBottomActionBar;
     private RelativeLayout albumArt, listQueue;
+    private TextView mSongName, mSongNameOnly, mArtistName;
     
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
     	View root = inflater.inflate(R.layout.bottom_action_bar, container);
         mBottomActionBar = new BottomActionBar(getActivity());
-        
-        
+        mAlbumImage = (ImageView)root.findViewById(R.id.bottom_action_bar_album_art);
+
+        mSongName = (TextView)root.findViewById(R.id.bottom_action_bar_track_name);
+        mSongNameOnly = (TextView)root.findViewById(R.id.bottom_action_bar_track_name_only);
+        mArtistName = (TextView)root.findViewById(R.id.bottom_action_bar_artist_name);
+
         mQueue = (ImageButton)root.findViewById(R.id.bottom_action_bar_switch_queue);
-        
+
+        mFavs = (ImageButton)root.findViewById(R.id.bottom_action_bar_favorites);
+        mFavs.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+            	MusicUtils.toggleFavorite();
+            	if(MusicUtils.isFavorite(getActivity(), MusicUtils.getCurrentAudioId())){
+            		mFavs.setImageResource(R.drawable.apollo_holo_light_favorite_selected);
+            	}
+            	else{
+            		mFavs.setImageResource(R.drawable.apollo_holo_light_favorite_normal);
+            	}
+            }
+        });
         
         
         mPrev = (ImageButton)root.findViewById(R.id.bottom_action_bar_previous);
@@ -129,19 +151,23 @@ private void doPauseResume() {
         }
     }
 
-    public void onCollapsed(){
-    	mPrev.setVisibility(View.VISIBLE);
-    	mNext.setVisibility(View.VISIBLE);
-    	mPlay.setVisibility(View.VISIBLE);
-    	
+    public void onCollapsed(){    	
     	mQueue.setImageResource(R.drawable.btn_switch_queue);
     	mQueue.setVisibility(View.GONE);
-        
+    	mFavs.setVisibility(View.GONE);        
         listQueue.setVisibility(View.GONE);
+        
+    	mPrev.setVisibility(View.VISIBLE);
+    	mNext.setVisibility(View.VISIBLE);
+    	mPlay.setVisibility(View.VISIBLE);
+    	mAlbumImage.setVisibility(View.VISIBLE);
         albumArt.setVisibility(View.VISIBLE);
+        
+        mSongName.setVisibility(View.VISIBLE);
+        mArtistName.setVisibility(View.VISIBLE);
+        mSongNameOnly.setVisibility(View.GONE);
 
         fade(listQueue, 0f);
-        // Fade in the album art
         fade(albumArt, 1f);
     }
     
@@ -149,7 +175,14 @@ public void onExpanded(){
     	mPrev.setVisibility(View.GONE);
     	mNext.setVisibility(View.GONE);
     	mPlay.setVisibility(View.GONE);
+    	
+    	mAlbumImage.setVisibility(View.GONE);
     	mQueue.setVisibility(View.VISIBLE);
+    	mFavs.setVisibility(View.VISIBLE);
+    	
+        mSongName.setVisibility(View.GONE);
+        mArtistName.setVisibility(View.GONE);
+        mSongNameOnly.setVisibility(View.VISIBLE);
     }
     
     /**
diff --git a/src/com/andrew/apolloMod/ui/fragments/base/GridViewFragment.java b/src/com/andrew/apolloMod/ui/fragments/base/GridViewFragment.java
index 3ebded7..d643ace 100644
--- a/src/com/andrew/apolloMod/ui/fragments/base/GridViewFragment.java
+++ b/src/com/andrew/apolloMod/ui/fragments/base/GridViewFragment.java
@@ -48,7 +48,7 @@ public abstract class GridViewFragment extends Fragment implements LoaderCallbac
     
     protected int mFragmentGroupId = 0;
 
-    protected String mCurrentId, mSortOrder = null, mType = null;
+    protected String mCurrentId, mSortOrder = null, mType = null, mWhere = null;
     
     protected String[] mProjection = null;
     
@@ -86,14 +86,16 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
 
     @Override
     public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
-        menu.add(mFragmentGroupId, PLAY_SELECTION, 0, getResources().getString(R.string.play_all));
-        menu.add(mFragmentGroupId, ADD_TO_PLAYLIST, 0, getResources().getString(R.string.add_to_playlist));
-        menu.add(mFragmentGroupId, SEARCH, 0, getResources().getString(R.string.search));
+    	if( mFragmentGroupId != 0 ){
+    	    menu.add(mFragmentGroupId, PLAY_SELECTION, 0, getResources().getString(R.string.play_all));
+    	    menu.add(mFragmentGroupId, ADD_TO_PLAYLIST, 0, getResources().getString(R.string.add_to_playlist));
+    	    menu.add(mFragmentGroupId, SEARCH, 0, getResources().getString(R.string.search));
 
-        mCurrentId = mCursor.getString(mCursor.getColumnIndexOrThrow(BaseColumns._ID));
+    	    mCurrentId = mCursor.getString(mCursor.getColumnIndexOrThrow(BaseColumns._ID));
 
-        menu.setHeaderView(ApolloUtils.setHeaderLayout(mType, mCursor, getActivity()));
-        super.onCreateContextMenu(menu, v, menuInfo);
+    	    menu.setHeaderView(ApolloUtils.setHeaderLayout(mType, mCursor, getActivity()));
+    	    super.onCreateContextMenu(menu, v, menuInfo);
+    	}
     }
 
     @Override
@@ -130,7 +132,7 @@ public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
 
 	@Override
 	public Loader<Cursor> onCreateLoader(int arg0, Bundle arg1) {
-	     return new CursorLoader(getActivity(), mUri, mProjection, null, null, mSortOrder);
+	     return new CursorLoader(getActivity(), mUri, mProjection,  mWhere, null, mSortOrder);
 	}
 
 	@Override
diff --git a/src/com/andrew/apolloMod/ui/fragments/list/RecentlyAddedFragment.java b/src/com/andrew/apolloMod/ui/fragments/list/RecentlyAddedFragment.java
index d268101..532a1e4 100644
--- a/src/com/andrew/apolloMod/ui/fragments/list/RecentlyAddedFragment.java
+++ b/src/com/andrew/apolloMod/ui/fragments/list/RecentlyAddedFragment.java
@@ -2,6 +2,8 @@
 package com.andrew.apolloMod.ui.fragments.list;
 
 import android.support.v4.content.Loader;
+import android.view.View;
+import android.widget.AdapterView;
 import android.database.Cursor;
 import android.os.Bundle;
 import android.provider.BaseColumns;
@@ -12,13 +14,14 @@
 import com.andrew.apolloMod.helpers.AddIdCursorLoader;
 import com.andrew.apolloMod.helpers.utils.MusicUtils;
 import com.andrew.apolloMod.ui.adapters.list.RecentlyAddedAdapter;
-import com.andrew.apolloMod.ui.fragments.base.ListViewFragment;
+import com.andrew.apolloMod.ui.fragments.base.GridViewFragment;
 import static com.andrew.apolloMod.Constants.NUMWEEKS;
+import static com.andrew.apolloMod.Constants.TYPE_ALBUM;
 
-public class RecentlyAddedFragment extends ListViewFragment{
-
+public class RecentlyAddedFragment extends GridViewFragment{
+	
     public void setupFragmentData(){
-        mAdapter = new RecentlyAddedAdapter(getActivity(), R.layout.listview_items,
+        mAdapter = new RecentlyAddedAdapter(getActivity(), R.layout.gridview_items_recent,
                 null, new String[] {}, new int[] {}, 0);
     	mProjection = new String[] {
                 BaseColumns._ID, MediaColumns.TITLE, AudioColumns.ALBUM, AudioColumns.ARTIST
@@ -32,11 +35,16 @@ public void setupFragmentData(){
         mWhere = where.toString();
         mSortOrder = MediaColumns.DATE_ADDED + " DESC";
         mUri = Audio.Media.EXTERNAL_CONTENT_URI;
-        mTitleColumn = MediaColumns.TITLE;       
+        mType = TYPE_ALBUM;
     }
 
     @Override
     public Loader<Cursor> onCreateLoader(int id, Bundle args) {    
         return new AddIdCursorLoader(getActivity(), mUri, mProjection, mWhere, null, mSortOrder);
     }
+
+    @Override
+    public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
+        MusicUtils.playAll(getActivity(), mCursor, position);
+    }
 }
diff --git a/src/com/andrew/apolloMod/ui/widgets/BottomActionBar.java b/src/com/andrew/apolloMod/ui/widgets/BottomActionBar.java
index b9b2a97..0df10df 100644
--- a/src/com/andrew/apolloMod/ui/widgets/BottomActionBar.java
+++ b/src/com/andrew/apolloMod/ui/widgets/BottomActionBar.java
@@ -14,6 +14,7 @@
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.View.OnLongClickListener;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -55,11 +56,24 @@ public void updateBottomActionBar(Activity activity) {
         }
 
         if (MusicUtils.mService != null && MusicUtils.getCurrentAudioId() != -1) {
-
+        	ImageButton mFavs = (ImageButton)bottomActionBar
+        			.findViewById(R.id.bottom_action_bar_favorites);
+        	if(MusicUtils.isFavorite(activity, MusicUtils.getCurrentAudioId())){
+        		mFavs.setImageResource(R.drawable.apollo_holo_light_favorite_selected);
+        	}
+        	else{
+        		mFavs.setImageResource(R.drawable.apollo_holo_light_favorite_normal);
+        	}
+            
             // Track name
             TextView mTrackName = (TextView)bottomActionBar
                     .findViewById(R.id.bottom_action_bar_track_name);
             mTrackName.setText(MusicUtils.getTrackName());
+            
+            // Track name
+            TextView mTrackNameOnly = (TextView)bottomActionBar
+                    .findViewById(R.id.bottom_action_bar_track_name_only);
+            mTrackNameOnly.setText(MusicUtils.getTrackName());
 
             // Artist name
             TextView mArtistName = (TextView)bottomActionBar
diff --git a/src/com/andrew/apolloMod/views/ViewHolderGrid.java b/src/com/andrew/apolloMod/views/ViewHolderGrid.java
index c44cbb1..564056d 100644
--- a/src/com/andrew/apolloMod/views/ViewHolderGrid.java
+++ b/src/com/andrew/apolloMod/views/ViewHolderGrid.java
@@ -31,7 +31,6 @@ public ViewHolderGrid(View view) {
         mPeakOne = (ImageView)view.findViewById(R.id.peak_one);
         mPeakTwo = (ImageView)view.findViewById(R.id.peak_two);
         mInfoHolder = (LinearLayout)view.findViewById(R.id.gridview_info_holder);
-        mInfoHolder.setBackgroundColor(view.getResources().getColor(R.color.transparent_black));
     }
 
 }

From 661b7768ecd9d9e737c90f92871d287dce41fc6c Mon Sep 17 00:00:00 2001
From: Splitter <splitvisionz@gmail.com>
Date: Tue, 25 Mar 2014 21:49:56 -0400
Subject: [PATCH 02/10] Cleaning up layout/theme code part 2

---
 res/layout/dragsort_listview_items.xml |  42 +-----
 res/layout/gridview.xml                |  13 +-
 res/layout/gridview_items.xml          |  24 +---
 res/layout/gridview_items_recent.xml   |  34 +----
 res/layout/library_browser.xml         |   9 +-
 res/layout/listview.xml                |  15 +--
 res/layout/listview_items.xml          |  23 +---
 res/values/attrs.xml                   |  13 ++
 res/values/styles.xml                  | 177 ++++++++++++++++++++++++-
 res/values/themes.xml                  |  16 +++
 10 files changed, 230 insertions(+), 136 deletions(-)

diff --git a/res/layout/dragsort_listview_items.xml b/res/layout/dragsort_listview_items.xml
index 58840b0..97fc965 100644
--- a/res/layout/dragsort_listview_items.xml
+++ b/res/layout/dragsort_listview_items.xml
@@ -1,56 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/listview_item_height"
-    android:paddingTop="@dimen/listview_items_padding_top_bottom" 
-    android:paddingBottom="@dimen/listview_items_padding_top_bottom"
-	android:background="@drawable/listview_item_background" 
-    android:layout_gravity="center_vertical" >
+    style="?ListviewItemWrapper" >
  
     <ImageView
         android:id="@+id/listview_drag_handle"
-        android:layout_width="@dimen/listview_drag_width"
-        android:layout_height="@dimen/listview_drag_height"
-        android:layout_alignParentLeft="true"
-        android:scaleType="center"
-	    android:src="@drawable/btn_drag_sort"/>
+        style="?ListviewDragHandle"/>
  
     <ImageView
         android:id="@+id/listview_item_image"
-        android:layout_width="@dimen/listview_album_art"
-        android:layout_height="@dimen/listview_album_art"
         android:layout_toRightOf="@+id/listview_drag_handle"
-        android:layout_margin="@dimen/listview_album_margin"
-        android:scaleType="centerCrop" 
-	    android:background="@drawable/no_art_small"/>
+        android:layout_alignParentLeft="false"
+        style="?ListviewItemArt"/>
 
     <!-- Padding may be set on via code for some tabs -->
 
     <TextView
         android:id="@+id/listview_item_line_one"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_toRightOf="@+id/listview_item_image"
-        android:ellipsize="marquee"
-        android:maxLength="29"
-        android:paddingLeft="@dimen/listview_items_padding_left_top"
-        android:paddingRight="@dimen/listview_items_padding_right"
-        android:paddingTop="@dimen/listview_items_padding_top_bottom"
-        android:singleLine="true"
-        android:textSize="@dimen/text_size_medium" />
+        style="?ListviewItemLineOne"/>
 
     <TextView
         android:id="@+id/listview_item_line_two"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/listview_item_line_one"
-        android:layout_toRightOf="@+id/listview_item_image"
-        android:ellipsize="end"
-        android:paddingLeft="@dimen/listview_items_padding_left_top"
-        android:paddingRight="@dimen/listview_items_padding_right"
-        android:paddingTop="@dimen/listview_items_padding_small_top"
-        android:singleLine="true"
-        android:textSize="@dimen/text_size_small" />
+        style="?ListviewItemLineTwo"/>
 
     <include layout="@layout/context_menu" />
 
diff --git a/res/layout/gridview.xml b/res/layout/gridview.xml
index 1003a51..771b003 100644
--- a/res/layout/gridview.xml
+++ b/res/layout/gridview.xml
@@ -8,16 +8,7 @@
     <include layout="@layout/shadow" />
 
     <GridView
-        android:id="@+id/gridview"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-    	android:paddingLeft="@dimen/gridview_item_padding_right_left_outer"
-    	android:paddingRight="@dimen/gridview_item_padding_right_left_outer"
-        android:cacheColorHint="@color/transparent"
-        android:drawSelectorOnTop="true"
-        android:numColumns="@integer/gridview_columns"
-        android:background="@color/background_grey"
-        android:scrollbars="none" />
+        android:id="@+id/gridview" 
+        style="?Gridview"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/gridview_items.xml b/res/layout/gridview_items.xml
index 3ea698e..bc90e00 100644
--- a/res/layout/gridview_items.xml
+++ b/res/layout/gridview_items.xml
@@ -5,17 +5,13 @@
     	android:paddingLeft="@dimen/gridview_item_padding_right_left"
     	android:paddingRight="@dimen/gridview_item_padding_right_left"
     	android:paddingBottom="@dimen/gridview_item_padding_bottom">
+    	
 		<RelativeLayout
-		    android:layout_width="match_parent"
-		    android:layout_height="match_parent"
-			android:background="@drawable/gridview_item_background" >
+		    style="?GridviewItemWrapper">
 		
 		    <com.andrew.apolloMod.views.TrackBrowserImageView
 		        android:id="@+id/gridview_image"
-		        android:layout_width="@dimen/gridview_image_width"
-		        android:layout_height="@dimen/gridview_image_height"
-		        android:scaleType="matrix" 
-			    android:background="@drawable/no_art_small"/>
+		        style="?GridviewItemArt"/>
 		     
 		    <LinearLayout
 				android:id="@+id/gridview_outershell"
@@ -28,22 +24,16 @@
 				
 				<LinearLayout
 			        android:id="@+id/gridview_info_holder"
-			        android:layout_width="match_parent"
-			        android:layout_height="@dimen/gridview_item_ccontainer_height"
-			        android:gravity="center_vertical"
-			        android:orientation="vertical"
-            		android:background="@drawable/transparent_black"
-				    android:paddingLeft="@dimen/gridview_item_ccontainer_padding_left"
-		        	android:paddingRight="@dimen/gridview_item_ccontainer_padding_right" 
-				    >
+            		style="?GridviewItemTextWrapper" >
+            		
 			        <TextView
 			            android:id="@+id/gridview_line_one"
-			            style="@style/GridviewShadowedText"
+			            style="?ShadowedText"
 			            android:textStyle="bold" />
 			
 			        <TextView
 			            android:id="@+id/gridview_line_two"
-			            style="@style/GridviewShadowedText" />
+			            style="?ShadowedText" />
 		        </LinearLayout>
 		    </LinearLayout>
 		
diff --git a/res/layout/gridview_items_recent.xml b/res/layout/gridview_items_recent.xml
index 8f40020..be9ba4c 100644
--- a/res/layout/gridview_items_recent.xml
+++ b/res/layout/gridview_items_recent.xml
@@ -7,47 +7,21 @@
     	android:paddingRight="@dimen/gridview_item_padding_right_left"
     	android:paddingBottom="@dimen/gridview_item_padding_bottom">
 	<RelativeLayout
-	    android:layout_width="match_parent"
-	    android:layout_height="@dimen/gridview_recent_item_height"
-	    android:paddingTop="@dimen/listview_items_padding_top_bottom" 
-	    android:paddingBottom="@dimen/listview_items_padding_top_bottom"
-		android:background="@drawable/listview_item_background" 
-	    android:layout_gravity="center_vertical" >
+	    style="?GridviewRecentsWrapper">
 	 
 	    <com.andrew.apolloMod.views.TrackBrowserImageView
 	        android:id="@+id/gridview_image"
-		    android:layout_width="@dimen/gridview_image_width"
-	        android:layout_height="@dimen/gridview_recent_album_art"
-	        android:layout_alignParentLeft="true"
-	        android:scaleType="matrix" 
-		    android:background="@drawable/no_art_small"/>
+	        style="?GridviewRecentsArt"/>
 	
 	    <!-- Padding may be set on via code for some tabs -->
 	
 	    <TextView
 	        android:id="@+id/gridview_line_one"
-			style="@style/GridviewShadowedText"
-	        android:layout_width="match_parent"
-	        android:layout_height="wrap_content"
-            android:background="@drawable/transparent_black"
-            android:layout_alignBottom="@+id/gridview_image"
-	        android:ellipsize="end"
-	        android:maxLength="49"
-	        android:padding="4dp"
-	        android:singleLine="true"
-			android:textColor="@color/white"
-	        android:textSize="@dimen/text_size_small" />
+			style="?GridviewRecentsShadowedText"/>
 	
 	    <TextView
 	        android:id="@+id/gridview_line_two"
-	        android:layout_width="match_parent"
-	        android:layout_height="wrap_content"
-	        android:layout_below="@+id/gridview_image"
-	        android:ellipsize="end"
-	        android:paddingTop="@dimen/listview_items_padding_small_top"
-	        android:singleLine="true"
-	        android:textColor="@color/light_grey"
-	        android:textSize="@dimen/text_size_micro" />
+	        style="?GridviewRecentsText"/>
 	
 	    <ImageView
 	        android:id="@+id/peak_two"
diff --git a/res/layout/library_browser.xml b/res/layout/library_browser.xml
index b73e9a7..cbb3421 100644
--- a/res/layout/library_browser.xml
+++ b/res/layout/library_browser.xml
@@ -16,20 +16,21 @@
 		    android:paddingTop="?android:attr/actionBarSize"
 		    android:clickable="true"
 			android:focusable="false"
-        	android:background="@color/background_grey"
-			android:focusableInTouchMode="true" >
+			android:focusableInTouchMode="true"
+        	android:background="@color/background_grey" >
 		
 		    <com.andrew.apolloMod.ui.widgets.ScrollableTabView
 		        android:id="@+id/scrollingTabs"
 		        android:layout_width="match_parent"
-        		android:background="@color/white"
-		        android:layout_height="@dimen/tab_height"/>
+		        android:layout_height="@dimen/tab_height"
+        		android:background="@color/white"/>
 		
 		    <android.support.v4.view.ViewPager
 		        android:id="@+id/viewPager"
 		        android:layout_width="match_parent"
 		        android:layout_height="wrap_content"
 		        android:layout_below="@+id/scrollingTabs" />
+		    
 		</LinearLayout>
 	
 	    <LinearLayout
diff --git a/res/layout/listview.xml b/res/layout/listview.xml
index 26d212e..e470ad5 100644
--- a/res/layout/listview.xml
+++ b/res/layout/listview.xml
@@ -11,20 +11,7 @@
     
     <ListView
         android:id="@android:id/list"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:cacheColorHint="@color/transparent"
-        android:drawSelectorOnTop="false"
-        android:fastScrollAlwaysVisible="false"
-        android:fastScrollEnabled="false"
-        android:scrollbars="none"
-        android:listSelector="@drawable/holo_selector"
-        android:background="@color/background_grey"
-  		android:divider="@android:color/transparent"
-  		android:dividerHeight="@dimen/listview_items_padding_top_bottom"
-        android:paddingRight="@dimen/listview_items_padding_top_bottom" 
-        android:paddingLeft="@dimen/listview_items_padding_top_bottom"  />
+        style="?Listview"  />
 
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/listview_items.xml b/res/layout/listview_items.xml
index 1aefeeb..c41c201 100644
--- a/res/layout/listview_items.xml
+++ b/res/layout/listview_items.xml
@@ -10,30 +10,11 @@
 
     <TextView
         android:id="@+id/listview_item_line_one"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_toRightOf="@+id/listview_item_image"
-        android:ellipsize="marquee"
-        android:maxLength="29"
-        android:paddingLeft="@dimen/listview_items_padding_left_top"
-        android:paddingRight="@dimen/listview_items_padding_right"
-        android:paddingTop="9dp"
-        android:singleLine="true"
-        android:textSize="@dimen/text_size_small_medium" />
+        style="?ListviewItemLineOne"/>
 
     <TextView
         android:id="@+id/listview_item_line_two"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/listview_item_line_one"
-        android:layout_toRightOf="@+id/listview_item_image"
-        android:ellipsize="end"
-        android:paddingLeft="@dimen/listview_items_padding_left_top"
-        android:paddingRight="@dimen/listview_items_padding_right"
-        android:paddingTop="@dimen/listview_items_padding_small_top"
-        android:singleLine="true"
-        android:textColor="@color/light_grey"
-        android:textSize="@dimen/text_size_small" />
+        style="?ListviewItemLineTwo"/>
 
     <include layout="@layout/context_menu" />
 
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 548e59a..1e214a3 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -32,5 +32,18 @@
     		<attr name="ContextMenuArrow" format="reference" />
     		<attr name="ListviewItemWrapper" format="reference" />
     		<attr name="ListviewItemArt" format="reference" />
+    		<attr name="ListviewItemLineOne" format="reference" />
+    		<attr name="ListviewItemLineTwo" format="reference" />
+    		<attr name="ListviewDragHandle" format="reference" />
+    		<attr name="Listview" format="reference" />
+    		<attr name="Gridview" format="reference" />
+    		<attr name="GridviewItemWrapper" format="reference" />
+    		<attr name="GridviewItemArt" format="reference" />
+    		<attr name="GridviewItemTextWrapper" format="reference" />
+    		<attr name="GridviewRecentsWrapper" format="reference" />
+    		<attr name="GridviewRecentsArt" format="reference" />
+    		<attr name="GridviewRecentsShadowedText" format="reference" />
+    		<attr name="GridviewRecentsText" format="reference" />
+    		<attr name="ShadowedText" format="reference" />
 		</declare-styleable>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 6159818..e128c9d 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -146,7 +146,7 @@
         <item name="android:layout_marginRight">@dimen/quick_context_margin_right</item>
         <item name="android:scaleType">centerInside</item>
     </style>
-    <!--  Listview Items -->    
+    <!--  Listview Styles -->    
     <style name="ListviewItemWrapperLayout">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">@dimen/listview_item_height</item>
@@ -161,7 +161,123 @@
         <item name="android:layout_margin">@dimen/listview_album_margin</item> 
         <item name="android:scaleType">centerCrop</item> 
     </style>
-    
+    <style name="ListviewItemLineOneLayout">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_toRightOf">@+id/listview_item_image</item>
+        <item name="android:ellipsize">marquee</item>
+        <item name="android:maxLength">29</item>
+        <item name="android:paddingLeft">@dimen/listview_items_padding_left_top</item>
+        <item name="android:paddingRight">@dimen/listview_items_padding_right</item>
+        <item name="android:paddingTop">@dimen/listview_items_padding_left_top</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:textSize">@dimen/text_size_small_medium</item> 
+    </style>    
+    <style name="ListviewItemLineTwoLayout">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:paddingLeft">@dimen/listview_items_padding_left_top</item>
+        <item name="android:paddingRight">@dimen/listview_items_padding_right</item>
+        <item name="android:paddingTop">@dimen/listview_items_padding_small_top</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:layout_below">@+id/listview_item_line_one</item>
+        <item name="android:layout_toRightOf">@+id/listview_item_image</item>
+        <item name="android:ellipsize">end</item>
+        <item name="android:textSize">@dimen/text_size_small</item> 
+    </style> 
+    <style name="ListviewLayout">
+        <item name="android:layout_width">match_parent</item> 
+        <item name="android:layout_height">0dp</item> 
+        <item name="android:layout_weight">1</item> 
+        <item name="android:drawSelectorOnTop">false</item> 
+        <item name="android:fastScrollAlwaysVisible">false</item> 
+        <item name="android:fastScrollEnabled">false</item> 
+        <item name="android:scrollbars">none</item> 
+        <item name="android:dividerHeight">@dimen/listview_items_padding_top_bottom</item> 
+        <item name="android:paddingRight">@dimen/listview_items_padding_top_bottom</item>  
+        <item name="android:paddingLeft">@dimen/listview_items_padding_top_bottom</item> 
+    </style>
+    <!-- Dragsort Listview Styles -->
+    <style name="ListviewDragHandleLayout">
+        <item name="android:layout_width">@dimen/listview_drag_width</item> 
+        <item name="android:layout_height">@dimen/listview_drag_height</item> 
+        <item name="android:layout_alignParentLeft">true</item> 
+        <item name="android:scaleType">center</item> 
+    </style>
+    <!-- Gridview Styles -->    
+    <style name="GridviewLayout">
+        <item name="android:layout_width">match_parent</item> 
+        <item name="android:layout_height">0dp</item> 
+        <item name="android:layout_weight">1</item> 
+        <item name="android:paddingLeft">@dimen/gridview_item_padding_right_left_outer</item> 
+        <item name="android:paddingRight">@dimen/gridview_item_padding_right_left_outer</item> 
+        <item name="android:drawSelectorOnTop">true</item> 
+        <item name="android:numColumns">@integer/gridview_columns</item> 
+        <item name="android:scrollbars">none</item> 
+    </style>
+    <style name="GridviewItemWrapperLayout">
+        <item name="android:layout_width">match_parent</item> 
+        <item name="android:layout_height">match_parent</item>  
+    </style>
+    <style name="GridviewItemArtLayout"> 
+        <item name="android:layout_width">@dimen/gridview_image_width</item>  
+        <item name="android:layout_height">@dimen/gridview_image_height</item>  
+        <item name="android:scaleType">matrix</item> 
+    </style>
+    <style name="GridviewItemTextWrapperLayout">
+        <item name="android:layout_width">match_parent</item> 
+        <item name="android:layout_height">@dimen/gridview_item_ccontainer_height</item> 
+        <item name="android:gravity">center_vertical</item> 
+        <item name="android:orientation">vertical</item> 
+        <item name="android:paddingLeft">@dimen/gridview_item_ccontainer_padding_left</item> 
+        <item name="android:paddingRight">@dimen/gridview_item_ccontainer_padding_right</item>
+    </style>
+    
+    <!-- Recents Gridview Styles -->
+    <style name="GridviewRecentsWrapperLayout">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">@dimen/gridview_recent_item_height</item>
+        <item name="android:paddingTop">@dimen/listview_items_padding_top_bottom</item> 
+        <item name="android:paddingBottom">@dimen/listview_items_padding_top_bottom</item> 
+        <item name="android:layout_gravity">center_vertical</item>
+    </style>
+    <style name="GridviewRecentsArtLayout">
+        <item name="android:layout_width">@dimen/gridview_image_width</item>
+        <item name="android:layout_height">@dimen/gridview_recent_album_art</item>
+        <item name="android:layout_alignParentLeft">true</item>
+        <item name="android:scaleType">matrix</item> 
+    </style>
+    <style name="GridviewRecentsShadowedTextLayout" parent="ShadowedTextLayout">
+        <item name="android:layout_width">match_parent</item> 
+        <item name="android:layout_height">wrap_content</item> 
+        <item name="android:layout_alignBottom">@+id/gridview_image</item> 
+        <item name="android:ellipsize">end</item> 
+        <item name="android:maxLength">49</item> 
+        <item name="android:padding">4dp</item> 
+        <item name="android:singleLine">true</item> 
+        <item name="android:textSize">@dimen/text_size_small</item>
+    </style>
+    <style name="GridviewRecentsTextLayout">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_below">@+id/gridview_image</item>
+        <item name="android:ellipsize">end</item>
+        <item name="android:paddingTop">@dimen/listview_items_padding_small_top</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:textSize">@dimen/text_size_micro</item>        
+    </style>
+        
+    <!-- Shadowed Text Styles-->
+    <style name="ShadowedTextLayout">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:ellipsize">end</item>
+        <item name="android:shadowRadius">1.5</item>
+	    <item name="android:shadowDx">1</item>
+	    <item name="android:shadowDy">1</item>
+        <item name="android:textSize">@dimen/text_size_small</item>
+    </style>
     
     
 	<!-- 
@@ -297,13 +413,68 @@
         <item name="android:src">@drawable/dropdown_ic_arrow_normal_holo_light</item>
     </style>
     
-    <!--  Listview Items -->    
+    <!--  Listview Styles -->    
     <style name="ListviewItemWrapper_Light" parent="ListviewItemWrapperLayout">
         <item name="android:background">@drawable/listview_item_background</item>
     </style>
     <style name="ListviewItemArt_Light" parent="ListviewItemArtLayout">
         <item name="android:background">@drawable/no_art_small</item>
     </style>
+    <style name="ListviewItemLineOne_Light" parent="ListviewItemLineOneLayout">
+        <item name="android:textColor">@color/black</item> 
+    </style>
+    <style name="ListviewItemLineTwo_Light" parent="ListviewItemLineTwoLayout">
+        <item name="android:textColor">@color/light_grey</item>
+    </style>
+    <style name="Listview_Light" parent="ListviewLayout">
+        <item name="android:listSelector">@drawable/holo_selector</item> 
+        <item name="android:background">@color/background_grey</item> 
+        <item name="android:divider">@android:color/transparent</item> 
+        <item name="android:cacheColorHint">@color/transparent</item> 
+    </style>
+  
+    <!-- Dragsort Listview Styles -->
+    <style name="ListviewDragHandle_Light" parent="ListviewDragHandleLayout">
+        <item name="android:src">@drawable/btn_drag_sort</item>
+    </style>
+    
+    <!-- Gridview Styles -->
+    <style name="Gridview_Light" parent="GridviewLayout">
+        <item name="android:background">@color/background_grey</item> 
+        <item name="android:cacheColorHint">@color/transparent</item> 
+    </style>
+    <style name="GridviewItemWrapper_Light" parent="GridviewItemWrapperLayout">
+        <item name="android:background">@drawable/gridview_item_background</item>  
+    </style>
+    <style name="GridviewItemArt_Light" parent="GridviewItemArtLayout"> 
+        <item name="android:background">@drawable/no_art_small</item> 
+    </style>
+    <style name="GridviewItemTextWrapper_Light" parent="GridviewItemTextWrapperLayout">
+        <item name="android:background">@drawable/transparent_black</item>  
+    </style>
+    <!-- Recents Gridview Styles -->
+    <style name="GridviewRecentsWrapper_Light" parent="GridviewRecentsWrapperLayout">
+        <item name="android:background">@drawable/gridview_item_background</item>
+    </style>
+    <style name="GridviewRecentsArt_Light" parent="GridviewRecentsArtLayout">
+        <item name="android:background">@drawable/no_art_small</item>
+    </style>
+    <style name="GridviewRecentsShadowedText_Light" parent="GridviewRecentsShadowedTextLayout"> 
+        <item name="android:shadowColor">@color/black</item>
+        <item name="android:textColor">@color/white</item> 
+        <item name="android:background">@drawable/transparent_black</item>
+    </style>
+    <style name="GridviewRecentsText_Light" parent="GridviewRecentsTextLayout">
+        <item name="android:textColor">@color/light_grey</item>      
+    </style>
+    
+    <!-- Shadowed Text Style-->
+    <style name="ShadowedText_Light" parent="ShadowedTextLayout">
+        <item name="android:shadowColor">@color/black</item>
+        <item name="android:textColor">@color/white</item>
+    </style>
+    
+    
     
 	<!-- 
 		// LIGHT THEME STYLES
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 7bd6305..3d2dc0c 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -40,6 +40,22 @@
     	
     	<item name="ListviewItemWrapper">@style/ListviewItemWrapper_Light</item>
     	<item name="ListviewItemArt">@style/ListviewItemArt_Light</item>
+    	<item name="ListviewItemLineOne">@style/ListviewItemLineOne_Light</item>
+    	<item name="ListviewItemLineTwo">@style/ListviewItemLineTwo_Light</item>
+    	<item name="Listview">@style/Listview_Light</item>
+    	<item name="ListviewDragHandle">@style/ListviewDragHandle_Light</item>
+    	
+    	<item name="Gridview">@style/Gridview_Light</item>
+    	<item name="GridviewItemWrapper">@style/GridviewItemWrapper_Light</item>
+    	<item name="GridviewItemArt">@style/GridviewItemArt_Light</item>
+    	<item name="GridviewItemTextWrapper">@style/GridviewItemTextWrapper_Light</item>
+    	
+    	<item name="GridviewRecentsWrapper">@style/GridviewRecentsWrapper_Light</item>
+    	<item name="GridviewRecentsArt">@style/GridviewRecentsArt_Light</item>
+    	<item name="GridviewRecentsShadowedText">@style/GridviewRecentsShadowedText_Light</item>
+    	<item name="GridviewRecentsText">@style/GridviewRecentsText_Light</item>
+    	
+    	<item name="ShadowedText">@style/ShadowedText_Light</item>
     </style>
     
 </resources>

From 4d909bb514d80731d569ee4890f60809a6c04172 Mon Sep 17 00:00:00 2001
From: Splitter <splitvisionz@gmail.com>
Date: Wed, 26 Mar 2014 21:52:33 -0400
Subject: [PATCH 03/10] Cleaning up layout/theme code part 3

---
 res/layout/audio_player.xml         |   2 +-
 res/layout/half_and_half.xml        |  29 +----
 res/layout/library_browser.xml      |  20 +---
 res/layout/nowplaying_album_art.xml |   5 +-
 res/layout/shuffle_all.xml          |  24 +---
 res/layout/simple_eq.xml            |   7 +-
 res/layout/track_browser.xml        |  12 +-
 res/values/attrs.xml                |  10 ++
 res/values/styles.xml               | 164 +++++++++++++++++++---------
 res/values/themes.xml               |  15 +++
 10 files changed, 162 insertions(+), 126 deletions(-)

diff --git a/res/layout/audio_player.xml b/res/layout/audio_player.xml
index 2cd426c..d541ce5 100644
--- a/res/layout/audio_player.xml
+++ b/res/layout/audio_player.xml
@@ -38,7 +38,7 @@
     
     <FrameLayout 
 	    android:id="@+id/colorstrip_bottom"
-		style="?AudioPlayerColorstrip"/>
+		style="?Colorstrip"/>
     
 	<View
 	    style="?AudioPlayerColorstripShadow"/>	
diff --git a/res/layout/half_and_half.xml b/res/layout/half_and_half.xml
index 16b5190..76cdbbb 100644
--- a/res/layout/half_and_half.xml
+++ b/res/layout/half_and_half.xml
@@ -6,13 +6,12 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/colorstrip"
         android:baselineAligned="false"
         android:orientation="horizontal" >
 
         <RelativeLayout
             android:id="@+id/artist_half_container"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1">
 			
@@ -24,14 +23,7 @@
 
 			<RelativeLayout
 		        android:id="@+id/half_artist_info_holder"
-		        android:layout_width="match_parent"
-		        android:layout_height="@dimen/half_and_half_text_wrap_height"
-	            android:layout_alignBottom="@+id/half_artist_image"
-            	android:background="@drawable/transparent_black"
-		        android:paddingTop="@dimen/gridview_item_ccontainer_padding_left"
-		        android:paddingBottom="@dimen/gridview_item_ccontainer_padding_left"
-			    android:paddingLeft="@dimen/gridview_item_ccontainer_padding_left"
-	        	android:paddingRight="@dimen/gridview_item_ccontainer_padding_right">
+		        style="?HalfTextWrapper">
 		        <TextView
 		            android:layout_alignParentLeft="true"
 		            android:id="@+id/half_artist_image_text"
@@ -40,18 +32,11 @@
         			android:singleLine="true"
 			        android:ellipsize="end"
 			        android:maxLength="22"
-		            style="@style/GridviewShadowedText"
+		            style="?ShadowedText"
 		            android:textStyle="bold"/>
 		        <ImageButton
 		            android:id="@+id/view_more"
-		            style="@style/GridviewShadowedText"
-		            android:layout_alignParentRight="true"
-		            android:layout_width="wrap_content"
-			        android:layout_height="wrap_content"
-			        android:visibility="gone"
-			        android:padding="@dimen/half_and_half_imagebutton_padding"
-					android:src="@drawable/view_more_album"
-		            android:background="@drawable/view_more"/>
+		            style="?HalfTextViewMore"/>
 		
 		        <TextView
 		            android:layout_alignParentLeft="true"
@@ -59,15 +44,13 @@
         			android:layout_height="wrap_content"
 			        android:layout_below="@+id/half_artist_image_text"
 		            android:id="@+id/half_artist_image_text_line_two"
-		            style="@style/GridviewShadowedText"/>
+		            style="?ShadowedText"/>
 	        </RelativeLayout>
 	        
 		    <RelativeLayout
-		        android:layout_width="fill_parent"
 		        android:id="@+id/bottom_colorstrip"
 	            android:layout_alignBottom="@+id/half_artist_image"
-				android:layout_height="@dimen/colorstrip_height"
-		        android:background="@color/holo_blue_dark" />
+		        style="?Colorstrip"/>
 		            
         </RelativeLayout>        
     </LinearLayout>
diff --git a/res/layout/library_browser.xml b/res/layout/library_browser.xml
index cbb3421..285793e 100644
--- a/res/layout/library_browser.xml
+++ b/res/layout/library_browser.xml
@@ -10,20 +10,11 @@
 	    android:gravity="bottom">
 	
 	    <LinearLayout
-	        android:layout_width="match_parent"
-	        android:layout_height="match_parent"
-	        android:orientation="vertical"
-		    android:paddingTop="?android:attr/actionBarSize"
-		    android:clickable="true"
-			android:focusable="false"
-			android:focusableInTouchMode="true"
-        	android:background="@color/background_grey" >
+	        style="?LibraryWrapper" >
 		
 		    <com.andrew.apolloMod.ui.widgets.ScrollableTabView
 		        android:id="@+id/scrollingTabs"
-		        android:layout_width="match_parent"
-		        android:layout_height="@dimen/tab_height"
-        		android:background="@color/white"/>
+		        style="?LibraryTabsWrapper"/>
 		
 		    <android.support.v4.view.ViewPager
 		        android:id="@+id/viewPager"
@@ -34,12 +25,7 @@
 		</LinearLayout>
 	
 	    <LinearLayout
-	        android:layout_width="match_parent"
-	        android:layout_height="match_parent"
-			android:orientation="vertical" 
-        	android:background="@color/white"
-			android:clickable="true"
-			android:focusable="false" >
+	        style="?BottomActionBarOuter" >
 	        <LinearLayout 
 				    android:id="@+id/bottom_action_bar_container2"
 				    android:layout_width="match_parent"
diff --git a/res/layout/nowplaying_album_art.xml b/res/layout/nowplaying_album_art.xml
index fe7c604..e17e6d8 100644
--- a/res/layout/nowplaying_album_art.xml
+++ b/res/layout/nowplaying_album_art.xml
@@ -6,9 +6,6 @@
     
 	<com.andrew.apolloMod.views.TrackBrowserImageView
             android:id="@+id/audio_player_album_art"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:src="@drawable/no_art_normal"
-            android:scaleType="matrix" />
+            style="?AudioPlayerAlbumArt"/>
 	
 </LinearLayout>
diff --git a/res/layout/shuffle_all.xml b/res/layout/shuffle_all.xml
index acbfe94..b5a3dd5 100644
--- a/res/layout/shuffle_all.xml
+++ b/res/layout/shuffle_all.xml
@@ -1,25 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/shuffle_wrapper"
-    android:layout_width="match_parent"
-    android:layout_height="55dp"
-    android:paddingRight="10dp" 
-    android:paddingLeft="10dp" 
-    android:paddingBottom="13dp"
-  	android:layout_gravity="center_vertical"
-  	android:background="@drawable/shuffle_background">
+    style="?ShuffleWrapper">
 
     <ImageView
         android:id="@+id/shuffle_imageview"
-        android:layout_width="25dp"
-        android:layout_height="25dp"
-        android:layout_alignParentLeft="true"
-        android:scaleType="centerCrop" 
-    	android:layout_marginTop="13dp" 
-    	android:layout_marginLeft="16dp" 
-	    android:background="@drawable/apollo_holo_light_shuffle_normal"/>
-
-    <!-- Padding may be set on via code for some tabs -->
+        tools:ignore="ContentDescription" 
+        style="?ShuffleImage"/>
 
     <TextView
         android:id="@+id/shuffle_textview"
@@ -28,11 +16,11 @@
         android:layout_toRightOf="@+id/shuffle_imageview"
         android:ellipsize="end"
         android:maxLength="29"
-        android:text="@string/shuffle_all"
         android:paddingRight="@dimen/listview_items_padding_right"
     	android:layout_marginTop="14dp" 
     	android:layout_marginLeft="31dp" 
         android:singleLine="true"
-        android:textSize="@dimen/text_size_medium" />
+        android:textSize="@dimen/text_size_medium"
+        android:text="@string/shuffle_all" />
 
 </RelativeLayout>
diff --git a/res/layout/simple_eq.xml b/res/layout/simple_eq.xml
index c3b34e4..8725c65 100644
--- a/res/layout/simple_eq.xml
+++ b/res/layout/simple_eq.xml
@@ -3,6 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical" >
+    
     <CheckBox 
         android:id="@+id/simple_eq_bass"
         android:text="@string/simple_eq_bass"
@@ -14,6 +15,7 @@
         android:layout_marginLeft="@dimen/simple_eq_margin_left_right"
         android:layout_marginRight="@dimen/simple_eq_margin_left_right"
         android:checked="false"/>
+    
 	<SeekBar
 	    android:id="@+id/simple_eq_bassboost"
 	    android:layout_width="fill_parent"
@@ -190,10 +192,7 @@
 	    		android:max="100"
 	    		android:progress="100"/>
         </LinearLayout>
-	    
-	    
-	    
-	    
+        
 	</LinearLayout>
 	
 </LinearLayout>
diff --git a/res/layout/track_browser.xml b/res/layout/track_browser.xml
index e1af2cd..ab9b679 100644
--- a/res/layout/track_browser.xml
+++ b/res/layout/track_browser.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:background="@color/background_grey"
-    android:layout_height="match_parent">
+    style="?TracksBrowserWrapper" >
+    
 	<com.sothree.slidinguppanel.SlidingUpPanelLayout
 	    android:id="@+id/sliding_layout"
 	    android:layout_width="match_parent"
@@ -28,12 +27,7 @@
 		</RelativeLayout>
 		
 	    <LinearLayout
-	        android:layout_width="match_parent"
-	        android:layout_height="match_parent"
-			android:orientation="vertical" 
-        	android:background="@color/white"
-			android:clickable="true"
-			android:focusable="false" >
+	        style="?BottomActionBarOuter" >
 	        <LinearLayout 
 				    android:id="@+id/bottom_action_bar_container2"
 				    android:layout_width="match_parent"
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 1e214a3..3d30f7c 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -7,11 +7,13 @@
     		<attr name="BottomActionBarDivider" format="reference" />
     		<attr name="BottomActionBar" format="reference" />
     		<attr name="BottomActionBarWrapper" format="reference" />
+    		<attr name="BottomActionBarOuter" format="reference" />
     		<attr name="BottomActionBarFavorites" format="reference" />
     		<attr name="BottomActionBarPrevious" format="reference" />
     		<attr name="BottomActionBarPlay" format="reference" />
     		<attr name="BottomActionBarNext" format="reference" />
     		<attr name="BottomActionBarNowQueue" format="reference" />    		
+    		<attr name="AudioPlayerAlbumArt" format="reference" />   		
     		<attr name="AudioPlayerText" format="reference" />
     		<attr name="AudioPlayerArtistAlbumText" format="reference" />
     		<attr name="AudioPlayerInfoText" format="reference" />
@@ -45,5 +47,13 @@
     		<attr name="GridviewRecentsShadowedText" format="reference" />
     		<attr name="GridviewRecentsText" format="reference" />
     		<attr name="ShadowedText" format="reference" />
+    		<attr name="Colorstrip" format="reference" />
+    		<attr name="HalfTextWrapper" format="reference" />
+    		<attr name="HalfTextViewMore" format="reference" />
+    		<attr name="LibraryWrapper" format="reference" />
+    		<attr name="LibraryTabsWrapper" format="reference" />
+    		<attr name="ShuffleWrapper" format="reference" />
+    		<attr name="ShuffleImage" format="reference" />
+    		<attr name="TracksBrowserWrapper" format="reference" />
 		</declare-styleable>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index e128c9d..79036d8 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -44,6 +44,13 @@
     	<item name="android:layout_gravity">bottom</item>
     	<item name="android:orientation">vertical</item> 
     </style>
+    <style name="BottomActionBarOuterLayout">
+    	<item name="android:layout_width">match_parent</item> 
+    	<item name="android:layout_height">match_parent</item> 
+    	<item name="android:orientation">vertical</item>  
+    	<item name="android:clickable">true</item> 
+    	<item name="android:focusable">false</item> 
+    </style>
     <style name="BottomActionBarItemLayout">
         <item name="android:layout_width">@dimen/bottom_action_bar_item_width</item>
         <item name="android:layout_height">match_parent</item>
@@ -65,6 +72,11 @@
         <item name="android:layout_height">@dimen/bottom_action_bar_divider_height</item>
     </style> 	
     <!-- AudioPlayer Styles -->
+    <style name="AudioPlayerAlbumArtLayout">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:scaleType">matrix</item>
+    </style>
     <style name="AudioPlayerTextLayout">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
@@ -89,7 +101,7 @@
         <item name="android:maxLength">21</item>
         <item name="android:singleLine">true</item>
     </style>
-    <style name="AudioPlayerViewMoreLayout" parent="GridviewShadowedText">  
+    <style name="AudioPlayerViewMoreLayout">  
         <item name="android:layout_alignParentRight">true</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
@@ -279,6 +291,68 @@
         <item name="android:textSize">@dimen/text_size_small</item>
     </style>
     
+    <!-- Colorstrip Style -->
+    <style name="ColorstripLayout">        
+        <item name="android:layout_width">fill_parent</item>
+        <item name="android:layout_height">@dimen/colorstrip_height</item>
+    </style>
+    
+    <!-- Half & Half Styles -->
+    <style name="HalfTextWrapperLayout">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">@dimen/half_and_half_text_wrap_height</item>
+        <item name="android:layout_alignBottom">@+id/half_artist_image</item>
+        <item name="android:paddingTop">@dimen/gridview_item_ccontainer_padding_left</item>
+        <item name="android:paddingBottom">@dimen/gridview_item_ccontainer_padding_left</item>
+        <item name="android:paddingLeft">@dimen/gridview_item_ccontainer_padding_left</item>
+        <item name="android:paddingRight">@dimen/gridview_item_ccontainer_padding_right</item>
+    </style>
+    <style name="HalfTextViewMoreLayout">
+        <item name="android:layout_alignParentRight">true</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:visibility">gone</item>
+        <item name="android:padding">@dimen/half_and_half_imagebutton_padding</item>
+    </style>
+    
+    <!-- Library Browser Styles -->
+    <style name="LibraryWrapperLayout">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:orientation">vertical</item>
+        <item name="android:paddingTop">?android:attr/actionBarSize</item>
+        <item name="android:clickable">true</item>
+        <item name="android:focusable">false</item>
+        <item name="android:focusableInTouchMode">true</item>        
+    </style>
+    <style name="LibraryTabsWrapperLayout">
+        <item name="android:layout_width">match_parent</item>  
+        <item name="android:layout_height">@dimen/tab_height</item>  
+    </style>
+    
+    <!-- Shuffle Styles -->
+    <style name="ShuffleWrapperLayout">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">55dp</item>
+        <item name="android:paddingRight">10dp</item> 
+        <item name="android:paddingLeft">10dp</item> 
+        <item name="android:paddingBottom">13dp</item>
+        <item name="android:layout_gravity">center_vertical</item>
+    </style>
+    <style name="ShuffleImageLayout">
+        <item name="android:layout_width">25dp</item>
+        <item name="android:layout_height">25dp</item>
+        <item name="android:layout_alignParentLeft">true</item>
+        <item name="android:scaleType">centerCrop</item>
+        <item name="android:layout_marginTop">13dp</item> 
+        <item name="android:layout_marginLeft">16dp</item> 
+	</style>
+    
+    <!-- Track Browser Styles -->
+    <style name="TracksBrowserWrapperLayout">
+        <item name="android:layout_width">match_parent</item> 
+        <item name="android:layout_height">match_parent</item>
+    </style>
     
 	<!-- 
 		// GENERAL THEME STYLES
@@ -318,6 +392,9 @@
     <style name="BottomActionBarItem_Light" parent="BottomActionBarItemLayout">
 		<item name="android:background">@drawable/holo_selector</item>
 	</style>    
+    <style name="BottomActionBarOuter_Light" parent="BottomActionBarOuterLayout">
+    	<item name="android:background">@color/white</item> 
+    </style>
     <style name="BottomActionBarText_Light" parent="BottomActionBarTextLayout">
 	    <item name="android:textColor">@color/transparent_black</item>
     </style>    
@@ -346,6 +423,9 @@
     </style>    
     
     <!-- AudioPlayer Styles -->
+    <style name="AudioPlayerAlbumArt_Light" parent="AudioPlayerAlbumArtLayout">
+        <item name="android:src">@drawable/no_art_normal</item>
+    </style>
     <style name="AudioPlayerText_Light" parent="AudioPlayerTextLayout"></style>
     <style name="AudioPlayerAlbumArtistText_Light" parent="AudioPlayerAlbumArtistTextLayout">
         <item name="android:textColor">@color/transparent_black</item>
@@ -474,7 +554,40 @@
         <item name="android:textColor">@color/white</item>
     </style>
     
+    <!-- Colorstrip Style -->
+    <style name="Colorstrip_Light" parent="ColorstripLayout">   
+        <item name="android:background">@color/holo_blue_dark</item> 
+    </style>
+    
+    <!-- Half & Half Styles -->
+    <style name="HalfTextWrapper_Light" parent="HalfTextWrapperLayout">
+        <item name="android:background">@drawable/transparent_black</item>
+    </style>    
+    <style name="HalfTextViewMore_Light" parent="HalfTextViewMoreLayout">
+        <item name="android:src">@drawable/view_more_album</item>
+        <item name="android:background">@drawable/view_more</item>
+    </style>
+    
+    <!-- Library Browser Styles -->
+    <style name="LibraryWrapper_Light" parent="LibraryWrapperLayout">
+        <item name="android:background">@color/background_grey</item>        
+    </style>
+    <style name="LibraryTabsWrapper_Light" parent="LibraryTabsWrapperLayout">
+        <item name="android:background">@color/white</item>  
+    </style>    
+    
+    <!-- Shuffle Styles -->
+    <style name="ShuffleWrapper_Light" parent="ShuffleWrapperLayout">
+        <item name="android:background">@drawable/shuffle_background</item>
+    </style>
+    <style name="ShuffleImage_Light" parent="ShuffleImageLayout">
+        <item name="android:background">@drawable/apollo_holo_light_shuffle_normal</item>
+	</style>
     
+    <!-- Track Browser Styles -->
+    <style name="TracksBrowserWrapper_Light" parent="TracksBrowserWrapperLayout">
+        <item name="android:background">@color/background_grey</item> 
+    </style>
     
 	<!-- 
 		// LIGHT THEME STYLES
@@ -489,22 +602,6 @@
 
    
 
-    <!-- List separator with a blue underline -->
-    <style name="SeparatorTextViewStyle">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:minHeight">@dimen/list_separator_min_height</item>
-        <item name="android:background">@drawable/list_section_divider_holo_custom</item>
-        <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:textColor">@color/holo_blue_dark</item>
-        <item name="android:gravity">center_vertical</item>
-        <item name="android:paddingRight">@dimen/list_separator_padding_left_right</item>
-        <item name="android:visibility">gone</item>
-        <item name="android:ellipsize">end</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:textAllCaps">true</item>
-    </style>
     <!-- Notification bar button -->
     <style name="StatusBarButton">
         <item name="android:layout_width">@dimen/status_bar_button_width_height</item>
@@ -523,19 +620,6 @@
         <item name="android:singleLine">true</item>
     </style>
 
-    <!-- Half and half layout -->
-    <style name="HalfText">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:background">@color/transparent_black</item>
-        <item name="android:ellipsize">end</item>
-        <item name="android:gravity">center</item>
-        <item name="android:padding">@dimen/half_and_half_text_padding</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:textColor">@color/white</item>
-        <item name="android:textSize">@dimen/text_size_small</item>
-    </style>
-
     <!-- ContextMenu header text -->
     <style name="HeaderText">
         <item name="android:layout_width">match_parent</item>
@@ -551,18 +635,6 @@
         <item name="android:textSize">@dimen/text_size_large</item>
     </style>
 
-    <!-- TextView in shown over the images in the GridView -->
-    <style name="GridViewTextItem">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:ellipsize">end</item>
-        <item name="android:shadowColor">@color/white</item>
-        <item name="android:shadowRadius">1</item>
-        <item name="android:textColor">@color/white</item>
-        <item name="android:textSize">@dimen/text_size_small</item>
-    </style>
-
     <!-- Now playing indicator -->
     <style name="PeakMeter">
         <item name="android:layout_width">wrap_content</item>
@@ -579,14 +651,6 @@
 	    <item name="android:shadowRadius">1.5</item> 
     </style>
     
-    <!--  TextView with drop-shadow and white text -->
-    <style name="GridviewShadowedText" parent="GridViewTextItem">        
-	    <item name="android:shadowColor">#000000</item>
-	    <item name="android:shadowDx">1</item>
-	    <item name="android:shadowDy">1</item>
-	    <item name="android:shadowRadius">1.5</item> 
-    </style>
-
     <!-- QuickQueue -->
     <style name="Theme.QuickQueue" parent="@android:style/Theme.Holo.Light">
         <item name="android:windowBackground">@color/transparent</item>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 3d2dc0c..c96fc64 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -12,12 +12,14 @@
     	<item name="BottomActionBarDivider">@style/BottomActionBarDivider_Light</item>
     	<item name="BottomActionBar">@style/BottomActionBar_Light</item>
     	<item name="BottomActionBarWrapper">@style/BottomActionBarWrapper_Light</item>
+    	<item name="BottomActionBarOuter">@style/BottomActionBarOuter_Light</item>
     	<item name="BottomActionBarFavorites">@style/BottomActionBarFavorites_Light</item>
     	<item name="BottomActionBarPrevious">@style/BottomActionBarPrevious_Light</item>
     	<item name="BottomActionBarPlay">@style/BottomActionBarPlay_Light</item>
     	<item name="BottomActionBarNext">@style/BottomActionBarNext_Light</item>
     	<item name="BottomActionBarNowQueue">@style/BottomActionBarNowQueue_Light</item>
     	
+    	<item name="AudioPlayerAlbumArt">@style/AudioPlayerAlbumArt_Light</item>
     	<item name="AudioPlayerText">@style/AudioPlayerText_Light</item>
     	<item name="AudioPlayerArtistAlbumText">@style/AudioPlayerAlbumArtistText_Light</item>
     	<item name="AudioPlayerInfoText">@style/AudioPlayerInfoText_Light</item>
@@ -56,6 +58,19 @@
     	<item name="GridviewRecentsText">@style/GridviewRecentsText_Light</item>
     	
     	<item name="ShadowedText">@style/ShadowedText_Light</item>
+    	
+    	<item name="Colorstrip">@style/Colorstrip_Light</item>
+    	
+    	<item name="HalfTextWrapper">@style/HalfTextWrapper_Light</item>
+    	<item name="HalfTextViewMore">@style/HalfTextViewMore_Light</item>
+    	
+    	<item name="LibraryWrapper">@style/LibraryWrapper_Light</item>
+    	<item name="LibraryTabsWrapper">@style/LibraryTabsWrapper_Light</item>
+    	
+    	<item name="ShuffleWrapper">@style/ShuffleWrapper_Light</item>
+    	<item name="ShuffleImage">@style/ShuffleImage_Light</item>
+    	
+    	<item name="TracksBrowserWrapper">@style/TracksBrowserWrapper_Light</item>
     </style>
     
 </resources>

From 91aac125efc3f7b6e1b7de428d0ed6cddb3124df Mon Sep 17 00:00:00 2001
From: Splitter <splitvisionz@gmail.com>
Date: Sat, 29 Mar 2014 22:35:03 -0400
Subject: [PATCH 04/10] Implement dark theme & theme chooser

Add a built in holo dark inspired theme and ability to switch between
default light theme and new dark theme in settings.
---
 AndroidManifest.xml                           |   8 +-
 res/color/tab_text_color_dark.xml             |   6 +
 res/drawable-hdpi/btn_drag_sort_dark.png      | Bin 0 -> 196 bytes
 res/drawable-hdpi/btn_switch_queue_dark.png   | Bin 0 -> 189 bytes
 .../dropdown_ic_arrow_normal_holo_dark.png    | Bin 0 -> 237 bytes
 .../scrubber_track_holo_dark_dark.9.png       | Bin 0 -> 178 bytes
 res/drawable-hdpi/view_more_now_dark.png      | Bin 0 -> 375 bytes
 res/drawable-mdpi/btn_drag_sort_dark.png      | Bin 0 -> 294 bytes
 res/drawable-mdpi/btn_switch_queue_dark.png   | Bin 0 -> 274 bytes
 .../dropdown_ic_arrow_normal_holo_dark.png    | Bin 0 -> 235 bytes
 .../scrubber_track_holo_dark.9.png            | Bin 99 -> 176 bytes
 .../scrubber_track_holo_dark_dark.9.png       | Bin 0 -> 174 bytes
 res/drawable-mdpi/view_more_now.png           | Bin 0 -> 377 bytes
 res/drawable-mdpi/view_more_now_dark.png      | Bin 0 -> 380 bytes
 res/drawable-nodpi/no_art_normal_dark.png     | Bin 0 -> 4838 bytes
 res/drawable-nodpi/no_art_small_dark.png      | Bin 0 -> 2878 bytes
 res/drawable-xhdpi/btn_drag_sort_dark.png     | Bin 0 -> 221 bytes
 res/drawable-xhdpi/btn_switch_queue_dark.png  | Bin 0 -> 205 bytes
 .../dropdown_ic_arrow_normal_holo_dark.png    | Bin 0 -> 310 bytes
 .../scrubber_track_holo_dark_dark.9.png       | Bin 0 -> 184 bytes
 res/drawable-xhdpi/view_more_now.png          | Bin 0 -> 436 bytes
 res/drawable-xhdpi/view_more_now_dark.png     | Bin 0 -> 452 bytes
 res/drawable/audio_player_seekbar_dark.xml    |  33 ++++
 .../gridview_item_background_dark.xml         |  38 ++++
 .../listview_item_background_dark.xml         |  38 ++++
 res/drawable/shuffle_background_dark.xml      |  22 +++
 res/layout/dragsort_listview.xml              |  15 +-
 res/layout/listview_items.xml                 |   2 -
 res/layout/listview_items_search.xml          |  31 +++
 res/layout/playlist_dialog.xml                |   8 +
 res/values/arrays.xml                         |   6 +
 res/values/attrs.xml                          |  16 +-
 res/values/colors.xml                         |  12 ++
 res/values/strings.xml                        |  12 +-
 res/values/styles.xml                         | 182 ++++++++++++++++++
 res/values/themes.xml                         | 100 ++++++++++
 res/xml/settings.xml                          |  12 ++
 src/com/andrew/apolloMod/Constants.java       |   2 +-
 .../apolloMod/activities/MusicLibrary.java    |  14 +-
 .../apolloMod/activities/PlayExternal.java    |   9 +
 .../activities/QueryBrowserActivity.java      |  37 ++--
 .../apolloMod/activities/QuickQueue.java      |  10 +
 .../andrew/apolloMod/activities/SimpleEq.java |   7 +
 .../apolloMod/activities/TracksBrowser.java   |   7 +
 .../apolloMod/helpers/GetBitmapTask.java      |  25 ++-
 .../andrew/apolloMod/menu/PlaylistDialog.java |  18 +-
 .../andrew/apolloMod/menu/PlaylistPicker.java |  16 ++
 .../apolloMod/preferences/SettingsHolder.java |  24 +++
 .../ui/fragments/AudioPlayerFragment.java     |  30 ++-
 .../ui/fragments/BottomActionBarFragment.java |  26 ++-
 .../apolloMod/ui/widgets/BottomActionBar.java |   7 +-
 51 files changed, 696 insertions(+), 77 deletions(-)
 create mode 100644 res/color/tab_text_color_dark.xml
 create mode 100644 res/drawable-hdpi/btn_drag_sort_dark.png
 create mode 100644 res/drawable-hdpi/btn_switch_queue_dark.png
 create mode 100644 res/drawable-hdpi/dropdown_ic_arrow_normal_holo_dark.png
 create mode 100644 res/drawable-hdpi/scrubber_track_holo_dark_dark.9.png
 create mode 100644 res/drawable-hdpi/view_more_now_dark.png
 create mode 100644 res/drawable-mdpi/btn_drag_sort_dark.png
 create mode 100644 res/drawable-mdpi/btn_switch_queue_dark.png
 create mode 100644 res/drawable-mdpi/dropdown_ic_arrow_normal_holo_dark.png
 create mode 100644 res/drawable-mdpi/scrubber_track_holo_dark_dark.9.png
 create mode 100644 res/drawable-mdpi/view_more_now.png
 create mode 100644 res/drawable-mdpi/view_more_now_dark.png
 create mode 100644 res/drawable-nodpi/no_art_normal_dark.png
 create mode 100644 res/drawable-nodpi/no_art_small_dark.png
 create mode 100644 res/drawable-xhdpi/btn_drag_sort_dark.png
 create mode 100644 res/drawable-xhdpi/btn_switch_queue_dark.png
 create mode 100644 res/drawable-xhdpi/dropdown_ic_arrow_normal_holo_dark.png
 create mode 100644 res/drawable-xhdpi/scrubber_track_holo_dark_dark.9.png
 create mode 100644 res/drawable-xhdpi/view_more_now.png
 create mode 100644 res/drawable-xhdpi/view_more_now_dark.png
 create mode 100644 res/drawable/audio_player_seekbar_dark.xml
 create mode 100644 res/drawable/gridview_item_background_dark.xml
 create mode 100644 res/drawable/listview_item_background_dark.xml
 create mode 100644 res/drawable/shuffle_background_dark.xml
 create mode 100644 res/layout/listview_items_search.xml
 create mode 100644 res/layout/playlist_dialog.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6a81780..dd39d43 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -31,16 +31,15 @@
         android:label="@string/app_name"
         android:largeHeap="true"
         android:process=":main"
-        android:taskAffinity="apollo.task.music"
-        android:theme="@style/ApolloTheme.Light" >
+        android:taskAffinity="apollo.task.music" >
         <meta-data
             android:name="android.app.default_searchable"
             android:value=".activities.QueryBrowserActivity" />
         <!-- Serach -->
         <activity
             android:name=".activities.QueryBrowserActivity"
-            android:exported="true"
-            android:theme="@style/ApolloTheme.Light" >
+            android:theme="@style/ApolloTheme.Light" 
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
                 <action android:name="android.intent.action.MEDIA_SEARCH" />
@@ -59,6 +58,7 @@
             android:name=".activities.MusicLibrary"
             android:label="@string/app_name"
         	android:logo="@drawable/ic_logo"
+          	android:theme="@android:style/Theme.NoTitleBar"
             android:windowSoftInputMode="adjustPan" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/res/color/tab_text_color_dark.xml b/res/color/tab_text_color_dark.xml
new file mode 100644
index 0000000..7c6d8f9
--- /dev/null
+++ b/res/color/tab_text_color_dark.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true" android:color="@color/selected_tabtext_dark" />
+    <item android:color="@color/unselected_tabtext_dark" />
+</selector>
diff --git a/res/drawable-hdpi/btn_drag_sort_dark.png b/res/drawable-hdpi/btn_drag_sort_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..b068ef2c8a9be5e52cf74148b38c5c82ad608400
GIT binary patch
literal 196
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCwj^(N7l!{JxM1({$v_d#0*}aI
z1_o|n5N2eUHAey{$X?><>&kwQSyr51*>>qKRiIFyr;B4q#=W=KHu4@&5MXiayBD*y
zySm6oIfc_uSZPx4ze{E-R+ZOzf2#SrdC~U6oB|AYboDk`D>yJTXg=iQ5MW5~+QH1k
kGDE0AGtrAf;KOQ084eATC%iU5iy0U^UHx3vIVCg!0FNg)OaK4?

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/btn_switch_queue_dark.png b/res/drawable-hdpi/btn_switch_queue_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..15e6e4730bacd13607c4908f50b2b9ee2a302aa9
GIT binary patch
literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCwj^(N7l!{JxM1({$v_d#0*}aI
z1_o|n5N2eUHAey{$X?><>&kwQS(eAr?4<Z%EufH>r;B4q#=W=KHu5qka4<L)nlCT2
zxYOVwoxCSI^G}3BHUq=)MN(<c_WV205qS3ZYkLKU1Me9df)8mXPUI9|uuz>N^sRw`
dk>S8L*7H+&l=is3cmgz)!PC{xWt~$(696~UIx_$O

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/dropdown_ic_arrow_normal_holo_dark.png b/res/drawable-hdpi/dropdown_ic_arrow_normal_holo_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..ced7555021b1085057e2a358422a38dfbd386436
GIT binary patch
literal 237
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}trX+877Y2q^y~;*F9%q3^WHAE+
zw=f7ZGR&GI0Tg5}@$_|NzsD>q%qsryyWcUOP@SiXV@Sl|w^Ob84h8VAw5#{IafJTp
zsFC8B{&>!8CD#c~T5s6iPT6L%x-{9~m_%}q;V}u>Nnfj&-%S1@s$Z7LXk~P+N@M4*
z7PeKDdcQs}%&n+-)$G6JTDw`m;SKZJSYP=3&y6ek>d0HN@b)cMmKR>T_v-HaHDCJ0
evA_5CA7W{=mfTTiwk8GW5(ZCKKbLh*2~7a3qEj#c

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/scrubber_track_holo_dark_dark.9.png b/res/drawable-hdpi/scrubber_track_holo_dark_dark.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f27cf9c9802e2a1400984b161db1604dd28f0ea
GIT binary patch
literal 178
zcmeAS@N?(olHy`uVBq!ia0vp^f<P?7!3HF=7hLlMQfx`y?k+$Y2!1;6t_M<_1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmPqvn-D_kF9Qn6i~?C)5S5w;`G}o2RRuO1P%uk{x_A`
zY<K6uo5upi4hyz~$oR<K<zlem5SXZvA+o$bh3Q7z)1{vKAAJ+rFYMk~edqo(uA`b?
SS*3wSF?hQAxvX<aXaWGnEHSwN

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/view_more_now_dark.png b/res/drawable-hdpi/view_more_now_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..5694d90e7053beacd489c796a6c3ac1afa4ad7ca
GIT binary patch
literal 375
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCwj^(N7l!{JxM1({$v_d#0*}aI
z1_o|n5N2eUHAey{$X?><>&kwQSytFc;Qf^9Kn4az7Ec$)kc@k8rz`p~J4&?fzpmrS
z-;k@I==eos4pV67BZVmnf}$*}oO10BU-&eFq*T;bFdRI*<>WFQ$4&JW^Jm`_{rs%n
z_`fuVV#|J)ZO@mA>Bw$9-uz0mqk#j6fTBw-F1cv33B>V`;{7jkTYOu&HusF%bsKC~
zR(0_5Gz#A~zP<R=_6rg_w%Km9T`|dxcSUj?=N#{-kPQLi><7+#Tlscbmhx@JzU$kp
z*4*j*zI}DzL8trYbT8ywyC<^x0Jp)^Eq8oE1V1p|VJM$ucUyiIlUP+;{NnZYKUeAp
zJ}S(1zTbFzUF`d8)>}4=>67l&{oa@_7R4Ao>7Dkni{7`ZD<eW4b00sQU~o;?YArB`
O7(8A5T-G@yGywoIc#)_8

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/btn_drag_sort_dark.png b/res/drawable-mdpi/btn_drag_sort_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..c96bc64e4af4c8c3d2e408d1812c569455ed31ca
GIT binary patch
literal 294
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI
z1_o|n5N2eUHAey{$X?><>&kwQSyr6iETBT}98hSpr;B4q#NoHo4EYWj@VNe8F8hE>
zRCcEbx6t#1H<lA3c8Dm8hHG%Q9Q6=umgW}}_~||E@p7JtlitrL&{$f+a>2V&b?5eq
zKCvI0qMrYAlihXl!RAGuxy%^Cg8WqU#rXdo6|LYeVA?RPNM+~d3Qlnw2Aiu@eb=wE
z=bbBEvCppH-;b}`#PmOMycY_%`RMD-0!_xLx^k<|w=p-oyIbTbrxW)`u<X=(OPghn
kW^^TM^{xEz{r3Uxgp2~K(v9YQK<6`fy85}Sb4q9e06_I^6#xJL

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/btn_switch_queue_dark.png b/res/drawable-mdpi/btn_switch_queue_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ce7a861ef23943cc67e2bf15b3bf68ea79d542e
GIT binary patch
literal 274
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI
z1_o|n5N2eUHAey{$X?><>&kwQSytFYEMRTrBcRZHPZ!6Kh{JEE?&dvgz~gfNrskxc
z2aH$J=Z4Hwc3>-T`@*p9&h6ecCM$VFwS4Ls_DvEfQ0ZTCpm5IIi$)WIxDH5nXlH+&
zWOw?3>gNw!Ceft}ZryImI=tl7CCMGkj5EUh5++^wc}w<O(;X?c2iXBR{Cm9A>dao1
z**uXw5oz%EwkWSo!MQ?qIfv{8rXE$(avV*x%52V-$4F=1t$8G?ew=@rqQZ{_d?E5c
Pr!siD`njxgN@xNAT%lul

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/dropdown_ic_arrow_normal_holo_dark.png b/res/drawable-mdpi/dropdown_ic_arrow_normal_holo_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..99b0e6d014e72f3908b06ef29283f7ceb8a33156
GIT binary patch
literal 235
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UOiAAEE({E-dX<fUJkA1-$YKTt
zZeb8+WSBKa0w~B{;_2(kevesJSVeOUr&}LTsK(R9F~sBe+ey}ZO%5Wi{6{1^5;-Sb
zWZVA4N@uBK>hcZ!*@`Lw=M0`&KlQ!$SB0PFutAT`3!bNqpQk-%WRCq2pf0WPVd=7l
z;G|#D{R%4^^Lj!Y7&&=GBnn>C%jGWUliMG<NbQAJ|Ltr+-je5A{rimq4mW4U?lVZQ
acrG7eFUrjz^r{W$4hBzGKbLh*2~7Yeu}c^L

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/scrubber_track_holo_dark.9.png b/res/drawable-mdpi/scrubber_track_holo_dark.9.png
index fe7b8816270fe3367d42cc3da5d9f331a30727ab..874c4a59927721c77a7c59d3858e7361638e8833 100644
GIT binary patch
delta 147
zcmYe^z&Jsro-N7S-Gu=Remd{22QoMdJR*x37`TN&n2}-D90{Nxdx@v7EBifWSzbo|
z2LHM5fI_yOE{-7@=aW+!8vgSfVRQ=;F*YzT_>-Qrz);~X+a%KsK%T*prAsq~7gt<c
q6UlS<;AJ0`V<s=n3?|L`!7$r_%a(txGVd0kNerH@elF{r5}E*@hb>kB

delta 69
zcmdnMm^?wnUdz+PF{I*FazaDHf0v{kNl6FmH<=jlIPqp?X5KoI@X3_N&i}IdvQEDm
YhP~GIioYXQPh|iCPgg&ebxsLQ0MPXt1poj5

diff --git a/res/drawable-mdpi/scrubber_track_holo_dark_dark.9.png b/res/drawable-mdpi/scrubber_track_holo_dark_dark.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..adb8774db3c50ee60509c166d0229dd4c2d7c7b0
GIT binary patch
literal 174
zcmeAS@N?(olHy`uVBq!ia0vp^JV4CH!3HFy_x^nYq}Y<Y-Cck*5d3uBT@R!<3p^r=
z85p>QL70(Y)*K0-AbW|YuPggKW?5cF1?_nYwgZK%JzX3_G|u0hw2_y=fa9>tmH+o2
zoGE$1oRY9IeS&C5#SBTWHpUp8$<mKnnG<%qt55o&SkgNG9Iw~ua>lvrTszMN+ROkN
O!{F)a=d#Wzp$P!Ww=t{$

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/view_more_now.png b/res/drawable-mdpi/view_more_now.png
new file mode 100644
index 0000000000000000000000000000000000000000..7206c9d1c276fd6f57bb0f0cef0610805ec0c740
GIT binary patch
literal 377
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI
z1_o|n5N2eUHAey{$X?><>&kwQSytGP*?~RNhk=2S&C|s(B;xSfYkT!v9A#KP+)q{B
z=H#?_uh-ImYSz}c<==U<rhebB=tc$4#0mykrS4nL<7WN$)l(9AcFy<PycDCEY3KgG
zo+D}HW6dRFa>laTImVg4Uy`X}J)iN;=n1wBaZ{GO6swUs<k)uP{fAqX4%s~!=FOk_
z3gcHMOmJi^o-4TZ6lcDX%3mW<q4<MUAwTo^58EdTT1OmJomXeHD8z0<Pwte3zXi{I
z_-5Mh*M)J)My+{F{1yj8_p;9Z=<2mmtEli@GV^(f<V#EVLqat+wwmtu%~0asaWwF+
z;VX5e*;mx|b9@S(bDe#o$Bef^-xhsO=1Kmac66nI{CEDsz+ji;2oC)Wb2|p3t@dFJ
T%*P#pfyChH>gTe~DWM4fWwehj

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/view_more_now_dark.png b/res/drawable-mdpi/view_more_now_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..79160f17b47b35670cc42f64a11c0ec25ff18874
GIT binary patch
literal 380
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI
z1_o|n5N2eUHAey{$X?><>&kwQSytFswC(A>`3ww<oSrU@ArXh)PP6r5aTI9Xzuo%8
zp?QhTt^$Td?>CAYm>PZJNP3}Z5)iqkwZ20^&LQ~V36B7^S?QOU*EZfP;k9Cw4GCHQ
zZ(o+goBgwM?u++XvVBvrWeRbSRalTYH?V~J5NpUvm8H=iayi5qJMBGx$w*v~7MRP%
z^Kjvk=Vjb!j7-azJE~j{O>dC=@#FXJ-0I8U`rdj@X=r^LeOvqX=lc#<t{O(Mf4lrV
znb(5toXS;u);lFC3r^PAdA;YgnDk`=_l`HKxFbK@k!OB>!0S@AC*PLPjE2~Rn?(yu
ze#A94|B>*un$u`?x{hVel1tZBuNCC|zV&VDTkhM@OD#9#{?<FVqKo0;nQw0IC;nyS
XotxJXuER447)}hHu6{1-oD!M<0fCrh

literal 0
HcmV?d00001

diff --git a/res/drawable-nodpi/no_art_normal_dark.png b/res/drawable-nodpi/no_art_normal_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a9ccf492e536e2081ce462dffe208d0112353f5
GIT binary patch
literal 4838
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

literal 0
HcmV?d00001

diff --git a/res/drawable-nodpi/no_art_small_dark.png b/res/drawable-nodpi/no_art_small_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..5bd9fb11e9eee4c2e67ad0160d6da9657b58ac04
GIT binary patch
literal 2878
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

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/btn_drag_sort_dark.png b/res/drawable-xhdpi/btn_drag_sort_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e6ff1a25367832a21c432f8c37a61a929b8950d
GIT binary patch
literal 221
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmPqv#huP`<XuiSwNvIPZ!6Kid%25Z)7~6z{6rV@1ar2
zG-Kfa)>#o*3wNEGUl<s=clUOc^Vk2YpSd`Pfr&$bfx$#H`GlfM1BlbWz>vT<`!Js(
zBa46o10xFqL-7rnG7e6l1X$^e!_PK2djKVVOlN(rrQsv}s&f(p5O})!xvX<aXaWFW
C{XU}r

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/btn_switch_queue_dark.png b/res/drawable-xhdpi/btn_switch_queue_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..75defd77810331782d1d8ce80b0bf8eca1415737
GIT binary patch
literal 205
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmPqv#hX*LDPai@<5>|PZ!6Kid%25Zxm!u;9xK;uxKx{
zjA;z>%#!-Aqrk+#&``O_I3)D>&i2%I=kCn<$IK$&z`)2Nz`!u)@VUh92@Fge3JnZQ
o3=PFMEOP{fz;X^ib064?@A2U=nZRoG1ju9XboFyt=akR{009p-?f?J)

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/dropdown_ic_arrow_normal_holo_dark.png b/res/drawable-xhdpi/dropdown_ic_arrow_normal_holo_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b8a0809e841bc29178fc7abbe91cd6b0ee5fd8d
GIT binary patch
literal 310
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I0wfs{c7_5;rX+877Y2q^y~;*F9%q3^WHAE+
zw=f7ZGR&GI0Tg5}@$_|NzsD>qtR`^KY7I#9aZeY=kc@k8ulaH_21>9#Fn;{Cd(8wT
zrJpC7A~HOV96Nq!|0m^m?oI>a@`roPEzf7|`hLao?o|dCIQZ}NI`Or1)y`Va3BUNR
zbu{r_&<p$ii-CDd`_skuelxsH{uuMVvZ2qg+V-=BgZhkp^Q)v66!+N8J)Zd5c5j24
z#In0H`7dyAvc3GC6t~~eT3hkh*XS*qjFY1FI~(h#nmHuD2|RsXlJ^1=--=x-M_2so
u=!y>WdF8LMd)a<Fhi;3-N8-=P7qN1$RVq_0>zD@g5`(9!pUXO@geCx?&2@GF

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/scrubber_track_holo_dark_dark.9.png b/res/drawable-xhdpi/scrubber_track_holo_dark_dark.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ea86b2e22b4c35618d4c32ee99bb75a48e05eb8
GIT binary patch
literal 184
zcmeAS@N?(olHy`uVBq!ia0vp^Vn8g#!3HEZm#uLCQfx`y?k+$Y2!1;6t_M<_1s;*b
z3=G_zAk1if^7LAuAbW|YuPggKW?5b)Ue}!Uj6fk*PZ!4!kK=ErZR9;*Ai%`0{d@gH
z!@`MXPlInfV%x#=SNTZ$Ojl0L264r6!pk#`iT?k<aHGz>+v!#FmpkhOcL%y0_2Qkz
Z>->%D;{Iv&mw^T{c)I$ztaD0e0sv_tIRgLy

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/view_more_now.png b/res/drawable-xhdpi/view_more_now.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9303be1f68de227dcdbee21adb6574bf80eedca
GIT binary patch
literal 436
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmPqv#hWIn`YUXCI$vZM^6{WkcwMxZ|v7|aTGcJvH!oz
z;=osX8eEjExXv%UR>?2t($N&OXvu|u1wwm01e{bh&Dwo3O?h{A=DWG~x9{FQ>$C0i
zGjk-JI22n1xKdemvmV`j_iyr+FI*iB9B>4ZbgF#fsxdi%#l-=RI7$=QR{sy(n`|m#
z(5kERkg<O$=Zqs#X&ZZ3?>t;A!uUAi{f~Lay+lvjM)`^xTvS~kd;F0>?!^|a7f-I|
zUVI|H(0|S&miWC|35yppv1N6uaZ9Yw^%A)7d5ebUf&SdUSE(7hto(Y##VWX;TV%aw
zRpqQWB$v0ly-UdA^_eP9rg^K^-2Wn_J$ugA<UQY|TVJ2>>)*ORByzvpm!!b!cmJp}
zid(#y{&gA0izlM&J7k_^MV2#$-&n7r;mWWlv@u?5g6|p5hv#dU_ZV2^Hkst51H+fW
M)78&qol`;+0C4`R<^TWy

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/view_more_now_dark.png b/res/drawable-xhdpi/view_more_now_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..8eb57093824b11dccadf5aa27c0dc1c94c956abd
GIT binary patch
literal 452
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmPqv#hW&$J57`+!z=b13g_FLn>~)onh<6;wa!2e{z#V
z_lzn=WBtT;sy59{jTy^2kFljSJzSKqqO-HRQ{2EL@{eP)>mMIBnXvMivA$KWstpdB
zI2(T6wR-uk0}{zShH9FME9XB;Rt|GN{%q5F2JQ_A1e87Y<glz_c#~KHBODzQX<WkU
zDLu(5l2ym^mG`bGTc%a=N3eWTnd=dCPUS)JlR8$5sarHx&i<-@f%RJBy)Bu6iyF@V
z_vtn(Z)tPjztP{3c+6=<U{uO0&U?(a1wT#*J+MA=;#-{$%DS86+MccM&iT5fAv-}`
zY2GHzigiW*7un5lJrG)Z&6u-dW!m4GJIr&Zo&S~R!lO3rQ0q6AJoP=lwF?9U_o{95
zie;2iez0uSH#T49sX7bJNf(F+re9{uYHqMj&{mR5=M4Fz_JdF6oYCv2(~B>CjQ`be
ctmZT8RFzuG@Eyy|fZ@&H>FVdQ&MBb@0IFHBfB*mh

literal 0
HcmV?d00001

diff --git a/res/drawable/audio_player_seekbar_dark.xml b/res/drawable/audio_player_seekbar_dark.xml
new file mode 100644
index 0000000..e37b4ad
--- /dev/null
+++ b/res/drawable/audio_player_seekbar_dark.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2012 Andrew Neal
+ 
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+ 
+       http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@android:id/background"
+        android:drawable="@drawable/scrubber_track_holo_dark_dark"/>
+    <item android:id="@android:id/secondaryProgress">
+        <scale
+            android:drawable="@drawable/scrubber_secondary_holo"
+            android:scaleWidth="100%" />
+    </item>
+    <item android:id="@android:id/progress">
+        <scale
+            android:drawable="@drawable/scrubber_primary_holo"
+            android:scaleWidth="100%" />
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/res/drawable/gridview_item_background_dark.xml b/res/drawable/gridview_item_background_dark.xml
new file mode 100644
index 0000000..dc1bb94
--- /dev/null
+++ b/res/drawable/gridview_item_background_dark.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:bottom="1dp">
+        <shape android:shape="rectangle"
+            android:dither="true">
+
+            <corners android:radius="2dp"/>
+
+            <solid android:color="#454545" />
+
+        </shape>
+    </item>
+    <item android:top="1dp" >
+        <shape android:shape="rectangle"
+            android:dither="true">
+
+            <corners android:radius="2dp"/>
+
+            <solid android:color="#111111" />
+
+        </shape>
+    </item>
+
+    <item android:top="1dp" android:bottom="1dp">
+        <shape android:shape="rectangle"
+            android:dither="true">
+
+            <corners android:radius="2dp" />
+
+            <solid android:color="@color/light_grey_dark" />
+
+            <padding android:bottom="8dp"
+                android:left="8dp"
+                android:right="8dp"
+                android:top="8dp" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/res/drawable/listview_item_background_dark.xml b/res/drawable/listview_item_background_dark.xml
new file mode 100644
index 0000000..d315565
--- /dev/null
+++ b/res/drawable/listview_item_background_dark.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:bottom="2dp">
+        <shape android:shape="rectangle"
+            android:dither="true">
+
+            <corners android:radius="2dp"/>
+
+            <solid android:color="#454545" />
+
+        </shape>
+    </item>
+    <item android:top="1dp" >
+        <shape android:shape="rectangle"
+            android:dither="true">
+
+            <corners android:radius="2dp"/>
+
+            <solid android:color="#1a1a1a" />
+
+        </shape>
+    </item>
+
+    <item android:top="1dp" android:bottom="2dp">
+        <shape android:shape="rectangle"
+            android:dither="true">
+
+            <corners android:radius="2dp" />
+
+            <solid android:color="@color/light_grey_dark" />
+
+            <padding android:bottom="8dp"
+                android:left="8dp"
+                android:right="8dp"
+                android:top="8dp" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/res/drawable/shuffle_background_dark.xml b/res/drawable/shuffle_background_dark.xml
new file mode 100644
index 0000000..691971e
--- /dev/null
+++ b/res/drawable/shuffle_background_dark.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+    <selector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:example="http://schemas.android.com/apk/res/com.charlesharley.example.android.customdrawablestates"
+    >
+     
+    <!--
+    We make the pressed and focused selector items transparent so the ListView's own selector states show through.
+    -->
+     
+    <item android:state_pressed="true"
+    android:drawable="@color/holo_blue_dark"
+    />
+     
+    <item android:state_focused="true"
+    android:drawable="@color/holo_blue_dark"
+    />
+     
+    <item 
+    android:drawable="@color/background_grey_dark"
+    />
+     
+    </selector>
diff --git a/res/layout/dragsort_listview.xml b/res/layout/dragsort_listview.xml
index e44ccf3..f36019e 100644
--- a/res/layout/dragsort_listview.xml
+++ b/res/layout/dragsort_listview.xml
@@ -12,20 +12,7 @@
     <com.mobeta.android.dslv.DragSortListView
     	xmlns:dslv="http://schemas.android.com/apk/lib/com.mobeta.android.dslv"
 	    android:id="@+id/list_view"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:cacheColorHint="@color/transparent"
-        android:drawSelectorOnTop="false"
-        android:fastScrollAlwaysVisible="false"
-        android:fastScrollEnabled="false"
-        android:scrollbars="none"
-        android:listSelector="@drawable/holo_selector"
-        android:background="@color/background_grey"
-  		android:divider="@android:color/transparent"
-  		android:dividerHeight="@dimen/listview_items_padding_top_bottom"
-        android:paddingRight="@dimen/listview_items_padding_top_bottom" 
-        android:paddingLeft="@dimen/listview_items_padding_top_bottom"
+	    style="?ListviewDragWrapper"
 	    dslv:drag_enabled="true"
     	dslv:drag_handle_id="@+id/listview_drag_handle"
 	    dslv:collapsed_height="2dp"
diff --git a/res/layout/listview_items.xml b/res/layout/listview_items.xml
index c41c201..3870f2d 100644
--- a/res/layout/listview_items.xml
+++ b/res/layout/listview_items.xml
@@ -6,8 +6,6 @@
         android:id="@+id/listview_item_image"
         style="?ListviewItemArt"/>
 
-    <!-- Padding may be set on via code for some tabs -->
-
     <TextView
         android:id="@+id/listview_item_line_one"
         style="?ListviewItemLineOne"/>
diff --git a/res/layout/listview_items_search.xml b/res/layout/listview_items_search.xml
new file mode 100644
index 0000000..637c18b
--- /dev/null
+++ b/res/layout/listview_items_search.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    style="?ListviewItemWrapper" >
+ 
+    <TextView
+        android:id="@+id/listview_item_line_one"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:ellipsize="marquee"
+        android:maxLength="29"
+        android:paddingLeft="@dimen/listview_items_padding_left_top"
+        android:paddingRight="@dimen/listview_items_padding_right"
+        android:paddingTop="@dimen/listview_items_padding_left_top"
+        android:singleLine="true"
+        android:textSize="@dimen/text_size_small_medium"
+        style="?ListviewItemLineOne"/>
+
+    <TextView
+        android:id="@+id/listview_item_line_two"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="@dimen/listview_items_padding_left_top"
+        android:paddingRight="@dimen/listview_items_padding_right"
+        android:paddingTop="@dimen/listview_items_padding_small_top"
+        android:singleLine="true"
+        android:layout_below="@+id/listview_item_line_one"
+        android:ellipsize="end"
+        android:textSize="@dimen/text_size_small" 
+        style="?ListviewItemLineTwo"/>
+
+</RelativeLayout>
diff --git a/res/layout/playlist_dialog.xml b/res/layout/playlist_dialog.xml
new file mode 100644
index 0000000..e550fc3
--- /dev/null
+++ b/res/layout/playlist_dialog.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal"
+    style="?PlaylistDialog" >
+
+</LinearLayout>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 158ea6e..4106d8f 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -11,6 +11,12 @@
         <item>@string/tab_genres</item>
     </string-array>
     
+    
+     <string-array name="theme_types">
+        <item>@string/theme_light</item>
+        <item>@string/theme_dark</item>
+    </string-array>
+    
      <string-array name="visualization_types">
         <item>@string/visual_none</item>
         <item>@string/visual_bargraph</item>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 3d30f7c..616cb75 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-		<declare-styleable name="ApolloTheme.Light">
+		<declare-styleable name="ApolloTheme">
+			<attr name="PlaylistDialog" format="reference" />
 			<attr name="Tabs" format="reference" />
     		<attr name="BottomActionBarItem" format="reference" />
     		<attr name="BottomActionBarText" format="reference" />
@@ -37,6 +38,7 @@
     		<attr name="ListviewItemLineOne" format="reference" />
     		<attr name="ListviewItemLineTwo" format="reference" />
     		<attr name="ListviewDragHandle" format="reference" />
+    		<attr name="ListviewDragWrapper" format="reference" />
     		<attr name="Listview" format="reference" />
     		<attr name="Gridview" format="reference" />
     		<attr name="GridviewItemWrapper" format="reference" />
@@ -55,5 +57,17 @@
     		<attr name="ShuffleWrapper" format="reference" />
     		<attr name="ShuffleImage" format="reference" />
     		<attr name="TracksBrowserWrapper" format="reference" />
+    		
+    		<!-- Resources needed to be grabbed by app directly from themes -->
+    		<attr name="AlbumArtNormal" format="reference" />
+    		<attr name="AlbumArtSmall" format="reference" />
+    		<attr name="AudioPauseButton" format="reference" />
+    		<attr name="AudioPlayButton" format="reference" />
+    		<attr name="AudioShuffleButton" format="reference" />
+    		<attr name="AudioRepeatButton" format="reference" />
+    		<attr name="AudioFavoritesButton" format="reference" />
+    		<attr name="AudioQueueButton" format="reference" />
+    		<attr name="AudioTextColor" format="reference" />
+    		
 		</declare-styleable>
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 3b0da2a..e66f1ca 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -4,12 +4,20 @@
     <!-- A transparent black -->
     <color name="transparent_black">#aa000000</color>
     
+    <color name="transparent_white">#aaffffff</color>
+    
     <!-- selected tab text -->
     <color name="selected_tabtext">#bb000000</color>
     
     <!-- non selected tab text -->
     <color name="unselected_tabtext">#77000000</color>
 
+    <!-- selected tab text -->
+    <color name="selected_tabtext_dark">#bbffffff</color>
+    
+    <!-- non selected tab text -->
+    <color name="unselected_tabtext_dark">#77ffffff</color>
+    
     <!-- A semi-transparent dark Holo shade of blue -->
     <color name="holo_blue_dark">#ff0099cc</color>
     
@@ -17,6 +25,10 @@
 
     <color name="background_grey">#ffdedede</color>
     
+    <color name="background_grey_dark">#ff1a1a1a</color>
+    
+    <color name="light_grey_dark">#ff262626</color>
+    
     <!-- Transparent -->
     <color name="transparent">#00000000</color>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 33bfafc..61d47c8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -113,9 +113,9 @@
     <string name="eqalizer">Equalizer</string>
     <string name="header_interface">Interface</string>
     <string name="settings_storage_category">Storage</string>
-    <string name="themes">Themes</string>
-    <string name="apollo_themes">Select theme for Apollo</string>
-    <string name="select_theme">Select your theme</string>
+    <string name="themes">Theme Chooser</string>
+    <string name="themes_title">Theme Chooser</string>
+    <string name="themes_subtitle">Select theme for ApolloMod</string>
     <string name="version">ApolloMod Version</string>
     <string name="tab_visibility_title">Tab visibility</string>
     <string name="tab_visibility_summary">Choose which tabs are displayed</string>
@@ -143,7 +143,7 @@ https://github.com/CyanogenMod/android_packages_apps_Apollo/tree/cm-10.1
     
     <!-- Settings keys -->
     <string name="key_themes" translatable="false">themepreview</string>
-    <string name="key_themes_package" translatable="false">themePackageName</string>
+    <string name="key_current_theme" translatable="false">current_theme</string>
     <string name="key_themes_preferences" translatable="false">themePrefences</string>
     <string name="key_build_version" translatable="false">build_version</string>
     <string name="key_build_depends" translatable="false">build_depends</string>
@@ -177,6 +177,10 @@ https://github.com/CyanogenMod/android_packages_apps_Apollo/tree/cm-10.1
     <string name="visual_bargraph">Bar Graph</string>
     <string name="visual_solidbargraph">Solid Bar Graph</string>
     <string name="visual_waveform">Waveform</string>
+    
+    <!-- Themes -->
+    <string name="theme_light">Light Theme</string>
+    <string name="theme_dark">Dark Theme</string>
 
     <!-- External file dialog -->
     <string name="play_external_question_msg">Select the action to apply to: \n\n<b><xliff:g id="name">%s</xliff:g></b></string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 79036d8..2fb7042 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -216,6 +216,18 @@
         <item name="android:layout_alignParentLeft">true</item> 
         <item name="android:scaleType">center</item> 
     </style>
+    <style name="ListviewDragWrapperLayout">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">0dp</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:drawSelectorOnTop">false</item>
+        <item name="android:fastScrollAlwaysVisible">false</item>
+        <item name="android:fastScrollEnabled">false</item>
+        <item name="android:scrollbars">none</item>
+        <item name="android:dividerHeight">@dimen/listview_items_padding_top_bottom</item>
+        <item name="android:paddingRight">@dimen/listview_items_padding_top_bottom</item> 
+        <item name="android:paddingLeft">@dimen/listview_items_padding_top_bottom</item>
+    </style>
     <!-- Gridview Styles -->    
     <style name="GridviewLayout">
         <item name="android:layout_width">match_parent</item> 
@@ -384,6 +396,8 @@
         <item name="android:textStyle">bold</item>
     </style> 
     
+    <style name="PlaylistDialog_Light" parent="@android:style/Theme.Holo.Light.Dialog.NoActionBar" ></style>
+    
 	<!-- BottomActionBar -->  
 	<style name="BottomActionBar_Light" parent="BottomActionBarLayout">
         <item name="android:background">@drawable/holo_selector</item>
@@ -517,6 +531,12 @@
     <style name="ListviewDragHandle_Light" parent="ListviewDragHandleLayout">
         <item name="android:src">@drawable/btn_drag_sort</item>
     </style>
+    <style name="ListviewDragWrapper_Light" parent="ListviewDragWrapperLayout">
+        <item name="android:cacheColorHint">@color/transparent</item>
+        <item name="android:listSelector">@drawable/holo_selector</item>
+        <item name="android:background">@color/background_grey</item>
+        <item name="android:divider">@android:color/transparent</item>
+    </style>
     
     <!-- Gridview Styles -->
     <style name="Gridview_Light" parent="GridviewLayout">
@@ -599,6 +619,168 @@
     
     
     
+	<!-- 
+		DARK THEME STYLES
+	-->	
+    <style name="PlaylistDialog_Dark" parent="@android:style/Theme.Holo.Dialog.NoActionBar" ></style>
+  
+    <!-- Tabs -->
+    <style name="Tabs_Dark" parent="TabsLayout">
+        <item name="android:textColor">@color/tab_text_color_dark</item>
+        <item name="android:textSize">@dimen/text_size_micro</item>
+        <item name="android:textStyle">bold</item>
+    </style> 
+    <style name="BottomActionBarOuter_Dark" parent="BottomActionBarOuterLayout">
+    	<item name="android:background">@color/light_grey_dark</item> 
+    </style>
+    <style name="BottomActionBarText_Dark" parent="BottomActionBarTextLayout">
+	    <item name="android:textColor">@color/transparent_white</item>
+    </style>    
+    <style name="BottomActionBarFavorites_Dark" parent="BottomActionBarItem_Light">
+        <item name="android:contentDescription">@string/cd_favorite</item>
+        <item name="android:src">@drawable/apollo_holo_dark_favorite_normal</item>
+    </style>
+    <style name="BottomActionBarPrevious_Dark" parent="BottomActionBarItem_Light">
+        <item name="android:contentDescription">@string/cd_previous</item>
+        <item name="android:src">@drawable/apollo_holo_dark_prev</item>
+    </style>
+    <style name="BottomActionBarPlay_Dark" parent="BottomActionBarItem_Light">
+        <item name="android:contentDescription">@string/cd_play</item>
+        <item name="android:src">@drawable/apollo_holo_dark_play</item>
+    </style>
+    <style name="BottomActionBarNext_Dark" parent="BottomActionBarItem_Light">
+        <item name="android:contentDescription">@string/cd_next</item>
+        <item name="android:src">@drawable/apollo_holo_dark_next</item>
+    </style>
+    <style name="BottomActionBarNowQueue_Dark" parent="BottomActionBarItem_Light">
+        <item name="android:contentDescription">@string/cd_show_queue</item>
+        <item name="android:src">@drawable/btn_switch_queue_dark</item>
+    </style>
+    <style name="AudioPlayerAlbumArt_Dark" parent="AudioPlayerAlbumArtLayout">
+        <item name="android:src">@drawable/no_art_normal_dark</item>
+    </style>
+    <style name="AudioPlayerAlbumArtistText_Dark" parent="AudioPlayerAlbumArtistTextLayout">
+        <item name="android:textColor">@color/transparent_white</item>
+        <item name="android:textSize">@dimen/text_size_small</item>
+        <item name="android:textStyle">bold</item>
+    </style>     
+    <style name="AudioPlayerInfoText_Dark" parent="AudioPlayerInfoTextLayout">
+        <item name="android:textColor">@color/transparent_white</item>
+        <item name="android:textSize">@dimen/text_size_small</item>
+    </style>    
+    <style name="AudioPlayerViewMore_Dark" parent="AudioPlayerViewMoreLayout"> 
+        <item name="android:src">@drawable/view_more_now_dark</item>
+        <item name="android:background">@drawable/holo_selector</item>
+    </style>    
+    <style name="AudioPlayerTimeText_Dark" parent="AudioPlayerTimeTextLayout">
+        <item name="android:textColor">@color/transparent_white</item>
+        <item name="android:textSize">@dimen/text_size_small</item>
+    </style>
+    <style name="AudioPlayerQueueBG_Dark" parent="AudioPlayerQueueBGLayout">
+        <item name="android:background">@color/background_grey_dark</item>
+    </style>
+    <style name="AudioPlayerPrevious_Dark" parent="AudioPlayerButton_Light">
+        <item name="android:contentDescription">@string/cd_previous</item>
+        <item name="android:src">@drawable/apollo_holo_dark_prev</item> 
+    </style>
+    <style name="AudioPlayerPlay_Dark" parent="AudioPlayerButton_Light">
+        <item name="android:contentDescription">@string/cd_play</item>
+        <item name="android:src">@drawable/apollo_holo_dark_pause</item> 
+    </style>
+    <style name="AudioPlayerNext_Dark" parent="AudioPlayerButton_Light">
+        <item name="android:contentDescription">@string/cd_next</item>
+        <item name="android:src">@drawable/apollo_holo_dark_next</item> 
+    </style>
+    <style name="AudioPlayerRepeat_Dark" parent="AudioPlayerButton_Light">
+        <item name="android:contentDescription">@string/cd_repeat</item>
+        <item name="android:src">@drawable/apollo_holo_light_repeat_normal</item> 
+    </style>
+    <style name="AudioPlayerShuffle_Dark" parent="AudioPlayerButton_Light">
+        <item name="android:contentDescription">@string/cd_shuffle</item>
+        <item name="android:src">@drawable/apollo_holo_dark_shuffle_normal</item> 
+    </style>
+    <style name="AudioPlayerSeek_Dark" parent="AudioPlayerSeekLayout">  
+        <item name="android:progressDrawable">@drawable/audio_player_seekbar_dark</item>
+    </style>
+    
+    <!-- Context Menu Styles -->
+    <style name="ContextMenuLine_Dark" parent="ContextMenuLineLayout">
+        <item name="android:background">@color/transparent_white</item>
+    </style>
+    <style name="ContextMenuArrow_Dark" parent="ContextMenuArrowLayout">
+        <item name="android:src">@drawable/dropdown_ic_arrow_normal_holo_dark</item>
+    </style>
+    
+    
+    <!-- Library Browser Styles -->
+    <style name="LibraryWrapper_Dark" parent="LibraryWrapperLayout">
+        <item name="android:background">@color/background_grey_dark</item>        
+    </style>
+    <style name="ListviewItemArt_Dark" parent="ListviewItemArtLayout">
+        <item name="android:background">@drawable/no_art_small_dark</item>
+    </style>
+    <style name="LibraryTabsWrapper_Dark" parent="LibraryTabsWrapperLayout">
+        <item name="android:background">@color/light_grey_dark</item>  
+    </style>    
+    
+    <style name="ListviewItemWrapper_Dark" parent="ListviewItemWrapperLayout">
+        <item name="android:background">@drawable/listview_item_background_dark</item>
+    </style>
+    <style name="ListviewItemLineOne_Dark" parent="ListviewItemLineOneLayout">
+        <item name="android:textColor">@color/white</item> 
+    </style>
+    <style name="ListviewItemLineTwo_Dark" parent="ListviewItemLineTwoLayout">
+        <item name="android:textColor">@color/transparent_white</item>
+    </style>
+    <style name="Listview_Dark" parent="ListviewLayout">
+        <item name="android:listSelector">@drawable/holo_selector</item> 
+        <item name="android:background">@color/background_grey_dark</item> 
+        <item name="android:divider">@android:color/transparent</item> 
+        <item name="android:cacheColorHint">@color/transparent</item> 
+    </style>
+    <style name="ListviewDragHandle_Dark" parent="ListviewDragHandleLayout">
+        <item name="android:src">@drawable/btn_drag_sort_dark</item>
+    </style>
+    <style name="ListviewDragWrapper_Dark" parent="ListviewDragWrapperLayout">
+        <item name="android:cacheColorHint">@color/transparent</item>
+        <item name="android:listSelector">@drawable/holo_selector</item>
+        <item name="android:background">@color/background_grey_dark</item>
+        <item name="android:divider">@android:color/transparent</item>
+    </style>
+  
+    <style name="Gridview_Dark" parent="GridviewLayout">
+        <item name="android:background">@color/background_grey_dark</item> 
+        <item name="android:cacheColorHint">@color/transparent</item> 
+    </style>
+    <style name="GridviewItemArt_Dark" parent="GridviewItemArtLayout"> 
+        <item name="android:background">@drawable/no_art_small_dark</item> 
+    </style>
+    <style name="GridviewItemWrapper_Dark" parent="GridviewItemWrapperLayout">
+        <item name="android:background">@drawable/gridview_item_background_dark</item>  
+    </style>
+    <style name="GridviewRecentsArt_Dark" parent="GridviewRecentsArtLayout">
+        <item name="android:background">@drawable/no_art_small_dark</item>
+    </style>
+    <style name="GridviewRecentsWrapper_Dark" parent="GridviewRecentsWrapperLayout">
+        <item name="android:background">@drawable/gridview_item_background_dark</item>  
+    </style>
+    <style name="GridviewRecentsText_Dark" parent="GridviewRecentsTextLayout">
+        <item name="android:textColor">@color/transparent_white</item>      
+    </style>
+    
+    <style name="ShuffleWrapper_Dark" parent="ShuffleWrapperLayout">
+        <item name="android:background">@drawable/shuffle_background_dark</item>
+        <item name="android:textColor">@color/transparent_white</item>
+    </style>
+    <style name="ShuffleImage_Dark" parent="ShuffleImageLayout">
+        <item name="android:background">@drawable/apollo_holo_dark_shuffle_normal</item>
+	</style>
+    <!-- Track Browser Styles -->
+    <style name="TracksBrowserWrapper_Dark" parent="TracksBrowserWrapperLayout">
+        <item name="android:background">@color/background_grey_dark</item> 
+    </style>
+    
+    
 
    
 
diff --git a/res/values/themes.xml b/res/values/themes.xml
index c96fc64..c50f2f8 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -5,8 +5,19 @@
         <item name="android:actionBarStyle">@style/ApolloTheme.BlueActionBar</item>
     	<item name="android:actionOverflowButtonStyle">@style/ApolloTheme.OverFlow</item>
     	
+    	<item name="PlaylistDialog">@style/PlaylistDialog_Light</item>
     	<item name="Tabs">@style/Tabs_Light</item>
     	
+    	<item name="AlbumArtNormal">@drawable/no_art_normal</item>
+    	<item name="AlbumArtSmall">@drawable/no_art_small</item>
+    	<item name="AudioPlayButton">@drawable/apollo_holo_light_play</item>
+    	<item name="AudioPauseButton">@drawable/apollo_holo_light_pause</item>
+    	<item name="AudioShuffleButton">@drawable/apollo_holo_light_shuffle_normal</item>
+    	<item name="AudioRepeatButton">@drawable/apollo_holo_light_repeat_normal</item>
+    	<item name="AudioFavoritesButton">@drawable/apollo_holo_light_favorite_normal</item>
+    	<item name="AudioQueueButton">@drawable/btn_switch_queue</item>
+    	<item name="AudioTextColor">@color/transparent_black</item>
+    	
     	<item name="BottomActionBarItem">@style/BottomActionBarItem_Light</item>
     	<item name="BottomActionBarText">@style/BottomActionBarText_Light</item>
     	<item name="BottomActionBarDivider">@style/BottomActionBarDivider_Light</item>
@@ -46,6 +57,7 @@
     	<item name="ListviewItemLineTwo">@style/ListviewItemLineTwo_Light</item>
     	<item name="Listview">@style/Listview_Light</item>
     	<item name="ListviewDragHandle">@style/ListviewDragHandle_Light</item>
+    	<item name="ListviewDragWrapper">@style/ListviewDragWrapper_Light</item>
     	
     	<item name="Gridview">@style/Gridview_Light</item>
     	<item name="GridviewItemWrapper">@style/GridviewItemWrapper_Light</item>
@@ -73,4 +85,92 @@
     	<item name="TracksBrowserWrapper">@style/TracksBrowserWrapper_Light</item>
     </style>
     
+    
+    
+    
+    
+    <style name="ApolloTheme.Dark" parent="@android:style/Theme.Holo">
+        <item name="android:actionBarStyle">@style/ApolloTheme.BlueActionBar</item>
+    	<item name="android:actionOverflowButtonStyle">@style/ApolloTheme.OverFlow</item>
+    	
+    	<item name="PlaylistDialog">@style/PlaylistDialog_Dark</item>
+    	<item name="Tabs">@style/Tabs_Dark</item>
+    	
+    	<item name="AlbumArtNormal">@drawable/no_art_normal_dark</item>
+    	<item name="AlbumArtSmall">@drawable/no_art_small_dark</item>
+    	<item name="AudioPlayButton">@drawable/apollo_holo_dark_play</item>
+    	<item name="AudioPauseButton">@drawable/apollo_holo_dark_pause</item>
+    	<item name="AudioShuffleButton">@drawable/apollo_holo_dark_shuffle_normal</item>
+    	<item name="AudioRepeatButton">@drawable/apollo_holo_dark_repeat_normal</item>
+    	<item name="AudioFavoritesButton">@drawable/apollo_holo_dark_favorite_normal</item>
+    	<item name="AudioQueueButton">@drawable/btn_switch_queue_dark</item>
+    	<item name="AudioTextColor">@color/transparent_white</item>
+    	
+    	<item name="BottomActionBarItem">@style/BottomActionBarItem_Light</item>
+    	<item name="BottomActionBarText">@style/BottomActionBarText_Dark</item>
+    	<item name="BottomActionBarDivider">@style/BottomActionBarDivider_Light</item>
+    	<item name="BottomActionBar">@style/BottomActionBar_Light</item>
+    	<item name="BottomActionBarWrapper">@style/BottomActionBarWrapper_Light</item>
+    	<item name="BottomActionBarOuter">@style/BottomActionBarOuter_Dark</item>
+    	<item name="BottomActionBarFavorites">@style/BottomActionBarFavorites_Dark</item>
+    	<item name="BottomActionBarPrevious">@style/BottomActionBarPrevious_Dark</item>
+    	<item name="BottomActionBarPlay">@style/BottomActionBarPlay_Dark</item>
+    	<item name="BottomActionBarNext">@style/BottomActionBarNext_Dark</item>
+    	<item name="BottomActionBarNowQueue">@style/BottomActionBarNowQueue_Dark</item>
+    	
+    	<item name="AudioPlayerAlbumArt">@style/AudioPlayerAlbumArt_Dark</item>
+    	<item name="AudioPlayerText">@style/AudioPlayerText_Light</item>
+    	<item name="AudioPlayerArtistAlbumText">@style/AudioPlayerAlbumArtistText_Dark</item>
+    	<item name="AudioPlayerInfoText">@style/AudioPlayerInfoText_Dark</item>
+    	<item name="AudioPlayerViewMore">@style/AudioPlayerViewMore_Dark</item>
+    	<item name="AudioPlayerButton">@style/AudioPlayerButton_Light</item>
+    	<item name="AudioPlayerTimeText">@style/AudioPlayerTimeText_Dark</item>
+    	<item name="AudioPlayerNowPlayingText">@style/AudioPlayerNowPlayingText_Light</item>
+    	<item name="AudioPlayerQueueBG">@style/AudioPlayerQueueBG_Dark</item>
+    	<item name="AudioPlayerColorstrip">@style/AudioPlayerColorstrip_Light</item>
+    	<item name="AudioPlayerColorstripShadow">@style/AudioPlayerColorstripShadow_Light</item>
+    	<item name="AudioPlayerPrevious">@style/AudioPlayerPrevious_Dark</item>
+    	<item name="AudioPlayerPlay">@style/AudioPlayerPrevious_Dark</item>
+    	<item name="AudioPlayerNext">@style/AudioPlayerNext_Dark</item>
+    	<item name="AudioPlayerRepeat">@style/AudioPlayerRepeat_Dark</item>
+    	<item name="AudioPlayerShuffle">@style/AudioPlayerShuffle_Dark</item>
+    	<item name="AudioPlayerSeek">@style/AudioPlayerSeek_Dark</item>
+    	
+    	<item name="ContextMenuLine">@style/ContextMenuLine_Dark</item>
+    	<item name="ContextMenuArrow">@style/ContextMenuArrow_Dark</item>
+    	
+    	<item name="ListviewItemWrapper">@style/ListviewItemWrapper_Dark</item>
+    	<item name="ListviewItemArt">@style/ListviewItemArt_Dark</item>
+    	<item name="ListviewItemLineOne">@style/ListviewItemLineOne_Dark</item>
+    	<item name="ListviewItemLineTwo">@style/ListviewItemLineTwo_Dark</item>
+    	<item name="Listview">@style/Listview_Dark</item>
+    	<item name="ListviewDragHandle">@style/ListviewDragHandle_Dark</item>
+    	<item name="ListviewDragWrapper">@style/ListviewDragWrapper_Dark</item>
+    	
+    	<item name="Gridview">@style/Gridview_Dark</item>
+    	<item name="GridviewItemWrapper">@style/GridviewItemWrapper_Dark</item>
+    	<item name="GridviewItemArt">@style/GridviewItemArt_Dark</item>
+    	<item name="GridviewItemTextWrapper">@style/GridviewItemTextWrapper_Light</item>
+    	
+    	<item name="GridviewRecentsWrapper">@style/GridviewRecentsWrapper_Dark</item>
+    	<item name="GridviewRecentsArt">@style/GridviewRecentsArt_Dark</item>
+    	<item name="GridviewRecentsShadowedText">@style/GridviewRecentsShadowedText_Light</item>
+    	<item name="GridviewRecentsText">@style/GridviewRecentsText_Dark</item>
+    	
+    	<item name="ShadowedText">@style/ShadowedText_Light</item>
+    	
+    	<item name="Colorstrip">@style/Colorstrip_Light</item>
+    	
+    	<item name="HalfTextWrapper">@style/HalfTextWrapper_Light</item>
+    	<item name="HalfTextViewMore">@style/HalfTextViewMore_Light</item>
+    	
+    	<item name="LibraryWrapper">@style/LibraryWrapper_Dark</item>
+    	<item name="LibraryTabsWrapper">@style/LibraryTabsWrapper_Dark</item>
+    	
+    	<item name="ShuffleWrapper">@style/ShuffleWrapper_Dark</item>
+    	<item name="ShuffleImage">@style/ShuffleImage_Dark</item>
+    	
+    	<item name="TracksBrowserWrapper">@style/TracksBrowserWrapper_Dark</item>
+    </style>
+    
 </resources>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index 904cb18..2f5b419 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -2,6 +2,18 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <PreferenceCategory android:title="@string/header_interface" >
+        
+        <ListPreference 
+	        android:dialogTitle="@string/themes_title"
+            android:key="@string/key_current_theme"
+            android:title="@string/themes_title"
+            android:summary="@string/themes_subtitle"
+            android:defaultValue="@string/theme_light" 
+            android:entries="@array/theme_types"
+            android:entryValues="@array/theme_types"
+	        android:capitalize="words"
+        	/>          
+        
         <MultiSelectListPreference
 	        android:dialogTitle="@string/tab_visibility_title"
 	        android:key="@string/key_tabs_enabled"
diff --git a/src/com/andrew/apolloMod/Constants.java b/src/com/andrew/apolloMod/Constants.java
index 80f6266..1ac6782 100644
--- a/src/com/andrew/apolloMod/Constants.java
+++ b/src/com/andrew/apolloMod/Constants.java
@@ -13,7 +13,7 @@ public final class Constants {
     public final static String LASTFM_API_KEY = "0bec3f7ec1f914d7c960c12a916c8fb3";
 
     // SharedPreferences
-    public final static String APOLLO = "Apollo", APOLLO_PREFERENCES = "apollopreferences",
+    public final static String APOLLO = "Apollo", APOLLO_PREFERENCES = "apollopreferences", CURRENT_THEME ="current_theme",
             ARTIST_KEY = "artist", ALBUM_KEY = "album", ALBUM_ID_KEY = "albumid", NUMALBUMS = "num_albums",
             GENRE_KEY = "genres", ARTIST_ID = "artistid", NUMWEEKS = "numweeks",BUILD_DEPENDS = "build_depends",
             PLAYLIST_NAME_FAVORITES = "Favorites", PLAYLIST_NAME = "playlist", WIDGET_STYLE="widget_type",
diff --git a/src/com/andrew/apolloMod/activities/MusicLibrary.java b/src/com/andrew/apolloMod/activities/MusicLibrary.java
index 303bdeb..9dc72f0 100644
--- a/src/com/andrew/apolloMod/activities/MusicLibrary.java
+++ b/src/com/andrew/apolloMod/activities/MusicLibrary.java
@@ -55,6 +55,7 @@
 import com.sothree.slidinguppanel.SlidingUpPanelLayout.PanelSlideListener;
 
 import static com.andrew.apolloMod.Constants.TABS_ENABLED;
+import static com.andrew.apolloMod.Constants.CURRENT_THEME;
 
 /**
  * @author Andrew Neal
@@ -73,9 +74,15 @@ public class MusicLibrary extends FragmentActivity implements ServiceConnection
 	private boolean isAlreadyStarted = false;	
     
     @Override
-    protected void onCreate(Bundle icicle) {
+    protected void onCreate(Bundle icicle) { 
+    	SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+    	String type = sp.getString(CURRENT_THEME, getResources().getString(R.string.theme_light));                    
+		if(type.equals(getResources().getString(R.string.theme_light)))
+			setTheme(R.style.ApolloTheme_Light);
+		else
+			setTheme(R.style.ApolloTheme_Dark);
         super.onCreate(icicle);
-
+        
         getWindow().requestFeature(Window.FEATURE_ACTION_BAR_OVERLAY);
         // Landscape mode on phone isn't ready
         if (!ApolloUtils.isTablet(this))
@@ -84,8 +91,7 @@ protected void onCreate(Bundle icicle) {
         // Scan for music
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);       
        // getSupportFragmentManager().beginTransaction().add(R.id.bottomactionbar_new, new BottomActionBarFragment(), "bottomactionbar_new").commit();
-        
-        // Layout
+       // Layout
         setContentView(R.layout.library_browser);
         
         mBActionbar =(BottomActionBarFragment) getSupportFragmentManager().findFragmentById(R.id.bottomactionbar_new);
diff --git a/src/com/andrew/apolloMod/activities/PlayExternal.java b/src/com/andrew/apolloMod/activities/PlayExternal.java
index 74e3ff0..bdebb28 100644
--- a/src/com/andrew/apolloMod/activities/PlayExternal.java
+++ b/src/com/andrew/apolloMod/activities/PlayExternal.java
@@ -16,6 +16,7 @@
 
 package com.andrew.apolloMod.activities;
 
+import static com.andrew.apolloMod.Constants.CURRENT_THEME;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -23,10 +24,12 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.RemoteException;
+import android.preference.PreferenceManager;
 import android.util.Log;
 import android.widget.Toast;
 
@@ -51,6 +54,12 @@ public class PlayExternal extends Activity
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
+    	SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+    	String type = sp.getString(CURRENT_THEME, getResources().getString(R.string.theme_light));                    
+		if(type.equals(getResources().getString(R.string.theme_light)))
+			setTheme(R.style.ApolloTheme_Light);
+		else
+			setTheme(R.style.ApolloTheme_Dark);
         super.onCreate(savedInstanceState);
 
         // Get the external file to play
diff --git a/src/com/andrew/apolloMod/activities/QueryBrowserActivity.java b/src/com/andrew/apolloMod/activities/QueryBrowserActivity.java
index 7ef4703..eb687d9 100644
--- a/src/com/andrew/apolloMod/activities/QueryBrowserActivity.java
+++ b/src/com/andrew/apolloMod/activities/QueryBrowserActivity.java
@@ -24,13 +24,13 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.content.SharedPreferences;
 import android.database.Cursor;
-import android.database.DatabaseUtils;
-import android.graphics.Color;
 import android.media.AudioManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.IBinder;
+import android.preference.PreferenceManager;
 import android.provider.BaseColumns;
 import android.provider.MediaStore;
 import android.provider.MediaStore.Audio;
@@ -38,9 +38,6 @@
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.SimpleCursorAdapter;
 import android.widget.TextView;
@@ -53,6 +50,7 @@
 import static com.andrew.apolloMod.Constants.ALBUM_KEY;
 import static com.andrew.apolloMod.Constants.ARTIST_ID;
 import static com.andrew.apolloMod.Constants.ARTIST_KEY;
+import static com.andrew.apolloMod.Constants.CURRENT_THEME;
 import static com.andrew.apolloMod.Constants.MIME_TYPE;
 
 public class QueryBrowserActivity extends ListActivity implements ServiceConnection {
@@ -71,6 +69,12 @@ public QueryBrowserActivity() {
     @SuppressWarnings("deprecation")
     @Override
     public void onCreate(Bundle icicle) {
+    	SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+    	String type = sp.getString(CURRENT_THEME, getResources().getString(R.string.theme_light));                    
+		if(type.equals(getResources().getString(R.string.theme_light)))
+			setTheme(R.style.ApolloTheme_Light);
+		else
+			setTheme(R.style.ApolloTheme_Dark);
         super.onCreate(icicle);
         setVolumeControlStream(AudioManager.STREAM_MUSIC);
         mAdapter = (QueryListAdapter)getLastNonConfigurationInstance();
@@ -120,6 +124,7 @@ public void onServiceConnected(ComponentName name, IBinder service) {
                 intent.setClass(this, TracksBrowser.class);
                 intent.putExtras(bundle);
                 startActivity(intent);
+                finish();
                 return;
             }
         }
@@ -152,7 +157,7 @@ public void onServiceConnected(ComponentName name, IBinder service) {
         mTrackList = getListView();
         mTrackList.setTextFilterEnabled(true);
         if (mAdapter == null) {
-            mAdapter = new QueryListAdapter(getApplication(), this, R.layout.listview_items, null, // cursor
+            mAdapter = new QueryListAdapter(getApplication(), this, R.layout.listview_items_search, null, // cursor
                     new String[] {}, new int[] {}, 0);
             setListAdapter(mAdapter);
             if (TextUtils.isEmpty(mFilterString)) {
@@ -335,21 +340,7 @@ public AsyncQueryHandler getQueryHandler() {
         public void bindView(View view, Context context, Cursor cursor) {
 
             TextView tv1 = (TextView)view.findViewById(R.id.listview_item_line_one);
-            tv1.setTextColor(Color.BLACK);
             TextView tv2 = (TextView)view.findViewById(R.id.listview_item_line_two);
-            tv2.setTextColor(Color.BLACK);
-            ImageView iv = (ImageView)view.findViewById(R.id.listview_item_image);
-            iv.setVisibility(View.GONE);
-            FrameLayout fl = (FrameLayout)view.findViewById(R.id.track_list_context_frame);
-            fl.setVisibility(View.GONE);
-            ViewGroup.LayoutParams p = iv.getLayoutParams();
-            if (p == null) {
-                // seen this happen, not sure why
-                DatabaseUtils.dumpCursor(cursor);
-                return;
-            }
-            p.width = ViewGroup.LayoutParams.WRAP_CONTENT;
-            p.height = ViewGroup.LayoutParams.WRAP_CONTENT;
 
             String mimetype = cursor.getString(cursor.getColumnIndexOrThrow(Audio.Media.MIME_TYPE));
 
@@ -440,7 +431,11 @@ public Cursor runQueryOnBackgroundThread(CharSequence constraint) {
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         if (keyCode == KeyEvent.KEYCODE_BACK) {
-            finish();
+        	Intent i = getBaseContext().getPackageManager()
+	   	             .getLaunchIntentForPackage( getBaseContext().getPackageName() );
+	   		i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+	   		startActivity(i);
+	   		finish();
             return true;
         }
         return super.onKeyDown(keyCode, event);
diff --git a/src/com/andrew/apolloMod/activities/QuickQueue.java b/src/com/andrew/apolloMod/activities/QuickQueue.java
index 3ed9c36..8bef00d 100644
--- a/src/com/andrew/apolloMod/activities/QuickQueue.java
+++ b/src/com/andrew/apolloMod/activities/QuickQueue.java
@@ -4,14 +4,18 @@
 
 package com.andrew.apolloMod.activities;
 
+import android.content.SharedPreferences;
 import android.media.AudioManager;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.provider.BaseColumns;
 import android.provider.MediaStore.Audio;
 import android.support.v4.app.FragmentActivity;
 
+import com.andrew.apolloMod.R;
 import com.andrew.apolloMod.ui.fragments.grid.QuickQueueFragment;
 
+import static com.andrew.apolloMod.Constants.CURRENT_THEME;
 import static com.andrew.apolloMod.Constants.MIME_TYPE;
 import static com.andrew.apolloMod.Constants.PLAYLIST_QUEUE;
 
@@ -22,6 +26,12 @@ public class QuickQueue extends FragmentActivity {
 
     @Override
     protected void onCreate(Bundle icicle) {
+    	SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+    	String type = sp.getString(CURRENT_THEME, getResources().getString(R.string.theme_light));                    
+		if(type.equals(getResources().getString(R.string.theme_light)))
+			setTheme(R.style.ApolloTheme_Light);
+		else
+			setTheme(R.style.ApolloTheme_Dark);
         // This needs to be called first
         super.onCreate(icicle);
 
diff --git a/src/com/andrew/apolloMod/activities/SimpleEq.java b/src/com/andrew/apolloMod/activities/SimpleEq.java
index 8649b42..40802a7 100644
--- a/src/com/andrew/apolloMod/activities/SimpleEq.java
+++ b/src/com/andrew/apolloMod/activities/SimpleEq.java
@@ -8,6 +8,7 @@
 import android.content.SharedPreferences.Editor;
 import android.content.pm.ActivityInfo;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.NavUtils;
 import android.view.MenuItem;
@@ -44,6 +45,12 @@ public class SimpleEq extends FragmentActivity
     
     @Override
     protected void onCreate(Bundle icicle) {
+    	SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+    	String type = sp.getString(CURRENT_THEME, getResources().getString(R.string.theme_light));                    
+		if(type.equals(getResources().getString(R.string.theme_light)))
+			setTheme(R.style.ApolloTheme_Light);
+		else
+			setTheme(R.style.ApolloTheme_Dark);
         super.onCreate(icicle);
         
         // Landscape mode on phone isn't ready
diff --git a/src/com/andrew/apolloMod/activities/TracksBrowser.java b/src/com/andrew/apolloMod/activities/TracksBrowser.java
index 2e85642..4920f38 100644
--- a/src/com/andrew/apolloMod/activities/TracksBrowser.java
+++ b/src/com/andrew/apolloMod/activities/TracksBrowser.java
@@ -13,6 +13,7 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.IBinder;
+import android.preference.PreferenceManager;
 import android.provider.BaseColumns;
 import android.provider.MediaStore;
 import android.provider.MediaStore.Audio;
@@ -80,6 +81,12 @@ public class TracksBrowser extends FragmentActivity implements ServiceConnection
     
     @Override
     protected void onCreate(Bundle icicle) {
+    	SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+    	String type = sp.getString(CURRENT_THEME, getResources().getString(R.string.theme_light));                    
+		if(type.equals(getResources().getString(R.string.theme_light)))
+			setTheme(R.style.ApolloTheme_Light);
+		else
+			setTheme(R.style.ApolloTheme_Dark);
         super.onCreate(icicle);
         
         getWindow().requestFeature(Window.FEATURE_ACTION_BAR_OVERLAY);
diff --git a/src/com/andrew/apolloMod/helpers/GetBitmapTask.java b/src/com/andrew/apolloMod/helpers/GetBitmapTask.java
index 06af5b1..b7c885c 100644
--- a/src/com/andrew/apolloMod/helpers/GetBitmapTask.java
+++ b/src/com/andrew/apolloMod/helpers/GetBitmapTask.java
@@ -1,9 +1,11 @@
 package com.andrew.apolloMod.helpers;
 
 import android.content.Context;
+import android.content.res.Resources.Theme;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.AsyncTask;
+import android.util.TypedValue;
 
 import com.andrew.apolloMod.R;
 import com.andrew.apolloMod.cache.ImageInfo;
@@ -83,17 +85,20 @@ else if( mImageInfo.size.equals( SIZE_THUMB ) ){
     protected void onPostExecute(Bitmap bitmap) {
         super.onPostExecute(bitmap);
         OnBitmapReadyListener listener = mListenerReference.get();
-        if(bitmap == null && !isCancelled()){
-        	if(mImageInfo.size.equals(SIZE_THUMB))
-        		bitmap = BitmapFactory.decodeResource(mContextReference.get().getResources(),
-        													R.drawable.no_art_small);
-        	else if(mImageInfo.size.equals(SIZE_NORMAL))
-        		bitmap = BitmapFactory.decodeResource(mContextReference.get().getResources(),
-        													R.drawable.no_art_normal);
+        if( bitmap == null && !isCancelled() ){
+			Theme theme = mContextReference.get().getTheme();
+			TypedValue typedvalueattr = new TypedValue();
+        	if( mImageInfo.size.equals(SIZE_THUMB) ) 
+    			theme.resolveAttribute(R.attr.AlbumArtSmall, typedvalueattr, true); 
+        	else if( mImageInfo.size.equals(SIZE_NORMAL) )     			
+    			theme.resolveAttribute(R.attr.AlbumArtNormal, typedvalueattr, true);
+        	
+        	bitmap = BitmapFactory.decodeResource(mContextReference.get().getResources(),
+        															typedvalueattr.resourceId);
         }
-        if (bitmap != null && !isCancelled()) {
-            if (listener != null) {
-                	listener.bitmapReady(bitmap,  ImageUtils.createShortTag(mImageInfo) + mImageInfo.size );
+        if( bitmap != null && !isCancelled() ) {
+            if ( listener != null ) {
+                	listener.bitmapReady( bitmap,  ImageUtils.createShortTag(mImageInfo) + mImageInfo.size );
             }
         }
     }
diff --git a/src/com/andrew/apolloMod/menu/PlaylistDialog.java b/src/com/andrew/apolloMod/menu/PlaylistDialog.java
index fc5049f..477be9d 100644
--- a/src/com/andrew/apolloMod/menu/PlaylistDialog.java
+++ b/src/com/andrew/apolloMod/menu/PlaylistDialog.java
@@ -20,18 +20,22 @@
 import android.app.Dialog;
 import android.content.ContentResolver;
 import android.content.DialogInterface;
+import android.content.SharedPreferences;
 import android.content.DialogInterface.OnCancelListener;
 import android.content.DialogInterface.OnClickListener;
 import android.content.DialogInterface.OnShowListener;
+import android.content.res.Resources.Theme;
 import android.database.Cursor;
 import android.media.AudioManager;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.provider.MediaStore;
 import android.provider.MediaStore.Audio;
 import android.support.v4.app.FragmentActivity;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.DisplayMetrics;
+import android.util.TypedValue;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.LinearLayout;
@@ -40,6 +44,7 @@
 import com.andrew.apolloMod.R;
 import com.andrew.apolloMod.helpers.utils.MusicUtils;
 
+import static com.andrew.apolloMod.Constants.CURRENT_THEME;
 import static com.andrew.apolloMod.Constants.INTENT_CREATE_PLAYLIST;
 import static com.andrew.apolloMod.Constants.INTENT_KEY_DEFAULT_NAME;
 import static com.andrew.apolloMod.Constants.INTENT_KEY_RENAME;
@@ -116,7 +121,18 @@ public void onCancel(DialogInterface dialog) {
     }
 
     @Override
-    public void onCreate(Bundle icicle) {
+    public void onCreate(Bundle icicle) {    	
+    	SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+		String type = sp.getString(CURRENT_THEME, getResources().getString(R.string.theme_light));                    
+		if(type.equals(getResources().getString(R.string.theme_light)))
+			setTheme(R.style.ApolloTheme_Light);
+		else
+			setTheme(R.style.ApolloTheme_Dark);
+	
+		Theme theme = getTheme();
+		TypedValue typedvalueattr = new TypedValue();
+		theme.resolveAttribute(R.attr.PlaylistDialog, typedvalueattr, true); 
+		setTheme(typedvalueattr.resourceId);
 
         super.onCreate(icicle);
         setContentView(new LinearLayout(this));
diff --git a/src/com/andrew/apolloMod/menu/PlaylistPicker.java b/src/com/andrew/apolloMod/menu/PlaylistPicker.java
index 08fe425..f8a23c6 100644
--- a/src/com/andrew/apolloMod/menu/PlaylistPicker.java
+++ b/src/com/andrew/apolloMod/menu/PlaylistPicker.java
@@ -9,13 +9,18 @@
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.res.Resources.Theme;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.util.TypedValue;
 import android.widget.LinearLayout;
 import android.widget.Toast;
 
 import com.andrew.apolloMod.R;
 import com.andrew.apolloMod.helpers.utils.MusicUtils;
 
+import static com.andrew.apolloMod.Constants.CURRENT_THEME;
 import static com.andrew.apolloMod.Constants.INTENT_ADD_TO_PLAYLIST;
 import static com.andrew.apolloMod.Constants.INTENT_CREATE_PLAYLIST;
 import static com.andrew.apolloMod.Constants.INTENT_PLAYLIST_LIST;
@@ -74,6 +79,17 @@ public void onClick(DialogInterface dialog, int which) {
     @Override
     public void onCreate(Bundle icicle) {
 
+    	SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+    	String type = sp.getString(CURRENT_THEME, getResources().getString(R.string.theme_light));                    
+		if(type.equals(getResources().getString(R.string.theme_light)))
+			setTheme(R.style.ApolloTheme_Light);
+		else
+			setTheme(R.style.ApolloTheme_Dark);
+
+    	Theme theme = getTheme();
+		TypedValue typedvalueattr = new TypedValue();
+		theme.resolveAttribute(R.attr.PlaylistDialog, typedvalueattr, true); 
+		setTheme(typedvalueattr.resourceId);
         super.onCreate(icicle);
         setContentView(new LinearLayout(this));
 
diff --git a/src/com/andrew/apolloMod/preferences/SettingsHolder.java b/src/com/andrew/apolloMod/preferences/SettingsHolder.java
index 1b868ac..bc749fd 100644
--- a/src/com/andrew/apolloMod/preferences/SettingsHolder.java
+++ b/src/com/andrew/apolloMod/preferences/SettingsHolder.java
@@ -9,13 +9,16 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.ServiceConnection;
+import android.content.SharedPreferences;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.preference.ListPreference;
 import android.preference.Preference;
+import android.preference.PreferenceManager;
 import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceActivity;
@@ -33,6 +36,7 @@
 import com.andrew.apolloMod.service.ApolloService;
 import com.andrew.apolloMod.service.ServiceToken;
 
+import static com.andrew.apolloMod.Constants.CURRENT_THEME;
 import static com.andrew.apolloMod.Constants.WIDGET_STYLE;
 import static com.andrew.apolloMod.Constants.DELETE_CACHE;
 import static com.andrew.apolloMod.Constants.BUILD_VERSION;
@@ -46,12 +50,19 @@ public class SettingsHolder extends PreferenceActivity  implements ServiceConnec
     
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+    	SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+    	String type = sp.getString(CURRENT_THEME, getResources().getString(R.string.theme_light));                    
+		if(type.equals(getResources().getString(R.string.theme_light)))
+			setTheme(R.style.ApolloTheme_Light);
+		else
+			setTheme(R.style.ApolloTheme_Dark);
         // This should be called first thing
         super.onCreate(savedInstanceState);
         mContext = this;
         // Load settings XML
         int preferencesResId = R.xml.settings;
         addPreferencesFromResource(preferencesResId);
+        initChangeTheme();
         
         //Init widget style change option
         initChangeWidgetTheme();
@@ -75,6 +86,19 @@ public boolean onOptionsItemSelected(MenuItem item) {
         }
         return super.onOptionsItemSelected(item);
     }
+
+    private void initChangeTheme(){
+    	ListPreference listPreference = (ListPreference)findPreference(CURRENT_THEME);
+        listPreference.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+            	Intent intent = getIntent();
+            	finish();
+            	startActivity(intent);
+                return true;
+            }
+        });
+    }
     
     private void initChangeWidgetTheme(){
     	ListPreference listPreference = (ListPreference)findPreference(WIDGET_STYLE);
diff --git a/src/com/andrew/apolloMod/ui/fragments/AudioPlayerFragment.java b/src/com/andrew/apolloMod/ui/fragments/AudioPlayerFragment.java
index 641545d..692f085 100644
--- a/src/com/andrew/apolloMod/ui/fragments/AudioPlayerFragment.java
+++ b/src/com/andrew/apolloMod/ui/fragments/AudioPlayerFragment.java
@@ -13,6 +13,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.res.Resources.Theme;
 import android.database.Cursor;
 import android.database.DatabaseUtils;
 import android.net.Uri;
@@ -27,6 +28,7 @@
 import android.support.v4.app.Fragment;
 import android.support.v4.view.ViewPager;
 import android.support.v4.view.ViewPager.SimpleOnPageChangeListener;
+import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -206,7 +208,7 @@ public void onClick(View v) {
         mAlbumArtPager.setOffscreenPageLimit(3);
         mAlbumArtPager.setCurrentItem(1);
         mAlbumArtPager.setOnPageChangeListener(new AlbumArtPageListener());
-        
+        setRepeatButtonImage();
         FrameLayout mColorstripBottom = (FrameLayout)root.findViewById(R.id.colorstrip_bottom);
         mColorstripBottom.setBackgroundColor(getResources().getColor(R.color.holo_blue_dark));
         return root;
@@ -472,7 +474,10 @@ private void setRepeatButtonImage() {
                     mRepeat.setImageResource(R.drawable.apollo_holo_light_repeat_one);
                     break;
                 default:
-                    mRepeat.setImageResource(R.drawable.apollo_holo_light_repeat_normal);
+                	Theme theme = getActivity().getTheme();
+        			TypedValue typedvalueattr = new TypedValue();
+            		theme.resolveAttribute(R.attr.AudioRepeatButton, typedvalueattr, true); 
+                    mRepeat.setImageResource(typedvalueattr.resourceId);
                     break;
             }
         } catch (RemoteException ex) {
@@ -489,7 +494,10 @@ private void setShuffleButtonImage() {
         try {
             switch (MusicUtils.mService.getShuffleMode()) {
                 case ApolloService.SHUFFLE_NONE:
-                    mShuffle.setImageResource(R.drawable.apollo_holo_light_shuffle_normal);
+                	Theme theme = getActivity().getTheme();
+        			TypedValue typedvalueattr = new TypedValue();
+            		theme.resolveAttribute(R.attr.AudioShuffleButton, typedvalueattr, true); 
+                    mShuffle.setImageResource(typedvalueattr.resourceId);
                     break;
                 case ApolloService.SHUFFLE_AUTO:
                     mShuffle.setImageResource(R.drawable.apollo_holo_light_shuffle_on);
@@ -508,11 +516,14 @@ private void setShuffleButtonImage() {
      */
     private void setPauseButtonImage() {
         try {
+        	Theme theme = getActivity().getTheme();
+			TypedValue typedvalueattr = new TypedValue();
             if (MusicUtils.mService != null && MusicUtils.mService.isPlaying()) {
-                mPlay.setImageResource(R.drawable.apollo_holo_light_pause);
+    			theme.resolveAttribute(R.attr.AudioPauseButton, typedvalueattr, true); 
             } else {
-                mPlay.setImageResource(R.drawable.apollo_holo_light_play);
+    			theme.resolveAttribute(R.attr.AudioPlayButton, typedvalueattr, true); 
             }
+            mPlay.setImageResource(typedvalueattr.resourceId);
         } catch (RemoteException ex) {
             ex.printStackTrace();
         }
@@ -591,6 +602,9 @@ public void onStopTrackingTouch(SeekBar bar) {
      * @return current time
      */
     private long refreshNow() {
+    	Theme theme = getActivity().getTheme();
+		TypedValue typedvalueattr = new TypedValue();
+		theme.resolveAttribute(R.attr.AudioTextColor, typedvalueattr, true); 
         if (MusicUtils.mService == null)
             return 500;
         try {
@@ -601,14 +615,14 @@ private long refreshNow() {
 
                 if (MusicUtils.mService.isPlaying()) {
                     mCurrentTime.setVisibility(View.VISIBLE);
-                    mCurrentTime.setTextColor(getResources().getColor(R.color.transparent_black));
+                    mCurrentTime.setTextColor(getResources().getColor(typedvalueattr.resourceId));
                 } else {
                     // blink the counter
                     int col = mCurrentTime.getCurrentTextColor();
                     mCurrentTime.setTextColor(col == getResources().getColor(
-                            R.color.transparent_black) ? getResources().getColor(
+                    		typedvalueattr.resourceId) ? getResources().getColor(
                             R.color.holo_blue_dark) : getResources().getColor(
-                            R.color.transparent_black));
+                            typedvalueattr.resourceId));
                     remaining = 500;
                 }
 
diff --git a/src/com/andrew/apolloMod/ui/fragments/BottomActionBarFragment.java b/src/com/andrew/apolloMod/ui/fragments/BottomActionBarFragment.java
index 57d5a5e..25aa774 100644
--- a/src/com/andrew/apolloMod/ui/fragments/BottomActionBarFragment.java
+++ b/src/com/andrew/apolloMod/ui/fragments/BottomActionBarFragment.java
@@ -7,9 +7,11 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.res.Resources.Theme;
 import android.os.Bundle;
 import android.os.RemoteException;
 import android.support.v4.app.Fragment;
+import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -55,7 +57,10 @@ public void onClick(View v) {
             		mFavs.setImageResource(R.drawable.apollo_holo_light_favorite_selected);
             	}
             	else{
-            		mFavs.setImageResource(R.drawable.apollo_holo_light_favorite_normal);
+                	Theme theme = getActivity().getTheme();
+            		TypedValue typedvalueattr = new TypedValue();
+            		theme.resolveAttribute(R.attr.AudioFavoritesButton, typedvalueattr, true); 
+            		mFavs.setImageResource(typedvalueattr.resourceId);
             	}
             }
         });
@@ -151,8 +156,11 @@ private void doPauseResume() {
         }
     }
 
-    public void onCollapsed(){    	
-    	mQueue.setImageResource(R.drawable.btn_switch_queue);
+    public void onCollapsed(){    
+    	Theme theme = getActivity().getTheme();
+		TypedValue typedvalueattr = new TypedValue();
+		theme.resolveAttribute(R.attr.AudioQueueButton, typedvalueattr, true); 
+    	mQueue.setImageResource( typedvalueattr.resourceId );
     	mQueue.setVisibility(View.GONE);
     	mFavs.setVisibility(View.GONE);        
         listQueue.setVisibility(View.GONE);
@@ -202,11 +210,14 @@ private void fade(final View v, final float alpha) {
      */
     private void setPauseButtonImage() {
         try {
+        	Theme theme = getActivity().getTheme();
+			TypedValue typedvalueattr = new TypedValue();
             if (MusicUtils.mService != null && MusicUtils.mService.isPlaying()) {
-                mPlay.setImageResource(R.drawable.apollo_holo_light_pause);
+    			theme.resolveAttribute(R.attr.AudioPauseButton, typedvalueattr, true); 
             } else {
-                mPlay.setImageResource(R.drawable.apollo_holo_light_play);
+    			theme.resolveAttribute(R.attr.AudioPlayButton, typedvalueattr, true); 
             }
+            mPlay.setImageResource(typedvalueattr.resourceId);
         } catch (RemoteException ex) {
             ex.printStackTrace();
         }
@@ -233,7 +244,10 @@ public void onClick(View v) {
             	else{
                     listQueue.setVisibility(View.GONE);
                     albumArt.setVisibility(View.VISIBLE);
-            		mQueue.setImageResource(R.drawable.btn_switch_queue);
+                	Theme theme = getActivity().getTheme();
+            		TypedValue typedvalueattr = new TypedValue();
+            		theme.resolveAttribute(R.attr.AudioQueueButton, typedvalueattr, true); 
+            		mQueue.setImageResource(typedvalueattr.resourceId);
                     // Fade out the pager container
                     fade(listQueue, 0f);
                     // Fade in the album art
diff --git a/src/com/andrew/apolloMod/ui/widgets/BottomActionBar.java b/src/com/andrew/apolloMod/ui/widgets/BottomActionBar.java
index 0df10df..8c13ed8 100644
--- a/src/com/andrew/apolloMod/ui/widgets/BottomActionBar.java
+++ b/src/com/andrew/apolloMod/ui/widgets/BottomActionBar.java
@@ -10,8 +10,10 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.Resources.Theme;
 import android.os.RemoteException;
 import android.util.AttributeSet;
+import android.util.TypedValue;
 import android.view.View;
 import android.view.View.OnLongClickListener;
 import android.widget.ImageButton;
@@ -62,7 +64,10 @@ public void updateBottomActionBar(Activity activity) {
         		mFavs.setImageResource(R.drawable.apollo_holo_light_favorite_selected);
         	}
         	else{
-        		mFavs.setImageResource(R.drawable.apollo_holo_light_favorite_normal);
+            	Theme theme = activity.getTheme();
+        		TypedValue typedvalueattr = new TypedValue();
+        		theme.resolveAttribute(R.attr.AudioFavoritesButton, typedvalueattr, true); 
+        		mFavs.setImageResource(typedvalueattr.resourceId);
         	}
             
             // Track name

From a6c676f651da7c1a8bbe834f7efbe2a8feb712ff Mon Sep 17 00:00:00 2001
From: Splitter <splitvisionz@gmail.com>
Date: Wed, 2 Apr 2014 19:48:12 -0400
Subject: [PATCH 05/10] Refactor/reorganize some of the code base

---
 .classpath                                    |   1 +
 AndroidManifest.xml                           |  26 +--
 res/layout/audio_controls.xml                 |   4 +-
 res/layout/audio_player.xml                   |   2 +-
 res/layout/bottom_action_bar.xml              |   4 +-
 res/layout/gridview_items.xml                 |   2 +-
 res/layout/gridview_items_recent.xml          |   2 +-
 res/layout/half_and_half.xml                  |   2 +-
 res/layout/library_browser.xml                |   2 +-
 res/layout/nowplaying_album_art.xml           |   2 +-
 res/layout/simple_eq.xml                      |  12 +-
 .../andrew/apolloMod/NowPlayingCursor.java    | 196 ------------------
 .../widgets => appwidgets}/AppWidget11.java   |   2 +-
 .../widgets => appwidgets}/AppWidget41.java   |   4 +-
 .../widgets => appwidgets}/AppWidget42.java   |   5 +-
 .../{helpers => cache}/GetBitmapTask.java     |   5 +-
 .../andrew/apolloMod/cache/ImageProvider.java |   3 +-
 .../helpers/{utils => }/ApolloUtils.java      |   4 +-
 .../helpers/{utils => }/ImageUtils.java       |   2 +-
 .../helpers/{utils => }/MusicUtils.java       |   2 +-
 .../helpers/{utils => }/StringUtilities.java  |   2 +-
 .../helpers/{utils => }/VisualizerUtils.java  |   4 +-
 .../apolloMod/helpers/lastfm/Album.java       |   3 +-
 .../apolloMod/helpers/lastfm/Artist.java      |   1 -
 .../apolloMod/helpers/lastfm/Caller.java      |   4 +-
 .../helpers/{ => lastfm}/DomElement.java      |   2 +-
 .../apolloMod/helpers/lastfm/Image.java       |   1 -
 .../apolloMod/helpers/lastfm/ImageHolder.java |   1 -
 .../apolloMod/helpers/lastfm/ItemFactory.java |   1 -
 .../apolloMod/helpers/lastfm/MusicEntry.java  |   1 -
 .../helpers/lastfm/ResponseBuilder.java       |   1 -
 .../apolloMod/helpers/lastfm/Result.java      |   1 -
 .../apolloMod/helpers/lastfm/Session.java     |   1 -
 .../helpers/visualizer/WaveformRenderer.java  |   2 +-
 .../apolloMod/menu/PlaylistPickerDialog.java  |  28 ---
 .../apolloMod/preferences/SettingsHolder.java |   2 +-
 .../apolloMod/service/ApolloService.java      |  16 +-
 .../service/MediaButtonIntentReceiver.java    |   2 +-
 .../apolloMod/service/ServiceBinder.java      |   2 +-
 .../{ => ui}/activities/MusicLibrary.java     |   8 +-
 .../{ => ui}/activities/PlayExternal.java     |   4 +-
 .../activities/QueryBrowserActivity.java      |   6 +-
 .../{ => ui}/activities/QuickQueue.java       |   2 +-
 .../{ => ui}/activities/SimpleEq.java         |   8 +-
 .../{ => ui}/activities/TracksBrowser.java    |   6 +-
 .../activities/dialogs}/PlaylistDialog.java   |   4 +-
 .../activities/dialogs}/PlaylistPicker.java   |   4 +-
 .../ui/adapters/AlbumArtPagerAdapter.java     |   3 +-
 .../apolloMod/ui/adapters/PagerAdapter.java   |   2 +-
 .../ui/adapters/QuickQueueAdapter.java        |   2 +-
 .../base/DragSortListViewAdapter.java         |   4 +-
 .../ui/adapters/base/GridViewAdapter.java     |   4 +-
 .../ui/adapters/base/ListViewAdapter.java     |   4 +-
 .../ui/adapters/grid/AlbumAdapter.java        |   2 +-
 .../ui/adapters/grid/ArtistAdapter.java       |   2 +-
 .../ui/adapters/list/AlbumListAdapter.java    |   3 +-
 .../ui/adapters/list/ArtistAlbumAdapter.java  |   3 +-
 .../ui/adapters/list/ArtistListAdapter.java   |   3 +-
 .../ui/adapters/list/GenreAdapter.java        |   2 +-
 .../ui/adapters/list/GenreListAdapter.java    |   2 +-
 .../ui/adapters/list/NowPlayingAdapter.java   |   2 +-
 .../ui/adapters/list/PlaylistListAdapter.java |   2 +-
 .../adapters/list/RecentlyAddedAdapter.java   |   3 +-
 .../ui/adapters/list/SonglistAdapter.java     |   2 +-
 .../ui/fragments/AudioPlayerFragment.java     |  12 +-
 .../ui/fragments/BottomActionBarFragment.java |   4 +-
 .../base/DragSortListViewFragment.java        |   3 +-
 .../ui/fragments/base/GridViewFragment.java   |   4 +-
 .../ui/fragments/base/ListViewFragment.java   |   3 +-
 .../fragments/base}/RefreshableFragment.java  |   2 +-
 .../ui/fragments/grid/QuickQueueFragment.java |   8 +-
 .../fragments/list/ArtistAlbumsFragment.java  |   4 +-
 .../ui/fragments/list/GenresFragment.java     |   4 +-
 .../ui/fragments/list/NowPlayingFragment.java |   2 +-
 .../fragments/list/PlaylistListFragment.java  |   2 +-
 .../ui/fragments/list/PlaylistsFragment.java  |   4 +-
 .../fragments/list/RecentlyAddedFragment.java |   2 +-
 .../ui/fragments/list/SongsFragment.java      |   2 +-
 .../{widgets => views}/BottomActionBar.java   |   6 +-
 .../RepeatingImageButton.java                 |   2 +-
 .../{widgets => views}/ScrollableTabView.java |   2 +-
 .../{ => ui}/views/TrackBrowserImageView.java |   2 +-
 .../{ => ui}/views/VerticalSeekBar.java       |   2 +-
 .../ui/{widgets => views}/VisualizerView.java |   2 +-
 .../views/holders}/ViewHolderGrid.java        |   2 +-
 .../views/holders}/ViewHolderList.java        |   2 +-
 .../views/holders}/ViewHolderQueue.java       |   2 +-
 87 files changed, 143 insertions(+), 379 deletions(-)
 delete mode 100644 src/com/andrew/apolloMod/NowPlayingCursor.java
 rename src/com/andrew/apolloMod/{app/widgets => appwidgets}/AppWidget11.java (99%)
 rename src/com/andrew/apolloMod/{app/widgets => appwidgets}/AppWidget41.java (98%)
 rename src/com/andrew/apolloMod/{app/widgets => appwidgets}/AppWidget42.java (99%)
 rename src/com/andrew/apolloMod/{helpers => cache}/GetBitmapTask.java (96%)
 rename src/com/andrew/apolloMod/helpers/{utils => }/ApolloUtils.java (99%)
 rename src/com/andrew/apolloMod/helpers/{utils => }/ImageUtils.java (99%)
 rename src/com/andrew/apolloMod/helpers/{utils => }/MusicUtils.java (99%)
 rename src/com/andrew/apolloMod/helpers/{utils => }/StringUtilities.java (99%)
 rename src/com/andrew/apolloMod/helpers/{utils => }/VisualizerUtils.java (95%)
 rename src/com/andrew/apolloMod/helpers/{ => lastfm}/DomElement.java (99%)
 delete mode 100644 src/com/andrew/apolloMod/menu/PlaylistPickerDialog.java
 rename src/com/andrew/apolloMod/{ => ui}/activities/MusicLibrary.java (98%)
 rename src/com/andrew/apolloMod/{ => ui}/activities/PlayExternal.java (98%)
 rename src/com/andrew/apolloMod/{ => ui}/activities/QueryBrowserActivity.java (99%)
 rename src/com/andrew/apolloMod/{ => ui}/activities/QuickQueue.java (97%)
 rename src/com/andrew/apolloMod/{ => ui}/activities/SimpleEq.java (96%)
 rename src/com/andrew/apolloMod/{ => ui}/activities/TracksBrowser.java (99%)
 rename src/com/andrew/apolloMod/{menu => ui/activities/dialogs}/PlaylistDialog.java (99%)
 rename src/com/andrew/apolloMod/{menu => ui/activities/dialogs}/PlaylistPicker.java (98%)
 rename src/com/andrew/apolloMod/{helpers => ui/fragments/base}/RefreshableFragment.java (94%)
 rename src/com/andrew/apolloMod/ui/{widgets => views}/BottomActionBar.java (96%)
 rename src/com/andrew/apolloMod/ui/{widgets => views}/RepeatingImageButton.java (99%)
 rename src/com/andrew/apolloMod/ui/{widgets => views}/ScrollableTabView.java (99%)
 rename src/com/andrew/apolloMod/{ => ui}/views/TrackBrowserImageView.java (97%)
 rename src/com/andrew/apolloMod/{ => ui}/views/VerticalSeekBar.java (97%)
 rename src/com/andrew/apolloMod/ui/{widgets => views}/VisualizerView.java (98%)
 rename src/com/andrew/apolloMod/{views => ui/views/holders}/ViewHolderGrid.java (95%)
 rename src/com/andrew/apolloMod/{views => ui/views/holders}/ViewHolderList.java (96%)
 rename src/com/andrew/apolloMod/{views => ui/views/holders}/ViewHolderQueue.java (94%)

diff --git a/.classpath b/.classpath
index d992108..c354ffb 100644
--- a/.classpath
+++ b/.classpath
@@ -2,6 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="src" path="dialog"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index dd39d43..5d573d5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -34,10 +34,10 @@
         android:taskAffinity="apollo.task.music" >
         <meta-data
             android:name="android.app.default_searchable"
-            android:value=".activities.QueryBrowserActivity" />
+            android:value=".ui.activities.QueryBrowserActivity" />
         <!-- Serach -->
         <activity
-            android:name=".activities.QueryBrowserActivity"
+            android:name=".ui.activities.QueryBrowserActivity"
             android:theme="@style/ApolloTheme.Light" 
             android:exported="true">
             <intent-filter>
@@ -55,7 +55,7 @@
 
         <!-- Main Activity -->
         <activity
-            android:name=".activities.MusicLibrary"
+            android:name=".ui.activities.MusicLibrary"
             android:label="@string/app_name"
         	android:logo="@drawable/ic_logo"
           	android:theme="@android:style/Theme.NoTitleBar"
@@ -76,7 +76,7 @@
         </activity>
         <!-- Now Playing -->
         <activity
-            android:name=".activities.AudioPlayerHolder"
+            android:name=".ui.activities.AudioPlayerHolder"
             android:clearTaskOnLaunch="true"
             android:excludeFromRecents="true"
             android:label="@string/nowplaying"
@@ -97,7 +97,7 @@
         </activity>
         <!-- Play External File -->
         <activity
-            android:name=".activities.PlayExternal"
+            android:name=".ui.activities.PlayExternal"
             android:clearTaskOnLaunch="true"
             android:excludeFromRecents="true"
             android:noHistory="true"
@@ -118,7 +118,7 @@
         </activity>
         <!-- Track browser -->
         <activity
-            android:name=".activities.TracksBrowser"
+            android:name=".ui.activities.TracksBrowser"
             android:label="@string/app_name"
             android:windowSoftInputMode="adjustPan" >
             <intent-filter>
@@ -131,7 +131,7 @@
 
         <!-- Quickly show the queue -->
         <activity
-            android:name=".activities.QuickQueue"
+            android:name=".ui.activities.QuickQueue"
             android:excludeFromRecents="true"
             android:launchMode="singleTop"
             android:noHistory="true"
@@ -144,14 +144,14 @@
             android:label="@string/settings" />
         <!-- Simple EQ -->
         <activity
-            android:name=".activities.SimpleEq"
+            android:name=".ui.activities.SimpleEq"
             android:excludeFromRecents="true"
             android:label="@string/simple_eq_page_title"
             android:windowSoftInputMode="adjustPan" 
         	android:parentActivityName=".activities.MusicLibrary" />
 
         <activity
-            android:name=".menu.PlaylistDialog"
+            android:name="com.andrew.apolloMod.ui.activities.dialogs.PlaylistDialog"
             android:label="@string/rename_playlist"
             android:theme="@android:style/Theme.Holo.Light.Dialog.NoActionBar" >
             <intent-filter>
@@ -166,7 +166,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="com.andrew.apolloMod.menu.PlaylistPicker"
+            android:name="com.andrew.apolloMod.ui.activities.dialogs.PlaylistPicker"
             android:icon="@drawable/ic_launcher"
             android:theme="@android:style/Theme.Holo.Light.Dialog.NoActionBar" >
             <intent-filter>
@@ -177,7 +177,7 @@
         </activity>
         <!-- 1x1 App Widget -->
         <receiver
-            android:name="com.andrew.apolloMod.app.widgets.AppWidget11"
+            android:name="com.andrew.apolloMod.appwidgets.AppWidget11"
             android:label="@string/apollo_1x1" >
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -189,7 +189,7 @@
         </receiver>
         <!-- 4x1 App Widget -->
         <receiver
-            android:name="com.andrew.apolloMod.app.widgets.AppWidget41"
+            android:name="com.andrew.apolloMod.appwidgets.AppWidget41"
             android:label="@string/apollo_4x1" >
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -201,7 +201,7 @@
         </receiver>
         <!-- 4x2 App Widget -->
         <receiver
-            android:name="com.andrew.apolloMod.app.widgets.AppWidget42"
+            android:name="com.andrew.apolloMod.appwidgets.AppWidget42"
             android:label="@string/apollo_4x2" >
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
diff --git a/res/layout/audio_controls.xml b/res/layout/audio_controls.xml
index ce1865c..32495ab 100644
--- a/res/layout/audio_controls.xml
+++ b/res/layout/audio_controls.xml
@@ -39,7 +39,7 @@
         android:orientation="horizontal"
         android:paddingTop="@dimen/audio_player_button_container_padding" > 
         
-        <com.andrew.apolloMod.ui.widgets.RepeatingImageButton
+        <com.andrew.apolloMod.ui.views.RepeatingImageButton
             android:id="@+id/audio_player_prev"
             style="?AudioPlayerPrevious"/>
 
@@ -47,7 +47,7 @@
             android:id="@+id/audio_player_play"
             style="?AudioPlayerPlay"/>
 
-        <com.andrew.apolloMod.ui.widgets.RepeatingImageButton
+        <com.andrew.apolloMod.ui.views.RepeatingImageButton
             android:id="@+id/audio_player_next"
             style="?AudioPlayerNext"/>
 
diff --git a/res/layout/audio_player.xml b/res/layout/audio_player.xml
index d541ce5..aed45c6 100644
--- a/res/layout/audio_player.xml
+++ b/res/layout/audio_player.xml
@@ -18,7 +18,7 @@
         
    	 	<include layout="@layout/shadow" />
    	 	
-        <com.andrew.apolloMod.ui.widgets.VisualizerView
+        <com.andrew.apolloMod.ui.views.VisualizerView
             android:id="@+id/visualizerView"
             android:layout_width="match_parent"
             android:layout_height="fill_parent"
diff --git a/res/layout/bottom_action_bar.xml b/res/layout/bottom_action_bar.xml
index a1319d6..c584efd 100644
--- a/res/layout/bottom_action_bar.xml
+++ b/res/layout/bottom_action_bar.xml
@@ -9,7 +9,7 @@
 	    style="?BottomActionBarDivider"
         tools:ignore="ContentDescription" />
 
-    <com.andrew.apolloMod.ui.widgets.BottomActionBar
+    <com.andrew.apolloMod.ui.views.BottomActionBar
         android:id="@+id/bottom_action_bar"
 		style="?BottomActionBar">
 
@@ -73,6 +73,6 @@
             style="?BottomActionBarItem"
             android:visibility="gone"/>"
         
-    </com.andrew.apolloMod.ui.widgets.BottomActionBar>
+    </com.andrew.apolloMod.ui.views.BottomActionBar>
 
 </LinearLayout>
diff --git a/res/layout/gridview_items.xml b/res/layout/gridview_items.xml
index bc90e00..d69a914 100644
--- a/res/layout/gridview_items.xml
+++ b/res/layout/gridview_items.xml
@@ -9,7 +9,7 @@
 		<RelativeLayout
 		    style="?GridviewItemWrapper">
 		
-		    <com.andrew.apolloMod.views.TrackBrowserImageView
+		    <com.andrew.apolloMod.ui.views.TrackBrowserImageView
 		        android:id="@+id/gridview_image"
 		        style="?GridviewItemArt"/>
 		     
diff --git a/res/layout/gridview_items_recent.xml b/res/layout/gridview_items_recent.xml
index be9ba4c..ea9a4aa 100644
--- a/res/layout/gridview_items_recent.xml
+++ b/res/layout/gridview_items_recent.xml
@@ -9,7 +9,7 @@
 	<RelativeLayout
 	    style="?GridviewRecentsWrapper">
 	 
-	    <com.andrew.apolloMod.views.TrackBrowserImageView
+	    <com.andrew.apolloMod.ui.views.TrackBrowserImageView
 	        android:id="@+id/gridview_image"
 	        style="?GridviewRecentsArt"/>
 	
diff --git a/res/layout/half_and_half.xml b/res/layout/half_and_half.xml
index 76cdbbb..48000bb 100644
--- a/res/layout/half_and_half.xml
+++ b/res/layout/half_and_half.xml
@@ -15,7 +15,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1">
 			
-            <com.andrew.apolloMod.views.TrackBrowserImageView
+            <com.andrew.apolloMod.ui.views.TrackBrowserImageView
                 android:id="@+id/half_artist_image"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/half_and_half_imageheight"
diff --git a/res/layout/library_browser.xml b/res/layout/library_browser.xml
index 285793e..55df23f 100644
--- a/res/layout/library_browser.xml
+++ b/res/layout/library_browser.xml
@@ -12,7 +12,7 @@
 	    <LinearLayout
 	        style="?LibraryWrapper" >
 		
-		    <com.andrew.apolloMod.ui.widgets.ScrollableTabView
+		    <com.andrew.apolloMod.ui.views.ScrollableTabView
 		        android:id="@+id/scrollingTabs"
 		        style="?LibraryTabsWrapper"/>
 		
diff --git a/res/layout/nowplaying_album_art.xml b/res/layout/nowplaying_album_art.xml
index e17e6d8..a38c01c 100644
--- a/res/layout/nowplaying_album_art.xml
+++ b/res/layout/nowplaying_album_art.xml
@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical" >
     
-	<com.andrew.apolloMod.views.TrackBrowserImageView
+	<com.andrew.apolloMod.ui.views.TrackBrowserImageView
             android:id="@+id/audio_player_album_art"
             style="?AudioPlayerAlbumArt"/>
 	
diff --git a/res/layout/simple_eq.xml b/res/layout/simple_eq.xml
index 8725c65..526430c 100644
--- a/res/layout/simple_eq.xml
+++ b/res/layout/simple_eq.xml
@@ -62,7 +62,7 @@
         		android:layout_width="fill_parent"
         		android:layout_height="wrap_content"
         		android:gravity="center_horizontal"/>
-            <com.andrew.apolloMod.views.VerticalSeekBar 
+            <com.andrew.apolloMod.ui.views.VerticalSeekBar 
                 android:id="@+id/simple_eq_band0_seek"
         		android:gravity="center_horizontal"
         		android:layout_height="fill_parent"
@@ -86,7 +86,7 @@
         		android:layout_width="fill_parent"
         		android:layout_height="wrap_content"
         		android:gravity="center_horizontal"/>
-            <com.andrew.apolloMod.views.VerticalSeekBar 
+            <com.andrew.apolloMod.ui.views.VerticalSeekBar 
                 android:id="@+id/simple_eq_band1_seek"
         		android:gravity="center_horizontal"
         		android:layout_height="fill_parent"
@@ -110,7 +110,7 @@
         		android:layout_width="fill_parent"
         		android:layout_height="wrap_content"
         		android:gravity="center_horizontal"/>
-            <com.andrew.apolloMod.views.VerticalSeekBar 
+            <com.andrew.apolloMod.ui.views.VerticalSeekBar 
                 android:id="@+id/simple_eq_band2_seek"
         		android:gravity="center_horizontal"
         		android:layout_height="fill_parent"
@@ -134,7 +134,7 @@
         		android:layout_width="fill_parent"
         		android:layout_height="wrap_content"
         		android:gravity="center_horizontal"/>
-            <com.andrew.apolloMod.views.VerticalSeekBar 
+            <com.andrew.apolloMod.ui.views.VerticalSeekBar 
                 android:id="@+id/simple_eq_band3_seek"
         		android:gravity="center_horizontal"
         		android:layout_height="fill_parent"
@@ -158,7 +158,7 @@
         		android:layout_width="fill_parent"
         		android:layout_height="wrap_content"
         		android:gravity="center_horizontal"/>
-            <com.andrew.apolloMod.views.VerticalSeekBar 
+            <com.andrew.apolloMod.ui.views.VerticalSeekBar 
                 android:id="@+id/simple_eq_band4_seek"
         		android:gravity="center_horizontal"
         		android:layout_height="fill_parent"
@@ -182,7 +182,7 @@
         		android:layout_width="fill_parent"
         		android:layout_height="wrap_content"
         		android:gravity="center_horizontal"/>
-            <com.andrew.apolloMod.views.VerticalSeekBar 
+            <com.andrew.apolloMod.ui.views.VerticalSeekBar 
                 android:id="@+id/simple_eq_band5_seek"
         		android:gravity="center_horizontal"
         		android:layout_height="fill_parent"
diff --git a/src/com/andrew/apolloMod/NowPlayingCursor.java b/src/com/andrew/apolloMod/NowPlayingCursor.java
deleted file mode 100644
index 5603a06..0000000
--- a/src/com/andrew/apolloMod/NowPlayingCursor.java
+++ /dev/null
@@ -1,196 +0,0 @@
-
-package com.andrew.apolloMod;
-
-import java.util.Arrays;
-
-import android.content.Context;
-import android.database.AbstractCursor;
-import android.database.Cursor;
-import android.os.RemoteException;
-import android.provider.BaseColumns;
-import android.provider.MediaStore.Audio;
-
-import com.andrew.apolloMod.IApolloService;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
-
-public class NowPlayingCursor extends AbstractCursor {
-
-    public NowPlayingCursor(IApolloService service, String[] projection, Context c) {
-        mProjection = projection;
-        mService = service;
-        makeNowPlayingCursor();
-        context = c;
-    }
-
-    private void makeNowPlayingCursor() {
-        mCurrentPlaylistCursor = null;
-        try {
-            mNowPlaying = mService.getQueue();
-        } catch (RemoteException ex) {
-            mNowPlaying = new long[0];
-        }
-        mSize = mNowPlaying.length;
-        if (mSize == 0) {
-            return;
-        }
-
-        StringBuilder where = new StringBuilder();
-        where.append(BaseColumns._ID + " IN (");
-        for (int i = 0; i < mSize; i++) {
-            where.append(mNowPlaying[i]);
-            if (i < mSize - 1) {
-                where.append(",");
-            }
-        }
-        where.append(")");
-
-        mCurrentPlaylistCursor = MusicUtils.query(context, Audio.Media.EXTERNAL_CONTENT_URI,
-                mProjection, where.toString(), null, BaseColumns._ID);
-
-        if (mCurrentPlaylistCursor == null) {
-            mSize = 0;
-            return;
-        }
-
-        int size = mCurrentPlaylistCursor.getCount();
-        mCursorIdxs = new long[size];
-        mCurrentPlaylistCursor.moveToFirst();
-        int colidx = mCurrentPlaylistCursor.getColumnIndexOrThrow(BaseColumns._ID);
-        for (int i = 0; i < size; i++) {
-            mCursorIdxs[i] = mCurrentPlaylistCursor.getLong(colidx);
-            mCurrentPlaylistCursor.moveToNext();
-        }
-        mCurrentPlaylistCursor.moveToFirst();
-        try {
-            int removed = 0;
-            for (int i = mNowPlaying.length - 1; i >= 0; i--) {
-                long trackid = mNowPlaying[i];
-                int crsridx = Arrays.binarySearch(mCursorIdxs, trackid);
-                if (crsridx < 0) {
-                    removed += mService.removeTrack(trackid);
-                }
-            }
-            if (removed > 0) {
-                mNowPlaying = mService.getQueue();
-                mSize = mNowPlaying.length;
-                if (mSize == 0) {
-                    mCursorIdxs = null;
-                    return;
-                }
-            }
-        } catch (RemoteException ex) {
-            mNowPlaying = new long[0];
-        }
-    }
-
-    @Override
-    public int getCount() {
-        return mSize;
-    }
-
-    @Override
-    public boolean onMove(int oldPosition, int newPosition) {
-        if (oldPosition == newPosition)
-            return true;
-
-        if (mNowPlaying == null || mCursorIdxs == null || newPosition >= mNowPlaying.length) {
-            return false;
-        }
-
-        // The cursor doesn't have any duplicates in it, and is not ordered
-        // in queue-order, so we need to figure out where in the cursor we
-        // should be.
-
-        long newid = mNowPlaying[newPosition];
-        int crsridx = Arrays.binarySearch(mCursorIdxs, newid);
-        mCurrentPlaylistCursor.moveToPosition(crsridx);
-        return true;
-    }
-
-    @Override
-    public String getString(int column) {
-        try {
-            return mCurrentPlaylistCursor.getString(column);
-        } catch (Exception ex) {
-            onChange(true);
-            return "";
-        }
-    }
-
-    @Override
-    public short getShort(int column) {
-        return mCurrentPlaylistCursor.getShort(column);
-    }
-
-    @Override
-    public int getInt(int column) {
-        try {
-            return mCurrentPlaylistCursor.getInt(column);
-        } catch (Exception ex) {
-            onChange(true);
-            return 0;
-        }
-    }
-
-    @Override
-    public long getLong(int column) {
-        try {
-            return mCurrentPlaylistCursor.getLong(column);
-        } catch (Exception ex) {
-            onChange(true);
-            return 0;
-        }
-    }
-
-    @Override
-    public float getFloat(int column) {
-        return mCurrentPlaylistCursor.getFloat(column);
-    }
-
-    @Override
-    public double getDouble(int column) {
-        return mCurrentPlaylistCursor.getDouble(column);
-    }
-
-    @Override
-    public int getType(int column) {
-        return mCurrentPlaylistCursor.getType(column);
-    }
-
-    @Override
-    public boolean isNull(int column) {
-        return mCurrentPlaylistCursor.isNull(column);
-    }
-
-    @Override
-    public String[] getColumnNames() {
-        return mProjection;
-    }
-
-    @Override
-	@SuppressWarnings("deprecation")
-    public void deactivate() {
-        if (mCurrentPlaylistCursor != null)
-            mCurrentPlaylistCursor.deactivate();
-    }
-
-    @Override
-    public boolean requery() {
-        makeNowPlayingCursor();
-        return true;
-    }
-
-    private final String[] mProjection;
-
-    private Cursor mCurrentPlaylistCursor;
-
-    private int mSize;
-
-    private long[] mNowPlaying;
-
-    private long[] mCursorIdxs;
-
-    private final Context context;
-
-    private final IApolloService mService;
-}
diff --git a/src/com/andrew/apolloMod/app/widgets/AppWidget11.java b/src/com/andrew/apolloMod/appwidgets/AppWidget11.java
similarity index 99%
rename from src/com/andrew/apolloMod/app/widgets/AppWidget11.java
rename to src/com/andrew/apolloMod/appwidgets/AppWidget11.java
index e18d232..fae9ccd 100644
--- a/src/com/andrew/apolloMod/app/widgets/AppWidget11.java
+++ b/src/com/andrew/apolloMod/appwidgets/AppWidget11.java
@@ -1,5 +1,5 @@
 
-package com.andrew.apolloMod.app.widgets;
+package com.andrew.apolloMod.appwidgets;
 
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
diff --git a/src/com/andrew/apolloMod/app/widgets/AppWidget41.java b/src/com/andrew/apolloMod/appwidgets/AppWidget41.java
similarity index 98%
rename from src/com/andrew/apolloMod/app/widgets/AppWidget41.java
rename to src/com/andrew/apolloMod/appwidgets/AppWidget41.java
index 0e5fd93..181949e 100644
--- a/src/com/andrew/apolloMod/app/widgets/AppWidget41.java
+++ b/src/com/andrew/apolloMod/appwidgets/AppWidget41.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.andrew.apolloMod.app.widgets;
+package com.andrew.apolloMod.appwidgets;
 
 import static com.andrew.apolloMod.Constants.WIDGET_STYLE;
 import android.app.PendingIntent;
@@ -30,8 +30,8 @@
 import android.widget.RemoteViews;
 
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.activities.MusicLibrary;
 import com.andrew.apolloMod.service.ApolloService;
+import com.andrew.apolloMod.ui.activities.MusicLibrary;
 
 /**
  * Simple widget to show currently playing album art along with play/pause and
diff --git a/src/com/andrew/apolloMod/app/widgets/AppWidget42.java b/src/com/andrew/apolloMod/appwidgets/AppWidget42.java
similarity index 99%
rename from src/com/andrew/apolloMod/app/widgets/AppWidget42.java
rename to src/com/andrew/apolloMod/appwidgets/AppWidget42.java
index de2038c..3aed5a0 100644
--- a/src/com/andrew/apolloMod/app/widgets/AppWidget42.java
+++ b/src/com/andrew/apolloMod/appwidgets/AppWidget42.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.andrew.apolloMod.app.widgets;
+package com.andrew.apolloMod.appwidgets;
 
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
@@ -29,8 +29,9 @@
 import android.widget.RemoteViews;
 
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.activities.MusicLibrary;
 import com.andrew.apolloMod.service.ApolloService;
+import com.andrew.apolloMod.ui.activities.MusicLibrary;
+
 import static com.andrew.apolloMod.Constants.WIDGET_STYLE;
 
 /**
diff --git a/src/com/andrew/apolloMod/helpers/GetBitmapTask.java b/src/com/andrew/apolloMod/cache/GetBitmapTask.java
similarity index 96%
rename from src/com/andrew/apolloMod/helpers/GetBitmapTask.java
rename to src/com/andrew/apolloMod/cache/GetBitmapTask.java
index b7c885c..d59e977 100644
--- a/src/com/andrew/apolloMod/helpers/GetBitmapTask.java
+++ b/src/com/andrew/apolloMod/cache/GetBitmapTask.java
@@ -1,4 +1,4 @@
-package com.andrew.apolloMod.helpers;
+package com.andrew.apolloMod.cache;
 
 import android.content.Context;
 import android.content.res.Resources.Theme;
@@ -8,8 +8,7 @@
 import android.util.TypedValue;
 
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.cache.ImageInfo;
-import com.andrew.apolloMod.helpers.utils.ImageUtils;
+import com.andrew.apolloMod.helpers.ImageUtils;
 
 import static com.andrew.apolloMod.Constants.*;
 
diff --git a/src/com/andrew/apolloMod/cache/ImageProvider.java b/src/com/andrew/apolloMod/cache/ImageProvider.java
index 94cfbba..ed12a12 100644
--- a/src/com/andrew/apolloMod/cache/ImageProvider.java
+++ b/src/com/andrew/apolloMod/cache/ImageProvider.java
@@ -12,8 +12,7 @@
 import android.util.DisplayMetrics;
 import android.widget.ImageView;
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.helpers.GetBitmapTask;
-import com.andrew.apolloMod.helpers.utils.ImageUtils;
+import com.andrew.apolloMod.helpers.ImageUtils;
 
 import static com.andrew.apolloMod.Constants.*;
 
diff --git a/src/com/andrew/apolloMod/helpers/utils/ApolloUtils.java b/src/com/andrew/apolloMod/helpers/ApolloUtils.java
similarity index 99%
rename from src/com/andrew/apolloMod/helpers/utils/ApolloUtils.java
rename to src/com/andrew/apolloMod/helpers/ApolloUtils.java
index 21b3921..c6b445e 100644
--- a/src/com/andrew/apolloMod/helpers/utils/ApolloUtils.java
+++ b/src/com/andrew/apolloMod/helpers/ApolloUtils.java
@@ -2,7 +2,7 @@
  * 
  */
 
-package com.andrew.apolloMod.helpers.utils;
+package com.andrew.apolloMod.helpers;
 
 import java.io.*;
 import java.net.HttpURLConnection;
@@ -37,7 +37,7 @@
 import android.widget.Toast;
 
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.activities.TracksBrowser;
+import com.andrew.apolloMod.ui.activities.TracksBrowser;
 import com.andrew.apolloMod.cache.ImageInfo;
 import com.andrew.apolloMod.cache.ImageProvider;
 import com.androidquery.util.AQUtility;
diff --git a/src/com/andrew/apolloMod/helpers/utils/ImageUtils.java b/src/com/andrew/apolloMod/helpers/ImageUtils.java
similarity index 99%
rename from src/com/andrew/apolloMod/helpers/utils/ImageUtils.java
rename to src/com/andrew/apolloMod/helpers/ImageUtils.java
index dd0b4ee..8f4257c 100644
--- a/src/com/andrew/apolloMod/helpers/utils/ImageUtils.java
+++ b/src/com/andrew/apolloMod/helpers/ImageUtils.java
@@ -1,4 +1,4 @@
-package com.andrew.apolloMod.helpers.utils;
+package com.andrew.apolloMod.helpers;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/src/com/andrew/apolloMod/helpers/utils/MusicUtils.java b/src/com/andrew/apolloMod/helpers/MusicUtils.java
similarity index 99%
rename from src/com/andrew/apolloMod/helpers/utils/MusicUtils.java
rename to src/com/andrew/apolloMod/helpers/MusicUtils.java
index 20b5bbf..566d6c7 100644
--- a/src/com/andrew/apolloMod/helpers/utils/MusicUtils.java
+++ b/src/com/andrew/apolloMod/helpers/MusicUtils.java
@@ -1,5 +1,5 @@
 
-package com.andrew.apolloMod.helpers.utils;
+package com.andrew.apolloMod.helpers;
 
 import java.util.Arrays;
 import java.util.Formatter;
diff --git a/src/com/andrew/apolloMod/helpers/utils/StringUtilities.java b/src/com/andrew/apolloMod/helpers/StringUtilities.java
similarity index 99%
rename from src/com/andrew/apolloMod/helpers/utils/StringUtilities.java
rename to src/com/andrew/apolloMod/helpers/StringUtilities.java
index 5ef7a96..c896751 100644
--- a/src/com/andrew/apolloMod/helpers/utils/StringUtilities.java
+++ b/src/com/andrew/apolloMod/helpers/StringUtilities.java
@@ -23,7 +23,7 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package com.andrew.apolloMod.helpers.utils;
+package com.andrew.apolloMod.helpers;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
diff --git a/src/com/andrew/apolloMod/helpers/utils/VisualizerUtils.java b/src/com/andrew/apolloMod/helpers/VisualizerUtils.java
similarity index 95%
rename from src/com/andrew/apolloMod/helpers/utils/VisualizerUtils.java
rename to src/com/andrew/apolloMod/helpers/VisualizerUtils.java
index 2a89ba5..bc474bb 100644
--- a/src/com/andrew/apolloMod/helpers/utils/VisualizerUtils.java
+++ b/src/com/andrew/apolloMod/helpers/VisualizerUtils.java
@@ -1,9 +1,9 @@
-package com.andrew.apolloMod.helpers.utils;
+package com.andrew.apolloMod.helpers;
 
 
 import java.lang.ref.WeakReference;
 
-import com.andrew.apolloMod.ui.widgets.VisualizerView;
+import com.andrew.apolloMod.ui.views.VisualizerView;
 
 import android.media.MediaPlayer;
 import android.media.audiofx.Visualizer;
diff --git a/src/com/andrew/apolloMod/helpers/lastfm/Album.java b/src/com/andrew/apolloMod/helpers/lastfm/Album.java
index 0e073cc..d4281f7 100644
--- a/src/com/andrew/apolloMod/helpers/lastfm/Album.java
+++ b/src/com/andrew/apolloMod/helpers/lastfm/Album.java
@@ -29,8 +29,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import com.andrew.apolloMod.helpers.DomElement;
-import com.andrew.apolloMod.helpers.utils.StringUtilities;
+import com.andrew.apolloMod.helpers.StringUtilities;
 
 
 /**
diff --git a/src/com/andrew/apolloMod/helpers/lastfm/Artist.java b/src/com/andrew/apolloMod/helpers/lastfm/Artist.java
index 09b5500..1cfdc1e 100644
--- a/src/com/andrew/apolloMod/helpers/lastfm/Artist.java
+++ b/src/com/andrew/apolloMod/helpers/lastfm/Artist.java
@@ -30,7 +30,6 @@
 import java.util.Map;
 import java.util.WeakHashMap;
 
-import com.andrew.apolloMod.helpers.DomElement;
 
 /**
  * Bean that contains artist information.<br/>
diff --git a/src/com/andrew/apolloMod/helpers/lastfm/Caller.java b/src/com/andrew/apolloMod/helpers/lastfm/Caller.java
index bced774..6ef747d 100644
--- a/src/com/andrew/apolloMod/helpers/lastfm/Caller.java
+++ b/src/com/andrew/apolloMod/helpers/lastfm/Caller.java
@@ -26,8 +26,8 @@
 
 package com.andrew.apolloMod.helpers.lastfm;
 
-import static com.andrew.apolloMod.helpers.utils.StringUtilities.encode;
-import static com.andrew.apolloMod.helpers.utils.StringUtilities.map;
+import static com.andrew.apolloMod.helpers.StringUtilities.encode;
+import static com.andrew.apolloMod.helpers.StringUtilities.map;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
diff --git a/src/com/andrew/apolloMod/helpers/DomElement.java b/src/com/andrew/apolloMod/helpers/lastfm/DomElement.java
similarity index 99%
rename from src/com/andrew/apolloMod/helpers/DomElement.java
rename to src/com/andrew/apolloMod/helpers/lastfm/DomElement.java
index 34f84f4..0a4dd34 100644
--- a/src/com/andrew/apolloMod/helpers/DomElement.java
+++ b/src/com/andrew/apolloMod/helpers/lastfm/DomElement.java
@@ -23,7 +23,7 @@
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package com.andrew.apolloMod.helpers;
+package com.andrew.apolloMod.helpers.lastfm;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/andrew/apolloMod/helpers/lastfm/Image.java b/src/com/andrew/apolloMod/helpers/lastfm/Image.java
index 0cab1e4..9950fdf 100644
--- a/src/com/andrew/apolloMod/helpers/lastfm/Image.java
+++ b/src/com/andrew/apolloMod/helpers/lastfm/Image.java
@@ -28,7 +28,6 @@
 
 import java.util.Locale;
 
-import com.andrew.apolloMod.helpers.DomElement;
 
 /**
  * An <code>Image</code> contains metadata and URLs for an artist's image.
diff --git a/src/com/andrew/apolloMod/helpers/lastfm/ImageHolder.java b/src/com/andrew/apolloMod/helpers/lastfm/ImageHolder.java
index dafa5fe..724ce23 100644
--- a/src/com/andrew/apolloMod/helpers/lastfm/ImageHolder.java
+++ b/src/com/andrew/apolloMod/helpers/lastfm/ImageHolder.java
@@ -32,7 +32,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import com.andrew.apolloMod.helpers.DomElement;
 
 /**
  * Abstract superclass for all items that may contain images (such as
diff --git a/src/com/andrew/apolloMod/helpers/lastfm/ItemFactory.java b/src/com/andrew/apolloMod/helpers/lastfm/ItemFactory.java
index 4dd51fd..971f374 100644
--- a/src/com/andrew/apolloMod/helpers/lastfm/ItemFactory.java
+++ b/src/com/andrew/apolloMod/helpers/lastfm/ItemFactory.java
@@ -26,7 +26,6 @@
 
 package com.andrew.apolloMod.helpers.lastfm;
 
-import com.andrew.apolloMod.helpers.DomElement;
 
 /**
  * An <code>ItemFactory</code> can be used to instantiate a value object - such as Artist, Album, Track, Tag - from an XML element. Use the
diff --git a/src/com/andrew/apolloMod/helpers/lastfm/MusicEntry.java b/src/com/andrew/apolloMod/helpers/lastfm/MusicEntry.java
index f554536..29ef50c 100644
--- a/src/com/andrew/apolloMod/helpers/lastfm/MusicEntry.java
+++ b/src/com/andrew/apolloMod/helpers/lastfm/MusicEntry.java
@@ -29,7 +29,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 
-import com.andrew.apolloMod.helpers.DomElement;
 
 
 /**
diff --git a/src/com/andrew/apolloMod/helpers/lastfm/ResponseBuilder.java b/src/com/andrew/apolloMod/helpers/lastfm/ResponseBuilder.java
index 81cbc75..a4601d4 100644
--- a/src/com/andrew/apolloMod/helpers/lastfm/ResponseBuilder.java
+++ b/src/com/andrew/apolloMod/helpers/lastfm/ResponseBuilder.java
@@ -30,7 +30,6 @@
 import java.util.Collection;
 import java.util.Collections;
 
-import com.andrew.apolloMod.helpers.DomElement;
 
 
 /**
diff --git a/src/com/andrew/apolloMod/helpers/lastfm/Result.java b/src/com/andrew/apolloMod/helpers/lastfm/Result.java
index cb92e6e..5361772 100644
--- a/src/com/andrew/apolloMod/helpers/lastfm/Result.java
+++ b/src/com/andrew/apolloMod/helpers/lastfm/Result.java
@@ -27,7 +27,6 @@
 
 import org.w3c.dom.Document;
 
-import com.andrew.apolloMod.helpers.DomElement;
 
 
 /**
diff --git a/src/com/andrew/apolloMod/helpers/lastfm/Session.java b/src/com/andrew/apolloMod/helpers/lastfm/Session.java
index c71a914..e666cf8 100644
--- a/src/com/andrew/apolloMod/helpers/lastfm/Session.java
+++ b/src/com/andrew/apolloMod/helpers/lastfm/Session.java
@@ -26,7 +26,6 @@
 
 package com.andrew.apolloMod.helpers.lastfm;
 
-import com.andrew.apolloMod.helpers.DomElement;
 
 /**
  * Contains Session data relevant for making API calls which require
diff --git a/src/com/andrew/apolloMod/helpers/visualizer/WaveformRenderer.java b/src/com/andrew/apolloMod/helpers/visualizer/WaveformRenderer.java
index 3cc3b3b..8e91a84 100644
--- a/src/com/andrew/apolloMod/helpers/visualizer/WaveformRenderer.java
+++ b/src/com/andrew/apolloMod/helpers/visualizer/WaveformRenderer.java
@@ -7,7 +7,7 @@
 package com.andrew.apolloMod.helpers.visualizer;
 
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 
 import android.content.Context;
 import android.graphics.BlurMaskFilter;
diff --git a/src/com/andrew/apolloMod/menu/PlaylistPickerDialog.java b/src/com/andrew/apolloMod/menu/PlaylistPickerDialog.java
deleted file mode 100644
index 4ddccde..0000000
--- a/src/com/andrew/apolloMod/menu/PlaylistPickerDialog.java
+++ /dev/null
@@ -1,28 +0,0 @@
-
-package com.andrew.apolloMod.menu;
-
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnCancelListener;
-import android.content.DialogInterface.OnClickListener;
-
-public class PlaylistPickerDialog extends AlertDialog implements OnCancelListener, OnClickListener {
-
-    public PlaylistPickerDialog(Context context) {
-        super(context);
-    }
-
-    @Override
-    public void onCancel(DialogInterface dialog) {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void onClick(DialogInterface dialog, int which) {
-        // TODO Auto-generated method stub
-
-    }
-
-}
diff --git a/src/com/andrew/apolloMod/preferences/SettingsHolder.java b/src/com/andrew/apolloMod/preferences/SettingsHolder.java
index bc749fd..5a6352a 100644
--- a/src/com/andrew/apolloMod/preferences/SettingsHolder.java
+++ b/src/com/andrew/apolloMod/preferences/SettingsHolder.java
@@ -32,7 +32,7 @@
 import com.andrew.apolloMod.IApolloService;
 import com.andrew.apolloMod.R;
 import com.andrew.apolloMod.cache.ImageProvider;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.service.ApolloService;
 import com.andrew.apolloMod.service.ServiceToken;
 
diff --git a/src/com/andrew/apolloMod/service/ApolloService.java b/src/com/andrew/apolloMod/service/ApolloService.java
index ff173f0..cd9ba37 100644
--- a/src/com/andrew/apolloMod/service/ApolloService.java
+++ b/src/com/andrew/apolloMod/service/ApolloService.java
@@ -69,15 +69,15 @@
 
 import com.andrew.apolloMod.IApolloService;
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.app.widgets.AppWidget11;
-import com.andrew.apolloMod.app.widgets.AppWidget41;
-import com.andrew.apolloMod.app.widgets.AppWidget42;
+import com.andrew.apolloMod.appwidgets.AppWidget11;
+import com.andrew.apolloMod.appwidgets.AppWidget41;
+import com.andrew.apolloMod.appwidgets.AppWidget42;
+import com.andrew.apolloMod.cache.GetBitmapTask;
 import com.andrew.apolloMod.cache.ImageInfo;
-import com.andrew.apolloMod.helpers.GetBitmapTask;
-import com.andrew.apolloMod.helpers.GetBitmapTask.OnBitmapReadyListener;
-import com.andrew.apolloMod.helpers.utils.ImageUtils;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
-import com.andrew.apolloMod.helpers.utils.VisualizerUtils;
+import com.andrew.apolloMod.cache.GetBitmapTask.OnBitmapReadyListener;
+import com.andrew.apolloMod.helpers.ImageUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
+import com.andrew.apolloMod.helpers.VisualizerUtils;
 import com.andrew.apolloMod.preferences.SharedPreferencesCompat;
 
 import static com.andrew.apolloMod.Constants.APOLLO_PREFERENCES;
diff --git a/src/com/andrew/apolloMod/service/MediaButtonIntentReceiver.java b/src/com/andrew/apolloMod/service/MediaButtonIntentReceiver.java
index 915889b..5047fe5 100644
--- a/src/com/andrew/apolloMod/service/MediaButtonIntentReceiver.java
+++ b/src/com/andrew/apolloMod/service/MediaButtonIntentReceiver.java
@@ -16,7 +16,7 @@
 
 package com.andrew.apolloMod.service;
 
-import com.andrew.apolloMod.activities.MusicLibrary;
+import com.andrew.apolloMod.ui.activities.MusicLibrary;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/src/com/andrew/apolloMod/service/ServiceBinder.java b/src/com/andrew/apolloMod/service/ServiceBinder.java
index faecba0..46ebe0b 100644
--- a/src/com/andrew/apolloMod/service/ServiceBinder.java
+++ b/src/com/andrew/apolloMod/service/ServiceBinder.java
@@ -6,7 +6,7 @@
 import android.os.IBinder;
 
 import com.andrew.apolloMod.IApolloService;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 
 public class ServiceBinder implements ServiceConnection {
     private final ServiceConnection mCallback;
diff --git a/src/com/andrew/apolloMod/activities/MusicLibrary.java b/src/com/andrew/apolloMod/ui/activities/MusicLibrary.java
similarity index 98%
rename from src/com/andrew/apolloMod/activities/MusicLibrary.java
rename to src/com/andrew/apolloMod/ui/activities/MusicLibrary.java
index 9dc72f0..fd8d96c 100644
--- a/src/com/andrew/apolloMod/activities/MusicLibrary.java
+++ b/src/com/andrew/apolloMod/ui/activities/MusicLibrary.java
@@ -2,7 +2,7 @@
  * 
  */
 
-package com.andrew.apolloMod.activities;
+package com.andrew.apolloMod.ui.activities;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -45,12 +45,12 @@
 import com.andrew.apolloMod.ui.fragments.list.PlaylistsFragment;
 import com.andrew.apolloMod.ui.fragments.list.RecentlyAddedFragment;
 import com.andrew.apolloMod.ui.fragments.list.SongsFragment;
-import com.andrew.apolloMod.helpers.utils.ApolloUtils;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.ApolloUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.preferences.SettingsHolder;
 import com.andrew.apolloMod.service.ApolloService;
 import com.andrew.apolloMod.service.ServiceToken;
-import com.andrew.apolloMod.ui.widgets.ScrollableTabView;
+import com.andrew.apolloMod.ui.views.ScrollableTabView;
 import com.sothree.slidinguppanel.SlidingUpPanelLayout;
 import com.sothree.slidinguppanel.SlidingUpPanelLayout.PanelSlideListener;
 
diff --git a/src/com/andrew/apolloMod/activities/PlayExternal.java b/src/com/andrew/apolloMod/ui/activities/PlayExternal.java
similarity index 98%
rename from src/com/andrew/apolloMod/activities/PlayExternal.java
rename to src/com/andrew/apolloMod/ui/activities/PlayExternal.java
index bdebb28..06726a0 100644
--- a/src/com/andrew/apolloMod/activities/PlayExternal.java
+++ b/src/com/andrew/apolloMod/ui/activities/PlayExternal.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.andrew.apolloMod.activities;
+package com.andrew.apolloMod.ui.activities;
 
 import static com.andrew.apolloMod.Constants.CURRENT_THEME;
 import android.app.Activity;
@@ -35,7 +35,7 @@
 
 import com.andrew.apolloMod.IApolloService;
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.service.ServiceToken;
 
 import java.io.File;
diff --git a/src/com/andrew/apolloMod/activities/QueryBrowserActivity.java b/src/com/andrew/apolloMod/ui/activities/QueryBrowserActivity.java
similarity index 99%
rename from src/com/andrew/apolloMod/activities/QueryBrowserActivity.java
rename to src/com/andrew/apolloMod/ui/activities/QueryBrowserActivity.java
index eb687d9..0f6324b 100644
--- a/src/com/andrew/apolloMod/activities/QueryBrowserActivity.java
+++ b/src/com/andrew/apolloMod/ui/activities/QueryBrowserActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.andrew.apolloMod.activities;
+package com.andrew.apolloMod.ui.activities;
 
 import android.app.ListActivity;
 import android.app.SearchManager;
@@ -43,8 +43,8 @@
 import android.widget.TextView;
 
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.helpers.utils.ApolloUtils;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.ApolloUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.service.ServiceToken;
 
 import static com.andrew.apolloMod.Constants.ALBUM_KEY;
diff --git a/src/com/andrew/apolloMod/activities/QuickQueue.java b/src/com/andrew/apolloMod/ui/activities/QuickQueue.java
similarity index 97%
rename from src/com/andrew/apolloMod/activities/QuickQueue.java
rename to src/com/andrew/apolloMod/ui/activities/QuickQueue.java
index 8bef00d..4f4c41a 100644
--- a/src/com/andrew/apolloMod/activities/QuickQueue.java
+++ b/src/com/andrew/apolloMod/ui/activities/QuickQueue.java
@@ -2,7 +2,7 @@
  * 
  */
 
-package com.andrew.apolloMod.activities;
+package com.andrew.apolloMod.ui.activities;
 
 import android.content.SharedPreferences;
 import android.media.AudioManager;
diff --git a/src/com/andrew/apolloMod/activities/SimpleEq.java b/src/com/andrew/apolloMod/ui/activities/SimpleEq.java
similarity index 96%
rename from src/com/andrew/apolloMod/activities/SimpleEq.java
rename to src/com/andrew/apolloMod/ui/activities/SimpleEq.java
index 40802a7..1fee0f2 100644
--- a/src/com/andrew/apolloMod/activities/SimpleEq.java
+++ b/src/com/andrew/apolloMod/ui/activities/SimpleEq.java
@@ -2,7 +2,7 @@
  * 
  */
 
-package com.andrew.apolloMod.activities;
+package com.andrew.apolloMod.ui.activities;
 
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
@@ -18,10 +18,10 @@
 import android.widget.TextView;
 
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.helpers.utils.ApolloUtils;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.ApolloUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.preferences.SharedPreferencesCompat;
-import com.andrew.apolloMod.views.VerticalSeekBar;
+import com.andrew.apolloMod.ui.views.VerticalSeekBar;
 
 import static com.andrew.apolloMod.Constants.*;
 
diff --git a/src/com/andrew/apolloMod/activities/TracksBrowser.java b/src/com/andrew/apolloMod/ui/activities/TracksBrowser.java
similarity index 99%
rename from src/com/andrew/apolloMod/activities/TracksBrowser.java
rename to src/com/andrew/apolloMod/ui/activities/TracksBrowser.java
index 4920f38..566a3c5 100644
--- a/src/com/andrew/apolloMod/activities/TracksBrowser.java
+++ b/src/com/andrew/apolloMod/ui/activities/TracksBrowser.java
@@ -2,7 +2,7 @@
  * 
  */
 
-package com.andrew.apolloMod.activities;
+package com.andrew.apolloMod.ui.activities;
 
 import android.app.SearchManager;
 import android.content.*;
@@ -36,8 +36,8 @@
 import com.andrew.apolloMod.R;
 import com.andrew.apolloMod.cache.ImageInfo;
 import com.andrew.apolloMod.cache.ImageProvider;
-import com.andrew.apolloMod.helpers.utils.ApolloUtils;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.ApolloUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.ui.adapters.PagerAdapter;
 import com.andrew.apolloMod.ui.fragments.BottomActionBarFragment;
 import com.andrew.apolloMod.ui.fragments.list.AlbumListFragment;
diff --git a/src/com/andrew/apolloMod/menu/PlaylistDialog.java b/src/com/andrew/apolloMod/ui/activities/dialogs/PlaylistDialog.java
similarity index 99%
rename from src/com/andrew/apolloMod/menu/PlaylistDialog.java
rename to src/com/andrew/apolloMod/ui/activities/dialogs/PlaylistDialog.java
index 477be9d..27ff0fa 100644
--- a/src/com/andrew/apolloMod/menu/PlaylistDialog.java
+++ b/src/com/andrew/apolloMod/ui/activities/dialogs/PlaylistDialog.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.andrew.apolloMod.menu;
+package com.andrew.apolloMod.ui.activities.dialogs;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -42,7 +42,7 @@
 import android.widget.Toast;
 
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 
 import static com.andrew.apolloMod.Constants.CURRENT_THEME;
 import static com.andrew.apolloMod.Constants.INTENT_CREATE_PLAYLIST;
diff --git a/src/com/andrew/apolloMod/menu/PlaylistPicker.java b/src/com/andrew/apolloMod/ui/activities/dialogs/PlaylistPicker.java
similarity index 98%
rename from src/com/andrew/apolloMod/menu/PlaylistPicker.java
rename to src/com/andrew/apolloMod/ui/activities/dialogs/PlaylistPicker.java
index f8a23c6..6d4bd3b 100644
--- a/src/com/andrew/apolloMod/menu/PlaylistPicker.java
+++ b/src/com/andrew/apolloMod/ui/activities/dialogs/PlaylistPicker.java
@@ -1,5 +1,5 @@
 
-package com.andrew.apolloMod.menu;
+package com.andrew.apolloMod.ui.activities.dialogs;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -18,7 +18,7 @@
 import android.widget.Toast;
 
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 
 import static com.andrew.apolloMod.Constants.CURRENT_THEME;
 import static com.andrew.apolloMod.Constants.INTENT_ADD_TO_PLAYLIST;
diff --git a/src/com/andrew/apolloMod/ui/adapters/AlbumArtPagerAdapter.java b/src/com/andrew/apolloMod/ui/adapters/AlbumArtPagerAdapter.java
index a521da5..98aca01 100644
--- a/src/com/andrew/apolloMod/ui/adapters/AlbumArtPagerAdapter.java
+++ b/src/com/andrew/apolloMod/ui/adapters/AlbumArtPagerAdapter.java
@@ -6,7 +6,8 @@
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentStatePagerAdapter;
-import com.andrew.apolloMod.helpers.RefreshableFragment;
+
+import com.andrew.apolloMod.ui.fragments.base.RefreshableFragment;
 
 public class AlbumArtPagerAdapter extends FragmentStatePagerAdapter {
 
diff --git a/src/com/andrew/apolloMod/ui/adapters/PagerAdapter.java b/src/com/andrew/apolloMod/ui/adapters/PagerAdapter.java
index 55c5b4b..4fff2bb 100644
--- a/src/com/andrew/apolloMod/ui/adapters/PagerAdapter.java
+++ b/src/com/andrew/apolloMod/ui/adapters/PagerAdapter.java
@@ -10,7 +10,7 @@
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
 
-import com.andrew.apolloMod.helpers.RefreshableFragment;
+import com.andrew.apolloMod.ui.fragments.base.RefreshableFragment;
 
 /**
  * @author Andrew Neal
diff --git a/src/com/andrew/apolloMod/ui/adapters/QuickQueueAdapter.java b/src/com/andrew/apolloMod/ui/adapters/QuickQueueAdapter.java
index 552dde5..8cb2c31 100644
--- a/src/com/andrew/apolloMod/ui/adapters/QuickQueueAdapter.java
+++ b/src/com/andrew/apolloMod/ui/adapters/QuickQueueAdapter.java
@@ -15,7 +15,7 @@
 import com.andrew.apolloMod.cache.ImageInfo;
 import com.andrew.apolloMod.cache.ImageProvider;
 import com.andrew.apolloMod.ui.fragments.grid.QuickQueueFragment;
-import com.andrew.apolloMod.views.ViewHolderQueue;
+import com.andrew.apolloMod.ui.views.holders.ViewHolderQueue;
 
 import java.lang.ref.WeakReference;
 
diff --git a/src/com/andrew/apolloMod/ui/adapters/base/DragSortListViewAdapter.java b/src/com/andrew/apolloMod/ui/adapters/base/DragSortListViewAdapter.java
index 3f06f45..55afd07 100644
--- a/src/com/andrew/apolloMod/ui/adapters/base/DragSortListViewAdapter.java
+++ b/src/com/andrew/apolloMod/ui/adapters/base/DragSortListViewAdapter.java
@@ -17,8 +17,8 @@
 import com.andrew.apolloMod.R;
 import com.andrew.apolloMod.cache.ImageInfo;
 import com.andrew.apolloMod.cache.ImageProvider;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
-import com.andrew.apolloMod.views.ViewHolderList;
+import com.andrew.apolloMod.helpers.MusicUtils;
+import com.andrew.apolloMod.ui.views.holders.ViewHolderList;
 import com.mobeta.android.dslv.SimpleDragSortCursorAdapter;
 
 public abstract class DragSortListViewAdapter extends SimpleDragSortCursorAdapter{
diff --git a/src/com/andrew/apolloMod/ui/adapters/base/GridViewAdapter.java b/src/com/andrew/apolloMod/ui/adapters/base/GridViewAdapter.java
index f581f97..11dda5a 100644
--- a/src/com/andrew/apolloMod/ui/adapters/base/GridViewAdapter.java
+++ b/src/com/andrew/apolloMod/ui/adapters/base/GridViewAdapter.java
@@ -15,8 +15,8 @@
 import com.andrew.apolloMod.R;
 import com.andrew.apolloMod.cache.ImageInfo;
 import com.andrew.apolloMod.cache.ImageProvider;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
-import com.andrew.apolloMod.views.ViewHolderGrid;
+import com.andrew.apolloMod.helpers.MusicUtils;
+import com.andrew.apolloMod.ui.views.holders.ViewHolderGrid;
 
 import java.lang.ref.WeakReference;
 
diff --git a/src/com/andrew/apolloMod/ui/adapters/base/ListViewAdapter.java b/src/com/andrew/apolloMod/ui/adapters/base/ListViewAdapter.java
index 68fafdf..761a4d0 100644
--- a/src/com/andrew/apolloMod/ui/adapters/base/ListViewAdapter.java
+++ b/src/com/andrew/apolloMod/ui/adapters/base/ListViewAdapter.java
@@ -17,8 +17,8 @@
 import com.andrew.apolloMod.R;
 import com.andrew.apolloMod.cache.ImageInfo;
 import com.andrew.apolloMod.cache.ImageProvider;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
-import com.andrew.apolloMod.views.ViewHolderList;
+import com.andrew.apolloMod.helpers.MusicUtils;
+import com.andrew.apolloMod.ui.views.holders.ViewHolderList;
 
 public abstract class ListViewAdapter extends SimpleCursorAdapter {
 	
diff --git a/src/com/andrew/apolloMod/ui/adapters/grid/AlbumAdapter.java b/src/com/andrew/apolloMod/ui/adapters/grid/AlbumAdapter.java
index bc71b31..31c923f 100644
--- a/src/com/andrew/apolloMod/ui/adapters/grid/AlbumAdapter.java
+++ b/src/com/andrew/apolloMod/ui/adapters/grid/AlbumAdapter.java
@@ -7,7 +7,7 @@
 import android.provider.BaseColumns;
 import android.provider.MediaStore.Audio.AlbumColumns;
 
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.ui.adapters.base.GridViewAdapter;
 
 public class AlbumAdapter extends GridViewAdapter {
diff --git a/src/com/andrew/apolloMod/ui/adapters/grid/ArtistAdapter.java b/src/com/andrew/apolloMod/ui/adapters/grid/ArtistAdapter.java
index a22ecdd..ef9687a 100644
--- a/src/com/andrew/apolloMod/ui/adapters/grid/ArtistAdapter.java
+++ b/src/com/andrew/apolloMod/ui/adapters/grid/ArtistAdapter.java
@@ -8,7 +8,7 @@
 import android.provider.MediaStore;
 import android.provider.MediaStore.Audio.ArtistColumns;
 
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.ui.adapters.base.GridViewAdapter;
 
 public class ArtistAdapter extends GridViewAdapter {
diff --git a/src/com/andrew/apolloMod/ui/adapters/list/AlbumListAdapter.java b/src/com/andrew/apolloMod/ui/adapters/list/AlbumListAdapter.java
index 70474dc..d7a1000 100644
--- a/src/com/andrew/apolloMod/ui/adapters/list/AlbumListAdapter.java
+++ b/src/com/andrew/apolloMod/ui/adapters/list/AlbumListAdapter.java
@@ -7,7 +7,8 @@
 import android.provider.BaseColumns;
 import android.provider.MediaStore.MediaColumns;
 import android.provider.MediaStore.Audio.AudioColumns;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.ui.adapters.base.ListViewAdapter;
 
 public class AlbumListAdapter extends ListViewAdapter {
diff --git a/src/com/andrew/apolloMod/ui/adapters/list/ArtistAlbumAdapter.java b/src/com/andrew/apolloMod/ui/adapters/list/ArtistAlbumAdapter.java
index b465e53..b3d2dbb 100644
--- a/src/com/andrew/apolloMod/ui/adapters/list/ArtistAlbumAdapter.java
+++ b/src/com/andrew/apolloMod/ui/adapters/list/ArtistAlbumAdapter.java
@@ -6,7 +6,8 @@
 import android.database.Cursor;
 import android.provider.BaseColumns;
 import android.provider.MediaStore.Audio.AlbumColumns;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.ui.adapters.base.ListViewAdapter;
 
 public class ArtistAlbumAdapter extends ListViewAdapter {
diff --git a/src/com/andrew/apolloMod/ui/adapters/list/ArtistListAdapter.java b/src/com/andrew/apolloMod/ui/adapters/list/ArtistListAdapter.java
index 5ce21cf..a8c08da 100644
--- a/src/com/andrew/apolloMod/ui/adapters/list/ArtistListAdapter.java
+++ b/src/com/andrew/apolloMod/ui/adapters/list/ArtistListAdapter.java
@@ -6,7 +6,8 @@
 import android.provider.BaseColumns;
 import android.provider.MediaStore.MediaColumns;
 import android.provider.MediaStore.Audio.AudioColumns;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.ui.adapters.base.ListViewAdapter;
 
 public class ArtistListAdapter extends ListViewAdapter {
diff --git a/src/com/andrew/apolloMod/ui/adapters/list/GenreAdapter.java b/src/com/andrew/apolloMod/ui/adapters/list/GenreAdapter.java
index 1014ac2..0dab8b9 100644
--- a/src/com/andrew/apolloMod/ui/adapters/list/GenreAdapter.java
+++ b/src/com/andrew/apolloMod/ui/adapters/list/GenreAdapter.java
@@ -5,7 +5,7 @@
 import android.database.Cursor;
 import android.provider.MediaStore.Audio;
 
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.ui.adapters.base.ListViewAdapter;
 
 public class GenreAdapter extends ListViewAdapter {
diff --git a/src/com/andrew/apolloMod/ui/adapters/list/GenreListAdapter.java b/src/com/andrew/apolloMod/ui/adapters/list/GenreListAdapter.java
index 800038f..68bf8dc 100644
--- a/src/com/andrew/apolloMod/ui/adapters/list/GenreListAdapter.java
+++ b/src/com/andrew/apolloMod/ui/adapters/list/GenreListAdapter.java
@@ -7,7 +7,7 @@
 import android.provider.MediaStore.MediaColumns;
 import android.provider.MediaStore.Audio.AudioColumns;
 
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.ui.adapters.base.ListViewAdapter;
 
 public class GenreListAdapter extends ListViewAdapter {
diff --git a/src/com/andrew/apolloMod/ui/adapters/list/NowPlayingAdapter.java b/src/com/andrew/apolloMod/ui/adapters/list/NowPlayingAdapter.java
index e4f25ac..bb52855 100644
--- a/src/com/andrew/apolloMod/ui/adapters/list/NowPlayingAdapter.java
+++ b/src/com/andrew/apolloMod/ui/adapters/list/NowPlayingAdapter.java
@@ -8,7 +8,7 @@
 import android.provider.MediaStore.Audio.AudioColumns;
 import android.widget.Toast;
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.ui.adapters.base.DragSortListViewAdapter;
 
 public class NowPlayingAdapter extends DragSortListViewAdapter {
diff --git a/src/com/andrew/apolloMod/ui/adapters/list/PlaylistListAdapter.java b/src/com/andrew/apolloMod/ui/adapters/list/PlaylistListAdapter.java
index 47b5cf5..15f8a73 100644
--- a/src/com/andrew/apolloMod/ui/adapters/list/PlaylistListAdapter.java
+++ b/src/com/andrew/apolloMod/ui/adapters/list/PlaylistListAdapter.java
@@ -11,7 +11,7 @@
 import android.util.Log;
 import android.widget.Toast;
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.ui.adapters.base.DragSortListViewAdapter;
 
 public class PlaylistListAdapter extends DragSortListViewAdapter {
diff --git a/src/com/andrew/apolloMod/ui/adapters/list/RecentlyAddedAdapter.java b/src/com/andrew/apolloMod/ui/adapters/list/RecentlyAddedAdapter.java
index 3b5f081..839e1a6 100644
--- a/src/com/andrew/apolloMod/ui/adapters/list/RecentlyAddedAdapter.java
+++ b/src/com/andrew/apolloMod/ui/adapters/list/RecentlyAddedAdapter.java
@@ -6,7 +6,8 @@
 import android.provider.BaseColumns;
 import android.provider.MediaStore.MediaColumns;
 import android.provider.MediaStore.Audio.AudioColumns;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.ui.adapters.base.GridViewAdapter;
 import static com.andrew.apolloMod.Constants.TYPE_ALBUM;
 
diff --git a/src/com/andrew/apolloMod/ui/adapters/list/SonglistAdapter.java b/src/com/andrew/apolloMod/ui/adapters/list/SonglistAdapter.java
index 8a68071..b18ed3e 100644
--- a/src/com/andrew/apolloMod/ui/adapters/list/SonglistAdapter.java
+++ b/src/com/andrew/apolloMod/ui/adapters/list/SonglistAdapter.java
@@ -8,7 +8,7 @@
 import android.provider.MediaStore.MediaColumns;
 import android.provider.MediaStore.Audio.AudioColumns;
 
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.ui.adapters.base.ListViewAdapter;
 
 public class SonglistAdapter extends ListViewAdapter {
diff --git a/src/com/andrew/apolloMod/ui/fragments/AudioPlayerFragment.java b/src/com/andrew/apolloMod/ui/fragments/AudioPlayerFragment.java
index 692f085..0daa003 100644
--- a/src/com/andrew/apolloMod/ui/fragments/AudioPlayerFragment.java
+++ b/src/com/andrew/apolloMod/ui/fragments/AudioPlayerFragment.java
@@ -40,16 +40,16 @@
 import android.widget.TextView;
 import android.widget.Toast;
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.activities.TracksBrowser;
+import com.andrew.apolloMod.ui.activities.TracksBrowser;
 import com.andrew.apolloMod.cache.ImageInfo;
 import com.andrew.apolloMod.cache.ImageProvider;
-import com.andrew.apolloMod.helpers.utils.ApolloUtils;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
-import com.andrew.apolloMod.helpers.utils.VisualizerUtils;
+import com.andrew.apolloMod.helpers.ApolloUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
+import com.andrew.apolloMod.helpers.VisualizerUtils;
 import com.andrew.apolloMod.service.ApolloService;
 import com.andrew.apolloMod.ui.adapters.AlbumArtPagerAdapter;
-import com.andrew.apolloMod.ui.widgets.RepeatingImageButton;
-import com.andrew.apolloMod.ui.widgets.VisualizerView;
+import com.andrew.apolloMod.ui.views.RepeatingImageButton;
+import com.andrew.apolloMod.ui.views.VisualizerView;
 
 public class AudioPlayerFragment extends Fragment {
 
diff --git a/src/com/andrew/apolloMod/ui/fragments/BottomActionBarFragment.java b/src/com/andrew/apolloMod/ui/fragments/BottomActionBarFragment.java
index 25aa774..23f8a60 100644
--- a/src/com/andrew/apolloMod/ui/fragments/BottomActionBarFragment.java
+++ b/src/com/andrew/apolloMod/ui/fragments/BottomActionBarFragment.java
@@ -23,10 +23,10 @@
 import android.widget.TextView;
 
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.service.ApolloService;
 import com.andrew.apolloMod.ui.fragments.list.NowPlayingFragment;
-import com.andrew.apolloMod.ui.widgets.BottomActionBar;
+import com.andrew.apolloMod.ui.views.BottomActionBar;
 
 public class BottomActionBarFragment extends Fragment {
 
diff --git a/src/com/andrew/apolloMod/ui/fragments/base/DragSortListViewFragment.java b/src/com/andrew/apolloMod/ui/fragments/base/DragSortListViewFragment.java
index df763d8..bf1bd43 100644
--- a/src/com/andrew/apolloMod/ui/fragments/base/DragSortListViewFragment.java
+++ b/src/com/andrew/apolloMod/ui/fragments/base/DragSortListViewFragment.java
@@ -25,8 +25,7 @@
 import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.AdapterView.OnItemClickListener;
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.helpers.RefreshableFragment;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.service.ApolloService;
 import com.andrew.apolloMod.ui.adapters.base.DragSortListViewAdapter;
 import com.mobeta.android.dslv.DragSortController;
diff --git a/src/com/andrew/apolloMod/ui/fragments/base/GridViewFragment.java b/src/com/andrew/apolloMod/ui/fragments/base/GridViewFragment.java
index d643ace..9c0581f 100644
--- a/src/com/andrew/apolloMod/ui/fragments/base/GridViewFragment.java
+++ b/src/com/andrew/apolloMod/ui/fragments/base/GridViewFragment.java
@@ -4,8 +4,8 @@
 import static com.andrew.apolloMod.Constants.INTENT_PLAYLIST_LIST;
 
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.helpers.utils.ApolloUtils;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.ApolloUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.service.ApolloService;
 import com.andrew.apolloMod.ui.adapters.base.GridViewAdapter;
 
diff --git a/src/com/andrew/apolloMod/ui/fragments/base/ListViewFragment.java b/src/com/andrew/apolloMod/ui/fragments/base/ListViewFragment.java
index 9b77979..9c8e59f 100644
--- a/src/com/andrew/apolloMod/ui/fragments/base/ListViewFragment.java
+++ b/src/com/andrew/apolloMod/ui/fragments/base/ListViewFragment.java
@@ -23,8 +23,7 @@
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ListView;
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.helpers.RefreshableFragment;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.service.ApolloService;
 import com.andrew.apolloMod.ui.adapters.base.ListViewAdapter;
 import static com.andrew.apolloMod.Constants.INTENT_ADD_TO_PLAYLIST;
diff --git a/src/com/andrew/apolloMod/helpers/RefreshableFragment.java b/src/com/andrew/apolloMod/ui/fragments/base/RefreshableFragment.java
similarity index 94%
rename from src/com/andrew/apolloMod/helpers/RefreshableFragment.java
rename to src/com/andrew/apolloMod/ui/fragments/base/RefreshableFragment.java
index 709c2fc..8a08998 100644
--- a/src/com/andrew/apolloMod/helpers/RefreshableFragment.java
+++ b/src/com/andrew/apolloMod/ui/fragments/base/RefreshableFragment.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.andrew.apolloMod.helpers;
+package com.andrew.apolloMod.ui.fragments.base;
 
 import android.support.v4.app.Fragment;
 
diff --git a/src/com/andrew/apolloMod/ui/fragments/grid/QuickQueueFragment.java b/src/com/andrew/apolloMod/ui/fragments/grid/QuickQueueFragment.java
index 576a795..9cf56fc 100644
--- a/src/com/andrew/apolloMod/ui/fragments/grid/QuickQueueFragment.java
+++ b/src/com/andrew/apolloMod/ui/fragments/grid/QuickQueueFragment.java
@@ -30,10 +30,9 @@
 import android.widget.GridView;
 import android.widget.LinearLayout;
 
-import com.andrew.apolloMod.NowPlayingCursor;
 import com.andrew.apolloMod.R;
 import com.andrew.apolloMod.helpers.AddIdCursorLoader;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.service.ApolloService;
 import com.andrew.apolloMod.ui.adapters.QuickQueueAdapter;
 
@@ -183,11 +182,6 @@ public boolean onContextItemSelected(MenuItem item) {
 
     @Override
     public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
-        if (mCursor instanceof NowPlayingCursor) {
-            if (MusicUtils.mService != null) {
-                MusicUtils.setQueuePosition(position);
-            }
-        }
         MusicUtils.playAll(getActivity(), mCursor, position);
         getActivity().finish();
     }
diff --git a/src/com/andrew/apolloMod/ui/fragments/list/ArtistAlbumsFragment.java b/src/com/andrew/apolloMod/ui/fragments/list/ArtistAlbumsFragment.java
index 7e899df..b9783d0 100644
--- a/src/com/andrew/apolloMod/ui/fragments/list/ArtistAlbumsFragment.java
+++ b/src/com/andrew/apolloMod/ui/fragments/list/ArtistAlbumsFragment.java
@@ -10,8 +10,8 @@
 import android.view.ContextMenu.ContextMenuInfo;
 import android.widget.AdapterView;
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.helpers.utils.ApolloUtils;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.ApolloUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.ui.adapters.list.ArtistAlbumAdapter;
 import com.andrew.apolloMod.ui.fragments.base.ListViewFragment;
 import static com.andrew.apolloMod.Constants.TYPE_ALBUM;
diff --git a/src/com/andrew/apolloMod/ui/fragments/list/GenresFragment.java b/src/com/andrew/apolloMod/ui/fragments/list/GenresFragment.java
index ef8a14b..b0c9506 100644
--- a/src/com/andrew/apolloMod/ui/fragments/list/GenresFragment.java
+++ b/src/com/andrew/apolloMod/ui/fragments/list/GenresFragment.java
@@ -9,8 +9,8 @@
 import android.view.View;
 import android.widget.AdapterView;
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.helpers.utils.ApolloUtils;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.ApolloUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.ui.adapters.list.GenreAdapter;
 import com.andrew.apolloMod.ui.fragments.base.ListViewFragment;
 import static com.andrew.apolloMod.Constants.TYPE_GENRE;
diff --git a/src/com/andrew/apolloMod/ui/fragments/list/NowPlayingFragment.java b/src/com/andrew/apolloMod/ui/fragments/list/NowPlayingFragment.java
index 115307d..8e5b823 100644
--- a/src/com/andrew/apolloMod/ui/fragments/list/NowPlayingFragment.java
+++ b/src/com/andrew/apolloMod/ui/fragments/list/NowPlayingFragment.java
@@ -10,7 +10,7 @@
 import android.provider.MediaStore.Audio.AudioColumns;
 import android.provider.MediaStore.MediaColumns;
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.ui.adapters.list.NowPlayingAdapter;
 import com.andrew.apolloMod.ui.fragments.base.DragSortListViewFragment;
 import static com.andrew.apolloMod.Constants.TYPE_SONG;
diff --git a/src/com/andrew/apolloMod/ui/fragments/list/PlaylistListFragment.java b/src/com/andrew/apolloMod/ui/fragments/list/PlaylistListFragment.java
index bc01776..4b0d3f8 100644
--- a/src/com/andrew/apolloMod/ui/fragments/list/PlaylistListFragment.java
+++ b/src/com/andrew/apolloMod/ui/fragments/list/PlaylistListFragment.java
@@ -8,7 +8,7 @@
 import android.provider.MediaStore.Audio.Playlists;
 import android.provider.MediaStore.MediaColumns;
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.ui.adapters.list.PlaylistListAdapter;
 import com.andrew.apolloMod.ui.fragments.base.DragSortListViewFragment;
 import static com.andrew.apolloMod.Constants.EXTERNAL;
diff --git a/src/com/andrew/apolloMod/ui/fragments/list/PlaylistsFragment.java b/src/com/andrew/apolloMod/ui/fragments/list/PlaylistsFragment.java
index 8ce1201..59aa4b8 100644
--- a/src/com/andrew/apolloMod/ui/fragments/list/PlaylistsFragment.java
+++ b/src/com/andrew/apolloMod/ui/fragments/list/PlaylistsFragment.java
@@ -15,8 +15,8 @@
 import android.widget.AdapterView;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.helpers.utils.ApolloUtils;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.ApolloUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.ui.adapters.list.PlaylistAdapter;
 import com.andrew.apolloMod.ui.fragments.base.ListViewFragment;
 import static com.andrew.apolloMod.Constants.INTENT_KEY_RENAME;
diff --git a/src/com/andrew/apolloMod/ui/fragments/list/RecentlyAddedFragment.java b/src/com/andrew/apolloMod/ui/fragments/list/RecentlyAddedFragment.java
index 532a1e4..21bc413 100644
--- a/src/com/andrew/apolloMod/ui/fragments/list/RecentlyAddedFragment.java
+++ b/src/com/andrew/apolloMod/ui/fragments/list/RecentlyAddedFragment.java
@@ -12,7 +12,7 @@
 import android.provider.MediaStore.MediaColumns;
 import com.andrew.apolloMod.R;
 import com.andrew.apolloMod.helpers.AddIdCursorLoader;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.ui.adapters.list.RecentlyAddedAdapter;
 import com.andrew.apolloMod.ui.fragments.base.GridViewFragment;
 import static com.andrew.apolloMod.Constants.NUMWEEKS;
diff --git a/src/com/andrew/apolloMod/ui/fragments/list/SongsFragment.java b/src/com/andrew/apolloMod/ui/fragments/list/SongsFragment.java
index 65d6508..a4a4417 100644
--- a/src/com/andrew/apolloMod/ui/fragments/list/SongsFragment.java
+++ b/src/com/andrew/apolloMod/ui/fragments/list/SongsFragment.java
@@ -14,7 +14,7 @@
 import android.widget.RelativeLayout;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 import com.andrew.apolloMod.ui.adapters.list.SonglistAdapter;
 import com.andrew.apolloMod.ui.fragments.base.ListViewFragment;
 import static com.andrew.apolloMod.Constants.TYPE_SONG;
diff --git a/src/com/andrew/apolloMod/ui/widgets/BottomActionBar.java b/src/com/andrew/apolloMod/ui/views/BottomActionBar.java
similarity index 96%
rename from src/com/andrew/apolloMod/ui/widgets/BottomActionBar.java
rename to src/com/andrew/apolloMod/ui/views/BottomActionBar.java
index 8c13ed8..547f627 100644
--- a/src/com/andrew/apolloMod/ui/widgets/BottomActionBar.java
+++ b/src/com/andrew/apolloMod/ui/views/BottomActionBar.java
@@ -2,7 +2,7 @@
  * 
  */
 
-package com.andrew.apolloMod.ui.widgets;
+package com.andrew.apolloMod.ui.views;
 
 import static com.andrew.apolloMod.Constants.SIZE_THUMB;
 import static com.andrew.apolloMod.Constants.SRC_FIRST_AVAILABLE;
@@ -22,10 +22,10 @@
 import android.widget.TextView;
 
 import com.andrew.apolloMod.R;
-import com.andrew.apolloMod.activities.QuickQueue;
+import com.andrew.apolloMod.ui.activities.QuickQueue;
 import com.andrew.apolloMod.cache.ImageInfo;
 import com.andrew.apolloMod.cache.ImageProvider;
-import com.andrew.apolloMod.helpers.utils.MusicUtils;
+import com.andrew.apolloMod.helpers.MusicUtils;
 
 /**
  * @author Andrew Neal
diff --git a/src/com/andrew/apolloMod/ui/widgets/RepeatingImageButton.java b/src/com/andrew/apolloMod/ui/views/RepeatingImageButton.java
similarity index 99%
rename from src/com/andrew/apolloMod/ui/widgets/RepeatingImageButton.java
rename to src/com/andrew/apolloMod/ui/views/RepeatingImageButton.java
index df3d2a9..3761eba 100644
--- a/src/com/andrew/apolloMod/ui/widgets/RepeatingImageButton.java
+++ b/src/com/andrew/apolloMod/ui/views/RepeatingImageButton.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.andrew.apolloMod.ui.widgets;
+package com.andrew.apolloMod.ui.views;
 
 import android.content.Context;
 import android.os.SystemClock;
diff --git a/src/com/andrew/apolloMod/ui/widgets/ScrollableTabView.java b/src/com/andrew/apolloMod/ui/views/ScrollableTabView.java
similarity index 99%
rename from src/com/andrew/apolloMod/ui/widgets/ScrollableTabView.java
rename to src/com/andrew/apolloMod/ui/views/ScrollableTabView.java
index 4757212..60356c7 100644
--- a/src/com/andrew/apolloMod/ui/widgets/ScrollableTabView.java
+++ b/src/com/andrew/apolloMod/ui/views/ScrollableTabView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.andrew.apolloMod.ui.widgets;
+package com.andrew.apolloMod.ui.views;
 
 import java.util.ArrayList;
 
diff --git a/src/com/andrew/apolloMod/views/TrackBrowserImageView.java b/src/com/andrew/apolloMod/ui/views/TrackBrowserImageView.java
similarity index 97%
rename from src/com/andrew/apolloMod/views/TrackBrowserImageView.java
rename to src/com/andrew/apolloMod/ui/views/TrackBrowserImageView.java
index 53e4ab6..ff48ce9 100644
--- a/src/com/andrew/apolloMod/views/TrackBrowserImageView.java
+++ b/src/com/andrew/apolloMod/ui/views/TrackBrowserImageView.java
@@ -1,4 +1,4 @@
-package com.andrew.apolloMod.views;
+package com.andrew.apolloMod.ui.views;
 
 
 import android.content.Context;
diff --git a/src/com/andrew/apolloMod/views/VerticalSeekBar.java b/src/com/andrew/apolloMod/ui/views/VerticalSeekBar.java
similarity index 97%
rename from src/com/andrew/apolloMod/views/VerticalSeekBar.java
rename to src/com/andrew/apolloMod/ui/views/VerticalSeekBar.java
index e7aa47b..7e6b752 100644
--- a/src/com/andrew/apolloMod/views/VerticalSeekBar.java
+++ b/src/com/andrew/apolloMod/ui/views/VerticalSeekBar.java
@@ -1,4 +1,4 @@
-package com.andrew.apolloMod.views;
+package com.andrew.apolloMod.ui.views;
 
 import android.content.Context;
 import android.graphics.Canvas;
diff --git a/src/com/andrew/apolloMod/ui/widgets/VisualizerView.java b/src/com/andrew/apolloMod/ui/views/VisualizerView.java
similarity index 98%
rename from src/com/andrew/apolloMod/ui/widgets/VisualizerView.java
rename to src/com/andrew/apolloMod/ui/views/VisualizerView.java
index f9e6eef..c36fcc2 100644
--- a/src/com/andrew/apolloMod/ui/widgets/VisualizerView.java
+++ b/src/com/andrew/apolloMod/ui/views/VisualizerView.java
@@ -4,7 +4,7 @@
  * Licensed under the MIT license:
  * http://creativecommons.org/licenses/MIT/
  */
-package com.andrew.apolloMod.ui.widgets;
+package com.andrew.apolloMod.ui.views;
 
 import com.andrew.apolloMod.R;
 import com.andrew.apolloMod.helpers.visualizer.AudioData;
diff --git a/src/com/andrew/apolloMod/views/ViewHolderGrid.java b/src/com/andrew/apolloMod/ui/views/holders/ViewHolderGrid.java
similarity index 95%
rename from src/com/andrew/apolloMod/views/ViewHolderGrid.java
rename to src/com/andrew/apolloMod/ui/views/holders/ViewHolderGrid.java
index 564056d..967bf74 100644
--- a/src/com/andrew/apolloMod/views/ViewHolderGrid.java
+++ b/src/com/andrew/apolloMod/ui/views/holders/ViewHolderGrid.java
@@ -2,7 +2,7 @@
  * 
  */
 
-package com.andrew.apolloMod.views;
+package com.andrew.apolloMod.ui.views.holders;
 
 import android.view.View;
 import android.widget.ImageView;
diff --git a/src/com/andrew/apolloMod/views/ViewHolderList.java b/src/com/andrew/apolloMod/ui/views/holders/ViewHolderList.java
similarity index 96%
rename from src/com/andrew/apolloMod/views/ViewHolderList.java
rename to src/com/andrew/apolloMod/ui/views/holders/ViewHolderList.java
index 8589e70..d8453dd 100644
--- a/src/com/andrew/apolloMod/views/ViewHolderList.java
+++ b/src/com/andrew/apolloMod/ui/views/holders/ViewHolderList.java
@@ -2,7 +2,7 @@
  * 
  */
 
-package com.andrew.apolloMod.views;
+package com.andrew.apolloMod.ui.views.holders;
 
 import android.view.View;
 import android.widget.FrameLayout;
diff --git a/src/com/andrew/apolloMod/views/ViewHolderQueue.java b/src/com/andrew/apolloMod/ui/views/holders/ViewHolderQueue.java
similarity index 94%
rename from src/com/andrew/apolloMod/views/ViewHolderQueue.java
rename to src/com/andrew/apolloMod/ui/views/holders/ViewHolderQueue.java
index aae85a1..ba1c179 100644
--- a/src/com/andrew/apolloMod/views/ViewHolderQueue.java
+++ b/src/com/andrew/apolloMod/ui/views/holders/ViewHolderQueue.java
@@ -2,7 +2,7 @@
  * 
  */
 
-package com.andrew.apolloMod.views;
+package com.andrew.apolloMod.ui.views.holders;
 
 import android.view.View;
 import android.widget.ImageView;

From 451535d125eb47cbcd4df2f5d473ba19aaf23ca6 Mon Sep 17 00:00:00 2001
From: Splitter <splitvisionz@gmail.com>
Date: Mon, 7 Apr 2014 10:01:34 -0400
Subject: [PATCH 06/10] Add content provider to track recently played songs

---
 AndroidManifest.xml                           |  48 +++---
 .../andrew/apolloMod/helpers/MusicUtils.java  |  32 ++++
 .../apolloMod/providers/HistoryStore.java     | 146 ++++++++++++++++++
 .../apolloMod/service/ApolloService.java      |   6 +-
 .../apolloMod/ui/activities/MusicLibrary.java |   3 +-
 .../adapters/list/RecentlyPlayedAdapter.java  |  32 ++++
 .../list/RecentlyPlayedFragment.java          |  34 ++++
 7 files changed, 278 insertions(+), 23 deletions(-)
 create mode 100644 src/com/andrew/apolloMod/providers/HistoryStore.java
 create mode 100644 src/com/andrew/apolloMod/ui/adapters/list/RecentlyPlayedAdapter.java
 create mode 100644 src/com/andrew/apolloMod/ui/fragments/list/RecentlyPlayedFragment.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5d573d5..72ed04f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -22,7 +22,7 @@
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
-	<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
 
     <application
         android:allowTaskReparenting="true"
@@ -37,9 +37,9 @@
             android:value=".ui.activities.QueryBrowserActivity" />
         <!-- Serach -->
         <activity
-            android:name=".ui.activities.QueryBrowserActivity"
-            android:theme="@style/ApolloTheme.Light" 
-            android:exported="true">
+            android:name="com.andrew.apolloMod.ui.activities.QueryBrowserActivity"
+            android:exported="true"
+            android:theme="@style/ApolloTheme.Light" >
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
                 <action android:name="android.intent.action.MEDIA_SEARCH" />
@@ -55,10 +55,10 @@
 
         <!-- Main Activity -->
         <activity
-            android:name=".ui.activities.MusicLibrary"
+            android:name="com.andrew.apolloMod.ui.activities.MusicLibrary"
             android:label="@string/app_name"
-        	android:logo="@drawable/ic_logo"
-          	android:theme="@android:style/Theme.NoTitleBar"
+            android:logo="@drawable/ic_logo"
+            android:theme="@android:style/Theme.NoTitleBar"
             android:windowSoftInputMode="adjustPan" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -76,7 +76,7 @@
         </activity>
         <!-- Now Playing -->
         <activity
-            android:name=".ui.activities.AudioPlayerHolder"
+            android:name="com.andrew.apolloMod.ui.activities.AudioPlayerHolder"
             android:clearTaskOnLaunch="true"
             android:excludeFromRecents="true"
             android:label="@string/nowplaying"
@@ -97,13 +97,13 @@
         </activity>
         <!-- Play External File -->
         <activity
-            android:name=".ui.activities.PlayExternal"
+            android:name="com.andrew.apolloMod.ui.activities.PlayExternal"
             android:clearTaskOnLaunch="true"
             android:excludeFromRecents="true"
-            android:noHistory="true"
+            android:label="@string/app_name"
             android:launchMode="singleTask"
-            android:theme="@style/Light.Translucent"
-            android:label="@string/app_name" >
+            android:noHistory="true"
+            android:theme="@style/Light.Translucent" >
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -118,7 +118,7 @@
         </activity>
         <!-- Track browser -->
         <activity
-            android:name=".ui.activities.TracksBrowser"
+            android:name="com.andrew.apolloMod.ui.activities.TracksBrowser"
             android:label="@string/app_name"
             android:windowSoftInputMode="adjustPan" >
             <intent-filter>
@@ -131,7 +131,7 @@
 
         <!-- Quickly show the queue -->
         <activity
-            android:name=".ui.activities.QuickQueue"
+            android:name="com.andrew.apolloMod.ui.activities.QuickQueue"
             android:excludeFromRecents="true"
             android:launchMode="singleTop"
             android:noHistory="true"
@@ -139,17 +139,16 @@
             android:windowSoftInputMode="stateUnchanged" />
         <!-- Settings -->
         <activity
-            android:name=".preferences.SettingsHolder"
-        	android:logo="@drawable/ic_logo"
-            android:label="@string/settings" />
+            android:name="com.andrew.apolloMod.preferences.SettingsHolder"
+            android:label="@string/settings"
+            android:logo="@drawable/ic_logo" />
         <!-- Simple EQ -->
         <activity
-            android:name=".ui.activities.SimpleEq"
+            android:name="com.andrew.apolloMod.ui.activities.SimpleEq"
             android:excludeFromRecents="true"
             android:label="@string/simple_eq_page_title"
-            android:windowSoftInputMode="adjustPan" 
-        	android:parentActivityName=".activities.MusicLibrary" />
-
+            android:parentActivityName=".activities.MusicLibrary"
+            android:windowSoftInputMode="adjustPan" />
         <activity
             android:name="com.andrew.apolloMod.ui.activities.dialogs.PlaylistDialog"
             android:label="@string/rename_playlist"
@@ -223,6 +222,13 @@
             android:name="com.andrew.apolloMod.service.ApolloService"
             android:label="@string/app_name"
             android:process=":main" />
+
+        <provider
+            android:name="com.andrew.apolloMod.providers.HistoryStore"
+            android:authorities="com.andrew.apolloMod.recents"
+            android:enabled="true"
+            android:exported="true" >
+        </provider>
     </application>
 
 </manifest>
diff --git a/src/com/andrew/apolloMod/helpers/MusicUtils.java b/src/com/andrew/apolloMod/helpers/MusicUtils.java
index 566d6c7..f7f48c9 100644
--- a/src/com/andrew/apolloMod/helpers/MusicUtils.java
+++ b/src/com/andrew/apolloMod/helpers/MusicUtils.java
@@ -41,6 +41,8 @@
 import android.widget.ImageButton;
 import android.widget.Toast;
 
+import com.andrew.apolloMod.providers.HistoryStore;
+import com.andrew.apolloMod.providers.HistoryStore.RecentColumns;
 import com.andrew.apolloMod.IApolloService;
 import com.andrew.apolloMod.R;
 import com.andrew.apolloMod.service.ApolloService;
@@ -587,6 +589,36 @@ public static long createPlaylist(Context context, String name) {
         }
         return -1;
     }
+    
+    public static long addSongToHistory(Context context, String id, String timeplayed, String title, String artist, String album, String album_id){
+    	if(Long.parseLong(id)<0)
+    		return -1;
+    	ContentResolver resolver = context.getContentResolver();
+        String[] cols = new String[] {
+                RecentColumns._ID, RecentColumns.TIME_PLAYED,
+                RecentColumns.TITLE, RecentColumns.ARTIST,
+                RecentColumns.ALBUM               
+            };
+        String whereclause = RecentColumns._ID + " = '" + id + "'";
+
+        ContentValues values = new ContentValues();
+        values.put(RecentColumns._ID, id);
+        values.put(RecentColumns.TIME_PLAYED, timeplayed);
+        values.put(RecentColumns.TITLE, title);
+        values.put(RecentColumns.ARTIST, artist);
+        values.put(RecentColumns.ALBUM, album);
+        values.put(RecentColumns.ALBUM_ID, album_id);
+        
+        Cursor cur = resolver.query(HistoryStore.CONTENT_URI, cols, whereclause, null, null);
+        
+        if (cur.getCount() <= 0) {
+            Uri uri = resolver.insert(HistoryStore.CONTENT_URI, values);
+            return Long.parseLong(uri.getLastPathSegment());
+        }
+        else{
+        	return resolver.update(HistoryStore.CONTENT_URI, values, whereclause, null);
+        }
+    }
 
     /**
      * @param context
diff --git a/src/com/andrew/apolloMod/providers/HistoryStore.java b/src/com/andrew/apolloMod/providers/HistoryStore.java
new file mode 100644
index 0000000..39f0b72
--- /dev/null
+++ b/src/com/andrew/apolloMod/providers/HistoryStore.java
@@ -0,0 +1,146 @@
+
+package com.andrew.apolloMod.providers;
+
+import android.content.ContentProvider;
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.UriMatcher;
+import android.database.Cursor;
+import android.database.SQLException;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.database.sqlite.SQLiteQueryBuilder;
+import android.net.Uri;
+import android.provider.BaseColumns;
+import android.provider.MediaStore.MediaColumns;
+import android.provider.MediaStore.Audio.AudioColumns;
+
+public class HistoryStore extends ContentProvider {
+
+	static final String PROVIDER = "com.andrew.apolloMod.recents";
+	
+	static final String URL = "content://" + PROVIDER ;
+	
+	public static final Uri CONTENT_URI = Uri.parse(URL);
+	
+	public static final String CONTENT_TYPE = ContentResolver.CURSOR_DIR_BASE_TYPE
+											+ "/vnd.com.andrew.apolloMod.recents";
+	
+	static final int RECENTS = 1;
+	
+	static final UriMatcher uriMatcher;
+		static{
+			uriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
+			uriMatcher.addURI(PROVIDER, "recents", RECENTS);
+			}  
+		
+	RecentDB recentDBHelper;	
+	private SQLiteDatabase database;
+	   
+	public HistoryStore() { }
+	
+	public static interface RecentColumns {
+		
+		public static final String _ID 			= 	BaseColumns._ID;
+		
+		public static final String TITLE 		= 	MediaColumns.TITLE;
+		
+		public static final String ALBUM 		= 	AudioColumns.ALBUM;
+
+		public static final String ALBUM_ID 	= 	AudioColumns.ALBUM_ID;
+		
+		public static final String ARTIST 		= 	AudioColumns.ARTIST;
+		
+        public static final String TIME_PLAYED 	= 	"timeplayed";
+		
+	}
+
+	public class RecentDB extends SQLiteOpenHelper {
+		
+		private static final int VERSION = 2;
+
+	    public static final String DATABASENAME = "recenthistory.db";
+	    
+	    public static final String DATABASETABLE = "recenthistory";
+	    
+	    public RecentDB(Context context) {
+	    	super(context, DATABASENAME, null, VERSION);
+	    }
+	    @Override
+	    public void onCreate(final SQLiteDatabase db) {
+	        db.execSQL("CREATE TABLE IF NOT EXISTS " + DATABASETABLE + " ("
+	                + RecentColumns._ID + " LONG NOT NULL," + RecentColumns.ALBUM
+	                + " TEXT NOT NULL," + RecentColumns.ARTIST + " TEXT NOT NULL,"
+	                + RecentColumns.TITLE + " TEXT NOT NULL,"+ RecentColumns.ALBUM_ID 
+	                + " TEXT NOT NULL," + RecentColumns.TIME_PLAYED + " LONG NOT NULL);");
+	    }	    
+	    @Override
+	    public void onUpgrade(final SQLiteDatabase db, final int oldVersion, final int newVersion) {
+	        db.execSQL("DROP TABLE IF EXISTS " + DATABASETABLE);
+	        onCreate(db);
+	    }
+	}
+	
+	@Override
+	public int delete(Uri uri, String selection, String[] selectionArgs) {
+		int count = database.delete(RecentDB.DATABASETABLE, selection, selectionArgs);
+		getContext().getContentResolver().notifyChange(uri, null);
+		return count;
+	}
+
+	@Override
+	public String getType(Uri uri) {
+		switch (uriMatcher.match(uri)){
+			case RECENTS:
+				return CONTENT_TYPE;
+			default:
+				throw new IllegalArgumentException("Unsupported URI: " + uri);
+		}
+	}
+
+	@Override
+	public Uri insert(Uri uri, ContentValues values) {		
+		long row = database.insert(RecentDB.DATABASETABLE, "", values);		
+		if(row > 0) {
+			Uri newUri = ContentUris.withAppendedId(CONTENT_URI, row);
+			getContext().getContentResolver().notifyChange(newUri, null);
+			return newUri;
+		}
+		throw new SQLException("Fail to add a new record into " + uri);
+	}
+
+	@Override
+	public boolean onCreate() {
+		recentDBHelper = new RecentDB(getContext());
+		database = recentDBHelper.getWritableDatabase();
+		if(database == null)
+			return false;
+		else
+			return true;
+	}
+
+	@Override
+	public Cursor query(Uri uri, String[] projection, String selection,
+			String[] selectionArgs, String sortOrder) {
+		SQLiteQueryBuilder queryBuilder = new SQLiteQueryBuilder();
+		queryBuilder.setTables(RecentDB.DATABASETABLE);
+		//queryBuilder.setDistinct(true);
+		if (sortOrder == null || sortOrder == "")
+			sortOrder = RecentColumns.TIME_PLAYED;
+		
+		Cursor cursor = queryBuilder.query(database, projection, selection,
+											selectionArgs, null, null, sortOrder);
+		cursor.setNotificationUri(getContext().getContentResolver(), uri);
+		return cursor;
+	}
+
+	@Override
+	public int update(Uri uri, ContentValues values, String selection,
+			String[] selectionArgs) {
+		int count = database.update(RecentDB.DATABASETABLE, values, selection, selectionArgs);
+		getContext().getContentResolver().notifyChange(uri, null);
+		return count;
+	}
+}
diff --git a/src/com/andrew/apolloMod/service/ApolloService.java b/src/com/andrew/apolloMod/service/ApolloService.java
index cd9ba37..5928978 100644
--- a/src/com/andrew/apolloMod/service/ApolloService.java
+++ b/src/com/andrew/apolloMod/service/ApolloService.java
@@ -2284,7 +2284,7 @@ private boolean setDataSourceImpl(MediaPlayer player, String path) {
     	    if(!type.equals(getResources().getString(R.string.visual_none))){
         	    VisualizerUtils.initVisualizer( player );
             }
-            return true;
+    	    return true;
         }
 
         public void setNextDataSource(String path) {
@@ -2342,6 +2342,10 @@ public void setHandler(Handler handler) {
         MediaPlayer.OnCompletionListener listener = new MediaPlayer.OnCompletionListener() {
             @Override
             public void onCompletion(MediaPlayer mp) {
+        	    String timestamp = Long.valueOf(System.currentTimeMillis()/1000).toString();
+        	    MusicUtils.addSongToHistory(getApplicationContext(), String.valueOf(getAudioId()), timestamp, 
+        	    						getTrackName(), getArtistName(), getAlbumName(), String.valueOf(getAlbumId()) );
+                
                 if (mp == mCurrentMediaPlayer && mNextMediaPlayer != null) {
                     mCurrentMediaPlayer.release();
                     mCurrentMediaPlayer = mNextMediaPlayer;
diff --git a/src/com/andrew/apolloMod/ui/activities/MusicLibrary.java b/src/com/andrew/apolloMod/ui/activities/MusicLibrary.java
index fd8d96c..8256b7c 100644
--- a/src/com/andrew/apolloMod/ui/activities/MusicLibrary.java
+++ b/src/com/andrew/apolloMod/ui/activities/MusicLibrary.java
@@ -44,6 +44,7 @@
 import com.andrew.apolloMod.ui.fragments.list.GenresFragment;
 import com.andrew.apolloMod.ui.fragments.list.PlaylistsFragment;
 import com.andrew.apolloMod.ui.fragments.list.RecentlyAddedFragment;
+import com.andrew.apolloMod.ui.fragments.list.RecentlyPlayedFragment;
 import com.andrew.apolloMod.ui.fragments.list.SongsFragment;
 import com.andrew.apolloMod.helpers.ApolloUtils;
 import com.andrew.apolloMod.helpers.MusicUtils;
@@ -220,7 +221,7 @@ public void initPager() {
         //Only show tabs that were set in preferences
         // Recently added tracks
         if(tabs_set.contains(getResources().getString(R.string.tab_recent)))
-        	mPagerAdapter.addFragment(new RecentlyAddedFragment());
+        	mPagerAdapter.addFragment(new RecentlyPlayedFragment());
         // Artists
         if(tabs_set.contains(getResources().getString(R.string.tab_artists)))
         	mPagerAdapter.addFragment(new ArtistsFragment());
diff --git a/src/com/andrew/apolloMod/ui/adapters/list/RecentlyPlayedAdapter.java b/src/com/andrew/apolloMod/ui/adapters/list/RecentlyPlayedAdapter.java
new file mode 100644
index 0000000..4fc670b
--- /dev/null
+++ b/src/com/andrew/apolloMod/ui/adapters/list/RecentlyPlayedAdapter.java
@@ -0,0 +1,32 @@
+
+package com.andrew.apolloMod.ui.adapters.list;
+
+import android.content.Context;
+import android.database.Cursor;
+
+import com.andrew.apolloMod.helpers.MusicUtils;
+import com.andrew.apolloMod.ui.adapters.base.GridViewAdapter;
+import static com.andrew.apolloMod.Constants.TYPE_ALBUM;
+import com.andrew.apolloMod.providers.HistoryStore.RecentColumns;
+
+public class RecentlyPlayedAdapter extends GridViewAdapter {
+
+    public RecentlyPlayedAdapter(Context context, int layout, Cursor c, String[] from, int[] to,
+            int flags) {
+        super(context, layout, c, from, to, flags);
+    }
+
+    public void setupViewData( Cursor mCursor ){
+    	mLineOneText = mCursor.getString(mCursor.getColumnIndexOrThrow(RecentColumns.TITLE));
+
+    	mLineTwoText = mCursor.getString(mCursor.getColumnIndexOrThrow(RecentColumns.ARTIST));
+
+        String albumName = mCursor.getString(mCursor.getColumnIndexOrThrow(RecentColumns.ALBUM));
+        String albumId = mCursor.getString(mCursor.getColumnIndexOrThrow(RecentColumns.ALBUM_ID));
+        mImageData = new String[]{ albumId , mLineTwoText, albumName };
+        
+        mPlayingId = MusicUtils.getCurrentAudioId();
+        mCurrentId = mCursor.getLong(mCursor.getColumnIndexOrThrow(RecentColumns._ID));
+        mGridType = TYPE_ALBUM;
+    }
+}
diff --git a/src/com/andrew/apolloMod/ui/fragments/list/RecentlyPlayedFragment.java b/src/com/andrew/apolloMod/ui/fragments/list/RecentlyPlayedFragment.java
new file mode 100644
index 0000000..7925f5d
--- /dev/null
+++ b/src/com/andrew/apolloMod/ui/fragments/list/RecentlyPlayedFragment.java
@@ -0,0 +1,34 @@
+
+package com.andrew.apolloMod.ui.fragments.list;
+
+import android.view.View;
+import android.widget.AdapterView;
+import com.andrew.apolloMod.R;
+import com.andrew.apolloMod.helpers.MusicUtils;
+import com.andrew.apolloMod.ui.adapters.list.RecentlyPlayedAdapter;
+import com.andrew.apolloMod.ui.fragments.base.GridViewFragment;
+import static com.andrew.apolloMod.Constants.TYPE_ALBUM;
+
+import com.andrew.apolloMod.providers.HistoryStore;
+import com.andrew.apolloMod.providers.HistoryStore.RecentColumns;
+
+public class RecentlyPlayedFragment extends GridViewFragment{
+	
+    public void setupFragmentData(){
+        mAdapter = new RecentlyPlayedAdapter(getActivity(), R.layout.gridview_items_recent,
+                null, new String[] {}, new int[] {}, 0);
+    	mProjection = new String[] {
+    			"DISTINCT "+RecentColumns._ID, RecentColumns.TIME_PLAYED,
+                RecentColumns.TITLE, RecentColumns.ARTIST,
+                RecentColumns.ALBUM, RecentColumns.ALBUM_ID       
+        };        
+        mSortOrder = RecentColumns.TIME_PLAYED + " DESC";
+        mUri = HistoryStore.CONTENT_URI;
+        mType = TYPE_ALBUM;
+    }
+
+    @Override
+    public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
+        MusicUtils.playAll(getActivity(), mCursor, position);
+    }
+}

From 41a1cb82389c66f9df682832747d4e985a3dfdfb Mon Sep 17 00:00:00 2001
From: Splitter <splitvisionz@gmail.com>
Date: Fri, 18 Apr 2014 19:19:18 -0400
Subject: [PATCH 07/10] Add Three recent view types

Add the ability to choose between recently added, recently played or
splitscreen(both)
---
 .../apollo_holo_light_recents_added.png       | Bin 0 -> 5663 bytes
 res/drawable-hdpi/view_more_now.png           | Bin 371 -> 635 bytes
 res/drawable-hdpi/view_more_now_dark.png      | Bin 375 -> 688 bytes
 res/drawable-mdpi/view_more_now.png           | Bin 377 -> 549 bytes
 res/drawable-mdpi/view_more_now_dark.png      | Bin 380 -> 588 bytes
 res/drawable-xhdpi/view_more_now.png          | Bin 436 -> 712 bytes
 res/drawable-xhdpi/view_more_now_dark.png     | Bin 452 -> 762 bytes
 res/drawable/recent_header_background.xml     |  24 ++
 .../recent_header_background_dark.xml         |  33 +++
 res/layout/recently_added_heading.xml         |  50 ++++
 res/layout/recents_main.xml                   |  11 +
 res/layout/recents_root_fragment.xml          |   7 +
 res/layout/recents_row.xml                    |  65 +++++
 res/values/arrays.xml                         |   9 +-
 res/values/attrs.xml                          |   1 +
 res/values/strings.xml                        |  13 +-
 res/values/styles.xml                         |  15 +-
 res/values/themes.xml                         |   4 +
 res/xml/settings.xml                          |  12 +
 src/com/andrew/apolloMod/Constants.java       |   2 +-
 .../apolloMod/preferences/SettingsHolder.java |   2 +
 .../apolloMod/providers/RecentsLoader.java    | 250 ++++++++++++++++++
 .../apolloMod/ui/activities/MusicLibrary.java |  13 +-
 .../ui/activities/TracksBrowser.java          |   2 +-
 .../apolloMod/ui/adapters/PagerAdapter.java   |  28 +-
 .../ui/fragments/RecentsRootFragment.java     |  61 +++++
 .../ui/fragments/RecentsSplitFragment.java    | 178 +++++++++++++
 .../ui/fragments/base/GridViewFragment.java   |   2 +-
 28 files changed, 763 insertions(+), 19 deletions(-)
 create mode 100644 res/drawable-hdpi/apollo_holo_light_recents_added.png
 create mode 100644 res/drawable/recent_header_background.xml
 create mode 100644 res/drawable/recent_header_background_dark.xml
 create mode 100644 res/layout/recently_added_heading.xml
 create mode 100644 res/layout/recents_main.xml
 create mode 100644 res/layout/recents_root_fragment.xml
 create mode 100644 res/layout/recents_row.xml
 create mode 100644 src/com/andrew/apolloMod/providers/RecentsLoader.java
 create mode 100644 src/com/andrew/apolloMod/ui/fragments/RecentsRootFragment.java
 create mode 100644 src/com/andrew/apolloMod/ui/fragments/RecentsSplitFragment.java

diff --git a/res/drawable-hdpi/apollo_holo_light_recents_added.png b/res/drawable-hdpi/apollo_holo_light_recents_added.png
new file mode 100644
index 0000000000000000000000000000000000000000..97946180cc587ed6a4b27babd7c64a6e0c32c70b
GIT binary patch
literal 5663
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
FV1oC93)KJs

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/view_more_now.png b/res/drawable-hdpi/view_more_now.png
index 187c23764b55305fee1ffdefc1825de05c806aeb..8911a353f478443a0969ba665d112a684c14b1ea 100644
GIT binary patch
delta 564
zcmV-40?YmL0{aAzQhx*u6gV-yWFC(I00Ia}L_t(&-tF4YYEwZJ$MH{+CI*VoP_1q%
z#)XJ~T2!o3+_=((D@C`yfv-?}g+7LYJGZV~=q6a9ZdCkRSAy312NM^WMG-Z*b8o$K
zF+Ugx$(+gg=AL`z%(<zdgPW?U)f!e*SX0|x->R7JD^OQ)O@9DVx(A9-3tcSY0H(wH
zn|Og9p5a@H07q~EbHDj)8b`x;kNa3pDTGer+8><%RdcwGQ>g&#$Hk0m)p04<mI_eE
z5}FaVO`JikOn_ZDn8Ut{c9{TEp_YnOCvPJ8?>DkOwsP2i32RgqV5@9^K~4wyWrt7`
zdve&%mVFZs@P8xc6&REW@IBNvvDyf0lm_rMRF|=O9@Z#zALxa27?VPKDHL-XIRM_J
zQck~)uz8cxdEiNe&01;zpEJzgjD+6NV(xZ^xpz|RO1v8LoVy<8CI`^R$1&!8DxwA|
z^E@ypa<QTT8e^W~k_6am*vuNGdF(6dON;n54&hvIY=4{s`YdkXEgs<MzXoVwH%^Lg
zskB2!q8o1Lhj@e!GPWJF0L<VR4v!fsS;BZJjF%zJt_7Gv02;V#*!yhTS<Q!WK7`i2
zQCDOXz;RrWvwId9VhcEdyLcRvg%)tN1n0M_7JOKY0a%ufmSX@q2?5N+0JIVUXr)vO
z6{^2wp)E>0H=aCZod6WDQB?ZR9u33p*x8Euzxor!(o~us2Wkue0000<MNUMnLSTXe
C9s*|o

delta 298
zcmV+_0oDHd1oHxrQhx&z7b+d}=s;Qk0096=L_t(&-tE^rN(4a^h2c+UOiUCE%}mU7
z0nQpsbTJ05$w#1zFf%Y2e1RrvAdHNGZBhm8;2;xO7w!*DL(vWO*QusXlO##<pDf`x
z*qndNcR6|jDUbpwkOE1PB-uu@jpjj?0x6IJ*+!FOAFGSLG=FGF-~hY$z*9tlJ*;3G
zo4Cg`lEA2xOW43pN#i+68|``meeQ6Amw5?{8W&hEX>@oj_fP_Lo?GR5z$BVLWv!&~
zRnusxN^}eSMGmU$FxX*tTR!O5IuJ$R6BoFeO==im3ypD#w|V=i6^>>Wbc)O0R=w2(
w`rP0Q?|(hm+9MX4;2hTx>-1qcb(2th1E(o2<3H0;5&!@I07*qoM6N<$f)_S{T>t<8

diff --git a/res/drawable-hdpi/view_more_now_dark.png b/res/drawable-hdpi/view_more_now_dark.png
index 5694d90e7053beacd489c796a6c3ac1afa4ad7ca..5b9911a20c8dc65489d5776369d463fecc5c8bb8 100644
GIT binary patch
delta 617
zcmV-v0+#*v0<Z;;Qhx*u6&@W<pqqaH00KQpL_t(&-tC&dYg9oH$3OG9oCt@=i4rS`
z1W^&uLPQWm5hNC(!Alhry?-E;y@jZMg<xZsMiE1rC|HSA64D6%1nmrjOD@GF-!ywo
z5bnL*<8~k1z{0_s?=aul+1r_U&m@fjFDa)qP0|u2mP+@BnSWg`ljGgMXOvuq1d=%e
zeag!ka22=(i~}|Is0Dll7J*M@)=G|mq}#v)VDvwaYrsXfW+lBcvxQ^`NSX#7<xI&@
z;IX8-nZ1sF1|*#aW(wNMfQJqnkAS2KFa?Zwz(;_Fq%7tR90JY+;LiewV-h$3)C2H!
zXJdGg`N|Hk6@P$lI~&mmboxM`6O+KMTOm6bHH8iW#{%$2V;|z(z$k|9U@(C;@HYVe
z$JvNOz|1y))c_M~&PLRG;GJg_+YTGIm@~6gVA}(_ZDz}<bY$N=Fh5diDL;B(mXaZ0
zW^aMb0+5!&B-PYEE1>&4#i_&>U?qp%iqlPwKnM7jLw|2Qw1A7<4=AO6z-P))O_jiD
z;8YI1ap2q_Bi3s&aSdnyCtZ1+r-XhX={GQMW{W|8;oUKH-toE{A07wp0XIEID*H?7
z55PR|EAQB`>vyF<q)z}7z$F*$ex~sax4ujI47@k9pM6OoNmbwpa3N=kgvgj%cO)$X
zPkZf1)?&l?yTAf)WdP3aZ&fb?Z=4Us2}rsR%mGF`F<?$o!)FI3Nk=Aq2pma>K;4Hx
zH6a4klxm^D)GlRtZ#;a>IwTN!QI!2-j|^y**#G7pXhNh&s04(600000NkvXXu0mjf
D%x({t

delta 302
zcmV+}0nz@j1@{7wQhx&-6EYC*lzUMC009I^L_t(&-tCtmP6I(0g}>J<Ne_T+AR$5Y
z6r2K8iQ*uXAQ2S=1qmL9K=ckMQW_*Dr~tvkw8^F{L9%~%pPShg^X7ju{~HJ)gug_#
z=cN`b9ks`U>J^B92#A0P2qA=|(WKEdvIvNP2uK<Y{~X&Fwtsgk3z*w}usx}Ihz$&Z
z6WcS}qsq6?7`V1Qu|24gMh&QAehHjQT2!!57YD%1_NncrY9reLj@Pz2tlWwBx2sXX
zLf_6U&}`P;6sy1sFqO32OjHr@0o(w0l0MrXngSMjUSFfHKl!OIQQ~oHL*Iehu3hhI
z1=>6TXOiB2`zNt)7Fq#UlI|;}(M#KVd015A3&+b~FxC?~tpET307*qoM6N<$f@Hdc
A6aWAK

diff --git a/res/drawable-mdpi/view_more_now.png b/res/drawable-mdpi/view_more_now.png
index 7206c9d1c276fd6f57bb0f0cef0610805ec0c740..df50dc295c37f32ddbf2c060ed088191cf7e8252 100644
GIT binary patch
delta 477
zcmV<30V4kS0;L3yQhx*u6&pBs)4P2D00FW|L_t(o!^PJ>YZO5k$MMf@HVN@e5b*-$
z6=)-hRRk>r5k&07q_MX1_1N0li=~1fXkjV70F@Yse~QGYx0~h(gm8PeyX@ROu+7YG
zcE8Wg%rn2qu!(yp%{FqpEaKxYusdUbAs!Zy`7XYheU!O5M}N^_%nB~!1~#JY3*O-q
z4pIWF<1x;n!eO*uzysXIb9`^J5}U>%wlJvKF=g~^g|>HqA=V=EY)pR^eQTlZ9bgcd
zWfL@6Xa*?&Mv>vPs6yL2z~6>19^qdKfMqN+&@Eso1wfm#qDld<7e%I;^5KKf_73n1
zI}LWh4t}NpfPb%3#^h}ewYC5srj+jj?^6Q&z?+(JIbMe*8Gy)ee@y#+{2{3U%9@=}
zb+L6_0E!7yu$UTPGmhJFm2L@-aI;TCvK(gP3T{P>pL8e<aR>MD79YcJ9(Dn^i%VDy
z-JcU)pw17#|9GzBDt_ZLUNr?ck0+6Rd8)Q&4gP9&VpdF!b1`+-@a%M%9=8UL=Xj*Q
z7)3(cO%~zC1l!d$j_umTCR4ClQ)v2#Gfe=V&iaBl_nT4P#zyyiInA?qU(b&K!0T4Q
TRCatb00000NkvXXu0mjfmSEp~

delta 304
zcmV-00nh%W1o;AxQhx&-6EOoo2Wd<I009O`L_t(o!|m3+E<`~b1@PZxBep_9v%N~C
zP<sW1UZ?jADwX%JqS$y0k$3<dB8%GRUYh?+E+Q1>&Q127WHOm%&j0J289Gcm3LG@d
zIg3MFLl2J`0(h?uGr3!kJ%C=6r0EuX8p1(_#P9Ihc|dE7Xn!|@@{Vy|sbG*n1#_Jd
zwaN)^G9>*n6%t>;dQ|yu55qrW5j$ALC7ymVqEtSxjBS*m`w`CY_BDY0L;;ksDxLxl
zIKfrD1)K3jO0g<(aqeRS&lqFUqz_b8D6xe#zfEW&54goq{W0n%BAe7EzX<YEoYx1j
zNSN&s_M-P=3@Ky(X2q#6ANLP&QBy=?SO_m@H$DI|wLeyX1IIxC0000<MNUMnLSTaN
Ce1R|k

diff --git a/res/drawable-mdpi/view_more_now_dark.png b/res/drawable-mdpi/view_more_now_dark.png
index 79160f17b47b35670cc42f64a11c0ec25ff18874..91347cf0181782af5c979dd82009406c4279c0b5 100644
GIT binary patch
delta 516
zcmV+f0{i{^0?Y)EQhx*u6(2YpzkYcD00G%aL_t(o!^PLTYgADX2Jqi(Ht|77P<#}o
zOGL1;uo5gqv9hz$E;bhSwo!ZkgjlGp!NNyrFSbH7N+6}6kQg<)V{;aQ<hpmmy_<p4
zocZpZ@661ZGZUG)h}-BJuXOMvGV>iCV|B~~7I3dyPQDruAAiPaJu{)-alq2u2lL~&
zh8vhG+v|9NR}t}T)I=D?_<1bj4o>1%S*Ob0a=|oDATy6*3DXrfreAbR1>3j>&S4gb
z*h3#hH(Ric6F7m%3gf#;Ocre81b&wj4vkj9Hcns*y&AY4w%Z^ujfon#3AB=gy%Dhe
zHVCYhFyxT<Z-3!S;{+mN9UC=n!A3-UZKV?8(~xgE_}p44#`7WXM;FgpBM=d5cv<mX
z2P*~Bng`%1Huu=yEFRJ}ft`w*kVV%zfx{IAX`}+Q-+o{b4>7feda69dcN^=7GIIuJ
zalNcRr6N`pqtm#VnYZv3EBF`@KSm~ynfGxKGX=N3t9=)!>IVinvV+UGgzuU8J|Z5}
z3PEPhXXYDR#jz6G{KtqP)o{?9bjm-jWajJ4oUfAugBbTTCp{d(qdElU{?m5tR|XzA
zQzr+e@w25d;K)z{5piMM1LA>CMjb4aS#8|IX(tYPJpT(d7Lu%}U7Uyj0000<MNUMn
GLSTZJDC}tf

delta 307
zcmV-30nGl)1pES!Qhx&-6EhWt<-VT)009X}L_t(o!|j$mN(4a=g}=8u$ikjsgGCTA
za__MhFf}sr2x90dG*DT*g@1@39zavU$VgBonrG4jt%2Ee4LSuKR8+72zG@ikzng5|
z7mhgw_9Q(5R6rddplO{^bPK`-RH-DTTkvfN7XgVsN%|ZZ(0>~codyiyp`_<_3uXZV
zrUQt2MZ%YW8Tk17`)zyE_KxjIlz@fpTiYw!^WQ+!)iGKJ_S5HM4LAnQB-K9!+;k+M
z$$mac?+rMT^pFd<?5Yb{@Z28*=fFzRdr1zoRcL@+VA*n@H27YDgZvmxI-G$z%YFo$
zq|(<V)^Kk7+AQ{!?F-vmr8%%|`!2z#iU85f_D1iK{RIu3Zh%)T43Yo<002ovPDHLk
FV1kubij)8V

diff --git a/res/drawable-xhdpi/view_more_now.png b/res/drawable-xhdpi/view_more_now.png
index d9303be1f68de227dcdbee21adb6574bf80eedca..a775611da1cf05235b549bbf81a7877a7020db46 100644
GIT binary patch
delta 641
zcmV-{0)G9p1IPuCQhx*u6&*AuKTyyB00LD>L_t(|+U=W7OB+!XhMzPVh~h^?Y7rH6
zp;STCs;#;cbRkvHom)4$@-K*gA-_X+q6<M3!G*NaDoR^dMrpx?_(e-wK^M6~5D_!E
zXL3(wUbv7f&O7%$bLP&OduJj*0+=J1N=ATr0<2dATt$!mFMkAN-1A`ugaASSA%LeQ
zL21<i?LY(YI^+1az!{JN4uI1_1JD3W0u|5nqt>(!z$LH*oD>3pQJ^==m<nJT*a22G
z&jDi|2A`=u;G<Rm?LfB$pLal;MgS8Qy(YB*=mMe^{h~mpCID?hmy{X+^-4U&02B*&
z#xw!AQQ|2E;D1_)rx<`MC7!A>K-DEsCE%IR1fWsCvq=+xe@Z;X0Hg#wk2L}KA>jE<
z6M!!Qo?kTqxC1sU`fVCdRqFw}7QObgtq0gHhR!ttuyr>`Np?^gz>y;!c>}QPh)3Q4
z{00tlh(9nMY5@Q&0)IW0zKhbG^8>&gu;L+Z#fQH6wtqYP)2A3`0sQwV##sQ)$}a##
zKE*f-pvI>dCjm5(-X_mh<3NjxsreFB10AHdwo5#E#DFPN4}1ppfnP2IC?)+eM34Dx
zOEI9|v<DbFz=bOSI)OoR)}@sR;{w>q^;y9yfH*K@&UU_3Y37zO;1jS8{E-F_HwS#{
z*zLT>w0iHrGFj{*WdmTuq@K%aHEkPMvw0hwQ84&S4FI#Y01N|f6jr%4CTnvB(5$%B
zZ?*xTTrq$$8vx>p0mN+ph$sdSu>qi<^^!WEpg*JvSA;?UA%I{j{B}6#84xA?_Qm^v
bjz4)1G|yFK+Sv+C00000NkvXXu0mjfacK%~

delta 363
zcmX@Xx`lZ{P(8D(umPK9*_tK>21Z9u7srr_TW@dd*K=_cIsUQ#zsuslS9=;<l&!eV
zFT7UCFXz(H6trl`g@6S@dp!i4R5s1peKJjXcXsBxx%ap4-ahNI?ejBpB%L@ETLidL
zS$4A?-F^3O@|G`L9St0C1d?>BeB!DxIf2E+p&p1Kh@&)-ZT0`qy~(B`2Ccd}4;lNH
za?Us+mA0{m_0Ge^B8-nC-v5|)+)MPdZIrLL!9~>tvd148<X&vydhz6X?!_nK3;pLj
zVu|0Ym9Tgr6I)id8n?s>T`z$PpSNgu9_Y^ve3hE9%gV1;T&#loxkc7{R#nc5Lvne$
zQ`)<PEMA|f@?@H~dd>YWQrffUd`;f-UAp!43BUfW`$Ho4%Y8`-yngqOI-|J7o9SPd
zalCjU%DzM9Syp5@WB85rDjKc~dqNxIwI=wU;e2?$hIx;HRc@0>UOEF1c)I$ztaD0e
F0suEtoxA`5

diff --git a/res/drawable-xhdpi/view_more_now_dark.png b/res/drawable-xhdpi/view_more_now_dark.png
index 8eb57093824b11dccadf5aa27c0dc1c94c956abd..e55148c7626622a093081538ae7847d45d5c286c 100644
GIT binary patch
delta 692
zcmV;l0!#hG1NsG!Qhx*u6(AGn-K_-x00M_eL_t(|+U=V^XcR#dhregeC{g6Fh#X>}
zV2H(mjbNcUqvWs&f=$r!It8@}1Pc)fLTc-fN)G=bVqqcpr?3za#WWTwSOr01#6k?>
z&t{da6!&H}`)>Ea6<56P_I>kaXPDhHNjrfB${8J#^oSD2I)6$Ywe%M=8!toA>8>w*
z2UG$o0o6?~*PG8iU;-Eg8mZs^0W1M;fCpywysrdE+7HYC^}k%lj^r~TX$6=wvuExF
zNV*6d`p>jFFemAuna#Sr2S}RDP<%QLOS<GzfTUx<fdHs6Ns}Hs;7mZ)IadNCod5;`
zA_pW*dFp_J5r3F1PXcy1VMY_MJ_2*llYp;In9&4$al(uyVA%=Nm4Fpb0vZvR+dK)_
z9f3LGNx*j}%xD7MI$=f=5aS@@sV4!~BQS5e5nyINfja?_cN3<o^MH^ecF)y$K+*+E
z0a@?d2}t67K^SW$;6*_gYbM}EK^SWzz|1}YFMApNgn!|-0|2HoZev%?Y&!PEMHi5)
z-}4z#=W`gG+@21<&XBX%PXfN>lv7v%g^j!fY|N0ep`QedX2{vo7Xl=W0jDygo|e>(
zzDlLvnG5xvprjFC5*P<I^@v*q9s~Ey>{X!a`%`l*;7AVxCxIit=757V2(*E=q~9{S
zX7(Wjynhy;@G0OpFr34bP0RQU+%mIn?o&Y0R^Tj=9$9CIC%_dmTaG#flEN<ldkeOl
zw}6(UMc}fTeGI+|NIDPPE@1KLXad(H%>)%7>1s0fyu?vS-5>%Io7)}kavMq4_S^wY
z$6Nho2my7+0=9$@FyvUkPzV9$Sb&8P(AV+LjV(~W|B<RX5vl}K0?HlLe}}6n0G$%o
a-}wc$P{HHkHc-?60000<MNUMnLSTXrLNJX0

delta 379
zcmeyxdW3mGP(8D(urbHe$Cum~7#IURT^vIyZoQph>&4<I;1+*!lSKE7Dn?`d#CNJT
z%}tFN%Q}y-r8PZVl(3?+v%6E=z$EgIW3%fYA2yk=@|m%|Rj;ZI4w^U{e%`fu`K|*J
z$vuW@nu;suKTB2)b3guU(|QK(4G093J@({qy{uw*lUM>H932yBT*B%pJ;^GPRmby{
z_pT{hrd9GsuzXXQ>k)NM<w5e3I#!FRTQpbB{;Ge0^;+Y-Et!Ff8qWXs={75GX>;Je
z(ch7H%xOhnRLU#Pd(5{5KTZfeus(C*Tb&Qex|`(Mo~`cA`MRYcJ3(D(-X_k9bwwrr
z7un5lJrG)Z&6u-dW!m4GJIr&Zo&S~R!lO3rQ0q6AJoP=lwF?9U_o{95ie;2iez0uS
zH#T49sX7bJNf(F+re9{uYHqMj&{mR5=M4Fz_JdF6oYCv2(~B>CjQ`betmZT8RFzuG
T@Eyy|7=Xaj)z4*}Q$iB}^~<BE

diff --git a/res/drawable/recent_header_background.xml b/res/drawable/recent_header_background.xml
new file mode 100644
index 0000000..95b6ad5
--- /dev/null
+++ b/res/drawable/recent_header_background.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle"
+            android:dither="true">
+
+            <corners android:radius="2dp"/>
+
+            <solid android:color="#ccc" />
+
+        </shape>
+    </item>
+
+    <item android:bottom="2dp">
+        <shape android:shape="rectangle"
+            android:dither="true">
+
+            <corners android:radius="2dp" />
+
+            <solid android:color="@color/listview_item_bg_color" />
+
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/res/drawable/recent_header_background_dark.xml b/res/drawable/recent_header_background_dark.xml
new file mode 100644
index 0000000..fd11e77
--- /dev/null
+++ b/res/drawable/recent_header_background_dark.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:bottom="2dp">
+        <shape android:shape="rectangle"
+            android:dither="true">
+
+            <corners android:radius="2dp"/>
+
+            <solid android:color="#454545" />
+
+        </shape>
+    </item>
+    <item android:top="1dp" >
+        <shape android:shape="rectangle"
+            android:dither="true">
+
+            <corners android:radius="2dp"/>
+
+            <solid android:color="#1a1a1a" />
+
+        </shape>
+    </item>
+
+    <item android:top="1dp" android:bottom="2dp">
+        <shape android:shape="rectangle"
+            android:dither="true">
+
+            <corners android:radius="2dp" />
+
+            <solid android:color="@color/light_grey_dark" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/res/layout/recently_added_heading.xml b/res/layout/recently_added_heading.xml
new file mode 100644
index 0000000..6497c13
--- /dev/null
+++ b/res/layout/recently_added_heading.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"	
+    android:id="@+id/recents_heading"
+	android:clickable="true"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+	<RelativeLayout
+	    android:id="@+id/recently_added_wrapper"
+	    style="?RecentlyAddedWrapper"
+	    android:clickable="true"
+	    android:layout_marginTop="0dp" 
+	    android:layout_marginLeft="6dp" 
+	    android:layout_marginRight="6dp" 
+	    android:layout_marginBottom="8dp">
+	
+	
+	    <TextView
+	        android:id="@+id/recents_textview"
+	        android:layout_width="match_parent"
+	        android:layout_height="wrap_content"
+	        android:layout_alignParentLeft="true"
+	        android:ellipsize="end"
+	        android:maxLength="29"
+	        android:paddingRight="@dimen/listview_items_padding_right"
+	    	android:layout_marginTop="20dp" 
+	    	android:layout_marginLeft="8dp" 
+	        android:singleLine="true"
+	        android:textSize="@dimen/text_size_medium"
+	        android:text="@string/recents_added" />
+	    
+	    
+	    <TextView
+	        android:id="@+id/recents_viewmore"
+	        android:layout_width="wrap_content"
+	        android:layout_height="wrap_content"
+	        android:layout_alignParentRight="true"
+	        android:ellipsize="end"
+	        android:maxLength="29"
+	        android:padding="5dp"
+	    	android:layout_marginTop="16dp" 
+	    	android:layout_marginRight="8dp" 
+	        android:singleLine="true"
+	        android:textSize="@dimen/text_size_small"
+	        android:textColor="@color/white"
+	        android:background="@color/holo_blue_dark"
+	        android:text="View More" />
+	
+	</RelativeLayout>
+</LinearLayout>
diff --git a/res/layout/recents_main.xml b/res/layout/recents_main.xml
new file mode 100644
index 0000000..b27134c
--- /dev/null
+++ b/res/layout/recents_main.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"			    
	android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:id="@+id/recents_scrollview" >
+        <LinearLayout
+            android:id="@+id/recents_wrapper"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical" />
+</ScrollView>
\ No newline at end of file
diff --git a/res/layout/recents_root_fragment.xml b/res/layout/recents_root_fragment.xml
new file mode 100644
index 0000000..feaa64f
--- /dev/null
+++ b/res/layout/recents_root_fragment.xml
@@ -0,0 +1,7 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/root_frame" >
+
+</FrameLayout>
diff --git a/res/layout/recents_row.xml b/res/layout/recents_row.xml
new file mode 100644
index 0000000..7f8ee86
--- /dev/null
+++ b/res/layout/recents_row.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"	
+    android:id="@+id/recents_row"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+    
+	<LinearLayout 
+		    android:layout_height="wrap_content"
+		    android:layout_width="0dp"
+			android:layout_weight="1"
+		    android:id="@+id/recent_column1"
+		    android:visibility="invisible"
+		    android:orientation="horizontal"
+	    	android:paddingLeft="@dimen/gridview_item_padding_right_left"
+	    	android:paddingRight="@dimen/gridview_item_padding_right_left"
+	    	android:paddingBottom="@dimen/gridview_item_padding_bottom">
+		<RelativeLayout
+		    style="?GridviewRecentsWrapper"
+		    android:orientation="vertical">				 
+		    <com.andrew.apolloMod.ui.views.TrackBrowserImageView
+		        android:id="@+id/recent_image1"
+		        style="?GridviewRecentsArt"/>
+		    <TextView
+		        android:id="@+id/recent_line_one1"
+				style="?GridviewRecentsShadowedText"
+				android:layout_alignBottom="@+id/recent_image1" />
+		
+		    <TextView
+		        android:id="@+id/recent_line_two1"
+		        style="?GridviewRecentsText"
+        		android:layout_below="@+id/recent_image1" />
+		
+		</RelativeLayout>
+	</LinearLayout>
+	
+	<LinearLayout 
+		    android:layout_height="wrap_content"
+		    android:layout_width="0dp"
+			android:layout_weight="1"
+		    android:id="@+id/recent_column2"
+		    android:visibility="invisible"
+		    android:orientation="horizontal"
+	    	android:paddingLeft="@dimen/gridview_item_padding_right_left"
+	    	android:paddingRight="@dimen/gridview_item_padding_right_left"
+	    	android:paddingBottom="@dimen/gridview_item_padding_bottom">
+		<RelativeLayout
+		    style="?GridviewRecentsWrapper"
+		    android:orientation="vertical">				 
+		    <com.andrew.apolloMod.ui.views.TrackBrowserImageView
+		        android:id="@+id/recent_image2"
+		        style="?GridviewRecentsArt"/>
+		    <TextView
+		        android:id="@+id/recent_line_one2"
+				style="?GridviewRecentsShadowedText"
+				android:layout_alignBottom="@+id/recent_image2" />
+		
+		    <TextView
+		        android:id="@+id/recent_line_two2"
+		        style="?GridviewRecentsText"
+        		android:layout_below="@+id/recent_image2" />
+		
+		</RelativeLayout>
+	</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 4106d8f..9eb1f9a 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -17,13 +17,18 @@
         <item>@string/theme_dark</item>
     </string-array>
     
+     <string-array name="recents_types">
+        <item>@string/recents_added</item>
+        <item>@string/recents_played</item>
+        <item>@string/recents_split</item>
+    </string-array>
+    
      <string-array name="visualization_types">
         <item>@string/visual_none</item>
         <item>@string/visual_bargraph</item>
         <item>@string/visual_solidbargraph</item>
         <item>@string/visual_waveform</item>
-    </string-array>
-    
+    </string-array>   
      
      <string-array name="widget_style_types">
         <item>@string/widget_style_dark</item>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 616cb75..2fe693b 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -56,6 +56,7 @@
     		<attr name="LibraryTabsWrapper" format="reference" />
     		<attr name="ShuffleWrapper" format="reference" />
     		<attr name="ShuffleImage" format="reference" />
+    		<attr name="RecentlyAddedWrapper" format="reference" />
     		<attr name="TracksBrowserWrapper" format="reference" />
     		
     		<!-- Resources needed to be grabbed by app directly from themes -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 61d47c8..e761735 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -122,7 +122,9 @@
     <string name="settings_delete_cache_title">Delete cache</string>
     <string name="settings_delete_cache_summary">Remove all cached images</string>
     <string name="delete_warning">This will permanently delete the cached image entries</string>
-    <string name="visualizer_title">Audio visualizer</string>
+    <string name="recents_title">Recents View Type</string>
+    <string name="recents_summary">Choose to the type of recents display to show</string>
+	<string name="visualizer_title">Audio visualizer</string>
     <string name="visualizer_summary">Choose to display audio visualizations during playback</string>
 	<string name="widget_style_title">Widget Style</string>
     <string name="widget_style_summary">Choose the widget design</string>
@@ -148,6 +150,7 @@ https://github.com/CyanogenMod/android_packages_apps_Apollo/tree/cm-10.1
     <string name="key_build_version" translatable="false">build_version</string>
     <string name="key_build_depends" translatable="false">build_depends</string>
     <string name="key_tabs_enabled" translatable="false">tabs_enabled</string>
+    <string name="key_recents_type" translatable="false">recents_type</string>
     <string name="key_visualization_type" translatable="false">visualization_type</string>
     <string name="key_widget_style" translatable="false">widget_type</string>
     <string name="key_delete_cache" translatable="false">delete_cache</string>
@@ -172,6 +175,11 @@ https://github.com/CyanogenMod/android_packages_apps_Apollo/tree/cm-10.1
     <string name="tab_playlists">Playlists</string>
     <string name="tab_genres">Genres</string>
     
+    <!-- Recents -->
+    <string name="recents_added">Recently Added</string>
+    <string name="recents_played">Recently Played</string>
+    <string name="recents_split">Splitscreen</string>
+    
     <!-- Visualizations -->
     <string name="visual_none">None</string>
     <string name="visual_bargraph">Bar Graph</string>
@@ -206,5 +214,8 @@ https://github.com/CyanogenMod/android_packages_apps_Apollo/tree/cm-10.1
     <string name="simple_eq_band3">1kHz</string>
     <string name="simple_eq_band4">5kHz</string>
     <string name="simple_eq_band5">16kHz</string>
+    
+    <string name="recents_added">Recently Added</string>
+    <string name="recents_played">Recently Played</string>
 
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 2fb7042..a790f8f 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -106,7 +106,7 @@
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_marginRight">15dp</item>
-        <item name="android:layout_marginTop">3dp</item>
+        <item name="android:layout_marginTop">0dp</item>
 	    <item name="android:padding">@dimen/half_and_half_imagebutton_padding</item>
     </style>    
     <style name="AudioPlayerButtonLayout">
@@ -604,6 +604,12 @@
         <item name="android:background">@drawable/apollo_holo_light_shuffle_normal</item>
 	</style>
     
+    <style name="RecentlyAddedWrapper_Light" parent="ShuffleWrapperLayout">
+        <item name="android:padding">0dp</item>
+        <item name="android:layout_height">60dp</item>
+        <item name="android:background">@drawable/recent_header_background</item>
+    </style>
+    
     <!-- Track Browser Styles -->
     <style name="TracksBrowserWrapper_Light" parent="TracksBrowserWrapperLayout">
         <item name="android:background">@color/background_grey</item> 
@@ -775,6 +781,13 @@
     <style name="ShuffleImage_Dark" parent="ShuffleImageLayout">
         <item name="android:background">@drawable/apollo_holo_dark_shuffle_normal</item>
 	</style>
+    
+    <style name="RecentlyAddedWrapper_Dark" parent="ShuffleWrapperLayout">
+        <item name="android:padding">0dp</item>
+        <item name="android:layout_height">60dp</item>
+        <item name="android:background">@drawable/recent_header_background_dark</item>
+    </style>
+    
     <!-- Track Browser Styles -->
     <style name="TracksBrowserWrapper_Dark" parent="TracksBrowserWrapperLayout">
         <item name="android:background">@color/background_grey_dark</item> 
diff --git a/res/values/themes.xml b/res/values/themes.xml
index c50f2f8..e3bc659 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -82,6 +82,8 @@
     	<item name="ShuffleWrapper">@style/ShuffleWrapper_Light</item>
     	<item name="ShuffleImage">@style/ShuffleImage_Light</item>
     	
+    	<item name="RecentlyAddedWrapper">@style/RecentlyAddedWrapper_Light</item>
+    	
     	<item name="TracksBrowserWrapper">@style/TracksBrowserWrapper_Light</item>
     </style>
     
@@ -170,6 +172,8 @@
     	<item name="ShuffleWrapper">@style/ShuffleWrapper_Dark</item>
     	<item name="ShuffleImage">@style/ShuffleImage_Dark</item>
     	
+    	<item name="RecentlyAddedWrapper">@style/RecentlyAddedWrapper_Dark</item>
+    	
     	<item name="TracksBrowserWrapper">@style/TracksBrowserWrapper_Dark</item>
     </style>
     
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index 2f5b419..34e6e37 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -24,6 +24,18 @@
 	        android:defaultValue="@array/tab_titles"
 	        android:capitalize="words"
 	        />
+        
+        <ListPreference 
+	        android:dialogTitle="@string/recents_title"
+            android:key="@string/key_recents_type"
+            android:title="@string/recents_title"
+            android:summary="@string/recents_summary"
+            android:defaultValue="@string/recents_added" 
+            android:entries="@array/recents_types"
+            android:entryValues="@array/recents_types"
+	        android:capitalize="words"
+        	/>  
+        
         <ListPreference 
 	        android:dialogTitle="@string/visualizer_title"
             android:key="@string/key_visualization_type"
diff --git a/src/com/andrew/apolloMod/Constants.java b/src/com/andrew/apolloMod/Constants.java
index 1ac6782..ee96fc8 100644
--- a/src/com/andrew/apolloMod/Constants.java
+++ b/src/com/andrew/apolloMod/Constants.java
@@ -17,7 +17,7 @@ public final class Constants {
             ARTIST_KEY = "artist", ALBUM_KEY = "album", ALBUM_ID_KEY = "albumid", NUMALBUMS = "num_albums",
             GENRE_KEY = "genres", ARTIST_ID = "artistid", NUMWEEKS = "numweeks",BUILD_DEPENDS = "build_depends",
             PLAYLIST_NAME_FAVORITES = "Favorites", PLAYLIST_NAME = "playlist", WIDGET_STYLE="widget_type",
-            VISUALIZATION_TYPE="visualization_type", DELETE_CACHE="delete_cache", BUILD_VERSION = "build_version",
+            RECENTS_TYPE="recents_type", VISUALIZATION_TYPE="visualization_type", DELETE_CACHE="delete_cache", BUILD_VERSION = "build_version",
             UP_STARTS_ALBUM_ACTIVITY = "upStartsAlbumActivity", TABS_ENABLED = "tabs_enabled";
     
     //Image Loading Constants
diff --git a/src/com/andrew/apolloMod/preferences/SettingsHolder.java b/src/com/andrew/apolloMod/preferences/SettingsHolder.java
index 5a6352a..f07a898 100644
--- a/src/com/andrew/apolloMod/preferences/SettingsHolder.java
+++ b/src/com/andrew/apolloMod/preferences/SettingsHolder.java
@@ -62,6 +62,7 @@ protected void onCreate(Bundle savedInstanceState) {
         // Load settings XML
         int preferencesResId = R.xml.settings;
         addPreferencesFromResource(preferencesResId);
+        
         initChangeTheme();
         
         //Init widget style change option
@@ -73,6 +74,7 @@ protected void onCreate(Bundle savedInstanceState) {
         // Init about dialog
         initAboutDialog();
         
+        //Init dependencies dialog
         initDependencies();
         
     }
diff --git a/src/com/andrew/apolloMod/providers/RecentsLoader.java b/src/com/andrew/apolloMod/providers/RecentsLoader.java
new file mode 100644
index 0000000..6604631
--- /dev/null
+++ b/src/com/andrew/apolloMod/providers/RecentsLoader.java
@@ -0,0 +1,250 @@
+
+package com.andrew.apolloMod.providers;
+
+import android.support.v4.content.AsyncTaskLoader;
+import android.content.ContentQueryMap;
+import android.content.Context;
+import android.content.ContentValues;
+import android.database.ContentObserver;
+import android.database.Cursor;
+import android.database.MatrixCursor;
+import android.net.Uri;
+import android.provider.BaseColumns;
+import android.provider.MediaStore.Audio;
+import android.provider.MediaStore.MediaColumns;
+import android.provider.MediaStore.Audio.AlbumColumns;
+import android.provider.MediaStore.Audio.AudioColumns;
+import java.io.FileDescriptor;
+import java.io.PrintWriter;
+import java.util.Arrays;
+import java.util.Map;
+import com.andrew.apolloMod.providers.HistoryStore.RecentColumns;
+
+public class RecentsLoader extends AsyncTaskLoader<Cursor> {
+    final ForceLoadContentObserver mObserver;
+
+    Uri mUri;
+    String[] mProjection;
+    String mSelection;
+    String[] mSelectionArgs;
+    String mSortOrder;
+
+    Cursor mCursor;
+    Context mContext;
+
+    /* Runs on a worker thread */
+    @Override
+    public Cursor loadInBackground() {
+
+    	//Get Recently Added Songs
+    	String[] sProjection = new String[] {
+                BaseColumns._ID, MediaColumns.TITLE, AudioColumns.ALBUM, AudioColumns.ARTIST
+        };
+
+        StringBuilder where = new StringBuilder();
+        where.append(MediaColumns.TITLE + " != ''");
+        where.append(" AND " + AudioColumns.IS_MUSIC + "=1");
+        
+        Cursor mediaCursor = getContext().getContentResolver().query( Audio.Media.EXTERNAL_CONTENT_URI,
+        			sProjection, where.toString(), null, MediaColumns.DATE_ADDED + " DESC LIMIT 4");
+        
+        //Merge with Album data
+        String [] projection =  new String[] {
+                BaseColumns._ID, AlbumColumns.ALBUM
+        };        
+        Uri uri = Audio.Albums.EXTERNAL_CONTENT_URI;
+        String sortOrder = Audio.Albums.DEFAULT_SORT_ORDER;
+        Cursor albumCursor = getContext().getContentResolver().query(uri, projection, null, null, sortOrder);
+        
+        //Matrix cursor to hold final data to be returned to calling context
+        MatrixCursor cursor = new MatrixCursor( new String[]
+        		{ BaseColumns._ID, MediaColumns.TITLE, AudioColumns.ARTIST, AudioColumns.ALBUM, AudioColumns.ALBUM_ID});
+        //Map data from Audio Id cursor to the ALbumName Colum
+        ContentQueryMap mQueryMap = new ContentQueryMap(albumCursor, AlbumColumns.ALBUM, false, null);
+
+		Map<String, ContentValues> data = mQueryMap.getRows();
+        if (mediaCursor != null) {
+            while(mediaCursor.moveToNext()) {
+				String id = mediaCursor.getString(mediaCursor.getColumnIndexOrThrow(BaseColumns._ID));
+				String title = mediaCursor.getString(mediaCursor.getColumnIndexOrThrow(MediaColumns.TITLE));
+				String artist = mediaCursor.getString(mediaCursor.getColumnIndexOrThrow(AudioColumns.ARTIST));
+				String album = mediaCursor.getString(mediaCursor.getColumnIndexOrThrow(AudioColumns.ALBUM));
+					
+				ContentValues tData = data.get(album);
+				String albumid = (String) tData.get(BaseColumns._ID);
+				cursor.addRow(new String[] {id, title, artist, album, albumid});
+            }
+            mediaCursor.close();
+        }
+        
+        //Add empty row to symbolize start of recently played
+		cursor.addRow(new String[] {"-1", "", "", "", ""});
+        
+        //Add recently played to cursor
+        sProjection = new String[] {
+    			"DISTINCT "+RecentColumns._ID, RecentColumns.TIME_PLAYED,
+                RecentColumns.TITLE, RecentColumns.ARTIST,
+                RecentColumns.ALBUM, RecentColumns.ALBUM_ID       
+        };                
+        Cursor historyCursor = getContext().getContentResolver().query( HistoryStore.CONTENT_URI,
+    			sProjection, null, null, RecentColumns.TIME_PLAYED + " DESC LIMIT 4");
+        if (historyCursor != null) {
+            while(historyCursor.moveToNext()) {
+				String id = historyCursor.getString(historyCursor.getColumnIndexOrThrow(BaseColumns._ID));
+				String title = historyCursor.getString(historyCursor.getColumnIndexOrThrow(MediaColumns.TITLE));
+				String artist = historyCursor.getString(historyCursor.getColumnIndexOrThrow(AudioColumns.ARTIST));
+				String album = historyCursor.getString(historyCursor.getColumnIndexOrThrow(AudioColumns.ALBUM));
+				String albumid = historyCursor.getString(historyCursor.getColumnIndexOrThrow(AudioColumns.ALBUM_ID));
+				cursor.addRow(new String[] {id, title, artist, album, albumid});
+            }
+            historyCursor.close();
+        }
+        
+        if (cursor != null) {
+            // Ensure the cursor window is filled
+            registerContentObserver(cursor, mObserver);
+            cursor.setNotificationUri(mContext.getContentResolver(), HistoryStore.CONTENT_URI);
+        }
+        return cursor;
+    }
+
+    /**
+     * Registers an observer to get notifications from the content provider
+     * when the cursor needs to be refreshed.
+     */
+    void registerContentObserver(Cursor cursor, ContentObserver observer) {
+        cursor.registerContentObserver(mObserver);
+    }
+
+    /* Runs on the UI thread */
+    @Override
+    public void deliverResult(Cursor cursor) {
+        if (isReset()) {
+            // An async query came in while the loader is stopped
+            if (cursor != null) {
+                cursor.close();
+            }
+            return;
+        }
+        Cursor oldCursor = mCursor;
+        mCursor = cursor;
+
+        if (isStarted()) {
+            super.deliverResult(cursor);
+        }
+
+        if (oldCursor != null && oldCursor != cursor && !oldCursor.isClosed()) {
+            oldCursor.close();
+        }
+    }
+
+    /**
+     * Creates an empty unspecified CursorLoader.  You must follow this with
+     * calls to {@link #setUri(Uri)}, {@link #setSelection(String)}, etc
+     * to specify the query to perform.
+     */
+    public RecentsLoader(Context context) {
+        super(context);
+        mContext = context;
+        mObserver = new ForceLoadContentObserver();
+    }
+
+    /**
+     * Starts an asynchronous load of the contacts list data. When the result is ready the callbacks
+     * will be called on the UI thread. If a previous load has been completed and is still valid
+     * the result may be passed to the callbacks immediately.
+     *
+     * Must be called from the UI thread
+     */
+    @Override
+    protected void onStartLoading() {
+        if (mCursor != null) {
+            deliverResult(mCursor);
+        }
+        if (takeContentChanged() || mCursor == null) {
+            forceLoad();
+        }
+    }
+
+    /**
+     * Must be called from the UI thread
+     */
+    @Override
+    protected void onStopLoading() {
+        // Attempt to cancel the current load task if possible.
+        cancelLoad();
+    }
+
+    @Override
+    public void onCanceled(Cursor cursor) {
+        if (cursor != null && !cursor.isClosed()) {
+            cursor.close();
+        }
+    }
+
+    @Override
+    protected void onReset() {
+        super.onReset();
+        
+        // Ensure the loader is stopped
+        onStopLoading();
+
+        if (mCursor != null && !mCursor.isClosed()) {
+            mCursor.close();
+        }
+        mCursor = null;
+    }
+
+    public Uri getUri() {
+        return mUri;
+    }
+
+    public void setUri(Uri uri) {
+        mUri = uri;
+    }
+
+    public String[] getProjection() {
+        return mProjection;
+    }
+
+    public void setProjection(String[] projection) {
+        mProjection = projection;
+    }
+
+    public String getSelection() {
+        return mSelection;
+    }
+
+    public void setSelection(String selection) {
+        mSelection = selection;
+    }
+
+    public String[] getSelectionArgs() {
+        return mSelectionArgs;
+    }
+
+    public void setSelectionArgs(String[] selectionArgs) {
+        mSelectionArgs = selectionArgs;
+    }
+
+    public String getSortOrder() {
+        return mSortOrder;
+    }
+
+    public void setSortOrder(String sortOrder) {
+        mSortOrder = sortOrder;
+    }
+
+    @Override
+    public void dump(String prefix, FileDescriptor fd, PrintWriter writer, String[] args) {
+        super.dump(prefix, fd, writer, args);
+        writer.print(prefix); writer.print("mUri="); writer.println(mUri);
+        writer.print(prefix); writer.print("mProjection=");
+                writer.println(Arrays.toString(mProjection));
+        writer.print(prefix); writer.print("mSelection="); writer.println(mSelection);
+        writer.print(prefix); writer.print("mSelectionArgs=");
+                writer.println(Arrays.toString(mSelectionArgs));
+        writer.print(prefix); writer.print("mSortOrder="); writer.println(mSortOrder);
+        writer.print(prefix); writer.print("mCursor="); writer.println(mCursor);
+    }
+}
diff --git a/src/com/andrew/apolloMod/ui/activities/MusicLibrary.java b/src/com/andrew/apolloMod/ui/activities/MusicLibrary.java
index 8256b7c..d380699 100644
--- a/src/com/andrew/apolloMod/ui/activities/MusicLibrary.java
+++ b/src/com/andrew/apolloMod/ui/activities/MusicLibrary.java
@@ -1,13 +1,9 @@
-/**
- * 
- */
 
 package com.andrew.apolloMod.ui.activities;
 
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
-
 import android.app.ActionBar;
 import android.content.ComponentName;
 import android.content.Intent;
@@ -33,18 +29,16 @@
 import android.view.View;
 import android.view.ViewTreeObserver;
 import android.view.Window;
-
 import com.andrew.apolloMod.IApolloService;
 import com.andrew.apolloMod.R;
 import com.andrew.apolloMod.ui.adapters.PagerAdapter;
 import com.andrew.apolloMod.ui.adapters.ScrollingTabsAdapter;
 import com.andrew.apolloMod.ui.fragments.BottomActionBarFragment;
+import com.andrew.apolloMod.ui.fragments.RecentsRootFragment;
 import com.andrew.apolloMod.ui.fragments.grid.AlbumsFragment;
 import com.andrew.apolloMod.ui.fragments.grid.ArtistsFragment;
 import com.andrew.apolloMod.ui.fragments.list.GenresFragment;
 import com.andrew.apolloMod.ui.fragments.list.PlaylistsFragment;
-import com.andrew.apolloMod.ui.fragments.list.RecentlyAddedFragment;
-import com.andrew.apolloMod.ui.fragments.list.RecentlyPlayedFragment;
 import com.andrew.apolloMod.ui.fragments.list.SongsFragment;
 import com.andrew.apolloMod.helpers.ApolloUtils;
 import com.andrew.apolloMod.helpers.MusicUtils;
@@ -54,7 +48,6 @@
 import com.andrew.apolloMod.ui.views.ScrollableTabView;
 import com.sothree.slidinguppanel.SlidingUpPanelLayout;
 import com.sothree.slidinguppanel.SlidingUpPanelLayout.PanelSlideListener;
-
 import static com.andrew.apolloMod.Constants.TABS_ENABLED;
 import static com.andrew.apolloMod.Constants.CURRENT_THEME;
 
@@ -203,7 +196,7 @@ protected void onStop() {
      */
     public void initPager() {
         // Initiate PagerAdapter
-        PagerAdapter mPagerAdapter = new PagerAdapter(getSupportFragmentManager());
+        PagerAdapter mPagerAdapter = new PagerAdapter(this, getSupportFragmentManager());
 
         //Get tab visibility preferences
         SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
@@ -221,7 +214,7 @@ public void initPager() {
         //Only show tabs that were set in preferences
         // Recently added tracks
         if(tabs_set.contains(getResources().getString(R.string.tab_recent)))
-        	mPagerAdapter.addFragment(new RecentlyPlayedFragment());
+        	mPagerAdapter.addFragment(new RecentsRootFragment());
         // Artists
         if(tabs_set.contains(getResources().getString(R.string.tab_artists)))
         	mPagerAdapter.addFragment(new ArtistsFragment());
diff --git a/src/com/andrew/apolloMod/ui/activities/TracksBrowser.java b/src/com/andrew/apolloMod/ui/activities/TracksBrowser.java
index 566a3c5..daa16e7 100644
--- a/src/com/andrew/apolloMod/ui/activities/TracksBrowser.java
+++ b/src/com/andrew/apolloMod/ui/activities/TracksBrowser.java
@@ -441,7 +441,7 @@ public void onClick(View v) {
      */
     private void initPager() {
         // Initiate PagerAdapter
-        PagerAdapter mPagerAdapter = new PagerAdapter(getSupportFragmentManager());
+        PagerAdapter mPagerAdapter = new PagerAdapter(this, getSupportFragmentManager());
         if (ApolloUtils.isArtist(mimeType))
             // Show all albums for an artist
             mPagerAdapter.addFragment(new ArtistAlbumsFragment(bundle));
diff --git a/src/com/andrew/apolloMod/ui/adapters/PagerAdapter.java b/src/com/andrew/apolloMod/ui/adapters/PagerAdapter.java
index 4fff2bb..038729e 100644
--- a/src/com/andrew/apolloMod/ui/adapters/PagerAdapter.java
+++ b/src/com/andrew/apolloMod/ui/adapters/PagerAdapter.java
@@ -4,12 +4,23 @@
 
 package com.andrew.apolloMod.ui.adapters;
 
+import static com.andrew.apolloMod.Constants.TABS_ENABLED;
+
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
 
+import com.andrew.apolloMod.R;
+import com.andrew.apolloMod.ui.activities.MusicLibrary;
+import com.andrew.apolloMod.ui.fragments.RecentsRootFragment;
 import com.andrew.apolloMod.ui.fragments.base.RefreshableFragment;
 
 /**
@@ -18,9 +29,11 @@
 public class PagerAdapter extends FragmentPagerAdapter {
 
     private final ArrayList<Fragment> mFragments = new ArrayList<Fragment>();
+    private Context mContext;
 
-    public PagerAdapter(FragmentManager fragmentManager) {
+    public PagerAdapter(Context context, FragmentManager fragmentManager) {
         super(fragmentManager);
+    	mContext = context;
     }
 
     public void addFragment(Fragment fragment) {
@@ -34,7 +47,18 @@ public int getCount() {
     }
 
     @Override
-    public Fragment getItem(int position) {
+    public Fragment getItem(int position) {	
+        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(mContext);
+        Set<String> defaults = new HashSet<String>(Arrays.asList(
+        		mContext.getResources().getStringArray(R.array.tab_titles)
+        	));
+        Set<String> tabs_set = sp.getStringSet(TABS_ENABLED,defaults);
+
+    	if (position == 0 
+    			&& tabs_set.contains(mContext.getResources().getString(R.string.tab_recent)) 
+    			&& MusicLibrary.class.isInstance(mContext) ){
+    		return new RecentsRootFragment();
+    	}
         return mFragments.get(position);
     }
 
diff --git a/src/com/andrew/apolloMod/ui/fragments/RecentsRootFragment.java b/src/com/andrew/apolloMod/ui/fragments/RecentsRootFragment.java
new file mode 100644
index 0000000..a1be79a
--- /dev/null
+++ b/src/com/andrew/apolloMod/ui/fragments/RecentsRootFragment.java
@@ -0,0 +1,61 @@
+
+package com.andrew.apolloMod.ui.fragments;
+
+import static com.andrew.apolloMod.Constants.TABS_ENABLED;
+import static com.andrew.apolloMod.Constants.VISUALIZATION_TYPE;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import com.andrew.apolloMod.R;
+import com.andrew.apolloMod.ui.fragments.list.RecentlyAddedFragment;
+import com.andrew.apolloMod.ui.fragments.list.RecentlyPlayedFragment;
+
+import static com.andrew.apolloMod.Constants.RECENTS_TYPE;
+
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentTransaction;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+public class RecentsRootFragment extends Fragment {
+
+
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container,
+			Bundle savedInstanceState) {
+
+		View view = inflater.inflate(R.layout.recents_root_fragment, container, false);
+
+		FragmentTransaction transaction = getFragmentManager()
+				.beginTransaction();
+		
+		SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getActivity());
+		String type = sp.getString(RECENTS_TYPE, getResources().getString(R.string.recents_added));                    
+ 	    if( type.equals(getResources().getString(R.string.recents_added)) ){
+ 	    	Log.e("Recents","ADDED!!!!!");
+ 	    	transaction.replace(R.id.root_frame, new RecentlyAddedFragment());
+ 	    }
+ 	    else if( type.equals(getResources().getString(R.string.recents_played)) ){
+ 	    	Log.e("Recents","PLAYED!!!!!");
+ 	    	transaction.replace(R.id.root_frame, new RecentlyPlayedFragment());
+ 	    }
+ 	    else{
+ 	    	Log.e("Recents","SPLITTERRR!!!!!");
+ 	    	transaction.replace(R.id.root_frame, new RecentsSplitFragment());
+ 	    }     	
+
+		//transaction.replace(R.id.root_frame, new RecentsSplitFragment());
+
+		transaction.commit();
+
+		return view;
+	}
+
+}
diff --git a/src/com/andrew/apolloMod/ui/fragments/RecentsSplitFragment.java b/src/com/andrew/apolloMod/ui/fragments/RecentsSplitFragment.java
new file mode 100644
index 0000000..3427d82
--- /dev/null
+++ b/src/com/andrew/apolloMod/ui/fragments/RecentsSplitFragment.java
@@ -0,0 +1,178 @@
+
+package com.andrew.apolloMod.ui.fragments;
+
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentTransaction;
+import android.support.v4.app.LoaderManager.LoaderCallbacks;
+import android.support.v4.content.Loader;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.app.Activity;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.provider.BaseColumns;
+import android.provider.MediaStore.MediaColumns;
+import android.provider.MediaStore.Audio.AudioColumns;
+import com.andrew.apolloMod.R;
+import com.andrew.apolloMod.cache.ImageInfo;
+import com.andrew.apolloMod.cache.ImageProvider;
+import com.andrew.apolloMod.helpers.MusicUtils;
+import com.andrew.apolloMod.providers.RecentsLoader;
+import com.andrew.apolloMod.ui.fragments.list.RecentlyAddedFragment;
+import com.andrew.apolloMod.ui.fragments.list.RecentlyPlayedFragment;
+
+import static com.andrew.apolloMod.Constants.SIZE_THUMB;
+import static com.andrew.apolloMod.Constants.SRC_FIRST_AVAILABLE;
+import static com.andrew.apolloMod.Constants.TYPE_ALBUM;
+
+public class RecentsSplitFragment  extends Fragment implements LoaderCallbacks<Cursor>{
+	
+	private LinearLayout mWrapper;
+	
+	private Cursor mCursor;
+	
+    private ImageProvider mImageProvider;
+	
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        getLoaderManager().initLoader(0, null, this);
+    	mImageProvider = ImageProvider.getInstance( (Activity) getActivity() );
+    }    
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View root = inflater.inflate(R.layout.recents_main, container, false);
+        mWrapper = (LinearLayout )root.findViewById(R.id.recents_wrapper);
+        return root;
+    }
+
+	@Override
+    public Loader<Cursor> onCreateLoader(int id, Bundle args) {    
+        return new RecentsLoader(getActivity());
+    }
+
+	@Override
+	public void onLoadFinished(Loader<Cursor> loader, Cursor cursor) {
+		mWrapper.removeAllViews();
+		mWrapper.addView(View.inflate(getActivity(), R.layout.shadow, null));
+
+		mCursor = cursor;
+		View row = null;
+		mCursor.moveToPosition(-1);
+		int count = 0;
+		boolean added = false;
+		row = View.inflate(getActivity(), R.layout.recently_added_heading, null);
+		View wrapper = row.findViewById(R.id.recently_added_wrapper);
+		wrapper.setOnClickListener(new OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					FragmentTransaction trans = getFragmentManager()
+					.beginTransaction();
+					trans.replace(R.id.root_frame, new RecentlyAddedFragment());
+					trans.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN);
+					trans.addToBackStack(null);
+					trans.commit();
+				}
+			});
+		mWrapper.addView(row);
+		
+		while (mCursor.moveToNext()) {
+			if(mCursor.getString(mCursor.getColumnIndex(BaseColumns._ID)).equals("-1")){
+				count = 0;
+				if(!added){
+					mWrapper.addView(row);
+					added = true;
+				}
+				row = View.inflate(getActivity(), R.layout.recently_added_heading, null);
+				((TextView)row.findViewById(R.id.recents_textview)).setText(R.string.recents_played);
+				wrapper = row.findViewById(R.id.recently_added_wrapper);
+				wrapper.setOnClickListener(new OnClickListener() {
+						@Override
+						public void onClick(View v) {
+							FragmentTransaction trans = getFragmentManager()
+							.beginTransaction();
+							trans.replace(R.id.root_frame, new RecentlyPlayedFragment());
+							trans.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN);
+							trans.addToBackStack(null);
+							trans.commit();
+						}
+					});
+				
+				
+				
+				mWrapper.addView(row);									
+				continue;
+			}
+			if (count % 2 == 0) {
+				row = View.inflate(getActivity(), R.layout.recents_row, null);
+				View col1 = row.findViewById(R.id.recent_column1);
+				col1.setVisibility(View.VISIBLE);
+				col1.setTag(mCursor.getLong(mCursor.getColumnIndexOrThrow(BaseColumns._ID)));
+				col1.setOnClickListener(new OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						MusicUtils.addToCurrentPlaylist(getActivity(), new long[]{(Long)v.getTag()});
+					}
+				});
+				TextView lineOne = (TextView) row.findViewById(R.id.recent_line_one1);
+				TextView lineTwo = (TextView) row.findViewById(R.id.recent_line_two1);
+				lineOne.setText(mCursor.getString(mCursor.getColumnIndexOrThrow(MediaColumns.TITLE)));
+				lineTwo.setText(mCursor.getString(mCursor.getColumnIndexOrThrow(AudioColumns.ARTIST)));
+				added = false;
+				
+				String artistName = mCursor.getString(mCursor.getColumnIndexOrThrow(AudioColumns.ARTIST));
+				String albumName = mCursor.getString(mCursor.getColumnIndexOrThrow(AudioColumns.ALBUM));
+		        String albumId = mCursor.getString(mCursor.getColumnIndexOrThrow(AudioColumns.ALBUM_ID));
+		        ImageInfo mInfo = new ImageInfo();
+	            mInfo.type = TYPE_ALBUM;
+	            mInfo.size = SIZE_THUMB;
+	            mInfo.source = SRC_FIRST_AVAILABLE;
+	            mInfo.data = new String[]{ albumId , artistName, albumName };
+	            mImageProvider.loadImage( (ImageView) row.findViewById(R.id.recent_image1), mInfo ); 
+			}	
+			else{
+				View col2 = row.findViewById(R.id.recent_column2);
+				col2.setVisibility(View.VISIBLE);
+				col2.setTag(mCursor.getLong(mCursor.getColumnIndexOrThrow(BaseColumns._ID)));
+				col2.setOnClickListener(new OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						MusicUtils.addToCurrentPlaylist(getActivity(), new long[]{(Long)v.getTag()});
+					}
+				});
+				TextView lineOne = (TextView) row.findViewById(R.id.recent_line_one2);
+				TextView lineTwo = (TextView) row.findViewById(R.id.recent_line_two2);
+				lineOne.setText(mCursor.getString(mCursor.getColumnIndexOrThrow(MediaColumns.TITLE)));
+				lineTwo.setText(mCursor.getString(mCursor.getColumnIndexOrThrow(AudioColumns.ARTIST)));
+				mWrapper.addView(row);
+				added = true;
+				
+				String artistName = mCursor.getString(mCursor.getColumnIndexOrThrow(AudioColumns.ARTIST));
+				String albumName = mCursor.getString(mCursor.getColumnIndexOrThrow(AudioColumns.ALBUM));
+		        String albumId = mCursor.getString(mCursor.getColumnIndexOrThrow(AudioColumns.ALBUM_ID));
+		        ImageInfo mInfo = new ImageInfo();
+	            mInfo.type = TYPE_ALBUM;
+	            mInfo.size = SIZE_THUMB;
+	            mInfo.source = SRC_FIRST_AVAILABLE;
+	            mInfo.data = new String[]{ albumId , artistName, albumName };
+	            mImageProvider.loadImage( (ImageView) row.findViewById(R.id.recent_image2), mInfo ); 
+			}
+			count++;
+		}	
+		if(!added){
+			mWrapper.addView(row);
+		}
+		
+	}
+
+	@Override
+	public void onLoaderReset(Loader<Cursor> arg0) {
+		
+	}
+}
diff --git a/src/com/andrew/apolloMod/ui/fragments/base/GridViewFragment.java b/src/com/andrew/apolloMod/ui/fragments/base/GridViewFragment.java
index 9c0581f..2f4de4e 100644
--- a/src/com/andrew/apolloMod/ui/fragments/base/GridViewFragment.java
+++ b/src/com/andrew/apolloMod/ui/fragments/base/GridViewFragment.java
@@ -34,7 +34,7 @@
 public abstract class GridViewFragment extends Fragment implements LoaderCallbacks<Cursor>,
 OnItemClickListener {
 
-	private GridView mGridView;
+	protected GridView mGridView;
 	
 	protected GridViewAdapter mAdapter;
 

From 251bd0e03e0faa6d5e5f0aa59e27aefeb80fd09e Mon Sep 17 00:00:00 2001
From: Splitter <splitvisionz@gmail.com>
Date: Fri, 18 Apr 2014 19:21:01 -0400
Subject: [PATCH 08/10] remove unused drawable added in last commit

---
 .../apollo_holo_light_recents_added.png          | Bin 5663 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 res/drawable-hdpi/apollo_holo_light_recents_added.png

diff --git a/res/drawable-hdpi/apollo_holo_light_recents_added.png b/res/drawable-hdpi/apollo_holo_light_recents_added.png
deleted file mode 100644
index 97946180cc587ed6a4b27babd7c64a6e0c32c70b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5663
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
FV1oC93)KJs


From 7edeaf27d7718c4d1178240744ae35366e3fa2dd Mon Sep 17 00:00:00 2001
From: Splitter <splitvisionz@gmail.com>
Date: Sun, 20 Apr 2014 20:49:18 -0400
Subject: [PATCH 09/10] Blacked out theme part One

---
 res/values/arrays.xml                         |  1 +
 res/values/strings.xml                        |  3 +-
 res/values/themes.xml                         | 91 +++++++++++++++++++
 .../apolloMod/preferences/SettingsHolder.java |  4 +-
 .../apolloMod/ui/activities/MusicLibrary.java |  4 +-
 .../apolloMod/ui/activities/PlayExternal.java |  4 +-
 .../ui/activities/QueryBrowserActivity.java   |  4 +-
 .../apolloMod/ui/activities/QuickQueue.java   |  4 +-
 .../apolloMod/ui/activities/SimpleEq.java     |  4 +-
 .../ui/activities/TracksBrowser.java          |  4 +-
 .../ui/activities/dialogs/PlaylistDialog.java |  4 +-
 .../ui/activities/dialogs/PlaylistPicker.java |  4 +-
 .../ui/fragments/RecentsRootFragment.java     |  9 --
 13 files changed, 121 insertions(+), 19 deletions(-)

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 9eb1f9a..2aaf0b6 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -15,6 +15,7 @@
      <string-array name="theme_types">
         <item>@string/theme_light</item>
         <item>@string/theme_dark</item>
+        <item>@string/theme_black</item>
     </string-array>
     
      <string-array name="recents_types">
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e761735..8dfcbe7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -189,7 +189,8 @@ https://github.com/CyanogenMod/android_packages_apps_Apollo/tree/cm-10.1
     <!-- Themes -->
     <string name="theme_light">Light Theme</string>
     <string name="theme_dark">Dark Theme</string>
-
+    <string name="theme_black">Black Theme</string>
+    
     <!-- External file dialog -->
     <string name="play_external_question_msg">Select the action to apply to: \n\n<b><xliff:g id="name">%s</xliff:g></b></string>
     <string name="play_external_question_button_play">Play</string>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index e3bc659..698f911 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -177,4 +177,95 @@
     	<item name="TracksBrowserWrapper">@style/TracksBrowserWrapper_Dark</item>
     </style>
     
+    
+    
+    
+    
+    
+    <style name="ApolloTheme.Black" parent="ApolloTheme.Dark">
+        <item name="android:actionBarStyle">@style/ApolloTheme.BlueActionBar</item>
+    	<item name="android:actionOverflowButtonStyle">@style/ApolloTheme.OverFlow</item>
+    	
+    	<item name="PlaylistDialog">@style/PlaylistDialog_Dark</item>
+    	<item name="Tabs">@style/Tabs_Dark</item>
+    	
+    	<item name="AlbumArtNormal">@drawable/no_art_normal_dark</item>
+    	<item name="AlbumArtSmall">@drawable/no_art_small_dark</item>
+    	<item name="AudioPlayButton">@drawable/apollo_holo_dark_play</item>
+    	<item name="AudioPauseButton">@drawable/apollo_holo_dark_pause</item>
+    	<item name="AudioShuffleButton">@drawable/apollo_holo_dark_shuffle_normal</item>
+    	<item name="AudioRepeatButton">@drawable/apollo_holo_dark_repeat_normal</item>
+    	<item name="AudioFavoritesButton">@drawable/apollo_holo_dark_favorite_normal</item>
+    	<item name="AudioQueueButton">@drawable/btn_switch_queue_dark</item>
+    	<item name="AudioTextColor">@color/transparent_white</item>
+    	
+    	<item name="BottomActionBarItem">@style/BottomActionBarItem_Light</item>
+    	<item name="BottomActionBarText">@style/BottomActionBarText_Dark</item>
+    	<item name="BottomActionBarDivider">@style/BottomActionBarDivider_Light</item>
+    	<item name="BottomActionBar">@style/BottomActionBar_Light</item>
+    	<item name="BottomActionBarWrapper">@style/BottomActionBarWrapper_Light</item>
+    	<item name="BottomActionBarOuter">@style/BottomActionBarOuter_Dark</item>
+    	<item name="BottomActionBarFavorites">@style/BottomActionBarFavorites_Dark</item>
+    	<item name="BottomActionBarPrevious">@style/BottomActionBarPrevious_Dark</item>
+    	<item name="BottomActionBarPlay">@style/BottomActionBarPlay_Dark</item>
+    	<item name="BottomActionBarNext">@style/BottomActionBarNext_Dark</item>
+    	<item name="BottomActionBarNowQueue">@style/BottomActionBarNowQueue_Dark</item>
+    	
+    	<item name="AudioPlayerAlbumArt">@style/AudioPlayerAlbumArt_Dark</item>
+    	<item name="AudioPlayerText">@style/AudioPlayerText_Light</item>
+    	<item name="AudioPlayerArtistAlbumText">@style/AudioPlayerAlbumArtistText_Dark</item>
+    	<item name="AudioPlayerInfoText">@style/AudioPlayerInfoText_Dark</item>
+    	<item name="AudioPlayerViewMore">@style/AudioPlayerViewMore_Dark</item>
+    	<item name="AudioPlayerButton">@style/AudioPlayerButton_Light</item>
+    	<item name="AudioPlayerTimeText">@style/AudioPlayerTimeText_Dark</item>
+    	<item name="AudioPlayerNowPlayingText">@style/AudioPlayerNowPlayingText_Light</item>
+    	<item name="AudioPlayerQueueBG">@style/AudioPlayerQueueBG_Dark</item>
+    	<item name="AudioPlayerColorstrip">@style/AudioPlayerColorstrip_Light</item>
+    	<item name="AudioPlayerColorstripShadow">@style/AudioPlayerColorstripShadow_Light</item>
+    	<item name="AudioPlayerPrevious">@style/AudioPlayerPrevious_Dark</item>
+    	<item name="AudioPlayerPlay">@style/AudioPlayerPrevious_Dark</item>
+    	<item name="AudioPlayerNext">@style/AudioPlayerNext_Dark</item>
+    	<item name="AudioPlayerRepeat">@style/AudioPlayerRepeat_Dark</item>
+    	<item name="AudioPlayerShuffle">@style/AudioPlayerShuffle_Dark</item>
+    	<item name="AudioPlayerSeek">@style/AudioPlayerSeek_Dark</item>
+    	
+    	<item name="ContextMenuLine">@style/ContextMenuLine_Dark</item>
+    	<item name="ContextMenuArrow">@style/ContextMenuArrow_Dark</item>
+    	
+    	<item name="ListviewItemWrapper">@style/ListviewItemWrapper_Dark</item>
+    	<item name="ListviewItemArt">@style/ListviewItemArt_Dark</item>
+    	<item name="ListviewItemLineOne">@style/ListviewItemLineOne_Dark</item>
+    	<item name="ListviewItemLineTwo">@style/ListviewItemLineTwo_Dark</item>
+    	<item name="Listview">@style/Listview_Dark</item>
+    	<item name="ListviewDragHandle">@style/ListviewDragHandle_Dark</item>
+    	<item name="ListviewDragWrapper">@style/ListviewDragWrapper_Dark</item>
+    	
+    	<item name="Gridview">@style/Gridview_Dark</item>
+    	<item name="GridviewItemWrapper">@style/GridviewItemWrapper_Dark</item>
+    	<item name="GridviewItemArt">@style/GridviewItemArt_Dark</item>
+    	<item name="GridviewItemTextWrapper">@style/GridviewItemTextWrapper_Light</item>
+    	
+    	<item name="GridviewRecentsWrapper">@style/GridviewRecentsWrapper_Dark</item>
+    	<item name="GridviewRecentsArt">@style/GridviewRecentsArt_Dark</item>
+    	<item name="GridviewRecentsShadowedText">@style/GridviewRecentsShadowedText_Light</item>
+    	<item name="GridviewRecentsText">@style/GridviewRecentsText_Dark</item>
+    	
+    	<item name="ShadowedText">@style/ShadowedText_Light</item>
+    	
+    	<item name="Colorstrip">@style/Colorstrip_Light</item>
+    	
+    	<item name="HalfTextWrapper">@style/HalfTextWrapper_Light</item>
+    	<item name="HalfTextViewMore">@style/HalfTextViewMore_Light</item>
+    	
+    	<item name="LibraryWrapper">@style/LibraryWrapper_Dark</item>
+    	<item name="LibraryTabsWrapper">@style/LibraryTabsWrapper_Dark</item>
+    	
+    	<item name="ShuffleWrapper">@style/ShuffleWrapper_Dark</item>
+    	<item name="ShuffleImage">@style/ShuffleImage_Dark</item>
+    	
+    	<item name="RecentlyAddedWrapper">@style/RecentlyAddedWrapper_Dark</item>
+    	
+    	<item name="TracksBrowserWrapper">@style/TracksBrowserWrapper_Dark</item>
+    </style>
+    
 </resources>
diff --git a/src/com/andrew/apolloMod/preferences/SettingsHolder.java b/src/com/andrew/apolloMod/preferences/SettingsHolder.java
index f07a898..5c33554 100644
--- a/src/com/andrew/apolloMod/preferences/SettingsHolder.java
+++ b/src/com/andrew/apolloMod/preferences/SettingsHolder.java
@@ -53,7 +53,9 @@ protected void onCreate(Bundle savedInstanceState) {
     	SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
     	String type = sp.getString(CURRENT_THEME, getResources().getString(R.string.theme_light));                    
 		if(type.equals(getResources().getString(R.string.theme_light)))
-			setTheme(R.style.ApolloTheme_Light);
+			setTheme(R.style.ApolloTheme_Light);                  
+		else if(type.equals(getResources().getString(R.string.theme_black)))
+			setTheme(R.style.ApolloTheme_Black);
 		else
 			setTheme(R.style.ApolloTheme_Dark);
         // This should be called first thing
diff --git a/src/com/andrew/apolloMod/ui/activities/MusicLibrary.java b/src/com/andrew/apolloMod/ui/activities/MusicLibrary.java
index d380699..62c458d 100644
--- a/src/com/andrew/apolloMod/ui/activities/MusicLibrary.java
+++ b/src/com/andrew/apolloMod/ui/activities/MusicLibrary.java
@@ -72,7 +72,9 @@ protected void onCreate(Bundle icicle) {
     	SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
     	String type = sp.getString(CURRENT_THEME, getResources().getString(R.string.theme_light));                    
 		if(type.equals(getResources().getString(R.string.theme_light)))
-			setTheme(R.style.ApolloTheme_Light);
+			setTheme(R.style.ApolloTheme_Light);                 
+		else if(type.equals(getResources().getString(R.string.theme_black)))
+			setTheme(R.style.ApolloTheme_Black);
 		else
 			setTheme(R.style.ApolloTheme_Dark);
         super.onCreate(icicle);
diff --git a/src/com/andrew/apolloMod/ui/activities/PlayExternal.java b/src/com/andrew/apolloMod/ui/activities/PlayExternal.java
index 06726a0..db5edee 100644
--- a/src/com/andrew/apolloMod/ui/activities/PlayExternal.java
+++ b/src/com/andrew/apolloMod/ui/activities/PlayExternal.java
@@ -57,7 +57,9 @@ public void onCreate(Bundle savedInstanceState) {
     	SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
     	String type = sp.getString(CURRENT_THEME, getResources().getString(R.string.theme_light));                    
 		if(type.equals(getResources().getString(R.string.theme_light)))
-			setTheme(R.style.ApolloTheme_Light);
+			setTheme(R.style.ApolloTheme_Light);                 
+		else if(type.equals(getResources().getString(R.string.theme_black)))
+			setTheme(R.style.ApolloTheme_Black);
 		else
 			setTheme(R.style.ApolloTheme_Dark);
         super.onCreate(savedInstanceState);
diff --git a/src/com/andrew/apolloMod/ui/activities/QueryBrowserActivity.java b/src/com/andrew/apolloMod/ui/activities/QueryBrowserActivity.java
index 0f6324b..6dbe137 100644
--- a/src/com/andrew/apolloMod/ui/activities/QueryBrowserActivity.java
+++ b/src/com/andrew/apolloMod/ui/activities/QueryBrowserActivity.java
@@ -72,7 +72,9 @@ public void onCreate(Bundle icicle) {
     	SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
     	String type = sp.getString(CURRENT_THEME, getResources().getString(R.string.theme_light));                    
 		if(type.equals(getResources().getString(R.string.theme_light)))
-			setTheme(R.style.ApolloTheme_Light);
+			setTheme(R.style.ApolloTheme_Light);                 
+		else if(type.equals(getResources().getString(R.string.theme_black)))
+			setTheme(R.style.ApolloTheme_Black);
 		else
 			setTheme(R.style.ApolloTheme_Dark);
         super.onCreate(icicle);
diff --git a/src/com/andrew/apolloMod/ui/activities/QuickQueue.java b/src/com/andrew/apolloMod/ui/activities/QuickQueue.java
index 4f4c41a..d3453d1 100644
--- a/src/com/andrew/apolloMod/ui/activities/QuickQueue.java
+++ b/src/com/andrew/apolloMod/ui/activities/QuickQueue.java
@@ -29,7 +29,9 @@ protected void onCreate(Bundle icicle) {
     	SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
     	String type = sp.getString(CURRENT_THEME, getResources().getString(R.string.theme_light));                    
 		if(type.equals(getResources().getString(R.string.theme_light)))
-			setTheme(R.style.ApolloTheme_Light);
+			setTheme(R.style.ApolloTheme_Light);                 
+		else if(type.equals(getResources().getString(R.string.theme_black)))
+			setTheme(R.style.ApolloTheme_Black);
 		else
 			setTheme(R.style.ApolloTheme_Dark);
         // This needs to be called first
diff --git a/src/com/andrew/apolloMod/ui/activities/SimpleEq.java b/src/com/andrew/apolloMod/ui/activities/SimpleEq.java
index 1fee0f2..c97e811 100644
--- a/src/com/andrew/apolloMod/ui/activities/SimpleEq.java
+++ b/src/com/andrew/apolloMod/ui/activities/SimpleEq.java
@@ -48,7 +48,9 @@ protected void onCreate(Bundle icicle) {
     	SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
     	String type = sp.getString(CURRENT_THEME, getResources().getString(R.string.theme_light));                    
 		if(type.equals(getResources().getString(R.string.theme_light)))
-			setTheme(R.style.ApolloTheme_Light);
+			setTheme(R.style.ApolloTheme_Light);                 
+		else if(type.equals(getResources().getString(R.string.theme_black)))
+			setTheme(R.style.ApolloTheme_Black);
 		else
 			setTheme(R.style.ApolloTheme_Dark);
         super.onCreate(icicle);
diff --git a/src/com/andrew/apolloMod/ui/activities/TracksBrowser.java b/src/com/andrew/apolloMod/ui/activities/TracksBrowser.java
index daa16e7..2e92097 100644
--- a/src/com/andrew/apolloMod/ui/activities/TracksBrowser.java
+++ b/src/com/andrew/apolloMod/ui/activities/TracksBrowser.java
@@ -84,7 +84,9 @@ protected void onCreate(Bundle icicle) {
     	SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
     	String type = sp.getString(CURRENT_THEME, getResources().getString(R.string.theme_light));                    
 		if(type.equals(getResources().getString(R.string.theme_light)))
-			setTheme(R.style.ApolloTheme_Light);
+			setTheme(R.style.ApolloTheme_Light);                 
+		else if(type.equals(getResources().getString(R.string.theme_black)))
+			setTheme(R.style.ApolloTheme_Black);
 		else
 			setTheme(R.style.ApolloTheme_Dark);
         super.onCreate(icicle);
diff --git a/src/com/andrew/apolloMod/ui/activities/dialogs/PlaylistDialog.java b/src/com/andrew/apolloMod/ui/activities/dialogs/PlaylistDialog.java
index 27ff0fa..3e08416 100644
--- a/src/com/andrew/apolloMod/ui/activities/dialogs/PlaylistDialog.java
+++ b/src/com/andrew/apolloMod/ui/activities/dialogs/PlaylistDialog.java
@@ -125,7 +125,9 @@ public void onCreate(Bundle icicle) {
     	SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
 		String type = sp.getString(CURRENT_THEME, getResources().getString(R.string.theme_light));                    
 		if(type.equals(getResources().getString(R.string.theme_light)))
-			setTheme(R.style.ApolloTheme_Light);
+			setTheme(R.style.ApolloTheme_Light);                 
+		else if(type.equals(getResources().getString(R.string.theme_black)))
+			setTheme(R.style.ApolloTheme_Black);
 		else
 			setTheme(R.style.ApolloTheme_Dark);
 	
diff --git a/src/com/andrew/apolloMod/ui/activities/dialogs/PlaylistPicker.java b/src/com/andrew/apolloMod/ui/activities/dialogs/PlaylistPicker.java
index 6d4bd3b..c387116 100644
--- a/src/com/andrew/apolloMod/ui/activities/dialogs/PlaylistPicker.java
+++ b/src/com/andrew/apolloMod/ui/activities/dialogs/PlaylistPicker.java
@@ -82,7 +82,9 @@ public void onCreate(Bundle icicle) {
     	SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
     	String type = sp.getString(CURRENT_THEME, getResources().getString(R.string.theme_light));                    
 		if(type.equals(getResources().getString(R.string.theme_light)))
-			setTheme(R.style.ApolloTheme_Light);
+			setTheme(R.style.ApolloTheme_Light);                 
+		else if(type.equals(getResources().getString(R.string.theme_black)))
+			setTheme(R.style.ApolloTheme_Black);
 		else
 			setTheme(R.style.ApolloTheme_Dark);
 
diff --git a/src/com/andrew/apolloMod/ui/fragments/RecentsRootFragment.java b/src/com/andrew/apolloMod/ui/fragments/RecentsRootFragment.java
index a1be79a..5a57b01 100644
--- a/src/com/andrew/apolloMod/ui/fragments/RecentsRootFragment.java
+++ b/src/com/andrew/apolloMod/ui/fragments/RecentsRootFragment.java
@@ -1,19 +1,10 @@
 
 package com.andrew.apolloMod.ui.fragments;
 
-import static com.andrew.apolloMod.Constants.TABS_ENABLED;
-import static com.andrew.apolloMod.Constants.VISUALIZATION_TYPE;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
 import com.andrew.apolloMod.R;
 import com.andrew.apolloMod.ui.fragments.list.RecentlyAddedFragment;
 import com.andrew.apolloMod.ui.fragments.list.RecentlyPlayedFragment;
-
 import static com.andrew.apolloMod.Constants.RECENTS_TYPE;
-
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;

From 41642527504753992873f0023a1cd36ced827dda Mon Sep 17 00:00:00 2001
From: Splitter <splitvisionz@gmail.com>
Date: Sun, 20 Apr 2014 20:50:26 -0400
Subject: [PATCH 10/10] Change view more icons

---
 res/drawable-hdpi/view_more_album.png  | Bin 335 -> 376 bytes
 res/drawable-hdpi/view_more_song.png   | Bin 338 -> 395 bytes
 res/drawable-mdpi/view_more_album.png  | Bin 339 -> 464 bytes
 res/drawable-mdpi/view_more_song.png   | Bin 335 -> 459 bytes
 res/drawable-xhdpi/view_more_album.png | Bin 453 -> 470 bytes
 res/drawable-xhdpi/view_more_song.png  | Bin 472 -> 506 bytes
 res/drawable/view_more.xml             |   6 ------
 res/values/styles.xml                  |   2 +-
 8 files changed, 1 insertion(+), 7 deletions(-)
 delete mode 100644 res/drawable/view_more.xml

diff --git a/res/drawable-hdpi/view_more_album.png b/res/drawable-hdpi/view_more_album.png
index 1b5ed67d81cebd819655e5967f5d3dfbd1fb07ac..113f5fee375886bfa9aad8a9f11536b5eef3b58a 100644
GIT binary patch
delta 303
zcmV+~0nq->0{8-uQhx*$02dT#{)Tw~009L_L_t(&-tC$(PQy?TL}w5OprGX@xdaq&
zh)77BgOh}YmSb>*P$TFf8uVzKkRl>>V&cEjO#5YNp0$5xWv?X(xRta}E#29Ea#8ae
z2=S|V71zLgZQ1~mWZRWq{o41LiYovC2tWV=aFou6gvPeEgMV+=`55XGt|_4aoZ=4b
ztHmh?!IV${0+1w566X#iiIc<uXh6XIp%3z3eSDygPhbgL4)Wa)z(;3g1<XbTV2Add
zAE|HPp^v9tU#F)UB_uuDzWK{j>s@FyN{~&UFG<(7Un+H>_s+^Ia8a=fy#bGd+kZm<
zSBK<R{*h%C3MfDT8Ud)bYOtBfsxN!EBPzRY^8;&*W!9Uv4VwS}002ovPDHLkV1khU
BhV=jd

delta 261
zcmV+g0s8*<0?z`FQhx&i4kJ4Zb=K<u007)cL_t(&-tE>gY65W(#o;%ymMN?PDJ7L4
zr1CN;(nwm%*rfLg-oYDKr3zj^@Bpb(M4Pqv*(?MWTx1c}!S}U)Smv=X^CUAfGqcvB
z=@Fpw0V5h`>}CH04&VUy9>C08C0r$Z$Q-}{%-RD6z*FV`BYvO+mcV1i0MGpU0~Wx;
zwLadJAK)D*vUj1Kq)$n!h#+N|t865FM8sFtLpG803iRs_MS|hClBN;yovliglID_L
z&JBM{tMpjgLK|S5=@uNS!S}%IlJ$9O0e*osFw9yf-T+s7vwL&`(3k?u5WU_n00000
LNkvXXu0mjft$TP+

diff --git a/res/drawable-hdpi/view_more_song.png b/res/drawable-hdpi/view_more_song.png
index d3837427c25db1eb246dc0156907d1401eaf40a5..2a06a775b02df666ec44044360d098dc9db0a7e0 100644
GIT binary patch
delta 322
zcmV-I0logx0*eEXQhx*$02@1Qn)ECH009_DL_t(&-tC&P4Z=VSMZZxRI*@4DgaK%2
zU<f26=3o*i7=VrqSOIDzIw&7a5@-M+UC3G3ZSJD~qHp_7u}Kmzm9&<xn3>teoQkg@
z#3SZjR0H!$v;jzxnVF|gU+M11c?3WJ{5wF=L}f@BpQ>Y6D1QKQ%7JhFn<9_GLILp0
z9C+o=Hczr)p#W&J59Dx*3kwB6Byoe$#04iT6aYErKpTy%$X#GE3jvE%mFYQ>z3|QR
z0dNE^IRRAriw}!Nl6I21k}kif>&YwxEG6wr@siYcQ-y%7q>1M~aCOrNUL_MS25w0!
zMiaW<i357Tp*vi1b_ejZcm<r?0+btuIReCQ);Lb50`N9!P@j;!4|`Zi<aXTV4l-g5
U3ni8EGynhq07*qoM6N<$f~Hx9F8}}l

delta 265
zcmV+k0rvij1JVMJQhx&i4kb0cmt1N9007@fL_t(&-tE>gN<%>uh2ej~v$RMhSV}+;
zgj5DAH(_UyF0HM-jV?jRPO<=TA=W9>CKkVqAOsR27SBu0SHI$%naA7<5fKp)J8Qpv
zpxS%L);8uGRKI}~NP&GX5D{4=vPxu-r9cYAK2nd>Va4D_>VK2EQqL*{KU5#oH-C&O
z1n<<D`f5+M<?FTtZ@@Kh51jtj1MW72zXBeCNx4C$9soDMMd@`~y#(e!?=Q_x>vU`F
z85je1z^eMtI#*xT9*56rB|7z1eg7`-QS~-X)P=gN{7VhgX*R-$__Hr{%Kx-gMC=Rz
P0000<MNUMnLIPldM|pKq

diff --git a/res/drawable-mdpi/view_more_album.png b/res/drawable-mdpi/view_more_album.png
index a394a7096f13ebe54d3294c383e5b08c605a51b3..63d3e7fa636a383cc8a3548dd805d6b482ba81ba 100644
GIT binary patch
delta 392
zcmV;30eAk>0?-4HQhx*$03QX*mn?$-00CV|L_t(o!|j(bN&`U@hQB|CfEKBQl<5pc
zQbk#F0>LB1dstd{6Y&Ou;0+{|RSbFpZ3CtVA-{#Qu*I&rn`BoZe>1yphIw!IfA9S>
zvfTzoK#Owm4n(s320Q{+K%*q*bKn{n;4kz_{(5ZpY`YfT8-J9K20)F9u??W|0P5dl
zX#^}nkYh<R+lRnj5kHbfS&nSGpJ9)25^PT{h?M>N$uj(V6ac453W9A|l!Dw7X`D%#
zY|F6BGJFB1Va-s|#P$u)E#RjqsgpMe4-(ID;&p-JDkz8pZI(iTZAnr}6?9h6e@XJM
z{y^HoRgtyl#(%27cH8z@p&YQSHN>z3JlMYdDbnAFQ52VEP7PXy@!t0SDq^$<<1{bz
zfPr)1GH)MvO*Eoeus!E+z6%@yAHapAyId5k>DWE8-O8Bn+jf0}ZGJ2%s!WU|E&r7q
m&nxgf2dMmVs*11YgHM7nF)Oigg`ofd002ovPDHLkU;%<@`?Kf(

delta 266
zcmV+l0rmdS1JeSKQhx&i5iSDpq{QO@007`gL_t(o!|j$a3Iah4MSo-pvC!VmQf#!)
zy@22mEIol|@Ce>QEWL>qx*kNZTK3tjjVP|Lv!gg4rU@AmlDy1FQBhHWWse4+FKHtw
zt2kC_W{XFod*axVG_0!vjnFM<)R>ejYdlGsNXjct;2M!Di+^ED(!fUx%<TNu3mD@^
z`?3_|o~oUF<sNV^a5?x`#s7mA&;h1^3za~-nEWF!`}A_+0l_WMD@#G<p(t}nDX;^&
zbz?|znvxPpvv(M}ii6+R{Yui>%r12e;$3H86oLeRW%0NLL2(j48$Y2N5d90y9F;V%
Q00000NkvXXt^-0~f-wJfV*mgE

diff --git a/res/drawable-mdpi/view_more_song.png b/res/drawable-mdpi/view_more_song.png
index f493d5b423c8298769dd717cf7602a10811ce47d..fba8c497f064be732b361d5bf47fce7a4864e4cb 100644
GIT binary patch
delta 386
zcmV-|0e$|@0?PxCQhx*$03H?3I}N4)00CG@L_t(o!{wK|N&`_4hQA3*3PCL`?Suq`
zK!oV4h}c_cFIb4J;428?t4J!bNKl_ZTfr1T{4CregqXOO>>~cK#o0YO^Uw9133U_b
z0~=I}SD+W_3vdUV0nLh(kAZVw55KWpvGu6is*QBrq<S;~8h_M`zehmrnGa88dEg_b
zv2U|pCIvk>1V#(U?#>fXl)!#OJS+&A%S^(e2Fw?rUIXokz58WX!6FOVz|O>arLHpk
zEX(D2W7vp@NW;?o-<`0erc_!P-KwJ^1d9@A*Aareq}TEY8&3Zm5q%)ayc#*HwA4gh
z%^;_x-ltFN7km4=s>u%@+rR)gP#-hoLnmv;OlBxQ0WJZ7o2(Aa8lGfI`4w=S3d)1X
zn%vVKxJYlSN9p=-A`!Dx)}T-ls;BC^+F9aU&{dsR1zYO+vI+dy2O{FR%EM?}!$CL(
gsC_t%n#c3KFTAtnnNhcnD*ylh07*qoM6N<$g5E{7Qvd(}

delta 261
zcmV+g0s8*S1J44GQhx&i5iT2*&uk+A007)cL_t(o!|j$m3c^4Th2KaDvC!VmM$k@B
za{(cD@D85ATiA-7x3N)k6RY576G1}a4`j0{`(T=B-u%2byHY?vfM-})64*%^*US}3
zTAEo}OqO9RY3iWiPBGE)y@J-0aW%qMrGZh|xN0Cjnb{>+?|%DN032|G*}E>t98LWC
zb$6i3?`KC`KWIT90v15e2YCV<a|L&sBpv{J2R4kKiV)~a+DJ+ywH@@9y|Q5<DbC5s
zqq*nU%(jw-lGgc|wwjBGKGDGhNbk$@Wx)=x@>ak@A@lHY_*>in&OZf!iVsMn00000
LNkvXXu0mjfb!&L}

diff --git a/res/drawable-xhdpi/view_more_album.png b/res/drawable-xhdpi/view_more_album.png
index b002e2d827f97ab37aaf893b41e465eb9bc6ce4e..654954b7813205a5d98f04e5b2f07b41f589a85d 100644
GIT binary patch
delta 398
zcmX@ge2sZRP(6z%gNj)3?50!(2F7Gh7srr_TW@FE`W<!<XuTgHDD;R&P-w0`gQ@CV
zf5+KEMNAoj;SW?oLNsJeRav*L{t%epR3P|t`-gMYYxhojCVl?gnJje`PK#+K6HAuM
z%<`)0=rFT-d|zd**7SR-S3{rw%sIAtbEVS1Y&MgnQ9LGdd%5esGMX&iy|;No0K*@<
zo{keA-s|6v(cH;%fB}INR=e%Ka<TSnb!X^%Ij`B@jQJRu4H%dU#4N7pS+@wQwKp(I
zfY9XyvlSt13+^3~MI1mu9;XA!1zXnl|GhgyijSco{6S9oY<3=o2f{l}0ZHy1?Dea1
zujSYHu4~EL@FKhDK;<`+A3QPXYyy+6`AuBR#2DjpBqulOrujjkOAlmrFec6Z>dgLu
zF(ys7C9a|HTF?(pi<|Bol?jKQGqNQxux;34xkO@ibZF>O={Y<P!YbRA{hn1-VWkx1
lxwX#i)a8n}AX&k;=5mi;)NHAJ%f|o&p6srEF6*2UngA@}qsagO

delta 380
zcmV-?0fYY51H}W7Qhx&i5i}PpRNB)300B}-L_t(|+U?mrN&{gOh2i%O5kd+<w6hdk
zKq^}sD>oqSLhLLAu@+o_rG;Rr7ItP07J{8Z@P`yODkOR=j1Yt3fQZc8^RyEJ_susj
zcLHW+W@ct)Rv(h0%;%!ym#Jz2BBIo6MfQ{801n^)4&VR|V1H(2mXg<DKL|O112}*K
zIDi9K-IV=fB>hlDg@&I1rX;P_^4BdBKvG-pZY3>ejIf~34u?^if4vP(0!`q*w!&AS
z0knaWv1^aOI<OBsMMOXAI(!MNMZ{6&_W=Xo7}x_k5%G{Mz=u0v7dRW9j9x^%WC}2P
zTWkWS5z)&S0Ck`XtVBd7>n?BroPT$*QRBgHfW?To$hZw|1G7I3U&j-04J?%zysD4F
zElC4?ZAVg_Z)uP;BdI?&cvsR~mSt#K((}mhTaxm;)f(OcSCZ}}&1YPP3rQQ2T9}!c
a{n{I0?BZSX%g-qQ0000<MNUMnLSTZ$Poil6

diff --git a/res/drawable-xhdpi/view_more_song.png b/res/drawable-xhdpi/view_more_song.png
index f3f00ac90b30ddce7370c5e625bbe01912c45652..0cae9e8b875e56791d2286c64f21ada1120db596 100644
GIT binary patch
delta 434
zcmV;j0Zsnc1NsAyQhx*$04N1pkc_tg00D<dL_t(|+U=V?P6AOBh0jF_iHTdVg@V1X
z0WE21Wd+t&#2pxyVr6Wo-2=&#pM?Vv5_MGG0CUf2hneAi@7=%2yCF%yK+;UoopNX{
z={_Q=sEuDrx>7E^NgDO)mCt6pYMW<bTQ9(*s}=*3+QyA`0e?)ozU(!GjRIhOF(M+v
z-v4ZKPswEf24DaNkXrq=(@q=uO**#=7=Qsd2p&ZH>O1}$VC@11U;qZ-EKni>pUT%I
zyMO^0fP>&smbl&l24DaNU;qYif@yFceS~*_0T_S*bSelQbAR9+kg4<A+YSKEfko*$
zVOPap)bRIXV1HS<kSPh^%Y%{)Zkz&D(G_VKK)>M)7m^l|u8*;tEgA%Yv7{$S!*qoZ
zFqQP&RpXmvfwQjH0Y4s=28Oi@j1T^2OB||b5@mq_@X$(LZs}XZU(?_Xuu2PH?GnIi
zS^)I}E`i4`0Pw^}_IB6+3}D+gQjE=g*LJ2GoDASrc`JsdcQyC$bVO8=M*0{jPqXrp
cMiEiH13<CrfY7!GdH?_b07*qoM6N<$g7&q&eE<Le

delta 400
zcmV;B0dM~L1K0zQQhx&i5i}|7HOF`W00Cu5L_t(|+U=OJN?bu0M$fD(=r$@FR1#8&
zlG-ZOrbrpzU`rn$50EM$W$-m5;1k&R5*F4LfnaAPWZ|U92G(VD<E{|yo$u6_3*VV<
z?wx-igb+dqA%qaZY}C@$Y~=|OY+Sff=H~0v-tGv9fCz|y2!Dux5JCu{N-_@TAQS-+
z5CIVo0TB@99D+(Lv{Y8-IfJW1U`t)CZPky|pZ?*n3IXccIP97CdE2BM-35ZL0_(sK
z_y+W*9@$cNfYE>a%M{?QlyduQ<M3qNffHcA4dZb4A46{d1K=3=ut;+nw*}M{pg&&e
zcfdzryKUdH$A4CG6L=4NZbIFc`B*&EfB|p{yliZ^C9lLTf$weqozFF-z5y<P-P#)P
z_a#@rE8uID4Vck}bKrGb8nDO_xT~Hxn~~b9WdPb!e@qGZrM{?X3hby~CIsB6{TeSp
u4%8d<x|%I8Lqbpeq~@M6gb+eQ_zeNZ(^<1mW32!H00{s|MNUMnLSTa5%DB=1

diff --git a/res/drawable/view_more.xml b/res/drawable/view_more.xml
deleted file mode 100644
index 34f0f8e..0000000
--- a/res/drawable/view_more.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="@color/transparent_black" />
-    <stroke android:width="1dp" android:color="@color/transparent_black" />
-    <corners android:radius="4dp" />
-</shape>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index a790f8f..2504ffc 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -585,7 +585,7 @@
     </style>    
     <style name="HalfTextViewMore_Light" parent="HalfTextViewMoreLayout">
         <item name="android:src">@drawable/view_more_album</item>
-        <item name="android:background">@drawable/view_more</item>
+        <item name="android:background">@color/transparent</item>
     </style>
     
     <!-- Library Browser Styles -->