Skip to content

Commit f313118

Browse files
committed
Format with google-java-format and add RELEAESENOTES
1 parent 944314a commit f313118

File tree

3 files changed

+28
-32
lines changed

3 files changed

+28
-32
lines changed

RELEASENOTES.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,8 @@
121121
`rememberProgressStateWithTickCount` Composable to `media3-ui-compose`
122122
module. This state holder is used in `demo-compose` to display progress
123123
as a horizontal read-only progress bar.
124+
* Add `MetadataState` class and the corresponding `rememberMetadataState`
125+
Composable to `media3-ui-compose` module.
124126
* Downloads:
125127
* OkHttp extension:
126128
* Cronet extension:

libraries/ui_compose/src/main/java/androidx/media3/ui/compose/state/MetadataState.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ class MetadataState(private val player: Player) {
5454
suspend fun observe(): Nothing {
5555
player.listen { events ->
5656
if (
57-
events.containsAny(
58-
Player.EVENT_AVAILABLE_COMMANDS_CHANGED,
59-
Player.EVENT_MEDIA_ITEM_TRANSITION,
60-
)
57+
events.containsAny(
58+
Player.EVENT_AVAILABLE_COMMANDS_CHANGED,
59+
Player.EVENT_MEDIA_ITEM_TRANSITION,
60+
)
6161
) {
6262
uri = getMediaItemUriWithCommandCheck()
6363
}

libraries/ui_compose/src/test/java/androidx/media3/ui/compose/state/MetadataStateTest.kt

Lines changed: 22 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,11 @@ import org.junit.runner.RunWith
3232
@RunWith(AndroidJUnit4::class)
3333
class MetadataStateTest {
3434

35-
@get:Rule
36-
val composeTestRule = createComposeRule()
35+
@get:Rule val composeTestRule = createComposeRule()
3736

3837
@Test
3938
fun uri_emptyPlaylist_returnsNull() {
40-
val player = TestPlayer(
41-
playbackState = Player.STATE_IDLE,
42-
playlist = emptyList(),
43-
)
39+
val player = TestPlayer(playbackState = Player.STATE_IDLE, playlist = emptyList())
4440

4541
lateinit var state: MetadataState
4642
composeTestRule.setContent { state = rememberMetadataState(player) }
@@ -50,11 +46,7 @@ class MetadataStateTest {
5046

5147
@Test
5248
fun uri_singleItemWithoutUri_returnsNull() {
53-
val player = TestPlayer(
54-
playlist = listOf(
55-
MediaItemData.Builder("uid_1").build(),
56-
),
57-
)
49+
val player = TestPlayer(playlist = listOf(MediaItemData.Builder("uid_1").build()))
5850

5951
lateinit var state: MetadataState
6052
composeTestRule.setContent { state = rememberMetadataState(player) }
@@ -65,11 +57,11 @@ class MetadataStateTest {
6557
@Test
6658
fun uri_singleItemWithUri_returnsTheUri() {
6759
val uri = "https://storage.googleapis.com/wvmedia/clear/h264/tears/tears.mpd".toUri()
68-
val player = TestPlayer(
69-
playlist = listOf(
70-
MediaItemData.Builder("uid_1").setMediaItem(MediaItem.fromUri(uri)).build(),
71-
),
72-
)
60+
val player =
61+
TestPlayer(
62+
playlist =
63+
listOf(MediaItemData.Builder("uid_1").setMediaItem(MediaItem.fromUri(uri)).build())
64+
)
7365

7466
lateinit var state: MetadataState
7567
composeTestRule.setContent { state = rememberMetadataState(player) }
@@ -82,13 +74,15 @@ class MetadataStateTest {
8274
val uri1 = "https://storage.googleapis.com/wvmedia/clear/h264/tears/tears.mpd".toUri()
8375
val uri2 =
8476
"https://storage.googleapis.com/exoplayer-test-media-1/mp4/dizzy-with-tx3g.mp4".toUri()
85-
val player = TestPlayer(
86-
playlist = listOf(
87-
MediaItemData.Builder("uid_1").setMediaItem(MediaItem.fromUri(uri1)).build(),
88-
MediaItemData.Builder("uid_2").build(),
89-
MediaItemData.Builder("uid_3").setMediaItem(MediaItem.fromUri(uri2)).build(),
90-
),
91-
)
77+
val player =
78+
TestPlayer(
79+
playlist =
80+
listOf(
81+
MediaItemData.Builder("uid_1").setMediaItem(MediaItem.fromUri(uri1)).build(),
82+
MediaItemData.Builder("uid_2").build(),
83+
MediaItemData.Builder("uid_3").setMediaItem(MediaItem.fromUri(uri2)).build(),
84+
)
85+
)
9286

9387
lateinit var state: MetadataState
9488
composeTestRule.setContent { state = rememberMetadataState(player) }
@@ -109,11 +103,11 @@ class MetadataStateTest {
109103
@Test
110104
fun uri_getCurrentMediaItemCommandBecomesAvailable_returnsUpdatedUri() {
111105
val uri = "https://storage.googleapis.com/wvmedia/clear/h264/tears/tears.mpd".toUri()
112-
val player = TestPlayer(
113-
playlist = listOf(
114-
MediaItemData.Builder("uid_1").setMediaItem(MediaItem.fromUri(uri)).build(),
115-
),
116-
)
106+
val player =
107+
TestPlayer(
108+
playlist =
109+
listOf(MediaItemData.Builder("uid_1").setMediaItem(MediaItem.fromUri(uri)).build())
110+
)
117111
player.removeCommands(Player.COMMAND_GET_CURRENT_MEDIA_ITEM)
118112

119113
lateinit var state: MetadataState

0 commit comments

Comments
 (0)