From 2d04ab4c4604465480d0d4aa0002bee0a562de74 Mon Sep 17 00:00:00 2001
From: antonio <antoniocappiello.play@gmail.com>
Date: Wed, 23 Mar 2022 21:47:08 +0100
Subject: [PATCH] Single line text in almost all adapters

---
 .idea/misc.xml                                  |  4 ++--
 .../play/adapter/AlbumAdapter.java              |  3 +++
 .../AlbumArtistPageOrSimilarAdapter.java        |  3 +++
 .../play/adapter/AlbumCatalogueAdapter.java     |  3 +++
 .../play/adapter/ArtistAdapter.java             |  2 ++
 .../play/adapter/ArtistCatalogueAdapter.java    |  2 ++
 .../play/adapter/ArtistSimilarAdapter.java      |  2 ++
 .../res/layout/bottom_sheet_artist_dialog.xml   |  4 ----
 .../res/layout/bottom_sheet_podcast_dialog.xml  |  4 ----
 .../res/layout/bottom_sheet_song_dialog.xml     |  4 ----
 .../main/res/layout/fragment_playlist_page.xml  |  1 -
 .../inner_fragment_player_controller_layout.xml | 17 +++++++++--------
 .../res/layout/item_home_podcast_episode.xml    |  3 ---
 .../main/res/layout/item_home_similar_track.xml |  1 -
 .../main/res/layout/item_horizontal_album.xml   |  9 +--------
 .../main/res/layout/item_horizontal_artist.xml  |  9 +--------
 .../res/layout/item_horizontal_playlist.xml     |  4 ----
 .../layout/item_horizontal_playlist_dialog.xml  |  4 ----
 .../item_horizontal_playlist_dialog_track.xml   |  4 ----
 .../main/res/layout/item_horizontal_track.xml   |  8 --------
 app/src/main/res/layout/item_library_album.xml  | 10 +++++-----
 app/src/main/res/layout/item_library_artist.xml |  5 ++---
 ...tem_library_artist_page_or_similar_album.xml |  9 ++++-----
 .../res/layout/item_library_catalogue_album.xml | 10 ++++------
 .../layout/item_library_catalogue_artist.xml    |  5 ++---
 .../res/layout/item_library_similar_artist.xml  |  5 ++---
 app/src/main/res/layout/item_login_server.xml   | 11 ++---------
 .../main/res/layout/item_player_queue_song.xml  | 10 +---------
 28 files changed, 50 insertions(+), 106 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 44868b40..ecef2970 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -132,12 +132,12 @@
         <entry key="app/src/main/res/layout/item_home_track.xml" value="0.3229166666666667" />
         <entry key="app/src/main/res/layout/item_home_year.xml" value="0.3229166666666667" />
         <entry key="app/src/main/res/layout/item_home_year_placeholder.xml" value="0.3229166666666667" />
-        <entry key="app/src/main/res/layout/item_horizontal_album.xml" value="0.8" />
+        <entry key="app/src/main/res/layout/item_horizontal_album.xml" value="0.1" />
         <entry key="app/src/main/res/layout/item_horizontal_artist.xml" value="0.3229166666666667" />
         <entry key="app/src/main/res/layout/item_horizontal_playlist.xml" value="0.3229166666666667" />
         <entry key="app/src/main/res/layout/item_horizontal_playlist_dialog.xml" value="0.3229166666666667" />
         <entry key="app/src/main/res/layout/item_horizontal_playlist_dialog_track.xml" value="0.3229166666666667" />
-        <entry key="app/src/main/res/layout/item_horizontal_track.xml" value="0.3229166666666667" />
+        <entry key="app/src/main/res/layout/item_horizontal_track.xml" value="0.1" />
         <entry key="app/src/main/res/layout/item_library_album.xml" value="0.3229166666666667" />
         <entry key="app/src/main/res/layout/item_library_artist.xml" value="0.3229166666666667" />
         <entry key="app/src/main/res/layout/item_library_artist_page_or_similar_album.xml" value="0.3229166666666667" />
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumAdapter.java
index f151a95b..5fbf5715 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumAdapter.java
@@ -85,6 +85,9 @@ public class AlbumAdapter extends RecyclerView.Adapter<AlbumAdapter.ViewHolder>
 
             itemView.setOnClickListener(this);
             itemView.setOnLongClickListener(this);
