From b9ec0e5a1a70f9af5aa5daeb0e956478dd1ba8e5 Mon Sep 17 00:00:00 2001 From: Peng Jiang Date: Wed, 26 Jun 2024 01:47:24 -0700 Subject: [PATCH] use view.getPaddingStart() directly (#45150) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/45150 As the androidx.core 1.13.1 change, ViewCompact.getPaddingStart and getPaddingEnd are deprecated. based on the suggestion from https://developer.android.com/reference/kotlin/androidx/core/view/ViewCompat#getPaddingStart(android.view.View), use: view.getPaddingStart and view.getPaddingEnd directly. {F1717102270} Changelog: [Internal] - Migrating deprecated APIs with AndroidX.Core 1.13.1 Reviewed By: alanleedev Differential Revision: D58955567 fbshipit-source-id: b84377e1ded0d94e9035dcfa4dbd9c463396a322 --- .../facebook/react/views/scroll/ReactScrollViewHelper.kt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) 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 fabeec1315d..879c7a70e69 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(