Skip to content
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

Skipping interception of some gestures #4155

Merged
merged 1 commit into from
Sep 1, 2020
+17 −1
Merged

Skipping interception of some gestures #4155

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Skipping interception of some gestures
@avently
avently committed Aug 17, 2020
commit 24c24d6c724cdf392a8a90b0ffef88cfd5c9f641
8 changes: 8 additions & 0 deletions app/src/main/java/com/google/android/material/appbar/FlingBehavior.java
View file
Original file line number Diff line number Diff line change
@@ -68,6 +68,14 @@ public boolean onInterceptTouchEvent(final CoordinatorLayout parent, final AppBa
return false;
}
}
final View seekBar = child.findViewById(R.id.playbackSeekBar);
if (seekBar != null) {
final boolean visible = seekBar.getGlobalVisibleRect(globalRect);
if (visible && globalRect.contains((int) ev.getRawX(), (int) ev.getRawY())) {
allowScroll = false;
return false;
}
}
allowScroll = true;
switch (ev.getActionMasked()) {
case MotionEvent.ACTION_DOWN:
10 changes: 9 additions & 1 deletion app/src/main/java/org/schabi/newpipe/player/event/CustomBottomSheetBehavior.java
View file
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@
import android.graphics.Rect;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import androidx.annotation.NonNull;
@@ -25,7 +26,7 @@ public CustomBottomSheetBehavior(final Context context, final AttributeSet attrs
private boolean skippingInterception = false;
private final List<Integer> skipInterceptionOfElements = Arrays.asList(
R.id.detail_content_root_layout, R.id.relatedStreamsLayout,
R.id.playQueuePanel, R.id.viewpager);
R.id.playQueuePanel, R.id.viewpager, R.id.bottomControls);

@Override
public boolean onInterceptTouchEvent(@NonNull final CoordinatorLayout parent,
@@ -51,6 +52,13 @@ public boolean onInterceptTouchEvent(@NonNull final CoordinatorLayout parent,
visible = viewGroup.getGlobalVisibleRect(globalRect);
if (visible
&& globalRect.contains((int) event.getRawX(), (int) event.getRawY())) {
// Makes bottom part of the player draggable in portrait when
// playbackControlRoot is hidden
if (element == R.id.bottomControls
&& child.findViewById(R.id.playbackControlRoot)
.getVisibility() != View.VISIBLE) {
return super.onInterceptTouchEvent(parent, child, event);
}
skippingInterception = true;
return false;
}