f

lib/android/app/src/main/java/com/reactnativenavigation/anim/TopBarAnimator.java

@@ -11,7 +11,7 @@ import android.view.animation.AccelerateInterpolator;
 import android.view.animation.DecelerateInterpolator;
 
 import com.reactnativenavigation.parse.AnimationOptions;
-import com.reactnativenavigation.views.TopBar;
+import com.reactnativenavigation.views.topbar.TopBar;
 
 public class TopBarAnimator {
 

lib/android/app/src/main/java/com/reactnativenavigation/anim/TopBarCollapseBehavior.java

@@ -4,7 +4,7 @@ package com.reactnativenavigation.anim;
 import android.view.View;
 
 import com.reactnativenavigation.interfaces.ScrollEventListener;
-import com.reactnativenavigation.views.TopBar;
+import com.reactnativenavigation.views.topbar.TopBar;
 
 public class TopBarCollapseBehavior implements ScrollEventListener.OnScrollListener, ScrollEventListener.OnDragListener {
     private TopBar topBar;

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

@@ -16,8 +16,8 @@ import com.reactnativenavigation.viewcontrollers.externalcomponent.ExternalCompo
 import com.reactnativenavigation.viewcontrollers.toptabs.TopTabsController;
 import com.reactnativenavigation.views.ComponentViewCreator;
 import com.reactnativenavigation.views.titlebar.TitleBarReactViewCreator;
-import com.reactnativenavigation.views.TopBarButtonCreator;
-import com.reactnativenavigation.views.TopTabsLayoutCreator;
+import com.reactnativenavigation.views.titlebar.TitleBarButtonCreator;
+import com.reactnativenavigation.views.toptabs.TopTabsLayoutCreator;
 import com.reactnativenavigation.views.topbar.TopBarBackgroundViewCreator;
 
 import java.util.ArrayList;
@@ -121,7 +121,7 @@ public class LayoutFactory {
 
 	private ViewController createStack(LayoutNode node) {
         StackController stackController = new StackController(activity,
-                new TopBarButtonCreator(reactInstanceManager),
+                new TitleBarButtonCreator(reactInstanceManager),
                 new TitleBarReactViewCreator(reactInstanceManager),
                 new TopBarBackgroundViewCreator(reactInstanceManager),
                 node.id,

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

@@ -13,7 +13,7 @@ import com.reactnativenavigation.parse.TopTabsOptions;
 import com.reactnativenavigation.parse.params.Button;
 import com.reactnativenavigation.viewcontrollers.IReactView;
 import com.reactnativenavigation.views.Component;
-import com.reactnativenavigation.views.TopBar;
+import com.reactnativenavigation.views.topbar.TopBar;
 
 import java.util.ArrayList;
 

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

@@ -13,7 +13,7 @@ import com.reactnativenavigation.utils.NoOpPromise;
 import com.reactnativenavigation.views.Component;
 import com.reactnativenavigation.views.ReactComponent;
 import com.reactnativenavigation.views.StackLayout;
-import com.reactnativenavigation.views.TopBar;
+import com.reactnativenavigation.views.topbar.TopBar;
 import com.reactnativenavigation.views.titlebar.TitleBarReactViewCreator;
 import com.reactnativenavigation.views.topbar.TopBarBackgroundViewCreator;
 

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

@@ -18,7 +18,7 @@ import android.widget.TextView;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.parse.params.Button;
 import com.reactnativenavigation.parse.params.Text;
-import com.reactnativenavigation.views.TopBarReactButtonView;
+import com.reactnativenavigation.views.titlebar.TitleBarReactButtonView;
 import com.reactnativenavigation.utils.ArrayUtils;
 import com.reactnativenavigation.utils.ImageLoader;
 import com.reactnativenavigation.utils.ImageLoadingListenerAdapter;
@@ -28,7 +28,7 @@ import com.reactnativenavigation.utils.ViewUtils;
 import java.util.ArrayList;
 import java.util.List;
 
-public class TopBarButtonController extends ViewController<TopBarReactButtonView> implements MenuItem.OnMenuItemClickListener {
+public class TopBarButtonController extends ViewController<TitleBarReactButtonView> implements MenuItem.OnMenuItemClickListener {
     public interface OnClickListener {
         void onPress(String buttonId);
     }
@@ -62,9 +62,9 @@ public class TopBarButtonController extends ViewController<TopBarReactButtonView
 
     @NonNull
     @Override
-    protected TopBarReactButtonView createView() {
-        view = (TopBarReactButtonView) viewCreator.create(getActivity(), getId(), button.component.get());
-        return (TopBarReactButtonView) view.asView();
+    protected TitleBarReactButtonView createView() {
+        view = (TitleBarReactButtonView) viewCreator.create(getActivity(), getId(), button.component.get());
+        return (TitleBarReactButtonView) view.asView();
     }
 
     @Override

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

@@ -11,8 +11,8 @@ import com.reactnativenavigation.viewcontrollers.ParentController;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 import com.reactnativenavigation.viewcontrollers.ViewVisibilityListenerAdapter;
 import com.reactnativenavigation.views.Component;
-import com.reactnativenavigation.views.TopTabsLayoutCreator;
-import com.reactnativenavigation.views.TopTabsViewPager;
+import com.reactnativenavigation.views.toptabs.TopTabsLayoutCreator;
+import com.reactnativenavigation.views.toptabs.TopTabsViewPager;
 
 import java.util.Collection;
 import java.util.List;

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

@@ -1,6 +1,7 @@
 package com.reactnativenavigation.views;
 
 import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.views.topbar.TopBar;
 
 public interface Component {
     void applyOptions(Options options);

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

@@ -12,6 +12,7 @@ import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.presentation.ComponentOptionsPresenter;
 import com.reactnativenavigation.viewcontrollers.IReactView;
 import com.reactnativenavigation.viewcontrollers.TopBarButtonController;
+import com.reactnativenavigation.views.topbar.TopBar;
 import com.reactnativenavigation.views.touch.OverlayTouchDelegate;
 
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;

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

@@ -7,6 +7,7 @@ import android.widget.RelativeLayout;
 
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.presentation.ComponentOptionsPresenter;
+import com.reactnativenavigation.views.topbar.TopBar;
 
 import static android.widget.RelativeLayout.BELOW;
 

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

@@ -13,6 +13,7 @@ import com.reactnativenavigation.utils.CompatUtils;
 import com.reactnativenavigation.viewcontrollers.ReactViewCreator;
 import com.reactnativenavigation.viewcontrollers.TopBarButtonController;
 import com.reactnativenavigation.views.titlebar.TitleBarReactViewCreator;
+import com.reactnativenavigation.views.topbar.TopBar;
 import com.reactnativenavigation.views.topbar.TopBarBackgroundViewCreator;
 
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;

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

@@ -1,20 +0,0 @@
-package com.reactnativenavigation.views;
-
-import android.app.Activity;
-
-import com.facebook.react.ReactInstanceManager;
-import com.reactnativenavigation.viewcontrollers.ReactViewCreator;
-
-public class TopBarButtonCreator implements ReactViewCreator {
-
-    private ReactInstanceManager instanceManager;
-
-    public TopBarButtonCreator(ReactInstanceManager instanceManager) {
-        this.instanceManager = instanceManager;
-	}
-
-	@Override
-	public TopBarReactButtonView create(Activity activity, String componentId, String componentName) {
-        return new TopBarReactButtonView(activity, instanceManager, componentId, componentName);
-    }
-}

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

@@ -0,0 +1,20 @@
+package com.reactnativenavigation.views.titlebar;
+
+import android.app.Activity;
+
+import com.facebook.react.ReactInstanceManager;
+import com.reactnativenavigation.viewcontrollers.ReactViewCreator;
+
+public class TitleBarButtonCreator implements ReactViewCreator {
+
+    private ReactInstanceManager instanceManager;
+
+    public TitleBarButtonCreator(ReactInstanceManager instanceManager) {
+        this.instanceManager = instanceManager;
+	}
+
+	@Override
+	public TitleBarReactButtonView create(Activity activity, String componentId, String componentName) {
+        return new TitleBarReactButtonView(activity, instanceManager, componentId, componentName);
+    }
+}

lib/android/app/src/main/java/com/reactnativenavigation/views/TopBarReactButtonView.java → lib/android/app/src/main/java/com/reactnativenavigation/views/titlebar/TitleBarReactButtonView.java

@@ -1,4 +1,4 @@
-package com.reactnativenavigation.views;
+package com.reactnativenavigation.views.titlebar;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -7,9 +7,9 @@ import com.facebook.react.ReactInstanceManager;
 import com.reactnativenavigation.react.ReactView;
 
 @SuppressLint("ViewConstructor")
-public class TopBarReactButtonView extends ReactView {
+public class TitleBarReactButtonView extends ReactView {
 
-    public TopBarReactButtonView(Context context, ReactInstanceManager reactInstanceManager, String componentId, String componentName) {
+    public TitleBarReactButtonView(Context context, ReactInstanceManager reactInstanceManager, String componentId, String componentName) {
         super(context, reactInstanceManager, componentId, componentName);
     }
 

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

@@ -1,4 +1,4 @@
-package com.reactnativenavigation.views;
+package com.reactnativenavigation.views.topbar;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -27,10 +27,10 @@ import com.reactnativenavigation.parse.params.Text;
 import com.reactnativenavigation.utils.CompatUtils;
 import com.reactnativenavigation.viewcontrollers.ReactViewCreator;
 import com.reactnativenavigation.viewcontrollers.TopBarButtonController;
+import com.reactnativenavigation.views.StackLayout;
+import com.reactnativenavigation.views.toptabs.TopTabs;
 import com.reactnativenavigation.views.titlebar.TitleBar;
 import com.reactnativenavigation.views.titlebar.TitleBarReactViewCreator;
-import com.reactnativenavigation.views.topbar.TopBarBackgroundView;
-import com.reactnativenavigation.views.topbar.TopBarBackgroundViewCreator;
 
 import java.util.List;
 

lib/android/app/src/main/java/com/reactnativenavigation/views/TopTabs.java → lib/android/app/src/main/java/com/reactnativenavigation/views/toptabs/TopTabs.java

@@ -1,4 +1,4 @@
-package com.reactnativenavigation.views;
+package com.reactnativenavigation.views.toptabs;
 
 import android.content.Context;
 import android.graphics.Typeface;
@@ -8,6 +8,7 @@ import android.view.ViewManager;
 
 import com.reactnativenavigation.parse.params.Color;
 import com.reactnativenavigation.parse.params.Number;
+import com.reactnativenavigation.views.topbar.TopBar;
 
 public class TopTabs extends TabLayout {
     private final TopTabsStyleHelper styleHelper;

lib/android/app/src/main/java/com/reactnativenavigation/views/TopTabsLayoutCreator.java → lib/android/app/src/main/java/com/reactnativenavigation/views/toptabs/TopTabsLayoutCreator.java

@@ -1,4 +1,4 @@
-package com.reactnativenavigation.views;
+package com.reactnativenavigation.views.toptabs;
 
 import android.content.Context;
 

lib/android/app/src/main/java/com/reactnativenavigation/views/TopTabsStyleHelper.java → lib/android/app/src/main/java/com/reactnativenavigation/views/toptabs/TopTabsStyleHelper.java

@@ -1,4 +1,4 @@
-package com.reactnativenavigation.views;
+package com.reactnativenavigation.views.toptabs;
 
 import android.content.res.ColorStateList;
 import android.graphics.Typeface;
@@ -9,6 +9,7 @@ import com.reactnativenavigation.parse.params.Color;
 import com.reactnativenavigation.parse.params.Number;
 import com.reactnativenavigation.utils.Task;
 import com.reactnativenavigation.utils.ViewUtils;
+import com.reactnativenavigation.views.toptabs.TopTabs;
 
 class TopTabsStyleHelper {
     private TopTabs topTabs;

lib/android/app/src/main/java/com/reactnativenavigation/views/TopTabsViewPager.java → lib/android/app/src/main/java/com/reactnativenavigation/views/toptabs/TopTabsViewPager.java

@@ -1,4 +1,4 @@
-package com.reactnativenavigation.views;
+package com.reactnativenavigation.views.toptabs;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -12,6 +12,8 @@ import com.reactnativenavigation.viewcontrollers.IReactView;
 import com.reactnativenavigation.viewcontrollers.TopBarButtonController;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 import com.reactnativenavigation.viewcontrollers.toptabs.TopTabsAdapter;
+import com.reactnativenavigation.views.Component;
+import com.reactnativenavigation.views.topbar.TopBar;
 
 import java.util.List;
 

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

@@ -11,7 +11,7 @@ import com.reactnativenavigation.interfaces.ScrollEventListener;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 import com.reactnativenavigation.views.ReactComponent;
-import com.reactnativenavigation.views.TopBar;
+import com.reactnativenavigation.views.topbar.TopBar;
 
 public class SimpleViewController extends ViewController<FrameLayout> {
 

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

@@ -3,7 +3,7 @@ package com.reactnativenavigation.mocks;
 import android.app.Activity;
 
 import com.facebook.react.ReactInstanceManager;
-import com.reactnativenavigation.views.TopBarReactButtonView;
+import com.reactnativenavigation.views.titlebar.TitleBarReactButtonView;
 import com.reactnativenavigation.viewcontrollers.ReactViewCreator;
 
 import static org.mockito.Mockito.mock;
@@ -11,9 +11,9 @@ import static org.mockito.Mockito.mock;
 public class TopBarButtonCreatorMock implements ReactViewCreator {
 
     @Override
-    public TopBarReactButtonView create(Activity activity, String componentId, String componentName) {
+    public TitleBarReactButtonView create(Activity activity, String componentId, String componentName) {
         final ReactInstanceManager reactInstanceManager = mock(ReactInstanceManager.class);
-        return new TopBarReactButtonView(activity, reactInstanceManager, componentId, componentName) {
+        return new TitleBarReactButtonView(activity, reactInstanceManager, componentId, componentName) {
             @Override
             public void sendComponentStart() {
 

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

@@ -15,7 +15,7 @@ import com.reactnativenavigation.parse.params.Fraction;
 import com.reactnativenavigation.parse.params.Number;
 import com.reactnativenavigation.parse.params.Text;
 import com.reactnativenavigation.presentation.OptionsPresenter;
-import com.reactnativenavigation.views.TopBar;
+import com.reactnativenavigation.views.topbar.TopBar;
 
 import org.json.JSONObject;
 import org.junit.Test;

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

@@ -17,8 +17,8 @@ import com.reactnativenavigation.utils.ViewHelper;
 import com.reactnativenavigation.viewcontrollers.toptabs.TopTabsAdapter;
 import com.reactnativenavigation.viewcontrollers.toptabs.TopTabsController;
 import com.reactnativenavigation.views.ReactComponent;
-import com.reactnativenavigation.views.TopTabsLayoutCreator;
-import com.reactnativenavigation.views.TopTabsViewPager;
+import com.reactnativenavigation.views.toptabs.TopTabsLayoutCreator;
+import com.reactnativenavigation.views.toptabs.TopTabsViewPager;
 
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;

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

@@ -12,6 +12,7 @@ import com.reactnativenavigation.mocks.TopBarButtonCreatorMock;
 import com.reactnativenavigation.parse.params.Text;
 import com.reactnativenavigation.utils.ViewUtils;
 import com.reactnativenavigation.viewcontrollers.TopBarButtonController;
+import com.reactnativenavigation.views.topbar.TopBar;
 import com.reactnativenavigation.views.topbar.TopBarBackgroundView;
 
 import org.junit.Test;

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

@@ -13,6 +13,7 @@ import com.reactnativenavigation.parse.params.Button;
 import com.reactnativenavigation.parse.params.Text;
 import com.reactnativenavigation.utils.TitleBarHelper;
 import com.reactnativenavigation.viewcontrollers.TopBarButtonController;
+import com.reactnativenavigation.views.topbar.TopBar;
 
 import org.junit.Test;
 

playground/src/screens/CustomTopBar.js

@@ -16,6 +16,22 @@ class CustomTopBar extends Component {
     this.state = {};
   }
 
+  componentDidAppear() {
+    console.log('guyca', 'componentDidAppear');
+  }
+
+  componentDidDisappear() {
+    console.log('guyca', `componentDidDisappear`);
+  }
+
+  componentDidMount() {
+    console.log('guyca', `componentDidMount`);
+  }
+
+  componentWillUnmount() {
+    console.log('guyca', `componentWillUnmount`);
+  }
+
   render() {
     return (
       <View style={styles.container}>