jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove implicit dependency on Androidx

Browse Source 
Summary: This change removes the dependency of FlipperEditor from AndroidX, which prevents it from moving to the Litho repository

Reviewed By: Andrey-Mishanin

Differential Revision: D23475867

fbshipit-source-id: a330c676859ed9ce9a0ab186dd206310d2eccca5
This commit is contained in:
Paco Estevez Garcia
2020-09-03 07:40:40 -07:00
committed by Facebook GitHub Bot
parent d8863d91a2
commit a49ceff441
3 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
android/plugins/litho/src/main/java/com/facebook/flipper/plugins/litho/FlipperEditor.java
View File

@@ -7,7 +7,6 @@
package com.facebook.flipper.plugins.litho; package com.facebook.flipper.plugins.litho;
import androidx.core.util.Pair;
import com.facebook.flipper.core.FlipperArray; import com.facebook.flipper.core.FlipperArray;
import com.facebook.flipper.core.FlipperDynamic; import com.facebook.flipper.core.FlipperDynamic;
import com.facebook.flipper.core.FlipperObject; import com.facebook.flipper.core.FlipperObject;
@@ -135,9 +134,9 @@ public class FlipperEditor {
while (keys.hasNext()) { while (keys.hasNext()) {
final String field = keys.next(); final String field = keys.next();
final FlipperObject object = flipperObject.getObject(field); final FlipperObject object = flipperObject.getObject(field);
final Pair<SetDataOperations.FlipperValueHint, FlipperDynamic> value = final SetDataOperations.HintedFlipperDynamic value =
SetDataOperations.parseLayoutEditorMessage(object); SetDataOperations.parseLayoutEditorMessage(object);
values.put(field, parseEditorValue(value.first, value.second)); values.put(field, parseEditorValue(value.kind, value.value));
} }
return values; return values;
} }
@@ -146,9 +145,9 @@ public class FlipperEditor {
ArrayList<EditorValue> values = new ArrayList<>(); ArrayList<EditorValue> values = new ArrayList<>();
for (int i = 0; i < flipperArray.length(); i++) { for (int i = 0; i < flipperArray.length(); i++) {
final FlipperObject object = flipperArray.getObject(i); final FlipperObject object = flipperArray.getObject(i);
final Pair<SetDataOperations.FlipperValueHint, FlipperDynamic> value = final SetDataOperations.HintedFlipperDynamic value =
SetDataOperations.parseLayoutEditorMessage(object); SetDataOperations.parseLayoutEditorMessage(object);
values.add(parseEditorValue(value.first, value.second)); values.add(parseEditorValue(value.kind, value.value));
} }
return values; return values;

7
android/src/main/java/com/facebook/flipper/plugins/inspector/InspectorFlipperPlugin.java
View File

@@ -12,7 +12,6 @@ import android.content.Context;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityEvent;
import androidx.core.util.Pair;
import com.facebook.flipper.core.ErrorReportingRunnable; import com.facebook.flipper.core.ErrorReportingRunnable;
import com.facebook.flipper.core.FlipperArray; import com.facebook.flipper.core.FlipperArray;
import com.facebook.flipper.core.FlipperConnection; import com.facebook.flipper.core.FlipperConnection;
@@ -339,10 +338,10 @@ public class InspectorFlipperPlugin implements FlipperPlugin {
if (wrapper instanceof FlipperObject && ((FlipperObject) wrapper).contains("kind")) { if (wrapper instanceof FlipperObject && ((FlipperObject) wrapper).contains("kind")) {
// New message with tagged types // New message with tagged types
final Pair<SetDataOperations.FlipperValueHint, FlipperDynamic> message = final SetDataOperations.HintedFlipperDynamic message =
SetDataOperations.parseLayoutEditorMessage((FlipperObject) wrapper); SetDataOperations.parseLayoutEditorMessage((FlipperObject) wrapper);
hint = message.first; hint = message.kind;
value = message.second; value = message.value;
} else { } else {
// Old message with untagged types // Old message with untagged types

16
android/src/main/java/com/facebook/flipper/plugins/inspector/SetDataOperations.java
View File

@@ -7,7 +7,6 @@
package com.facebook.flipper.plugins.inspector; package com.facebook.flipper.plugins.inspector;
import androidx.core.util.Pair;
import com.facebook.flipper.core.FlipperDynamic; import com.facebook.flipper.core.FlipperDynamic;
import com.facebook.flipper.core.FlipperObject; import com.facebook.flipper.core.FlipperObject;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@@ -21,11 +20,20 @@ public final class SetDataOperations {
* @param wrapper the object containing the elements * @param wrapper the object containing the elements
* @return a pair of a nullable hint and the uncasted value as a FlipperDynamic * @return a pair of a nullable hint and the uncasted value as a FlipperDynamic
*/ */
public static Pair<FlipperValueHint, FlipperDynamic> parseLayoutEditorMessage( public static HintedFlipperDynamic parseLayoutEditorMessage(FlipperObject wrapper) {
FlipperObject wrapper) {
final FlipperValueHint kind = FlipperValueHint.fromString(wrapper.getString("kind")); final FlipperValueHint kind = FlipperValueHint.fromString(wrapper.getString("kind"));
final FlipperDynamic value = wrapper.getDynamic("data"); final FlipperDynamic value = wrapper.getDynamic("data");
return new Pair<>(kind, value); return new HintedFlipperDynamic(kind, value);
}
public static final class HintedFlipperDynamic {
public final @Nullable FlipperValueHint kind;
public final FlipperDynamic value;
public HintedFlipperDynamic(@Nullable FlipperValueHint kind, FlipperDynamic value) {
this.kind = kind;
this.value = value;
}
} }
/** Each supported type of the Layout Editor protocol for values */ /** Each supported type of the Layout Editor protocol for values */