|
@@ -14,6 +14,7 @@ import com.reactnativenavigation.parse.Transitions;
|
14
|
14
|
import com.reactnativenavigation.views.element.Element;
|
15
|
15
|
import com.reactnativenavigation.views.element.ElementTransitionManager;
|
16
|
16
|
|
|
17
|
+import java.util.Collection;
|
17
|
18
|
import java.util.Collections;
|
18
|
19
|
import java.util.List;
|
19
|
20
|
|
|
@@ -35,8 +36,10 @@ public class NavigationAnimator extends BaseAnimator {
|
35
|
36
|
|
36
|
37
|
public void push(ViewGroup view, NestedAnimationsOptions animation, Transitions transitions, List<Element> fromElements, List<Element> toElements, Runnable onAnimationEnd) {
|
37
|
38
|
view.setAlpha(0);
|
38
|
|
- AnimatorSet set = animation.content.getAnimation(view, getDefaultPushAnimation(view));
|
39
|
|
- set.playTogether(merge(set.getChildAnimations(), transitionManager.createTransitions(transitions, fromElements, toElements)));
|
|
39
|
+ AnimatorSet push = animation.content.getAnimation(view, getDefaultPushAnimation(view));
|
|
40
|
+ AnimatorSet set = new AnimatorSet();
|
|
41
|
+ Collection<Animator> elementTransitions = transitionManager.createTransitions(transitions, fromElements, toElements);
|
|
42
|
+ set.playTogether(merge(push.getChildAnimations(), elementTransitions));
|
40
|
43
|
set.addListener(new AnimatorListenerAdapter() {
|
41
|
44
|
@Override
|
42
|
45
|
public void onAnimationStart(Animator animation) {
|