From 09ab843309b822e768bde153581195f83c218dbe Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Tue, 22 Dec 2015 12:55:11 +0100 Subject: [PATCH] Fixed reveal animation, updated gradle plugin --- .../gramophone/ui/fragments/player/PlayerFragment.java | 5 +++-- build.gradle | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java index f246d752..c92b6363 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java @@ -224,9 +224,10 @@ public class PlayerFragment extends AbsPlayerFragment implements PlayerAlbumCove slidingUpPanelLayout.setBackgroundColor(lastColor); Animator backgroundAnimator; if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + int topMargin = getResources().getDimensionPixelSize(R.dimen.status_bar_padding); int x = (int) (playbackControlsFragment.playPauseFab.getX() + playbackControlsFragment.playPauseFab.getWidth() / 2 + playbackControlsFragment.getView().getX()); - int y = (int) (playbackControlsFragment.playPauseFab.getY() + playbackControlsFragment.playPauseFab.getHeight() / 2 + playbackControlsFragment.getView().getY()); - float startRadius = 0; + int y = (int) (topMargin + playbackControlsFragment.playPauseFab.getY() + playbackControlsFragment.playPauseFab.getHeight() / 2 + playbackControlsFragment.getView().getY()); + float startRadius = Math.max(playbackControlsFragment.playPauseFab.getWidth() / 2, playbackControlsFragment.playPauseFab.getHeight() / 2); float endRadius = Math.max(colorBackground.getWidth(), colorBackground.getHeight()); colorBackground.setBackgroundColor(newColor); backgroundAnimator = ViewAnimationUtils.createCircularReveal(colorBackground, x, y, startRadius, endRadius); diff --git a/build.gradle b/build.gradle index cd1429ec..6d210cb9 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.0.0-alpha2' + classpath 'com.android.tools.build:gradle:2.0.0-alpha3' classpath 'com.github.triplet.gradle:play-publisher:1.1.3' } }