be-gay-do-crimes
/
NewPipe
mirror of https://github.com/TeamNewPipe/NewPipe
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed wrong padding on devices with cutout on vertical videos

This commit is contained in:
Avently 2020-08-17 20:18:16 +03:00
parent 8030312924
commit e833d415e3
1 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java
View File

@ -915,8 +915,8 @@ public class VideoPlayerImpl extends VideoPlayer
// show kodi button if it supports the current service and it is enabled in settings // show kodi button if it supports the current service and it is enabled in settings
final boolean showKodiButton = playQueue != null && playQueue.getItem() != null final boolean showKodiButton = playQueue != null && playQueue.getItem() != null
&& KoreUtil.isServiceSupportedByKore(playQueue.getItem().getServiceId()) && KoreUtil.isServiceSupportedByKore(playQueue.getItem().getServiceId())
&& PreferenceManager.getDefaultSharedPreferences(context) && PreferenceManager.getDefaultSharedPreferences(context)
.getBoolean(context.getString(R.string.show_play_with_kodi_key), false); .getBoolean(context.getString(R.string.show_play_with_kodi_key), false);
playWithKodi.setVisibility(videoPlayerSelected() && kodiEnabled && showKodiButton playWithKodi.setVisibility(videoPlayerSelected() && kodiEnabled && showKodiButton
? View.VISIBLE : View.GONE); ? View.VISIBLE : View.GONE);
} }
@ -1499,9 +1499,10 @@ public class VideoPlayerImpl extends VideoPlayer
// It doesn't include NavigationBar, notches, etc. // It doesn't include NavigationBar, notches, etc.
display.getSize(size); display.getSize(size);
final boolean isLandscape = service.isLandscape();
final int width = isFullscreen final int width = isFullscreen
? (service.isLandscape() ? (isLandscape ? size.x : size.y)
? size.x : size.y) : ViewGroup.LayoutParams.MATCH_PARENT; : ViewGroup.LayoutParams.MATCH_PARENT;
final int gravity = isFullscreen final int gravity = isFullscreen
? (display.getRotation() == Surface.ROTATION_90 ? (display.getRotation() == Surface.ROTATION_90
? Gravity.START : Gravity.END) ? Gravity.START : Gravity.END)
@ -1532,14 +1533,15 @@ public class VideoPlayerImpl extends VideoPlayer
// And the situations when we need to set custom height is // And the situations when we need to set custom height is
// in fullscreen mode in tablet in non-multiWindow mode or with vertical video. // in fullscreen mode in tablet in non-multiWindow mode or with vertical video.
// Other than that MATCH_PARENT is good // Other than that MATCH_PARENT is good
final boolean navBarAtTheBottom = DeviceUtils.isTablet(service) || !service.isLandscape(); final boolean navBarAtTheBottom = DeviceUtils.isTablet(service) || !isLandscape;
controlsRoot.getLayoutParams().height = isFullscreen && !isInMultiWindow() controlsRoot.getLayoutParams().height = isFullscreen && !isInMultiWindow()
&& navBarAtTheBottom ? size.y : ViewGroup.LayoutParams.MATCH_PARENT; && navBarAtTheBottom ? size.y : ViewGroup.LayoutParams.MATCH_PARENT;
controlsRoot.requestLayout(); controlsRoot.requestLayout();
final int topPadding = isFullscreen && !isInMultiWindow() ? getStatusBarHeight() : 0; int topPadding = isFullscreen && !isInMultiWindow() ? getStatusBarHeight() : 0;
getRootView().findViewById(R.id.playbackWindowRoot).setPadding(0, topPadding, 0, 0); topPadding = !isLandscape && hasCutout(topPadding) ? 0 : topPadding;
getRootView().findViewById(R.id.playbackWindowRoot).requestLayout(); getRootView().findViewById(R.id.playbackWindowRoot).setTranslationY(topPadding);
getBottomControlsRoot().setTranslationY(-topPadding);
} }
/** /**
@ -1548,8 +1550,12 @@ public class VideoPlayerImpl extends VideoPlayer
*/ */
private int getStatusBarHeight() { private int getStatusBarHeight() {
int statusBarHeight = 0; int statusBarHeight = 0;
final int resourceId = service.getResources().getIdentifier( final int resourceId = service.isLandscape()
"status_bar_height_landscape", "dimen", "android"); ? service.getResources().getIdentifier(
"status_bar_height_landscape", "dimen", "android")
: service.getResources().getIdentifier(
"status_bar_height", "dimen", "android");
if (resourceId > 0) { if (resourceId > 0) {
statusBarHeight = service.getResources().getDimensionPixelSize(resourceId); statusBarHeight = service.getResources().getDimensionPixelSize(resourceId);
} }
@ -1563,6 +1569,20 @@ public class VideoPlayerImpl extends VideoPlayer
return statusBarHeight; return statusBarHeight;
} }
/*
* Compares current status bar height with default status bar height in Android and decides,
* does the device has cutout or not
* */
private boolean hasCutout(final float statusBarHeight) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
final DisplayMetrics metrics = getRootView().getResources().getDisplayMetrics();
final float defaultStatusBarHeight = TypedValue.applyDimension(
TypedValue.COMPLEX_UNIT_DIP, 25, metrics);
return statusBarHeight > defaultStatusBarHeight;
}
return false;
}
protected void setMuteButton(final ImageButton button, final boolean isMuted) { protected void setMuteButton(final ImageButton button, final boolean isMuted) {
button.setImageDrawable(AppCompatResources.getDrawable(service, isMuted button.setImageDrawable(AppCompatResources.getDrawable(service, isMuted
? R.drawable.ic_volume_off_white_24dp : R.drawable.ic_volume_up_white_24dp)); ? R.drawable.ic_volume_off_white_24dp : R.drawable.ic_volume_up_white_24dp));
@ -2081,7 +2101,7 @@ public class VideoPlayerImpl extends VideoPlayer
* This will be called when a user goes to another app/activity, turns off a screen. * This will be called when a user goes to another app/activity, turns off a screen.
* We don't want to interrupt playback and don't want to see notification so * We don't want to interrupt playback and don't want to see notification so
* next lines of code will enable audio-only playback only if needed * next lines of code will enable audio-only playback only if needed
* */ */
private void onFragmentStopped() { private void onFragmentStopped() {
if (videoPlayerSelected() && (isPlaying() || isLoading())) { if (videoPlayerSelected() && (isPlaying() || isLoading())) {
if (backgroundPlaybackEnabled()) { if (backgroundPlaybackEnabled()) {