From 9295c10dcdcc6e670c6b428d867bdee3261232de Mon Sep 17 00:00:00 2001
From: CappielloAntonio <antoniocappiello.play@gmail.com>
Date: Mon, 2 Aug 2021 15:37:29 +0200
Subject: [PATCH] Fixed display of long texts in adapters

---
 .idea/misc.xml                                |  3 ++
 .../play/adapter/PlayerSongQueueAdapter.java  |  4 --
 .../play/ui/fragment/ArtistPageFragment.java  |  2 +-
 .../ui/notification/PlayingNotification.java  |  6 +--
 .../main/res/layout/item_horizontal_album.xml |  5 +-
 .../res/layout/item_horizontal_artist.xml     |  5 +-
 .../main/res/layout/item_horizontal_track.xml | 11 +++--
 .../res/layout/item_player_queue_song.xml     | 46 ++++++-------------
 8 files changed, 35 insertions(+), 47 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index eb4be65d..ae0c8d86 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,6 +4,9 @@
     <option name="filePathToZoomLevelMap">
       <map>
         <entry key="app/src/main/res/layout/fragment_artist_page.xml" value="0.3229166666666667" />
+        <entry key="app/src/main/res/layout/item_horizontal_album.xml" value="0.3166496424923391" />
+        <entry key="app/src/main/res/layout/item_horizontal_track.xml" value="0.1" />
+        <entry key="app/src/main/res/layout/item_player_queue_song.xml" value="0.3229166666666667" />
       </map>
     </option>
   </component>
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/PlayerSongQueueAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/PlayerSongQueueAdapter.java
index ff2d8ccf..2bcb4ede 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/PlayerSongQueueAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/PlayerSongQueueAdapter.java
@@ -50,7 +50,6 @@ public class PlayerSongQueueAdapter extends RecyclerView.Adapter<PlayerSongQueue
 
         holder.songTitle.setText(MusicUtil.getReadableInfo(song.getTitle()));
         holder.songArtist.setText(MusicUtil.getReadableInfo(song.getArtistName()));
-        holder.songDuration.setText(MusicUtil.getReadableDurationString(song.getDuration(), false));
 
         CustomGlideRequest.Builder
                 .from(context, song.getPrimary(), song.getBlurHash(), CustomGlideRequest.SONG_PIC)
@@ -60,7 +59,6 @@ public class PlayerSongQueueAdapter extends RecyclerView.Adapter<PlayerSongQueue
         if (position < MusicPlayerRemote.getPosition()) {
             holder.songTitle.setTextColor(context.getResources().getColor(R.color.songToPlayTextColor, null));
             holder.songArtist.setTextColor(context.getResources().getColor(R.color.songToPlayTextColor, null));
-            holder.songDuration.setTextColor(context.getResources().getColor(R.color.songToPlayTextColor, null));
         }
     }
 
@@ -85,7 +83,6 @@ public class PlayerSongQueueAdapter extends RecyclerView.Adapter<PlayerSongQueue
     public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
         TextView songTitle;
         TextView songArtist;
