fix android unittests

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

@@ -13,7 +13,7 @@ public class ComponentViewController extends ViewController implements Navigatio
     public interface ReactViewCreator {
 
         IReactView create(Activity activity, String componentId, String componentName);
-	}
+    }
 
     public interface IReactView {
 
@@ -23,75 +23,79 @@ public class ComponentViewController extends ViewController implements Navigatio
 
         void destroy();
 
-		void sendComponentStart();
+        void sendComponentStart();
 
-		void sendComponentStop();
+        void sendComponentStop();
 
         void sendOnNavigationButtonPressed(String buttonId);
     }
 
-	private final String componentName;
-
-	private final ReactViewCreator viewCreator;
-	private NavigationOptions options;
-	private ReactComponent component;
-
-	public ComponentViewController(final Activity activity,
-								   final String id,
-								   final String componentName,
-								   final ReactViewCreator viewCreator,
-								   final NavigationOptions initialNavigationOptions) {
-		super(activity, id);
-		this.componentName = componentName;
-		this.viewCreator = viewCreator;
-		this.options = initialNavigationOptions;
-	}
+    private final String componentName;
+
+    private final ReactViewCreator viewCreator;
+    private NavigationOptions options;
+    private ReactComponent component;
+
+    public ComponentViewController(final Activity activity,
+                                   final String id,
+                                   final String componentName,
+                                   final ReactViewCreator viewCreator,
+                                   final NavigationOptions initialNavigationOptions) {
+        super(activity, id);
+        this.componentName = componentName;
+        this.viewCreator = viewCreator;
+        this.options = initialNavigationOptions;
+    }
 
     @RestrictTo(RestrictTo.Scope.TESTS)
     TopBar getTopBar() {
         return component.getTopBar();
     }
 
-	@Override
-	public void destroy() {
-		super.destroy();
-		if (component != null) component.destroy();
-		component = null;
-	}
-
-	@Override
-	public void onViewAppeared() {
-		super.onViewAppeared();
-		ensureViewIsCreated();
-		component.applyOptions(options);
-		component.sendComponentStart();
-	}
-
-	@Override
-	public void onViewDisappear() {
-		super.onViewDisappear();
-		component.sendComponentStop();
-	}
-
-	@Override
-	protected boolean isViewShown() {
-		return super.isViewShown() && component.isReady();
-	}
-
-	@NonNull
-	@Override
-	protected View createView() {
-		component = (ReactComponent) viewCreator.create(getActivity(), getId(), componentName);
+    @Override
+    public void destroy() {
+        super.destroy();
+        if (component != null) component.destroy();
+        component = null;
+    }
+
+    @Override
+    public void onViewAppeared() {
+        super.onViewAppeared();
+        ensureViewIsCreated();
+        component.applyOptions(options);
+        component.sendComponentStart();
+    }
+
+    @Override
+    public void onViewDisappear() {
+        super.onViewDisappear();
+        component.sendComponentStop();
+    }
+
+    @Override
+    protected boolean isViewShown() {
+        return super.isViewShown() && component.isReady();
+    }
+
+    @NonNull
+    @Override
+    protected View createView() {
+        component = (ReactComponent) viewCreator.create(getActivity(), getId(), componentName);
         return component.asView();
-	}
+    }
 
-	@Override
-	public void mergeNavigationOptions(NavigationOptions options) {
-		this.options.mergeWith(options);
+    @Override
+    public void mergeNavigationOptions(NavigationOptions options) {
+        this.options.mergeWith(options);
         component.applyOptions(options);
-	}
+    }
+
+    NavigationOptions getOptions() {
+        return options;
+    }
 
-	NavigationOptions getOptions() {
-		return options;
-	}
+    ReactComponent getComponent() {
+        return component;
+    }
 }

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

