From 36ecfb678ee1c43651e6dfed522ebeedbc73ab44 Mon Sep 17 00:00:00 2001
From: Muntashir Al-Islam <muntashirakon@riseup.net>
Date: Wed, 25 May 2022 17:14:48 +0600
Subject: [PATCH] Display song images in album/artist details page

Signed-off-by: Muntashir Al-Islam <muntashirakon@riseup.net>
---
 .../music/adapter/song/SimpleSongAdapter.kt   |  1 -
 app/src/main/res/layout/item_song.xml         | 44 +++++++++++--------
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/io/github/muntashirakon/music/adapter/song/SimpleSongAdapter.kt b/app/src/main/java/io/github/muntashirakon/music/adapter/song/SimpleSongAdapter.kt
index 292709a68..e5ba83799 100755
--- a/app/src/main/java/io/github/muntashirakon/music/adapter/song/SimpleSongAdapter.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/adapter/song/SimpleSongAdapter.kt
@@ -44,7 +44,6 @@ class SimpleSongAdapter(
         val trackAndTime = (if (fixedTrackNumber > 0) "$fixedTrackNumber | " else "") +
                 MusicUtil.getReadableDurationString(dataSet[position].duration)
 
-        holder.imageText?.visibility = View.GONE
         holder.time?.text = trackAndTime
         holder.text2?.text = dataSet[position].artistName
     }
diff --git a/app/src/main/res/layout/item_song.xml b/app/src/main/res/layout/item_song.xml
index 9c297186f..ef505a362 100755
--- a/app/src/main/res/layout/item_song.xml
+++ b/app/src/main/res/layout/item_song.xml
@@ -4,44 +4,46 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="@dimen/item_song_height"
-    android:layout_marginStart="2dp"
-    android:layout_marginEnd="2dp"
+    android:layout_marginVertical="2dp"
+    android:layout_marginHorizontal="2dp"
     android:background="?rectSelector"
     android:clickable="true"
     android:focusable="true"
     android:orientation="horizontal">
 
-    <FrameLayout
+    <com.google.android.material.card.MaterialCardView
         android:id="@+id/imageContainer"
         android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_weight="0"
-        android:paddingStart="8dp"
-        android:paddingEnd="8dp"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="8dp"
+        android:scaleType="centerCrop"
+        app:cardCornerRadius="10dp"
+        app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/imageText"
-            android:layout_width="40dp"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:maxLines="1"
-            android:minHeight="40dp"
-            android:textAppearance="@style/TextViewNormal"
-            android:textColor="?android:attr/textColorSecondary"
-            tools:text="@tools:sample/us_zipcodes" />
-    </FrameLayout>
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/image"
+            android:layout_width="45dp"
+            android:layout_height="45dp"
+            android:layout_gravity="center_vertical"
+            android:gravity="center_vertical"
+            android:scaleType="centerCrop"
+            tools:ignore="ContentDescription"
+            tools:srcCompat="@tools:sample/backgrounds/scenic" />
+
+    </com.google.android.material.card.MaterialCardView>
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
+        android:layout_marginTop="12dp"
+        android:layout_marginHorizontal="8dp"
         android:singleLine="true"
         android:ellipsize="marquee"
-        android:paddingTop="8dp"
         android:textAppearance="@style/TextViewBody2"
         app:layout_constraintEnd_toStartOf="@+id/menu"
         app:layout_constraintStart_toEndOf="@+id/imageContainer"
@@ -53,6 +55,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_weight="0"
+        android:layout_marginTop="4dp"
+        android:layout_marginHorizontal="8dp"
         android:maxLines="1"
         android:textAppearance="@style/TextViewCaption"
         app:layout_constraintStart_toEndOf="@id/imageContainer"
@@ -64,6 +68,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_weight="0"
+        android:layout_marginTop="4dp"
+        android:layout_marginHorizontal="8dp"
         android:maxLines="1"
         android:textAppearance="@style/TextViewCaption"
         app:layout_constraintEnd_toStartOf="@id/menu"