From 632c1cd2c08ad21dfab32bb32fc2c4cc85003ce2 Mon Sep 17 00:00:00 2001
From: antonio <antoniocappiello.play@gmail.com>
Date: Tue, 14 Mar 2023 12:06:19 +0100
Subject: [PATCH] Queued songs that have already been played now have different
 graphics

---
 .../ui/adapter/PlayerSongQueueAdapter.java    | 29 ++++++++++++++-----
 .../res/layout/item_player_queue_song.xml     | 16 ++--------
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/com/cappielloantonio/play/ui/adapter/PlayerSongQueueAdapter.java b/app/src/main/java/com/cappielloantonio/play/ui/adapter/PlayerSongQueueAdapter.java
index d65a7123..f467f6fb 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/adapter/PlayerSongQueueAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/adapter/PlayerSongQueueAdapter.java
@@ -2,7 +2,6 @@ package com.cappielloantonio.play.ui.adapter;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
-import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
@@ -59,15 +58,13 @@ public class PlayerSongQueueAdapter extends RecyclerView.Adapter<PlayerSongQueue
                 .into(holder.item.queueSongCoverImageView);
 
         MediaManager.getCurrentIndex(mediaBrowserListenableFuture, index -> {
-            holder.item.queueSongPlayImageView.setVisibility(position == index ? View.VISIBLE : View.INVISIBLE);
+            if (position < index) {
+                holder.item.queueSongTitleTextView.setAlpha(0.2f);
+                holder.item.queueSongSubtitleTextView.setAlpha(0.2f);
+            }
         });
     }
 
-    @Override
-    public int getItemCount() {
-        return songs.size();
-    }
-
     public List<Child> getItems() {
         return this.songs;
     }
@@ -77,6 +74,24 @@ public class PlayerSongQueueAdapter extends RecyclerView.Adapter<PlayerSongQueue
         notifyDataSetChanged();
     }
 
+    @Override
+    public int getItemCount() {
+        if (songs == null) {
+            return 0;
+        }
+        return songs.size();
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        return position;
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
     public void setMediaBrowserListenableFuture(ListenableFuture<MediaBrowser> mediaBrowserListenableFuture) {
         this.mediaBrowserListenableFuture = mediaBrowserListenableFuture;
     }
diff --git a/app/src/main/res/layout/item_player_queue_song.xml b/app/src/main/res/layout/item_player_queue_song.xml
index d7903c67..c0b4b20f 100644
--- a/app/src/main/res/layout/item_player_queue_song.xml
+++ b/app/src/main/res/layout/item_player_queue_song.xml
@@ -6,21 +6,9 @@
     android:foreground="?attr/selectableItemBackground"
     android:orientation="horizontal"
     android:paddingTop="3dp"
-    android:paddingEnd="24dp"
+    android:paddingHorizontal="24dp"
     android:paddingBottom="3dp">
 
-    <ImageView
-        android:id="@+id/queue_song_play_image_view"
-        android:layout_width="16dp"
-        android:layout_height="16dp"
-        android:layout_gravity="center"
-        android:layout_margin="4dp"
-        android:src="@drawable/ic_play"
-        android:visibility="invisible"
-        app:layout_constraintBottom_toBottomOf="@+id/queue_song_cover_image_view"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/queue_song_cover_image_view" />
-
     <ImageView
         android:id="@+id/queue_song_cover_image_view"
         android:layout_width="52dp"
@@ -28,7 +16,7 @@
         android:layout_gravity="center"
         android:layout_margin="2dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/queue_song_play_image_view"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView