From c262ab4e14f7c1d73171445501954f2ba173997f Mon Sep 17 00:00:00 2001 From: John Knox Date: Thu, 20 Feb 2020 11:21:24 -0800 Subject: [PATCH] Change positionOnScreen to positionOnScreen{X,Y} Summary: Nested subobjects work but aren't very well typed in the layout plugin. So changing it to help flipper work with it. From: ``` positionOnScreen: {x: 234, y: 456}, ``` to ``` positionOnScreenX: 234, positionOnScreenY: 456, ``` Reviewed By: passy Differential Revision: D19998161 fbshipit-source-id: 4e4d7ced3cb37c527bbdf65549ec436311a8c2b8 --- .../plugins/inspector/descriptors/ViewDescriptor.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ViewDescriptor.java b/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ViewDescriptor.java index b85c02ba6..9b2f9fb88 100644 --- a/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ViewDescriptor.java +++ b/android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ViewDescriptor.java @@ -150,12 +150,8 @@ public class ViewDescriptor extends NodeDescriptor { new FlipperObject.Builder() .put("x", InspectorValue.mutable(node.getPivotX())) .put("y", InspectorValue.mutable(node.getPivotY()))) - .put( - "positionOnScreen", - new FlipperObject.Builder() - .put("x", positionOnScreen[0]) - .put("y", positionOnScreen[1]) - .build()); + .put("positionOnScreenX", positionOnScreen[0]) + .put("positionOnScreenY", positionOnScreen[1]); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { viewProps