Unify enable/enabled options

In some places “enable” was used to control certain options. This commit adds backwards compatible support
for “enabled” property which should be used from now on.

docs/docs/styling.md

@@ -287,6 +287,7 @@ For example, changing the animation used when the app is first launched (Support
 Navigation.setDefaultOptions({
   animations: {
     setRoot: {
+      enabled: 'true' | 'false', // Optional, used to enable/disable the animation
       alpha: {
         from: 0,
         to: 1,
@@ -315,6 +316,7 @@ When *pushing* and *popping* screens to and from a stack, you can control the To
 ```js
 animations: {
   push: {
+    enabled: 'true' | 'false', // Optional, used to enable/disable the animation
     topBar: {
       id: 'TEST', // Optional, id of the TopBar we'd like to animate.
       alpha: {
@@ -334,6 +336,9 @@ animations: {
         to: 1
       }
     }
+  },
+  pop: {
+    ...
   }
 }
 ```

lib/android/app/src/main/java/com/reactnativenavigation/parse/AnimationOptions.java

@@ -33,7 +33,8 @@ public class AnimationOptions {
                     options.id = TextParser.parse(json, key);
                     break;
                 case "enable":
-                    options.enable = BoolParser.parse(json, key);
+                case "enabled":
+                    options.enabled = BoolParser.parse(json, key);
                     break;
                 case "waitForRender":
                     options.waitForRender = BoolParser.parse(json, key);
@@ -47,26 +48,26 @@ public class AnimationOptions {
     }
 
     public Text id = new NullText();
-    public Bool enable = new NullBool();
+    public Bool enabled = new NullBool();
     public Bool waitForRender = new NullBool();
     private HashSet<ValueAnimationOptions> valueOptions = new HashSet<>();
 
     void mergeWith(AnimationOptions other) {
         if (other.id.hasValue()) id = other.id;
-        if (other.enable.hasValue()) enable = other.enable;
+        if (other.enabled.hasValue()) enabled = other.enabled;
         if (other.waitForRender.hasValue()) waitForRender = other.waitForRender;
         if (!other.valueOptions.isEmpty()) valueOptions = other.valueOptions;
     }
 
     void mergeWithDefault(AnimationOptions defaultOptions) {
         if (!id.hasValue()) id = defaultOptions.id;
-        if (!enable.hasValue()) enable = defaultOptions.enable;
+        if (!enabled.hasValue()) enabled = defaultOptions.enabled;
         if (!waitForRender.hasValue()) waitForRender = defaultOptions.waitForRender;
         if (valueOptions.isEmpty()) valueOptions = defaultOptions.valueOptions;
     }
 
     public boolean hasValue() {
-        return id.hasValue() || enable.hasValue() || waitForRender.hasValue();
+        return id.hasValue() || enabled.hasValue() || waitForRender.hasValue();
     }
 
     public AnimatorSet getAnimation(View view) {

lib/android/app/src/main/java/com/reactnativenavigation/parse/NestedAnimationsOptions.java

@@ -15,13 +15,13 @@ public class NestedAnimationsOptions {
         options.content = AnimationOptions.parse(json.optJSONObject("content"));
         options.bottomTabs = AnimationOptions.parse(json.optJSONObject("bottomTabs"));
         options.topBar = AnimationOptions.parse(json.optJSONObject("topBar"));
-        options.enable = BoolParser.parse(json, "enable");
+        options.enabled = BoolParser.parseFirst(json, "enabled", "enable");
         options.waitForRender = BoolParser.parse(json, "waitForRender");
 
         return options;
     }
 
-    public Bool enable = new NullBool();
+    public Bool enabled = new NullBool();
     public Bool waitForRender = new NullBool();
     public AnimationOptions content = new AnimationOptions();
     public AnimationOptions bottomTabs = new AnimationOptions();
@@ -31,7 +31,7 @@ public class NestedAnimationsOptions {
         topBar.mergeWith(other.topBar);
         content.mergeWith(other.content);
         bottomTabs.mergeWith(other.bottomTabs);
-        if (other.enable.hasValue()) enable = other.enable;
+        if (other.enabled.hasValue()) enabled = other.enabled;
         if (other.waitForRender.hasValue()) waitForRender = other.waitForRender;
     }
 
@@ -39,7 +39,7 @@ public class NestedAnimationsOptions {
         content.mergeWithDefault(defaultOptions.content);
         bottomTabs.mergeWithDefault(defaultOptions.bottomTabs);
         topBar.mergeWithDefault(defaultOptions.topBar);
-        if (!enable.hasValue()) enable = defaultOptions.enable;
+        if (!enabled.hasValue()) enabled = defaultOptions.enabled;
         if (!waitForRender.hasValue()) waitForRender = defaultOptions.waitForRender;
     }
 

lib/android/app/src/main/java/com/reactnativenavigation/parse/parsers/BoolParser.java

@@ -5,8 +5,17 @@ import com.reactnativenavigation.parse.params.NullBool;
 
 import org.json.JSONObject;
 
+import java.util.Arrays;
+
+import static com.reactnativenavigation.utils.CollectionUtils.first;
+
 public class BoolParser {
-    public static Bool parse(JSONObject json, String bool) {
-        return json.has(bool) ? new Bool(json.optBoolean(bool)) : new NullBool();
+    public static Bool parse(JSONObject json, String key) {
+        return json.has(key) ? new Bool(json.optBoolean(key)) : new NullBool();
+    }
+
+    public static Bool parseFirst(JSONObject json, String... keys) {
+        String first = first(Arrays.asList(keys), json::has);
+        return first != null ? new Bool(json.optBoolean(first)) : new NullBool();
     }
 }

lib/android/app/src/main/java/com/reactnativenavigation/presentation/StackPresenter.java

@@ -226,14 +226,14 @@ public class StackPresenter {
 
     private void applyTopBarVisibility(TopBarOptions options, AnimationsOptions animationOptions, Options componentOptions) {
         if (options.visible.isFalse()) {
-            if (options.animate.isTrueOrUndefined() && componentOptions.animations.push.enable.isTrueOrUndefined()) {
+            if (options.animate.isTrueOrUndefined() && componentOptions.animations.push.enabled.isTrueOrUndefined()) {
                 topBar.hideAnimate(animationOptions.pop.topBar);
             } else {
                 topBar.hide();
             }
         }
         if (options.visible.isTrueOrUndefined()) {
-            if (options.animate.isTrueOrUndefined() && componentOptions.animations.push.enable.isTrueOrUndefined()) {
+            if (options.animate.isTrueOrUndefined() && componentOptions.animations.push.enabled.isTrueOrUndefined()) {
                 topBar.showAnimate(animationOptions.push.topBar);
             } else {
                 topBar.show();
@@ -301,7 +301,7 @@ public class StackPresenter {
 
     public void onChildWillAppear(Options appearing, Options disappearing) {
         if (disappearing.topBar.visible.isTrueOrUndefined() && appearing.topBar.visible.isFalse()) {
-            if (disappearing.topBar.animate.isTrueOrUndefined() && disappearing.animations.pop.enable.isTrueOrUndefined()) {
+            if (disappearing.topBar.animate.isTrueOrUndefined() && disappearing.animations.pop.enabled.isTrueOrUndefined()) {
                 topBar.hideAnimate(disappearing.animations.pop.topBar);
             } else {
                 topBar.hide();

lib/android/app/src/main/java/com/reactnativenavigation/utils/CollectionUtils.java

@@ -75,6 +75,14 @@ public class CollectionUtils {
         }
     }
 
+    public static @Nullable <T> T first(@Nullable Collection<T> items, Filter<T> by) {
+        if (isNullOrEmpty(items)) return null;
+        for (T item : items) {
+            if (by.filter(item)) return item;
+        }
+        return null;
+    }
+
     private static @NonNull <T> Collection<T> get(@Nullable Collection<T> t) {
         return t == null ? Collections.EMPTY_LIST : t;
     }

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

@@ -38,7 +38,7 @@ public class ModalPresenter {
         Options options = toAdd.resolveCurrentOptions(defaultOptions);
         toAdd.setWaitForRender(options.animations.showModal.waitForRender);
         modalsContainer.addView(toAdd.getView());
-        if (options.animations.showModal.enable.isTrueOrUndefined()) {
+        if (options.animations.showModal.enabled.isTrueOrUndefined()) {
             if (options.animations.showModal.waitForRender.isTrue()) {
                 toAdd.setOnAppearedListener(() -> animateShow(toAdd, toRemove, listener, options));
             } else {
@@ -83,7 +83,7 @@ public class ModalPresenter {
             listener.onError("Can not dismiss modal before activity is created");
             return;
         }
-        if (toDismiss.options.animations.dismissModal.enable.isTrueOrUndefined()) {
+        if (toDismiss.options.animations.dismissModal.enabled.isTrueOrUndefined()) {
             animator.dismiss(toDismiss.getView(), toDismiss.options.animations.dismissModal, new AnimatorListenerAdapter() {
                 @Override
                 public void onAnimationEnd(Animator animation) {

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/StackController.java

@@ -144,7 +144,7 @@ public class StackController extends ParentController<StackLayout> {
         addChildToStack(child, child.getView(), resolvedOptions);
 
         if (toRemove != null) {
-            if (resolvedOptions.animations.push.enable.isTrueOrUndefined()) {
+            if (resolvedOptions.animations.push.enabled.isTrueOrUndefined()) {
                 if (resolvedOptions.animations.push.waitForRender.isTrue()) {
                     child.getView().setAlpha(0);
                     child.setOnAppearedListener(() -> animator.push(child.getView(), resolvedOptions.animations.push, resolvedOptions.transitions, toRemove.getElements(), child.getElements(), () -> {
@@ -218,7 +218,7 @@ public class StackController extends ParentController<StackLayout> {
             getView().addView(appearingView, 0);
         }
         presenter.onChildWillAppear(appearing.options, disappearing.options);
-        if (disappearing.options.animations.pop.enable.isTrueOrUndefined()) {
+        if (disappearing.options.animations.pop.enabled.isTrueOrUndefined()) {
             animator.pop(disappearing.getView(), resolvedOptions.animations.pop, () -> finishPopping(disappearing, listener));
         } else {
             finishPopping(disappearing, listener);

lib/android/app/src/test/java/com/reactnativenavigation/BaseTest.java

@@ -56,13 +56,13 @@ public abstract class BaseTest {
 
     protected void disablePushAnimation(ViewController... controllers) {
         for (ViewController controller : controllers) {
-            controller.options.animations.push.enable = new Bool(false);
+            controller.options.animations.push.enabled = new Bool(false);
         }
     }
 
     protected void disablePopAnimation(ViewController... controllers) {
         for (ViewController controller : controllers) {
-            controller.options.animations.pop.enable = new Bool(false);
+            controller.options.animations.pop.enabled = new Bool(false);
         }
     }
 
@@ -73,13 +73,13 @@ public abstract class BaseTest {
 
     protected void disableShowModalAnimation(ViewController... modals) {
         for (ViewController modal : modals) {
-            modal.options.animations.showModal.enable = new Bool(false);
+            modal.options.animations.showModal.enabled = new Bool(false);
         }
     }
 
     protected void disableDismissModalAnimation(ViewController... modals) {
         for (ViewController modal : modals) {
-            modal.options.animations.dismissModal.enable = new Bool(false);
+            modal.options.animations.dismissModal.enabled = new Bool(false);
         }
     }
 

lib/android/app/src/test/java/com/reactnativenavigation/parse/parsers/BoolParserTest.java

@@ -0,0 +1,28 @@
+package com.reactnativenavigation.parse.parsers;
+
+import com.reactnativenavigation.BaseTest;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.junit.Test;
+
+import static org.assertj.core.api.Java6Assertions.assertThat;
+
+public class BoolParserTest extends BaseTest {
+
+    @Test
+    public void parse() throws JSONException {
+        JSONObject json = new JSONObject();
+        json.put("value", true);
+        assertThat(BoolParser.parse(json, "value").get()).isTrue();
+    }
+
+    @Test
+    public void parseFirst() throws JSONException {
+        JSONObject json = new JSONObject();
+        json.put("value1", true);
+        json.put("value2", false);
+        assertThat(BoolParser.parseFirst(json, "value1", "value2").get()).isTrue();
+        assertThat(BoolParser.parseFirst(json, "value2", "value1").get()).isFalse();
+    }
+}

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

@@ -89,7 +89,7 @@ public class ModalPresenterTest extends BaseTest {
     @Test
     public void showModal_resolvesDefaultOptions() throws JSONException {
         Options defaultOptions = new Options();
-        JSONObject disabledShowModalAnimation = new JSONObject().put("enable", false);
+        JSONObject disabledShowModalAnimation = new JSONObject().put("enabled", false);
         defaultOptions.animations.showModal = AnimationOptions.parse(disabledShowModalAnimation);
 
         uut.setDefaultOptions(defaultOptions);

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/navigator/NavigatorTest.java

@@ -433,8 +433,8 @@ public class NavigatorTest extends BaseTest {
 
     @Test
     public void pushedStackCanBePopped() {
-        child1.options.animations.push.enable = new Bool(false);
-        child2.options.animations.push.enable = new Bool(false);
+        child1.options.animations.push.enabled = new Bool(false);
+        child2.options.animations.push.enabled = new Bool(false);
         StackController spy = spy(parentController);
         StackController parent = newStack();
         parent.ensureViewIsCreated();
@@ -577,7 +577,7 @@ public class NavigatorTest extends BaseTest {
         disablePushAnimation(child1);
 
         StackController spy = spy(parentController);
-        spy.options.animations.setRoot.enable = new Bool(false);
+        spy.options.animations.setRoot.enabled = new Bool(false);
         uut.setRoot(spy, new CommandListenerAdapter());
         spy.push(child1, new CommandListenerAdapter());
         activityController.destroy();

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/stack/StackControllerTest.java

@@ -402,7 +402,7 @@ public class StackControllerTest extends BaseTest {
 
         child1.options.topBar.visible = new Bool(false);
         child1.options.topBar.animate = new Bool(false);
-        child1.options.animations.push.enable = new Bool(false);
+        child1.options.animations.push.enabled = new Bool(false);
 
         uut.push(child1, new CommandListenerAdapter());
         uut.push(child2, new CommandListenerAdapter() {
@@ -433,7 +433,7 @@ public class StackControllerTest extends BaseTest {
 
     @Test
     public void pop_appearingChildHasCorrectLayoutParams() {
-        child2.options.animations.pop.enable = new Bool(false);
+        child2.options.animations.pop.enabled = new Bool(false);
         child1.options.topBar.drawBehind = new Bool(false);
 
         StackController uut = createStack(Arrays.asList(child1, child2));
@@ -514,8 +514,8 @@ public class StackControllerTest extends BaseTest {
 
     @Test
     public void popToRoot_PopsEverythingAboveFirstController() {
-        child1.options.animations.push.enable = new Bool(false);
-        child2.options.animations.push.enable = new Bool(false);
+        child1.options.animations.push.enabled = new Bool(false);
+        child2.options.animations.push.enabled = new Bool(false);
 
         uut.push(child1, new CommandListenerAdapter());
         uut.push(child2, new CommandListenerAdapter());
@@ -538,8 +538,8 @@ public class StackControllerTest extends BaseTest {
 
     @Test
     public void popToRoot_onlyTopChildIsAnimated() {
-        child1.options.animations.push.enable = new Bool(false);
-        child2.options.animations.push.enable = new Bool(false);
+        child1.options.animations.push.enabled = new Bool(false);
+        child2.options.animations.push.enabled = new Bool(false);
 
         uut.push(child1, new CommandListenerAdapter());
         uut.push(child2, new CommandListenerAdapter());
@@ -558,9 +558,9 @@ public class StackControllerTest extends BaseTest {
 
     @Test
     public void popToRoot_topChildrenAreDestroyed() {
-        child1.options.animations.push.enable = new Bool(false);
-        child2.options.animations.push.enable = new Bool(false);
-        child3.options.animations.push.enable = new Bool(false);
+        child1.options.animations.push.enabled = new Bool(false);
+        child2.options.animations.push.enabled = new Bool(false);
+        child3.options.animations.push.enabled = new Bool(false);
 
         uut.push(child1, new CommandListenerAdapter());
         uut.push(child2, new CommandListenerAdapter());
@@ -633,8 +633,8 @@ public class StackControllerTest extends BaseTest {
 
     @Test
     public void pop_callWillAppearWillDisappear() {
-        child1.options.animations.push.enable = new Bool(false);
-        child2.options.animations.push.enable = new Bool(false);
+        child1.options.animations.push.enabled = new Bool(false);
+        child2.options.animations.push.enabled = new Bool(false);
         child1 = spy(child1);
         child2 = spy(child2);
         uut.push(child1, new CommandListenerAdapter());
@@ -649,8 +649,8 @@ public class StackControllerTest extends BaseTest {
         uut.ensureViewIsCreated();
 
         child1.options.topBar.visible = new Bool(false);
-        child1.options.animations.push.enable = new Bool(false);
-        child2.options.animations.push.enable = new Bool(true);
+        child1.options.animations.push.enabled = new Bool(false);
+        child2.options.animations.push.enabled = new Bool(true);
         uut.push(child1, new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
@@ -678,7 +678,7 @@ public class StackControllerTest extends BaseTest {
 
         child1.options.topBar.visible = new Bool(false);
         child1.options.topBar.animate = new Bool(false);
-        child2.options.animations.push.enable = new Bool(false);
+        child2.options.animations.push.enabled = new Bool(false);
         child2.options.topBar.animate = new Bool(false);
 
         child1.ensureViewIsCreated();