react-native-navigation 7.22.0 → 7.22.2

package/lib/android/app/src/main/java/com/reactnativenavigation/options/ElementTransitionOptions.kt

@@ -1,7 +1,6 @@
 package com.reactnativenavigation.options
 
 import android.animation.Animator
-import android.animation.AnimatorSet
 import android.view.View
 import org.json.JSONObject
 

package/lib/android/app/src/main/java/com/reactnativenavigation/options/HardwareBackButtonOptions.kt

@@ -1,11 +1,8 @@
 package com.reactnativenavigation.options
 
-import android.content.Context
-import com.reactnativenavigation.options.animations.ViewAnimationOptions
-import com.reactnativenavigation.options.params.*
+import com.reactnativenavigation.options.params.Bool
+import com.reactnativenavigation.options.params.NullBool
 import com.reactnativenavigation.options.parsers.BoolParser
-import com.reactnativenavigation.options.parsers.ColorParser
-import com.reactnativenavigation.options.parsers.FractionParser
 import org.json.JSONObject
 
 

package/lib/android/app/src/main/java/com/reactnativenavigation/options/LayoutFactory.java

@@ -47,37 +47,37 @@ import static com.reactnativenavigation.utils.CollectionUtils.*;
 
 public class LayoutFactory {
 	private Activity activity;
-    private ChildControllersRegistry childRegistry;
+	private ChildControllersRegistry childRegistry;
 	private final ReactInstanceManager reactInstanceManager;
-    private EventEmitter eventEmitter;
-    private Map<String, ExternalComponentCreator> externalComponentCreators;
-    private @NonNull Options defaultOptions = new Options();
-    private TypefaceLoader typefaceManager;
-
-    public void setDefaultOptions(@NonNull Options defaultOptions) {
-        Assertions.assertNotNull(defaultOptions);
-        this.defaultOptions = defaultOptions;
-    }
-
-    public LayoutFactory(final ReactInstanceManager reactInstanceManager) {
-        this.reactInstanceManager = reactInstanceManager;
-    }
-
-    public void init(Activity activity, EventEmitter eventEmitter, ChildControllersRegistry childRegistry, Map<String, ExternalComponentCreator> externalComponentCreators) {
-        this.activity = activity;
-        this.eventEmitter = eventEmitter;
-        this.childRegistry = childRegistry;
-        this.externalComponentCreators = externalComponentCreators;
-        typefaceManager = new TypefaceLoader(activity);
-    }
-
-	public ViewController create(final LayoutNode node) {
+	private EventEmitter eventEmitter;
+	private Map<String, ExternalComponentCreator> externalComponentCreators;
+	private @NonNull Options defaultOptions = new Options();
+	private TypefaceLoader typefaceManager;
+
+	public void setDefaultOptions(@NonNull Options defaultOptions) {
+		Assertions.assertNotNull(defaultOptions);
+		this.defaultOptions = defaultOptions;
+	}
+
+	public LayoutFactory(final ReactInstanceManager reactInstanceManager) {
+		this.reactInstanceManager = reactInstanceManager;
+	}
+
+	public void init(Activity activity, EventEmitter eventEmitter, ChildControllersRegistry childRegistry, Map<String, ExternalComponentCreator> externalComponentCreators) {
+		this.activity = activity;
+		this.eventEmitter = eventEmitter;
+		this.childRegistry = childRegistry;
+		this.externalComponentCreators = externalComponentCreators;
+		typefaceManager = new TypefaceLoader(activity);
+	}
+
+	public ViewController<?> create(final LayoutNode node) {
 		final ReactContext context = reactInstanceManager.getCurrentReactContext();
 		switch (node.type) {
 			case Component:
 				return createComponent(context, node);
-            case ExternalComponent:
-                return createExternalComponent(context, node);
+			case ExternalComponent:
+				return createExternalComponent(context, node);
 			case Stack:
 				return createStack(context, node);
 			case BottomTabs:
@@ -90,22 +90,22 @@ public class LayoutFactory {
 				return createSideMenuLeft(node);
 			case SideMenuRight:
 				return createSideMenuRight(node);
-            case TopTabs:
-                return createTopTabs(context, node);
+			case TopTabs:
+				return createTopTabs(context, node);
 			default:
 				throw new IllegalArgumentException("Invalid node type: " + node.type);
 		}
 	}
 
-    private ViewController createSideMenuRoot(ReactContext context, LayoutNode node) {
+	private ViewController<?> createSideMenuRoot(ReactContext context, LayoutNode node) {
 		SideMenuController sideMenuController = new SideMenuController(activity,
-                childRegistry,
-                node.id,
-                parse(context, typefaceManager, node.getOptions()),
-                new SideMenuPresenter(),
-                new Presenter(activity, defaultOptions)
-        );
-		ViewController childControllerCenter = null, childControllerLeft = null, childControllerRight = null;
+				childRegistry,
+				node.id,
+				parse(context, typefaceManager, node.getOptions()),
+				new SideMenuPresenter(),
+				new Presenter(activity, defaultOptions)
+		);
+		ViewController<?> childControllerCenter = null, childControllerLeft = null, childControllerRight = null;
 
 		for (LayoutNode child : node.children) {
 			switch (child.type) {
@@ -141,105 +141,105 @@ public class LayoutFactory {
 		return sideMenuController;
 	}
 
-	private ViewController createSideMenuContent(LayoutNode node) {
+	private ViewController<?> createSideMenuContent(LayoutNode node) {
 		return create(node.children.get(0));
 	}
 
-	private ViewController createSideMenuLeft(LayoutNode node) {
+	private ViewController<?> createSideMenuLeft(LayoutNode node) {
 		return create(node.children.get(0));
 	}
 
-	private ViewController createSideMenuRight(LayoutNode node) {
+	private ViewController<?> createSideMenuRight(LayoutNode node) {
 		return create(node.children.get(0));
 	}
 
-	private ViewController createComponent(ReactContext context, LayoutNode node) {
+	private ViewController<?> createComponent(ReactContext context, LayoutNode node) {
 		String id = node.id;
 		String name = node.data.optString("name");
-        return new ComponentViewController(activity,
-                childRegistry,
-                id,
-                name,
-                new ComponentViewCreator(reactInstanceManager),
-                parse(context, typefaceManager, node.getOptions()),
-                new Presenter(activity, defaultOptions),
-                new ComponentPresenter(defaultOptions)
-        );
+		return new ComponentViewController(activity,
+				childRegistry,
+				id,
+				name,
+				new ComponentViewCreator(reactInstanceManager),
+				parse(context, typefaceManager, node.getOptions()),
+				new Presenter(activity, defaultOptions),
+				new ComponentPresenter(defaultOptions)
+		);
 	}
 
-    private ViewController createExternalComponent(ReactContext context, LayoutNode node) {
-        final ExternalComponent externalComponent = ExternalComponent.parse(node.data);
-        return new ExternalComponentViewController(activity,
-                childRegistry,
-                node.id,
-                new Presenter(activity, defaultOptions),
-                externalComponent,
-                externalComponentCreators.get(externalComponent.name.get()),
-                reactInstanceManager,
-                new EventEmitter(context),
-                new ExternalComponentPresenter(),
-                parse(context, typefaceManager, node.getOptions())
-        );
-    }
-
-	private ViewController createStack(ReactContext context, LayoutNode node) {
-        return new StackControllerBuilder(activity, eventEmitter)
-                .setChildren(createChildren(node.children))
-                .setChildRegistry(childRegistry)
-                .setTopBarController(new TopBarController())
-                .setId(node.id)
-                .setInitialOptions(parse(context, typefaceManager, node.getOptions()))
-                .setStackPresenter(new StackPresenter(activity,
-                        new TitleBarReactViewCreator(reactInstanceManager),
-                        new TopBarBackgroundViewCreator(reactInstanceManager),
-                        new TitleBarButtonCreator(reactInstanceManager),
-                        new IconResolver(activity, new ImageLoader()),
-                        new TypefaceLoader(activity),
-                        new RenderChecker(),
-                        defaultOptions
-                ))
-                .setPresenter(new Presenter(activity, defaultOptions))
-                .build();
+	private ViewController<?> createExternalComponent(ReactContext context, LayoutNode node) {
+		final ExternalComponent externalComponent = ExternalComponent.parse(node.data);
+		return new ExternalComponentViewController(activity,
+				childRegistry,
+				node.id,
+				new Presenter(activity, defaultOptions),
+				externalComponent,
+				externalComponentCreators.get(externalComponent.name.get()),
+				reactInstanceManager,
+				new EventEmitter(context),
+				new ExternalComponentPresenter(),
+				parse(context, typefaceManager, node.getOptions())
+		);
 	}
 
-    private List<ViewController> createChildren(List<LayoutNode> children) {
-        List<ViewController> result = new ArrayList<>();
-        for (LayoutNode child : children) {
-            result.add(create(child));
-        }
-        return result;
-    }
-
-    private ViewController createBottomTabs(ReactContext context, LayoutNode node) {
-        List<ViewController<?>> tabs = map(node.children, this::create);
-        BottomTabsPresenter bottomTabsPresenter = new BottomTabsPresenter(tabs, defaultOptions, new BottomTabsAnimator());
-        return new BottomTabsController(activity,
-                tabs,
-                childRegistry,
-                eventEmitter,
-                new ImageLoader(),
-                node.id,
-                parse(context, typefaceManager, node.getOptions()),
-                new Presenter(activity, defaultOptions),
-                new BottomTabsAttacher(tabs, bottomTabsPresenter, defaultOptions),
-                bottomTabsPresenter,
-                new BottomTabPresenter(activity, tabs, new ImageLoader(), new TypefaceLoader(activity), defaultOptions));
+	private ViewController<?> createStack(ReactContext context, LayoutNode node) {
+		return new StackControllerBuilder(activity, eventEmitter)
+				.setChildren(createChildren(node.children))
+				.setChildRegistry(childRegistry)
+				.setTopBarController(new TopBarController())
+				.setId(node.id)
+				.setInitialOptions(parse(context, typefaceManager, node.getOptions()))
+				.setStackPresenter(new StackPresenter(activity,
+						new TitleBarReactViewCreator(reactInstanceManager),
+						new TopBarBackgroundViewCreator(reactInstanceManager),
+						new TitleBarButtonCreator(reactInstanceManager),
+						new IconResolver(activity, new ImageLoader()),
+						new TypefaceLoader(activity),
+						new RenderChecker(),
+						defaultOptions
+				))
+				.setPresenter(new Presenter(activity, defaultOptions))
+				.build();
 	}
 
-    private ViewController createTopTabs(ReactContext context, LayoutNode node) {
-        final List<ViewController> tabs = new ArrayList<>();
-        for (int i = 0; i < node.children.size(); i++) {
-            ViewController tabController = create(node.children.get(i));
-            Options options = parse(context, typefaceManager, node.children.get(i).getOptions());
-            options.setTopTabIndex(i);
-            tabs.add(tabController);
-        }
-        return new TopTabsController(activity, childRegistry, node.id, tabs, new TopTabsLayoutCreator(activity, tabs), parse(context, typefaceManager, node.getOptions()), new Presenter(activity, defaultOptions));
-    }
-
-    @NonNull
-    @RestrictTo(RestrictTo.Scope.TESTS)
-    public Options getDefaultOptions() {
-        return defaultOptions;
-    }
+	private List<ViewController<?>> createChildren(List<LayoutNode> children) {
+		List<ViewController<?>> result = new ArrayList<>();
+		for (LayoutNode child : children) {
+			result.add(create(child));
+		}
+		return result;
+	}
+
+	private ViewController<?> createBottomTabs(ReactContext context, LayoutNode node) {
+		List<ViewController<?>> tabs = map(node.children, this::create);
+		BottomTabsPresenter bottomTabsPresenter = new BottomTabsPresenter(tabs, defaultOptions, new BottomTabsAnimator());
+		return new BottomTabsController(activity,
+				tabs,
+				childRegistry,
+				eventEmitter,
+				new ImageLoader(),
+				node.id,
+				parse(context, typefaceManager, node.getOptions()),
+				new Presenter(activity, defaultOptions),
+				new BottomTabsAttacher(tabs, bottomTabsPresenter, defaultOptions),
+				bottomTabsPresenter,
+				new BottomTabPresenter(activity, tabs, new ImageLoader(), new TypefaceLoader(activity), defaultOptions));
+	}
+
+	private ViewController<?> createTopTabs(ReactContext context, LayoutNode node) {
+		final List<ViewController<?>> tabs = new ArrayList<>();
+		for (int i = 0; i < node.children.size(); i++) {
+			ViewController<?> tabController = create(node.children.get(i));
+			Options options = parse(context, typefaceManager, node.children.get(i).getOptions());
+			options.setTopTabIndex(i);
+			tabs.add(tabController);
+		}
+		return new TopTabsController(activity, childRegistry, node.id, tabs, new TopTabsLayoutCreator(activity, tabs), parse(context, typefaceManager, node.getOptions()), new Presenter(activity, defaultOptions));
+	}
+
+	@NonNull
+	@RestrictTo(RestrictTo.Scope.TESTS)
+	public Options getDefaultOptions() {
+		return defaultOptions;
+	}
 }

package/lib/android/app/src/main/java/com/reactnativenavigation/options/ValueAnimationOptions.kt

@@ -60,9 +60,9 @@ class ValueAnimationOptions {
         return animator
     }
 
-    override fun equals(o: Any?): Boolean {
-        if (this === o) return true
-        return if (o == null || javaClass != o.javaClass) false else animProp == (o as ValueAnimationOptions).animProp
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        return if (other == null || javaClass != other.javaClass) false else animProp == (other as ValueAnimationOptions).animProp
     }
 
     fun equals(animationProperty: Property<View?, Float?>): Boolean {

package/lib/android/app/src/main/java/com/reactnativenavigation/options/interpolators/SpringInterpolator.kt

@@ -7,35 +7,35 @@ class SpringInterpolator(private val mass: Float = 3f, private val damping: Floa
     private val velocity: Float = initialVelocity
 
     override fun getInterpolation(t: Float): Float {
-        val b = damping;
-        val m = mass;
-        val k = stiffness;
-        val v0 = velocity;
+        val b = damping
+        val m = mass
+        val k = stiffness
+        val v0 = velocity
 
-        var beta = b / (2 * m);
-        val omega0 = sqrt(k / m);
-        val omega1 = sqrt((omega0 * omega0) - (beta * beta));
-        val omega2 = sqrt((beta * beta) - (omega0 * omega0));
+        var beta = b / (2 * m)
+        val omega0 = sqrt(k / m)
+        val omega1 = sqrt((omega0 * omega0) - (beta * beta))
+        val omega2 = sqrt((beta * beta) - (omega0 * omega0))
 
-        val x0 = -1;
+        val x0 = -1
 
-        if (!this.allowsOverdamping && beta > omega0) beta = omega0;
+        if (!this.allowsOverdamping && beta > omega0) beta = omega0
         if (t == 1f) {
             return 1f
         }
         return when {
             beta < omega0 -> {
                 // Underdamped
-                val envelope = exp(-beta * t);
-                -x0 + envelope * (x0 * cos(omega1 * t) + ((beta * x0 + v0) / omega1) * sin(omega1 * t));
+                val envelope = exp(-beta * t)
+                -x0 + envelope * (x0 * cos(omega1 * t) + ((beta * x0 + v0) / omega1) * sin(omega1 * t))
             }
             beta == omega0 -> {
-                val envelope = exp(-beta * t);
-                -x0 + envelope * (x0 + (beta * x0 + v0) * t);
+                val envelope = exp(-beta * t)
+                -x0 + envelope * (x0 + (beta * x0 + v0) * t)
             }
             else -> {
-                val envelope = exp(-beta * t);
-                -x0 + envelope * (x0 * cosh(omega2 * t) + ((beta * x0 + v0) / omega2) * sinh(omega2 * t));
+                val envelope = exp(-beta * t)
+                -x0 + envelope * (x0 * cosh(omega2 * t) + ((beta * x0 + v0) / omega2) * sinh(omega2 * t))
             }
         }
     }

package/lib/android/app/src/main/java/com/reactnativenavigation/options/parsers/TypefaceLoader.kt

@@ -2,7 +2,6 @@ package com.reactnativenavigation.options.parsers
 
 import android.content.Context
 import android.graphics.Typeface
-import android.text.TextUtils
 import com.reactnativenavigation.utils.ReactTypefaceUtils
 
 open class TypefaceLoader(private val context: Context) {

package/lib/android/app/src/main/java/com/reactnativenavigation/react/CommandListenerAdapter.java

@@ -1,7 +1,5 @@
 package com.reactnativenavigation.react;
 
-import com.reactnativenavigation.react.CommandListener;
-
 import androidx.annotation.Nullable;
 
 public class CommandListenerAdapter implements CommandListener {

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

@@ -30,6 +30,7 @@ import com.reactnativenavigation.viewcontrollers.navigator.Navigator;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.ViewController;
 
 import java.util.ArrayList;
+import java.util.Objects;
 
 import static com.reactnativenavigation.utils.UiUtils.pxToDp;
 
@@ -107,9 +108,9 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void setRoot(String commandId, ReadableMap rawLayoutTree, Promise promise) {
-        final LayoutNode layoutTree = LayoutNodeParser.parse(jsonParser.parse(rawLayoutTree).optJSONObject("root"));
+        final LayoutNode layoutTree = LayoutNodeParser.parse(Objects.requireNonNull(jsonParser.parse(rawLayoutTree).optJSONObject("root")));
         handle(() -> {
-            final ViewController viewController = layoutFactory.create(layoutTree);
+            final ViewController<?> viewController = layoutFactory.create(layoutTree);
             navigator().setRoot(viewController, new NativeCommandListener("setRoot", commandId, promise, eventEmitter, now), reactInstanceManager);
         });
     }
@@ -132,7 +133,7 @@ public class NavigationModule extends ReactContextBaseJavaModule {
     public void push(String commandId, String onComponentId, ReadableMap rawLayoutTree, Promise promise) {
         final LayoutNode layoutTree = LayoutNodeParser.parse(jsonParser.parse(rawLayoutTree));
         handle(() -> {
-            final ViewController viewController = layoutFactory.create(layoutTree);
+            final ViewController<?> viewController = layoutFactory.create(layoutTree);
             navigator().push(onComponentId, viewController, new NativeCommandListener("push", commandId, promise, eventEmitter, now));
         });
     }
@@ -140,7 +141,7 @@ public class NavigationModule extends ReactContextBaseJavaModule {
     @ReactMethod
     public void setStackRoot(String commandId, String onComponentId, ReadableArray children, Promise promise) {
         handle(() -> {
-            ArrayList<ViewController> _children = new ArrayList<>();
+            ArrayList<ViewController<?>> _children = new ArrayList<>();
             for (int i = 0; i < children.size(); i++) {
                 final LayoutNode layoutTree = LayoutNodeParser.parse(jsonParser.parse(children.getMap(i)));
                 _children.add(layoutFactory.create(layoutTree));
@@ -168,7 +169,7 @@ public class NavigationModule extends ReactContextBaseJavaModule {
     public void showModal(String commandId, ReadableMap rawLayoutTree, Promise promise) {
         final LayoutNode layoutTree = LayoutNodeParser.parse(jsonParser.parse(rawLayoutTree));
         handle(() -> {
-            final ViewController viewController = layoutFactory.create(layoutTree);
+            final ViewController<?> viewController = layoutFactory.create(layoutTree);
             navigator().showModal(viewController, new NativeCommandListener("showModal", commandId, promise, eventEmitter, now));
         });
     }
@@ -190,7 +191,7 @@ public class NavigationModule extends ReactContextBaseJavaModule {
     public void showOverlay(String commandId, ReadableMap rawLayoutTree, Promise promise) {
         final LayoutNode layoutTree = LayoutNodeParser.parse(jsonParser.parse(rawLayoutTree));
         handle(() -> {
-            final ViewController viewController = layoutFactory.create(layoutTree);
+            final ViewController<?> viewController = layoutFactory.create(layoutTree);
             navigator().showOverlay(viewController, new NativeCommandListener("showOverlay", commandId, promise, eventEmitter, now));
         });
     }

package/lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationPackage.kt

@@ -5,7 +5,6 @@ import com.facebook.react.ReactPackage
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.uimanager.ViewManager
-import com.reactnativenavigation.NavigationActivity
 import com.reactnativenavigation.options.LayoutFactory
 import com.reactnativenavigation.react.modal.ModalViewManager
 
@@ -22,6 +21,6 @@ class NavigationPackage(private val reactNativeHost: ReactNativeHost) : ReactPac
 
     override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
 
-        return listOf(ModalViewManager((reactContext.currentActivity as NavigationActivity).navigator))
+        return listOf(ModalViewManager(reactContext))
     }
 }

package/lib/android/app/src/main/java/com/reactnativenavigation/react/modal/ModalContentLayout.kt

@@ -28,13 +28,13 @@ class ModalContentLayout(context: Context?) : ReactViewGroup(context), RootView{
             val reactContext: ReactContext = this.getReactContext()
             reactContext.runOnNativeModulesQueueThread(object : GuardedRunnable(reactContext) {
                 override fun runGuarded() {
-                    val uiManager = this@ModalContentLayout.getReactContext().getNativeModule<UIManagerModule>(
-                        UIManagerModule::class.java
+                    val uiManager = this@ModalContentLayout.getReactContext().getNativeModule(
+                            UIManagerModule::class.java
                     ) as UIManagerModule
                     uiManager.updateNodeSize(
-                        viewTag,
-                        this@ModalContentLayout.viewWidth,
-                        this@ModalContentLayout.viewHeight
+                            viewTag,
+                            this@ModalContentLayout.viewWidth,
+                            this@ModalContentLayout.viewHeight
                     )
                 }
             })

package/lib/android/app/src/main/java/com/reactnativenavigation/react/modal/ModalLayoutController.kt

@@ -36,16 +36,16 @@ class ModalLayoutController(
     override fun sendOnNavigationButtonPressed(buttonId: String?) {
         if (buttonId == Constants.HARDWARE_BACK_BUTTON_ID) {
             val dispatcher = reactContext.getNativeModule(
-                UIManagerModule::class.java
-            ).eventDispatcher
-            dispatcher.dispatchEvent(RequestCloseModalEvent(getHostId()))
+                    UIManagerModule::class.java
+            )?.eventDispatcher
+            dispatcher?.dispatchEvent(RequestCloseModalEvent(getHostId()))
         }
     }
 
     fun sendShowEvent() {
         val dispatcher = reactContext.getNativeModule(
-            UIManagerModule::class.java
-        ).eventDispatcher
-        dispatcher.dispatchEvent(ShowModalEvent(getHostId()))
+                UIManagerModule::class.java
+        )?.eventDispatcher
+        dispatcher?.dispatchEvent(ShowModalEvent(getHostId()))
     }
-}
+}

package/lib/android/app/src/main/java/com/reactnativenavigation/react/modal/ModalViewManager.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import android.graphics.Point
 import android.view.WindowManager
 import com.facebook.infer.annotation.Assertions
+import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.common.MapBuilder
 import com.facebook.react.module.annotations.ReactModule
@@ -12,6 +13,7 @@ import com.facebook.react.uimanager.ReactShadowNodeImpl
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.annotations.ReactProp
+import com.reactnativenavigation.NavigationActivity
 import com.reactnativenavigation.options.ModalPresentationStyle
 import com.reactnativenavigation.options.Options
 import com.reactnativenavigation.options.params.Bool
@@ -25,7 +27,15 @@ import com.reactnativenavigation.viewcontrollers.navigator.Navigator
 private const val MODAL_MANAGER_NAME = "RNNModalViewManager"
 
 @ReactModule(name = MODAL_MANAGER_NAME)
-class ModalViewManager(private val navigator: Navigator) : ViewGroupManager<ModalHostLayout>() {
+class ModalViewManager(val reactContext: ReactContext) : ViewGroupManager<ModalHostLayout>() {
+
+    private val navigator: Navigator?
+        get() {
+            val navigationActivity = reactContext.currentActivity as? NavigationActivity
+            return navigationActivity?.let {
+                if (it.isFinishing || it.isDestroyed) null else it.navigator
+            }
+        }
     private val jsonParser = JSONParser()
     override fun getName(): String = MODAL_MANAGER_NAME
 
@@ -41,15 +51,18 @@ class ModalViewManager(private val navigator: Navigator) : ViewGroupManager<Moda
         return ModalHostShadowNode::class.java
     }
 
+
     override fun onDropViewInstance(modal: ModalHostLayout) {
         super.onDropViewInstance(modal)
-        navigator.dismissModal(modal.viewController.id, CommandListenerAdapter())
-        modal.onDropInstance()
+        navigator?.let {
+            it.dismissModal(modal.viewController.id, CommandListenerAdapter())
+            modal.onDropInstance()
+        }
     }
 
     override fun onAfterUpdateTransaction(modal: ModalHostLayout) {
         super.onAfterUpdateTransaction(modal)
-        navigator.showModal(modal.viewController, CommandListenerAdapter(object : CommandListener {
+        navigator?.showModal(modal.viewController, CommandListenerAdapter(object : CommandListener {
             override fun onSuccess(childId: String?) {
                 modal.viewController.sendShowEvent()
             }
@@ -70,23 +83,26 @@ class ModalViewManager(private val navigator: Navigator) : ViewGroupManager<Moda
     @ReactProp(name = "animation")
     fun setAnimation(modal: ModalHostLayout, animation: ReadableMap) {
         modal.viewController.mergeOptions(Options().apply {
-           val animationJson = jsonParser.parse(animation)
+            val animationJson = jsonParser.parse(animation)
             val showModal = parseTransitionAnimationOptions(animationJson.optJSONObject("showModal"))
             val dismissModal = parseTransitionAnimationOptions(animationJson.optJSONObject("dismissModal"))
             this.animations.showModal = showModal
             this.animations.dismissModal = dismissModal
         })
     }
+
     @ReactProp(name = "blurOnUnmount")
     fun setBlurOnUnmount(modal: ModalHostLayout, blurOnUnmount: Boolean) {
-       modal.viewController.mergeOptions(Options().apply {
-           this.modal.blurOnUnmount = Bool(blurOnUnmount)
-       })
+        modal.viewController.mergeOptions(Options().apply {
+            this.modal.blurOnUnmount = Bool(blurOnUnmount)
+        })
     }
+
     @ReactProp(name = "transparent")
     fun setTransparent(modal: ModalHostLayout, transparent: Boolean) {
         modal.viewController.mergeOptions(Options().apply {
-            this.modal.presentationStyle = if(transparent) ModalPresentationStyle.OverCurrentContext else ModalPresentationStyle.None
+            this.modal.presentationStyle =
+                if (transparent) ModalPresentationStyle.OverCurrentContext else ModalPresentationStyle.None
         })
     }
 }

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

@@ -13,7 +13,7 @@ public class CoordinatorLayoutUtils {
         return new CoordinatorLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT);
     }
 
-    public static CoordinatorLayout.LayoutParams matchParentWithBehaviour(CoordinatorLayout.Behavior behavior) {
+    public static CoordinatorLayout.LayoutParams matchParentWithBehaviour(CoordinatorLayout.Behavior<?> behavior) {
         CoordinatorLayout.LayoutParams lp = new CoordinatorLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT);
         lp.setBehavior(behavior);
         return lp;

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

@@ -2,7 +2,6 @@ package com.reactnativenavigation.utils
 
 import android.graphics.Outline
 import android.os.Build
-import android.util.Log
 import android.view.View
 import android.view.ViewOutlineProvider
 import androidx.annotation.RequiresApi

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

@@ -33,7 +33,7 @@ public class ReflectionUtils {
 		return null;
 	}
 
-	private static Field getField(Class clazz, String name) {
+	private static Field getField(Class<?> clazz, String name) {
 		try {
 			return clazz.getDeclaredField(name);
 		} catch (NoSuchFieldException nsfe) {

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

@@ -7,7 +7,7 @@ import java.util.Collection;
 import static com.reactnativenavigation.utils.CollectionUtils.reduce;
 
 public class RenderChecker {
-    public boolean areRendered(Collection<ViewController> components) {
+    public boolean areRendered(Collection<ViewController<?>> components) {
         return reduce(components, true, ViewController::isRendered);
     }
 }

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

@@ -9,8 +9,6 @@ import android.view.WindowManager;
 import static android.view.WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS;
 import static com.reactnativenavigation.utils.UiUtils.dpToPx;
 
-import androidx.annotation.VisibleForTesting;
-
 public class StatusBarUtils {
     private static final int STATUS_BAR_HEIGHT_M = 24;
     private static final int STATUS_BAR_HEIGHT_L = 25;