Skip to content

Commit 57768bf

Browse files
fabriziocuccifacebook-github-bot
authored andcommitted
Kotlinify ColorPropConverter (#50626)
Summary: Pull Request resolved: #50626 As per title. Changelog: [Android][Breaking] Kotlinify ColorPropConverter Reviewed By: javache Differential Revision: D72788490 fbshipit-source-id: 1c81c70566437db36e45e59995093c4c808369d8
1 parent 398f206 commit 57768bf

File tree

6 files changed

+224
-246
lines changed

6 files changed

+224
-246
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -662,12 +662,12 @@ public class com/facebook/react/bridge/CatalystInstanceImpl$PendingJSCall {
662662
public fun toString ()Ljava/lang/String;
663663
}
664664

665-
public class com/facebook/react/bridge/ColorPropConverter {
666-
public fun <init> ()V
667-
public static fun getColor (Ljava/lang/Object;Landroid/content/Context;)Ljava/lang/Integer;
668-
public static fun getColor (Ljava/lang/Object;Landroid/content/Context;I)Ljava/lang/Integer;
669-
public static fun getColorInstance (Ljava/lang/Object;Landroid/content/Context;)Landroid/graphics/Color;
670-
public static fun resolveResourcePath (Landroid/content/Context;Ljava/lang/String;)Ljava/lang/Integer;
665+
public final class com/facebook/react/bridge/ColorPropConverter {
666+
public static final field INSTANCE Lcom/facebook/react/bridge/ColorPropConverter;
667+
public static final fun getColor (Ljava/lang/Object;Landroid/content/Context;)Ljava/lang/Integer;
668+
public static final fun getColor (Ljava/lang/Object;Landroid/content/Context;I)I
669+
public static final fun getColorInstance (Ljava/lang/Object;Landroid/content/Context;)Landroid/graphics/Color;
670+
public static final fun resolveResourcePath (Landroid/content/Context;Ljava/lang/String;)Ljava/lang/Integer;
671671
}
672672

673673
public final class com/facebook/react/bridge/CxxCallbackImpl : com/facebook/jni/HybridClassBase, com/facebook/react/bridge/Callback {

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/ColorAnimatedNode.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ internal class ColorAnimatedNode(
7272
return
7373
}
7474
val context = context ?: return
75-
val color = ColorPropConverter.getColor(nativeColor, context)
75+
val color = ColorPropConverter.getColor(nativeColor, context) ?: return
7676
val rNode = nativeAnimatedNodesManager.getNodeById(rNodeId) as ValueAnimatedNode?
7777
val gNode = nativeAnimatedNodesManager.getNodeById(gNodeId) as ValueAnimatedNode?
7878
val bNode = nativeAnimatedNodesManager.getNodeById(bNodeId) as ValueAnimatedNode?

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ColorPropConverter.java

Lines changed: 0 additions & 234 deletions
This file was deleted.

0 commit comments

Comments
 (0)