react-native-navigation 7.21.0 → 7.22.0-snapshot.1649

package/lib/android/app/src/test/java/com/reactnativenavigation/TestUtils.java

@@ -5,6 +5,8 @@ import android.content.Context;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+
 import com.reactnativenavigation.mocks.TitleBarReactViewCreatorMock;
 import com.reactnativenavigation.mocks.TopBarBackgroundViewCreatorMock;
 import com.reactnativenavigation.mocks.TitleBarButtonCreatorMock;
@@ -31,7 +33,7 @@ public class TestUtils {
     public static StackControllerBuilder newStackController(Activity activity) {
         TopBarController topBarController = new TopBarController() {
             @Override
-            protected TopBar createTopBar(Context context, StackLayout stackLayout) {
+            protected TopBar createTopBar(@NonNull Context context, @NonNull StackLayout stackLayout) {
                 TopBar topBar = super.createTopBar(context, stackLayout);
                 topBar.layout(0, 0, 1000, UiUtils.getTopBarHeight(context));
                 return topBar;
@@ -45,7 +47,7 @@ public class TestUtils {
                 .setInitialOptions(new Options());
     }
 
-    public static void hideBackButton(ViewController viewController) {
+    public static void hideBackButton(ViewController<?> viewController) {
         viewController.options.topBar.buttons.back.visible = new Bool(false);
     }
 

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

@@ -4,6 +4,8 @@ import android.content.Context;
 import android.view.MotionEvent;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+
 import com.reactnativenavigation.options.ButtonOptions;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.ScrollEventListener;
 import com.reactnativenavigation.options.Options;
@@ -71,7 +73,7 @@ public class TestComponentLayout extends ComponentLayout implements ButtonContro
     }
 
     @Override
-    public void onPress(ButtonOptions button) {
+    public void onPress(@NonNull ButtonOptions button) {
 
     }
 }

package/lib/android/app/src/test/java/com/reactnativenavigation/options/OptionsTest.java

@@ -40,6 +40,7 @@ public class OptionsTest extends BaseTest {
     private static final int TOP_BAR_TEXT_COLOR = 0xff123456;
     private static final int TOP_BAR_FONT_SIZE = 18;
     private static final String TOP_BAR_FONT_FAMILY = "HelveticaNeue-CondensedBold";
+    private static final String BACK_BUTTON_ACCESSIBILITY_LABEL = "Go Back My Accessibility Label";
     private static final int SUBTITLE_FONT_SIZE = 14;
     private static final int SUBTITLE_TEXT_COLOR = 0xff123457;
     private static final int SCREEN_BACKGROUND_COLOR = 0xff123458;
@@ -101,6 +102,7 @@ public class OptionsTest extends BaseTest {
         assertThat(result.topBar.visible.get()).isEqualTo(TOP_BAR_VISIBLE.get());
         assertThat(result.topBar.drawBehind.get()).isEqualTo(TOP_BAR_DRAW_BEHIND.get());
         assertThat(result.topBar.hideOnScroll.get()).isEqualTo(TOP_BAR_HIDE_ON_SCROLL.get());
+        assertThat(result.topBar.buttons.back.accessibilityLabel.get()).isEqualTo(BACK_BUTTON_ACCESSIBILITY_LABEL);
         assertThat(result.bottomTabsOptions.animate.get()).isEqualTo(BOTTOM_TABS_ANIMATE.get());
         assertThat(result.bottomTabsOptions.visible.get()).isEqualTo(BOTTOM_TABS_VISIBLE.get());
         assertThat(result.fabOptions.id.get()).isEqualTo(FAB_ID);
@@ -123,6 +125,11 @@ public class OptionsTest extends BaseTest {
                 .put("animate", BOTTOM_TABS_ANIMATE.get());
     }
 
+    private JSONObject createBackButton() throws JSONException {
+        return new JSONObject()
+                .put("accessibilityLabel", BACK_BUTTON_ACCESSIBILITY_LABEL);
+    }
+
     @NonNull
     private JSONObject createTopBar(boolean visible) throws JSONException {
         return new JSONObject()
@@ -131,7 +138,8 @@ public class OptionsTest extends BaseTest {
                 .put("background", createBackground())
                 .put("visible", visible)
                 .put("drawBehind", TOP_BAR_DRAW_BEHIND.get())
-                .put("hideOnScroll", TOP_BAR_HIDE_ON_SCROLL.get());
+                .put("hideOnScroll", TOP_BAR_HIDE_ON_SCROLL.get())
+                .put("backButton", createBackButton());
     }
 
     private JSONObject createBackground() throws JSONException {

package/lib/android/app/src/test/java/com/reactnativenavigation/options/TopBarButtonsTest.kt

@@ -1,16 +1,32 @@
 package com.reactnativenavigation.options
 
+import android.app.Activity
 import com.reactnativenavigation.BaseTest
 import org.assertj.core.api.Java6Assertions
 import org.assertj.core.api.Java6Assertions.assertThat
+import org.json.JSONObject
 import org.junit.Test
+import java.lang.Exception
 import kotlin.test.assertTrue
 
 class TopBarButtonsTest : BaseTest() {
+    private final var ACCESSIBILITY_LABEL_AS_DEFAUL_OPTIONS: String = "accessibilityLabel as default option"
+    private final var ACCESSIBILITY_LABEL_AS_CUSTOM_OPTIONS: String = "My accessibilityLabel explicitly given"
+    private final var OTHER_ACCESSIBILITY_LABEL: String = "Other accessibilityLabel"
     private lateinit var uut: TopBarButtons
+    private var activity: Activity? = null
 
     override fun beforeEach() {
         uut = TopBarButtons()
+        activity = newActivity()
+    }
+
+    fun createBackButtonJson(label: String?): JSONObject {
+        return JSONObject().put("accessibilityLabel", label);
+    }
+
+    fun createTopBarOptionsJson(label: String?): JSONObject {
+        return JSONObject().put("backButton", createBackButtonJson(label))
     }
 
     @Test
@@ -22,4 +38,58 @@ class TopBarButtonsTest : BaseTest() {
         assertThat(uut.right).hasSize(2)
         right.forEachIndexed { index, buttonOptions -> assertThat(buttonOptions).isNotEqualTo(uut.right!![index]) }
     }
+
+    @Test
+    fun mergeWithDefault_dontOverrideCustomAccessibilityLabel() {
+        val default: TopBarButtons = TopBarButtons.parse(activity, createTopBarOptionsJson(ACCESSIBILITY_LABEL_AS_DEFAUL_OPTIONS))
+        val current: TopBarButtons = TopBarButtons.parse(activity, createTopBarOptionsJson(ACCESSIBILITY_LABEL_AS_CUSTOM_OPTIONS))
+
+        current.mergeWithDefault(default)
+        assertThat(current.back.accessibilityLabel.get()).isEqualTo(ACCESSIBILITY_LABEL_AS_CUSTOM_OPTIONS)
+    }
+
+    @Test
+    fun mergeWithDefault_overrideDefaultAccessibilityLabel() {
+        val default: TopBarButtons = TopBarButtons.parse(activity, createTopBarOptionsJson(ACCESSIBILITY_LABEL_AS_DEFAUL_OPTIONS))
+        val current: TopBarButtons = TopBarButtons.parse(activity, createTopBarOptionsJson(BackButton.DEFAULT_ACCESSIBILITY_LABEL))
+
+        current.mergeWithDefault(default)
+        assertThat(current.back.accessibilityLabel.get()).isEqualTo(ACCESSIBILITY_LABEL_AS_DEFAUL_OPTIONS)
+    }
+
+    @Test
+    fun mergeWithDefault_overrideEmptyAccessibilityLabel() {
+        val default: TopBarButtons = TopBarButtons.parse(activity, createTopBarOptionsJson(ACCESSIBILITY_LABEL_AS_DEFAUL_OPTIONS))
+        val current: TopBarButtons = TopBarButtons.parse(activity, createTopBarOptionsJson(null))
+
+        current.mergeWithDefault(default)
+        assertThat(current.back.accessibilityLabel.get()).isEqualTo(ACCESSIBILITY_LABEL_AS_DEFAUL_OPTIONS)
+    }
+
+    @Test
+    fun mergeWith_dontOverrideCurrentAccessibilityLabelWhenPassEmptyValue() {
+        val current: TopBarButtons = TopBarButtons.parse(activity, createTopBarOptionsJson(ACCESSIBILITY_LABEL_AS_CUSTOM_OPTIONS))
+        val other: TopBarButtons = TopBarButtons.parse(activity, createTopBarOptionsJson(null))
+
+        current.mergeWith(other)
+        assertThat(current.back.accessibilityLabel.get()).isEqualTo(ACCESSIBILITY_LABEL_AS_CUSTOM_OPTIONS)
+    }
+
+    @Test
+    fun mergeWith_dontOverrideCurrentAccessibilityLabelWhenPassDefaultValue() {
+        val current: TopBarButtons = TopBarButtons.parse(activity, createTopBarOptionsJson(ACCESSIBILITY_LABEL_AS_CUSTOM_OPTIONS))
+        val other: TopBarButtons = TopBarButtons.parse(activity, createTopBarOptionsJson(BackButton.DEFAULT_ACCESSIBILITY_LABEL))
+
+        current.mergeWith(other)
+        assertThat(current.back.accessibilityLabel.get()).isEqualTo(ACCESSIBILITY_LABEL_AS_CUSTOM_OPTIONS)
+    }
+
+    @Test
+    fun mergeWith_overridePreviousAccessibilityLabelWithNewValue() {
+        val current: TopBarButtons = TopBarButtons.parse(activity, createTopBarOptionsJson(ACCESSIBILITY_LABEL_AS_CUSTOM_OPTIONS))
+        val other: TopBarButtons = TopBarButtons.parse(activity, createTopBarOptionsJson(OTHER_ACCESSIBILITY_LABEL))
+
+        current.mergeWith(other)
+        assertThat(current.back.accessibilityLabel.get()).isEqualTo(OTHER_ACCESSIBILITY_LABEL)
+    }
 }

package/lib/android/app/src/test/java/com/reactnativenavigation/options/parsers/ColorParseTest.java

@@ -6,7 +6,6 @@ import com.facebook.react.bridge.JavaOnlyMap;
 import com.reactnativenavigation.BaseTest;
 import com.reactnativenavigation.options.params.DontApplyColour;
 import com.reactnativenavigation.options.params.ReactPlatformColor;
-import com.reactnativenavigation.utils.StatusBarUtils;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -16,7 +15,6 @@ import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 
 import static org.assertj.core.api.Java6Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
 
 import android.app.Activity;
 
@@ -38,7 +36,6 @@ public class ColorParseTest extends BaseTest {
 
     @Test
     public void shouldParsePlatformColors() throws JSONException {
-        JSONObject json = new JSONObject();
         JSONObject color = new JSONObject();
         final JSONArray jsonArray = new JSONArray();
         jsonArray.put("@color/colorPrimary");

package/lib/android/app/src/test/java/com/reactnativenavigation/presentation/RenderCheckerTest.java

@@ -25,7 +25,7 @@ public class RenderCheckerTest extends BaseTest {
 
     @Test
     public void areRendered() {
-        Collection<ViewController> items = Arrays.asList(
+        Collection<ViewController<?>> items = Arrays.asList(
                 renderedComponent(),
                 renderedComponent(),
                 renderedComponent()
@@ -36,7 +36,7 @@ public class RenderCheckerTest extends BaseTest {
 
     @Test
     public void areRendered_reduce() {
-        Collection<ViewController> items = Arrays.asList(
+        Collection<ViewController<?>> items = Arrays.asList(
                 renderedComponent(),
                 notRenderedComponent(),
                 renderedComponent()
@@ -45,14 +45,14 @@ public class RenderCheckerTest extends BaseTest {
 
     }
 
-    private ViewController renderedComponent() {
-        ViewController mock = Mockito.mock(ViewController.class);
+    private ViewController<?> renderedComponent() {
+        ViewController<?> mock = Mockito.mock(ViewController.class);
         when(mock.isRendered()).then(__ -> true);
         return mock;
     }
 
-    private ViewController notRenderedComponent() {
-        ViewController mock = Mockito.mock(ViewController.class);
+    private ViewController<?> notRenderedComponent() {
+        ViewController<?> mock = Mockito.mock(ViewController.class);
         when(mock.isRendered()).then(__ -> false);
         return mock;
     }

package/lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/bottomtabs/BottomTabPresenterTest.java

@@ -12,7 +12,6 @@ import com.reactnativenavigation.mocks.TypefaceLoaderMock;
 import com.reactnativenavigation.options.Options;
 import com.reactnativenavigation.options.params.Colour;
 import com.reactnativenavigation.options.params.DontApplyColour;
-import com.reactnativenavigation.options.params.NullColor;
 import com.reactnativenavigation.options.params.NullText;
 import com.reactnativenavigation.options.params.NullThemeColour;
 import com.reactnativenavigation.options.params.ThemeColour;
@@ -47,9 +46,9 @@ public class BottomTabPresenterTest extends BaseTest {
     private BottomTabPresenter uut;
     private BottomTabs bottomTabs;
     private List<ViewController<?>> tabs;
-    private ViewController child1;
-    private ViewController child2;
-    private ViewController child3;
+    private ViewController<?> child1;
+    private ViewController<?> child2;
+    private ViewController<?> child3;
     private Activity activity;
     private ChildControllersRegistry childRegistry;
 

package/lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/bottomtabs/BottomTabsAttacherTest.java

@@ -49,7 +49,7 @@ public class BottomTabsAttacherTest extends BaseTest {
 
     @Test
     public void onTabSelected() {
-        ViewController tab = mock(ViewController.class);
+        ViewController<?> tab = mock(ViewController.class);
         uut.onTabSelected(tab);
         verify(mode).onTabSelected(tab);
     }

package/lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/bottomtabs/BottomTabsControllerTest.java

@@ -36,7 +36,6 @@ import com.reactnativenavigation.views.bottomtabs.BottomTabs;
 import com.reactnativenavigation.views.bottomtabs.BottomTabsContainer;
 import com.reactnativenavigation.views.bottomtabs.BottomTabsLayout;
 
-import org.jetbrains.annotations.NotNull;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
@@ -50,7 +49,6 @@ import androidx.annotation.NonNull;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 
 
-import static com.nhaarman.mockitokotlin2.OngoingStubbingKt.whenever;
 import static com.reactnativenavigation.TestUtils.hideBackButton;
 import static com.reactnativenavigation.utils.ObjectUtils.perform;
 import static org.assertj.core.api.Java6Assertions.assertThat;
@@ -68,12 +66,12 @@ public class BottomTabsControllerTest extends BaseTest {
     private BottomTabsContainer bottomTabsContainer;
     private BottomTabsController uut;
     private final Options initialOptions = new Options();
-    private ViewController child1;
-    private ViewController child2;
-    private ViewController child3;
-    private ViewController stackChild;
+    private ViewController<?> child1;
+    private ViewController<?> child2;
+    private ViewController<?> child3;
+    private ViewController<?> stackChild;
     private StackController child4;
-    private ViewController child5;
+    private ViewController<?> child5;
     private final Options tabOptions = OptionHelper.createBottomTabOptions();
     private final ImageLoader imageLoaderMock = ImageLoaderMock.mock();
     private EventEmitter eventEmitter;
@@ -125,7 +123,7 @@ public class BottomTabsControllerTest extends BaseTest {
     @Test
     public void parentControllerIsSet() {
         uut = createBottomTabs();
-        for (ViewController tab : tabs) {
+        for (ViewController<?> tab : tabs) {
             assertThat(tab.getParentController()).isEqualTo(uut);
         }
     }
@@ -134,7 +132,7 @@ public class BottomTabsControllerTest extends BaseTest {
     public void setTabs_allChildViewsAreAttachedToHierarchy() {
         uut.onViewWillAppear();
         assertThat(uut.getView().getChildCount()).isEqualTo(6);
-        for (ViewController child : uut.getChildControllers()) {
+        for (ViewController<?> child : uut.getChildControllers()) {
             assertThat(child.getView().getParent()).isNotNull();
         }
     }
@@ -152,13 +150,13 @@ public class BottomTabsControllerTest extends BaseTest {
     public void onTabSelected() {
         uut.ensureViewIsCreated();
         assertThat(uut.getSelectedIndex()).isZero();
-        assertThat(((ViewController) ((List) uut.getChildControllers()).get(0)).getView().getVisibility()).isEqualTo(View.VISIBLE);
+        assertThat(((ViewController<?>) ((List<?>) uut.getChildControllers()).get(0)).getView().getVisibility()).isEqualTo(View.VISIBLE);
 
         uut.onTabSelected(3, false);
 
         assertThat(uut.getSelectedIndex()).isEqualTo(3);
-        assertThat(((ViewController) ((List) uut.getChildControllers()).get(0)).getView().getVisibility()).isEqualTo(View.INVISIBLE);
-        assertThat(((ViewController) ((List) uut.getChildControllers()).get(3)).getView().getVisibility()).isEqualTo(View.VISIBLE);
+        assertThat(((ViewController<?>) ((List<?>) uut.getChildControllers()).get(0)).getView().getVisibility()).isEqualTo(View.INVISIBLE);
+        assertThat(((ViewController<?>) ((List<?>) uut.getChildControllers()).get(3)).getView().getVisibility()).isEqualTo(View.VISIBLE);
         verify(eventEmitter).emitBottomTabSelected(0, 3);
     }
 
@@ -170,7 +168,7 @@ public class BottomTabsControllerTest extends BaseTest {
         uut.onTabSelected(0, true);
 
         assertThat(uut.getSelectedIndex()).isEqualTo(0);
-        assertThat(((ViewController) ((List) uut.getChildControllers()).get(0)).getView().getParent()).isNotNull();
+        assertThat(((ViewController<?>) ((List<?>) uut.getChildControllers()).get(0)).getView().getParent()).isNotNull();
         verify(eventEmitter).emitBottomTabSelected(0, 0);
     }
 
@@ -185,7 +183,7 @@ public class BottomTabsControllerTest extends BaseTest {
 
     @Test
     public void applyChildOptions_bottomTabsOptionsAreClearedAfterApply() {
-        ParentController parent = Mockito.mock(ParentController.class);
+        ParentController<?> parent = Mockito.mock(ParentController.class);
         uut.setParentController(parent);
 
         child1.options.bottomTabsOptions.backgroundColor = new ThemeColour(new Colour(Color.RED));
@@ -456,7 +454,7 @@ public class BottomTabsControllerTest extends BaseTest {
         when(child5.handleBack(any())).thenReturn(true);
     }
 
-    private StackController spyOnStack(ViewController initialChild) {
+    private StackController spyOnStack(ViewController<?> initialChild) {
         StackController build = TestUtils.newStackController(activity)
                 .setInitialOptions(tabOptions)
                 .build();

package/lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/bottomtabs/attacher/modes/AttachModeTest.java

@@ -31,8 +31,8 @@ public abstract class AttachModeTest extends BaseTest {
     private Activity activity;
     private ChildControllersRegistry childRegistry;
     protected ViewGroup parent;
-    ViewController tab1;
-    ViewController tab2;
+    ViewController<?> tab1;
+    ViewController<?> tab2;
     List<ViewController<?>> tabs;
     protected Options options;
     protected BottomTabsPresenter presenter;
@@ -69,18 +69,18 @@ public abstract class AttachModeTest extends BaseTest {
         forEach(otherTabs(), t -> assertThat(t.getView().getVisibility()).isEqualTo(View.INVISIBLE));
     }
 
-    ViewController[] otherTabs() {
+    ViewController<?>[] otherTabs() {
         return filter(tabs, t -> t != initialTab()).toArray(new ViewController[0]);
     }
 
-    ViewController initialTab() {
+    ViewController<?> initialTab() {
         return tabs.get(INITIAL_TAB);
     }
 
     private List<ViewController<?>> createTabs() {
         tab1 = new SimpleViewController(activity, childRegistry, "child1", new Options());
         tab2 = spy(new SimpleViewController(activity, childRegistry, "child2", new Options()));
-        ViewController tab3 = new SimpleViewController(activity, childRegistry, "child3", new Options());
+        ViewController<?> tab3 = new SimpleViewController(activity, childRegistry, "child3", new Options());
         return Arrays.asList(tab1, tab2, tab3);
     }
 }

package/lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/child/ChildControllerTest.java

@@ -16,7 +16,7 @@ import static org.mockito.Mockito.verify;
 
 public class ChildControllerTest extends BaseTest {
 
-    private ChildController uut;
+    private ChildController<?> uut;
     private ChildControllersRegistry childRegistry;
     private Presenter presenter;
     private Options resolvedOptions = new Options();
@@ -31,7 +31,7 @@ public class ChildControllerTest extends BaseTest {
                 return resolvedOptions;
             }
         };
-        ParentController parent = Mockito.mock(ParentController.class);
+        ParentController<?> parent = Mockito.mock(ParentController.class);
         uut.setParentController(parent);
     }
 

package/lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/child/ChildControllersRegistryTest.java

@@ -15,8 +15,8 @@ import static org.mockito.Mockito.verify;
 
 public class ChildControllersRegistryTest extends BaseTest {
     private ChildControllersRegistry uut;
-    private ChildController child1;
-    private ChildController child2;
+    private ChildController<?> child1;
+    private ChildController<?> child2;
 
     @Override
     public void beforeEach() {

package/lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/modal/ModalPresenterTest.java

@@ -40,11 +40,11 @@ public class ModalPresenterTest extends BaseTest {
     private static final String MODAL_ID_1 = "modalId1";
     private static final String MODAL_ID_2 = "modalId2";
 
-    private ChildController modal1;
-    private ChildController modal2;
+    private ChildController<?> modal1;
+    private ChildController<?> modal2;
     private ModalPresenter uut;
     private ModalAnimator animator;
-    private ViewController root;
+    private ViewController<?> root;
     private CoordinatorLayout modalsLayout;
 
 
@@ -285,7 +285,7 @@ public class ModalPresenterTest extends BaseTest {
     public void dismissModal_successIsReportedBeforeViewIsDestroyed() {
         disableModalAnimations(modal1);
         CommandListenerAdapter listener = Mockito.mock(CommandListenerAdapter.class);
-        ViewController modal = spy(modal1);
+        ViewController<?> modal = spy(modal1);
         InOrder inOrder = inOrder(listener, modal);
 
         uut.showModal(modal, root, new CommandListenerAdapter());

package/lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/modal/ModalStackTest.java

@@ -40,16 +40,16 @@ public class ModalStackTest extends BaseTest {
     private static final String MODAL_ID_4 = "modalId4";
 
     private ModalStack uut;
-    private ViewController modal1;
-    private ViewController modal2;
-    private ViewController modal3;
-    private ViewController modal4;
+    private ViewController<?> modal1;
+    private ViewController<?> modal2;
+    private ViewController<?> modal3;
+    private ViewController<?> modal4;
     private StackController stack;
     private Activity activity;
     private ChildControllersRegistry childRegistry;
     private ModalPresenter presenter;
     private ModalAnimator animator;
-    private ViewController root;
+    private ViewController<?> root;
     private EventEmitter emitter;
 
     @Override
@@ -308,7 +308,7 @@ public class ModalStackTest extends BaseTest {
 
     @Test
     public void handleBack_ViewControllerTakesPrecedenceOverModal() {
-        ViewController backHandlingModal = spy(new SimpleViewController(activity, childRegistry, "stack", new Options()){
+        ViewController<?> backHandlingModal = spy(new SimpleViewController(activity, childRegistry, "stack", new Options()){
             @Override
             public boolean handleBack(CommandListener listener) {
                 return true;
@@ -338,17 +338,17 @@ public class ModalStackTest extends BaseTest {
         verify(modal2).destroy();
     }
 
-    private ViewController findModal(String id) {
+    private ViewController<?> findModal(String id) {
         return uut.findControllerById(id);
     }
 
-    private void showModalsWithoutAnimation(ViewController... modals) {
-        for (ViewController modal : modals) {
+    private void showModalsWithoutAnimation(ViewController<?>... modals) {
+        for (ViewController<?> modal : modals) {
             showModalWithoutAnimation(modal);
         }
     }
 
-    private void showModalWithoutAnimation(ViewController modal) {
+    private void showModalWithoutAnimation(ViewController<?> modal) {
         disableShowModalAnimation(modal);
         uut.showModal(modal, root, new CommandListenerAdapter());
     }