From 0090896ca0b2748a4f6b09644c426ede767f5172 Mon Sep 17 00:00:00 2001
From: antonio <antoniocappiello.play@gmail.com>
Date: Sat, 11 Mar 2023 16:38:13 +0100
Subject: [PATCH] Fixed the representation of strings in the playlist adapter

---
 .../PlaylistDialogHorizontalAdapter.java      |  3 +-
 .../ui/adapter/PlaylistHorizontalAdapter.java |  3 +-
 .../fragment/PlaylistCatalogueFragment.java   |  4 +-
 .../res/layout/item_horizontal_playlist.xml   | 45 +++----------------
 .../item_horizontal_playlist_dialog.xml       | 44 +++---------------
 app/src/main/res/values/strings.xml           |  2 +-
 6 files changed, 20 insertions(+), 81 deletions(-)

diff --git a/app/src/main/java/com/cappielloantonio/play/ui/adapter/PlaylistDialogHorizontalAdapter.java b/app/src/main/java/com/cappielloantonio/play/ui/adapter/PlaylistDialogHorizontalAdapter.java
index 35c62578..8400f154 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/adapter/PlaylistDialogHorizontalAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/adapter/PlaylistDialogHorizontalAdapter.java
@@ -39,8 +39,7 @@ public class PlaylistDialogHorizontalAdapter extends RecyclerView.Adapter<Playli
         Playlist playlist = playlists.get(position);
 
         holder.item.playlistDialogTitleTextView.setText(MusicUtil.getReadableString(playlist.getName()));
-        holder.item.playlistDialogCountTextView.setText(holder.itemView.getContext().getString(R.string.playlist_counted_tracks, playlist.getSongCount()));
-        holder.item.playlistDialogDurationTextView.setText(MusicUtil.getReadableDurationString(playlist.getDuration(), false));
+        holder.item.playlistDialogCountTextView.setText(holder.itemView.getContext().getString(R.string.playlist_counted_tracks, playlist.getSongCount(), MusicUtil.getReadableDurationString(playlist.getDuration(), false)));
     }
 
     @Override
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/adapter/PlaylistHorizontalAdapter.java b/app/src/main/java/com/cappielloantonio/play/ui/adapter/PlaylistHorizontalAdapter.java
index f7161bb2..dfa9ed82 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/adapter/PlaylistHorizontalAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/adapter/PlaylistHorizontalAdapter.java
@@ -75,8 +75,7 @@ public class PlaylistHorizontalAdapter extends RecyclerView.Adapter<PlaylistHori
         Playlist playlist = playlists.get(position);
 
         holder.item.playlistDialogTitleTextView.setText(MusicUtil.getReadableString(playlist.getName()));