+
+            textAlbumName.setSelected(true);
+            textArtistName.setSelected(true);
         }
 
         @Override
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumArtistPageOrSimilarAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumArtistPageOrSimilarAdapter.java
index 525041be..8c581f2a 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumArtistPageOrSimilarAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumArtistPageOrSimilarAdapter.java
@@ -84,6 +84,9 @@ public class AlbumArtistPageOrSimilarAdapter extends RecyclerView.Adapter<AlbumA
 
             itemView.setOnClickListener(this);
             itemView.setOnLongClickListener(this);
+
+            textAlbumName.setSelected(true);
+            textArtistName.setSelected(true);
         }
 
         @Override
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumCatalogueAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumCatalogueAdapter.java
index 350a47cf..255a9cbc 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumCatalogueAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumCatalogueAdapter.java
@@ -128,6 +128,9 @@ public class AlbumCatalogueAdapter extends RecyclerView.Adapter<AlbumCatalogueAd
 
             itemView.setOnClickListener(this);
             itemView.setOnLongClickListener(this);
+
+            textAlbumName.setSelected(true);
+            textArtistName.setSelected(true);
         }
 
         @Override
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistAdapter.java
index cc57c72c..b0cb891b 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistAdapter.java
@@ -101,6 +101,8 @@ public class ArtistAdapter extends RecyclerView.Adapter<ArtistAdapter.ViewHolder
 
             itemView.setOnClickListener(this);
             itemView.setOnLongClickListener(this);
+
+            textArtistName.setSelected(true);
         }
 
         @Override
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistCatalogueAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistCatalogueAdapter.java
index e8b22bf8..a4ee180b 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistCatalogueAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistCatalogueAdapter.java
@@ -131,6 +131,8 @@ public class ArtistCatalogueAdapter extends RecyclerView.Adapter<ArtistCatalogue
 
             itemView.setOnClickListener(this);
             itemView.setOnLongClickListener(this);
+
+            textArtistName.setSelected(true);
         }
 
         @Override
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistSimilarAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistSimilarAdapter.java
index d0f5cacd..e4a57fc3 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/ArtistSimilarAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/ArtistSimilarAdapter.java
@@ -87,6 +87,8 @@ public class ArtistSimilarAdapter extends RecyclerView.Adapter<ArtistSimilarAdap
 
             itemView.setOnClickListener(this);
             itemView.setOnLongClickListener(this);
+
+            textArtistName.setSelected(true);
         }
 
         @Override
diff --git a/app/src/main/res/layout/bottom_sheet_artist_dialog.xml b/app/src/main/res/layout/bottom_sheet_artist_dialog.xml
index 6c1495ac..75ef2cef 100644
--- a/app/src/main/res/layout/bottom_sheet_artist_dialog.xml
+++ b/app/src/main/res/layout/bottom_sheet_artist_dialog.xml
@@ -46,12 +46,8 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:ellipsize="marquee"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:marqueeRepeatLimit="marquee_forever"
             android:paddingStart="12dp"
             android:paddingEnd="12dp"
-            android:scrollHorizontally="true"
             android:singleLine="true"
             android:text="@string/label_placeholder"
             app:layout_constraintEnd_toStartOf="@id/button_favorite"
diff --git a/app/src/main/res/layout/bottom_sheet_podcast_dialog.xml b/app/src/main/res/layout/bottom_sheet_podcast_dialog.xml
index f3999579..14d18a78 100644
--- a/app/src/main/res/layout/bottom_sheet_podcast_dialog.xml
+++ b/app/src/main/res/layout/bottom_sheet_podcast_dialog.xml
@@ -30,12 +30,8 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:ellipsize="marquee"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:marqueeRepeatLimit="marquee_forever"
             android:paddingStart="12dp"
             android:paddingEnd="12dp"
-            android:scrollHorizontally="true"
             android:singleLine="true"
             android:text="@string/label_placeholder"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/bottom_sheet_song_dialog.xml b/app/src/main/res/layout/bottom_sheet_song_dialog.xml
index 9fdd86d9..37d632cb 100644
--- a/app/src/main/res/layout/bottom_sheet_song_dialog.xml
+++ b/app/src/main/res/layout/bottom_sheet_song_dialog.xml
@@ -46,12 +46,8 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:ellipsize="marquee"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:marqueeRepeatLimit="marquee_forever"
             android:paddingStart="12dp"
             android:paddingEnd="12dp"
-            android:scrollHorizontally="true"
             android:singleLine="true"
             android:text="@string/label_placeholder"
             app:layout_constraintEnd_toStartOf="@id/button_favorite"
