yetangitu/NewPipe
1
0
Fork 0
mirror of https://github.com/TeamNewPipe/NewPipe.git synced 2025-10-03 01:39:38 +02:00
Code Issues Releases Wiki Activity

Merge pull request #12612 from Profpatsch/rename-fullscreen-buttons

Browse source
This commit is contained in:
Stypox 2025-09-07 18:00:47 +02:00 • committed by GitHub
commit 759342fa62
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 64 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.kt
View file

@ -991,7 +991,7 @@ class VideoDetailFragment :
// restored (i.e. bottomSheetState) to STATE_EXPANDED.
updateBottomSheetState(BottomSheetBehavior.STATE_EXPANDED)
// toggle landscape in order to open directly in fullscreen
onScreenRotationButtonClicked()
onFullscreenToggleButtonClicked()
}
if (PreferenceManager.getDefaultSharedPreferences(activity)
@ -1726,7 +1726,7 @@ class VideoDetailFragment :
tryAddVideoPlayerView()
}
override fun onScreenRotationButtonClicked() {
override fun onFullscreenToggleButtonClicked() {
// In tablet user experience will be better if screen will not be rotated
// from landscape to portrait every time.
// Just turn on fullscreen mode in landscape orientation

2
app/src/main/java/org/schabi/newpipe/player/event/PlayerServiceEventListener.java
View file

@ -10,7 +10,7 @@ public interface PlayerServiceEventListener extends PlayerEventListener {
void onFullscreenStateChanged(boolean fullscreen);
void onScreenRotationButtonClicked();
void onFullscreenToggleButtonClicked();
void onMoreOptionsLongClicked();

4
app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.kt
View file

@ -243,8 +243,8 @@ object PlayerHolder {
listener?.onFullscreenStateChanged(fullscreen)
}
override fun onScreenRotationButtonClicked() {
listener?.onScreenRotationButtonClicked()
override fun onFullscreenToggleButtonClicked() {
listener?.onFullscreenToggleButtonClicked()
}
override fun onMoreOptionsLongClicked() {

74
app/src/main/java/org/schabi/newpipe/player/ui/MainPlayerUi.java
View file

@ -122,7 +122,7 @@ public final class MainPlayerUi extends VideoPlayerUi implements View.OnLayoutCh
&& DeviceUtils.isTablet(player.getService())
&& PlayerHelper.globalScreenOrientationLocked(player.getService())) {
player.getFragmentListener().ifPresent(
PlayerServiceEventListener::onScreenRotationButtonClicked);
PlayerServiceEventListener::onFullscreenToggleButtonClicked);
}
}
@ -154,12 +154,12 @@ public final class MainPlayerUi extends VideoPlayerUi implements View.OnLayoutCh
protected void initListeners() {
super.initListeners();
binding.screenRotationButton.setOnClickListener(makeOnClickListener(() -> {
binding.fullscreenToggleButton.setOnClickListener(makeOnClickListener(() -> {
// Only if it's not a vertical video or vertical video but in landscape with locked
// orientation a screen orientation can be changed automatically
if (!isVerticalVideo || (isLandscape() && globalScreenOrientationLocked(context))) {
player.getFragmentListener()
.ifPresent(PlayerServiceEventListener::onScreenRotationButtonClicked);
.ifPresent(PlayerServiceEventListener::onFullscreenToggleButtonClicked);
} else {
toggleFullscreen();
}
@ -233,7 +233,7 @@ public final class MainPlayerUi extends VideoPlayerUi implements View.OnLayoutCh
// Exit from fullscreen when user closes the player via notification
if (isFullscreen) {
toggleFullscreen();
exitFullscreen();
}
removeViewFromParent();
@ -270,7 +270,7 @@ public final class MainPlayerUi extends VideoPlayerUi implements View.OnLayoutCh
closeItemsList();
showHideKodiButton();
binding.fullScreenButton.setVisibility(View.GONE);
binding.fullscreenToggleButtonSecondaryMenu.setVisibility(View.GONE);
setupScreenRotationButton();
binding.resizeTextView.setVisibility(View.VISIBLE);
binding.getRoot().findViewById(R.id.metadataView).setVisibility(View.VISIBLE);
@ -414,7 +414,7 @@ public final class MainPlayerUi extends VideoPlayerUi implements View.OnLayoutCh
public void onCompleted() {
super.onCompleted();
if (isFullscreen) {
toggleFullscreen();
exitFullscreen();
}
}
//endregion
@ -885,10 +885,10 @@ public final class MainPlayerUi extends VideoPlayerUi implements View.OnLayoutCh
//region Video size, orientation, fullscreen
private void setupScreenRotationButton() {
binding.screenRotationButton.setVisibility(globalScreenOrientationLocked(context)
binding.fullscreenToggleButton.setVisibility(globalScreenOrientationLocked(context)
|| isVerticalVideo || DeviceUtils.isTablet(context)
? View.VISIBLE : View.GONE);
binding.screenRotationButton.setImageDrawable(AppCompatResources.getDrawable(context,
binding.fullscreenToggleButton.setImageDrawable(AppCompatResources.getDrawable(context,
isFullscreen ? R.drawable.ic_fullscreen_exit
: R.drawable.ic_fullscreen));
}
@ -905,7 +905,7 @@ public final class MainPlayerUi extends VideoPlayerUi implements View.OnLayoutCh
&& !DeviceUtils.isTablet(context)) {
// set correct orientation
player.getFragmentListener().ifPresent(
PlayerServiceEventListener::onScreenRotationButtonClicked);
PlayerServiceEventListener::onFullscreenToggleButtonClicked);
}
setupScreenRotationButton();
@ -915,28 +915,54 @@ public final class MainPlayerUi extends VideoPlayerUi implements View.OnLayoutCh
if (DEBUG) {
Log.d(TAG, "toggleFullscreen() called");
}
if (isFullscreen) {
exitFullscreen();
} else {
enterFullscreen();
}
}
public void enterFullscreen() {
if (DEBUG) {
Log.d(TAG, "enterFullscreen() called");
}
final PlayerServiceEventListener fragmentListener = player.getFragmentListener()
.orElse(null);
if (fragmentListener == null || player.exoPlayerIsNull()) {
return;
}
isFullscreen = true;
// Android needs tens milliseconds to send new insets but a user is able to see
// how controls changes it's position from `0` to `nav bar height` padding.
// So just hide the controls to hide this visual inconsistency
hideControls(0, 0);
fragmentListener.onFullscreenStateChanged(true);
setupFullscreenButtons(true);
}
isFullscreen = !isFullscreen;
if (isFullscreen) {
// Android needs tens milliseconds to send new insets but a user is able to see
// how controls changes it's position from `0` to `nav bar height` padding.
// So just hide the controls to hide this visual inconsistency
hideControls(0, 0);
} else {
// Apply window insets because Android will not do it when orientation changes
// from landscape to portrait (open vertical video to reproduce)
binding.playbackControlRoot.setPadding(0, 0, 0, 0);
public void exitFullscreen() {
if (DEBUG) {
Log.d(TAG, "exitFullscreen() called");
}
fragmentListener.onFullscreenStateChanged(isFullscreen);
final PlayerServiceEventListener fragmentListener = player.getFragmentListener()
.orElse(null);
if (fragmentListener == null || player.exoPlayerIsNull()) {
return;
}
isFullscreen = false;
// Apply window insets because Android will not do it when orientation changes
// from landscape to portrait (open vertical video to reproduce)
binding.playbackControlRoot.setPadding(0, 0, 0, 0);
fragmentListener.onFullscreenStateChanged(false);
setupFullscreenButtons(false);
}
binding.titleTextView.setVisibility(isFullscreen ? View.VISIBLE : View.GONE);
binding.channelTextView.setVisibility(isFullscreen ? View.VISIBLE : View.GONE);
binding.playerCloseButton.setVisibility(isFullscreen ? View.GONE : View.VISIBLE);
private void setupFullscreenButtons(final boolean fullscreen) {
binding.titleTextView.setVisibility(fullscreen ? View.VISIBLE : View.GONE);
binding.channelTextView.setVisibility(fullscreen ? View.VISIBLE : View.GONE);
binding.playerCloseButton.setVisibility(fullscreen ? View.GONE : View.VISIBLE);
setupScreenRotationButton();
}
@ -951,7 +977,7 @@ public final class MainPlayerUi extends VideoPlayerUi implements View.OnLayoutCh
if (videoInLandscapeButNotInFullscreen
&& notPaused
&& !DeviceUtils.isTablet(context)) {
toggleFullscreen();
enterFullscreen();
}
}
//endregion

4
app/src/main/java/org/schabi/newpipe/player/ui/PopupPlayerUi.java
View file

@ -153,8 +153,8 @@ public final class PopupPlayerUi extends VideoPlayerUi {
@Override
protected void setupElementsVisibility() {
binding.fullScreenButton.setVisibility(View.VISIBLE);
binding.screenRotationButton.setVisibility(View.GONE);
binding.fullscreenToggleButtonSecondaryMenu.setVisibility(View.VISIBLE);
binding.fullscreenToggleButton.setVisibility(View.GONE);
binding.resizeTextView.setVisibility(View.GONE);
binding.getRoot().findViewById(R.id.metadataView).setVisibility(View.GONE);
binding.queueButton.setVisibility(View.GONE);

8
app/src/main/java/org/schabi/newpipe/player/ui/VideoPlayerUi.java
View file

@ -234,7 +234,7 @@ public abstract class VideoPlayerUi extends PlayerUi implements SeekBar.OnSeekBa
ShareUtils.copyToClipboard(context, player.getVideoUrlAtCurrentTime());
return true;
});
binding.fullScreenButton.setOnClickListener(makeOnClickListener(() -> {
binding.fullscreenToggleButtonSecondaryMenu.setOnClickListener(makeOnClickListener(() -> {
player.setRecovery();
NavigationHelper.playOnMainPlayer(context,
Objects.requireNonNull(player.getPlayQueue()), true);
@ -301,8 +301,8 @@ public abstract class VideoPlayerUi extends PlayerUi implements SeekBar.OnSeekBa
binding.moreOptionsButton.setOnLongClickListener(null);
binding.share.setOnClickListener(null);
binding.share.setOnLongClickListener(null);
binding.fullScreenButton.setOnClickListener(null);
binding.screenRotationButton.setOnClickListener(null);
binding.fullscreenToggleButtonSecondaryMenu.setOnClickListener(null);
binding.fullscreenToggleButton.setOnClickListener(null);
binding.playWithKodi.setOnClickListener(null);
binding.openInBrowser.setOnClickListener(null);
binding.playerCloseButton.setOnClickListener(null);
@ -1455,7 +1455,7 @@ public abstract class VideoPlayerUi extends PlayerUi implements SeekBar.OnSeekBa
if (player.getCurrentState() == STATE_PLAYING && !isSomePopupMenuVisible) {
if (v == binding.playPauseButton
// Hide controls in fullscreen immediately
|| (v == binding.screenRotationButton && isFullscreen())) {
|| (v == binding.fullscreenToggleButton && isFullscreen())) {
hideControls(0, 0);
} else {
hideControls(DEFAULT_CONTROLS_DURATION, DEFAULT_CONTROLS_HIDE_TIME);

6
app/src/main/res/layout/player.xml
View file

@ -363,7 +363,7 @@
tools:ignore="RtlHardcoded" />
<androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/fullScreenButton"
android:id="@+id/fullscreenToggleButtonSecondaryMenu"
android:layout_width="40dp"
android:layout_height="40dp"
android:background="?attr/selectableItemBackgroundBorderless"
@ -457,7 +457,7 @@
android:layout_gravity="center"
android:layout_marginTop="2dp"
android:layout_weight="1"
android:nextFocusDown="@id/screenRotationButton"
android:nextFocusDown="@id/fullscreenToggleButton"
tools:progress="25"
tools:secondaryProgress="50" />
@ -486,7 +486,7 @@
tools:ignore="HardcodedText,RtlHardcoded,RtlSymmetry" />
<androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/screenRotationButton"
android:id="@+id/fullscreenToggleButton"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginStart="4dp"