From a0ddb92cd2ddaac96099116d51adc355fe7e0283 Mon Sep 17 00:00:00 2001 From: Pasquale Anatriello Date: Fri, 8 Mar 2019 11:16:55 -0800 Subject: [PATCH] Remove Reference API Summary: Reference has been deprecated for a while. This diff completely removes it in favor of using ComparableDrawable everywhere. Reviewed By: astreet Differential Revision: D14241428 fbshipit-source-id: a986f34fda3a05c85d3d57b1e806c5e48c3f485e --- .../plugins/litho/DebugComponentDescriptor.java | 15 +-------------- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/android/src/main/java/com/facebook/flipper/plugins/litho/DebugComponentDescriptor.java b/android/src/main/java/com/facebook/flipper/plugins/litho/DebugComponentDescriptor.java index 7cac7bf26..39967cf28 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/litho/DebugComponentDescriptor.java +++ b/android/src/main/java/com/facebook/flipper/plugins/litho/DebugComponentDescriptor.java @@ -25,14 +25,12 @@ import com.facebook.flipper.plugins.inspector.NodeDescriptor; import com.facebook.flipper.plugins.inspector.Touch; import com.facebook.flipper.plugins.inspector.descriptors.ObjectDescriptor; import com.facebook.litho.Component; -import com.facebook.litho.ComponentContext; import com.facebook.litho.DebugComponent; import com.facebook.litho.DebugLayoutNode; import com.facebook.litho.LithoView; import com.facebook.litho.StateContainer; import com.facebook.litho.annotations.Prop; import com.facebook.litho.annotations.State; -import com.facebook.litho.reference.Reference; import com.facebook.yoga.YogaAlign; import com.facebook.yoga.YogaDirection; import com.facebook.yoga.YogaEdge; @@ -180,7 +178,7 @@ public class DebugComponentDescriptor extends NodeDescriptor { } final FlipperObject.Builder data = new FlipperObject.Builder(); - data.put("background", fromReference(node.getContext(), layout.getBackground())); + data.put("background", fromDrawable(layout.getBackground())); data.put("foreground", fromDrawable(layout.getForeground())); data.put("direction", InspectorValue.mutable(Enum, layout.getLayoutDirection().toString())); @@ -631,17 +629,6 @@ public class DebugComponentDescriptor extends NodeDescriptor { return InspectorValue.mutable(Color, 0); } - private static InspectorValue fromReference( - ComponentContext c, Reference r) { - if (r == null) { - return fromDrawable(null); - } - - final T d = Reference.acquire(c.getAndroidContext(), r); - final InspectorValue v = fromDrawable(d); - Reference.release(c.getAndroidContext(), d, r); - return v; - } private static InspectorValue fromFloat(float f) { if (Float.isNaN(f)) { diff --git a/gradle.properties b/gradle.properties index f80b7fd9c..683b02171 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ POM_DEVELOPER_ID=facebook POM_DEVELOPER_NAME=facebook # Shared version numbers -LITHO_VERSION=0.24.0 +LITHO_VERSION=0.24.1-PASQUALE-SNAPSHOT ANDROIDX_VERSION=1.0.0 # Gradle internals