Skip to content

Block the gesture when touch it from NavigationBar or StatusBar. #3337

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

Merged
TobiGr merged 3 commits into from
May 9, 2020
Merged

Block the gesture when touch it from NavigationBar or StatusBar. #3337

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d9c6f7a
Block the gesture when touch it from NavigationBar or StatusBar.
AioiLight Apr 2, 2020
562754c
Merge branch 'dev' into blocking-gesture-when-touch-from-navbar
AioiLight Apr 4, 2020
0abd2bc
Clean up code
AioiLight Apr 4, 2020
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
23 changes: 23 additions & 0 deletions app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1245,6 +1245,13 @@ public boolean onScroll(final MotionEvent initialEvent, final MotionEvent moving
return false;
}

final boolean isTouchingStatusBar = initialEvent.getY() < getStatusBarHeight();
final boolean isTouchingNavigationBar = initialEvent.getY()
> playerImpl.getRootView().getHeight() - getNavigationBarHeight();
if (isTouchingStatusBar || isTouchingNavigationBar) {
return false;
}

// if (DEBUG) {
// Log.d(TAG, "MainVideoPlayer.onScroll = " +
// "e1.getRaw = [" + initialEvent.getRawX() + ", "
Expand Down Expand Up @@ -1333,6 +1340,22 @@ public boolean onScroll(final MotionEvent initialEvent, final MotionEvent moving
return true;
}

private int getNavigationBarHeight() {
int resId = getResources().getIdentifier("navigation_bar_height", "dimen", "android");
if (resId > 0) {
return getResources().getDimensionPixelSize(resId);
}
return 0;
}

private int getStatusBarHeight() {
int resId = getResources().getIdentifier("status_bar_height", "dimen", "android");
if (resId > 0) {
return getResources().getDimensionPixelSize(resId);
}
return 0;
}

private void onScrollEnd() {
if (DEBUG) {
Log.d(TAG, "onScrollEnd() called");
Expand Down