Update roadmap (#3043)

* Rename to onChildWillAppear

* update roadmap

docs/README.md

@@ -75,67 +75,67 @@ v2 is written in Test Driven Development. We have a test for every feature inclu
 | dismissModal           |     ✅       |	✅|
 | showOverlay             |  ✅         |	✅ |
 | dismissOverlay             |  ✅   |	✅ |
-| customTransition            |   ✅        |	[Contribute](/docs/WorkingLocally.md) |
+| customTransition            |✅|✅|
 | Screen Visibility        | ✅     |✅|
 | async commands (await push)     |  ✅        |✅   |
 
 ### Navigation Options
 
-|       topBar         | iOS  | Android | Contributor(s) |
-|--------------------|:----:|:-----:|-----|
-| title         |        	✅    | 	✅| Wix|
-| textColor    | ✅     |     ✅        | Wix|
-| textFontSize       |    ✅      |     ✅        | Wix|
-| textFontFamily     |      ✅     |     ✅        | Wix |
-| backgroundColor    |  ✅       |     ✅         | Wix|
-| buttonColor         |    ✅      |✅| Wix|
-| hidden             |   ✅      |     ✅        | Wix|
-| hideOnScroll         |  ✅    |✅| Wix|
-| translucent         |   ✅     |     [Contribute](/docs/WorkingLocally.md)        | Wix|
-| transparent         |  ✅        |     [Contribute](/docs/WorkingLocally.md)        | |
-| noBorder             |    ✅     |     [Contribute](/docs/WorkingLocally.md)        |  @gtchance|
+|       topBar         | iOS  | Android |
+|--------------------|:----:|:-----:|
+| title         |        	✅    | 	✅|
+| textColor    | ✅     |     ✅        |
+| textFontSize       |    ✅      |     ✅|
+| textFontFamily     |      ✅     |     ✅|
+| backgroundColor    |  ✅       |     ✅|
+| buttonColor         |    ✅      |✅|
+| hidden             |   ✅      |     ✅|
+| hideOnScroll         |  ✅    |✅||
+| translucent         |   ✅     |     [Contribute](/docs/WorkingLocally.md)        |
+| transparent         |  ✅        |     [Contribute](/docs/WorkingLocally.md)        |
+| noBorder             |    ✅     |     [Contribute](/docs/WorkingLocally.md)        |
 | drawUnder         |    ✅     |✅||
-| blur               |    ✅     |      [Contribute](/docs/WorkingLocally.md)       | @gtchance|
+| blur               |    ✅     |      [Contribute](/docs/WorkingLocally.md)       |
 | custom component          |✅     |✅|
-| background component          |✅     |[Contribute](/docs/WorkingLocally.md)| |
-| subtitleColor            |   ✅      |[Contribute](/docs/WorkingLocally.md)| |
-| subtitleFontFamily      |    [Contribute](/docs/WorkingLocally.md)    |     [Contribute](/docs/WorkingLocally.md)| |
-| largeTitle (iOS 11)      |    ✅     |     /iOS Specific       | |
-
-|       tabBar         | iOS  | Android | Contributor(s) |
-|--------------------|:----:|:-----:|-----|
-| drawUnder          |    ✅     |✅| |
-| hidden   |   ✅     |    ✅        | @gtchance |
-| tabBadge          |       ✅    |✅| Wix|
-| currentTab by Index          |       ✅    | ✅ | Wix |
-| currentTab by componentId         |✅| ✅ | Wix |
-
-|       buttons        | iOS  | Android | Contributor(s) |
-|--------------------|:----:|:-----:|-----|
-| id    |   ✅      |✅|@Johan-dutoit|
-| testID   |     ✅   |✅| @Johan-dutoit|
-| color             |    ✅     |✅| @Johan-dutoit|
-| icon          |   ✅     |✅| @Johan-dutoit|
-| disableTint        |    ✅       |✅| @Johan-dutoit|
-| fontSize        |    ✅       |✅| @Johan-dutoit |
-| fontWeight        |    ✅       |    [Contribute](/docs/WorkingLocally.md)   | |
-
-|       statusBar        | iOS  | Android | Contributor(s) |
-|--------------------|:----:|:-----:|-----|
-| textColorScheme    |✅|[Contribute](/docs/WorkingLocally.md) | |
-| textColorSchemeSingleScreen   |✅|     / iOS specific      | |
-| blur             |    ✅     |      [Contribute](/docs/WorkingLocally.md)       | @gtchance |
-| hideWithTopBar          |   ✅     |     [Contribute](/docs/WorkingLocally.md)       | @gtchance |
-| hidden         |    ✅       |     [Contribute](/docs/WorkingLocally.md)      | Wix |
-
-|       other        | iOS  | Android | Contributor(s) |
-|--------------------|:----:|:-----:|-----|
-| screenBackgroundColor        |   ✅     | ✅ | |
-| orientation       |    ✅     |✅| Wix |
-| disabledBackGesture        |    ✅     |    / iOS specific     | |
-| screenBackgroundImageName        |   ✅      |    [Contribute](/docs/WorkingLocally.md)        | |
-| rootBackgroundImageName              |    ✅     |    [Contribute](/docs/WorkingLocally.md)       | |
-| sideMenuVisible          |      ✅   |✅| |
+| background component          |✅     |✅|
+| subtitleColor            |   ✅      |✅|
+| subtitleFontFamily      |✅|✅|
+| largeTitle (iOS 11)      |    ✅     |     /iOS Specific       |
+
+|       tabBar         | iOS  | Android |
+|--------------------|:----:|:-----:|
+| drawUnder          |    ✅     |✅|
+| hidden   |   ✅     |    ✅        |
+| tabBadge          |       ✅    |✅|
+| currentTab by Index          |       ✅    | ✅ |
+| currentTab by componentId         |✅| ✅ |
+
+|       buttons        | iOS  | Android |
+|--------------------|:----:|:-----:|
+| id    |   ✅      |✅|
+| testID   |     ✅   |✅|
+| color             |    ✅     |✅|
+| icon          |   ✅     |✅|
+| disableTint        |    ✅       |✅|
+| fontSize        |    ✅       |✅|
+| fontWeight        |    ✅       |    [Contribute](/docs/WorkingLocally.md)   |
+
+|       statusBar        | iOS  | Android |
+|--------------------|:----:|:-----:|
+| textColorScheme    |✅|[Contribute](/docs/WorkingLocally.md) |
+| textColorSchemeSingleScreen   |✅|     / iOS specific      |
+| blur             |    ✅     |      [Contribute](/docs/WorkingLocally.md)       |
+| hideWithTopBar          |   ✅     |     [Contribute](/docs/WorkingLocally.md)       |
+| hidden         |    ✅       |     [Contribute](/docs/WorkingLocally.md)      |
+
+|       other        | iOS  | Android |
+|--------------------|:----:|:-----:|
+| screenBackgroundColor        |   ✅     | ✅ |
+| orientation       |    ✅     |✅|
+| disabledBackGesture        |    ✅     |    / iOS specific     |
+| screenBackgroundImageName        |   ✅      |    [Contribute](/docs/WorkingLocally.md)        |
+| rootBackgroundImageName              |    ✅     |    [Contribute](/docs/WorkingLocally.md)       |
+| sideMenuVisible          |      ✅   |✅|
 
 
 ## v1 vs v2 Feature Comparison

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

@@ -104,7 +104,7 @@ public class OptionsPresenter {
         if (topTabOptions.fontFamily != null) topBar.setTopTabFontFamily(topTabOptions.tabIndex, topTabOptions.fontFamily);
     }
 
-    public void onChildWillPop(Options disappearing, Options appearing) {
+    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()) {
                 topBar.hideAnimate(disappearing.animations.pop.topBar);

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

@@ -141,7 +141,7 @@ public class StackController extends ParentController<StackLayout> {
         disappearing.onViewWillDisappear();
         appearing.onViewWillAppear();
         getView().addView(appearing.getView(), 0);
-        getView().onChildWillPop(disappearing.options, appearing.options);
+        getView().onChildWillAppear(appearing, disappearing);
 
         if (disappearing.options.animations.pop.enable.isTrueOrUndefined()) {
             animator.pop(disappearing.getView(), () -> finishPopping(disappearing, listener));

lib/android/app/src/main/java/com/reactnativenavigation/views/StackLayout.java

@@ -8,6 +8,7 @@ import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.presentation.OptionsPresenter;
 import com.reactnativenavigation.viewcontrollers.ReactViewCreator;
 import com.reactnativenavigation.viewcontrollers.TopBarButtonController;
+import com.reactnativenavigation.viewcontrollers.ViewController;
 import com.reactnativenavigation.viewcontrollers.topbar.TopBarBackgroundViewController;
 import com.reactnativenavigation.viewcontrollers.topbar.TopBarController;
 import com.reactnativenavigation.views.titlebar.TitleBarReactViewCreator;
@@ -40,8 +41,8 @@ public class StackLayout extends RelativeLayout {
         optionsPresenter.applyChildOptions(options, child);
     }
 
-    public void onChildWillPop(Options disappearing, Options appearing) {
-        optionsPresenter.onChildWillPop(disappearing, appearing);
+    public void onChildWillAppear(ViewController appearing, ViewController disappearing) {
+        optionsPresenter.onChildWillAppear(appearing.options, disappearing.options);
     }
 
     public void mergeChildOptions(Options options, Component child) {

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

@@ -155,7 +155,7 @@ public class StackControllerTest extends BaseTest {
                 uut.pop(new CommandListenerAdapter() {
                     @Override
                     public void onSuccess(String childId) {
-                        verify(stackLayout[0], times(1)).onChildWillPop(child2.options, child1.options);
+                        verify(stackLayout[0], times(1)).onChildWillAppear(child1, child2);
                     }
                 });
             }