Merge pull request #5458 from Stypox/fix-popup-x
Fix popup closing x button animation
This commit is contained in:
commit
cafc64534b
2 changed files with 6 additions and 9 deletions
|
@ -4003,7 +4003,7 @@ public final class Player implements
|
|||
}
|
||||
|
||||
public View getClosingOverlayView() {
|
||||
return closeOverlayBinding.getRoot();
|
||||
return binding.closingOverlay;
|
||||
}
|
||||
|
||||
public ProgressBar getVolumeProgressBar() {
|
||||
|
|
|
@ -124,11 +124,11 @@ public class PlayerGestureListener
|
|||
final View closingOverlayView = player.getClosingOverlayView();
|
||||
if (player.isInsideClosingRadius(movingEvent)) {
|
||||
if (closingOverlayView.getVisibility() == View.GONE) {
|
||||
animate(closingOverlayView, true, 250);
|
||||
animate(closingOverlayView, true, 200);
|
||||
}
|
||||
} else {
|
||||
if (closingOverlayView.getVisibility() == View.VISIBLE) {
|
||||
animate(closingOverlayView, false, 0);
|
||||
animate(closingOverlayView, false, 200);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -234,12 +234,9 @@ public class PlayerGestureListener
|
|||
|
||||
if (player.isInsideClosingRadius(event)) {
|
||||
player.closePopup();
|
||||
} else {
|
||||
animate(player.getClosingOverlayView(), false, 0);
|
||||
|
||||
if (!player.isPopupClosing()) {
|
||||
} else if (!player.isPopupClosing()) {
|
||||
animate(player.getCloseOverlayButton(), false, 200);
|
||||
}
|
||||
animate(player.getClosingOverlayView(), false, 200);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue