Refactor towards StackLayout (#2506)

* Deleted getContentView method
* Delete Custom dialog code
* Delete topTab code
* sendOnNavigationButtonPressed was pulled to a dedicated interface

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

@@ -4,18 +4,13 @@ import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
-import android.animation.TimeInterpolator;
 import android.content.Context;
 import android.support.annotation.Nullable;
-import android.util.DisplayMetrics;
 import android.view.View;
-import android.view.ViewGroup;
-import android.view.WindowManager;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.DecelerateInterpolator;
 
 import com.reactnativenavigation.utils.UiUtils;
-import com.reactnativenavigation.views.TopBar;
 
 @SuppressWarnings("ResourceType")
 public class NavigationAnimator {

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

@@ -3,14 +3,12 @@ package com.reactnativenavigation.parse;
 import android.app.Activity;
 
 import com.facebook.react.ReactInstanceManager;
-import com.reactnativenavigation.react.ReactComponentViewCreator;
 import com.reactnativenavigation.utils.TypefaceLoader;
 import com.reactnativenavigation.viewcontrollers.BottomTabsController;
 import com.reactnativenavigation.viewcontrollers.ComponentViewController;
 import com.reactnativenavigation.viewcontrollers.SideMenuController;
 import com.reactnativenavigation.viewcontrollers.StackController;
 import com.reactnativenavigation.viewcontrollers.ViewController;
-import com.reactnativenavigation.viewcontrollers.overlay.DialogViewController;
 import com.reactnativenavigation.viewcontrollers.toptabs.TopTabController;
 import com.reactnativenavigation.viewcontrollers.toptabs.TopTabsController;
 import com.reactnativenavigation.views.ComponentViewCreator;
@@ -49,12 +47,8 @@ public class LayoutFactory {
 				return createSideMenuLeft(node);
 			case SideMenuRight:
 				return createSideMenuRight(node);
-//			case CustomDialog:
-//				return createDialogComponent(node);
             case TopTabs:
                 return createTopTabs(node);
-//            case TopTab:
-//                return createTopTab(node);
 			default:
 				throw new IllegalArgumentException("Invalid node type: " + node.type);
 		}
@@ -123,13 +117,6 @@ public class LayoutFactory {
 		return tabsComponent;
 	}
 
-	private ViewController createDialogComponent(LayoutNode node) {
-		String id = node.id;
-		String name = node.data.optString("name");
-		ReactComponentViewCreator creator = new ReactComponentViewCreator(reactInstanceManager);
-		return new DialogViewController(activity, id, name, creator);
-	}
-
     private ViewController createTopTabs(LayoutNode node) {
         final List<TopTabController> tabs = new ArrayList<>();
         for (int i = 0; i < node.children.size(); i++) {
@@ -140,16 +127,4 @@ public class LayoutFactory {
         Options options = Options.parse(typefaceManager, node.getNavigationOptions(), defaultOptions);
         return new TopTabsController(activity, node.id, tabs, new TopTabsLayoutCreator(activity, tabs), options);
     }
-
-    private ViewController createTopTab(LayoutNode node) {
-        String id = node.id;
-        String name = node.data.optString("name");
-        Options options = Options.parse(typefaceManager, node.getNavigationOptions(), defaultOptions);
-        return new TopTabController(activity,
-                id,
-                name,
-                new ReactComponentViewCreator(reactInstanceManager),
-                options
-        );
-    }
 }

lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationModule.java

@@ -19,7 +19,6 @@ import com.reactnativenavigation.utils.TypefaceLoader;
 import com.reactnativenavigation.utils.UiThread;
 import com.reactnativenavigation.viewcontrollers.Navigator;
 import com.reactnativenavigation.viewcontrollers.ViewController;
-import com.reactnativenavigation.viewcontrollers.overlay.OverlayFactory;
 
 public class NavigationModule extends ReactContextBaseJavaModule {
 	private static final String NAME = "RNNBridgeModule";
@@ -102,18 +101,8 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 
 	@ReactMethod
 	public void showOverlay(final String type, final ReadableMap data, final Promise promise) {
-		if (OverlayFactory.Overlay.create(type) == OverlayFactory.Overlay.CustomDialog) {
-			final LayoutNode layoutTree = LayoutNodeParser.parse(JSONParser.parse(data));
-			handle(() -> {
-                ViewController viewController = newLayoutFactory().create(layoutTree);
-                navigator().showOverlay(type, OverlayOptions.create(viewController), promise);
-            });
-		} else {
-			final OverlayOptions overlayOptions = OverlayOptions.parse(JSONParser.parse(data));
-			handle(() -> navigator().showOverlay(type, overlayOptions, promise));
-		}
-
-
+        final OverlayOptions overlayOptions = OverlayOptions.parse(JSONParser.parse(data));
+        handle(() -> navigator().showOverlay(type, overlayOptions, promise));
 	}
 
 	@ReactMethod

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

@@ -38,17 +38,13 @@ public class StackController extends ParentController {
 		View enteringView = child.getView();
 		getView().addView(enteringView);
 
-		//TODO animatePush only when needed
 		if (previousTop != null) {
-			animator.animatePush(enteringView, new NavigationAnimator.NavigationAnimationListener() {
-				@Override
-				public void onAnimationEnd() {
-					getView().removeView(previousTop.getView());
-					if (promise != null) {
-						promise.resolve(child.getId());
-					}
-				}
-			});
+			animator.animatePush(enteringView, () -> {
+                getView().removeView(previousTop.getView());
+                if (promise != null) {
+                    promise.resolve(child.getId());
+                }
+            });
 		} else if (promise != null) {
 			promise.resolve(child.getId());
 		}
@@ -80,12 +76,7 @@ public class StackController extends ParentController {
 		getView().addView(enteringView, getView().getChildCount() - 1);
 
 		if (animate) {
-			animator.animatePop(exitingView, new NavigationAnimator.NavigationAnimationListener() {
-				@Override
-				public void onAnimationEnd() {
-					finishPopping(exitingView, poppedTop, promise);
-				}
-			});
+			animator.animatePop(exitingView, () -> finishPopping(exitingView, poppedTop, promise));
 		} else {
 			finishPopping(exitingView, poppedTop, promise);
 		}

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/overlay/CustomOverlay.java

@@ -1,36 +0,0 @@
-package com.reactnativenavigation.viewcontrollers.overlay;
-
-
-import android.content.Context;
-
-import com.reactnativenavigation.parse.OverlayOptions;
-import com.reactnativenavigation.viewcontrollers.ComponentViewController;
-import com.reactnativenavigation.viewcontrollers.ViewController;
-import com.reactnativenavigation.views.CustomDialog;
-
-public class CustomOverlay implements OverlayInterface {
-
-	private CustomDialog dialog;
-
-	@Override
-	public CustomOverlay create(ViewController root, OverlayOptions options) {
-		//TODO; implement
-
-		ViewController viewController = options.getCustomView();
-		dialog = new CustomDialog(root.getActivity(), viewController.getView());
-
-		return this;
-	}
-
-	@Override
-	public void show() {
-		dialog.show();
-	}
-
-	@Override
-	public void dismiss() {
-		if (dialog != null) {
-			dialog.dismiss();
-		}
-	}
-}

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/overlay/OverlayFactory.java

@@ -1,8 +1,6 @@
 package com.reactnativenavigation.viewcontrollers.overlay;
 
 
-import android.content.Context;
-
 import com.reactnativenavigation.parse.OverlayOptions;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 
@@ -10,8 +8,7 @@ public class OverlayFactory {
 
 	public enum Overlay {
 		AlertDialog("alert", new AlertOverlay()),
-		Snackbar("snackbar", new SnackbarOverlay()),
-		CustomDialog("custom", new CustomOverlay());
+		Snackbar("snackbar", new SnackbarOverlay());
 
 		private String name;
 		private OverlayInterface overlayInstance;

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

@@ -1,18 +1,12 @@
 package com.reactnativenavigation.views;
 
-import android.view.View;
-
 import com.reactnativenavigation.parse.Options;
 
 public interface Component {
     void applyOptions(Options options);
 
-    void sendOnNavigationButtonPressed(String id);
-
     TopBar getTopBar();
 
-    View getContentView();
-
     void drawBehindTopBar();
 
     void drawBelowTopBar();

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

@@ -13,7 +13,7 @@ import com.reactnativenavigation.viewcontrollers.ComponentViewController.*;
 import static android.view.ViewGroup.LayoutParams.*;
 
 @SuppressLint("ViewConstructor")
-public class ComponentLayout extends RelativeLayout implements ReactComponent {
+public class ComponentLayout extends RelativeLayout implements ReactComponent, TitleBarButton.OnClickListener {
 
     private TopBar topBar;
     private IReactView reactView;
@@ -22,7 +22,7 @@ public class ComponentLayout extends RelativeLayout implements ReactComponent {
 	public ComponentLayout(Context context, IReactView reactView, EventDispatcher eventDispatcher) {
 		super(context);
 		this.reactView = reactView;
-		this.topBar = new TopBar(context, this, eventDispatcher);
+		this.topBar = new TopBar(context, reactView.asView(), this, eventDispatcher);
         optionsPresenter = new OptionsPresenter(this);
         initViews();
     }
@@ -74,11 +74,6 @@ public class ComponentLayout extends RelativeLayout implements ReactComponent {
         return topBar;
     }
 
-    @Override
-    public View getContentView() {
-        return reactView.asView();
-    }
-
     @Override
     public void drawBehindTopBar() {
         RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) reactView.asView().getLayoutParams();
@@ -92,4 +87,9 @@ public class ComponentLayout extends RelativeLayout implements ReactComponent {
         layoutParams.addRule(BELOW, topBar.getId());
         reactView.asView().setLayoutParams(layoutParams);
     }
+
+    @Override
+    public void onPress(String buttonId) {
+        reactView.sendOnNavigationButtonPressed(buttonId);
+    }
 }

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

@@ -1,29 +0,0 @@
-package com.reactnativenavigation.views;
-
-import android.app.Dialog;
-import android.content.Context;
-import android.support.annotation.NonNull;
-import android.util.Log;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
-import android.view.WindowManager;
-
-import com.facebook.react.ReactRootView;
-
-
-public class CustomDialog extends Dialog {
-
-	private View component;
-
-	public CustomDialog(@NonNull Context context, @NonNull View component) {
-		super(context);
-
-		this.component = component;
-		init();
-	}
-
-	private void init() {
-		addContentView(component, new WindowManager.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
-	}
-}

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

@@ -22,13 +22,17 @@ import com.reactnativenavigation.utils.UiUtils;
 import java.util.ArrayList;
 
 public class TitleBarButton implements MenuItem.OnMenuItemClickListener {
+    public interface OnClickListener {
+        void onPress(String buttonId);
+    }
+
 	private Toolbar toolbar;
 	private final Button button;
-	private Component component;
 	private Drawable icon;
+    private OnClickListener onPressListener;
 
-	TitleBarButton(Component component, Toolbar toolbar, Button button) {
-		this.component = component;
+    TitleBarButton(Toolbar toolbar, Button button, OnClickListener onPressListener) {
+        this.onPressListener = onPressListener;
 		this.toolbar = toolbar;
 		this.button = button;
 	}
@@ -118,12 +122,12 @@ public class TitleBarButton implements MenuItem.OnMenuItemClickListener {
 	}
 
 	private void setNavigationClickListener() {
-		toolbar.setNavigationOnClickListener(view -> component.sendOnNavigationButtonPressed(button.id));
+		toolbar.setNavigationOnClickListener(view -> onPressListener.onPress(button.id));
 	}
 
 	@Override
 	public boolean onMenuItemClick(MenuItem menuItem) {
-		this.component.sendOnNavigationButtonPressed(button.id);
+		onPressListener.onPress(button.id);
 		return true;
 	}
 

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

@@ -1,40 +1,44 @@
 package com.reactnativenavigation.views;
 
-import android.annotation.*;
-import android.content.*;
-import android.graphics.*;
-import android.support.annotation.*;
-import android.support.design.widget.*;
+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.support.v7.widget.Toolbar;
-import android.util.*;
-import android.view.*;
-import android.widget.*;
-
-import com.facebook.react.uimanager.events.*;
-import com.reactnativenavigation.anim.*;
+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 com.reactnativenavigation.parse.Button;
 import com.reactnativenavigation.parse.Color;
-import com.reactnativenavigation.parse.*;
 import com.reactnativenavigation.parse.Number;
-import com.reactnativenavigation.viewcontrollers.toptabs.*;
+import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.viewcontrollers.toptabs.TopTabsViewPager;
 
-import java.util.*;
+import java.util.ArrayList;
 
 @SuppressLint("ViewConstructor")
 public class TopBar extends AppBarLayout {
     private final Toolbar titleBar;
+    private TitleBarButton.OnClickListener onClickListener;
     private final TopBarCollapseBehavior collapsingBehavior;
     private final TopBarAnimator animator;
-    private Component component;
     private TopTabs topTabs;
 
-    public TopBar(final Context context, Component component, EventDispatcher eventDispatcher) {
+    public TopBar(final Context context, View contentView, TitleBarButton.OnClickListener onClickListener, EventDispatcher eventDispatcher) {
         super(context);
+        this.onClickListener = onClickListener;
         collapsingBehavior = new TopBarCollapseBehavior(eventDispatcher, this);
-        this.component = component;
         titleBar = new Toolbar(context);
         topTabs = new TopTabs(getContext());
-        this.animator = new TopBarAnimator(this, component != null ? component.getContentView() : null);
+        this.animator = new TopBarAnimator(this, contentView);
         addView(titleBar);
     }
 
@@ -119,7 +123,7 @@ public class TopBar extends AppBarLayout {
     }
 
     private void setLeftButton(final Button button) {
-        TitleBarButton leftBarButton = new TitleBarButton(component, this.titleBar, button);
+        TitleBarButton leftBarButton = new TitleBarButton(this.titleBar, button, onClickListener);
         leftBarButton.applyNavigationIcon(getContext());
     }
 
@@ -133,7 +137,7 @@ public class TopBar extends AppBarLayout {
 
         for (int i = 0; i < rightButtons.size(); i++) {
             Button button = rightButtons.get(i);
-            TitleBarButton titleBarButton = new TitleBarButton(component, this.titleBar, button);
+            TitleBarButton titleBarButton = new TitleBarButton(this.titleBar, button, onClickListener);
             titleBarButton.addToMenu(getContext(), menu);
         }
     }

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

@@ -15,7 +15,7 @@ import com.reactnativenavigation.viewcontrollers.toptabs.*;
 import java.util.*;
 
 @SuppressLint("ViewConstructor")
-public class TopTabsLayout extends RelativeLayout implements Component {
+public class TopTabsLayout extends RelativeLayout implements Component, TitleBarButton.OnClickListener {
 
     private TopBar topBar;
     private List<TopTabController> tabs;
@@ -25,9 +25,9 @@ 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, null);
-        topBar.setId(View.generateViewId());
         viewPager = new TopTabsViewPager(context, tabs, adapter);
+        topBar = new TopBar(context, viewPager, this, null);
+        topBar.setId(View.generateViewId());
         optionsPresenter = new OptionsPresenter(this);
         initViews();
     }
@@ -45,21 +45,11 @@ public class TopTabsLayout extends RelativeLayout implements Component {
         optionsPresenter.applyOptions(options);
     }
 
-    @Override
-    public void sendOnNavigationButtonPressed(String id) {
-        viewPager.sendOnNavigationButtonPressed(id);
-    }
-
     @Override
     public TopBar getTopBar() {
         return topBar;
     }
 
-    @Override
-    public View getContentView() {
-        return viewPager;
-    }
-
     @Override
     public void drawBehindTopBar() {
 
@@ -87,4 +77,9 @@ public class TopTabsLayout extends RelativeLayout implements Component {
     public int getCurrentItem() {
         return viewPager.getCurrentItem();
     }
+
+    @Override
+    public void onPress(String buttonId) {
+        viewPager.sendOnNavigationButtonPressed(buttonId);
+    }
 }

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

@@ -8,7 +8,7 @@ import com.reactnativenavigation.parse.*;
 import com.reactnativenavigation.presentation.*;
 import com.reactnativenavigation.views.*;
 
-public class TestComponentLayout extends RelativeLayout implements ReactComponent {
+public class TestComponentLayout extends RelativeLayout implements ReactComponent, TitleBarButton.OnClickListener {
 
     private final TopBar topBar;
     private final View contentView;
@@ -16,8 +16,8 @@ public class TestComponentLayout extends RelativeLayout implements ReactComponen
 
     public TestComponentLayout(final Context context) {
         super(context);
-        topBar = new TopBar(context, this, null);
         contentView = new View(context);
+        topBar = new TopBar(context, contentView, this, null);
         addView(topBar);
         addView(contentView);
         optionsPresenter = new OptionsPresenter(this);
@@ -27,11 +27,6 @@ public class TestComponentLayout extends RelativeLayout implements ReactComponen
         return topBar;
     }
 
-    @Override
-    public View getContentView() {
-        return contentView;
-    }
-
     @Override
     public void drawBehindTopBar() {
         RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
@@ -77,4 +72,9 @@ public class TestComponentLayout extends RelativeLayout implements ReactComponen
     public void sendOnNavigationButtonPressed(String id) {
 
     }
+
+    @Override
+    public void onPress(String buttonId) {
+
+    }
 }

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

@@ -6,13 +6,13 @@ import android.view.*;
 import com.reactnativenavigation.parse.*;
 import com.reactnativenavigation.views.*;
 
-public class TestComponentView extends View implements ReactComponent {
+public class TestComponentView extends View implements ReactComponent, TitleBarButton.OnClickListener {
 
     private TopBar topBar;
 
     public TestComponentView(final Context context) {
         super(context);
-        topBar = new TopBar(context, this, null);
+        topBar = new TopBar(context, this, this, null);
 
     }
 
@@ -54,17 +54,17 @@ public class TestComponentView extends View implements ReactComponent {
     }
 
     @Override
-    public View getContentView() {
-        return null;
+    public void drawBehindTopBar() {
+
     }
 
     @Override
-    public void drawBehindTopBar() {
+    public void drawBelowTopBar() {
 
     }
 
     @Override
-    public void drawBelowTopBar() {
+    public void onPress(String buttonId) {
 
     }
 }

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

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