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

feat: automatic PiP animation #648

Merged
merged 7 commits into from
Feb 3, 2024
Merged

feat: automatic PiP animation #648

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5979103
Add automatic PiP animation
Natanel-Shitrit Feb 2, 2024
195bad2
Fix linting
Natanel-Shitrit Feb 2, 2024
eb07dd7
Fix linting
Natanel-Shitrit Feb 2, 2024
96c7688
chore: fix merge conflict
Natanel-Shitrit Feb 2, 2024
b1ccc10
fix: disable pip gesture when media is paused
jarnedemeulemeester Feb 3, 2024
beceee7
fix: crash when gestures are disabled
jarnedemeulemeester Feb 3, 2024
8a454fd
fix: keep auto enter enabled after using button
jarnedemeulemeester Feb 3, 2024
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
Prev Previous commit
Next Next commit
chore: fix merge conflict
  • Loading branch information
@Natanel-Shitrit @jarnedemeulemeester
Natanel-Shitrit authored and jarnedemeulemeester committed Feb 3, 2024
commit 96c7688111538654572ad4ffdc590e29de182081
50 changes: 27 additions & 23 deletions app/phone/src/main/java/dev/jdtech/jellyfin/PlayerActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,16 +319,6 @@ class PlayerActivity : BasePlayerActivity() {
if (!isPipSupported) {
return
}
binding.playerView.useController = false
binding.playerView.findViewById<Button>(R.id.btn_skip_intro).isVisible = false

wasZoom = playerGestureHelper!!.isZoomEnabled
playerGestureHelper?.updateZoomMode(false)

// Brightness mode Auto
window.attributes = window.attributes.apply {
screenBrightness = WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_NONE
}

try {
enterPictureInPictureMode(pipParams())
Expand All @@ -340,19 +330,33 @@ class PlayerActivity : BasePlayerActivity() {
newConfig: Configuration,
) {
super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig)
if (!isInPictureInPictureMode) {
binding.playerView.useController = true
playerGestureHelper?.updateZoomMode(wasZoom)

// Override auto brightness
window.attributes = window.attributes.apply {
screenBrightness = if (appPreferences.playerBrightnessRemember) {
appPreferences.playerBrightness
} else {
Settings.System.getInt(
contentResolver,
Settings.System.SCREEN_BRIGHTNESS,
).toFloat() / 255
when (isInPictureInPictureMode) {
true -> {
binding.playerView.useController = false
binding.playerView.findViewById<Button>(R.id.btn_skip_intro).isVisible = false

wasZoom = playerGestureHelper!!.isZoomEnabled
playerGestureHelper?.updateZoomMode(false)

// Brightness mode Auto
window.attributes = window.attributes.apply {
screenBrightness = WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_NONE
}
}
false -> {
binding.playerView.useController = true
playerGestureHelper?.updateZoomMode(wasZoom)

// Override auto brightness
window.attributes = window.attributes.apply {
screenBrightness = if (appPreferences.playerBrightnessRemember) {
appPreferences.playerBrightness
} else {
Settings.System.getInt(
contentResolver,
Settings.System.SCREEN_BRIGHTNESS,
).toFloat() / 255
}
}
}
}
Expand Down