diff --git a/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/topbar/button/ButtonPresenter.kt b/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/topbar/button/ButtonPresenter.kt index 785fcbe150c..93b3b8e5690 100644 --- a/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/topbar/button/ButtonPresenter.kt +++ b/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/topbar/button/ButtonPresenter.kt @@ -79,7 +79,7 @@ open class ButtonPresenter(private val context: Context, private val button: But private fun applyAccessibilityLabel(menuItem: MenuItem) { if (button.accessibilityLabel.hasValue()) { if (button.component.hasValue()) { - menuItem.actionView.contentDescription = button.accessibilityLabel.get() + menuItem.actionView?.contentDescription = button.accessibilityLabel.get() } else { MenuItemCompat.setContentDescription(menuItem, button.accessibilityLabel.get()) } diff --git a/lib/android/app/src/main/java/com/reactnativenavigation/views/animations/BaseViewAnimator.kt b/lib/android/app/src/main/java/com/reactnativenavigation/views/animations/BaseViewAnimator.kt index 8d6c25607d3..c30fcad0c75 100644 --- a/lib/android/app/src/main/java/com/reactnativenavigation/views/animations/BaseViewAnimator.kt +++ b/lib/android/app/src/main/java/com/reactnativenavigation/views/animations/BaseViewAnimator.kt @@ -43,17 +43,17 @@ open class BaseViewAnimator( private inner class AnimatorListener(private val startState: AnimationState, private val endVisibility: Int) : AnimatorListenerAdapter() { var isCancelled = false - override fun onAnimationStart(animation: Animator?) { + override fun onAnimationStart(animation: Animator) { view.resetViewProperties() view.visibility = View.VISIBLE animationState = startState } - override fun onAnimationCancel(animation: Animator?) { + override fun onAnimationCancel(animation: Animator) { isCancelled = true } - override fun onAnimationEnd(animation: Animator?) { + override fun onAnimationEnd(animation: Animator) { if (!isCancelled) { animationState = AnimationState.Idle view.visibility = endVisibility diff --git a/lib/android/app/src/main/java/com/reactnativenavigation/views/stack/topbar/titlebar/IconBackgroundDrawable.kt b/lib/android/app/src/main/java/com/reactnativenavigation/views/stack/topbar/titlebar/IconBackgroundDrawable.kt index a469d4c404c..e3f606a7fb1 100644 --- a/lib/android/app/src/main/java/com/reactnativenavigation/views/stack/topbar/titlebar/IconBackgroundDrawable.kt +++ b/lib/android/app/src/main/java/com/reactnativenavigation/views/stack/topbar/titlebar/IconBackgroundDrawable.kt @@ -68,7 +68,7 @@ class IconBackgroundDrawable( super.setBounds(r) } - override fun onBoundsChange(bounds: Rect?) { + override fun onBoundsChange(bounds: Rect) { if (bounds != null) { backgroundRect = Rect((bounds.width() - backgroundWidth) / 2, (bounds.height() - backgroundHeight) / 2, diff --git a/package.json b/package.json index aa997902abf..67105c2112e 100644 --- a/package.json +++ b/package.json @@ -105,7 +105,7 @@ "pngjs": "^6.0.0", "prettier": "2.1.2", "react": "18.0.0", - "react-native": "0.69.5", + "react-native": "0.69.7", "react-native-fast-image": "^8.3.4", "react-native-gesture-handler": "^1.6.1", "react-native-reanimated": "2.10.0", @@ -218,4 +218,4 @@ } } } -} \ No newline at end of file +}