react-native-navigation 7.22.0 → 7.22.2

package/lib/android/app/src/main/java/com/reactnativenavigation/utils/UiUtils.java

@@ -11,7 +11,6 @@ import android.view.WindowManager;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
 
 public class UiUtils {
     private static final int DEFAULT_TOOLBAR_HEIGHT = 56;
@@ -81,13 +80,13 @@ public class UiUtils {
         });
     }
 
-	public static void runOnMainThread(Runnable runnable) {
-		new Handler(Looper.getMainLooper()).post(runnable);
-	}
+    public static void runOnMainThread(Runnable runnable) {
+        new Handler(Looper.getMainLooper()).post(runnable);
+    }
 
-	public static float getWindowHeight(Context context) {
+    public static float getWindowHeight(Context context) {
         return getDisplayMetrics(context).heightPixels;
-	}
+    }
 
     public static float getWindowWidth(Context context) {
         return getDisplayMetrics(context).widthPixels;

package/lib/android/app/src/main/java/com/reactnativenavigation/utils/ViewParent.kt

@@ -2,9 +2,6 @@ package com.reactnativenavigation.utils
 
 import android.view.View
 import android.view.ViewParent
-import androidx.core.view.doOnLayout
-import kotlin.coroutines.resume
-import kotlin.coroutines.suspendCoroutine
 
 val ViewParent.scaleX: Float
     get() = (this as View).scaleX

package/lib/android/app/src/main/java/com/reactnativenavigation/utils/ViewUtils.java

@@ -3,7 +3,6 @@ package com.reactnativenavigation.utils;
 import android.graphics.Point;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.ViewManager;
 import android.view.ViewParent;
 
 import com.facebook.react.views.view.ReactViewBackgroundDrawable;
@@ -34,11 +33,11 @@ public class ViewUtils {
         return null;
     }
 
-    public static <T> List<T> findChildrenByClassRecursive(ViewGroup root, Class clazz) {
+    public static <T> List<T> findChildrenByClassRecursive(ViewGroup root, Class<?> clazz) {
         return findChildrenByClassRecursive(root, clazz, child -> true);
     }
 
-    public static <T> List<T> findChildrenByClassRecursive(ViewGroup root, Class clazz, Matcher<T> matcher) {
+    public static <T> List<T> findChildrenByClassRecursive(ViewGroup root, Class<?> clazz, Matcher<T> matcher) {
         ArrayList<T> ret = new ArrayList<>();
         for (int i = 0; i < root.getChildCount(); i++) {
             View view = root.getChildAt(i);
@@ -56,7 +55,7 @@ public class ViewUtils {
         return findChildrenByClass(root, clazz, child -> true);
     }
 
-    public static <T> List<T> findChildrenByClass(ViewGroup root, Class clazz, Matcher<T> matcher) {
+    public static <T> List<T> findChildrenByClass(ViewGroup root, Class<?> clazz, Matcher<T> matcher) {
         List<T> ret = new ArrayList<>();
         for (int i = 0; i < root.getChildCount(); i++) {
             View child = root.getChildAt(i);
@@ -114,7 +113,7 @@ public class ViewUtils {
         }
         throw new RuntimeException(view.getBackground().getClass().getSimpleName() + " is not ReactViewBackgroundDrawable");
     }
-    
+
 
     public static boolean isVisible(View view) {
         return perform(view, false, v -> v.getVisibility() == View.VISIBLE);

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/bottomtabs/BottomTabPresenter.java

@@ -1,17 +1,20 @@
 package com.reactnativenavigation.viewcontrollers.bottomtabs;
 
+import static com.reactnativenavigation.utils.CollectionUtils.forEach;
+import static com.reactnativenavigation.utils.UiUtils.dpToPx;
+
 import android.content.Context;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 
+import androidx.annotation.NonNull;
+
 import com.aurelhubert.ahbottomnavigation.notification.AHNotification;
 import com.reactnativenavigation.options.BottomTabOptions;
 import com.reactnativenavigation.options.DotIndicatorOptions;
 import com.reactnativenavigation.options.Options;
-import com.reactnativenavigation.options.params.Param;
 import com.reactnativenavigation.options.params.ThemeColour;
 import com.reactnativenavigation.options.parsers.TypefaceLoader;
-import com.reactnativenavigation.utils.ContextKt;
 import com.reactnativenavigation.utils.ImageLoader;
 import com.reactnativenavigation.utils.ImageLoadingListenerAdapter;
 import com.reactnativenavigation.utils.LateInit;
@@ -20,11 +23,6 @@ import com.reactnativenavigation.views.bottomtabs.BottomTabs;
 
 import java.util.List;
 
-import androidx.annotation.NonNull;
-
-import static com.reactnativenavigation.utils.CollectionUtils.*;
-import static com.reactnativenavigation.utils.UiUtils.dpToPx;
-
 public class BottomTabPresenter {
     private final Context context;
     private final ImageLoader imageLoader;
@@ -81,7 +79,7 @@ public class BottomTabPresenter {
         });
     }
 
-    public void mergeChildOptions(Options options, ViewController child) {
+    public void mergeChildOptions(Options options, ViewController<?> child) {
         bottomTabs.perform(bottomTabs -> {
             int index = bottomTabFinder.findByControllerId(child.getId());
             if (index >= 0) {

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/bottomtabs/BottomTabsAnimator.kt

@@ -2,7 +2,6 @@ package com.reactnativenavigation.viewcontrollers.bottomtabs
 
 import com.reactnativenavigation.views.animations.BaseViewAnimator
 import com.reactnativenavigation.views.bottomtabs.BottomTabs
-import com.reactnativenavigation.views.stack.topbar.TopBar
 
 class BottomTabsAnimator(view: BottomTabs? = null) : BaseViewAnimator<BottomTabs>(HideDirection.Down, view) {
     override fun onShowAnimationEnd() {

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/bottomtabs/BottomTabsController.java

@@ -134,7 +134,7 @@ public class BottomTabsController extends ParentController<BottomTabsLayout> imp
     }
 
     @Override
-    public void applyChildOptions(Options options, ViewController child) {
+    public void applyChildOptions(Options options, ViewController<?> child) {
         super.applyChildOptions(options, child);
         presenter.applyChildOptions(resolveCurrentOptions(), child);
         performOnParentController(parent -> parent.applyChildOptions(
@@ -147,7 +147,7 @@ public class BottomTabsController extends ParentController<BottomTabsLayout> imp
     }
 
     @Override
-    public void mergeChildOptions(Options options, ViewController child) {
+    public void mergeChildOptions(Options options, ViewController<?> child) {
         super.mergeChildOptions(options, child);
         presenter.mergeChildOptions(options, child);
         tabPresenter.mergeChildOptions(options, child);
@@ -214,7 +214,7 @@ public class BottomTabsController extends ParentController<BottomTabsLayout> imp
     }
 
     @Override
-    public int getBottomInset(ViewController child) {
+    public int getBottomInset(ViewController<?> child) {
         return presenter.getBottomInset(resolveChildOptions(child)) + perform(getParentController(), 0, p -> p.getBottomInset(this));
     }
 

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/bottomtabs/attacher/BottomTabsAttacher.java

@@ -36,7 +36,7 @@ public class BottomTabsAttacher {
         attachStrategy.destroy();
     }
 
-    public void onTabSelected(ViewController tab) {
+    public void onTabSelected(ViewController<?> tab) {
         attachStrategy.onTabSelected(tab);
     }
 }

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/bottomtabs/attacher/modes/AttachMode.java

@@ -20,7 +20,7 @@ public abstract class AttachMode {
     protected final BottomTabsPresenter presenter;
     protected final BottomTabFinder bottomTabFinder;
     protected final List<ViewController<?>> tabs;
-    final ViewController initialTab;
+    final ViewController<?> initialTab;
 
     public static AttachMode get(ViewGroup parent, List<ViewController<?>> tabs, BottomTabsPresenter presenter, Options resolved) {
         switch (resolved.bottomTabsOptions.tabsAttachMode) {
@@ -57,12 +57,12 @@ public abstract class AttachMode {
 
     }
 
-    public void onTabSelected(ViewController tab) {
+    public void onTabSelected(ViewController<?> tab) {
 
     }
 
     @VisibleForTesting(otherwise = VisibleForTesting.PROTECTED)
-    public void attach(ViewController tab) {
+    public void attach(ViewController<?> tab) {
         ViewGroup view = tab.getView();
         view.setVisibility(tab == initialTab ? View.VISIBLE : View.INVISIBLE);
         parent.addView(view, matchParentWithBehaviour(new BottomTabsBehaviour(tab.getParentController())));

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/bottomtabs/attacher/modes/OnSwitchToTab.java

@@ -20,13 +20,13 @@ public class OnSwitchToTab extends AttachMode {
     }
 
     @Override
-    public void onTabSelected(ViewController tab) {
+    public void onTabSelected(ViewController<?> tab) {
         if (tab != initialTab && isNotAttached(tab)) {
             attach(tab);
         }
     }
 
-    private boolean isNotAttached(ViewController tab) {
+    private boolean isNotAttached(ViewController<?> tab) {
         return tab.getView().getParent() == null;
     }
 }

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/child/ChildController.java

@@ -98,7 +98,7 @@ public abstract class ChildController<T extends ViewGroup> extends ViewControlle
         return applyWindowInsets(findController(view), insets);
     }
 
-    protected WindowInsetsCompat applyWindowInsets(ViewController view, WindowInsetsCompat insets) {
+    protected WindowInsetsCompat applyWindowInsets(ViewController<?> view, WindowInsetsCompat insets) {
         return insets.replaceSystemWindowInsets(
                 insets.getSystemWindowInsetLeft(),
                 0,

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/child/ChildControllersRegistry.java

@@ -5,13 +5,13 @@ import java.util.ArrayDeque;
 import static com.reactnativenavigation.utils.ObjectUtils.perform;
 
 public class ChildControllersRegistry {
-    private ArrayDeque<ChildController> children = new ArrayDeque<>();
+    private ArrayDeque<ChildController<?>> children = new ArrayDeque<>();
 
-    public void onViewAppeared(ChildController child) {
+    public void onViewAppeared(ChildController<?> child) {
         children.push(child);
     }
 
-    public void onViewDisappear(ChildController child) {
+    public void onViewDisappear(ChildController<?> child) {
         if (isTopChild(child)) {
             children.pop();
             if (!children.isEmpty()) children.peek().onViewBroughtToFront();
@@ -20,7 +20,7 @@ public class ChildControllersRegistry {
         }
     }
 
-    private boolean isTopChild(ChildController child) {
+    private boolean isTopChild(ChildController<?> child) {
         return perform(children.peek(), false, c -> c.equals(child));
     }
 
@@ -28,7 +28,7 @@ public class ChildControllersRegistry {
         return children.size();
     }
 
-    public void onChildDestroyed(ChildController child) {
+    public void onChildDestroyed(ChildController<?> child) {
         children.remove(child);
     }
 }

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/component/ComponentPresenterBase.java

@@ -2,7 +2,6 @@ package com.reactnativenavigation.viewcontrollers.component;
 
 import android.view.View;
 import android.view.ViewGroup.MarginLayoutParams;
-import android.view.WindowManager;
 
 import androidx.annotation.NonNull;
 

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

@@ -136,7 +136,7 @@ public class ComponentViewController extends ChildController<ComponentLayout> {
     }
 
     @Override
-    protected WindowInsetsCompat applyWindowInsets(ViewController view, WindowInsetsCompat insets) {
+    protected WindowInsetsCompat applyWindowInsets(ViewController<?> view, WindowInsetsCompat insets) {
         ViewCompat.onApplyWindowInsets(view.getView(), insets.replaceSystemWindowInsets(
                 insets.getSystemWindowInsetLeft(),
                 insets.getSystemWindowInsetTop(),

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/modal/ModalPresenter.java

@@ -70,7 +70,7 @@ public class ModalPresenter {
 
 
     @NotNull
-    private ScreenAnimationListener createListener(ViewController toAdd, ViewController toRemove, CommandListener listener) {
+    private ScreenAnimationListener createListener(ViewController<?> toAdd, ViewController<?> toRemove, CommandListener listener) {
         return new ScreenAnimationListener() {
             @Override
             public void onStart() {
@@ -89,7 +89,7 @@ public class ModalPresenter {
         };
     }
 
-    private void onShowModalEnd(ViewController toAdd, @Nullable ViewController toRemove, CommandListener listener) {
+    private void onShowModalEnd(ViewController<?> toAdd, @Nullable ViewController<?> toRemove, CommandListener listener) {
         toAdd.onViewDidAppear();
         if (toRemove != null && toAdd.resolveCurrentOptions(defaultOptions).modal.presentationStyle != ModalPresentationStyle.OverCurrentContext) {
             toRemove.detachView();
@@ -97,7 +97,7 @@ public class ModalPresenter {
         listener.onSuccess(toAdd.getId());
     }
 
-    void dismissModal(ViewController toDismiss, @Nullable ViewController toAdd, ViewController root, CommandListener listener) {
+    void dismissModal(ViewController<?> toDismiss, @Nullable ViewController<?> toAdd, ViewController<?> root, CommandListener listener) {
         if (modalsLayout == null) {
             listener.onError("Can not dismiss modal before activity is created");
             return;
@@ -119,14 +119,14 @@ public class ModalPresenter {
         }
     }
 
-    boolean shouldDismissModal(ViewController toDismiss) {
+    boolean shouldDismissModal(ViewController<?> toDismiss) {
         return toDismiss.resolveCurrentOptions(defaultOptions).hardwareBack.dismissModalOnPress.get(true);
     }
 
-    public Options resolveOptions(ViewController modalController){
+    public Options resolveOptions(ViewController<?> modalController){
         return modalController.resolveCurrentOptions(defaultOptions);
     }
-    private void onDismissEnd(ViewController toDismiss, CommandListener listener) {
+    private void onDismissEnd(ViewController<?> toDismiss, CommandListener listener) {
         listener.onSuccess(toDismiss.getId());
         toDismiss.destroy();
         if (isEmpty()) modalsLayout.setVisibility(View.GONE);

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/modal/ModalStack.java

@@ -24,7 +24,7 @@ import static com.reactnativenavigation.react.Constants.HARDWARE_BACK_BUTTON_ID;
 import static com.reactnativenavigation.utils.ObjectUtils.perform;
 
 public class ModalStack {
-    private final List<ViewController> modals = new ArrayList<>();
+    private final List<ViewController<?>> modals = new ArrayList<>();
     private final ModalPresenter presenter;
     private final ModalOverlay overlay;
     private EventEmitter eventEmitter;
@@ -57,19 +57,19 @@ public class ModalStack {
         presenter.setDefaultOptions(defaultOptions);
     }
 
-    public void showModal(ViewController viewController, ViewController root, CommandListener listener) {
-        ViewController toRemove = isEmpty() ? root : peek();
+    public void showModal(ViewController<?> viewController, ViewController<?> root, CommandListener listener) {
+        ViewController<?> toRemove = isEmpty() ? root : peek();
         modals.add(viewController);
         viewController.setOverlay(overlay);
         presenter.showModal(viewController, toRemove, listener);
     }
 
-    public boolean dismissModal(String componentId, @Nullable ViewController root, CommandListener listener) {
-        ViewController toDismiss = findModalByComponentId(componentId);
+    public boolean dismissModal(String componentId, @Nullable ViewController<?> root, CommandListener listener) {
+        ViewController<?> toDismiss = findModalByComponentId(componentId);
         if (toDismiss != null) {
             boolean isDismissingTopModal = isTop(toDismiss);
             modals.remove(toDismiss);
-            @Nullable ViewController toAdd = isEmpty() ? root : isDismissingTopModal ? get(size() - 1) : null;
+            @Nullable ViewController<?> toAdd = isEmpty() ? root : isDismissingTopModal ? get(size() - 1) : null;
             if (isDismissingTopModal) {
                 if (toAdd == null) {
                     listener.onError("Could not dismiss modal");
@@ -90,7 +90,7 @@ public class ModalStack {
         }
     }
 
-    public void dismissAllModals(@Nullable ViewController root, Options mergeOptions, CommandListener listener) {
+    public void dismissAllModals(@Nullable ViewController<?> root, Options mergeOptions, CommandListener listener) {
         if (modals.isEmpty()) {
             listener.onSuccess(perform(root, "", ViewController::getId));
             return;
@@ -117,7 +117,7 @@ public class ModalStack {
         }
     }
 
-    public boolean handleBack(CommandListener listener, ViewController root) {
+    public boolean handleBack(CommandListener listener, ViewController<?> root) {
         if (isEmpty()) return false;
         if (peek().handleBack(listener)) {
             return true;
@@ -130,12 +130,12 @@ public class ModalStack {
         }
     }
 
-    ViewController peek() {
+    ViewController<?> peek() {
         if (modals.isEmpty()) throw new EmptyStackException();
         return modals.get(modals.size() - 1);
     }
 
-    public ViewController get(int index) {
+    public ViewController<?> get(int index) {
         return modals.get(index);
     }
 
@@ -147,13 +147,13 @@ public class ModalStack {
         return modals.size();
     }
 
-    private boolean isTop(ViewController modal) {
+    private boolean isTop(ViewController<?> modal) {
         return !isEmpty() && peek().equals(modal);
     }
 
     @Nullable
-    private ViewController findModalByComponentId(String componentId) {
-        for (ViewController modal : modals) {
+    private ViewController<?> findModalByComponentId(String componentId) {
+        for (ViewController<?> modal : modals) {
             if (modal.findController(componentId) != null) {
                 return modal;
             }
@@ -163,9 +163,9 @@ public class ModalStack {
 
 
     @Nullable
-    public ViewController findControllerById(String componentId) {
-        for (ViewController modal : modals) {
-            ViewController controllerById = modal.findController(componentId);
+    public ViewController<?> findControllerById(String componentId) {
+        for (ViewController<?> modal : modals) {
+            ViewController<?> controllerById = modal.findController(componentId);
             if (controllerById != null) {
                 return controllerById;
             }
@@ -174,14 +174,14 @@ public class ModalStack {
     }
 
     public void destroy() {
-        for (ViewController modal : modals) {
+        for (ViewController<?> modal : modals) {
             modal.destroy();
         }
         modals.clear();
     }
 
     public void onConfigurationChanged(Configuration newConfig) {
-        for (ViewController controller : modals) {
+        for (ViewController<?> controller : modals) {
             controller.onConfigurationChanged(newConfig);
         }
     }

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/navigator/Navigator.java

@@ -31,13 +31,13 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-public class Navigator extends ParentController {
+public class Navigator extends ParentController<ViewGroup> {
 
     private final ModalStack modalStack;
     private final OverlayManager overlayManager;
     private final RootPresenter rootPresenter;
-    private ViewController root;
-    private ViewController previousRoot;
+    private ViewController<?> root;
+    private ViewController<?> previousRoot;
     private final CoordinatorLayout rootLayout;
     private final CoordinatorLayout modalsLayout;
     private final CoordinatorLayout overlaysLayout;
@@ -96,7 +96,7 @@ public class Navigator extends ParentController {
 
     @NonNull
     @Override
-    public Collection<ViewController> getChildControllers() {
+    public Collection<ViewController<?>> getChildControllers() {
         return root == null ? Collections.emptyList() : Collections.singletonList(root);
     }
 
@@ -108,7 +108,7 @@ public class Navigator extends ParentController {
     }
 
     @Override
-    public ViewController getCurrentChild() {
+    public ViewController<?> getCurrentChild() {
         return root;
     }
 
@@ -159,17 +159,17 @@ public class Navigator extends ParentController {
     }
 
     public void mergeOptions(final String componentId, Options options) {
-        ViewController target = findController(componentId);
+        ViewController<?> target = findController(componentId);
         if (target != null) {
             target.mergeOptions(options);
         }
     }
 
-    public void push(final String id, final ViewController viewController, CommandListener listener) {
+    public void push(final String id, final ViewController<?> viewController, CommandListener listener) {
         applyOnStack(id, listener, stack -> stack.push(viewController, listener));
     }
 
-    public void setStackRoot(String id, List<ViewController> children, CommandListener listener) {
+    public void setStackRoot(String id, List<ViewController<?>> children, CommandListener listener) {
         applyOnStack(id, listener, stack -> stack.setRoot(children, listener));
     }
 
@@ -190,7 +190,7 @@ public class Navigator extends ParentController {
         }
     }
 
-    public void showModal(final ViewController viewController, CommandListener listener) {
+    public void showModal(final ViewController<?> viewController, CommandListener listener) {
         modalStack.showModal(viewController, root, listener);
     }
 
@@ -206,7 +206,7 @@ public class Navigator extends ParentController {
         modalStack.dismissAllModals(root, mergeOptions, listener);
     }
 
-    public void showOverlay(ViewController overlay, CommandListener listener) {
+    public void showOverlay(ViewController<?> overlay, CommandListener listener) {
         overlayManager.show(overlaysLayout, overlay, listener);
     }
 
@@ -220,8 +220,8 @@ public class Navigator extends ParentController {
 
     @Nullable
     @Override
-    public ViewController findController(String id) {
-        ViewController controllerById = super.findController(id);
+    public ViewController<?> findController(String id) {
+        ViewController<?> controllerById = super.findController(id);
         if (controllerById == null) {
             controllerById = modalStack.findControllerById(id);
         }

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/parent/ParentController.java

@@ -47,14 +47,14 @@ public abstract class ParentController<T extends ViewGroup> extends ChildControl
     @Override
     public void onViewDidAppear() {
         super.onViewDidAppear();
-        ViewController currentChild = getCurrentChild();
+        ViewController<?> currentChild = getCurrentChild();
         if (currentChild != null) currentChild.onViewDidAppear();
     }
 
     @Override
     public void onViewDisappear() {
         super.onViewDisappear();
-        ViewController currentChild = getCurrentChild();
+        ViewController<?> currentChild = getCurrentChild();
         if (currentChild != null) currentChild.onViewDisappear();
     }
 
@@ -68,7 +68,7 @@ public abstract class ParentController<T extends ViewGroup> extends ChildControl
                 .withDefaultOptions(initialOptions);
     }
 
-    public Options resolveChildOptions(ViewController child) {
+    public Options resolveChildOptions(ViewController<?> child) {
         if (child == this) return resolveCurrentOptions();
         return child
                 .resolveCurrentOptions()
@@ -82,18 +82,18 @@ public abstract class ParentController<T extends ViewGroup> extends ChildControl
         return resolveCurrentOptions().withDefaultOptions(defaultOptions);
     }
 
-    public boolean isCurrentChild(ViewController child) {
+    public boolean isCurrentChild(ViewController<?> child) {
         return getCurrentChild() == child;
     }
 
-    public abstract ViewController getCurrentChild();
+    public abstract ViewController<?> getCurrentChild();
 
     @NonNull
     @Override
     public abstract T createView();
 
     @NonNull
-    public abstract Collection<? extends ViewController> getChildControllers();
+    public abstract Collection<? extends ViewController<?>> getChildControllers();
 
     @Nullable
     protected BottomTabsController getBottomTabsController() {
@@ -105,12 +105,12 @@ public abstract class ParentController<T extends ViewGroup> extends ChildControl
 
     @Nullable
     @Override
-    public ViewController findController(final String id) {
-        ViewController fromSuper = super.findController(id);
+    public ViewController<?> findController(final String id) {
+        ViewController<?> fromSuper = super.findController(id);
         if (fromSuper != null) return fromSuper;
 
-        for (ViewController child : getChildControllers()) {
-            ViewController fromChild = child.findController(id);
+        for (ViewController<?> child : getChildControllers()) {
+            ViewController<?> fromChild = child.findController(id);
             if (fromChild != null) return fromChild;
         }
 
@@ -119,12 +119,12 @@ public abstract class ParentController<T extends ViewGroup> extends ChildControl
 
     @Nullable
     @Override
-    public ViewController findController(View child) {
-        ViewController fromSuper = super.findController(child);
+    public ViewController<?> findController(View child) {
+        ViewController<?> fromSuper = super.findController(child);
         if (fromSuper != null) return fromSuper;
 
-        for (ViewController childController : getChildControllers()) {
-            ViewController fromChild = childController.findController(child);
+        for (ViewController<?> childController : getChildControllers()) {
+            ViewController<?> fromChild = childController.findController(child);
             if (fromChild != null) return fromChild;
         }
 
@@ -136,19 +136,19 @@ public abstract class ParentController<T extends ViewGroup> extends ChildControl
         if (super.containsComponent(component)) {
             return true;
         }
-        for (ViewController child : getChildControllers()) {
+        for (ViewController<?> child : getChildControllers()) {
             if (child.containsComponent(component)) return true;
         }
         return false;
     }
 
     @CallSuper
-    public void applyChildOptions(Options options, ViewController child) {
+    public void applyChildOptions(Options options, ViewController<?> child) {
         this.options = initialOptions.mergeWith(options);
     }
 
     @CallSuper
-    public void mergeChildOptions(Options options, ViewController child) {
+    public void mergeChildOptions(Options options, ViewController<?> child) {
     }
 
     @Override
@@ -177,7 +177,7 @@ public abstract class ParentController<T extends ViewGroup> extends ChildControl
         return getCurrentChild() != null && getCurrentChild().isRendered();
     }
 
-    public void onChildDestroyed(ViewController child) {
+    public void onChildDestroyed(ViewController<?> child) {
 
     }
 
@@ -186,7 +186,7 @@ public abstract class ParentController<T extends ViewGroup> extends ChildControl
         forEach(getChildControllers(), ViewController::applyTopInset);
     }
 
-    public int getTopInset(ViewController child) {
+    public int getTopInset(ViewController<?> child) {
         return perform(getParentController(), 0, p -> p.getTopInset(child));
     }
 
@@ -195,7 +195,7 @@ public abstract class ParentController<T extends ViewGroup> extends ChildControl
         forEach(getChildControllers(), ViewController::applyBottomInset);
     }
 
-    public int getBottomInset(ViewController child) {
+    public int getBottomInset(ViewController<?> child) {
         return perform(getParentController(), 0, p -> p.getBottomInset(child));
     }
 
@@ -206,8 +206,8 @@ public abstract class ParentController<T extends ViewGroup> extends ChildControl
 
     public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
-        Collection<? extends ViewController> childControllers = getChildControllers();
-        for(ViewController controller: childControllers){
+        Collection<? extends ViewController<?>> childControllers = getChildControllers();
+        for(ViewController<?> controller: childControllers){
             controller.onConfigurationChanged(newConfig);
         }
     }