From b2ebd92d2aa17556982c8e6667e968ec6a2e643d Mon Sep 17 00:00:00 2001
From: OxygenCobalt <oxycblt@abstractr.net>
Date: Tue, 21 Sep 2021 06:41:01 -0600
Subject: [PATCH] ui: fix ellipsizing of certain textviews

Fix a problem where ellipsizing wouldn't work on the new TextView
styles.
---
 app/src/main/res/layout-land/item_detail.xml          |  1 -
 app/src/main/res/layout-large/item_detail.xml         |  1 -
 app/src/main/res/layout/fragment_compact_playback.xml |  1 +
 app/src/main/res/layout/item_detail.xml               |  1 -
 app/src/main/res/layout/widget_full.xml               |  1 +
 app/src/main/res/layout/widget_small.xml              |  1 +
 app/src/main/res/values/styles_android.xml            |  1 -
 app/src/main/res/values/styles_ui.xml                 | 11 +++++++----
 8 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/layout-land/item_detail.xml b/app/src/main/res/layout-land/item_detail.xml
index 87989341e..85fc98f5f 100644
--- a/app/src/main/res/layout-land/item_detail.xml
+++ b/app/src/main/res/layout-land/item_detail.xml
@@ -80,7 +80,6 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/spacing_small"
-            android:backgroundTint="?attr/colorAccent"
             android:text="@string/lbl_shuffle"
             app:layout_constraintBottom_toBottomOf="@+id/detail_play_button"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout-large/item_detail.xml b/app/src/main/res/layout-large/item_detail.xml
index 12f34d903..880a9a576 100644
--- a/app/src/main/res/layout-large/item_detail.xml
+++ b/app/src/main/res/layout-large/item_detail.xml
@@ -77,7 +77,6 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/spacing_small"
-            android:backgroundTint="?attr/colorAccent"
             android:text="@string/lbl_shuffle"
             app:layout_constraintBottom_toBottomOf="@+id/detail_play_button"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_compact_playback.xml b/app/src/main/res/layout/fragment_compact_playback.xml
index 9432d57b8..9f60d5658 100644
--- a/app/src/main/res/layout/fragment_compact_playback.xml
+++ b/app/src/main/res/layout/fragment_compact_playback.xml
@@ -57,6 +57,7 @@
             style="@style/Widget.Auxio.TextView.Secondary.Compact"
             android:layout_marginStart="@dimen/spacing_small"
             android:layout_marginEnd="@dimen/spacing_small"
+            android:ellipsize="end"
             android:text="@{@string/fmt_two(song.album.artist.name, song.album.name)}"
             app:layout_constraintBottom_toBottomOf="@+id/playback_cover"
             app:layout_constraintEnd_toStartOf="@+id/playback_play_pause"
diff --git a/app/src/main/res/layout/item_detail.xml b/app/src/main/res/layout/item_detail.xml
index 32e3bfbdc..5ddcac1ec 100644
--- a/app/src/main/res/layout/item_detail.xml
+++ b/app/src/main/res/layout/item_detail.xml
@@ -72,7 +72,6 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/spacing_small"
-            android:backgroundTint="?attr/colorAccent"
             android:text="@string/lbl_shuffle"
             app:layout_constraintBottom_toBottomOf="@+id/detail_play_button"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/widget_full.xml b/app/src/main/res/layout/widget_full.xml
index e033a6567..ab2395d61 100644
--- a/app/src/main/res/layout/widget_full.xml
+++ b/app/src/main/res/layout/widget_full.xml
@@ -4,6 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
+    android:background="?attr/colorSurface"
     android:theme="@style/Theme.Widget">
 
     <ImageView
diff --git a/app/src/main/res/layout/widget_small.xml b/app/src/main/res/layout/widget_small.xml
index 870ad7075..89f244e01 100644
--- a/app/src/main/res/layout/widget_small.xml
+++ b/app/src/main/res/layout/widget_small.xml
@@ -4,6 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
+    android:background="?attr/colorSurface"
     android:theme="@style/Theme.Widget">
 
     <ImageView
diff --git a/app/src/main/res/values/styles_android.xml b/app/src/main/res/values/styles_android.xml
index ca55b2203..71eaf6043 100644
--- a/app/src/main/res/values/styles_android.xml
+++ b/app/src/main/res/values/styles_android.xml
@@ -85,6 +85,5 @@
         <item name="android:layout_width">match_parent</item>
         <item name="android:padding">@dimen/spacing_medium</item>
         <item name="android:orientation">vertical</item>
-        <item name="android:background">?attr/colorSurface</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles_ui.xml b/app/src/main/res/values/styles_ui.xml
index 389861817..ba9d9c9a3 100644
--- a/app/src/main/res/values/styles_ui.xml
+++ b/app/src/main/res/values/styles_ui.xml
@@ -47,7 +47,7 @@
         <item name="android:enabled">true</item>
         <item name="android:theme">@style/ThemeOverlay.SeekbarHalo</item>
     </style>
-    
+
     <style name="ThemeOverlay.SeekbarHalo" parent="">
         <!-- TODO: Remove this dumb hack and use a slider -->
         <item name="colorControlHighlight">@color/overlay_seekbar_halo</item>
@@ -108,7 +108,7 @@
     <style name="Widget.Auxio.TextView.Primary" parent="Widget.Auxio.TextView.Base">
         <item name="android:fontFamily">@font/inter_semibold</item>
         <item name="android:ellipsize">marquee</item>
-        <item name="android:maxLines">1</item>
+        <item name="android:singleLine">true</item>
         <item name="android:marqueeRepeatLimit">marquee_forever</item>
         <item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Headline6
         </item>
@@ -122,12 +122,14 @@
 
     <style name="Widget.Auxio.TextView.Primary.Compact" parent="Widget.Auxio.TextView.Base">
         <item name="android:fontFamily">@font/inter_semibold</item>
+        <item name="android:ellipsize">end</item>
         <item name="android:maxLines">1</item>
         <item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Body2</item>
     </style>
 
     <style name="Widget.Auxio.TextView.Secondary.Compact" parent="Widget.Auxio.TextView.Base">
         <item name="android:maxLines">1</item>
+        <item name="android:ellipsize">end</item>
         <item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Caption</item>
     </style>
 
@@ -174,9 +176,10 @@
         <item name="android:padding">@dimen/spacing_small</item>
     </style>
 
-    <style name="Widget.Auxio.Button.Primary" parent="@style/Widget.MaterialComponents.Button.TextButton">
+    <style name="Widget.Auxio.Button.Primary" parent="Widget.MaterialComponents.Button.TextButton">
         <item name="android:letterSpacing">0.01</item>
         <item name="android:textAllCaps">false</item>
+        <item name="android:backgroundTint">?attr/colorPrimary</item>
         <item name="android:textSize">@dimen/text_size_small</item>
         <item name="android:textColor">?attr/colorSurface</item>
         <item name="rippleColor">@color/mtrl_btn_ripple_color</item>
@@ -184,7 +187,7 @@
         <item name="cornerRadius">0dp</item>
     </style>
 
-    <style name="Widget.Auxio.Button.Secondary" parent="@style/Widget.MaterialComponents.Button.OutlinedButton">
+    <style name="Widget.Auxio.Button.Secondary" parent="Widget.MaterialComponents.Button.OutlinedButton">
         <item name="android:letterSpacing">0.01</item>
         <item name="android:textAllCaps">false</item>
         <item name="android:textSize">@dimen/text_size_small</item>