Skip to content

Commit 6fb92b1

Browse files
committed
fix issue about FAB behavior
1 parent 2087150 commit 6fb92b1

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

app/src/main/java/com/forgetsky/wanandroid/widget/behavior/AnimatorUtil.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package com.forgetsky.wanandroid.widget.behavior;
1717

18+
import android.support.design.widget.CoordinatorLayout;
1819
import android.support.v4.view.ViewCompat;
1920
import android.support.v4.view.ViewPropertyAnimatorListener;
2021
import android.support.v4.view.animation.LinearOutSlowInInterpolator;
@@ -87,8 +88,9 @@ public static void translateShow(View view, ViewPropertyAnimatorListener viewPro
8788
*/
8889
public static void translateHide(View view, ViewPropertyAnimatorListener viewPropertyAnimatorListener) {
8990
view.setVisibility(View.VISIBLE);
91+
CoordinatorLayout.LayoutParams layoutParams = (CoordinatorLayout.LayoutParams) view.getLayoutParams();
9092
ViewCompat.animate(view)
91-
.translationY(350)
93+
.translationY(view.getHeight() + layoutParams.bottomMargin)
9294
.setDuration(400)
9395
.setInterpolator(FAST_OUT_SLOW_IN_INTERPOLATOR)
9496
.setListener(viewPropertyAnimatorListener)

app/src/main/java/com/forgetsky/wanandroid/widget/behavior/ScaleDownShowBehavior.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public void onAnimationStart(View view) {
6565
isShow = false;
6666
}
6767
});
68-
} else if ((dyConsumed < 0 || dyUnconsumed < 0 && !isAnimateIng && !isShow)) {
68+
} else if ((dyConsumed < 0 || dyUnconsumed < 0) && !isAnimateIng && !isShow) {
6969
// 手指下滑,显示FAB
7070
AnimatorUtil.translateShow(child, new StateListener() {
7171
@Override

0 commit comments

Comments
 (0)