Refactor TitleBarReactView

Manage the view with controller which handles lifecycle

e2e/ScreenStyle.test.js

@@ -127,4 +127,10 @@ describe('screen style', () => {
     await elementById(testIDs.TAB_BASED_APP_BUTTON).tap();
     await expect(elementById(testIDs.TOP_BAR_ELEMENT)).toBeVisible();
   });
+
+  it('set title component', async () => {
+    await elementById(testIDs.PUSH_OPTIONS_BUTTON).tap();
+    await elementById(testIDs.SHOW_TOPBAR_REACT_VIEW).tap();
+    await expect(elementByLabel('Press Me')).toBeVisible();
+  });
 });

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

@@ -38,7 +38,7 @@ public class OptionsPresenter {
 
     private void applyTopBarOptions(TopBarOptions options, AnimationsOptions animationOptions, Component component) {
         if (options.title.text.hasValue()) topBar.setTitle(options.title.text.get());
-        if (options.title.component.hasValue()) topBar.setComponent(options.title.component.get(), options.title.alignment);
+        if (options.title.component.hasValue()) topBar.setTitleComponent(options.title.component.get(), options.title.alignment);
         topBar.setBackgroundColor(options.background.color);
         topBar.setBackgroundComponent(options.background.component);
         topBar.setTitleTextColor(options.title.color);
@@ -121,7 +121,7 @@ public class OptionsPresenter {
 
     private void mergeTopBarOptions(TopBarOptions options, AnimationsOptions animationsOptions, Component component) {
         if (options.title.text.hasValue()) topBar.setTitle(options.title.text.get());
-        if (options.title.component.hasValue()) topBar.setComponent(options.title.component.get(), options.title.alignment);
+        if (options.title.component.hasValue()) topBar.setTitleComponent(options.title.component.get(), options.title.alignment);
         if (options.background.color.hasValue()) topBar.setBackgroundColor(options.background.color);
         if (options.title.color.hasValue()) topBar.setTitleTextColor(options.title.color);
         if (options.title.fontSize.hasValue()) topBar.setTitleFontSize(options.title.fontSize);

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

@@ -12,15 +12,17 @@ public class TitleBarReactViewController extends ViewController<TitleBarReactVie
     private final TitleBarReactViewCreator reactViewCreator;
     private String componentName;
 
-    public TitleBarReactViewController(TitleBarReactViewController reactViewController) {
-        this(reactViewController.getActivity(), reactViewController.reactViewCreator);
-    }
-
     public TitleBarReactViewController(Activity activity, TitleBarReactViewCreator reactViewCreator) {
         super(activity, CompatUtils.generateViewId() + "", new Options());
         this.reactViewCreator = reactViewCreator;
     }
 
+    @Override
+    public void onViewAppeared() {
+        super.onViewAppeared();
+        runOnPreDraw(view -> view.setLayoutParams(view.getLayoutParams()));
+    }
+
     @Override
     protected TitleBarReactView createView() {
         return reactViewCreator.create(getActivity(), getId(), componentName);

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

@@ -26,7 +26,6 @@ import com.reactnativenavigation.parse.params.Number;
 import com.reactnativenavigation.parse.params.Text;
 import com.reactnativenavigation.utils.CompatUtils;
 import com.reactnativenavigation.viewcontrollers.ReactViewCreator;
-import com.reactnativenavigation.viewcontrollers.TitleBarReactViewController;
 import com.reactnativenavigation.viewcontrollers.TopBarButtonController;
 import com.reactnativenavigation.views.titlebar.TitleBar;
 import com.reactnativenavigation.views.titlebar.TitleBarReactViewCreator;
@@ -71,7 +70,7 @@ public class TopBar extends AppBarLayout implements ScrollEventListener.ScrollAw
     protected TitleBar createTitleBar(Context context, ReactViewCreator buttonCreator, TitleBarReactViewCreator reactViewCreator, TopBarButtonController.OnClickListener onClickListener) {
         return new TitleBar(context,
                 buttonCreator,
-                new TitleBarReactViewController((Activity) context, reactViewCreator),
+                reactViewCreator,
                 onClickListener
         );
     }
@@ -100,7 +99,7 @@ public class TopBar extends AppBarLayout implements ScrollEventListener.ScrollAw
         titleBar.setTitleTypeface(typeface);
     }
 
-    public void setComponent(String componentName, TitleOptions.Alignment alignment) {
+    public void setTitleComponent(String componentName, TitleOptions.Alignment alignment) {
         titleBar.setComponent(componentName, alignment);
     }
 

lib/android/app/src/main/java/com/reactnativenavigation/views/titlebar/TitleBar.java

@@ -30,14 +30,16 @@ import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 public class TitleBar extends Toolbar {
     private final ReactViewCreator buttonCreator;
     private TitleBarReactViewController reactViewController;
+    private final TitleBarReactViewCreator reactViewCreator;
     private final TopBarButtonController.OnClickListener onClickListener;
     private final List<TopBarButtonController> rightButtonControllers = new ArrayList<>();
     private TopBarButtonController leftButtonController;
 
-    public TitleBar(Context context, ReactViewCreator buttonCreator, TitleBarReactViewController reactViewController, TopBarButtonController.OnClickListener onClickListener) {
+    public TitleBar(Context context, ReactViewCreator buttonCreator, TitleBarReactViewCreator reactViewCreator, TopBarButtonController.OnClickListener onClickListener) {
         super(context);
         this.buttonCreator = buttonCreator;
-        this.reactViewController = reactViewController;
+        this.reactViewCreator = reactViewCreator;
+        reactViewController = new TitleBarReactViewController((Activity) context, reactViewCreator);
         this.onClickListener = onClickListener;
         getMenu();
         setContentDescription("titleBar");
@@ -61,7 +63,6 @@ public class TitleBar extends Toolbar {
         clearTitle();
         reactViewController.setComponent(componentName);
         addView(reactViewController.getView(), getComponentLayoutParams(alignment));
-        requestLayout();
     }
 
     public void setBackgroundColor(Color color) {
@@ -99,7 +100,7 @@ public class TitleBar extends Toolbar {
 
     private void clearComponent() {
         reactViewController.destroy();
-        reactViewController = new TitleBarReactViewController(reactViewController);
+        reactViewController = new TitleBarReactViewController((Activity) getContext(), reactViewCreator);
     }
 
     private void clearLeftButton() {

lib/android/app/src/main/java/com/reactnativenavigation/views/titlebar/TitleBarReactView.java

@@ -16,7 +16,7 @@ public class TitleBarReactView extends ReactView {
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         super.onMeasure(
-                getChildCount() > 0 ? MeasureSpec.makeMeasureSpec(getChildAt(0).getWidth(), MeasureSpec.EXACTLY) : widthMeasureSpec,
+                (getChildCount() > 0 && getChildAt(0).getWidth() > 0) ? MeasureSpec.makeMeasureSpec(getChildAt(0).getWidth(), MeasureSpec.EXACTLY) : widthMeasureSpec,
                 heightMeasureSpec
         );
     }

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

@@ -137,7 +137,7 @@ public class OptionsMergingTest extends BaseTest {
 
     private void assertTopBarOptions(int t) {
         verify(topBar, times(t)).setTitle(any());
-        verify(topBar, times(t)).setComponent(any(), any());
+        verify(topBar, times(t)).setTitleComponent(any(), any());
         verify(topBar, times(t)).setBackgroundColor(any());
         verify(topBar, times(t)).setTitleTextColor(any());
         verify(topBar, times(t)).setTitleFontSize(any());

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

@@ -12,6 +12,7 @@ import com.reactnativenavigation.parse.TitleOptions;
 import com.reactnativenavigation.parse.params.Button;
 import com.reactnativenavigation.parse.params.Text;
 import com.reactnativenavigation.react.ReactView;
+import com.reactnativenavigation.utils.ViewUtils;
 import com.reactnativenavigation.views.titlebar.TitleBar;
 import com.reactnativenavigation.views.titlebar.TitleBarReactView;
 
@@ -38,16 +39,15 @@ public class TitleBarTest extends BaseTest {
     private Button textButton;
     private Button customButton;
     private Map<String, TopBarButtonController> buttonControllers;
-    private TitleBarReactViewController reactViewController;
 
     @Override
     public void beforeEach() {
         final TopBarButtonCreatorMock buttonCreator = new TopBarButtonCreatorMock();
         final Activity activity = newActivity();
-        reactViewController = spy(new TitleBarReactViewController(activity, new TitleBarReactViewCreatorMock()));
         createButtons();
         buttonControllers = new HashMap<>();
-        uut = spy(new TitleBar(activity, buttonCreator, reactViewController, (buttonId -> {})) {
+        TitleBarReactViewCreatorMock reactViewCreator = new TitleBarReactViewCreatorMock();
+        uut = spy(new TitleBar(activity, buttonCreator, reactViewCreator, (buttonId -> {})) {
             @Override
             public TopBarButtonController createButtonController(Button button) {
                 TopBarButtonController controller = spy(super.createButtonController(button));
@@ -169,11 +169,12 @@ public class TitleBarTest extends BaseTest {
 
     @Test
     public void clear() throws Exception {
+        uut.setComponent("someComponent", TitleOptions.Alignment.Center);
         uut.clear();
         assertThat(uut.getTitle()).isNullOrEmpty();
         assertThat(uut.getMenu().size()).isZero();
         assertThat(uut.getNavigationIcon()).isNull();
-        verify(reactViewController, times(1)).destroy();
+        assertThat(ViewUtils.findChildrenByClassRecursive(uut, TitleBarReactView.class).size()).isZero();
     }
 
     private List<Button> leftButton(Button leftButton) {

playground/src/screens/OptionsScreen.js

@@ -131,7 +131,6 @@ class OptionsScreen extends Component {
             title: 'Two',
             icon: require('../../img/navicon_add.png'),
             disableIconTint: true,
-            // disabled: true,
             showAsAction: 'ifRoom',
             buttonColor: 'green',
             buttonFontSize: 28,