|
|
@@ -10,6 +10,7 @@ import android.view.View;
|
|
|
import android.widget.FrameLayout;
|
|
|
|
|
|
import kr.co.zumo.app.R;
|
|
|
+import kr.co.zumo.app.lifeplus.model.SuperModel;
|
|
|
import kr.co.zumo.app.lifeplus.view.Event;
|
|
|
import kr.co.zumo.app.lifeplus.view.IEventListener;
|
|
|
|
|
|
@@ -228,6 +229,10 @@ public class Tutorial {
|
|
|
third.setDuration(1000);
|
|
|
third.setStartDelay(1000);
|
|
|
|
|
|
+ ObjectAnimator translateAnimator1 =
|
|
|
+ ObjectAnimator.ofFloat(secondView, View.TRANSLATION_X, SuperModel.getInstance().getScreenWidth(), 0f);
|
|
|
+ translateAnimator1.setDuration(500);
|
|
|
+
|
|
|
first.addListener(new Animator.AnimatorListener() {
|
|
|
@Override
|
|
|
public void onAnimationStart(Animator animator) {
|
|
|
@@ -260,9 +265,10 @@ public class Tutorial {
|
|
|
|
|
|
@Override
|
|
|
public void onAnimationEnd(Animator animator) {
|
|
|
- frameLayout.removeView(firstView);
|
|
|
+ // frameLayout.removeView(firstView);
|
|
|
frameLayout.addView(secondView);
|
|
|
- third.start();
|
|
|
+ secondView.setTranslationX(SuperModel.getInstance().getScreenWidth());
|
|
|
+ translateAnimator1.start();
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -285,7 +291,10 @@ public class Tutorial {
|
|
|
|
|
|
@Override
|
|
|
public void onAnimationEnd(Animator animator) {
|
|
|
+ frameLayout.removeView(firstView);
|
|
|
frameLayout.removeView(secondView);
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -299,6 +308,27 @@ public class Tutorial {
|
|
|
}
|
|
|
});
|
|
|
|
|
|
+ translateAnimator1.addListener(new Animator.AnimatorListener() {
|
|
|
+ @Override
|
|
|
+ public void onAnimationStart(Animator animator) {
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public void onAnimationEnd(Animator animator) {
|
|
|
+ third.start();
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public void onAnimationCancel(Animator animator) {
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public void onAnimationRepeat(Animator animator) {
|
|
|
+
|
|
|
+ }
|
|
|
+ });
|
|
|
|
|
|
}
|
|
|
}
|