-        holder.item.playlistDialogCountTextView.setText(holder.itemView.getContext().getString(R.string.playlist_counted_tracks, playlist.getSongCount()));
-        holder.item.playlistDialogDurationTextView.setText(MusicUtil.getReadableDurationString(playlist.getDuration(), false));
+        holder.item.playlistDialogCountTextView.setText(holder.itemView.getContext().getString(R.string.playlist_counted_tracks, playlist.getSongCount(), MusicUtil.getReadableDurationString(playlist.getDuration(), false)));
     }
 
     @Override
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistCatalogueFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistCatalogueFragment.java
index 6a87e14b..383d88dc 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistCatalogueFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistCatalogueFragment.java
@@ -107,7 +107,9 @@ public class PlaylistCatalogueFragment extends Fragment implements ClickCallback
         bind.playlistCatalogueRecyclerView.setAdapter(playlistHorizontalAdapter);
 
         if (getActivity() != null) {
-            playlistCatalogueViewModel.getPlaylistList(getViewLifecycleOwner()).observe(getViewLifecycleOwner(), playlists -> playlistHorizontalAdapter.setItems(playlists));
+            playlistCatalogueViewModel.getPlaylistList(getViewLifecycleOwner()).observe(getViewLifecycleOwner(), playlists -> {
+                if (playlists != null) playlistHorizontalAdapter.setItems(playlists);
+            });
         }
 
         bind.playlistCatalogueRecyclerView.setOnTouchListener((v, event) -> {
diff --git a/app/src/main/res/layout/item_horizontal_playlist.xml b/app/src/main/res/layout/item_horizontal_playlist.xml
index b260ed93..54b4cdf6 100644
--- a/app/src/main/res/layout/item_horizontal_playlist.xml
+++ b/app/src/main/res/layout/item_horizontal_playlist.xml
@@ -27,52 +27,21 @@
             android:paddingTop="8dp"
             android:paddingEnd="12dp"
             android:singleLine="true"
-            android:text="@string/label_placeholder"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <LinearLayout
-            android:layout_width="wrap_content"
+        <TextView
+            android:id="@+id/playlist_dialog_count_text_view"
+            style="@style/LabelSmall"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
+            android:ellipsize="marquee"
+            android:paddingStart="12dp"
             android:paddingEnd="12dp"
             android:paddingBottom="8dp"
-            app:layout_constrainedWidth="true"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/playlist_dialog_title_text_view">
-
-            <TextView
-                android:id="@+id/playlist_dialog_count_text_view"
-                style="@style/LabelSmall"
-                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" />
-
-            <TextView
-                android:id="@+id/queue_separator_text_view"
-                style="@style/LabelSmall"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/label_dot_separator" />
-
-            <TextView
-                android:id="@+id/playlist_dialog_duration_text_view"
-                style="@style/LabelSmall"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:maxLines="1"
-                android:paddingStart="4dp"
-                android:paddingEnd="12dp"
-                android:text="@string/label_placeholder" />
-        </LinearLayout>
+            app:layout_constraintTop_toBottomOf="@+id/playlist_dialog_title_text_view" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-
 </com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_horizontal_playlist_dialog.xml b/app/src/main/res/layout/item_horizontal_playlist_dialog.xml
index d35d577d..894c50a9 100644
--- a/app/src/main/res/layout/item_horizontal_playlist_dialog.xml
+++ b/app/src/main/res/layout/item_horizontal_playlist_dialog.xml
@@ -18,50 +18,20 @@
         android:paddingTop="8dp"
         android:paddingEnd="12dp"
         android:singleLine="true"
-        android:text="@string/label_placeholder"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <LinearLayout
-        android:layout_width="wrap_content"
+    <TextView
+        android:id="@+id/playlist_dialog_count_text_view"
+        style="@style/LabelSmall"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
+        android:ellipsize="marquee"
+        android:paddingStart="12dp"
         android:paddingEnd="12dp"
         android:paddingBottom="8dp"
-        app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/playlist_dialog_title_text_view">
-
-        <TextView
-            android:id="@+id/playlist_dialog_count_text_view"
-            style="@style/LabelSmall"
-            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" />
-
-        <TextView
-            android:id="@+id/queue_separator_text_view"
-            style="@style/LabelSmall"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/label_dot_separator" />
-
-        <TextView
-            android:id="@+id/playlist_dialog_duration_text_view"
-            style="@style/LabelSmall"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:maxLines="1"
-            android:paddingStart="4dp"
-            android:paddingEnd="12dp"
-            android:text="@string/label_placeholder" />
-    </LinearLayout>
+        app:layout_constraintTop_toBottomOf="@+id/playlist_dialog_title_text_view" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6087724a..23e8e0b9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -117,7 +117,7 @@
     <string name="playlist_chooser_dialog_negative_button">Cancel</string>
     <string name="playlist_chooser_dialog_neutral_button">Create</string>
     <string name="playlist_chooser_dialog_title">Add to a playlist</string>
-    <string name="playlist_counted_tracks">%1$d tracks</string>
+    <string name="playlist_counted_tracks">%1$d tracks •  %2$s</string>
     <string name="playlist_duration">Duration  •  %1$s</string>
     <string name="playlist_editor_dialog_hint_name">Playlist Name</string>
     <string name="playlist_editor_dialog_negative_button">Cancel</string>