Skip to content

Enable playlist on the video player screen. #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chikoski merged 3 commits into from
Mar 11, 2025
Merged

Enable playlist on the video player screen. #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ba21e9
Enable playlist on the video player screen.
chikoski Mar 7, 2025
1450bf1
Move state objects introduced from media3-ui-compose to buttons to co…
chikoski Mar 10, 2025
352dcad
Remove playback position from video player composables for performanc…
chikoski Mar 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 27 additions & 27 deletions JetStreamCompose/jetstream/src/main/assets/movies.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
{
"id": "6f251d94cc5c2",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ElephantsDream.mp4",
"subtitleUri": "https://thepaciellogroup.github.io/AT-browser-tests/video/subtitles-en.vtt",
"rank": 3,
"rankUpDown": "+23",
Expand Down Expand Up @@ -70,7 +70,7 @@
},
{
"id": "51df9ee9a5c29",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ElephantsDream.mp4",
"subtitleUri": "https://thepaciellogroup.github.io/AT-browser-tests/video/subtitles-en.vtt",
"rank": 5,
"rankUpDown": "+27",
Expand Down Expand Up @@ -116,7 +116,7 @@
},
{
"id": "040fab3d5e08e",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ElephantsDream.mp4",
"subtitleUri": "https://thepaciellogroup.github.io/AT-browser-tests/video/subtitles-en.vtt",
"rank": 7,
"rankUpDown": "+57",
Expand Down Expand Up @@ -162,7 +162,7 @@
},
{
"id": "c4278acc58c31",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ElephantsDream.mp4",
"subtitleUri": "https://thepaciellogroup.github.io/AT-browser-tests/video/subtitles-en.vtt",
"rank": 9,
"rankUpDown": "+29",
Expand Down Expand Up @@ -208,7 +208,7 @@
},
{
"id": "feee7e2119c28",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ElephantsDream.mp4",
"subtitleUri": "https://thepaciellogroup.github.io/AT-browser-tests/video/subtitles-en.vtt",
"rank": 11,
"rankUpDown": "+36",
Expand Down Expand Up @@ -254,7 +254,7 @@
},
{
"id": "66f35ba9d671d",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ElephantsDream.mp4",
"subtitleUri": "https://thepaciellogroup.github.io/AT-browser-tests/video/subtitles-en.vtt",
"rank": 13,
"rankUpDown": "+16",
Expand Down Expand Up @@ -300,7 +300,7 @@
},
{
"id": "523d5cdae88f7",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ElephantsDream.mp4",
"subtitleUri": "https://thepaciellogroup.github.io/AT-browser-tests/video/subtitles-en.vtt",
"rank": 15,
"rankUpDown": "+17",
Expand Down Expand Up @@ -346,7 +346,7 @@
},
{
"id": "c10133062b2aa",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ElephantsDream.mp4",
"subtitleUri": "https://thepaciellogroup.github.io/AT-browser-tests/video/subtitles-en.vtt",
"rank": 18,
"rankUpDown": "+33",
Expand Down Expand Up @@ -392,7 +392,7 @@
},
{
"id": "af69b8b439cb9",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ElephantsDream.mp4",
"subtitleUri": "https://thepaciellogroup.github.io/AT-browser-tests/video/subtitles-en.vtt",
"rank": 20,
"rankUpDown": "+41",
Expand Down Expand Up @@ -438,7 +438,7 @@
},
{
"id": "5d428a566a71c",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ElephantsDream.mp4",
"subtitleUri": "https://thepaciellogroup.github.io/AT-browser-tests/video/subtitles-en.vtt",
"rank": 22,
"rankUpDown": "+28",
Expand All @@ -461,7 +461,7 @@
},
{
"id": "84e74ee74bfc",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ElephantsDream.mp4",
"subtitleUri": "https://thepaciellogroup.github.io/AT-browser-tests/video/subtitles-en.vtt",
"rank": 23,
"rankUpDown": "+48",
Expand Down Expand Up @@ -507,7 +507,7 @@
},
{
"id": "aa723f7cb6d5d",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ElephantsDream.mp4",
"subtitleUri": "https://thepaciellogroup.github.io/AT-browser-tests/video/subtitles-en.vtt",
"rank": 25,
"rankUpDown": "+35",
Expand Down Expand Up @@ -553,7 +553,7 @@
},
{
"id": "f1b81e90f812",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ElephantsDream.mp4",
"subtitleUri": "https://thepaciellogroup.github.io/AT-browser-tests/video/subtitles-en.vtt",
"rank": 27,
"rankUpDown": "+22",
Expand Down Expand Up @@ -599,7 +599,7 @@
},
{
"id": "504431d1aca8",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ElephantsDream.mp4",
"subtitleUri": "https://thepaciellogroup.github.io/AT-browser-tests/video/subtitles-en.vtt",
"rank": 29,
"rankUpDown": "+39",
Expand Down Expand Up @@ -645,7 +645,7 @@
},
{
"id": "c08e5ae6ecc9f",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ElephantsDream.mp4",
"subtitleUri": "https://thepaciellogroup.github.io/AT-browser-tests/video/subtitles-en.vtt",
"rank": 31,
"rankUpDown": "+42",
Expand Down Expand Up @@ -691,7 +691,7 @@
},
{
"id": "40353aa9623af",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ElephantsDream.mp4",
"subtitleUri": "https://thepaciellogroup.github.io/AT-browser-tests/video/subtitles-en.vtt",
"rank": 33,
"rankUpDown": "+51",
Expand All @@ -714,7 +714,7 @@
},
{
"id": "64e067f836ca2",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ElephantsDream.mp4",
"subtitleUri": "https://thepaciellogroup.github.io/AT-browser-tests/video/subtitles-en.vtt",
"rank": 34,
"rankUpDown": "+31",
Expand Down Expand Up @@ -760,7 +760,7 @@
},
{
"id": "61946ea9ede15",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ElephantsDream.mp4",
"subtitleUri": "https://thepaciellogroup.github.io/AT-browser-tests/video/subtitles-en.vtt",
"rank": 36,
"rankUpDown": "+21",
Expand Down Expand Up @@ -829,7 +829,7 @@
},
{
"id": "08ef353fd4def",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ElephantsDream.mp4",
"subtitleUri": "https://thepaciellogroup.github.io/AT-browser-tests/video/subtitles-en.vtt",
"rank": 39,
"rankUpDown": "+55",
Expand Down Expand Up @@ -875,7 +875,7 @@
},
{
"id": "43e5a062e2bfc",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ElephantsDream.mp4",
"subtitleUri": "https://thepaciellogroup.github.io/AT-browser-tests/video/subtitles-en.vtt",
"rank": 41,
"rankUpDown": "+48",
Expand Down Expand Up @@ -921,7 +921,7 @@
},
{
"id": "73ce574852058",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ElephantsDream.mp4",
"subtitleUri": "https://thepaciellogroup.github.io/AT-browser-tests/video/subtitles-en.vtt",
"rank": 43,
"rankUpDown": "+19",
Expand Down Expand Up @@ -967,7 +967,7 @@
},
{
"id": "defa276de73e5",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ElephantsDream.mp4",
"subtitleUri": "https://thepaciellogroup.github.io/AT-browser-tests/video/subtitles-en.vtt",
"rank": 45,
"rankUpDown": "+54",
Expand All @@ -990,7 +990,7 @@
},
{
"id": "d84978bdf9622",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ElephantsDream.mp4",
"subtitleUri": "https://thepaciellogroup.github.io/AT-browser-tests/video/subtitles-en.vtt",
"rank": 46,
"rankUpDown": "+33",
Expand Down Expand Up @@ -1036,7 +1036,7 @@
},
{
"id": "834ce43565946",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ElephantsDream.mp4",
"subtitleUri": "https://thepaciellogroup.github.io/AT-browser-tests/video/subtitles-en.vtt",
"rank": 48,
"rankUpDown": "+57",
Expand Down Expand Up @@ -1082,7 +1082,7 @@
},
{
"id": "07c92f3a31737",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ElephantsDream.mp4",
"subtitleUri": "https://thepaciellogroup.github.io/AT-browser-tests/video/subtitles-en.vtt",
"rank": 50,
"rankUpDown": "+30",
Expand Down Expand Up @@ -1128,7 +1128,7 @@
},
{
"id": "b995170bc926",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ElephantsDream.mp4",
"subtitleUri": "https://thepaciellogroup.github.io/AT-browser-tests/video/subtitles-en.vtt",
"rank": 52,
"rankUpDown": "+46",
Expand Down Expand Up @@ -1174,7 +1174,7 @@
},
{
"id": "5be58f705ee35",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
"videoUri": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ElephantsDream.mp4",
"subtitleUri": "https://thepaciellogroup.github.io/AT-browser-tests/video/subtitles-en.vtt",
"rank": 54,
"rankUpDown": "+54",
Expand Down
2 changes: 1 addition & 1 deletion JetStreamCompose/jetstream/src/main/java/com/google/jetstream/data/entities/MovieDetails.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,5 @@ data class MovieDetails(
val budget: String,
val revenue: String,
val similarMovies: MovieList,
val reviewsAndRatings: List<MovieReviewsAndRatings>
val reviewsAndRatings: List<MovieReviewsAndRatings>,
)
4 changes: 2 additions & 2 deletions ...ose/jetstream/src/main/java/com/google/jetstream/data/repositories/MovieRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class MovieRepositoryImpl @Inject constructor(
override suspend fun getMovieDetails(movieId: String): MovieDetails {
val movieList = movieDataSource.getMovieList()
val movie = movieList.find { it.id == movieId } ?: movieList.first()
val similarMovieList = movieList.shuffled().subList(0, 2)
val similarMovieList = movieList.subList(1, 4)
val castList = movieCastDataSource.getMovieCastList()

return MovieDetails(
Expand Down Expand Up @@ -116,7 +116,7 @@ class MovieRepositoryImpl @Inject constructor(
reviewCount = DefaultCount,
reviewRating = DefaultRating
),
)
),
)
}

Expand Down
6 changes: 6 additions & 0 deletions JetStreamCompose/jetstream/src/main/java/com/google/jetstream/data/util/StringConstants.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,5 +125,11 @@ object StringConstants {
const val VideoPlayerControlSettingsButton = "Playlist Button"
const val VideoPlayerControlPlayPauseButton = "Playlist Button"
const val VideoPlayerControlForward = "Fast forward 10 seconds"
const val VideoPlayerControlSkipNextButton = "Skip to the next movie"
const val VideoPlayerControlSkipPreviousButton = "Skip to the previous movie"
const val VideoPlayerControlRepeatAll = "Repeat all movies"
const val VideoPlayerControlRepeatOne = "Repeat movie"
const val VideoPlayerControlRepeatNone = "No repeat"
const val VideoPlayerControlRepeatButton = "Repeat Button"
}
}
Loading
Loading