mnalis/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] del: Unnecessary check removed.

Browse source
This commit is contained in:
a.marchuk 2015-08-04 12:10:24 +03:00 • committed by Alex Zolotarev
parent f0d84b21ca
commit 4b0ec67ffd
3 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/src/com/mapswithme/maps/widget/placepage/BasePlacePageAnimationController.java
View file

@ -94,7 +94,7 @@ public abstract class BasePlacePageAnimationController
return mGestureDetector.onTouchEvent(event);
}
protected void finishAnimation(boolean previewShown, boolean ppShown)
protected void notifyVisibilityListener(boolean previewShown, boolean ppShown)
{
if (mVisibilityChangedListener != null)
{

24
android/src/com/mapswithme/maps/widget/placepage/PlacePageBottomAnimationController.java
View file

@ -193,12 +193,11 @@ class PlacePageBottomAnimationController extends BasePlacePageAnimationControlle
}
UiUtils.invisible(mFrame);
finishAnimation(true, false);
notifyVisibilityListener(true, false);
return;
}
if (mAnimationHelper != null)
mFrame.addOnLayoutChangeListener(mAnimationHelper.mListener);
mFrame.addOnLayoutChangeListener(mAnimationHelper.mListener);
ValueAnimator animator;
Interpolator interpolator;
@ -226,7 +225,7 @@ class PlacePageBottomAnimationController extends BasePlacePageAnimationControlle
@Override
public void onAnimationEnd(Animator animation)
{
finishAnimation(true, false);
notifyVisibilityListener(true, false);
}
});
}
@ -250,7 +249,7 @@ class PlacePageBottomAnimationController extends BasePlacePageAnimationControlle
public void onAnimationEnd(Animator animation)
{
UiUtils.invisible(mFrame, mBookmarkDetails);
finishAnimation(true, false);
notifyVisibilityListener(true, false);
}
});
}
@ -285,7 +284,7 @@ class PlacePageBottomAnimationController extends BasePlacePageAnimationControlle
if (NO_ANIMATION)
{
refreshToolbarVisibility();
finishAnimation(true, true);
notifyVisibilityListener(true, true);
mDetails.scrollTo(0, 0);
UiUtils.hide(mBookmarkDetails);
return;
@ -313,7 +312,7 @@ class PlacePageBottomAnimationController extends BasePlacePageAnimationControlle
public void onAnimationEnd(Animator animation)
{
refreshToolbarVisibility();
finishAnimation(true, true);
notifyVisibilityListener(true, true);
mDetails.scrollTo(0, 0);
UiUtils.invisible(mBookmarkDetails);
}
@ -332,7 +331,7 @@ class PlacePageBottomAnimationController extends BasePlacePageAnimationControlle
if (NO_ANIMATION)
{
refreshToolbarVisibility();
finishAnimation(true, true);
notifyVisibilityListener(true, true);
return;
}
@ -357,7 +356,7 @@ class PlacePageBottomAnimationController extends BasePlacePageAnimationControlle
public void onAnimationEnd(Animator animation)
{
refreshToolbarVisibility();
finishAnimation(true, true);
notifyVisibilityListener(true, true);
}
});
@ -389,12 +388,11 @@ class PlacePageBottomAnimationController extends BasePlacePageAnimationControlle
if (NO_ANIMATION)
{
UiUtils.hide(mPlacePage);
finishAnimation(false, false);
notifyVisibilityListener(false, false);
return;
}
if (mAnimationHelper != null)
mFrame.removeOnLayoutChangeListener(mAnimationHelper.mListener);
mFrame.removeOnLayoutChangeListener(mAnimationHelper.mListener);
final float animHeight = mPlacePage.getHeight() - mPreview.getTop() - ViewHelper.getTranslationY(mPreview);
final ValueAnimator animator = ValueAnimator.ofFloat(0f, animHeight);
@ -413,7 +411,7 @@ class PlacePageBottomAnimationController extends BasePlacePageAnimationControlle
{
UiUtils.invisible(mPlacePage, mBookmarkDetails);
ViewHelper.setTranslationY(mPlacePage, 0);
finishAnimation(false, false);
notifyVisibilityListener(false, false);
}
});
animator.setDuration(DURATION);

8
android/src/com/mapswithme/maps/widget/placepage/PlacePageLeftAnimationController.java
View file

@ -117,7 +117,7 @@ class PlacePageLeftAnimationController extends BasePlacePageAnimationController
if (NO_ANIMATION)
{
finishAnimation(true, true);
notifyVisibilityListener(true, true);
return;
}
@ -135,7 +135,7 @@ class PlacePageLeftAnimationController extends BasePlacePageAnimationController
@Override
public void onAnimationEnd(Animator animation)
{
finishAnimation(true, true);
notifyVisibilityListener(true, true);
}
});
@ -149,7 +149,7 @@ class PlacePageLeftAnimationController extends BasePlacePageAnimationController
if (NO_ANIMATION)
{
UiUtils.hide(mPlacePage);
finishAnimation(false, false);
notifyVisibilityListener(false, false);
return;
}
@ -169,7 +169,7 @@ class PlacePageLeftAnimationController extends BasePlacePageAnimationController
public void onAnimationEnd(Animator animation)
{
UiUtils.invisible(mPlacePage);
finishAnimation(false, false);
notifyVisibilityListener(false, false);
}
});