react-native-navigation 7.22.0 → 7.22.2

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

@@ -50,6 +50,7 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import static com.reactnativenavigation.utils.CollectionUtils.difference;
 import static com.reactnativenavigation.utils.CollectionUtils.filter;
@@ -124,7 +125,7 @@ public class StackPresenter {
     }
 
     public boolean isRendered(View component) {
-        ArrayList<ViewController> controllers = new ArrayList<>();
+        ArrayList<ViewController<?>> controllers = new ArrayList<>();
         controllers.addAll(perform(componentRightButtons.get(component), new ArrayList<>(), Map::values));
         controllers.addAll(perform(componentLeftButtons.get(component), new ArrayList<>(), Map::values));
         controllers.add(backgroundControllers.get(component));
@@ -132,7 +133,7 @@ public class StackPresenter {
         return renderChecker.areRendered(filter(controllers, ObjectUtils::notNull));
     }
 
-    public void mergeOptions(Options options, StackController stack, ViewController currentChild) {
+    public void mergeOptions(Options options, StackController stack, ViewController<?> currentChild) {
         TopBarOptions resolvedTopBarOptions = options.topBar.copy().mergeWithDefault(stack.resolveChildOptions(currentChild).topBar).mergeWithDefault(defaultOptions.topBar);
         mergeOrientation(options.layout.orientation);
         //        mergeButtons(topBar, withDefault.topBar.buttons, child);
@@ -165,7 +166,7 @@ public class StackPresenter {
         applyTopBarVisibility(withDefault.topBar);
     }
 
-    public void applyChildOptions(Options currentChildOptions, StackController stack, ViewController child) {
+    public void applyChildOptions(Options currentChildOptions, StackController stack, ViewController<?> child) {
         Options finalChildOptions = currentChildOptions.copy().withDefaultOptions(defaultOptions);
         applyOrientation(finalChildOptions.layout.orientation);
         applyButtons(finalChildOptions.topBar, child);
@@ -179,7 +180,7 @@ public class StackPresenter {
         ((Activity) topBar.getContext()).setRequestedOrientation(withDefaultOptions.getValue());
     }
 
-    public void onChildDestroyed(ViewController child) {
+    public void onChildDestroyed(ViewController<?> child) {
         perform(titleControllers.remove(child.getView()), TitleBarReactViewController::destroy);
         perform(backgroundControllers.remove(child.getView()), TopBarBackgroundViewController::destroy);
         destroyButtons(componentRightButtons.get(child.getView()));
@@ -192,7 +193,7 @@ public class StackPresenter {
         if (buttons != null) forEach(buttons.values(), ViewController::destroy);
     }
 
-    private void applyTopBarOptions(Options options, StackController stack, ViewController child) {
+    private void applyTopBarOptions(Options options, StackController stack, ViewController<?> child) {
         final View component = child.getView();
         TopBarOptions topBarOptions = options.topBar;
 
@@ -211,7 +212,7 @@ public class StackPresenter {
 
         if (topBarOptions.title.component.hasValue()) {
             if (titleControllers.containsKey(component)) {
-                topBarController.setTitleComponent(titleControllers.get(component));
+                topBarController.setTitleComponent(Objects.requireNonNull(titleControllers.get(component)));
             } else {
                 TitleBarReactViewController controller = new TitleBarReactViewController(activity, titleViewCreator, topBarOptions.title.component);
                 controller.setWaitForRender(topBarOptions.title.component.waitForRender);
@@ -267,15 +268,15 @@ public class StackPresenter {
     }
 
     private void mergeStatusBarDrawBehindOptions(TopBarOptions topBarOptions, Options toMerge) {
-      if(toMerge.statusBar.drawBehind.hasValue()){
-          if(toMerge.statusBar.visible.isTrueOrUndefined() && toMerge.statusBar.drawBehind.isTrue()){
-              topBar.setTopPadding(StatusBarUtils.getStatusBarHeight(activity));
-              topBar.setHeight(topBarOptions.height.get(UiUtils.getTopBarHeightDp(activity)) + StatusBarUtils.getStatusBarHeightDp(activity));
-          } else {
-              topBar.setTopPadding(0);
-              topBar.setHeight(topBarOptions.height.get(UiUtils.getTopBarHeightDp(activity)));
-          }
-      }
+        if(toMerge.statusBar.drawBehind.hasValue()){
+            if(toMerge.statusBar.visible.isTrueOrUndefined() && toMerge.statusBar.drawBehind.isTrue()){
+                topBar.setTopPadding(StatusBarUtils.getStatusBarHeight(activity));
+                topBar.setHeight(topBarOptions.height.get(UiUtils.getTopBarHeightDp(activity)) + StatusBarUtils.getStatusBarHeightDp(activity));
+            } else {
+                topBar.setTopPadding(0);
+                topBar.setHeight(topBarOptions.height.get(UiUtils.getTopBarHeightDp(activity)));
+            }
+        }
     }
 
     @Nullable
@@ -289,7 +290,7 @@ public class StackPresenter {
         return null;
     }
 
-    private void applyTopBarVisibilityIfChildIsNotBeingAnimated(TopBarOptions options, StackController stack, ViewController child) {
+    private void applyTopBarVisibilityIfChildIsNotBeingAnimated(TopBarOptions options, StackController stack, ViewController<?> child) {
         if (!stack.isChildInTransition(child) || options.animate.isFalse()) applyTopBarVisibility(options);
     }
 
@@ -302,7 +303,7 @@ public class StackPresenter {
         }
     }
 
-    private void applyButtons(TopBarOptions options, ViewController child) {
+    private void applyButtons(TopBarOptions options, ViewController<?> child) {
         if (options.buttons.right != null) {
             List<ButtonOptions> rightButtons = mergeButtonsWithColor(options.buttons.right,
                     options.rightButtonColor
@@ -351,7 +352,7 @@ public class StackPresenter {
     }
 
     private List<ButtonController> getOrCreateButtonControllers(@Nullable Map<String, ButtonController> currentButtons, @NonNull List<ButtonOptions> buttons) {
-        ArrayList result = new ArrayList<ButtonController>();
+        ArrayList<ButtonController> result = new ArrayList<>();
         for (ButtonOptions b : buttons) {
             result.add(take(first(perform(currentButtons, null, Map::values), button -> button.getButton().equals(b)), createButtonController(b)));
         }
@@ -383,7 +384,7 @@ public class StackPresenter {
         }
     }
 
-    public List<Animator> getAdditionalPushAnimations(StackController stack, ViewController appearing, Options appearingOptions) {
+    public List<Animator> getAdditionalPushAnimations(StackController stack, ViewController<?> appearing, Options appearingOptions) {
         return CollectionUtils.asList(
                 topBarController.getPushAnimation(appearingOptions, getTopBarTranslationAnimationDelta(stack, appearing)),
                 perform(bottomTabsController, null, btc -> btc.getPushAnimation(appearingOptions))
@@ -397,14 +398,14 @@ public class StackPresenter {
         );
     }
 
-    public List<Animator> getAdditionalSetRootAnimations(StackController stack, ViewController appearing, Options appearingOptions) {
+    public List<Animator> getAdditionalSetRootAnimations(StackController stack, ViewController<?> appearing, Options appearingOptions) {
         return CollectionUtils.asList(
                 topBarController.getSetStackRootAnimation(appearingOptions, getTopBarTranslationAnimationDelta(stack, appearing)),
                 perform(bottomTabsController, null, btc -> btc.getSetStackRootAnimation(appearingOptions))
         );
     }
 
-    public void mergeChildOptions(Options toMerge, Options resolvedOptions, StackController stack, ViewController child) {
+    public void mergeChildOptions(Options toMerge, Options resolvedOptions, StackController stack, ViewController<?> child) {
         TopBarOptions topBar = toMerge.copy().topBar.mergeWithDefault(resolvedOptions.topBar).mergeWithDefault(defaultOptions.topBar);
         mergeOrientation(toMerge.layout.orientation);
         mergeButtons(topBar, toMerge.topBar, child.getView(), stack);
@@ -507,7 +508,7 @@ public class StackPresenter {
         return result;
     }
 
-    private void mergeTopBarOptions(TopBarOptions resolveOptions, Options options, StackController stack, ViewController child) {
+    private void mergeTopBarOptions(TopBarOptions resolveOptions, Options options, StackController stack, ViewController<?> child) {
         TopBarOptions topBarOptions = options.topBar;
         final View component = child.getView();
         if (options.layout.direction.hasValue()) topBar.setLayoutDirection(options.layout.direction);
@@ -560,7 +561,7 @@ public class StackPresenter {
 
         if (topBarOptions.background.component.hasValue()) {
             if (backgroundControllers.containsKey(component)) {
-                topBar.setBackgroundComponent(backgroundControllers.get(component).getView());
+                topBar.setBackgroundComponent(Objects.requireNonNull(backgroundControllers.get(component)).getView());
             } else {
                 TopBarBackgroundViewController controller = new TopBarBackgroundViewController(activity, topBarBackgroundViewCreator);
                 backgroundControllers.put(component, controller);
@@ -619,7 +620,7 @@ public class StackPresenter {
         }
     }
 
-    public boolean shouldPopOnHardwareButtonPress(ViewController viewController) {
+    public boolean shouldPopOnHardwareButtonPress(ViewController<?> viewController) {
         return viewController.resolveCurrentOptions().hardwareBack.popStackOnPress.get(true);
     }
 
@@ -650,7 +651,7 @@ public class StackPresenter {
     }
 
 
-    public void applyTopInsets(StackController stack, ViewController child) {
+    public void applyTopInsets(StackController stack, ViewController<?> child) {
         if (stack.isCurrentChild(child)) applyStatusBarInsets(stack, child);
         child.applyTopInset();
     }
@@ -663,18 +664,18 @@ public class StackPresenter {
         return componentLeftButtons.containsKey(child) ? new ArrayList<>(componentLeftButtons.get(child).values()) : null;
     }
 
-    private void applyStatusBarInsets(StackController stack, ViewController child) {
+    private void applyStatusBarInsets(StackController stack, ViewController<?> child) {
         MarginLayoutParams lp = (MarginLayoutParams) topBar.getLayoutParams();
         lp.topMargin = getTopBarTopMargin(stack, child);
         topBar.requestLayout();
     }
 
-    private int getTopBarTranslationAnimationDelta(StackController stack, ViewController child) {
+    private int getTopBarTranslationAnimationDelta(StackController stack, ViewController<?> child) {
         Options options = stack.resolveChildOptions(child).withDefaultOptions(defaultOptions);
         return options.statusBar.hasTransparency() ? getTopBarTopMargin(stack, child) : 0;
     }
 
-    private int getTopBarTopMargin(StackController stack, ViewController child) {
+    private int getTopBarTopMargin(StackController stack, ViewController<?> child) {
         Options withDefault = stack.resolveChildOptions(child).withDefaultOptions(defaultOptions);
         int topMargin = UiUtils.dpToPx(activity, withDefault.topBar.topMargin.get(0));
         int statusBarInset = withDefault.statusBar.visible.isTrueOrUndefined() && !withDefault.statusBar.drawBehind.isTrue() ? StatusBarUtils.getStatusBarHeight(child.getActivity()) : 0;

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/topbar/TopBarAnimator.kt

@@ -4,6 +4,7 @@ import com.reactnativenavigation.views.animations.BaseViewAnimator
 import com.reactnativenavigation.views.stack.topbar.TopBar
 
 class TopBarAnimator @JvmOverloads constructor(view: TopBar? = null) : BaseViewAnimator<TopBar>(HideDirection.Up, view) {
+    @Suppress("UNUSED_PARAMETER")
     fun hideOnScroll(translationStart: Float, translationEndDy: Float) {
         // NOOP for now - this entire mechanism needs to be reimplemented as it relies on bridge events which are obsolete in TurboModules config
     }

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

@@ -5,7 +5,6 @@ import android.app.Activity;
 import com.reactnativenavigation.options.ComponentOptions;
 import com.reactnativenavigation.options.Options;
 import com.reactnativenavigation.react.events.ComponentType;
-import com.reactnativenavigation.react.events.EventEmitter;
 import com.reactnativenavigation.utils.CompatUtils;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.ViewController;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.YellowBoxDelegate;

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/topbar/TopBarController.kt

@@ -122,7 +122,7 @@ open class TopBarController(private val animator: TopBarAnimator = TopBarAnimato
     }
 
     open fun mergeLeftButtons(toAdd: List<ButtonController>, toRemove: List<ButtonController>) {
-        view.clearBackButton();
+        view.clearBackButton()
         toRemove.forEach { view.removeLeftButton(it) }
         forEachIndexed(toAdd) { b: ButtonController, i: Int -> b.addToMenu(leftButtonBar, i * 10) }
     }

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/topbar/button/BackButtonHelper.java

@@ -5,13 +5,13 @@ import com.reactnativenavigation.options.params.Bool;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.ViewController;
 
 public class BackButtonHelper {
-    public void clear(ViewController child) {
+    public void clear(ViewController<?> child) {
         if (!child.options.topBar.buttons.back.hasValue()) {
             child.options.topBar.buttons.back.visible = new Bool(false);
         }
     }
 
-    public void addToPushedChild(ViewController child) {
+    public void addToPushedChild(ViewController<?> child) {
         if (child.options.topBar.buttons.left != null || child.options.topBar.buttons.back.visible.isFalse()) return;
         Options options = new Options();
         options.topBar.buttons.back.setVisible();

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/topbar/button/ButtonPresenter.kt

@@ -88,7 +88,7 @@ open class ButtonPresenter(private val context: Context, private val button: But
         menuItem.isEnabled = button.enabled.isTrueOrUndefined
     }
 
-    private fun applyIconBackgroundDrawable(srcDrawable: Drawable): Drawable? {
+    private fun applyIconBackgroundDrawable(srcDrawable: Drawable): Drawable {
         return if (button.iconBackground.hasValue()) {
             val width = button.iconBackground.width.get(srcDrawable.intrinsicWidth).let { max(it, srcDrawable.intrinsicWidth) }
             val height = button.iconBackground.height.get(srcDrawable.intrinsicHeight).let { max(it, srcDrawable.intrinsicHeight) }

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/topbar/button/ButtonSpan.kt

@@ -1,7 +1,6 @@
 package com.reactnativenavigation.viewcontrollers.stack.topbar.button
 
 import android.content.Context
-import android.graphics.Color
 import android.graphics.Paint
 import android.graphics.Typeface
 import android.text.TextPaint

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/topbar/button/IconResolver.java

@@ -5,7 +5,6 @@ import android.graphics.drawable.Drawable;
 import android.util.Log;
 
 import com.reactnativenavigation.options.ButtonOptions;
-import com.reactnativenavigation.react.Constants;
 import com.reactnativenavigation.utils.Functions.Func1;
 import com.reactnativenavigation.utils.ImageLoader;
 import com.reactnativenavigation.utils.ImageLoadingListenerAdapter;

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/toptabs/TopTabsAdapter.java

@@ -1,5 +1,6 @@
 package com.reactnativenavigation.viewcontrollers.toptabs;
 
+import androidx.annotation.NonNull;
 import androidx.viewpager.widget.PagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 import android.view.View;
@@ -11,10 +12,10 @@ import com.reactnativenavigation.viewcontrollers.viewcontroller.ViewController;
 import java.util.List;
 
 public class TopTabsAdapter extends PagerAdapter implements ViewPager.OnPageChangeListener {
-    private List<ViewController> tabs;
+    private List<ViewController<?>> tabs;
     private int currentPage = 0;
 
-    public TopTabsAdapter(List<ViewController> tabs) {
+    public TopTabsAdapter(List<ViewController<?>> tabs) {
         this.tabs = tabs;
     }
 
@@ -29,12 +30,12 @@ public class TopTabsAdapter extends PagerAdapter implements ViewPager.OnPageChan
     }
 
     @Override
-    public boolean isViewFromObject(View view, Object object) {
+    public boolean isViewFromObject(@NonNull View view, @NonNull Object object) {
         return view == object;
     }
 
     @Override
-    public Object instantiateItem(ViewGroup component, int position) {
+    public Object instantiateItem(@NonNull ViewGroup component, int position) {
         return tabs.get(position).getView();
     }
 

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/toptabs/TopTabsController.java

@@ -21,14 +21,14 @@ import androidx.annotation.NonNull;
 
 public class TopTabsController extends ParentController<TopTabsViewPager> {
 
-    private List<ViewController> tabs;
+    private List<ViewController<?>> tabs;
     private TopTabsLayoutCreator viewCreator;
 
-    public TopTabsController(Activity activity, ChildControllersRegistry childRegistry, String id, List<ViewController> tabs, TopTabsLayoutCreator viewCreator, Options options, Presenter presenter) {
+    public TopTabsController(Activity activity, ChildControllersRegistry childRegistry, String id, List<ViewController<?>> tabs, TopTabsLayoutCreator viewCreator, Options options, Presenter presenter) {
         super(activity, childRegistry, id, presenter, options);
         this.viewCreator = viewCreator;
         this.tabs = tabs;
-        for (ViewController tab : tabs) {
+        for (ViewController<?> tab : tabs) {
             tab.setParentController(this);
             tab.setViewVisibilityListener(new ViewVisibilityListenerAdapter() {
                 @Override
@@ -40,7 +40,7 @@ public class TopTabsController extends ParentController<TopTabsViewPager> {
     }
 
     @Override
-    public ViewController getCurrentChild() {
+    public ViewController<?> getCurrentChild() {
         return tabs.get(getView().getCurrentItem());
     }
 
@@ -53,7 +53,7 @@ public class TopTabsController extends ParentController<TopTabsViewPager> {
 
     @NonNull
     @Override
-    public Collection<? extends ViewController> getChildControllers() {
+    public Collection<? extends ViewController<?>> getChildControllers() {
         return tabs;
     }
 
@@ -88,13 +88,13 @@ public class TopTabsController extends ParentController<TopTabsViewPager> {
     }
 
     @Override
-    public void applyChildOptions(Options options, ViewController child) {
+    public void applyChildOptions(Options options, ViewController<?> child) {
         super.applyChildOptions(options, child);
         performOnParentController(parentController -> parentController.applyChildOptions(this.options.copy(), child));
     }
 
     @CallSuper
-    public void mergeChildOptions(Options options, ViewController child) {
+    public void mergeChildOptions(Options options, ViewController<?> child) {
         super.mergeChildOptions(options, child);
         performOnParentController(parentController -> parentController.applyChildOptions(options.copy(), child));
     }
@@ -104,7 +104,7 @@ public class TopTabsController extends ParentController<TopTabsViewPager> {
         getCurrentChild().onViewDidAppear();
     }
 
-    private void performOnCurrentTab(Func1<ViewController> task) {
+    private void performOnCurrentTab(Func1<ViewController<?>> task) {
         task.run(tabs.get(getView().getCurrentItem()));
     }
 }

package/lib/android/app/src/main/java/com/reactnativenavigation/views/bottomtabs/BottomTabsContainer.kt

@@ -1,11 +1,9 @@
 package com.reactnativenavigation.views.bottomtabs
 
-import android.R.attr.factor
 import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.Color
 import android.view.View
-import android.widget.FrameLayout
 import android.widget.LinearLayout
 import androidx.annotation.RestrictTo
 import androidx.core.graphics.ColorUtils
@@ -14,7 +12,6 @@ import kotlin.math.roundToInt
 
 internal const val DEFAULT_SHADOW_COLOR = Color.BLACK
 internal const val DEFAULT_SHADOW_RADIUS = 10
-internal const val SHADOW_HEIGHT_DP = 20
 internal const val DEFAULT_SHADOW_DISTANCE = 15f
 internal const val DEFAULT_SHADOW_ANGLE = 270f
 
@@ -50,7 +47,7 @@ class BottomTabsContainer(context: Context, val bottomTabs: BottomTabs) : Shadow
         setTopOutLineColor(DEFAULT_TOP_OUTLINE_COLOR)
         this.topOutLineView.visibility = View.GONE
 
-        this.addView(linearLayout, FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT)
+        this.addView(linearLayout, LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)
     }
 
     override var shadowRadius: Float

package/lib/android/app/src/main/java/com/reactnativenavigation/views/bottomtabs/BottomTabsLayout.java

@@ -21,7 +21,6 @@ public class BottomTabsLayout extends CoordinatorLayout {
     @Override
     public void addView(View child, int index, ViewGroup.LayoutParams params) {
         if (bottomTabsContainer != null && child != bottomTabsContainer) {
-            int indexOfChild = this.indexOfChild(bottomTabsContainer);
             super.addView(child, getChildCount() - 1, params);
         } else {
             super.addView(child, 0, params);

package/lib/android/app/src/main/java/com/reactnativenavigation/views/element/animators/PropertyAnimatorCreator.kt

@@ -7,6 +7,7 @@ import com.reactnativenavigation.options.SharedElementTransitionOptions
 import java.lang.reflect.ParameterizedType
 
 abstract class PropertyAnimatorCreator<T : View> internal constructor(protected val from: View, protected val to: View) {
+    @Suppress("UNCHECKED_CAST")
     @CallSuper
     fun shouldAnimateProperty(): Boolean {
         val type = childClass
@@ -21,6 +22,7 @@ abstract class PropertyAnimatorCreator<T : View> internal constructor(protected
     protected open fun excludedViews() = emptyList<Class<*>>()
 
     abstract fun create(options: SharedElementTransitionOptions): Animator
+    @Suppress("UNCHECKED_CAST")
     private val childClass: Class<T>
         get() = (javaClass.genericSuperclass as ParameterizedType).actualTypeArguments[0] as Class<T>
 

package/lib/android/app/src/main/java/com/reactnativenavigation/views/element/animators/ReactImageBoundsAnimator.kt

@@ -4,7 +4,6 @@ import android.animation.Animator
 import android.animation.ObjectAnimator
 import android.graphics.Rect
 import android.view.View
-import android.widget.ImageView
 import com.facebook.react.views.image.ReactImageView
 import com.reactnativenavigation.options.SharedElementTransitionOptions
 import com.reactnativenavigation.utils.ViewUtils

package/lib/android/app/src/main/java/com/reactnativenavigation/views/element/animators/ReactImageMatrixAnimator.kt

@@ -2,7 +2,6 @@ package com.reactnativenavigation.views.element.animators
 
 import android.animation.Animator
 import android.animation.ObjectAnimator
-import android.animation.TypeEvaluator
 import android.graphics.PointF
 import android.graphics.Rect
 import android.view.View
@@ -14,6 +13,7 @@ import com.reactnativenavigation.options.SharedElementTransitionOptions
 import com.reactnativenavigation.utils.ViewUtils
 import kotlin.math.max
 import kotlin.math.roundToInt
+import android.animation.TypeEvaluator
 
 class ReactImageMatrixAnimator(from: View, to: View) : PropertyAnimatorCreator<ReactImageView>(from, to) {
     override fun shouldAnimateProperty(fromChild: ReactImageView, toChild: ReactImageView): Boolean {
@@ -53,7 +53,7 @@ class ReactImageMatrixAnimator(from: View, to: View) : PropertyAnimatorCreator<R
 
     private fun getScaleType(child: View): ScalingUtils.ScaleType {
         return getScaleType(
-            child as ReactImageView, child.hierarchy.actualImageScaleType ?: ImageResizeMode.defaultValue()
+                child as ReactImageView, child.hierarchy.actualImageScaleType ?: ImageResizeMode.defaultValue()
         )
     }
 

package/lib/android/app/src/main/java/com/reactnativenavigation/views/element/animators/ReactViewRotationAnimator.kt

@@ -2,14 +2,9 @@ package com.reactnativenavigation.views.element.animators
 
 import android.animation.Animator
 import android.animation.ObjectAnimator
-import android.graphics.Rect
 import android.view.View
-import androidx.core.animation.doOnEnd
 import com.facebook.react.views.view.ReactViewGroup
 import com.reactnativenavigation.options.SharedElementTransitionOptions
-import com.reactnativenavigation.utils.areDimensionsWithInheritedScaleEqual
-import com.reactnativenavigation.utils.computeInheritedScale
-import kotlin.math.roundToInt
 
 class ReactViewRotationAnimator(from: View, to: View) : PropertyAnimatorCreator<ReactViewGroup>(from, to) {
     private val fromRotation = from.rotation

package/lib/android/app/src/main/java/com/reactnativenavigation/views/stack/topbar/titlebar/TitleBarReactView.kt

@@ -2,30 +2,9 @@ package com.reactnativenavigation.views.stack.topbar.titlebar
 
 import android.annotation.SuppressLint
 import android.content.Context
-import androidx.core.view.children
 import com.facebook.react.ReactInstanceManager
 import com.reactnativenavigation.react.ReactView
 
 @SuppressLint("ViewConstructor")
 class TitleBarReactView(context: Context?, reactInstanceManager: ReactInstanceManager?, componentId: String?,
-                        componentName: String?) : ReactView(context, reactInstanceManager, componentId, componentName) {
-    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-        super.onMeasure(interceptReactRootViewMeasureSpec(widthMeasureSpec), heightMeasureSpec)
-    }
-
-    private fun interceptReactRootViewMeasureSpec(widthMeasureSpec: Int): Int {
-        // This is a HACK.
-        // ReactRootView has problematic behavior when setting width to WRAP_CONTENT,
-        // It's causing infinite measurements, that hung up the UI.
-        // Intercepting largest child by width, and use its width as (parent) ReactRootView width fixed that.
-        // See for more details https://github.com/wix/react-native-navigation/pull/7096
-        var measuredWidth = 0;
-        this.children.forEach {
-            if (it.measuredWidth > measuredWidth) {
-                measuredWidth = it.measuredWidth
-            }
-        }
-        return if (measuredWidth > 0) MeasureSpec.makeMeasureSpec(measuredWidth, MeasureSpec.EXACTLY) else
-            widthMeasureSpec
-    }
-}
+                        componentName: String?) : ReactView(context, reactInstanceManager, componentId, componentName)

package/lib/android/app/src/main/java/com/reactnativenavigation/views/toptabs/TopTabsLayoutCreator.java

@@ -9,9 +9,9 @@ import java.util.List;
 
 public class TopTabsLayoutCreator {
     private Context context;
-    private List<ViewController> tabs;
+    private List<ViewController<?>> tabs;
 
-    public TopTabsLayoutCreator(Context context, List<ViewController> tabs) {
+    public TopTabsLayoutCreator(Context context, List<ViewController<?>> tabs) {
         this.context = context;
         this.tabs = tabs;
     }

package/lib/android/app/src/main/java/com/reactnativenavigation/views/toptabs/TopTabsViewPager.java

@@ -22,9 +22,9 @@ import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 public class TopTabsViewPager extends ViewPager implements Component, ButtonController.OnClickListener {
 
     private static final int OFFSCREEN_PAGE_LIMIT = 99;
-    private List<ViewController> tabs;
+    private List<ViewController<?>> tabs;
 
-    public TopTabsViewPager(Context context, List<ViewController> tabs, TopTabsAdapter adapter) {
+    public TopTabsViewPager(Context context, List<ViewController<?>> tabs, TopTabsAdapter adapter) {
         super(context);
         this.tabs = tabs;
         initTabs(adapter);
@@ -32,7 +32,7 @@ public class TopTabsViewPager extends ViewPager implements Component, ButtonCont
 
     private void initTabs(TopTabsAdapter adapter) {
         setOffscreenPageLimit(OFFSCREEN_PAGE_LIMIT);
-        for (ViewController tab : tabs) {
+        for (ViewController<?> tab : tabs) {
             addView(tab.getView(), new ViewGroup.LayoutParams(MATCH_PARENT, MATCH_PARENT));
         }
         setAdapter(adapter);
@@ -45,7 +45,7 @@ public class TopTabsViewPager extends ViewPager implements Component, ButtonCont
     }
 
     private boolean areAllTabsRendered() {
-        for (ViewController tab : tabs) {
+        for (ViewController<?> tab : tabs) {
             if (!tab.isRendered()) return false;
         }
         return true;
@@ -61,13 +61,13 @@ public class TopTabsViewPager extends ViewPager implements Component, ButtonCont
     }
 
     public void destroy() {
-        for (ViewController tab : tabs) {
+        for (ViewController<?> tab : tabs) {
             tab.destroy();
         }
     }
 
     public boolean isCurrentView(View view) {
-        for (ViewController tab : tabs) {
+        for (ViewController<?> tab : tabs) {
             if (tab.getView() == view) {
                 return true;
             }

package/lib/android/app/src/reactNative63/java/com/reactnativenavigation/react/NavigationReactNativeHost.java

@@ -8,7 +8,6 @@ import com.facebook.react.ReactPackage;
 import com.facebook.react.common.LifecycleState;
 import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
 import com.reactnativenavigation.NavigationApplication;
-import com.reactnativenavigation.react.DevBundleDownloadListenerAdapter;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;