@@ -1,20 +1,16 @@
 package com.reactnativenavigation.views;
 
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.os.Build;
-import android.support.annotation.RestrictTo;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.RelativeLayout;
-
-import com.facebook.react.uimanager.events.EventDispatcher;
-import com.reactnativenavigation.parse.NavigationOptions;
-import com.reactnativenavigation.presentation.OptionsPresenter;
-import com.reactnativenavigation.viewcontrollers.ComponentViewController.IReactView;
-
-import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
-import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
+import android.annotation.*;
+import android.content.*;
+import android.view.*;
+import android.widget.*;
+
+import com.facebook.react.uimanager.events.*;
+import com.reactnativenavigation.parse.*;
+import com.reactnativenavigation.presentation.*;
+import com.reactnativenavigation.viewcontrollers.ComponentViewController.*;
+
+import static android.view.ViewGroup.LayoutParams.*;
 
 @SuppressLint("ViewConstructor")
 public class ComponentLayout extends RelativeLayout implements ReactComponent {
@@ -25,7 +21,7 @@ public class ComponentLayout extends RelativeLayout implements ReactComponent {
 
 	public ComponentLayout(Context context, IReactView reactView, EventDispatcher eventDispatcher) {
 		super(context);
-		this.topBar = new TopBar(context, this);
+		this.topBar = new TopBar(context, this, eventDispatcher);
 		this.reactView = reactView;
         optionsPresenter = new OptionsPresenter(this);
         initViews();

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

@@ -1,10 +1,11 @@
 package com.reactnativenavigation.views;
 
-import android.app.Activity;
+import android.app.*;
 
-import com.facebook.react.ReactInstanceManager;
-import com.reactnativenavigation.react.ReactComponentViewCreator;
-import com.reactnativenavigation.viewcontrollers.ComponentViewController;
+import com.facebook.react.*;
+import com.facebook.react.uimanager.*;
+import com.reactnativenavigation.react.*;
+import com.reactnativenavigation.viewcontrollers.*;
 
 public class ComponentViewCreator implements ComponentViewController.ReactViewCreator {
 
@@ -17,6 +18,6 @@ public class ComponentViewCreator implements ComponentViewController.ReactViewCr
 	@Override
 	public ComponentViewController.IReactView create(Activity activity, String componentId, String componentName) {
         ComponentViewController.IReactView reactView = new ReactComponentViewCreator(instanceManager).create(activity, componentId, componentName);
-        return new ComponentLayout(activity, reactView);
+        return new ComponentLayout(activity, reactView, instanceManager.getCurrentReactContext().getNativeModule(UIManagerModule.class).getEventDispatcher());
 	}
 }

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

@@ -1,43 +1,40 @@
 package com.reactnativenavigation.views;
 
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.graphics.Typeface;
-import android.support.annotation.ColorInt;
-import android.support.annotation.Nullable;
-import android.support.design.widget.AppBarLayout;
+import android.annotation.*;
+import android.content.*;
+import android.graphics.*;
+import android.support.annotation.*;
+import android.support.design.widget.*;
 import android.support.v7.widget.Toolbar;
-import android.util.Log;
-import android.view.Menu;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import com.facebook.react.uimanager.events.EventDispatcher;
-import com.reactnativenavigation.anim.TopBarAnimator;
-import com.reactnativenavigation.anim.TopBarCollapseBehavior;
+import android.util.*;
+import android.view.*;
+import android.widget.*;
+
+import com.facebook.react.uimanager.events.*;
+import com.reactnativenavigation.anim.*;
 import com.reactnativenavigation.parse.Button;
 import com.reactnativenavigation.parse.Color;
-import com.reactnativenavigation.parse.NavigationOptions;
+import com.reactnativenavigation.parse.*;
 import com.reactnativenavigation.parse.Number;
-import com.reactnativenavigation.viewcontrollers.toptabs.TopTabsViewPager;
-import com.reactnativenavigation.parse.Color;
+import com.reactnativenavigation.viewcontrollers.toptabs.*;
 
-import java.util.ArrayList;
+import java.util.*;
 
 @SuppressLint("ViewConstructor")
 public class TopBar extends AppBarLayout {
-	private final Toolbar titleBar;
+    private final Toolbar titleBar;
+    private final TopBarCollapseBehavior collapsingBehavior;
+    private final TopBarAnimator animator;
     private Component component;
     private TopTabs topTabs;
 
-    public TopBar(final Context context, Component component) {
+    public TopBar(final Context context, Component component, EventDispatcher eventDispatcher) {
         super(context);
         collapsingBehavior = new TopBarCollapseBehavior(eventDispatcher, this);
         this.component = component;
         titleBar = new Toolbar(context);
         topTabs = new TopTabs(getContext());
-        animator = new TopBarAnimator(this, component != null ? component.getContentView() : null);
+        this.animator = new TopBarAnimator(this, component != null ? component.getContentView() : null);
         addView(titleBar);
     }
 
@@ -121,10 +118,10 @@ public class TopBar extends AppBarLayout {
         setLeftButton(leftButton);
     }
 
-	private void setLeftButton(final Button button) {
-		TitleBarButton leftBarButton = new TitleBarButton(component, this.titleBar, button);
-		leftBarButton.applyNavigationIcon(getContext());
-	}
+    private void setLeftButton(final Button button) {
+        TitleBarButton leftBarButton = new TitleBarButton(component, this.titleBar, button);
+        leftBarButton.applyNavigationIcon(getContext());
+    }
 
     private void setRightButtons(ArrayList<Button> rightButtons) {
         if (rightButtons == null || rightButtons.size() == 0) {
@@ -134,11 +131,11 @@ public class TopBar extends AppBarLayout {
         Menu menu = getTitleBar().getMenu();
         menu.clear();
 
-		for (int i = 0; i < rightButtons.size(); i++){
-	   		Button button = rightButtons.get(i);
-			TitleBarButton titleBarButton = new TitleBarButton(component, this.titleBar, button);
-			titleBarButton.addToMenu(getContext(), menu);
-       }
+        for (int i = 0; i < rightButtons.size(); i++) {
+            Button button = rightButtons.get(i);
+            TitleBarButton titleBarButton = new TitleBarButton(component, this.titleBar, button);
+            titleBarButton.addToMenu(getContext(), menu);
+        }
     }
 
     public Toolbar getTitleBar() {

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

@@ -1,22 +1,18 @@
 package com.reactnativenavigation.views;
 
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.support.annotation.RestrictTo;
-import android.support.v4.view.ViewPager;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-
-import com.reactnativenavigation.parse.NavigationOptions;
-import com.reactnativenavigation.presentation.OptionsPresenter;
-import com.reactnativenavigation.utils.Task;
-import com.reactnativenavigation.viewcontrollers.toptabs.TopTabController;
-import com.reactnativenavigation.viewcontrollers.toptabs.TopTabsAdapter;
-import com.reactnativenavigation.viewcontrollers.toptabs.TopTabsViewPager;
-
-import java.util.List;
+import android.annotation.*;
+import android.content.*;
+import android.support.annotation.*;
+import android.support.v4.view.*;
+import android.view.*;
+import android.widget.*;
+
+import com.reactnativenavigation.parse.*;
+import com.reactnativenavigation.presentation.*;
+import com.reactnativenavigation.utils.*;
+import com.reactnativenavigation.viewcontrollers.toptabs.*;
+
+import java.util.*;
 
 @SuppressLint("ViewConstructor")
 public class TopTabsLayout extends RelativeLayout implements Component {
@@ -29,7 +25,7 @@ public class TopTabsLayout extends RelativeLayout implements Component {
     public TopTabsLayout(Context context, List<TopTabController> tabs, TopTabsAdapter adapter) {
         super(context);
         this.tabs = tabs;
-        topBar = new TopBar(context, this);
+        topBar = new TopBar(context, this, null);
         topBar.setId(View.generateViewId());
         viewPager = new TopTabsViewPager(context, tabs, adapter);
         optionsPresenter = new OptionsPresenter(this);

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

@@ -18,7 +18,7 @@ public class TestComponentLayout extends RelativeLayout implements ReactComponen
 
     public TestComponentLayout(final Context context) {
 		super(context);
-        topBar = new TopBar(context, this);
+        topBar = new TopBar(context, this, null);
         contentView = new View(context);
         addView(topBar);
         addView(contentView);

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

@@ -13,7 +13,7 @@ public class TestComponentView extends View implements ReactComponent {
 
 	public TestComponentView(final Context context) {
 		super(context);
-		topBar = new TopBar(context, this);
+		topBar = new TopBar(context, this, null);
 
 	}
 

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

@@ -140,7 +140,7 @@ public class OptionsApplyingTest extends BaseTest {
 
     @Test
     public void appliesDrawUnder() throws Exception {
-        assertThat(uut.getNavigationOptions()).isSameAs(initialNavigationOptions);
+        assertThat(uut.getOptions()).isSameAs(initialNavigationOptions);
         initialNavigationOptions.topBarOptions.title = "the title";
         initialNavigationOptions.topBarOptions.drawBehind = NavigationOptions.BooleanOptions.False;
         uut.onViewAppeared();

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

@@ -9,7 +9,7 @@ import static org.assertj.core.api.Java6Assertions.assertThat;
 public class TopBarTest extends BaseTest {
 	@Test
 	public void title() throws Exception {
-		TopBar topBar = new TopBar(newActivity());
+		TopBar topBar = new TopBar(newActivity(), null, null);
 		assertThat(topBar.getTitle()).isEmpty();
 
 		topBar.setTitle("new title");