Consolidate skew detection into a single hasAffine2DSkewTransform

Replace the hasSkewTransform + isAffine2DTransform pair at the BaseViewManager call site with one public hasAffine2DSkewTransform; the two predicates are now internal but still unit-tested. Mark the intentionally-ignored NumberFormatException catches with `_`, and refresh the ReactAndroid API snapshot.

Author: qflen

packages/react-native/ReactAndroid/api/ReactAndroid.api

@@ -4113,8 +4113,7 @@ public abstract class com/facebook/react/uimanager/SimpleViewManager : com/faceb
 public final class com/facebook/react/uimanager/SkewMatrixHelper {
 	public static final field INSTANCE Lcom/facebook/react/uimanager/SkewMatrixHelper;
 	public static final fun buildAffine2DMatrix (Lcom/facebook/react/bridge/ReadableArray;FFLcom/facebook/react/bridge/ReadableArray;)Landroid/graphics/Matrix;
-	public static final fun hasSkewTransform (Lcom/facebook/react/bridge/ReadableArray;)Z
-	public static final fun isAffine2DTransform (Lcom/facebook/react/bridge/ReadableArray;)Z
+	public static final fun hasAffine2DSkewTransform (Lcom/facebook/react/bridge/ReadableArray;)Z
 }
 
 public final class com/facebook/react/uimanager/Spacing {

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java

@@ -583,8 +583,7 @@ protected void setTransformProperty(
     }
 
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q
-        && SkewMatrixHelper.hasSkewTransform(transforms)
-        && SkewMatrixHelper.isAffine2DTransform(transforms)) {
+        && SkewMatrixHelper.hasAffine2DSkewTransform(transforms)) {
       Matrix affine =
           SkewMatrixHelper.buildAffine2DMatrix(
               transforms,

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/SkewMatrixHelper.kt

@@ -22,8 +22,16 @@ import com.facebook.react.common.ReactConstants
  */
 public object SkewMatrixHelper {
 
+  /**
+   * Returns true only when [transforms] both contains a `skewX` / `skewY` operation and is fully
+   * representable as a 2D-affine [Matrix] (see [isAffine2DTransform]) — i.e. the case
+   * [BaseViewManager.setTransformProperty] applies via `View.setAnimationMatrix` on Android Q+.
+   */
   @JvmStatic
-  public fun hasSkewTransform(transforms: ReadableArray): Boolean {
+  public fun hasAffine2DSkewTransform(transforms: ReadableArray): Boolean =
+      hasSkewTransform(transforms) && isAffine2DTransform(transforms)
+
+  internal fun hasSkewTransform(transforms: ReadableArray): Boolean {
     if (isRawMatrixShorthand(transforms)) return false
     for (i in 0 until transforms.size()) {
       if (transforms.getType(i) != ReadableType.Map) continue
@@ -41,8 +49,7 @@ public object SkewMatrixHelper {
    * a `translate` with a non-zero Z component, and the raw 16-element matrix shorthand used by
    * Fabric LayoutAnimations.
    */
-  @JvmStatic
-  public fun isAffine2DTransform(transforms: ReadableArray): Boolean {
+  internal fun isAffine2DTransform(transforms: ReadableArray): Boolean {
     if (isRawMatrixShorthand(transforms)) return false
     for (i in 0 until transforms.size()) {
       if (transforms.getType(i) != ReadableType.Map) continue
@@ -165,7 +172,7 @@ public object SkewMatrixHelper {
         if (!part.endsWith("%")) return defaultDip
         try {
           (part.dropLast(1).toDouble() * dimensionDip / 100.0).toFloat()
-        } catch (e: NumberFormatException) {
+        } catch (_: NumberFormatException) {
           defaultDip
         }
       }
@@ -198,7 +205,7 @@ public object SkewMatrixHelper {
       } else {
         s.toDouble()
       }
-    } catch (e: NumberFormatException) {
+    } catch (_: NumberFormatException) {
       FLog.w(ReactConstants.TAG, "Invalid translate value: $s")
       0.0
     }

packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/SkewMatrixHelperTest.kt

@@ -118,6 +118,28 @@ class SkewMatrixHelperTest {
     assertThat(SkewMatrixHelper.isAffine2DTransform(transforms)).isTrue()
   }
 
+  @Test
+  fun hasAffine2DSkewTransform_trueForSkewX() {
+    val transforms = JavaOnlyArray.of(JavaOnlyMap.of("skewX", "20deg"))
+    assertThat(SkewMatrixHelper.hasAffine2DSkewTransform(transforms)).isTrue()
+  }
+
+  @Test
+  fun hasAffine2DSkewTransform_falseForSkewWithRotateX() {
+    val transforms =
+        JavaOnlyArray.of(
+            JavaOnlyMap.of("skewX", "20deg"),
+            JavaOnlyMap.of("rotateX", "10deg"),
+        )
+    assertThat(SkewMatrixHelper.hasAffine2DSkewTransform(transforms)).isFalse()
+  }
+
+  @Test
+  fun hasAffine2DSkewTransform_falseForRotateOnly() {
+    val transforms = JavaOnlyArray.of(JavaOnlyMap.of("rotate", "30deg"))
+    assertThat(SkewMatrixHelper.hasAffine2DSkewTransform(transforms)).isFalse()
+  }
+
   @Test
   fun buildAffine2DMatrix_pureSkewX_producesExpectedEntries() {
     val transforms = JavaOnlyArray.of(JavaOnlyMap.of("skewX", "20deg"))