baalajimaestro/NewPipe
1
0
Fork 0
Code Issues Pull requests Projects Releases 7 Packages Wiki Activity

Merge pull request #5458 from Stypox/fix-popup-x

Browse source 
Fix popup closing x button animation
This commit is contained in:
Tobias Groza 2021-01-22 10:01:12 +01:00 committed by GitHub
commit cafc64534b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/schabi/newpipe/player/Player.java
View file

@ -4003,7 +4003,7 @@ public final class Player implements
} }
public View getClosingOverlayView() { public View getClosingOverlayView() {
return closeOverlayBinding.getRoot(); return binding.closingOverlay;
} }
public ProgressBar getVolumeProgressBar() { public ProgressBar getVolumeProgressBar() {

11
app/src/main/java/org/schabi/newpipe/player/event/PlayerGestureListener.java
View file

@ -124,11 +124,11 @@ public class PlayerGestureListener
final View closingOverlayView = player.getClosingOverlayView(); final View closingOverlayView = player.getClosingOverlayView();
if (player.isInsideClosingRadius(movingEvent)) { if (player.isInsideClosingRadius(movingEvent)) {
if (closingOverlayView.getVisibility() == View.GONE) { if (closingOverlayView.getVisibility() == View.GONE) {
animate(closingOverlayView, true, 250); animate(closingOverlayView, true, 200);
} }
} else { } else {
if (closingOverlayView.getVisibility() == View.VISIBLE) { if (closingOverlayView.getVisibility() == View.VISIBLE) {
animate(closingOverlayView, false, 0); animate(closingOverlayView, false, 200);
} }
} }
} }
@ -234,12 +234,9 @@ public class PlayerGestureListener
if (player.isInsideClosingRadius(event)) { if (player.isInsideClosingRadius(event)) {
player.closePopup(); player.closePopup();
} else { } else if (!player.isPopupClosing()) {
animate(player.getClosingOverlayView(), false, 0);
if (!player.isPopupClosing()) {
animate(player.getCloseOverlayButton(), false, 200); animate(player.getCloseOverlayButton(), false, 200);
} animate(player.getClosingOverlayView(), false, 200);
} }
} }
} }