SeekOverlay: Hide controls shadow in most cases during seeking

TeamNewPipe · Nov 20, 2020 · 95ad4ef · 95ad4ef
1 parent 9555a77
commit 95ad4ef
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 52 deletions.
diff --git a/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java b/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java
@@ -460,70 +460,77 @@ private void setupPlayerSeekOverlay() {
         final int fadeDurations = 450;
 
         seekOverlay.showCircle(true)
-            .circleBackgroundColorInt(CircleClipTapView.COLOR_DARK_TRANSPARENT)
+            .circleBackgroundColorInt(CircleClipTapView.COLOR_DARK)
             .seekSeconds(seekDurationInMillis / 1000)
             .performListener(new PlayerSeekOverlay.PerformListener() {
 
-            final boolean keepShadow = true;
+                boolean keepShadow = false;
 
-            @Override
-            public void onPrepare() {
-                if (checkCorrectConditions()) {
-                    gestureListener.endMultiDoubleTap();
-                    return;
-                }
-                seekOverlay.arcSize(CircleClipTapView.Companion.calculateArcSize(getSurfaceView()));
-            }
+                @Override
+                public void onPrepare() {
+                    if (checkCorrectConditions()) {
+                        gestureListener.endMultiDoubleTap();
+                        return;
+                    }
 
-            @Override
-            public void onAnimationStart() {
-                animateView(seekOverlay, true, fadeDurations);
-                hideControls(fadeDurations, 0, keepShadow);
-            }
+                    keepShadow = !getPlayer().getPlayWhenReady() && isControlsVisible();
+                    seekOverlay
+                        .arcSize(CircleClipTapView.Companion.calculateArcSize(getSurfaceView()))
+                        .circleBackgroundColorInt(
+                            keepShadow ? CircleClipTapView.COLOR_DARK_TRANSPARENT
+                                : CircleClipTapView.COLOR_DARK
+                        );
+                }
 
-            @Override
-            public void onAnimationEnd() {
-                animateView(seekOverlay, false, fadeDurations);
-                if (!getPlayer().getPlayWhenReady()) {
-                    showControls(fadeDurations);
-                } else {
-                    showHideShadow(false, fadeDurations, 0);
+                @Override
+                public void onAnimationStart() {
+                    animateView(seekOverlay, true, fadeDurations);
+                    hideControls(fadeDurations, 0, keepShadow);
                 }
-            }
 
-            @Override
-            public Boolean shouldFastForward(@NotNull final DisplayPortion portion) {
-                // Null indicates an invalid area or condition e.g. the middle portion
-                // or video start or end was reached during double tap seeking
-                if (checkCorrectConditions()) {
-                    return null;
+                @Override
+                public void onAnimationEnd() {
+                    animateView(seekOverlay, false, fadeDurations);
+                    if (!getPlayer().getPlayWhenReady()) {
+                        showControls(fadeDurations);
+                    } else {
+                        showHideShadow(false, fadeDurations, 0);
+                    }
                 }
-                if (portion == DisplayPortion.LEFT) {
-                    return false;
-                } else if (portion == DisplayPortion.RIGHT) {
-                    return true;
-                } else /* portion == DisplayPortion.MIDDLE */ {
-                    return null;
+
+                @Override
+                public Boolean shouldFastForward(@NotNull final DisplayPortion portion) {
+                    // Null indicates an invalid area or condition e.g. the middle portion
+                    // or video start or end was reached during double tap seeking
+                    if (checkCorrectConditions()) {
+                        return null;
+                    }
+                    if (portion == DisplayPortion.LEFT) {
+                        return false;
+                    } else if (portion == DisplayPortion.RIGHT) {
+                        return true;
+                    } else /* portion == DisplayPortion.MIDDLE */ {
+                        return null;
+                    }
                 }
-            }
 
-            @Override
-            public void seek(final boolean forward) {
-                gestureListener.keepInDoubleTapMode();
-                if (forward) {
-                    onFastForward();
-                } else {
-                    onFastRewind();
+                @Override
+                public void seek(final boolean forward) {
+                    gestureListener.keepInDoubleTapMode();
+                    if (forward) {
+                        onFastForward();
+                    } else {
+                        onFastRewind();
+                    }
                 }
-            }
 
-            private boolean checkCorrectConditions() {
-                return getPlayer().getCurrentPosition() == getPlayer().getDuration()
-                    // Add puffer of a half second, so that direct rewinding is not possible
-                    || getPlayer().getCurrentPosition() <= 500L
-                    || getPlayer().getPlaybackState() == Player.STATE_ENDED
-                    || getPlayer().getPlaybackState() == Player.STATE_IDLE;
-            }
+                private boolean checkCorrectConditions() {
+                    return getPlayer().getCurrentPosition() == getPlayer().getDuration()
+                        // Add puffer of a half second, so that direct rewinding is not possible
+                        || getPlayer().getCurrentPosition() <= 500L
+                        || getPlayer().getPlaybackState() == Player.STATE_ENDED
+                        || getPlayer().getPlaybackState() == Player.STATE_IDLE;
+                }
         });
         gestureListener.doubleTapControls(seekOverlay);
     }

diff --git a/app/src/main/java/org/schabi/newpipe/views/player/CircleClipTapView.kt b/app/src/main/java/org/schabi/newpipe/views/player/CircleClipTapView.kt
@@ -11,7 +11,7 @@ import org.schabi.newpipe.player.event.DisplayPortion
 class CircleClipTapView(context: Context?, attrs: AttributeSet) : View(context, attrs) {
 
     companion object {
-        const val COLOR_DARK = 0x40000000
+        const val COLOR_DARK = 0x45000000
         const val COLOR_DARK_TRANSPARENT = 0x30000000
         const val COLOR_LIGHT_TRANSPARENT = 0x25EEEEEE