diff --git a/app/src/main/res/layout/fragment_playlist_page.xml b/app/src/main/res/layout/fragment_playlist_page.xml
index 352bccc5..82b332cf 100644
--- a/app/src/main/res/layout/fragment_playlist_page.xml
+++ b/app/src/main/res/layout/fragment_playlist_page.xml
@@ -83,7 +83,6 @@
                     android:ellipsize="end"
                     android:maxLines="2"
                     android:paddingTop="8dp"
-                    android:singleLine="false"
                     android:text="@string/label_placeholder"
                     android:textAlignment="center"
                     app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/inner_fragment_player_controller_layout.xml b/app/src/main/res/layout/inner_fragment_player_controller_layout.xml
index 54411466..8bebdfd8 100644
--- a/app/src/main/res/layout/inner_fragment_player_controller_layout.xml
+++ b/app/src/main/res/layout/inner_fragment_player_controller_layout.xml
@@ -66,9 +66,9 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="24dp"
         android:layout_marginTop="24dp"
-        android:layout_marginEnd="24dp"
-        android:ellipsize="end"
-        android:maxLines="2"
+        android:layout_marginEnd="12dp"
+        android:ellipsize="marquee"
+        android:singleLine="true"
         android:text="@string/label_placeholder"
         app:layout_constraintEnd_toStartOf="@+id/button_favorite"
         app:layout_constraintStart_toStartOf="parent"
@@ -91,15 +91,16 @@
     <TextView
         android:id="@+id/player_artist_name_label"
         style="@style/TitleMedium"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="24dp"
-        android:layout_marginEnd="24dp"
-        android:ellipsize="end"
-        android:maxLines="2"
+        android:layout_marginEnd="12dp"
+        android:ellipsize="marquee"
+        android:singleLine="true"
         android:text="@string/label_placeholder"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/player_media_title_label" />
+        app:layout_constraintTop_toBottomOf="@+id/player_media_title_label"
+        app:layout_constraintEnd_toStartOf="@+id/button_favorite"/>
 
     <TextView
         android:id="@+id/exo_position"
diff --git a/app/src/main/res/layout/item_home_podcast_episode.xml b/app/src/main/res/layout/item_home_podcast_episode.xml
index dd657781..7f3627fc 100644
--- a/app/src/main/res/layout/item_home_podcast_episode.xml
+++ b/app/src/main/res/layout/item_home_podcast_episode.xml
@@ -30,7 +30,6 @@
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:maxLines="2"
-            android:singleLine="false"
             android:paddingStart="12dp"
             android:paddingEnd="16dp"
             android:text="@string/label_placeholder"
@@ -48,7 +47,6 @@
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:maxLines="2"
-            android:singleLine="false"
             android:paddingStart="12dp"
             android:paddingEnd="16dp"
             android:text="@string/label_placeholder"
@@ -75,7 +73,6 @@
             android:maxLines="2"
             android:paddingStart="12dp"
             android:paddingEnd="12dp"
-            android:singleLine="false"
             android:text="@string/label_placeholder"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/item_home_similar_track.xml b/app/src/main/res/layout/item_home_similar_track.xml
index d05e40f1..4a5d76b2 100644
--- a/app/src/main/res/layout/item_home_similar_track.xml
+++ b/app/src/main/res/layout/item_home_similar_track.xml
@@ -22,7 +22,6 @@
         android:ellipsize="end"
         android:maxLines="2"
         android:paddingTop="8dp"
-        android:singleLine="false"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/track_cover_image_view" />
diff --git a/app/src/main/res/layout/item_horizontal_album.xml b/app/src/main/res/layout/item_horizontal_album.xml
index 23c1cb31..34889dda 100644
--- a/app/src/main/res/layout/item_horizontal_album.xml
+++ b/app/src/main/res/layout/item_horizontal_album.xml
@@ -25,13 +25,9 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="marquee"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:marqueeRepeatLimit="marquee_forever"
         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"
@@ -45,10 +41,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="marquee"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:marqueeRepeatLimit="marquee_forever"
-        android:maxLines="1"
+        android:singleLine="true"
         android:paddingStart="12dp"
         android:paddingEnd="16dp"
         android:text="@string/label_placeholder"
diff --git a/app/src/main/res/layout/item_horizontal_artist.xml b/app/src/main/res/layout/item_horizontal_artist.xml
index dc446f34..d56ae095 100644
--- a/app/src/main/res/layout/item_horizontal_artist.xml
+++ b/app/src/main/res/layout/item_horizontal_artist.xml
@@ -25,12 +25,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="marquee"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:marqueeRepeatLimit="marquee_forever"
         android:paddingStart="12dp"
         android:paddingEnd="12dp"
-        android:scrollHorizontally="true"
         android:singleLine="true"
         android:text="@string/label_placeholder"
         app:layout_constraintBottom_toTopOf="@id/artist_info_text_view"
