Queue: Replace DSVL with RecyclerView

2 files changed, 15 insertions, 41 deletions

diff --git a/app/src/main/res/layout/queue_fragment.xml b/app/src/main/res/layout/queue_fragment.xml
index 339369971..ba2cdd110 100644
--- a/app/src/main/res/layout/queue_fragment.xml
+++ b/app/src/main/res/layout/queue_fragment.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:dslv="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -21,26 +20,12 @@
         android:layout_below="@id/info_bar"
         android:background="?android:attr/listDivider"/>
 
-    <com.mobeta.android.dslv.DragSortListView
-        android:id="@android:id/list"
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/recyclerView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:clipToPadding="false"
-        android:scrollbarStyle="outsideOverlay"
-        android:layout_below="@+id/divider"
-        dslv:collapsed_height="2dp"
-        dslv:drag_enabled="true"
-        dslv:drag_handle_id="@id/drag_handle"
-        dslv:drag_scroll_start="0.33"
-        dslv:float_alpha="0.6"
-        dslv:float_background_color="?attr/dragview_float_background"
-        dslv:max_drag_scroll_speed="0.5"
-        dslv:remove_enabled="true"
-        dslv:remove_mode="flingRemove"
-        dslv:slide_shuffle_speed="0.3"
-        dslv:sort_enabled="true"
-        dslv:track_drag_sort="true"
-        dslv:use_default_controller="true" />
+        android:layout_below="@id/divider"
+        android:scrollbars="vertical"/>
 
     <TextView
         android:id="@id/android:empty"
@@ -58,19 +43,4 @@
         android:indeterminateOnly="true"
         android:visibility="gone" />
 
-    <LinearLayout
-        android:id="@+id/undobar"
-        android:layout_alignParentBottom="true"
-        style="@style/UndoBar">
-
-        <TextView
-            android:id="@+id/undobar_message"
-            style="@style/UndoBarMessage"/>
-
-        <Button
-            android:id="@+id/undobar_button"
-            style="@style/UndoBarButton"/>
-
-    </LinearLayout>
-
 </RelativeLayout>
diff --git a/app/src/main/res/layout/queue_listitem.xml b/app/src/main/res/layout/queue_listitem.xml
index 38076ff51..8572f5e05 100644
--- a/app/src/main/res/layout/queue_listitem.xml
+++ b/app/src/main/res/layout/queue_listitem.xml
@@ -6,24 +6,28 @@
     android:layout_width="match_parent"
     android:layout_height="@dimen/listitem_threeline_height"
     android:orientation="horizontal"
-    android:paddingLeft="16dp"
+    android:paddingLeft="8dp"
+    android:gravity="center_vertical"
+    android:background="?attr/selectableItemBackground"
     tools:background="@android:color/darker_gray" >
 
     <ImageView
         android:id="@+id/drag_handle"
-        android:layout_width="100dp"
-        android:layout_height="match_parent"
-        android:layout_marginLeft="-8dp"
-        android:layout_marginRight="-64dp"
+        android:layout_width="wrap_content"
+        android:layout_height="48dp"
+        android:layout_marginLeft="-16dp"
+        android:layout_marginRight="-20dp"
+        android:gravity="center"
         android:contentDescription="@string/drag_handle_content_description"
         android:scaleType="fitXY"
         android:src="?attr/dragview_background"
-        tools:src="@drawable/ic_drag_handle"
+        tools:src="@drawable/ic_drag_vertical_grey600_48dp"
         tools:background="@android:color/holo_green_dark" />
 
     <RelativeLayout
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp">
         <TextView
             android:id="@+id/txtvPlaceholder"
             android:layout_width="@dimen/thumbnail_length_queue_item"