ui: fix ellipsizing of certain textviews
Fix a problem where ellipsizing wouldn't work on the new TextView styles.
This commit is contained in:
parent
443c26fe98
commit
b2ebd92d2a
8 changed files with 10 additions and 8 deletions
|
@ -80,7 +80,6 @@
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="@dimen/spacing_small"
|
android:layout_marginStart="@dimen/spacing_small"
|
||||||
android:backgroundTint="?attr/colorAccent"
|
|
||||||
android:text="@string/lbl_shuffle"
|
android:text="@string/lbl_shuffle"
|
||||||
app:layout_constraintBottom_toBottomOf="@+id/detail_play_button"
|
app:layout_constraintBottom_toBottomOf="@+id/detail_play_button"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
|
|
@ -77,7 +77,6 @@
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="@dimen/spacing_small"
|
android:layout_marginStart="@dimen/spacing_small"
|
||||||
android:backgroundTint="?attr/colorAccent"
|
|
||||||
android:text="@string/lbl_shuffle"
|
android:text="@string/lbl_shuffle"
|
||||||
app:layout_constraintBottom_toBottomOf="@+id/detail_play_button"
|
app:layout_constraintBottom_toBottomOf="@+id/detail_play_button"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
|
|
@ -57,6 +57,7 @@
|
||||||
style="@style/Widget.Auxio.TextView.Secondary.Compact"
|
style="@style/Widget.Auxio.TextView.Secondary.Compact"
|
||||||
android:layout_marginStart="@dimen/spacing_small"
|
android:layout_marginStart="@dimen/spacing_small"
|
||||||
android:layout_marginEnd="@dimen/spacing_small"
|
android:layout_marginEnd="@dimen/spacing_small"
|
||||||
|
android:ellipsize="end"
|
||||||
android:text="@{@string/fmt_two(song.album.artist.name, song.album.name)}"
|
android:text="@{@string/fmt_two(song.album.artist.name, song.album.name)}"
|
||||||
app:layout_constraintBottom_toBottomOf="@+id/playback_cover"
|
app:layout_constraintBottom_toBottomOf="@+id/playback_cover"
|
||||||
app:layout_constraintEnd_toStartOf="@+id/playback_play_pause"
|
app:layout_constraintEnd_toStartOf="@+id/playback_play_pause"
|
||||||
|
|
|
@ -72,7 +72,6 @@
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="@dimen/spacing_small"
|
android:layout_marginStart="@dimen/spacing_small"
|
||||||
android:backgroundTint="?attr/colorAccent"
|
|
||||||
android:text="@string/lbl_shuffle"
|
android:text="@string/lbl_shuffle"
|
||||||
app:layout_constraintBottom_toBottomOf="@+id/detail_play_button"
|
app:layout_constraintBottom_toBottomOf="@+id/detail_play_button"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
|
android:background="?attr/colorSurface"
|
||||||
android:theme="@style/Theme.Widget">
|
android:theme="@style/Theme.Widget">
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
|
android:background="?attr/colorSurface"
|
||||||
android:theme="@style/Theme.Widget">
|
android:theme="@style/Theme.Widget">
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
|
|
|
@ -85,6 +85,5 @@
|
||||||
<item name="android:layout_width">match_parent</item>
|
<item name="android:layout_width">match_parent</item>
|
||||||
<item name="android:padding">@dimen/spacing_medium</item>
|
<item name="android:padding">@dimen/spacing_medium</item>
|
||||||
<item name="android:orientation">vertical</item>
|
<item name="android:orientation">vertical</item>
|
||||||
<item name="android:background">?attr/colorSurface</item>
|
|
||||||
</style>
|
</style>
|
||||||
</resources>
|
</resources>
|
|
@ -108,7 +108,7 @@
|
||||||
<style name="Widget.Auxio.TextView.Primary" parent="Widget.Auxio.TextView.Base">
|
<style name="Widget.Auxio.TextView.Primary" parent="Widget.Auxio.TextView.Base">
|
||||||
<item name="android:fontFamily">@font/inter_semibold</item>
|
<item name="android:fontFamily">@font/inter_semibold</item>
|
||||||
<item name="android:ellipsize">marquee</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:marqueeRepeatLimit">marquee_forever</item>
|
||||||
<item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Headline6
|
<item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Headline6
|
||||||
</item>
|
</item>
|
||||||
|
@ -122,12 +122,14 @@
|
||||||
|
|
||||||
<style name="Widget.Auxio.TextView.Primary.Compact" parent="Widget.Auxio.TextView.Base">
|
<style name="Widget.Auxio.TextView.Primary.Compact" parent="Widget.Auxio.TextView.Base">
|
||||||
<item name="android:fontFamily">@font/inter_semibold</item>
|
<item name="android:fontFamily">@font/inter_semibold</item>
|
||||||
|
<item name="android:ellipsize">end</item>
|
||||||
<item name="android:maxLines">1</item>
|
<item name="android:maxLines">1</item>
|
||||||
<item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Body2</item>
|
<item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Body2</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="Widget.Auxio.TextView.Secondary.Compact" parent="Widget.Auxio.TextView.Base">
|
<style name="Widget.Auxio.TextView.Secondary.Compact" parent="Widget.Auxio.TextView.Base">
|
||||||
<item name="android:maxLines">1</item>
|
<item name="android:maxLines">1</item>
|
||||||
|
<item name="android:ellipsize">end</item>
|
||||||
<item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Caption</item>
|
<item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Caption</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
@ -174,9 +176,10 @@
|
||||||
<item name="android:padding">@dimen/spacing_small</item>
|
<item name="android:padding">@dimen/spacing_small</item>
|
||||||
</style>
|
</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:letterSpacing">0.01</item>
|
||||||
<item name="android:textAllCaps">false</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:textSize">@dimen/text_size_small</item>
|
||||||
<item name="android:textColor">?attr/colorSurface</item>
|
<item name="android:textColor">?attr/colorSurface</item>
|
||||||
<item name="rippleColor">@color/mtrl_btn_ripple_color</item>
|
<item name="rippleColor">@color/mtrl_btn_ripple_color</item>
|
||||||
|
@ -184,7 +187,7 @@
|
||||||
<item name="cornerRadius">0dp</item>
|
<item name="cornerRadius">0dp</item>
|
||||||
</style>
|
</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:letterSpacing">0.01</item>
|
||||||
<item name="android:textAllCaps">false</item>
|
<item name="android:textAllCaps">false</item>
|
||||||
<item name="android:textSize">@dimen/text_size_small</item>
|
<item name="android:textSize">@dimen/text_size_small</item>
|
||||||
|
|
Loading…
Reference in a new issue