Invoke onNavigationButtonPressed on button press (#2755)

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

@@ -4,6 +4,7 @@ import android.support.annotation.ColorInt;
 import android.view.MenuItem;
 
 import com.reactnativenavigation.parse.params.Bool;
+import com.reactnativenavigation.parse.params.NullBool;
 import com.reactnativenavigation.parse.parsers.BoolParser;
 
 import org.json.JSONArray;
@@ -15,15 +16,15 @@ import static com.reactnativenavigation.parse.Options.NO_INT_VALUE;
 
 public class Button {
 	public String id;
-	public Text title;
-	public Bool enabled;
-	public Bool disableIconTint;
+	public Text title = new NullText();
+	public Bool enabled = new NullBool();
+	public Bool disableIconTint = new NullBool();
 	public int showAsAction;
 	@ColorInt public int buttonColor;
 	public int buttonFontSize;
-	private Text buttonFontWeight;
+	private Text buttonFontWeight = new NullText();
 	public Text icon = new NullText();
-	public Text testId;
+	public Text testId = new NullText();
 
 	private static Button parseJson(JSONObject json)  {
 		Button button = new Button();

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

@@ -26,6 +26,20 @@ public class ViewUtils {
         return null;
     }
 
+    public static <T> List<T> findChildrenByClassRecursive(ViewGroup root, Class clazz) {
+        ArrayList<T> ret = new ArrayList<>();
+        for (int i = 0; i < root.getChildCount(); i++) {
+            View view = root.getChildAt(i);
+            if (view instanceof ViewGroup) {
+                ret.addAll(findChildrenByClassRecursive((ViewGroup) view, clazz));
+            }
+            if (clazz.isAssignableFrom(view.getClass())) {
+                ret.add((T) view);
+            }
+        }
+        return ret;
+    }
+
     public static <T> List<T> findChildrenByClass(ViewGroup root, Class clazz) {
         List<T> ret = new ArrayList<>();
         for (int i = 0; i < root.getChildCount(); i++) {

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

@@ -68,6 +68,15 @@ public class BottomTabsController extends ParentController implements AHBottomNa
 		return !tabs.isEmpty() && tabs.get(bottomTabs.getCurrentItem()).handleBack();
 	}
 
+    @Override
+    public void sendOnNavigationButtonPressed(String buttonId) {
+        getCurrentTab().sendOnNavigationButtonPressed(buttonId);
+    }
+
+    private ViewController getCurrentTab() {
+        return tabs.get(bottomTabs.getCurrentItem());
+    }
+
     @Override
     public boolean onTabSelected(int index, boolean wasSelected) {
         if (wasSelected) return false;

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

@@ -36,6 +36,11 @@ public class ComponentViewController extends ViewController<ComponentLayout> imp
         super.onViewDisappear();
     }
 
+    @Override
+    public void sendOnNavigationButtonPressed(String buttonId) {
+        getView().sendOnNavigationButtonPressed(buttonId);
+    }
+
     @Override
     public void applyOptions(Options options) {
         view.applyOptions(options);

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

@@ -52,6 +52,11 @@ public class Navigator extends ParentController {
         super.destroy();
     }
 
+    @Override
+    public void sendOnNavigationButtonPressed(String buttonId) {
+
+    }
+
     public void setRoot(final ViewController viewController, Promise promise) {
         if (root != null) {
             root.destroy();

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

@@ -32,7 +32,12 @@ public class SideMenuController extends ParentController {
         return new DrawerLayout(getActivity());
 	}
 
-	@NonNull
+    @Override
+    public void sendOnNavigationButtonPressed(String buttonId) {
+        centerController.sendOnNavigationButtonPressed(buttonId);
+    }
+
+    @NonNull
 	@Override
 	public Collection<ViewController> getChildControllers() {
 		ArrayList<ViewController> children = new ArrayList<>();

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

@@ -192,10 +192,15 @@ public class StackController extends ParentController <StackLayout> {
         return false;
 	}
 
+    @Override
+    public void sendOnNavigationButtonPressed(String buttonId) {
+        peek().sendOnNavigationButtonPressed(buttonId);
+    }
+
     @NonNull
     @Override
     protected StackLayout createView() {
-        stackLayout = new StackLayout(getActivity());
+        stackLayout = new StackLayout(getActivity(), this::sendOnNavigationButtonPressed);
         return stackLayout;
     }
 

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

@@ -191,6 +191,8 @@ public abstract class ViewController<T extends ViewGroup> implements ViewTreeObs
         }
     }
 
+    public abstract void sendOnNavigationButtonPressed(String buttonId);
+
     protected boolean isViewShown() {
         return !isDestroyed && getView().isShown();
     }

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/toptabs/TopTabsController.java

@@ -68,6 +68,11 @@ public class TopTabsController extends ParentController<TopTabsViewPager> implem
         performOnCurrentTab(ViewController::onViewDisappear);
     }
 
+    @Override
+    public void sendOnNavigationButtonPressed(String buttonId) {
+        performOnCurrentTab(tab -> tab.sendOnNavigationButtonPressed(buttonId));
+    }
+
     @Override
     public void applyOptions(Options options) {
         getView().applyOptions(options);

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

@@ -1,5 +1,6 @@
 package com.reactnativenavigation.views;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.support.annotation.RestrictTo;
 import android.support.v4.view.ViewPager;
@@ -17,13 +18,14 @@ import com.reactnativenavigation.utils.CompatUtils;
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 
-public class StackLayout extends RelativeLayout implements TitleBarButton.OnClickListener {
+@SuppressLint("ViewConstructor")
+public class StackLayout extends RelativeLayout {
 
     private final TopBar topBar;
 
-    public StackLayout(Context context) {
+    public StackLayout(Context context, TitleBarButton.OnClickListener topBarButtonClickListener) {
         super(context);
-        topBar = new TopBar(context, this, this);
+        topBar = new TopBar(context, topBarButtonClickListener, this);
         topBar.setId(CompatUtils.generateViewId());
         createLayout();
         setContentDescription("StackLayout");
@@ -33,11 +35,6 @@ public class StackLayout extends RelativeLayout implements TitleBarButton.OnClic
         addView(topBar, MATCH_PARENT, WRAP_CONTENT);
     }
 
-    @Override
-    public void onPress(String buttonId) {
-
-    }
-
     public void applyOptions(Options options, ReactComponent component) {
         new OptionsPresenter(topBar, component).applyOptions(options);
     }

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

@@ -15,13 +15,21 @@ import com.reactnativenavigation.views.TopBar;
 
 public class SimpleViewController extends ViewController<FrameLayout> {
 
+    private SimpleView simpleView;
+
     public SimpleViewController(final Activity activity, String id, Options options) {
         super(activity, id, options);
     }
 
     @Override
     protected FrameLayout createView() {
-        return new SimpleView(getActivity());
+        simpleView = new SimpleView(getActivity());
+        return simpleView;
+    }
+
+    @Override
+    public void sendOnNavigationButtonPressed(String buttonId) {
+        simpleView.sendOnNavigationButtonPressed(buttonId);
     }
 
     @Override

lib/android/app/src/test/java/com/reactnativenavigation/utils/TitleBarHelper.java

@@ -0,0 +1,11 @@
+package com.reactnativenavigation.utils;
+
+import android.support.v7.widget.Toolbar;
+import android.view.View;
+import android.widget.TextView;
+
+public class TitleBarHelper {
+    public static View getRightButton(Toolbar toolbar, int index) {
+        return (View) ViewUtils.findChildrenByClassRecursive(toolbar, TextView.class).get(index);
+    }
+}

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

@@ -45,11 +45,11 @@ public class BottomTabsControllerTest extends BaseTest {
         super.beforeEach();
         activity = newActivity();
         uut = new BottomTabsController(activity, imageLoaderMock, "uut", new Options());
-        child1 = new SimpleViewController(activity, "child1", tabOptions);
-        child2 = new SimpleViewController(activity, "child2", tabOptions);
-        child3 = new SimpleViewController(activity, "child3", tabOptions);
-        child4 = new SimpleViewController(activity, "child4", tabOptions);
-        child5 = new SimpleViewController(activity, "child5", tabOptions);
+        child1 = spy(new SimpleViewController(activity, "child1", tabOptions));
+        child2 = spy(new SimpleViewController(activity, "child2", tabOptions));
+        child3 = spy(new SimpleViewController(activity, "child3", tabOptions));
+        child4 = spy(new SimpleViewController(activity, "child4", tabOptions));
+        child5 = spy(new SimpleViewController(activity, "child5", tabOptions));
     }
 
     @Test
@@ -140,6 +140,16 @@ public class BottomTabsControllerTest extends BaseTest {
         assertThat(optionsCaptor.getValue().bottomTabsOptions.color.hasValue()).isFalse();
     }
 
+    @Test
+    public void buttonPressInvokedOnCurrentTab() throws Exception {
+        uut.setTabs(createTabs());
+        uut.ensureViewIsCreated();
+        uut.selectTabAtIndex(1);
+
+        uut.sendOnNavigationButtonPressed("btn1");
+        verify(child2, times(1)).sendOnNavigationButtonPressed("btn1");
+    }
+
     @NonNull
     private List<ViewController> createTabs() {
         return Arrays.asList(child1, child2, child3, child4, child5);

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

@@ -67,4 +67,11 @@ public class ComponentViewControllerTest extends BaseTest {
         when(view.isReady()).thenReturn(true);
         assertThat(uut.isViewShown()).isTrue();
     }
+
+    @Test
+    public void onNavigationButtonPressInvokedOnReactComponent() throws Exception {
+        uut.ensureViewIsCreated();
+        uut.sendOnNavigationButtonPressed("btn1");
+        verify(view, times(1)).sendOnNavigationButtonPressed("btn1");
+    }
 }

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

@@ -51,6 +51,11 @@ public class ParentControllerTest extends BaseTest {
                 return layout;
             }
 
+            @Override
+            public void sendOnNavigationButtonPressed(String buttonId) {
+
+            }
+
             @NonNull
             @Override
             public Collection<ViewController> getChildControllers() {

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

@@ -35,9 +35,9 @@ public class StackControllerTest extends BaseTest {
         super.beforeEach();
         activity = newActivity();
         uut = new StackController(activity, "uut", new Options());
-        child1 = new SimpleViewController(activity, "child1", new Options());
-        child2 = new SimpleViewController(activity, "child2", new Options());
-        child3 = new SimpleViewController(activity, "child3", new Options());
+        child1 = spy(new SimpleViewController(activity, "child1", new Options()));
+        child2 = spy(new SimpleViewController(activity, "child2", new Options()));
+        child3 = spy(new SimpleViewController(activity, "child3", new Options()));
     }
 
     @Test
@@ -381,6 +381,14 @@ public class StackControllerTest extends BaseTest {
         assertThat(ViewHelper.isVisible(uut.getTopBar().getTopTabs())).isFalse();
     }
 
+    @Test
+    public void buttonPressInvokedOnCurrentStack() throws Exception {
+        uut.ensureViewIsCreated();
+        uut.push(child1, new MockPromise());
+        uut.sendOnNavigationButtonPressed("btn1");
+        verify(child1, times(1)).sendOnNavigationButtonPressed("btn1");
+    }
+
     private void assertContainsOnlyId(String... ids) {
         assertThat(uut.size()).isEqualTo(ids.length);
         assertThat(uut.getChildControllers()).extracting((Extractor<ViewController, String>) ViewController::getId).containsOnly(ids);

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

@@ -232,6 +232,14 @@ public class TopTabsViewControllerTest extends BaseTest {
         assertThat(ViewHelper.isVisible(stackController.getTopBar().getTopTabs())).isFalse();
     }
 
+    @Test
+    public void onNavigationButtonPressInvokedOnCurrentTab() throws Exception {
+        uut.ensureViewIsCreated();
+        uut.switchToTab(1);
+        uut.sendOnNavigationButtonPressed("btn1");
+        verify(tabControllers.get(1), times(1)).sendOnNavigationButtonPressed("btn1");
+    }
+
     private IReactView tab(TopTabsViewPager topTabs, final int index) {
         return (IReactView) ((ViewGroup) topTabs.getChildAt(index)).getChildAt(0);
     }

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

@@ -53,6 +53,11 @@ public class ViewControllerTest extends BaseTest {
             protected FrameLayout createView() {
                 return otherView;
             }
+
+            @Override
+            public void sendOnNavigationButtonPressed(String buttonId) {
+
+            }
         };
         assertThat(myController.getView()).isEqualTo(otherView);
     }

lib/android/app/src/test/java/com/reactnativenavigation/views/TopBarTest.java

@@ -1,12 +1,20 @@
 package com.reactnativenavigation.views;
 
+import android.util.Log;
+import android.view.MenuItem;
+
 import com.reactnativenavigation.BaseTest;
 import com.reactnativenavigation.anim.TopBarAnimator;
+import com.reactnativenavigation.parse.Button;
+import com.reactnativenavigation.parse.Text;
 import com.reactnativenavigation.parse.params.Bool;
 import com.reactnativenavigation.parse.params.NullBool;
+import com.reactnativenavigation.utils.TitleBarHelper;
 
 import org.junit.Test;
 
+import java.util.ArrayList;
+
 import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
@@ -16,16 +24,48 @@ public class TopBarTest extends BaseTest {
 
     private TopBar uut;
     private TopBarAnimator animator;
+    private ArrayList<Button> leftButton;
+    private ArrayList<Button> rightButtons;
+    private TitleBarButton.OnClickListener onClickListener;
 
     @Override
     public void beforeEach() {
-        StackLayout parent = new StackLayout(newActivity());
-        uut = new TopBar(newActivity(), buttonId -> {}, parent);
+        onClickListener = spy(new TitleBarButton.OnClickListener() {
+            @Override
+            public void onPress(String buttonId) {
+                Log.i("TopBarTest", "onPress: " + buttonId);
+            }
+        });
+        StackLayout parent = new StackLayout(newActivity(), this.onClickListener);
+        uut = new TopBar(newActivity(), this.onClickListener, parent);
         animator = spy(new TopBarAnimator(uut));
         uut.setAnimator(animator);
+        leftButton = createLeftButton();
+        rightButtons = createRightButtons();
         parent.addView(uut);
     }
 
+    private ArrayList<Button> createLeftButton() {
+        ArrayList<Button> result = new ArrayList<>();
+        Button leftButton = new Button();
+        leftButton.id = "leftButton";
+        leftButton.title = new Text("");
+        result.add(spy(leftButton));
+        return result;
+    }
+
+    private ArrayList<Button> createRightButtons() {
+        ArrayList<Button> result = new ArrayList<>();
+        for (int i = 0; i < 2; i++) {
+            Button button = new Button();
+            button.id = "rightButtons" + i;
+            button.title = new Text("btn" + i);
+            button.showAsAction = MenuItem.SHOW_AS_ACTION_ALWAYS;
+            result.add(spy(button));
+        }
+        return result;
+    }
+
     @Test
     public void title() throws Exception {
         assertThat(uut.getTitle()).isEmpty();
@@ -45,4 +85,14 @@ public class TopBarTest extends BaseTest {
         uut.show(new NullBool());
         verify(animator, times(1)).show();
     }
+
+    @Test
+    public void button_TitleBarButtonOnClickInvoked() throws Exception {
+        uut.setButtons(new ArrayList<>(), rightButtons);
+        for (int i = 0; i < rightButtons.size(); i++) {
+            Button rightButton = rightButtons.get(i);
+            TitleBarHelper.getRightButton(uut.getTitleBar(), i).callOnClick();
+            verify(onClickListener, times(1)).onPress(rightButton.id);
+        }
+    }
 }