@@ -47,10 +43,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="marquee"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:marqueeRepeatLimit="marquee_forever"
-        android:maxLines="1"
+        android:singleLine="true"
         android:paddingStart="12dp"
         android:paddingEnd="16dp"
         android:text="@string/label_placeholder"
diff --git a/app/src/main/res/layout/item_horizontal_playlist.xml b/app/src/main/res/layout/item_horizontal_playlist.xml
index a8b9dead..b260ed93 100644
--- a/app/src/main/res/layout/item_horizontal_playlist.xml
+++ b/app/src/main/res/layout/item_horizontal_playlist.xml
@@ -23,13 +23,9 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:ellipsize="marquee"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:marqueeRepeatLimit="marquee_forever"
             android:paddingStart="12dp"
             android:paddingTop="8dp"
             android:paddingEnd="12dp"
-            android:scrollHorizontally="true"
             android:singleLine="true"
             android:text="@string/label_placeholder"
             app:layout_constraintEnd_toEndOf="parent"
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 69f853a7..d35d577d 100644
--- a/app/src/main/res/layout/item_horizontal_playlist_dialog.xml
+++ b/app/src/main/res/layout/item_horizontal_playlist_dialog.xml
@@ -14,13 +14,9 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="marquee"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:marqueeRepeatLimit="marquee_forever"
         android:paddingStart="12dp"
         android:paddingTop="8dp"
         android:paddingEnd="12dp"
-        android:scrollHorizontally="true"
         android:singleLine="true"
         android:text="@string/label_placeholder"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/item_horizontal_playlist_dialog_track.xml b/app/src/main/res/layout/item_horizontal_playlist_dialog_track.xml
index 2ada1756..ffe19baa 100644
--- a/app/src/main/res/layout/item_horizontal_playlist_dialog_track.xml
+++ b/app/src/main/res/layout/item_horizontal_playlist_dialog_track.xml
@@ -25,13 +25,9 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="marquee"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:marqueeRepeatLimit="marquee_forever"
         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/playlist_dialog_song_handle_button"
diff --git a/app/src/main/res/layout/item_horizontal_track.xml b/app/src/main/res/layout/item_horizontal_track.xml
index 27988a91..cc0cce39 100644
--- a/app/src/main/res/layout/item_horizontal_track.xml
+++ b/app/src/main/res/layout/item_horizontal_track.xml
@@ -45,12 +45,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="marquee"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:marqueeRepeatLimit="marquee_forever"
         android:paddingTop="10dp"
         android:paddingEnd="12dp"
-        android:scrollHorizontally="true"
         android:singleLine="true"
         android:text="@string/label_placeholder"
         app:layout_constraintEnd_toStartOf="@+id/search_result_dowanload_indicator_image_view"
@@ -63,11 +59,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="marquee"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:marqueeRepeatLimit="marquee_forever"
         android:paddingEnd="12dp"
-        android:scrollHorizontally="true"
         android:singleLine="true"
         android:text="@string/label_placeholder"
         app:layout_constraintEnd_toStartOf="@+id/search_result_dowanload_indicator_image_view"
diff --git a/app/src/main/res/layout/item_library_album.xml b/app/src/main/res/layout/item_library_album.xml
index 7d74c767..82832796 100644
--- a/app/src/main/res/layout/item_library_album.xml
+++ b/app/src/main/res/layout/item_library_album.xml
@@ -19,10 +19,10 @@
         style="@style/LabelMedium"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:maxLines="2"
+        android:ellipsize="marquee"
         android:paddingTop="8dp"
-        android:singleLine="false"
+        android:scrollHorizontally="true"
+        android:singleLine="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/album_cover_image_view" />
@@ -32,8 +32,8 @@
         style="@style/LabelSmall"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:maxLines="1"
+        android:ellipsize="marquee"
+        android:singleLine="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/album_name_label" />
diff --git a/app/src/main/res/layout/item_library_artist.xml b/app/src/main/res/layout/item_library_artist.xml
index 7f423e44..76f3cc90 100644
--- a/app/src/main/res/layout/item_library_artist.xml
+++ b/app/src/main/res/layout/item_library_artist.xml
@@ -19,11 +19,10 @@
         style="@style/LabelMedium"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:ellipsize="end"
+        android:ellipsize="marquee"
         android:maxWidth="172dp"
-        android:maxLines="1"
         android:paddingTop="8dp"
