Merge branch 'RecyclerView' into SlideUpPanel2

14 files changed, 59 insertions, 39 deletions

diff --git a/app/src/main/res/layout/abstract_recycler_fragment.xml b/app/src/main/res/layout/abstract_recycler_fragment.xml
new file mode 100644
index 00000000..4c7dd6b8
--- /dev/null
+++ b/app/src/main/res/layout/abstract_recycler_fragment.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/refresh_layout"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent">
+
+	<LinearLayout
+		android:id="@+id/fragment_list_layout"
+		android:layout_width="fill_parent"
+		android:layout_height="fill_parent"
+		android:orientation="vertical" >
+
+		<View
+			android:layout_width="fill_parent"
+			android:layout_height="1px"
+			android:background="@color/dividerColor"/>
+
+		<android.support.v7.widget.RecyclerView
+			android:id="@+id/fragment_recycler"
+			android:layout_width="fill_parent"
+			android:layout_height="0dip"
+			android:layout_weight="1.0"
+			android:scrollbars="vertical"/>
+
+		<include layout="@layout/tab_progress" />
+	</LinearLayout>
+</android.support.v4.widget.SwipeRefreshLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/album_cell_item.xml b/app/src/main/res/layout/album_cell_item.xml
index 3f708e63..fe634c13 100644
--- a/app/src/main/res/layout/album_cell_item.xml
+++ b/app/src/main/res/layout/album_cell_item.xml
@@ -2,7 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent"
+	android:background="?attr/selectableItemBackground">
 
 	<RelativeLayout
 		android:layout_width="match_parent"
@@ -77,7 +78,7 @@
 		</LinearLayout>
 
 		<ImageView
-			android:id="@+id/album_more"
+			android:id="@+id/more_button"
 			android:src="?attr/download_none"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/album_list_item.xml b/app/src/main/res/layout/album_list_item.xml
index 0ee92edd..67c052eb 100644
--- a/app/src/main/res/layout/album_list_item.xml
+++ b/app/src/main/res/layout/album_list_item.xml
@@ -65,7 +65,7 @@
 		android:visibility="gone"/>
 
 	<ImageView
-		android:id="@+id/album_more"
+		android:id="@+id/more_button"
 		android:src="?attr/download_none"
 		android:layout_width="wrap_content"
 		android:layout_height="fill_parent"
diff --git a/app/src/main/res/layout/basic_header.xml b/app/src/main/res/layout/basic_header.xml
new file mode 100644
index 00000000..b5ae900a
--- /dev/null
+++ b/app/src/main/res/layout/basic_header.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/item_name"
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content"
+	android:textAppearance="?android:attr/textAppearanceMedium"
+	android:background="@android:color/transparent"
+	android:textColor="@color/cyan"
+	android:textStyle="bold"
+	android:paddingLeft="6dp"
+	android:paddingRight="6dp"
+	android:paddingTop="8dp"
+	android:paddingBottom="8dp"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/basic_list_item.xml b/app/src/main/res/layout/basic_list_item.xml
index 2338f7e0..88d8ca20 100644
--- a/app/src/main/res/layout/basic_list_item.xml
+++ b/app/src/main/res/layout/basic_list_item.xml
@@ -3,7 +3,7 @@
 	android:orientation="horizontal"
 	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
-	android:background="@android:color/transparent">
+			  android:background="?attr/selectableItemBackground">
 
 	<TextView
 		android:id="@+id/item_name"
diff --git a/app/src/main/res/layout/genre_list_item.xml b/app/src/main/res/layout/genre_list_item.xml
index 6affa24c..a6a34c52 100644
--- a/app/src/main/res/layout/genre_list_item.xml
+++ b/app/src/main/res/layout/genre_list_item.xml
@@ -3,7 +3,7 @@
 	android:orientation="horizontal"
 	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
-	android:background="@android:color/transparent">
+	android:background="?attr/selectableItemBackground">
 
 	<TextView
 		android:id="@+id/genre_name"
diff --git a/app/src/main/res/layout/grid_view.xml b/app/src/main/res/layout/grid_view.xml
deleted file mode 100644
index 599cf92c..00000000
--- a/app/src/main/res/layout/grid_view.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<github.daneren2005.dsub.view.HeaderGridView xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/gridview"
-	android:layout_width="fill_parent"
-	android:layout_height="0dip"
-	android:layout_weight="1.0"
-	android:numColumns="@integer/Grid.Columns"
-	android:horizontalSpacing="10dp"
-	android:verticalSpacing="10dp"
-	android:gravity="center"
-	android:stretchMode="columnWidth"
-	android:padding="24px"
-	android:fastScrollEnabled="true"
-	android:scrollbarStyle="outsideOverlay"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/select_album.xml b/app/src/main/res/layout/select_album.xml
index bbdf0e54..cacbc560 100644
--- a/app/src/main/res/layout/select_album.xml
+++ b/app/src/main/res/layout/select_album.xml
@@ -17,12 +17,11 @@
 
 		<include layout="@layout/tab_progress"/>
 
