Skip to content

Commit

Permalink
Fix FFWD/RWND color in night mode
Browse files Browse the repository at this point in the history
The color set via textAppearance is overridden by any non-null
textColor set directly on the style. We always want the specific
properties the textAppearance specifies, so set them directly to
prevent them from being overridden.

#minor-release
Issue: google/ExoPlayer#9765
PiperOrigin-RevId: 414967143
  • Loading branch information
ojw28 authored and icbaker committed Dec 10, 2021
1 parent 1218f56 commit bc1e586
Showing 1 changed file with 7 additions and 9 deletions.
16 changes: 7 additions & 9 deletions libraries/ui/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -92,26 +92,24 @@
<item name="android:foreground">@drawable/exo_styled_controls_fastforward</item>
<item name="android:gravity">center|bottom</item>
<item name="android:paddingBottom">@dimen/exo_icon_padding_bottom</item>
<item name="android:textAppearance">@style/ExoStyledControls.ButtonText</item>
<item name="android:textStyle">bold</item>
<item name="android:textSize">@dimen/exo_icon_text_size</item>
<item name="android:textColor">@color/exo_white</item>
<!-- Needed for https://github.com/google/ExoPlayer/issues/7898 -->
<item name="backgroundTint">@android:color/white</item>
<item name="backgroundTint">@color/exo_white</item>
<item name="android:insetBottom">0dp</item>
</style>

<style name="ExoStyledControls.Button.Center.RewWithAmount">
<item name="android:foreground">@drawable/exo_styled_controls_rewind</item>
<item name="android:gravity">center|bottom</item>
<item name="android:paddingBottom">@dimen/exo_icon_padding_bottom</item>
<item name="android:textAppearance">@style/ExoStyledControls.ButtonText</item>
<!-- Needed for https://github.com/google/ExoPlayer/issues/7898 -->
<item name="backgroundTint">@android:color/white</item>
<item name="android:insetBottom">0dp</item>
</style>

<style name="ExoStyledControls.ButtonText">
<item name="android:textStyle">bold</item>
<item name="android:textSize">@dimen/exo_icon_text_size</item>
<item name="android:textColor">@color/exo_white</item>
<!-- Needed for https://github.com/google/ExoPlayer/issues/7898 -->
<item name="backgroundTint">@color/exo_white</item>
<item name="android:insetBottom">0dp</item>
</style>

<style name="ExoStyledControls.TimeText">
Expand Down

0 comments on commit bc1e586

Please sign in to comment.