react-native-navigation 7.22.0 → 7.22.2

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

@@ -29,9 +29,9 @@ import static com.reactnativenavigation.utils.ObjectUtils.perform;
 
 public class SideMenuController extends ParentController<SideMenuRoot> implements DrawerLayout.DrawerListener {
 
-    private ViewController center;
-    private ViewController left;
-    private ViewController right;
+    private ViewController<?> center;
+    private ViewController<?> left;
+    private ViewController<?> right;
     private SideMenuPresenter presenter;
     private float prevLeftSlideOffset = 0;
     private float prevRightSlideOffset = 0;
@@ -42,7 +42,7 @@ public class SideMenuController extends ParentController<SideMenuRoot> implement
     }
 
     @Override
-    public ViewController getCurrentChild() {
+    public ViewController<?> getCurrentChild() {
         if (!isDestroyed()) {
             if (getView().isDrawerOpen(Gravity.LEFT)) {
                 return left;
@@ -72,8 +72,8 @@ public class SideMenuController extends ParentController<SideMenuRoot> implement
 
     @NonNull
     @Override
-    public Collection<ViewController> getChildControllers() {
-        ArrayList<ViewController> children = new ArrayList<>();
+    public Collection<ViewController<?>> getChildControllers() {
+        ArrayList<ViewController<?>> children = new ArrayList<>();
         if (center != null) children.add(center);
         if (left != null) children.add(left);
         if (right != null) children.add(right);
@@ -87,14 +87,14 @@ public class SideMenuController extends ParentController<SideMenuRoot> implement
     }
 
     @Override
-    public void applyChildOptions(Options options, ViewController child) {
+    public void applyChildOptions(Options options, ViewController<?> child) {
         super.applyChildOptions(options, child);
         presenter.applyChildOptions(resolveCurrentOptions());
         performOnParentController(parent -> parent.applyChildOptions(this.options, child));
     }
 
     @Override
-    public void mergeChildOptions(Options options, ViewController child) {
+    public void mergeChildOptions(Options options, ViewController<?> child) {
         super.mergeChildOptions(options, child);
         presenter.mergeOptions(options.sideMenuRootOptions);
         mergeLockMode(this.initialOptions, options.sideMenuRootOptions);
@@ -129,13 +129,13 @@ public class SideMenuController extends ParentController<SideMenuRoot> implement
 
     @Override
     public void onDrawerOpened(@NonNull View drawerView) {
-        ViewController view = this.getMatchingView(drawerView);
+        ViewController<?> view = this.getMatchingView(drawerView);
         view.mergeOptions(this.getOptionsWithVisibility(isLeftMenu(drawerView), true));
     }
 
     @Override
     public void onDrawerClosed(@NonNull View drawerView) {
-        ViewController view = this.getMatchingView(drawerView);
+        ViewController<?> view = this.getMatchingView(drawerView);
         view.mergeOptions(this.getOptionsWithVisibility(isLeftMenu(drawerView), false));
     }
 
@@ -163,28 +163,28 @@ public class SideMenuController extends ParentController<SideMenuRoot> implement
 
     @Nullable
     @Override
-    public ViewController findController(View child) {
+    public ViewController<?> findController(View child) {
         return getView().isSideMenu(child) ? this : super.findController(child);
     }
 
-    public void setCenterController(ViewController centerController) {
+    public void setCenterController(ViewController<?> centerController) {
         center = centerController;
         getView().setCenter(center);
     }
 
-    public void setLeftController(ViewController controller) {
+    public void setLeftController(ViewController<?> controller) {
         left = controller;
         getView().setLeft(left, options);
         presenter.bindLeft(left);
     }
 
-    public void setRightController(ViewController controller) {
+    public void setRightController(ViewController<?> controller) {
         right = controller;
         getView().setRight(right, options);
         presenter.bindRight(right);
     }
 
-    private ViewController getMatchingView(View drawerView) {
+    private ViewController<?> getMatchingView(View drawerView) {
         return this.isLeftMenu(drawerView) ? left : right;
     }
 
@@ -206,7 +206,7 @@ public class SideMenuController extends ParentController<SideMenuRoot> implement
         return options;
     }
 
-    private void dispatchSideMenuVisibilityEvents(ViewController drawer, float prevOffset, float offset) {
+    private void dispatchSideMenuVisibilityEvents(ViewController<?> drawer, float prevOffset, float offset) {
         if (prevOffset < 1 && offset == 1) {
             drawer.onViewDidAppear();
         } else if (prevOffset == 0 && offset > 0) {

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/sidemenu/SideMenuPresenter.java

@@ -15,18 +15,18 @@ import androidx.drawerlayout.widget.DrawerLayout;
 public class SideMenuPresenter {
 
     private SideMenu sideMenu;
-    private ViewController left;
-    private ViewController right;
+    private ViewController<?> left;
+    private ViewController<?> right;
 
     public void bindView(SideMenu sideMenu) {
         this.sideMenu = sideMenu;
     }
 
-    public void bindLeft(ViewController left) {
+    public void bindLeft(ViewController<?> left) {
         this.left = left;
     }
 
-    public void bindRight(ViewController right) {
+    public void bindRight(ViewController<?> right) {
         this.right = right;
     }
 

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/FabPresenter.java

@@ -32,7 +32,7 @@ public class FabPresenter {
     private Fab fab;
     private FabMenu fabMenu;
 
-    public void applyOptions(FabOptions options, @NonNull ViewController component, @NonNull ViewGroup viewGroup) {
+    public void applyOptions(FabOptions options, @NonNull ViewController<?> component, @NonNull ViewGroup viewGroup) {
         this.viewGroup = viewGroup;
 
         if (options.id.hasValue()) {
@@ -54,7 +54,7 @@ public class FabPresenter {
         }
     }
 
-    public void mergeOptions(FabOptions options, @NonNull ViewController component, @NonNull ViewGroup viewGroup) {
+    public void mergeOptions(FabOptions options, @NonNull ViewController<?> component, @NonNull ViewGroup viewGroup) {
         this.viewGroup = viewGroup;
         if (options.id.hasValue()) {
             if (fabMenu != null && fabMenu.getFabId().equals(options.id.get())) {
@@ -72,7 +72,7 @@ public class FabPresenter {
         }
     }
 
-    private void createFab(ViewController component, FabOptions options) {
+    private void createFab(ViewController<?> component, FabOptions options) {
         ViewExtensionsKt.removeFromParent(fabMenu);
         ViewExtensionsKt.removeFromParent(fab);
         if (options.actionsArray.size() > 0) {
@@ -123,7 +123,7 @@ public class FabPresenter {
                 });
     }
 
-    private void setParams(ViewController component, View fab, FabOptions options) {
+    private void setParams(ViewController<?> component, View fab, FabOptions options) {
         CoordinatorLayout.LayoutParams lp = new CoordinatorLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT);
         lp.rightMargin = (int) viewGroup.getContext().getResources().getDimension(R.dimen.margin);
         lp.leftMargin = (int) viewGroup.getContext().getResources().getDimension(R.dimen.margin);
@@ -164,7 +164,7 @@ public class FabPresenter {
         fab.setLayoutParams(lp);
     }
 
-    private void applyFabOptions(ViewController component, Fab fab, FabOptions options) {
+    private void applyFabOptions(ViewController<?> component, Fab fab, FabOptions options) {
         if (options.visible.isTrueOrUndefined()) {
             fab.setScaleX(0.6f);
             fab.setScaleY(0.6f);
@@ -204,7 +204,7 @@ public class FabPresenter {
         }
     }
 
-    private void mergeFabOptions(ViewController component, Fab fab, FabOptions options) {
+    private void mergeFabOptions(ViewController<?> component, Fab fab, FabOptions options) {
         if (options.visible.isTrue()) {
             fab.show(true);
         }
@@ -234,7 +234,7 @@ public class FabPresenter {
         }
     }
 
-    private void applyFabMenuOptions(ViewController component, FabMenu fabMenu, FabOptions options) {
+    private void applyFabMenuOptions(ViewController<?> component, FabMenu fabMenu, FabOptions options) {
         if (options.visible.isTrueOrUndefined()) {
             fabMenu.showMenuButton(true);
         }
@@ -271,7 +271,7 @@ public class FabPresenter {
         }
     }
 
-    private void mergeFabMenuOptions(ViewController component, FabMenu fabMenu, FabOptions options) {
+    private void mergeFabMenuOptions(ViewController<?> component, FabMenu fabMenu, FabOptions options) {
         if (options.visible.isTrue()) {
             fabMenu.showMenuButton(true);
         }

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/IdStack.java

@@ -14,7 +14,7 @@ import static com.reactnativenavigation.utils.CollectionUtils.*;
 
 public class IdStack<E> implements Iterable<String> {
 
-	private final ArrayList<String> deque = new ArrayList();
+	private final ArrayList<String> deque = new ArrayList<>();
 	private final Map<String, E> map = new HashMap<>();
 
 	public void push(String id, E item) {
@@ -22,17 +22,17 @@ public class IdStack<E> implements Iterable<String> {
 		map.put(id, item);
 	}
 
-    public void set(String id, E item, int index) {
-        deque.add(index, id);
-        map.put(id, item);
-    }
+	public void set(String id, E item, int index) {
+		deque.add(index, id);
+		map.put(id, item);
+	}
 
 	public E peek() {
-        return isEmpty() ? null : map.get(last(deque));
+		return isEmpty() ? null : map.get(last(deque));
 	}
 
 	public E pop() {
-	    return isEmpty() ? null : map.remove(removeLast(deque));
+		return isEmpty() ? null : map.remove(removeLast(deque));
 	}
 
 	public boolean isEmpty() {
@@ -57,8 +57,8 @@ public class IdStack<E> implements Iterable<String> {
 	}
 
 	public E get(final int index) {
-        return map.get(deque.get(index));
-    }
+		return map.get(deque.get(index));
+	}
 
 	public boolean containsId(final String id) {
 		return deque.contains(id);
@@ -77,7 +77,7 @@ public class IdStack<E> implements Iterable<String> {
 	}
 
 	@NonNull
-    @Override
+	@Override
 	public Iterator<String> iterator() {
 		return deque.iterator();
 	}
@@ -87,8 +87,8 @@ public class IdStack<E> implements Iterable<String> {
 		return map(deque, map::get);
 	}
 
-    public void remove(Iterator<String> iterator, String id) {
-        iterator.remove();
-        map.remove(id);
-    }
+	public void remove(Iterator<String> iterator, String id) {
+		iterator.remove();
+		map.remove(id);
+	}
 }

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

@@ -45,7 +45,7 @@ import static com.reactnativenavigation.utils.ObjectUtils.perform;
 
 public class StackController extends ParentController<StackLayout> {
 
-    private IdStack<ViewController> stack = new IdStack<>();
+    private IdStack<ViewController<?>> stack = new IdStack<>();
     private final StackAnimator animator;
     private final EventEmitter eventEmitter;
     private final TopBarController topBarController;
@@ -53,7 +53,7 @@ public class StackController extends ParentController<StackLayout> {
     private final StackPresenter presenter;
     private final FabPresenter fabPresenter;
 
-    public StackController(Activity activity, List<ViewController> children, ChildControllersRegistry childRegistry, EventEmitter eventEmitter, TopBarController topBarController, StackAnimator animator, String id, Options initialOptions, BackButtonHelper backButtonHelper, StackPresenter stackPresenter, Presenter presenter, FabPresenter fabPresenter) {
+    public StackController(Activity activity, List<ViewController<?>> children, ChildControllersRegistry childRegistry, EventEmitter eventEmitter, TopBarController topBarController, StackAnimator animator, String id, Options initialOptions, BackButtonHelper backButtonHelper, StackPresenter stackPresenter, Presenter presenter, FabPresenter fabPresenter) {
         super(activity, childRegistry, id, presenter, initialOptions);
         this.eventEmitter = eventEmitter;
         this.topBarController = topBarController;
@@ -108,7 +108,7 @@ public class StackController extends ParentController<StackLayout> {
     }
 
     @Override
-    public void applyChildOptions(Options options, ViewController child) {
+    public void applyChildOptions(Options options, ViewController<?> child) {
         super.applyChildOptions(options, child);
         presenter.applyChildOptions(resolveCurrentOptions(), this, child);
         fabPresenter.applyOptions(this.options.fabOptions, child, getView());
@@ -126,7 +126,7 @@ public class StackController extends ParentController<StackLayout> {
     }
 
     @Override
-    public void mergeChildOptions(Options options, ViewController child) {
+    public void mergeChildOptions(Options options, ViewController<?> child) {
         super.mergeChildOptions(options, child);
         if (child.isViewShown() && peek() == child) {
             presenter.mergeChildOptions(options, resolveCurrentOptions(), this, child);
@@ -148,17 +148,17 @@ public class StackController extends ParentController<StackLayout> {
     }
 
     @Override
-    public void onChildDestroyed(ViewController child) {
+    public void onChildDestroyed(ViewController<?> child) {
         super.onChildDestroyed(child);
         presenter.onChildDestroyed(child);
     }
 
-    public void push(ViewController child, CommandListener listener) {
+    public void push(ViewController<?> child, CommandListener listener) {
         if (findController(child.getId()) != null) {
             listener.onError("A stack can't contain two children with the same id: " + child.getId());
             return;
         }
-        final ViewController toRemove = stack.peek();
+        final ViewController<?> toRemove = stack.peek();
         if (size() > 0) backButtonHelper.addToPushedChild(child);
         child.setParentController(this);
         stack.push(child.getId(), child);
@@ -190,30 +190,30 @@ public class StackController extends ParentController<StackLayout> {
         animator.cancelAllAnimations();
     }
 
-    private void onPushAnimationComplete(ViewController toAdd, ViewController toRemove, CommandListener listener) {
+    private void onPushAnimationComplete(ViewController<?> toAdd, ViewController<?> toRemove, CommandListener listener) {
         toAdd.onViewDidAppear();
         if (!peek().equals(toRemove)) getView().removeView(toRemove.getView());
         listener.onSuccess(toAdd.getId());
     }
 
-    private void addChildToStack(ViewController child, Options resolvedOptions) {
+    private void addChildToStack(ViewController<?> child, Options resolvedOptions) {
         child.setWaitForRender(resolvedOptions.animations.push.waitForRender);
         if (size() == 1) presenter.applyInitialChildLayoutOptions(resolvedOptions);
         getView().addView(child.getView(), getView().getChildCount() - 1, matchParentWithBehaviour(new StackBehaviour(this)));
     }
 
-    public void setRoot(@Size(min = 1) List<ViewController> children, CommandListener listener) {
+    public void setRoot(@Size(min = 1) List<ViewController<?>> children, CommandListener listener) {
         if (!isViewCreated()) {
             setChildren(children);
             return;
         }
 
         animator.cancelPushAnimations();
-        final ViewController toRemove = stack.peek();
-        IdStack stackToDestroy = stack;
+        final ViewController<?> toRemove = stack.peek();
+        IdStack<?> stackToDestroy = stack;
         stack = new IdStack<>();
 
-        ViewController child = requireLast(children);
+        ViewController<?> child = requireLast(children);
         if (children.size() == 1) {
             backButtonHelper.clear(child);
         } else {
@@ -270,9 +270,9 @@ public class StackController extends ParentController<StackLayout> {
         }
     }
 
-    private void setChildren(List<ViewController> children) {
+    private void setChildren(List<ViewController<?>> children) {
         stack.clear();
-        for (ViewController child : children) {
+        for (ViewController<?> child : children) {
             if (stack.containsId(child.getId())) {
                 throw new IllegalArgumentException("A stack can't contain two children with the same id: " + child.getId());
             }
@@ -282,10 +282,10 @@ public class StackController extends ParentController<StackLayout> {
         }
     }
 
-    private void destroyStack(IdStack stack) {
+    private void destroyStack(IdStack<?> stack) {
         animator.cancelAllAnimations();
         for (String s : (Iterable<String>) stack) {
-            ((ViewController) stack.get(s)).destroy();
+            ((ViewController<?>) stack.get(s)).destroy();
         }
     }
 
@@ -298,9 +298,9 @@ public class StackController extends ParentController<StackLayout> {
         peek().mergeOptions(mergeOptions);
         Options disappearingOptions = resolveCurrentOptions(presenter.getDefaultOptions());
 
-        final ViewController disappearing = stack.pop();
+        final ViewController<?> disappearing = stack.pop();
         if (!isViewCreated()) return;
-        final ViewController appearing = stack.peek();
+        final ViewController<?> appearing = stack.peek();
 
         disappearing.onViewWillDisappear();
 
@@ -325,14 +325,14 @@ public class StackController extends ParentController<StackLayout> {
         }
     }
 
-    private void finishPopping(ViewController appearing, ViewController disappearing, CommandListener listener) {
+    private void finishPopping(ViewController<?> appearing, ViewController<?> disappearing, CommandListener listener) {
         appearing.onViewDidAppear();
         disappearing.destroy();
         listener.onSuccess(disappearing.getId());
         eventEmitter.emitScreenPoppedEvent(disappearing.getId());
     }
 
-    public void popTo(ViewController viewController, Options mergeOptions, CommandListener listener) {
+    public void popTo(ViewController<?> viewController, Options mergeOptions, CommandListener listener) {
         if (!stack.containsId(viewController.getId()) || peek().equals(viewController)) {
             listener.onError("Nothing to pop");
             return;
@@ -346,7 +346,7 @@ public class StackController extends ParentController<StackLayout> {
                 break;
             }
 
-            ViewController controller = stack.get(currentControlId);
+            ViewController<?> controller = stack.get(currentControlId);
             stack.remove(controller.getId());
             controller.destroy();
         }
@@ -364,7 +364,7 @@ public class StackController extends ParentController<StackLayout> {
         Iterator<String> iterator = stack.iterator();
         iterator.next();
         while (stack.size() > 2) {
-            ViewController controller = stack.get(iterator.next());
+            ViewController<?> controller = stack.get(iterator.next());
             if (!stack.isTop(controller.getId())) {
                 stack.remove(iterator, controller.getId());
                 controller.destroy();
@@ -374,7 +374,7 @@ public class StackController extends ParentController<StackLayout> {
         pop(mergeOptions, listener);
     }
 
-    ViewController peek() {
+    ViewController<?> peek() {
         return stack.peek();
     }
 
@@ -386,7 +386,7 @@ public class StackController extends ParentController<StackLayout> {
         return stack.isEmpty();
     }
 
-    public boolean isChildInTransition(ViewController child) {
+    public boolean isChildInTransition(ViewController<?> child) {
         return animator.isChildInTransition(child);
     }
 
@@ -419,7 +419,7 @@ public class StackController extends ParentController<StackLayout> {
 
     private void addInitialChild(StackLayout stackLayout) {
         if (isEmpty()) return;
-        ViewController childController = peek();
+        ViewController<?> childController = peek();
         ViewGroup child = childController.getView();
         child.setId(CompatUtils.generateViewId());
         childController.addOnAppearedListener(this::startChildrenBellowTopChild);
@@ -428,7 +428,7 @@ public class StackController extends ParentController<StackLayout> {
     }
 
     private void startChildrenBellowTopChild() {
-        ArrayList<ViewController> children = new ArrayList(getChildControllers());
+        ArrayList<ViewController<?>> children = new ArrayList<>(getChildControllers());
         for (int i = children.size() - 2; i >= 0; i--) {
             children.get(i).start();
         }
@@ -448,7 +448,7 @@ public class StackController extends ParentController<StackLayout> {
 
     @NonNull
     @Override
-    public Collection<ViewController> getChildControllers() {
+    public Collection<ViewController<?>> getChildControllers() {
         return stack.values();
     }
 
@@ -473,7 +473,7 @@ public class StackController extends ParentController<StackLayout> {
     }
 
     @Override
-    public int getTopInset(ViewController child) {
+    public int getTopInset(ViewController<?> child) {
         return presenter.getTopInset(resolveChildOptions(child));
     }
 

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/StackControllerBuilder.java

@@ -24,7 +24,7 @@ public class StackControllerBuilder {
     private BackButtonHelper backButtonHelper = new BackButtonHelper();
     private Presenter presenter;
     private StackPresenter stackPresenter;
-    private List<ViewController> children = new ArrayList<>();
+    private List<ViewController<?>> children = new ArrayList<>();
     private EventEmitter eventEmitter;
     private FabPresenter fabPresenter = new FabPresenter();
 
@@ -40,11 +40,11 @@ public class StackControllerBuilder {
         return this;
     }
 
-    public StackControllerBuilder setChildren(ViewController... children) {
+    public StackControllerBuilder setChildren(ViewController<?>... children) {
         return setChildren(Arrays.asList(children));
     }
 
-    public StackControllerBuilder setChildren(List<ViewController> children) {
+    public StackControllerBuilder setChildren(List<ViewController<?>> children) {
         this.children = children;
         return this;
     }