From 35bd0f46a40b6a067fd008599765ada4702b5298 Mon Sep 17 00:00:00 2001 From: ibaker Date: Tue, 14 Dec 2021 16:56:02 +0000 Subject: [PATCH] Update the session demo app to refer to exo_styled drawables This app uses the StyledPlayerView, so it should use the styled_ drawables. PiperOrigin-RevId: 416315889 --- .../media3/demo/session/PlayerActivity.kt | 18 +++++++++--------- .../res/layout/activity_playable_folder.xml | 4 ++-- .../src/main/res/layout/activity_player.xml | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/demos/session/src/main/java/androidx/media3/demo/session/PlayerActivity.kt b/demos/session/src/main/java/androidx/media3/demo/session/PlayerActivity.kt index 94d24de72f..05798a6277 100644 --- a/demos/session/src/main/java/androidx/media3/demo/session/PlayerActivity.kt +++ b/demos/session/src/main/java/androidx/media3/demo/session/PlayerActivity.kt @@ -153,20 +153,20 @@ class PlayerActivity : AppCompatActivity() { private fun updateShuffleSwitchUI(shuffleModeEnabled: Boolean) { val resId = - if (shuffleModeEnabled) R.drawable.exo_controls_shuffle_on - else R.drawable.exo_controls_shuffle_off + if (shuffleModeEnabled) R.drawable.exo_styled_controls_shuffle_on + else R.drawable.exo_styled_controls_shuffle_off findViewById(R.id.shuffle_switch) .setImageDrawable(ContextCompat.getDrawable(this, resId)) } private fun updateRepeatSwitchUI(repeatMode: Int) { - var resId: Int - when (repeatMode) { - Player.REPEAT_MODE_OFF -> resId = R.drawable.exo_controls_repeat_off - Player.REPEAT_MODE_ONE -> resId = R.drawable.exo_controls_repeat_one - Player.REPEAT_MODE_ALL -> resId = R.drawable.exo_controls_repeat_all - else -> resId = R.drawable.exo_icon_repeat_off - } + val resId: Int = + when (repeatMode) { + Player.REPEAT_MODE_OFF -> R.drawable.exo_styled_controls_repeat_off + Player.REPEAT_MODE_ONE -> R.drawable.exo_styled_controls_repeat_one + Player.REPEAT_MODE_ALL -> R.drawable.exo_styled_controls_repeat_all + else -> R.drawable.exo_styled_controls_repeat_off + } findViewById(R.id.repeat_switch) .setImageDrawable(ContextCompat.getDrawable(this, resId)) } diff --git a/demos/session/src/main/res/layout/activity_playable_folder.xml b/demos/session/src/main/res/layout/activity_playable_folder.xml index 9dfa52b660..378325cc52 100644 --- a/demos/session/src/main/res/layout/activity_playable_folder.xml +++ b/demos/session/src/main/res/layout/activity_playable_folder.xml @@ -46,7 +46,7 @@ android:layout_weight="1" android:layout_margin="10dp" android:textColor="@color/white" - android:drawableLeft="@drawable/exo_controls_shuffle_on" + android:drawableLeft="@drawable/exo_styled_controls_shuffle_on" android:text="@string/shuffle" />