Merge branch 'v2' of https://github.com/wix/react-native-navigation into v2

lib/android/app/src/main/java/com/reactnativenavigation/anim/ModalAnimator.java

@@ -1,39 +0,0 @@
-package com.reactnativenavigation.anim;
-
-
-import android.animation.AnimatorListenerAdapter;
-import android.animation.AnimatorSet;
-import android.content.Context;
-import android.view.View;
-
-import com.reactnativenavigation.parse.AnimationsOptions;
-
-public class ModalAnimator extends BaseAnimator {
-
-    public ModalAnimator(Context context, AnimationsOptions options) {
-        super(context);
-        this.options = options;
-    }
-
-    public void animateShow(View contentView, AnimatorListenerAdapter listener) {
-        AnimatorSet animatorSet;
-        if (options.showModal.hasValue()) {
-            animatorSet = options.showModal.getAnimation(contentView);
-        } else {
-            animatorSet = getDefaultPushAnimation(contentView);
-        }
-        animatorSet.addListener(listener);
-        animatorSet.start();
-    }
-
-    public void animateDismiss(View contentView, AnimatorListenerAdapter listener) {
-        AnimatorSet animatorSet;
-        if (options.dismissModal.hasValue()) {
-            animatorSet = options.dismissModal.getAnimation(contentView);
-        } else {
-            animatorSet = getDefaultPopAnimation(contentView);
-        }
-        animatorSet.addListener(listener);
-        animatorSet.start();
-    }
-}

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ModalStack.java

@@ -1,108 +0,0 @@
-package com.reactnativenavigation.viewcontrollers;
-
-import android.support.annotation.Nullable;
-
-import com.reactnativenavigation.utils.CommandListenerAdapter;
-import com.reactnativenavigation.utils.Task;
-import com.reactnativenavigation.viewcontrollers.Navigator.CommandListener;
-import com.reactnativenavigation.viewcontrollers.modal.Modal;
-import com.reactnativenavigation.viewcontrollers.modal.ModalCreator;
-import com.reactnativenavigation.viewcontrollers.modal.ModalListener;
-
-import java.util.ArrayList;
-import java.util.List;
-
-class ModalStack implements ModalListener {
-
-    private List<Modal> modals = new ArrayList<>();
-    private ModalCreator creator;
-    private ModalListener modalListener;
-
-    ModalStack(ModalCreator creator, ModalListener modalListener) {
-        this.creator = creator;
-        this.modalListener = modalListener;
-    }
-
-    void showModal(final ViewController viewController, CommandListener listener) {
-        Modal modal = creator.create(viewController, this);
-        modals.add(modal);
-        modal.show();
-        listener.onSuccess(viewController.getId());
-    }
-
-    void dismissModal(final String componentId, CommandListener listener) {
-        applyOnModal(componentId, (modal) -> modal.dismiss(listener), () -> listener.onError("Nothing to dismiss"));
-    }
-
-    void dismissAll(CommandListener listener) {
-        for (Modal modal : modals) {
-            modal.dismiss(size() == 1 ? listener : new CommandListenerAdapter());
-        }
-        modals.clear();
-    }
-
-    boolean isEmpty() {
-        return modals.isEmpty();
-    }
-
-    public int size() {
-        return modals.size();
-    }
-
-    @Nullable
-    Modal findModalByComponentId(String componentId) {
-        for (Modal modal : modals) {
-            if (modal.containsDeepComponentId(componentId)) {
-                return modal;
-            }
-        }
-        return null;
-    }
-
-    @Nullable
-    ViewController findControllerById(String id) {
-        Modal modal = findModalByComponentId(id);
-        return modal != null ? modal.viewController.findControllerById(id) : null;
-    }
-
-    @Override
-    public void onModalDismiss(Modal modal) {
-        if (peek() == modal) {
-            modals.remove(modal);
-            applyOnModal(peek(), peek -> peek.viewController.onViewAppeared(), null);
-        } else {
-            modals.remove(modal);
-        }
-        modalListener.onModalDismiss(modal);
-    }
-
-    @Override
-    public void onModalDisplay(Modal modal) {
-        modalListener.onModalDisplay(modal);
-    }
-
-    private Modal peek() {
-        return isEmpty() ? null : modals.get(modals.size() - 1);
-    }
-
-    public boolean handleBack(CommandListener listener) {
-        return !modals.isEmpty() && peek().handleBack(listener);
-    }
-
-    private void applyOnModal(String componentId, Task<Modal> accept, Runnable reject) {
-        Modal modal = findModalByComponentId(componentId);
-        if (modal != null) {
-            if (accept != null) accept.run(modal);
-        } else {
-            if (reject != null) reject.run();
-        }
-    }
-
-    private void applyOnModal(Modal modal, Task<Modal> accept, Runnable reject) {
-        if (modal != null) {
-            if (accept != null) accept.run(modal);
-        } else {
-            if (reject != null) reject.run();
-        }
-    }
-}

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/Navigator.java