-        TextView songDuration;
         ImageView cover;
 
         ViewHolder(View itemView) {
@@ -93,7 +90,6 @@ public class PlayerSongQueueAdapter extends RecyclerView.Adapter<PlayerSongQueue
 
             songTitle = itemView.findViewById(R.id.queue_song_title_text_view);
             songArtist = itemView.findViewById(R.id.queue_song_artist_text_view);
-            songDuration = itemView.findViewById(R.id.queue_song_duration_text_view);
             cover = itemView.findViewById(R.id.queue_song_cover_image_view);
 
             itemView.setOnClickListener(this);
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistPageFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistPageFragment.java
index fe71cc7f..513fd073 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistPageFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistPageFragment.java
@@ -115,7 +115,7 @@ public class ArtistPageFragment extends Fragment {
 
     private void initBackdrop() {
         CustomGlideRequest.Builder
-                .from(requireContext(), artistPageViewModel.getArtist().getPrimary(), artistPageViewModel.getArtist().getPrimary(), CustomGlideRequest.ARTIST_PIC)
+                .from(requireContext(), artistPageViewModel.getArtist().getId(), artistPageViewModel.getArtist().getPrimary(), CustomGlideRequest.ARTIST_PIC)
                 .build()
                 .into(bind.artistBackdropImageView);
     }
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/notification/PlayingNotification.java b/app/src/main/java/com/cappielloantonio/play/ui/notification/PlayingNotification.java
index a8720c0f..2bdb0ec1 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/notification/PlayingNotification.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/notification/PlayingNotification.java
@@ -57,12 +57,12 @@ public class PlayingNotification {
 
         Intent action = new Intent(service, MainActivity.class);
         action.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        final PendingIntent clickIntent = PendingIntent.getActivity(service, 0, action, 0);
+        final PendingIntent clickIntent = PendingIntent.getActivity(service, 0, action, PendingIntent.FLAG_IMMUTABLE);
 
         final ComponentName serviceName = new ComponentName(service, MusicService.class);
         Intent intent = new Intent(MusicService.ACTION_QUIT);
         intent.setComponent(serviceName);
-        final PendingIntent deleteIntent = PendingIntent.getService(service, 0, intent, 0);
+        final PendingIntent deleteIntent = PendingIntent.getService(service, 0, intent, PendingIntent.FLAG_IMMUTABLE);
 
         final int bigNotificationImageSize = service.getResources().getDimensionPixelSize(R.dimen.notification_big_image_size);
         service.runOnUiThread(() -> CustomGlideRequest.Builder
@@ -130,7 +130,7 @@ public class PlayingNotification {
         Intent intent = new Intent(action);
         intent.setComponent(serviceName);
         intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
-        return PendingIntent.getService(service, 0, intent, 0);
+        return PendingIntent.getService(service, 0, intent, PendingIntent.FLAG_IMMUTABLE);
     }
 
     void updateNotifyModeAndPostNotification(Notification notification) {
diff --git a/app/src/main/res/layout/item_horizontal_album.xml b/app/src/main/res/layout/item_horizontal_album.xml
index 9275ab0a..9abcafa4 100644
--- a/app/src/main/res/layout/item_horizontal_album.xml
+++ b/app/src/main/res/layout/item_horizontal_album.xml
@@ -28,11 +28,11 @@
         android:focusable="true"
         android:focusableInTouchMode="true"
         android:marqueeRepeatLimit="marquee_forever"
+        android:maxLines="1"
         android:paddingStart="12dp"
         android:paddingTop="10dp"
         android:paddingEnd="12dp"
         android:scrollHorizontally="true"
-        android:singleLine="true"
         android:text="@string/label_placeholder"
         app:layout_constraintEnd_toStartOf="@+id/album_more_button"
         app:layout_constraintStart_toEndOf="@+id/album_cover_image_view"
@@ -48,12 +48,13 @@
         android:focusable="true"
         android:focusableInTouchMode="true"
         android:marqueeRepeatLimit="marquee_forever"
+        android:maxLines="1"
         android:paddingStart="12dp"
         android:paddingEnd="16dp"
         android:text="@string/label_placeholder"
         app:layout_constraintEnd_toStartOf="@+id/album_more_button"
         app:layout_constraintStart_toEndOf="@+id/album_cover_image_view"
-        app:layout_constraintTop_toBottomOf="@+id/album_title_text_view"/>
+        app:layout_constraintTop_toBottomOf="@+id/album_title_text_view" />
 
     <ImageView
         android:id="@+id/album_more_button"
diff --git a/app/src/main/res/layout/item_horizontal_artist.xml b/app/src/main/res/layout/item_horizontal_artist.xml
index 6f827a56..530abd9e 100644
--- a/app/src/main/res/layout/item_horizontal_artist.xml
+++ b/app/src/main/res/layout/item_horizontal_artist.xml
@@ -28,11 +28,11 @@
         android:focusable="true"
         android:focusableInTouchMode="true"
         android:marqueeRepeatLimit="marquee_forever"
+        android:maxLines="1"
         android:paddingStart="12dp"
         android:paddingTop="10dp"
         android:paddingEnd="12dp"
         android:scrollHorizontally="true"
-        android:singleLine="true"
         android:text="@string/label_placeholder"
         app:layout_constraintEnd_toStartOf="@+id/artist_more_button"
         app:layout_constraintStart_toEndOf="@+id/artist_cover_image_view"
@@ -48,12 +48,13 @@
         android:focusable="true"
         android:focusableInTouchMode="true"
         android:marqueeRepeatLimit="marquee_forever"
+        android:maxLines="1"
         android:paddingStart="12dp"
         android:paddingEnd="16dp"
         android:text="@string/label_placeholder"
         app:layout_constraintEnd_toStartOf="@+id/artist_more_button"
         app:layout_constraintStart_toEndOf="@+id/artist_cover_image_view"
-        app:layout_constraintTop_toBottomOf="@+id/artist_name_text_view"/>
+        app:layout_constraintTop_toBottomOf="@+id/artist_name_text_view" />
 
     <ImageView
         android:id="@+id/artist_more_button"
diff --git a/app/src/main/res/layout/item_horizontal_track.xml b/app/src/main/res/layout/item_horizontal_track.xml
index 88944cd8..091c64d5 100644
--- a/app/src/main/res/layout/item_horizontal_track.xml
+++ b/app/src/main/res/layout/item_horizontal_track.xml
@@ -38,21 +38,25 @@
         app:layout_constraintStart_toEndOf="@+id/song_cover_image_view"
         app:layout_constraintTop_toTopOf="parent" />
 
-
     <LinearLayout
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:paddingEnd="12dp"
+        app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toStartOf="@+id/search_result_dowanload_indicator_image_view"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@+id/song_cover_image_view"
         app:layout_constraintTop_toBottomOf="@+id/search_result_song_title_text_view">
 
         <TextView
             android:id="@+id/album_artist_text_view"
             style="@style/ItemSubtitleTextView"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:ellipsize="end"
+            android:maxLines="1"
             android:paddingStart="12dp"
             android:paddingEnd="4dp"
             android:text="@string/label_placeholder" />
@@ -69,6 +73,7 @@
             style="@style/ItemSubtitleTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:maxLines="1"
             android:paddingStart="4dp"
             android:paddingEnd="12dp"
             android:text="@string/label_placeholder" />
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 b24705d5..abd03a06 100644
--- a/app/src/main/res/layout/item_player_queue_song.xml
+++ b/app/src/main/res/layout/item_player_queue_song.xml
@@ -3,6 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@color/cardColor"
+    android:clipChildren="false"
     android:foreground="?attr/selectableItemBackground"
     android:orientation="horizontal"
     android:paddingStart="24dp"
@@ -29,50 +30,31 @@
         android:focusable="true"
         android:focusableInTouchMode="true"
         android:marqueeRepeatLimit="marquee_forever"
+        android:maxLines="1"
         android:paddingStart="12dp"
         android:paddingTop="10dp"
         android:paddingEnd="12dp"
         android:scrollHorizontally="true"
-        android:singleLine="true"
         android:text="@string/label_placeholder"
         app:layout_constraintEnd_toStartOf="@+id/queue_song_holder_image"
         app:layout_constraintStart_toEndOf="@+id/queue_song_cover_image_view"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <LinearLayout
-        android:layout_width="0dp"
+    <TextView
+        android:id="@+id/queue_song_artist_text_view"
+        style="@style/ItemSubtitleTextView"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:paddingEnd="12dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:paddingStart="12dp"
+        android:paddingEnd="4dp"
+        android:text="@string/label_placeholder"
         app:layout_constraintEnd_toStartOf="@+id/queue_song_holder_image"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constrainedWidth="true"
         app:layout_constraintStart_toEndOf="@+id/queue_song_cover_image_view"
-        app:layout_constraintTop_toBottomOf="@+id/queue_song_title_text_view">
-
-        <TextView
-            android:id="@+id/queue_song_artist_text_view"
-            style="@style/ItemSubtitleTextView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingStart="12dp"
-            android:paddingEnd="4dp"
-            android:text="@string/label_placeholder" />
-
-        <TextView
-            android:id="@+id/queue_separator_text_view"
-            style="@style/ItemSubtitleTextView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/label_dot_separator" />
-
-        <TextView
-            android:id="@+id/queue_song_duration_text_view"
-            style="@style/ItemSubtitleTextView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingStart="4dp"
-            android:paddingEnd="12dp"
-            android:text="@string/label_placeholder" />
-    </LinearLayout>
+        app:layout_constraintTop_toBottomOf="@+id/queue_song_title_text_view" />
 
     <ImageView
         android:id="@+id/queue_song_holder_image"