Rename Modal classes

Remove temporary suffixes

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

@@ -8,11 +8,11 @@ import android.view.View;
 
 import com.reactnativenavigation.parse.AnimationOptions;
 
-public class ModalAnimator2 extends BaseAnimator {
+public class ModalAnimator extends BaseAnimator {
 
     private Animator animator;
 
-    public ModalAnimator2(Context context) {
+    public ModalAnimator(Context context) {
         super(context);
     }
 

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

@@ -9,7 +9,7 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
 import com.facebook.react.bridge.Promise;
-import com.reactnativenavigation.anim.ModalAnimator2;
+import com.reactnativenavigation.anim.ModalAnimator;
 import com.reactnativenavigation.anim.NavigationAnimator;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.presentation.NavigationOptionsListener;
@@ -17,7 +17,7 @@ import com.reactnativenavigation.presentation.OverlayManager;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
 import com.reactnativenavigation.utils.CompatUtils;
 import com.reactnativenavigation.viewcontrollers.modal.ModalPresenter;
-import com.reactnativenavigation.viewcontrollers.modal.ModalStack2;
+import com.reactnativenavigation.viewcontrollers.modal.ModalStack;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -30,7 +30,7 @@ public class Navigator extends ParentController {
         void onError(String message);
     }
 
-    private final ModalStack2 modalStack;
+    private final ModalStack modalStack;
     private ViewController root;
     private FrameLayout rootLayout;
     private FrameLayout contentLayout;
@@ -39,7 +39,7 @@ public class Navigator extends ParentController {
 
     public Navigator(final Activity activity) {
         super(activity, "navigator" + CompatUtils.generateViewId(), new Options());
-        modalStack = new ModalStack2(new ModalPresenter(new ModalAnimator2(activity)));
+        modalStack = new ModalStack(new ModalPresenter(new ModalAnimator(activity)));
     }
 
     public FrameLayout getContentLayout() {
@@ -87,7 +87,6 @@ public class Navigator extends ParentController {
         }
 
         root = viewController;
-
         contentLayout.addView(viewController.getView());
         if (viewController.options.animations.startApp.hasValue()) {
             new NavigationAnimator(viewController.getActivity(), viewController.options.animations)

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

@@ -4,7 +4,7 @@ import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.view.ViewGroup;
 
-import com.reactnativenavigation.anim.ModalAnimator2;
+import com.reactnativenavigation.anim.ModalAnimator;
 import com.reactnativenavigation.viewcontrollers.Navigator.CommandListener;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 
@@ -13,9 +13,9 @@ import javax.annotation.Nullable;
 public class ModalPresenter {
 
     private ViewGroup content;
-    private ModalAnimator2 animator;
+    private ModalAnimator animator;
 
-    public ModalPresenter(ModalAnimator2 animator) {
+    public ModalPresenter(ModalAnimator animator) {
         this.animator = animator;
     }
 

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

@@ -11,11 +11,11 @@ import java.util.List;
 
 import javax.annotation.Nullable;
 
-public class ModalStack2 {
+public class ModalStack {
     private List<ViewController> modals = new ArrayList<>();
     private final ModalPresenter presenter;
 
-    public ModalStack2(ModalPresenter presenter) {
+    public ModalStack(ModalPresenter presenter) {
         this.presenter = presenter;
     }
 

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/modal/ModalAnimatorMock.java

@@ -4,10 +4,10 @@ import android.animation.AnimatorListenerAdapter;
 import android.content.Context;
 import android.view.View;
 
-import com.reactnativenavigation.anim.ModalAnimator2;
+import com.reactnativenavigation.anim.ModalAnimator;
 import com.reactnativenavigation.parse.AnimationOptions;
 
-public class ModalAnimatorMock extends ModalAnimator2 {
+public class ModalAnimatorMock extends ModalAnimator {
 
     ModalAnimatorMock(Context context) {
         super(context);

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/modal/ModalPresenterTest.java

@@ -4,7 +4,7 @@ import android.app.Activity;
 import android.widget.FrameLayout;
 
 import com.reactnativenavigation.BaseTest;
-import com.reactnativenavigation.anim.ModalAnimator2;
+import com.reactnativenavigation.anim.ModalAnimator;
 import com.reactnativenavigation.mocks.SimpleViewController;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
@@ -28,12 +28,12 @@ public class ModalPresenterTest extends BaseTest {
     private ViewController modal2;
     private ModalPresenter uut;
     private FrameLayout contentLayout;
-    private ModalAnimator2 animator;
+    private ModalAnimator animator;
 
     @Override
     public void beforeEach() {
         Activity activity = newActivity();
-        animator = spy(new ModalAnimator2(activity));
+        animator = spy(new ModalAnimator(activity));
         uut = new ModalPresenter(animator);
         contentLayout = new FrameLayout(activity);
         activity.setContentView(contentLayout);

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/modal/ModalStackTest2.java

@@ -5,7 +5,7 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
 import com.reactnativenavigation.BaseTest;
-import com.reactnativenavigation.anim.ModalAnimator2;
+import com.reactnativenavigation.anim.ModalAnimator;
 import com.reactnativenavigation.mocks.SimpleViewController;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
@@ -31,13 +31,13 @@ public class ModalStackTest2 extends BaseTest {
     private static final String MODAL_ID_2 = "modalId2";
     private static final String MODAL_ID_3 = "modalId3";
 
-    private ModalStack2 uut;
+    private ModalStack uut;
     private ViewController modal1;
     private ViewController modal2;
     private ViewController modal3;
     private Activity activity;
     private ModalPresenter presenter;
-    private ModalAnimator2 animator;
+    private ModalAnimator animator;
 
     @Override
     public void beforeEach() {
@@ -46,7 +46,7 @@ public class ModalStackTest2 extends BaseTest {
         activity.setContentView(root);
         animator = spy(new ModalAnimatorMock(activity));
         presenter = spy(new ModalPresenter(animator));
-        uut = new ModalStack2(presenter);
+        uut = new ModalStack(presenter);
         uut.setContentLayout(root);
         modal1 = spy(new SimpleViewController(activity, MODAL_ID_1, new Options()));
         modal2 = spy(new SimpleViewController(activity, MODAL_ID_2, new Options()));