|
1 | 1 | package org.schabi.newpipe.player.ui |
2 | 2 |
|
| 3 | +import android.annotation.SuppressLint |
3 | 4 | import android.content.Intent |
4 | 5 | import android.content.res.Resources |
5 | 6 | import android.graphics.Bitmap |
@@ -223,7 +224,7 @@ abstract class VideoPlayerUi protected constructor( |
223 | 224 | ShareUtils.copyToClipboard(context, player.videoUrlAtCurrentTime) |
224 | 225 | true |
225 | 226 | } |
226 | | - binding.fullScreenButton.setOnClickListener( |
| 227 | + binding.fullscreenToggleButtonSecondaryMenu.setOnClickListener( |
227 | 228 | makeOnClickListener { |
228 | 229 | player.setRecovery() |
229 | 230 | NavigationHelper.playOnMainPlayer( |
@@ -303,8 +304,8 @@ abstract class VideoPlayerUi protected constructor( |
303 | 304 | binding.moreOptionsButton.setOnLongClickListener(null) |
304 | 305 | binding.share.setOnClickListener(null) |
305 | 306 | binding.share.setOnLongClickListener(null) |
306 | | - binding.fullScreenButton.setOnClickListener(null) |
307 | | - binding.screenRotationButton.setOnClickListener(null) |
| 307 | + binding.fullscreenToggleButtonSecondaryMenu.setOnClickListener(null) |
| 308 | + binding.fullscreenToggleButton.setOnClickListener(null) |
308 | 309 | binding.playWithKodi.setOnClickListener(null) |
309 | 310 | binding.openInBrowser.setOnClickListener(null) |
310 | 311 | binding.playerCloseButton.setOnClickListener(null) |
@@ -962,6 +963,8 @@ abstract class VideoPlayerUi protected constructor( |
962 | 963 | player.toggleShuffleModeEnabled() |
963 | 964 | } |
964 | 965 |
|
| 966 | + // TODO: don’t reference internal exoplayer2 resources |
| 967 | + @SuppressLint("PrivateResource") |
965 | 968 | override fun onRepeatModeChanged(@RepeatMode repeatMode: Int) { |
966 | 969 | super.onRepeatModeChanged(repeatMode) |
967 | 970 |
|
@@ -1477,7 +1480,7 @@ abstract class VideoPlayerUi protected constructor( |
1477 | 1480 | if (player.currentState == STATE_PLAYING && !isSomePopupMenuVisible) { |
1478 | 1481 | if (v == binding.playPauseButton || |
1479 | 1482 | // Hide controls in fullscreen immediately |
1480 | | - (v == binding.screenRotationButton && isFullscreen) |
| 1483 | + (v == binding.fullscreenToggleButton && isFullscreen) |
1481 | 1484 | ) { |
1482 | 1485 | hideControls(0, 0) |
1483 | 1486 | } else { |
|
0 commit comments