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

Moved device-specific code into DeviceUtils

This commit is contained in:
Avently 2020-09-03 15:44:36 +03:00
parent e833d415e3
commit b8a35e9e4a
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1538,8 +1538,9 @@ public class VideoPlayerImpl extends VideoPlayer
&& navBarAtTheBottom ? size.y : ViewGroup.LayoutParams.MATCH_PARENT; && navBarAtTheBottom ? size.y : ViewGroup.LayoutParams.MATCH_PARENT;
controlsRoot.requestLayout(); controlsRoot.requestLayout();
final DisplayMetrics metrics = getRootView().getResources().getDisplayMetrics();
int topPadding = isFullscreen && !isInMultiWindow() ? getStatusBarHeight() : 0; int topPadding = isFullscreen && !isInMultiWindow() ? getStatusBarHeight() : 0;
topPadding = !isLandscape && hasCutout(topPadding) ? 0 : topPadding; topPadding = !isLandscape && DeviceUtils.hasCutout(topPadding, metrics) ? 0 : topPadding;
getRootView().findViewById(R.id.playbackWindowRoot).setTranslationY(topPadding); getRootView().findViewById(R.id.playbackWindowRoot).setTranslationY(topPadding);
getBottomControlsRoot().setTranslationY(-topPadding); getBottomControlsRoot().setTranslationY(-topPadding);
} }
@ -1569,20 +1570,6 @@ 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));

15
app/src/main/java/org/schabi/newpipe/util/DeviceUtils.java
View File

@ -6,6 +6,8 @@ import android.content.pm.PackageManager;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.os.BatteryManager; import android.os.BatteryManager;
import android.os.Build; import android.os.Build;
import android.util.DisplayMetrics;
import android.util.TypedValue;
import android.view.KeyEvent; import android.view.KeyEvent;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
@ -72,4 +74,17 @@ public final class DeviceUtils {
return false; return false;
} }
} }
/*
* Compares current status bar height with default status bar height in Android and decides,
* does the device has cutout or not
* */
public static boolean hasCutout(final float statusBarHeight, final DisplayMetrics metrics) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
final float defaultStatusBarHeight = TypedValue.applyDimension(
TypedValue.COMPLEX_UNIT_DIP, 25, metrics);
return statusBarHeight > defaultStatusBarHeight;
}
return false;
}
} }