yenru0/EhViewer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix primary fab glitches

Browse Source
This commit is contained in:
tehcneko committed 2021-04-07 15:20:12 +08:00
1 parent 9839c6077a
commit 249fcc0c0e
1 file changed
+15 -4
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
+15 -4
View File
@@ -40,6 +40,7 @@ import android.view.MenuItem;
import android.view.View;
import android.view.ViewConfiguration;
import android.view.ViewGroup;
import android.view.ViewPropertyAnimator;
import android.view.WindowInsets;
import android.view.WindowInsetsAnimation;
import android.widget.ImageView;
@@ -188,6 +189,8 @@ public final class GalleryListScene extends BaseScene
}
};
@Nullable
private ViewPropertyAnimator fabAnimator;
@Nullable
private ViewTransition mViewTransition;
@Nullable
private GalleryListAdapter mAdapter;
@@ -1193,11 +1196,15 @@ public final class GalleryListScene extends BaseScene
if (null != mFabLayout && STATE_NORMAL == mState && !mShowActionFab) {
mShowActionFab = true;
View fab = mFabLayout.getPrimaryFab();
if (fabAnimator != null) {
fabAnimator.cancel();
}
fab.setVisibility(View.VISIBLE);
fab.setRotation(-45.0f);
fab.animate().scaleX(1.0f).scaleY(1.0f).rotation(0.0f).setListener(null)
fabAnimator = fab.animate().scaleX(1.0f).scaleY(1.0f).rotation(0.0f).setListener(null)
.setDuration(ANIMATE_TIME).setStartDelay(0L)
.setInterpolator(AnimationUtils.FAST_SLOW_INTERPOLATOR).start();
.setInterpolator(AnimationUtils.FAST_SLOW_INTERPOLATOR);
fabAnimator.start();
}
}
@@ -1205,9 +1212,13 @@ public final class GalleryListScene extends BaseScene
if (null != mFabLayout && STATE_NORMAL == mState && mShowActionFab) {
mShowActionFab = false;
View fab = mFabLayout.getPrimaryFab();
fab.animate().scaleX(0.0f).scaleY(0.0f).setListener(mActionFabAnimatorListener)
if (fabAnimator != null) {
fabAnimator.cancel();
}
fabAnimator = fab.animate().scaleX(0.0f).scaleY(0.0f).setListener(mActionFabAnimatorListener)
.setDuration(ANIMATE_TIME).setStartDelay(0L)
.setInterpolator(AnimationUtils.SLOW_FAST_INTERPOLATOR).start();
.setInterpolator(AnimationUtils.SLOW_FAST_INTERPOLATOR);
fabAnimator.start();
}
}