Fix expand arrow alpha animation

Signed-off-by: enricocid <enrico2588@gmail.com>
enricocid · Jun 14, 2018 · 4d6a1ed · 4d6a1ed
1 parent 7e02260
commit 4d6a1ed
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/project/app/src/main/java/com/iven/musicplayergo/MainActivity.java b/project/app/src/main/java/com/iven/musicplayergo/MainActivity.java
@@ -33,6 +33,8 @@
 import android.view.ViewAnimationUtils;
 import android.view.ViewTreeObserver;
 import android.view.animation.Animation;
+import android.view.animation.AnimationSet;
+import android.view.animation.DecelerateInterpolator;
 import android.view.animation.RotateAnimation;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
@@ -649,13 +651,16 @@ public void expandArtistDetails(View v) {
 
     private void rotateExpandImage(final boolean expand) {
 
-        final int ALPHA_DURATION = 100;
+        final int ALPHA_DURATION = 250;
         final float PIVOT_VALUE = 0.5f;
         final int PIVOT_TYPE = RotateAnimation.RELATIVE_TO_SELF;
         final float from = expand ? 0.0f : 180.0f;
         final float to = expand ? 180.0f : 0.0f;
-        final float originalAlpha = mExpandImage.getImageAlpha();
 
+        AnimationSet animSet = new AnimationSet(true);
+        animSet.setInterpolator(new DecelerateInterpolator());
+        animSet.setFillAfter(true);
+        animSet.setFillEnabled(true);
         final RotateAnimation animRotate = new RotateAnimation(from, to, PIVOT_TYPE, PIVOT_VALUE, PIVOT_TYPE, PIVOT_VALUE);
         animRotate.setDuration(ANIMATION_DURATION);
         animRotate.setFillAfter(true);
@@ -664,23 +669,24 @@ private void rotateExpandImage(final boolean expand) {
             public void onAnimationStart(Animation animation) {
                 if (!expand) {
                     mExpandImage.setVisibility(View.VISIBLE);
-                    mExpandImage.animate().alpha(originalAlpha).setDuration(ALPHA_DURATION).start();
+                    mExpandImage.animate().alpha(1.0f).setDuration(ALPHA_DURATION).start();
                 }
             }
 
             @Override
             public void onAnimationEnd(Animation animation) {
                 if (expand) {
                     mExpandImage.animate().alpha(0.0f).setDuration(ALPHA_DURATION).start();
-                    mExpandImage.setVisibility(View.GONE);
+                    mExpandImage.setVisibility(View.INVISIBLE);
                 }
             }
 
             @Override
             public void onAnimationRepeat(Animation animation) {
             }
         });
-        mExpandImage.startAnimation(animRotate);
+        animSet.addAnimation(animRotate);
+        mExpandImage.startAnimation(animSet);
     }
 
     private void revealView(final View viewToReveal, final View viewToHide, final boolean isSettings, boolean show) {

diff --git a/project/app/src/main/res/layout/player_now_playing.xml b/project/app/src/main/res/layout/player_now_playing.xml
@@ -19,9 +19,9 @@
     <LinearLayout
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="2dp"
         android:layout_weight="1"
         android:orientation="vertical"
-        android:layout_marginEnd="2dp"
         android:padding="4dp">
 
         <TextView