-        android:singleLine="false"
+        android:singleLine="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/artist_cover_image_view" />
diff --git a/app/src/main/res/layout/item_library_artist_page_or_similar_album.xml b/app/src/main/res/layout/item_library_artist_page_or_similar_album.xml
index 543abace..6ae1c184 100644
--- a/app/src/main/res/layout/item_library_artist_page_or_similar_album.xml
+++ b/app/src/main/res/layout/item_library_artist_page_or_similar_album.xml
@@ -19,11 +19,10 @@
         style="@style/LabelMedium"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:ellipsize="end"
+        android:ellipsize="marquee"
         android:maxWidth="256dp"
-        android:maxLines="2"
         android:paddingTop="8dp"
-        android:singleLine="false"
+        android:singleLine="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/artist_page_album_cover_image_view" />
@@ -33,8 +32,8 @@
         style="@style/LabelSmall"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:maxLines="1"
+        android:ellipsize="marquee"
+        android:singleLine="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/album_name_label" />
diff --git a/app/src/main/res/layout/item_library_catalogue_album.xml b/app/src/main/res/layout/item_library_catalogue_album.xml
index 1943a34e..d03e93fa 100644
--- a/app/src/main/res/layout/item_library_catalogue_album.xml
+++ b/app/src/main/res/layout/item_library_catalogue_album.xml
@@ -18,10 +18,8 @@
         style="@style/LabelMedium"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:maxLines="2"
-        android:paddingTop="8dp"
-        android:singleLine="false"
+        android:ellipsize="marquee"
+        android:singleLine="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/album_catalogue_cover_image_view" />
@@ -31,9 +29,9 @@
         style="@style/LabelSmall"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:maxLines="1"
+        android:ellipsize="marquee"
         android:paddingBottom="16dp"
+        android:singleLine="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/album_name_label" />
diff --git a/app/src/main/res/layout/item_library_catalogue_artist.xml b/app/src/main/res/layout/item_library_catalogue_artist.xml
index 3689bc67..9e7fb021 100644
--- a/app/src/main/res/layout/item_library_catalogue_artist.xml
+++ b/app/src/main/res/layout/item_library_catalogue_artist.xml
@@ -18,11 +18,10 @@
         style="@style/LabelMedium"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:maxLines="2"
+        android:ellipsize="marquee"
         android:paddingTop="8dp"
         android:paddingBottom="16dp"
-        android:singleLine="false"
+        android:singleLine="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/artist_catalogue_cover_image_view" />
diff --git a/app/src/main/res/layout/item_library_similar_artist.xml b/app/src/main/res/layout/item_library_similar_artist.xml
index 14a75ba0..5d2d6315 100644
--- a/app/src/main/res/layout/item_library_similar_artist.xml
+++ b/app/src/main/res/layout/item_library_similar_artist.xml
@@ -19,11 +19,10 @@
         style="@style/LabelMedium"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:ellipsize="end"
+        android:ellipsize="marquee"
         android:maxWidth="256dp"
-        android:maxLines="2"
         android:paddingTop="8dp"
-        android:singleLine="false"
+        android:singleLine="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/similar_artist_cover_image_view" />
diff --git a/app/src/main/res/layout/item_login_server.xml b/app/src/main/res/layout/item_login_server.xml
index 66a32092..cb3a9e75 100644
--- a/app/src/main/res/layout/item_login_server.xml
+++ b/app/src/main/res/layout/item_login_server.xml
@@ -11,15 +11,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:ellipsize="marquee"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:marqueeRepeatLimit="marquee_forever"
-        android:maxLines="1"
+        android:singleLine="true"
         android:paddingStart="20dp"
         android:paddingTop="12dp"
         android:paddingEnd="12dp"
         android:paddingBottom="4dp"
-        android:scrollHorizontally="true"
         android:text="@string/label_placeholder"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -32,10 +28,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:ellipsize="marquee"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:marqueeRepeatLimit="marquee_forever"
-        android:maxLines="1"
+        android:singleLine="true"
         android:paddingStart="20dp"
         android:paddingEnd="12dp"
         android:paddingBottom="12dp"
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 7b05ff66..f0e53fae 100644
--- a/app/src/main/res/layout/item_player_queue_song.xml
+++ b/app/src/main/res/layout/item_player_queue_song.xml
@@ -26,14 +26,10 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="marquee"
-        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"
@@ -45,12 +41,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="marquee"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:marqueeRepeatLimit="marquee_forever"
         android:paddingStart="12dp"
         android:paddingEnd="4dp"
-        android:scrollHorizontally="true"
         android:singleLine="true"
         android:text="@string/label_placeholder"
         app:layout_constrainedWidth="true"