Merge SideMenuController options with parent (#5754)

# Conflicts: # lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/StackController.java # lib/android/app/src/main/java/com/reactnativenavigation/views/stack/StackBehaviour.java
wix · Dec 13, 2019 · ca6f624 · ca6f624
1 parent 5ac36ef
commit ca6f624
Show file tree

Hide file tree

Showing 10 changed files with 53 additions and 55 deletions.
diff --git a/...android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ParentController.java b/...android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ParentController.java
@@ -21,22 +21,22 @@
 import static com.reactnativenavigation.utils.CollectionUtils.*;
 import static com.reactnativenavigation.utils.ObjectUtils.perform;
 
-public abstract class ParentController<T extends ViewGroup> extends ChildController {
+public abstract class ParentController<T extends ViewGroup> extends ChildController<T> {
 
-	public ParentController(Activity activity, ChildControllersRegistry childRegistry, String id, Presenter presenter, Options initialOptions) {
+    public ParentController(Activity activity, ChildControllersRegistry childRegistry, String id, Presenter presenter, Options initialOptions) {
 		super(activity, childRegistry, id, presenter, initialOptions);
 	}
 
     @Override
     public void setWaitForRender(Bool waitForRender) {
         super.setWaitForRender(waitForRender);
-        applyOnController(getCurrentChild(), controller -> ((ViewController) controller).setWaitForRender(waitForRender));
+        applyOnController(getCurrentChild(), currentChild -> currentChild.setWaitForRender(waitForRender));
     }
 
     @Override
     public void setDefaultOptions(Options defaultOptions) {
 	    super.setDefaultOptions(defaultOptions);
-	    forEach(getChildControllers(), (child) -> child.setDefaultOptions(defaultOptions));
+	    forEach(getChildControllers(), child -> child.setDefaultOptions(defaultOptions));
     }
 
     @Override
@@ -69,12 +69,6 @@ public boolean isCurrentChild(ViewController child) {
 
     protected abstract ViewController getCurrentChild();
 
-    @NonNull
-	@Override
-	public T getView() {
-		return (T) super.getView();
-	}
-
 	@NonNull
 	@Override
 	protected abstract T createView();
@@ -127,8 +121,7 @@ public void applyChildOptions(Options options, ViewController child) {
     }
 
     @CallSuper
-    public void mergeChildOptions(Options options, ViewController childController) {
-
+    public void mergeChildOptions(Options options, ViewController child) {
     }
 
 	@Override
@@ -140,7 +133,7 @@ public void destroy() {
 	@SuppressWarnings("WeakerAccess")
     @CallSuper
     protected void clearOptions() {
-	    performOnParentController(parent -> ((ParentController) parent).clearOptions());
+	    performOnParentController(ParentController::clearOptions);
         options = initialOptions.copy().clearOneTimeOptions();
     }
 

diff --git a/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ViewController.java b/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ViewController.java
@@ -38,7 +38,7 @@
 
 public abstract class ViewController<T extends ViewGroup> implements ViewTreeObserver.OnGlobalLayoutListener,
         ViewGroup.OnHierarchyChangeListener,
-        BehaviourAdapter<T> {
+        BehaviourAdapter {
 
     private final List<Runnable> onAppearedListeners = new ArrayList();
     private boolean appearEventPosted;
@@ -151,7 +151,7 @@ public void performOnView(Func1<View> task) {
         if (view != null) task.run(view);
     }
 
-    protected void performOnParentController(Func1<ParentController> task) {
+    public void performOnParentController(Func1<ParentController> task) {
         if (parentController != null) task.run(parentController);
     }
 
@@ -331,13 +331,13 @@ public List<Element> getElements() {
 
     @Override
     @CallSuper
-    public boolean onMeasureChild(CoordinatorLayout parent, T child, int parentWidthMeasureSpec, int widthUsed, int parentHeightMeasureSpec, int heightUsed) {
+    public boolean onMeasureChild(CoordinatorLayout parent, ViewGroup child, int parentWidthMeasureSpec, int widthUsed, int parentHeightMeasureSpec, int heightUsed) {
         perform(findController(child), ViewController::applyTopInset);
         return false;
     }
 
     @Override
-    public boolean onDependentViewChanged(CoordinatorLayout parent, T child, View dependency) {
+    public boolean onDependentViewChanged(CoordinatorLayout parent, ViewGroup child, View dependency) {
         return false;
     }
 

diff --git a/.../main/java/com/reactnativenavigation/viewcontrollers/bottomtabs/BottomTabsController.java b/.../main/java/com/reactnativenavigation/viewcontrollers/bottomtabs/BottomTabsController.java
@@ -109,11 +109,10 @@ public void mergeOptions(Options options) {
     public void applyChildOptions(Options options, ViewController child) {
         super.applyChildOptions(options, child);
         presenter.applyChildOptions(resolveCurrentOptions(), child);
-        performOnParentController(parentController ->
-                ((ParentController) parentController).applyChildOptions(
-                        this.options.copy()
-                                .clearBottomTabsOptions()
-                                .clearBottomTabOptions(),
+        performOnParentController(parent -> parent.applyChildOptions(
+                this.options.copy()
+                        .clearBottomTabsOptions()
+                        .clearBottomTabOptions(),
                         child
                 )
         );
@@ -124,9 +123,7 @@ public void mergeChildOptions(Options options, ViewController child) {
         super.mergeChildOptions(options, child);
         presenter.mergeChildOptions(options, child);
         tabPresenter.mergeChildOptions(options, child);
-        performOnParentController(parentController ->
-                ((ParentController) parentController).mergeChildOptions(options.copy().clearBottomTabsOptions(), child)
-        );
+        performOnParentController(parent -> parent.mergeChildOptions(options.copy().clearBottomTabsOptions(), child));
     }
 
     @Override
@@ -165,7 +162,7 @@ private List<AHBottomNavigationItem> createTabs() {
         });
 	}
 
-    public int getSelectedIndex() {
+    int getSelectedIndex() {
 		return bottomTabs.getCurrentItem();
 	}
 

diff --git a/.../src/main/java/com/reactnativenavigation/viewcontrollers/sidemenu/SideMenuController.java b/.../src/main/java/com/reactnativenavigation/viewcontrollers/sidemenu/SideMenuController.java
@@ -87,15 +87,14 @@ public void applyOptions(Options options) {
     public void applyChildOptions(Options options, ViewController child) {
         super.applyChildOptions(options, child);
         presenter.applyChildOptions(resolveCurrentOptions());
-        performOnParentController(parentController ->
-                ((ParentController) parentController).applyChildOptions(this.options, child)
-        );
+        performOnParentController(parent -> parent.applyChildOptions(this.options, child));
     }
 
     @Override
     public void mergeChildOptions(Options options, ViewController child) {
         super.mergeChildOptions(options, child);
         presenter.mergeOptions(options.sideMenuRootOptions);
+        performOnParentController(parent -> parent.mergeChildOptions(options, child));
     }
 
     @Override
@@ -120,7 +119,7 @@ public Options resolveCurrentOptions() {
         return options;
     }
 
-    public boolean isDrawerOpen(int gravity) {
+    private boolean isDrawerOpen(int gravity) {
         return !isDestroyed() && getView().isDrawerOpen(gravity);
     }
 

diff --git a/...id/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/StackController.java b/...id/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/StackController.java
@@ -101,8 +101,8 @@ public void applyChildOptions(Options options, ViewController child) {
         super.applyChildOptions(options, child);
         presenter.applyChildOptions(resolveCurrentOptions(), this, child);
         fabOptionsPresenter.applyOptions(this.options.fabOptions, child, getView());
-        performOnParentController(parentController ->
-                ((ParentController) parentController).applyChildOptions(
+        performOnParentController(parent ->
+                parent.applyChildOptions(
                         this.options.copy()
                                 .clearTopBarOptions()
                                 .clearAnimationOptions()
@@ -123,8 +123,8 @@ public void mergeChildOptions(Options options, ViewController child) {
                 fabOptionsPresenter.mergeOptions(options.fabOptions, child, getView());
             }
         }
-        performOnParentController(parentController ->
-                ((ParentController) parentController).mergeChildOptions(
+        performOnParentController(parent ->
+                parent.mergeChildOptions(
                         options.copy()
                                 .clearTopBarOptions()
                                 .clearAnimationOptions()
@@ -221,13 +221,17 @@ public void onSuccess(String childId) {
         if (toRemove != null && resolvedOptions.animations.setStackRoot.enabled.isTrueOrUndefined()) {
             if (resolvedOptions.animations.setStackRoot.waitForRender.isTrue()) {
                 child.getView().setAlpha(0);
-                child.addOnAppearedListener(() -> animator.push(child.getView(), resolvedOptions.animations.setStackRoot, resolvedOptions.transitions, toRemove.getElements(), child.getElements(), () -> {
-                    listenerAdapter.onSuccess(child.getId());
-                }));
+                child.addOnAppearedListener(() -> animator.push(
+                        child.getView(),
+                        resolvedOptions.animations.setStackRoot,
+                        resolvedOptions.transitions,
+                        toRemove.getElements(),
+                        child.getElements(),
+                        () -> listenerAdapter.onSuccess(child.getId())
+                    )
+                );
             } else {
-                animator.push(child.getView(), resolvedOptions.animations.setStackRoot, () -> {
-                    listenerAdapter.onSuccess(child.getId());
-                });
+                animator.push(child.getView(), resolvedOptions.animations.setStackRoot, () -> listenerAdapter.onSuccess(child.getId()));
             }
         } else {
             listenerAdapter.onSuccess(child.getId());

diff --git a/lib/android/app/src/main/java/com/reactnativenavigation/views/BehaviourAdapter.java b/lib/android/app/src/main/java/com/reactnativenavigation/views/BehaviourAdapter.java
@@ -1,19 +1,20 @@
 package com.reactnativenavigation.views;
 
-import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import android.view.View;
 import android.view.ViewGroup;
 
-public interface BehaviourAdapter<V extends ViewGroup> {
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+
+public interface BehaviourAdapter {
     /**
      * @see CoordinatorLayout.Behavior#onMeasureChild
      * @return true if the Behavior measured the child view, false if the CoordinatorLayout should perform its default measurement
      */
-    boolean onMeasureChild(CoordinatorLayout parent, V child, int parentWidthMeasureSpec, int widthUsed, int parentHeightMeasureSpec, int heightUsed);
+    boolean onMeasureChild(CoordinatorLayout parent, ViewGroup child, int parentWidthMeasureSpec, int widthUsed, int parentHeightMeasureSpec, int heightUsed);
 
     /**
      * @see CoordinatorLayout.Behavior#onDependentViewChanged
      * @return true if the Behavior changed the child view's size or position, false otherwise
      */
-    boolean onDependentViewChanged(CoordinatorLayout parent, V child, View dependency);
+    boolean onDependentViewChanged(CoordinatorLayout parent, ViewGroup child, View dependency);
 }
diff --git a/lib/android/app/src/main/java/com/reactnativenavigation/views/BehaviourDelegate.java b/lib/android/app/src/main/java/com/reactnativenavigation/views/BehaviourDelegate.java
@@ -1,24 +1,26 @@
 package com.reactnativenavigation.views;
 
-import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import android.view.View;
 import android.view.ViewGroup;
 
-public class BehaviourDelegate<V extends ViewGroup> extends CoordinatorLayout.Behavior<V> {
+import androidx.annotation.NonNull;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+
+public class BehaviourDelegate extends CoordinatorLayout.Behavior<ViewGroup> {
 
     private BehaviourAdapter delegate;
 
-    public BehaviourDelegate(BehaviourAdapter<V> delegate) {
+    public BehaviourDelegate(BehaviourAdapter delegate) {
         this.delegate = delegate;
     }
 
     @Override
-    public boolean onDependentViewChanged(CoordinatorLayout parent, V child, View dependency) {
+    public boolean onDependentViewChanged(@NonNull CoordinatorLayout parent, @NonNull ViewGroup child, @NonNull View dependency) {
         return delegate.onDependentViewChanged(parent, child, dependency);
     }
 
     @Override
-    public boolean onMeasureChild(CoordinatorLayout parent, V child, int parentWidthMeasureSpec, int widthUsed, int parentHeightMeasureSpec, int heightUsed) {
+    public boolean onMeasureChild(@NonNull CoordinatorLayout parent, @NonNull ViewGroup child, int parentWidthMeasureSpec, int widthUsed, int parentHeightMeasureSpec, int heightUsed) {
         return delegate.onMeasureChild(parent, child, parentWidthMeasureSpec, widthUsed, parentHeightMeasureSpec, heightUsed);
     }
 }
diff --git a/...oid/app/src/main/java/com/reactnativenavigation/views/bottomtabs/BottomTabsBehaviour.java b/...oid/app/src/main/java/com/reactnativenavigation/views/bottomtabs/BottomTabsBehaviour.java
@@ -1,21 +1,22 @@
 package com.reactnativenavigation.views.bottomtabs;
 
-import androidx.annotation.NonNull;
-import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import android.view.View;
 import android.view.ViewGroup;
 
 import com.reactnativenavigation.views.BehaviourAdapter;
 import com.reactnativenavigation.views.BehaviourDelegate;
 import com.reactnativenavigation.views.BottomTabs;
 
-public class BottomTabsBehaviour<V extends ViewGroup> extends BehaviourDelegate<V> {
-    public BottomTabsBehaviour(BehaviourAdapter<V> delegate) {
+import androidx.annotation.NonNull;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+
+public class BottomTabsBehaviour extends BehaviourDelegate {
+    public BottomTabsBehaviour(BehaviourAdapter delegate) {
         super(delegate);
     }
 
     @Override
-    public boolean layoutDependsOn(@NonNull CoordinatorLayout parent, @NonNull V child, @NonNull View dependency) {
+    public boolean layoutDependsOn(@NonNull CoordinatorLayout parent, @NonNull ViewGroup child, @NonNull View dependency) {
         return dependency instanceof BottomTabs;
     }
 }
diff --git a/lib/android/app/src/main/java/com/reactnativenavigation/views/stack/StackBehaviour.java b/lib/android/app/src/main/java/com/reactnativenavigation/views/stack/StackBehaviour.java
@@ -12,7 +12,7 @@
 import androidx.annotation.NonNull;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 
-public class StackBehaviour extends BehaviourDelegate<ViewGroup> {
+public class StackBehaviour extends BehaviourDelegate {
     public StackBehaviour(BehaviourAdapter delegate) {
         super(delegate);
     }

diff --git a/.../test/java/com/reactnativenavigation/viewcontrollers/sidemenu/SideMenuControllerTest.java b/.../test/java/com/reactnativenavigation/viewcontrollers/sidemenu/SideMenuControllerTest.java
@@ -166,6 +166,7 @@ public void mergeChildOptions() {
         Options options = new Options();
         uut.mergeChildOptions(options, child);
         verify(presenter).mergeOptions(options.sideMenuRootOptions);
+        verify(parent).mergeChildOptions(options, child);
     }
 
     @Test