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

Fixed multiple detection of animation end.

Browse source
This commit is contained in:
Dmitry Yunitsky 2015-07-05 16:48:47 +03:00 • committed by Alex Zolotarev
parent f321740d30
commit d303aef130
4 changed files with 102 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10,7 +10,6 @@ import android.widget.ScrollView;
import com.mapswithme.maps.R;
import com.mapswithme.maps.bookmarks.data.MapObject;
import com.mapswithme.maps.widget.placepage.PlacePageView.State;
import com.nineoldandroids.animation.ValueAnimator;
/**
* Class is responsible for animations of PP(place page) and PPP(place page preview).
@ -101,9 +100,4 @@ public abstract class BasePlacePageAnimationController
mVisibilityChangedListener.onPlacePageVisibilityChanged(mIsPlacePageVisible);
}
}
protected boolean isAnimationCompleted(ValueAnimator animation)
{
return animation.getAnimatedFraction() > .99f;
}
}

102
android/src/com/mapswithme/maps/widget/placepage/BottomPlacePageAnimationController.java
View file

@ -1,5 +1,7 @@
package com.mapswithme.maps.widget.placepage;
import android.annotation.TargetApi;
import android.os.Build;
import android.support.annotation.NonNull;
import android.support.v4.view.GestureDetectorCompat;
import android.support.v7.widget.Toolbar;
@ -16,9 +18,11 @@ import com.mapswithme.maps.Framework;
import com.mapswithme.maps.R;
import com.mapswithme.maps.widget.placepage.PlacePageView.State;
import com.mapswithme.util.UiUtils;
import com.nineoldandroids.animation.Animator;
import com.nineoldandroids.animation.ValueAnimator;
import com.nineoldandroids.view.ViewHelper;
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
public class BottomPlacePageAnimationController extends BasePlacePageAnimationController implements View.OnLayoutChangeListener
{
private final View mViewBottomHack;
@ -174,15 +178,17 @@ public class BottomPlacePageAnimationController extends BasePlacePageAnimationCo
ViewHelper.setTranslationY(mButtons, (Float) animation.getAnimatedValue());
if (animation.getAnimatedFraction() > .5f)
{
mViewBottomHack.setVisibility(View.VISIBLE);
if (isAnimationCompleted(animation))
{
mIsPlacePageVisible = false;
mIsPreviewVisible = true;
notifyVisibilityListener();
}
}
}
});
animator.addListener(new UiUtils.SimpleNineoldAnimationListener()
{
@Override
public void onAnimationEnd(Animator animation)
{
mIsPlacePageVisible = false;
mIsPreviewVisible = true;
notifyVisibilityListener();
}
});
}
@ -198,15 +204,18 @@ public class BottomPlacePageAnimationController extends BasePlacePageAnimationCo
{
ViewHelper.setTranslationY(mPreview, (Float) animation.getAnimatedValue());
ViewHelper.setTranslationY(mDetails, (Float) animation.getAnimatedValue() + detailsHeight);
if (isAnimationCompleted(animation))
{
mDetails.setVisibility(View.INVISIBLE);
mBookmarkDetails.setVisibility(View.INVISIBLE);
mIsPlacePageVisible = false;
mIsPreviewVisible = true;
notifyVisibilityListener();
}
}
});
animator.addListener(new UiUtils.SimpleNineoldAnimationListener()
{
@Override
public void onAnimationEnd(Animator animation)
{
mDetails.setVisibility(View.INVISIBLE);
mBookmarkDetails.setVisibility(View.INVISIBLE);
mIsPlacePageVisible = false;
mIsPreviewVisible = true;
notifyVisibilityListener();
}
});
}
@ -239,15 +248,18 @@ public class BottomPlacePageAnimationController extends BasePlacePageAnimationCo
{
ViewHelper.setTranslationY(mPreview, (Float) animation.getAnimatedValue() - detailsScreenHeight);
ViewHelper.setTranslationY(mDetails, (Float) animation.getAnimatedValue());
if (isAnimationCompleted(animation))
{
refreshToolbarVisibility();
mIsPreviewVisible = mIsPlacePageVisible = true;
notifyVisibilityListener();
mDetails.scrollTo(0, 0);
mBookmarkDetails.setVisibility(View.INVISIBLE);
}
}
});
animator.addListener(new UiUtils.SimpleNineoldAnimationListener()
{
@Override
public void onAnimationEnd(Animator animation)
{
refreshToolbarVisibility();
mIsPreviewVisible = mIsPlacePageVisible = true;
notifyVisibilityListener();
mDetails.scrollTo(0, 0);
mBookmarkDetails.setVisibility(View.INVISIBLE);
}
});
@ -281,13 +293,16 @@ public class BottomPlacePageAnimationController extends BasePlacePageAnimationCo
{
ViewHelper.setTranslationY(mPreview, (Float) animation.getAnimatedValue() - detailsScreenHeight);
ViewHelper.setTranslationY(mDetails, (Float) animation.getAnimatedValue());
if (isAnimationCompleted(animation))
{
refreshToolbarVisibility();
mIsPreviewVisible = mIsPlacePageVisible = true;
notifyVisibilityListener();
}
}
});
animator.addListener(new UiUtils.SimpleNineoldAnimationListener()
{
@Override
public void onAnimationEnd(Animator animation)
{
refreshToolbarVisibility();
mIsPreviewVisible = mIsPlacePageVisible = true;
notifyVisibilityListener();
}
});
@ -317,16 +332,19 @@ public class BottomPlacePageAnimationController extends BasePlacePageAnimationCo
public void onAnimationUpdate(ValueAnimator animation)
{
ViewHelper.setTranslationY(mPlacePage, (Float) animation.getAnimatedValue());
}
});
animator.addListener(new UiUtils.SimpleNineoldAnimationListener()
{
@Override
public void onAnimationEnd(Animator animation)
{
mIsPreviewVisible = mIsPlacePageVisible = false;
if (isAnimationCompleted(animation))
{
mIsPreviewVisible = mIsPlacePageVisible = false;
mPlacePage.setVisibility(View.INVISIBLE);
mBookmarkDetails.setVisibility(View.INVISIBLE);
ViewHelper.setTranslationY(mPlacePage, 0);
notifyVisibilityListener();
}
mPlacePage.setVisibility(View.INVISIBLE);
mBookmarkDetails.setVisibility(View.INVISIBLE);
ViewHelper.setTranslationY(mPlacePage, 0);
notifyVisibilityListener();
}
});
animator.setDuration(SHORT_ANIM_DURATION);

35
android/src/com/mapswithme/maps/widget/placepage/LeftFloatPlacePageAnimationController.java
View file

@ -10,6 +10,8 @@ import android.view.animation.AccelerateInterpolator;
import com.mapswithme.maps.Framework;
import com.mapswithme.maps.bookmarks.data.MapObject;
import com.mapswithme.maps.widget.placepage.PlacePageView.State;
import com.mapswithme.util.UiUtils;
import com.nineoldandroids.animation.Animator;
import com.nineoldandroids.animation.ValueAnimator;
import com.nineoldandroids.view.ViewHelper;
@ -126,13 +128,15 @@ public class LeftFloatPlacePageAnimationController extends BasePlacePageAnimatio
@Override
public void onAnimationUpdate(ValueAnimator animation)
{
ViewHelper.setTranslationY(mPlacePage, (Float) animation.getAnimatedValue());
if (isAnimationCompleted(animation))
{
mIsPlacePageVisible = mIsPreviewVisible = true;
notifyVisibilityListener();
}
}
});
animator.addListener(new UiUtils.SimpleNineoldAnimationListener()
{
@Override
public void onAnimationEnd(Animator animation)
{
mIsPlacePageVisible = mIsPreviewVisible = true;
notifyVisibilityListener();
}
});
@ -152,13 +156,16 @@ public class LeftFloatPlacePageAnimationController extends BasePlacePageAnimatio
public void onAnimationUpdate(ValueAnimator animation)
{
ViewHelper.setTranslationY(mPlacePage, (Float) animation.getAnimatedValue());
if (isAnimationCompleted(animation))
{
mPlacePage.setVisibility(View.INVISIBLE);
mIsPlacePageVisible = mIsPreviewVisible = false;
notifyVisibilityListener();
}
}
});
animator.addListener(new UiUtils.SimpleNineoldAnimationListener()
{
@Override
public void onAnimationEnd(Animator animation)
{
mPlacePage.setVisibility(View.INVISIBLE);
mIsPlacePageVisible = mIsPreviewVisible = false;
notifyVisibilityListener();
}
});

34
android/src/com/mapswithme/maps/widget/placepage/LeftFullPlacePageAnimationController.java
View file

@ -9,6 +9,8 @@ import android.view.animation.AccelerateInterpolator;
import com.mapswithme.maps.bookmarks.data.MapObject;
import com.mapswithme.maps.widget.placepage.PlacePageView.State;
import com.mapswithme.util.UiUtils;
import com.nineoldandroids.animation.Animator;
import com.nineoldandroids.animation.ValueAnimator;
import com.nineoldandroids.view.ViewHelper;
@ -120,12 +122,15 @@ public class LeftFullPlacePageAnimationController extends BasePlacePageAnimation
public void onAnimationUpdate(ValueAnimator animation)
{
ViewHelper.setTranslationX(mPlacePage, (Float) animation.getAnimatedValue());
if (isAnimationCompleted(animation))
{
mIsPlacePageVisible = mIsPreviewVisible = true;
notifyVisibilityListener();
}
}
});
animator.addListener(new UiUtils.SimpleNineoldAnimationListener()
{
@Override
public void onAnimationEnd(Animator animation)
{
mIsPlacePageVisible = mIsPreviewVisible = true;
notifyVisibilityListener();
}
});
@ -145,13 +150,16 @@ public class LeftFullPlacePageAnimationController extends BasePlacePageAnimation
public void onAnimationUpdate(ValueAnimator animation)
{
ViewHelper.setTranslationX(mPlacePage, (Float) animation.getAnimatedValue());
if (isAnimationCompleted(animation))
{
mPlacePage.setVisibility(View.INVISIBLE);
mIsPlacePageVisible = mIsPreviewVisible = false;
notifyVisibilityListener();
}
}
});
animator.addListener(new UiUtils.SimpleNineoldAnimationListener()
{
@Override
public void onAnimationEnd(Animator animation)
{
mPlacePage.setVisibility(View.INVISIBLE);
mIsPlacePageVisible = mIsPreviewVisible = false;
notifyVisibilityListener();
}
});