-		<ListView
+		<android.support.v7.widget.RecyclerView
 			android:id="@+id/select_album_entries"
-			android:textFilterEnabled="true"
 			android:layout_width="fill_parent"
 			android:layout_height="0dip"
 			android:layout_weight="1.0"
-			android:fastScrollEnabled="true"/>
+			android:scrollbars="vertical"/>
 	</LinearLayout>
 </android.support.v4.widget.SwipeRefreshLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/select_artist_header.xml b/app/src/main/res/layout/select_artist_header.xml
index 2821ce43..0ac9e6a6 100644
--- a/app/src/main/res/layout/select_artist_header.xml
+++ b/app/src/main/res/layout/select_artist_header.xml
@@ -2,7 +2,9 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:orientation="vertical"
 	android:layout_width="fill_parent"
-	android:layout_height="wrap_content">
+	android:layout_height="wrap_content"
+	android:background="?attr/selectableItemBackground">
+
 	<LinearLayout
 			android:id="@+id/select_artist_folder"
 			android:orientation="horizontal"
diff --git a/app/src/main/res/layout/song_list_item.xml b/app/src/main/res/layout/song_list_item.xml
index 86f77869..9be27192 100644
--- a/app/src/main/res/layout/song_list_item.xml
+++ b/app/src/main/res/layout/song_list_item.xml
@@ -3,7 +3,8 @@
 		android:id="@id/drag_handle"
 		android:orientation="horizontal"
 		android:layout_width="fill_parent"
-		android:layout_height="?android:attr/listPreferredItemHeight">
+		android:layout_height="?android:attr/listPreferredItemHeight"
+		android:background="?attr/selectableItemBackground">
 
     <CheckedTextView
             android:id="@+id/song_check"
@@ -117,7 +118,7 @@
     </LinearLayout>
 	
 	<ImageView
-		android:id="@+id/artist_more"
+		android:id="@+id/more_button"
 		android:src="?attr/download_none"
 		android:layout_width="wrap_content"
 		android:layout_height="fill_parent"
diff --git a/app/src/main/res/layout/unscrollable_grid_view.xml b/app/src/main/res/layout/unscrollable_grid_view.xml
deleted file mode 100644
index 96bea5ce..00000000
--- a/app/src/main/res/layout/unscrollable_grid_view.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<github.daneren2005.dsub.view.UnscrollableGridView xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/gridview"
-	android:layout_width="fill_parent"
-	android:layout_height="wrap_content"
-	android:numColumns="@integer/Grid.Columns"
-	android:horizontalSpacing="10dp"
-	android:verticalSpacing="10dp"
-	android:gravity="center"
-	android:padding="20px"
-	android:stretchMode="columnWidth"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/user_list_item.xml b/app/src/main/res/layout/user_list_item.xml
index dc2bdab9..aa2d13c9 100644
--- a/app/src/main/res/layout/user_list_item.xml
+++ b/app/src/main/res/layout/user_list_item.xml
@@ -3,7 +3,7 @@
 			  android:orientation="horizontal"
 			  android:layout_width="fill_parent"
 			  android:layout_height="wrap_content"
-			  android:background="@android:color/transparent">
+			  android:background="?attr/selectableItemBackground">
 
 	<github.daneren2005.dsub.view.RecyclingImageView
 		android:id="@+id/item_avatar"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e6e19b4c..bb0a997b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -236,7 +236,9 @@
 	<string name="starring_content_starred">Starred \"%s\"</string>
 	<string name="starring_content_unstarred">Unstarred \"%s\"</string>
     <string name="starring_content_error">Failed to update \"%s\", please try later.</string>
-	
+
+	<string name="playlist.mine">My Playlists</string>
+	<string name="playlist.shared">Shared Playlists</string>
 	<string name="playlist_error">Failed to grab list of playlists</string>
 	<string name="updated_playlist">Added %1$s songs to \"%2$s\"</string>
     <string name="updated_playlist_error">Failed to update \"%s\", please try later.</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 061cfae7..c4a53b99 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<style name="BasicButton">
-		<item name="android:background">@drawable/abc_item_background_holo_light</item>
+		<item name="android:background">?attr/selectableItemBackground</item>
 	</style>
 
 	<style name="MoreButton" parent="BasicButton">