Skip to content
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

Jump to bottom

Clean up conditionals in PiP logic #69

Merged
merged 2 commits into from
May 8, 2024
Merged

Clean up conditionals in PiP logic #69

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2ef0ec
Update VideoPlayerScreen.kt
MagicalMeghan Apr 30, 2024
03f195d
Update VideoPlayerScreen.kt
MagicalMeghan May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 6 additions & 7 deletions app/src/main/java/com/google/android/samples/socialite/ui/player/VideoPlayerScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ import androidx.lifecycle.compose.LifecycleStartEffect
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.lifecycle.viewmodel.compose.viewModel
import androidx.media3.common.Player
import androidx.media3.common.VideoSize
import androidx.media3.ui.PlayerView
import com.google.android.samples.socialite.R

Expand Down Expand Up @@ -174,14 +175,12 @@ private fun VideoPlayer(
// create modifier that adds pip to video player
val pipModifier = modifier.onGloballyPositioned { layoutCoordinates ->
val builder = PictureInPictureParams.Builder()
if (shouldEnterPipMode) {
if (shouldEnterPipMode && player != null && player.videoSize != VideoSize.UNKNOWN) {
// set source rect hint, aspect ratio
if (player != null && player.videoSize.width > 0 && player.videoSize.height > 0) {
val sourceRect = layoutCoordinates.boundsInWindow().toAndroidRectF().toRect()
builder.setSourceRectHint(sourceRect)
val aspectRatio = Rational(player.videoSize.width, player.videoSize.height)
builder.setAspectRatio(aspectRatio)
}
val sourceRect = layoutCoordinates.boundsInWindow().toAndroidRectF().toRect()
builder.setSourceRectHint(sourceRect)
val aspectRatio = Rational(player.videoSize.width, player.videoSize.height)
builder.setAspectRatio(aspectRatio)
}

builder.setActions(
Expand Down