diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nUtil.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nUtil.kt index 57347b3048182b..396a81d21e357f 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nUtil.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nUtil.kt @@ -9,8 +9,8 @@ package com.facebook.react.modules.i18nmanager import android.content.Context import android.content.pm.ApplicationInfo +import android.view.View import androidx.core.text.TextUtilsCompat -import androidx.core.view.ViewCompat import java.util.Locale public class I18nUtil private constructor() { @@ -63,7 +63,7 @@ public class I18nUtil private constructor() { // Check if the current device language is RTL get() { val directionality = TextUtilsCompat.getLayoutDirectionFromLocale(Locale.getDefault()) - return directionality == ViewCompat.LAYOUT_DIRECTION_RTL + return directionality == View.LAYOUT_DIRECTION_RTL } private fun isPrefSet(context: Context, key: String, defaultValue: Boolean): Boolean = diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.kt index fabeec1315d4ae..879c7a70e6947b 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.kt @@ -14,7 +14,6 @@ import android.graphics.Point import android.view.View import android.view.ViewGroup import android.widget.OverScroller -import androidx.core.view.ViewCompat import com.facebook.common.logging.FLog import com.facebook.react.bridge.ReactContext import com.facebook.react.bridge.WritableMap @@ -434,10 +433,7 @@ public object ReactScrollViewHelper { scroller.setFriction(1.0f - scrollState.decelerationRate) // predict where a fling would end up so we can scroll to the nearest snap offset - val width = - (scrollView.width - - ViewCompat.getPaddingStart(scrollView) - - ViewCompat.getPaddingEnd(scrollView)) + val width = scrollView.width - scrollView.getPaddingStart() - scrollView.getPaddingEnd() val height = scrollView.height - scrollView.paddingBottom - scrollView.paddingTop val finalAnimatedPositionScroll = scrollState.finalAnimatedPositionScroll scroller.fling(