@@ -16,15 +16,13 @@ import com.reactnativenavigation.presentation.NavigationOptionsListener;
 import com.reactnativenavigation.presentation.OverlayManager;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
 import com.reactnativenavigation.utils.CompatUtils;
-import com.reactnativenavigation.viewcontrollers.modal.Modal;
-import com.reactnativenavigation.viewcontrollers.modal.ModalListener;
 import com.reactnativenavigation.viewcontrollers.modal.ModalPresenter;
 import com.reactnativenavigation.viewcontrollers.modal.ModalStack2;
 
 import java.util.Collection;
 import java.util.Collections;
 
-public class Navigator extends ParentController implements ModalListener {
+public class Navigator extends ParentController {
 
     public interface CommandListener {
         void onSuccess(String childId);
@@ -32,7 +30,6 @@ public class Navigator extends ParentController implements ModalListener {
         void onError(String message);
     }
 
-//    private final ModalStack modalStack;
     private final ModalStack2 modalStack;
     private ViewController root;
     private FrameLayout rootLayout;
@@ -42,7 +39,6 @@ public class Navigator extends ParentController implements ModalListener {
 
     public Navigator(final Activity activity) {
         super(activity, "navigator" + CompatUtils.generateViewId(), new Options());
-//        modalStack = new ModalStack(new ModalCreator(), this);
         modalStack = new ModalStack2(new ModalPresenter(new ModalAnimator2(activity)));
     }
 
@@ -202,20 +198,6 @@ public class Navigator extends ParentController implements ModalListener {
         });
     }
 
-    @Override
-    public void onModalDisplay(Modal modal) {
-        if (modalStack.size() == 1) {
-            root.onViewLostFocus();
-        }
-    }
-
-    @Override
-    public void onModalDismiss(Modal modal) {
-        if (modalStack.isEmpty()) {
-            root.onViewRegainedFocus();
-        }
-    }
-
     public void dismissAllModals(CommandListener listener) {
         if (!modalStack.isEmpty()) contentLayout.addView(root.getView(), 0);
         modalStack.dismissAllModals(listener);

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/modal/Modal.java

@@ -1,98 +0,0 @@
-package com.reactnativenavigation.viewcontrollers.modal;
-
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.app.Dialog;
-import android.content.DialogInterface;
-import android.support.annotation.Nullable;
-import android.view.KeyEvent;
-import android.view.View;
-
-import com.reactnativenavigation.R;
-import com.reactnativenavigation.anim.ModalAnimator;
-import com.reactnativenavigation.viewcontrollers.Navigator.CommandListener;
-import com.reactnativenavigation.viewcontrollers.ViewController;
-
-import static android.view.View.MeasureSpec.EXACTLY;
-import static android.view.View.MeasureSpec.makeMeasureSpec;
-
-public class Modal implements DialogInterface.OnKeyListener, DialogInterface.OnDismissListener, DialogInterface.OnShowListener {
-    public final ViewController viewController;
-    private final Dialog dialog;
-    private ModalListener modalListener;
-    @Nullable private CommandListener dismissCommandListener;
-
-    private ModalAnimator animator;
-
-    public Modal(final ViewController viewController, ModalListener modalListener) {
-        this.viewController = viewController;
-        dialog = new Dialog(viewController.getActivity(), R.style.Modal);
-        this.modalListener = modalListener;
-        dialog.setOnKeyListener(this);
-        dialog.setOnDismissListener(this);
-        dialog.setOnShowListener(this);
-        animator = new ModalAnimator(viewController.getActivity(), viewController.options.animations);
-    }
-
-    public void show() {
-        preMeasureView();
-        final View contentView = viewController.getView();
-        dialog.show();
-        animator.animateShow(contentView, new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationStart(Animator animation) {
-                dialog.setContentView(contentView);
-            }
-        });
-    }
-
-    public void dismiss(CommandListener listener) {
-        dismissCommandListener = listener;
-        animator.animateDismiss(viewController.getView(), new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationEnd(Animator animation) {
-                dialog.dismiss();
-            }
-        });
-    }
-
-    public boolean containsDeepComponentId(String componentId) {
-        return viewController.findControllerById(componentId) != null;
-    }
-
-    private void preMeasureView() {
-        View decorView = viewController.getActivity().getWindow().getDecorView();
-        viewController.getView().measure(makeMeasureSpec(decorView.getMeasuredWidth(), EXACTLY), makeMeasureSpec(decorView.getMeasuredHeight(), EXACTLY));
-    }
-
-    @Override
-    public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
-        if (keyCode == KeyEvent.KEYCODE_BACK) {
-            if (event.getAction() == KeyEvent.ACTION_UP) {
-                viewController.getActivity().onBackPressed();
-            }
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public void onDismiss(DialogInterface dialog) {
-        modalListener.onModalDismiss(this);
-        if (dismissCommandListener != null) {
-            dismissCommandListener.onSuccess(viewController.getId());
-        }
-    }
-
-    @Override
-    public void onShow(DialogInterface dialog) {
-        modalListener.onModalDisplay(this);
-    }
-
-    public boolean handleBack(CommandListener listener) {
-        if (!viewController.handleBack(listener)) {
-            dialog.dismiss();
-        }
-        return true;
-    }
-}

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/modal/ModalCreator.java

@@ -1,9 +0,0 @@
-package com.reactnativenavigation.viewcontrollers.modal;
-
-import com.reactnativenavigation.viewcontrollers.ViewController;
-
-public class ModalCreator {
-    public Modal create(ViewController viewController, ModalListener dismissListener) {
-        return new Modal(viewController, dismissListener);
-    }
-}

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/modal/ModalListener.java

@@ -1,7 +0,0 @@
-package com.reactnativenavigation.viewcontrollers.modal;
-
-public interface ModalListener {
-    void onModalDismiss(Modal modal);
-
-    void onModalDisplay(Modal modal);
-}

lib/android/app/src/test/java/com/reactnativenavigation/mocks/ModalCreatorMock.java

@@ -1,15 +0,0 @@
-package com.reactnativenavigation.mocks;
-
-import com.reactnativenavigation.viewcontrollers.ViewController;
-import com.reactnativenavigation.viewcontrollers.modal.Modal;
-import com.reactnativenavigation.viewcontrollers.modal.ModalCreator;
-import com.reactnativenavigation.viewcontrollers.modal.ModalListener;
-
-import static org.mockito.Mockito.spy;
-
-public class ModalCreatorMock extends ModalCreator {
-    @Override
-    public Modal create(ViewController viewController, ModalListener onDismissListener) {
-        return spy(new Modal(viewController, onDismissListener));
-    }
-}

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/ModalStackTest.java

@@ -1,128 +0,0 @@
-package com.reactnativenavigation.viewcontrollers;
-
-import com.reactnativenavigation.BaseTest;
-import com.reactnativenavigation.mocks.ModalCreatorMock;
-import com.reactnativenavigation.mocks.SimpleViewController;
-import com.reactnativenavigation.parse.Options;
-import com.reactnativenavigation.utils.CommandListenerAdapter;
-import com.reactnativenavigation.viewcontrollers.modal.Modal;
-import com.reactnativenavigation.viewcontrollers.modal.ModalListener;
-
-import org.junit.Test;
-
-import static org.assertj.core.api.Java6Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-public class ModalStackTest extends BaseTest {
-    private static final String CONTROLLER_ID = "simpleController";
-    private ModalStack uut;
-    private SimpleViewController viewController;
-    private ModalListener modalListener;
-
-    @Override
-    public void beforeEach() {
-        createDismissListener();
-        uut = spy(new ModalStack(new ModalCreatorMock(), modalListener));
-        viewController = new SimpleViewController(newActivity(), CONTROLLER_ID, new Options());
-    }
-
-    @SuppressWarnings("Convert2Lambda")
-    private void createDismissListener() {
-        ModalListener dismissListener = new ModalListener() {
-            @Override
-            public void onModalDismiss(Modal modal) {
-
-            }
-
-            @Override
-            public void onModalDisplay(Modal modal) {
-
-            }
-        };
-        this.modalListener = spy(dismissListener);
-    }
-
-    @Test
-    public void modalRefIsSaved() {
-        uut.showModal(viewController, new CommandListenerAdapter());
-        assertThat(findModal(CONTROLLER_ID)).isNotNull();
-    }
-
-    @Test
-    public void modalIsShown() {
-        uut.showModal(viewController, new CommandListenerAdapter() {
-            @Override
-            public void onSuccess(String childId) {
-                verify(findModal(CONTROLLER_ID), times(1)).show();
-                verify(modalListener, times(1)).onModalDisplay(any());
-            }
-        });
-    }
-
-    @Test
-    public void modalIsDismissed() {
-        uut.showModal(viewController, new CommandListenerAdapter());
-        final Modal modal = findModal(CONTROLLER_ID);
-        assertThat(modal).isNotNull();
-        uut.dismissModal(CONTROLLER_ID, new CommandListenerAdapter() {
-            @Override
-            public void onSuccess(String childId) {
-                assertThat(findModal(CONTROLLER_ID)).isNull();
-                verify(uut, times(1)).onModalDismiss(modal);
-            }
-        });
-    }
-
-    @Test
-    public void dismissAllModals() {
-        uut.showModal(new SimpleViewController(newActivity(), "1", new Options()), new CommandListenerAdapter());
-        uut.showModal(new SimpleViewController(newActivity(), "2", new Options()), new CommandListenerAdapter());
-        uut.dismissAll(new CommandListenerAdapter() {
-            @Override
-            public void onSuccess(String childId) {
-                assertThat(uut.isEmpty()).isTrue();
-            }
-        });
-    }
-
-    @Test
-    public void isEmpty() {
-        assertThat(uut.isEmpty()).isTrue();
-        uut.showModal(viewController, new CommandListenerAdapter());
-        assertThat(uut.isEmpty()).isFalse();
-        uut.dismissAll(new CommandListenerAdapter());
-        assertThat(uut.isEmpty()).isTrue();
-    }
-
-    @Test
-    public void onDismiss() {
-        uut.showModal(viewController, new CommandListenerAdapter());
-        uut.showModal(new SimpleViewController(newActivity(), "otherComponent", new Options()), new CommandListenerAdapter());
-        uut.dismissAll(new CommandListenerAdapter() {
-            @Override
-            public void onSuccess(String childId) {
-                verify(uut, times(2)).onModalDismiss(any());
-            }
-        });
-    }
-
-    @Test
-    public void onDismiss_onViewAppearedInvokedOnPreviousModal() {
-        SimpleViewController viewController = spy(new SimpleViewController(newActivity(), "otherComponent", new Options()));
-        uut.showModal(viewController, new CommandListenerAdapter());
-        uut.showModal(this.viewController, new CommandListenerAdapter());
-        uut.dismissModal(CONTROLLER_ID, new CommandListenerAdapter() {
-            @Override
-            public void onSuccess(String childId) {
-                verify(viewController, times(1)).onViewAppeared();
-            }
-        });
-    }
-
-    private Modal findModal(String id) {
-        return uut.findModalByComponentId(id);
-    }
-}

playground/src/screens/StaticLifecycleOverlay.js

@@ -20,6 +20,10 @@ class StaticLifecycleOverlay extends Component {
         events: [...this.state.events, { event: 'componentDidDisappear', componentId, componentName }]
       });
     });
+    Navigation.events().onNavigationCommand((name, params) => {
+      // console.log('RNN', `name: ${JSON.stringify(name)}`);
+      // console.log('RNN', `params: ${JSON.stringify(params)}`);
+    });
   }
 
   render() {

scripts/test-e2e.js

@@ -17,5 +17,5 @@ function run() {
   if (!skipBuild) {
     exec.execSync(`detox build --configuration ${configuration}`);
   }
-  exec.execSync(`detox test --configuration ${configuration} --platform ${platform} ${cleanup}`);
+  exec.execSync(`detox test --configuration ${configuration} --platform ${platform} ${cleanup} --loglevel verbose`);
 }