From 7e755611b069cbf57864db5925ab055e1bb08329 Mon Sep 17 00:00:00 2001
From: Prathamesh More <prathameshmm02@gmail.com>
Date: Mon, 20 Sep 2021 16:09:57 +0530
Subject: [PATCH] Fixed queue reordering

---
 .../fragments/playlists/PlaylistDetailsFragment.kt  |  2 +-
 app/src/main/res/drawable/ic_drag_handle.xml        | 10 ++++++++++
 app/src/main/res/layout/item_queue.xml              | 13 +++++--------
 3 files changed, 16 insertions(+), 9 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_drag_handle.xml

diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt
index 8edc235f..835785f0 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt
@@ -82,7 +82,7 @@ class PlaylistDetailsFragment : AbsMainActivityFragment(R.layout.fragment_playli
             playlist.playlistEntity,
             requireActivity(),
             ArrayList(),
-            R.layout.item_list,
+            R.layout.item_queue,
             this
         )
 
diff --git a/app/src/main/res/drawable/ic_drag_handle.xml b/app/src/main/res/drawable/ic_drag_handle.xml
new file mode 100644
index 00000000..88fe5b40
--- /dev/null
+++ b/app/src/main/res/drawable/ic_drag_handle.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M20,9H4v2h16V9zM4,15h16v-2H4V15z"/>
+</vector>
diff --git a/app/src/main/res/layout/item_queue.xml b/app/src/main/res/layout/item_queue.xml
index 1c401f9d..305cb28a 100644
--- a/app/src/main/res/layout/item_queue.xml
+++ b/app/src/main/res/layout/item_queue.xml
@@ -4,22 +4,19 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?rectSelector"
     android:clickable="true"
-    android:focusable="true">
-
+    android:focusable="true"
+    android:transitionGroup="true">
     <FrameLayout
         android:id="@+id/dummy_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="1dp"
             android:layout_marginEnd="1dp"
             android:layout_marginBottom="1dp"
-            android:background="?rectSelector"
             android:minHeight="?attr/listPreferredItemHeight"
             android:orientation="horizontal"
             tools:ignore="MissingPrefix">
@@ -27,15 +24,16 @@
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/drag_view"
                 android:layout_width="wrap_content"
-                android:layout_height="match_parent"
+                android:layout_height="0dp"
                 android:layout_gravity="center_vertical|start"
                 android:visibility="gone"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/ic_drag_vertical"
+                app:srcCompat="@drawable/ic_drag_handle"
                 app:tint="?attr/colorControlNormal"
                 tools:ignore="ContentDescription"
+                android:paddingHorizontal="8dp"
                 tools:visibility="visible" />
 
 
@@ -44,7 +42,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:layout_marginStart="16dp"
                 app:cardCornerRadius="6dp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toEndOf="@id/drag_view"