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

Run google-java-format over Android code

Browse Source 
Summary: Prettier code

Reviewed By: sjkirby

Differential Revision: D10182489

fbshipit-source-id: 6a1ba4d586f49edad00f839ccd1b94857ccfccaa
This commit is contained in:
Hilal Alsibai
2018-10-06 11:31:45 -07:00
committed by Facebook Github Bot
parent 34c55262ce
commit 52e43e6ab8
50 changed files with 485 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/src/main/java/com/facebook/flipper/android/AndroidFlipperClient.java
View File

@@ -60,7 +60,9 @@ public final class AndroidFlipperClient {
for (String permission : REQUIRED_PERMISSIONS) { for (String permission : REQUIRED_PERMISSIONS) {
if (ContextCompat.checkSelfPermission(context, permission) if (ContextCompat.checkSelfPermission(context, permission)
== PackageManager.PERMISSION_DENIED) { == PackageManager.PERMISSION_DENIED) {
Log.e("Flipper", String.format("App needs permission \"%s\" to work with Flipper.", permission)); Log.e(
"Flipper",
String.format("App needs permission \"%s\" to work with Flipper.", permission));
} }
} }
} }

2
android/src/main/java/com/facebook/flipper/android/EventBase.java
View File

@@ -7,10 +7,10 @@
*/ */
package com.facebook.flipper.android; package com.facebook.flipper.android;
import com.facebook.flipper.BuildConfig;
import com.facebook.jni.HybridClassBase; import com.facebook.jni.HybridClassBase;
import com.facebook.proguard.annotations.DoNotStrip; import com.facebook.proguard.annotations.DoNotStrip;
import com.facebook.soloader.SoLoader; import com.facebook.soloader.SoLoader;
import com.facebook.flipper.BuildConfig;
@DoNotStrip @DoNotStrip
class EventBase extends HybridClassBase { class EventBase extends HybridClassBase {

6
android/src/main/java/com/facebook/flipper/android/FlipperClientImpl.java
View File

@@ -7,14 +7,14 @@
*/ */
package com.facebook.flipper.android; package com.facebook.flipper.android;
import com.facebook.jni.HybridData;
import com.facebook.proguard.annotations.DoNotStrip;
import com.facebook.soloader.SoLoader;
import com.facebook.flipper.BuildConfig; import com.facebook.flipper.BuildConfig;
import com.facebook.flipper.core.FlipperClient; import com.facebook.flipper.core.FlipperClient;
import com.facebook.flipper.core.FlipperPlugin; import com.facebook.flipper.core.FlipperPlugin;
import com.facebook.flipper.core.FlipperStateUpdateListener; import com.facebook.flipper.core.FlipperStateUpdateListener;
import com.facebook.flipper.core.StateSummary; import com.facebook.flipper.core.StateSummary;
import com.facebook.jni.HybridData;
import com.facebook.proguard.annotations.DoNotStrip;
import com.facebook.soloader.SoLoader;
@DoNotStrip @DoNotStrip
class FlipperClientImpl implements FlipperClient { class FlipperClientImpl implements FlipperClient {

6
android/src/main/java/com/facebook/flipper/android/FlipperConnectionImpl.java
View File

@@ -7,14 +7,14 @@
*/ */
package com.facebook.flipper.android; package com.facebook.flipper.android;
import com.facebook.jni.HybridData;
import com.facebook.proguard.annotations.DoNotStrip;
import com.facebook.soloader.SoLoader;
import com.facebook.flipper.BuildConfig; import com.facebook.flipper.BuildConfig;
import com.facebook.flipper.core.FlipperArray; import com.facebook.flipper.core.FlipperArray;
import com.facebook.flipper.core.FlipperConnection; import com.facebook.flipper.core.FlipperConnection;
import com.facebook.flipper.core.FlipperObject; import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.core.FlipperReceiver; import com.facebook.flipper.core.FlipperReceiver;
import com.facebook.jni.HybridData;
import com.facebook.proguard.annotations.DoNotStrip;
import com.facebook.soloader.SoLoader;
@DoNotStrip @DoNotStrip
class FlipperConnectionImpl implements FlipperConnection { class FlipperConnectionImpl implements FlipperConnection {

6
android/src/main/java/com/facebook/flipper/android/FlipperResponderImpl.java
View File

@@ -7,13 +7,13 @@
*/ */
package com.facebook.flipper.android; package com.facebook.flipper.android;
import com.facebook.jni.HybridData;
import com.facebook.proguard.annotations.DoNotStrip;
import com.facebook.soloader.SoLoader;
import com.facebook.flipper.BuildConfig; import com.facebook.flipper.BuildConfig;
import com.facebook.flipper.core.FlipperArray; import com.facebook.flipper.core.FlipperArray;
import com.facebook.flipper.core.FlipperObject; import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.core.FlipperResponder; import com.facebook.flipper.core.FlipperResponder;
import com.facebook.jni.HybridData;
import com.facebook.proguard.annotations.DoNotStrip;
import com.facebook.soloader.SoLoader;
@DoNotStrip @DoNotStrip
class FlipperResponderImpl implements FlipperResponder { class FlipperResponderImpl implements FlipperResponder {

33
android/src/main/java/com/facebook/flipper/android/diagnostics/FlipperDiagnosticActivity.java
View File

@@ -3,16 +3,15 @@ package com.facebook.flipper.android.diagnostics;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.widget.Toast; import android.view.View;
import android.widget.LinearLayout;
import android.widget.ScrollView;
import android.widget.TextView;
import com.facebook.flipper.android.AndroidFlipperClient; import com.facebook.flipper.android.AndroidFlipperClient;
import com.facebook.flipper.core.FlipperClient; import com.facebook.flipper.core.FlipperClient;
import com.facebook.flipper.core.FlipperStateUpdateListener; import com.facebook.flipper.core.FlipperStateUpdateListener;
import com.facebook.flipper.core.StateSummary; import com.facebook.flipper.core.StateSummary;
import com.facebook.flipper.core.StateSummary.StateElement; import com.facebook.flipper.core.StateSummary.StateElement;
import android.widget.LinearLayout;
import android.view.View;
import android.widget.TextView;
import android.widget.ScrollView;
public class FlipperDiagnosticActivity extends Activity implements FlipperStateUpdateListener { public class FlipperDiagnosticActivity extends Activity implements FlipperStateUpdateListener {
@@ -51,12 +50,13 @@ public class FlipperDiagnosticActivity extends Activity implements FlipperStateU
scrollView.fullScroll(View.FOCUS_DOWN); scrollView.fullScroll(View.FOCUS_DOWN);
} }
@Override @Override
public void onUpdate() { public void onUpdate() {
final String state = AndroidFlipperClient.getInstance(this).getState(); final String state = AndroidFlipperClient.getInstance(this).getState();
final String summary = getSummary(); final String summary = getSummary();
runOnUiThread(new Runnable() { runOnUiThread(
new Runnable() {
@Override @Override
public void run() { public void run() {
summaryView.setText(summary); summaryView.setText(summary);
@@ -70,13 +70,20 @@ public class FlipperDiagnosticActivity extends Activity implements FlipperStateU
final Context context = this; final Context context = this;
final StateSummary summary = AndroidFlipperClient.getInstance(context).getStateSummary(); final StateSummary summary = AndroidFlipperClient.getInstance(context).getStateSummary();
final StringBuilder stateText = new StringBuilder(); final StringBuilder stateText = new StringBuilder();
for (StateElement e: summary.mList) { for (StateElement e : summary.mList) {
final String status; final String status;
switch(e.getState()) { switch (e.getState()) {
case IN_PROGRESS: status = "⏳"; break; case IN_PROGRESS:
case SUCCESS: status = "✅"; break; status = "⏳";
case FAILED: status = "❌"; break; break;
default: status = "❓"; case SUCCESS:
status = "✅";
break;
case FAILED:
status = "❌";
break;
default:
status = "❓";
} }
stateText.append(status).append(e.getName()).append("\n"); stateText.append(status).append(e.getName()).append("\n");
} }

6
android/src/main/java/com/facebook/flipper/core/FlipperConnection.java
View File

@@ -8,9 +8,9 @@
package com.facebook.flipper.core; package com.facebook.flipper.core;
/** /**
* A connection between a FlipperPlugin and the desktop Flipper application. Register request handlers * A connection between a FlipperPlugin and the desktop Flipper application. Register request
* to respond to calls made by the desktop application or directly send messages to the desktop * handlers to respond to calls made by the desktop application or directly send messages to the
* application. * desktop application.
*/ */
public interface FlipperConnection { public interface FlipperConnection {

8
android/src/main/java/com/facebook/flipper/core/FlipperPlugin.java
View File

@@ -9,10 +9,10 @@ package com.facebook.flipper.core;
/** /**
* A FlipperPlugin is an object which exposes an API to the Desktop Flipper application. When a * A FlipperPlugin is an object which exposes an API to the Desktop Flipper application. When a
* connection is established the plugin is given a FlipperConnection on which it can register request * connection is established the plugin is given a FlipperConnection on which it can register
* handlers and send messages. When the FlipperConnection is invalid onDisconnect is called. onConnect * request handlers and send messages. When the FlipperConnection is invalid onDisconnect is called.
* may be called again on the same plugin object if Flipper re-connects, this will provide a new * onConnect may be called again on the same plugin object if Flipper re-connects, this will provide
* FlipperConnection, do not attempt to re-use the previous connection. * a new FlipperConnection, do not attempt to re-use the previous connection.
*/ */
public interface FlipperPlugin { public interface FlipperPlugin {

6
android/src/main/java/com/facebook/flipper/core/FlipperResponder.java
View File

@@ -8,9 +8,9 @@
package com.facebook.flipper.core; package com.facebook.flipper.core;
/** /**
* FlipperResponder is used to asyncronously response to a messaged recieved from the Flipper desktop * FlipperResponder is used to asyncronously response to a messaged recieved from the Flipper
* app. The Flipper Responder will automatically wrap the response in an approriate object depending * desktop app. The Flipper Responder will automatically wrap the response in an approriate object
* on if it is an error or not. * depending on if it is an error or not.
*/ */
public interface FlipperResponder { public interface FlipperResponder {

8
android/src/main/java/com/facebook/flipper/core/FlipperStateUpdateListener.java
View File

@@ -3,10 +3,10 @@ package com.facebook.flipper.core;
public interface FlipperStateUpdateListener { public interface FlipperStateUpdateListener {
/** /**
* Called when the state of the Flipper client changes. * Called when the state of the Flipper client changes. Typical implementations will subscribe by
* Typical implementations will subscribe by calling {@link com.facebook.flipper.core.FlipperClient#subscribeForUpdates()}, to start receiving update events. * calling {@link com.facebook.flipper.core.FlipperClient#subscribeForUpdates()}, to start
* Calling {@link com.facebook.flipper.core.FlipperClient#getState()} will retrieve the updated state. * receiving update events. Calling {@link com.facebook.flipper.core.FlipperClient#getState()}
* will retrieve the updated state.
*/ */
void onUpdate(); void onUpdate();
} }

2
android/src/main/java/com/facebook/flipper/core/StateElement.java
View File

@@ -3,10 +3,12 @@ package com.facebook.flipper.core;
public class StateElement { public class StateElement {
private final String mName; private final String mName;
private final String mState; private final String mState;
public StateElement(String name, String state) { public StateElement(String name, String state) {
mName = name; mName = name;
mState = state; mState = state;
} }
public String getName() { public String getName() {
return mName; return mName;
} }

10
android/src/main/java/com/facebook/flipper/core/StateSummary.java
View File

@@ -1,24 +1,30 @@
package com.facebook.flipper.core; package com.facebook.flipper.core;
import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
public class StateSummary { public class StateSummary {
public enum State { public enum State {
IN_PROGRESS, SUCCESS, FAILED, UNKNOWN; IN_PROGRESS,
SUCCESS,
FAILED,
UNKNOWN;
} }
public static class StateElement { public static class StateElement {
private final String mName; private final String mName;
private final State mState; private final State mState;
public StateElement(String name, State state) { public StateElement(String name, State state) {
mName = name; mName = name;
mState = state; mState = state;
} }
public String getName() { public String getName() {
return mName; return mName;
} }
public State getState() { public State getState() {
return mState; return mState;
} }

4
android/src/main/java/com/facebook/flipper/plugins/common/BufferingFlipperPlugin.java
View File

@@ -15,8 +15,8 @@ import javax.annotation.Nullable;
/** /**
* Flipper plugin that keeps events in a buffer until a connection is available. * Flipper plugin that keeps events in a buffer until a connection is available.
* *
* <p>In order to send data to the {@link FlipperConnection}, use {@link #send(String, FlipperObject)} * <p>In order to send data to the {@link FlipperConnection}, use {@link #send(String,
* instead of {@link FlipperConnection#send(String, FlipperObject)}. * FlipperObject)} instead of {@link FlipperConnection#send(String, FlipperObject)}.
*/ */
public abstract class BufferingFlipperPlugin implements FlipperPlugin { public abstract class BufferingFlipperPlugin implements FlipperPlugin {

3
android/src/main/java/com/facebook/flipper/plugins/console/ConsoleFlipperPlugin.java
View File

@@ -30,6 +30,5 @@ public class ConsoleFlipperPlugin implements FlipperPlugin {
ConsoleCommandReceiver.listenForCommands(connection, mJavascriptEnvironment); ConsoleCommandReceiver.listenForCommands(connection, mJavascriptEnvironment);
} }
public void onDisconnect() throws Exception { public void onDisconnect() throws Exception {}
}
} }

3
android/src/main/java/com/facebook/flipper/plugins/console/JavascriptEnvironment.java
View File

@@ -45,8 +45,7 @@ public class JavascriptEnvironment implements ScriptingEnvironment {
public void registerGlobalObject(String name, Object object) { public void registerGlobalObject(String name, Object object) {
if (mBoundVariables.containsKey(name)) { if (mBoundVariables.containsKey(name)) {
throw new IllegalStateException( throw new IllegalStateException(
String.format( String.format("Variable %s is already reserved for %s", name, mBoundVariables.get(name)));
"Variable %s is already reserved for %s", name, mBoundVariables.get(name)));
} }
mBoundVariables.put(name, object); mBoundVariables.put(name, object);
} }

4
android/src/main/java/com/facebook/flipper/plugins/console/iface/ConsoleCommandReceiver.java
View File

@@ -17,8 +17,8 @@ import org.json.JSONObject;
/** /**
* Convenience class for adding console execution to a Flipper Plugin. Calling {@link * Convenience class for adding console execution to a Flipper Plugin. Calling {@link
* ConsoleCommandReceiver#listenForCommands(FlipperConnection, ScriptingEnvironment, ContextProvider)} * ConsoleCommandReceiver#listenForCommands(FlipperConnection, ScriptingEnvironment,
* will add the necessary listeners for responding to command execution calls. * ContextProvider)} will add the necessary listeners for responding to command execution calls.
*/ */
public class ConsoleCommandReceiver { public class ConsoleCommandReceiver {

9
android/src/main/java/com/facebook/flipper/plugins/inspector/HighlightedOverlay.java
View File

@@ -12,7 +12,6 @@ import android.graphics.Rect;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Build; import android.os.Build;
import android.view.View; import android.view.View;
import android.util.Log;
/** /**
* A singleton instance of a overlay drawable used for highlighting node bounds. See {@link * A singleton instance of a overlay drawable used for highlighting node bounds. See {@link
@@ -30,7 +29,6 @@ public class HighlightedOverlay {
* @param padding A {@link Rect} containing the padding values * @param padding A {@link Rect} containing the padding values
* @param contentBounds The {@link Rect} bounds of the content, which includes padding * @param contentBounds The {@link Rect} bounds of the content, which includes padding
*/ */
public static void setHighlighted( public static void setHighlighted(
View targetView, Rect margin, Rect padding, Rect contentBounds, boolean isAlignmentMode) { View targetView, Rect margin, Rect padding, Rect contentBounds, boolean isAlignmentMode) {
if (!VIEW_OVERLAY_SUPPORT) { if (!VIEW_OVERLAY_SUPPORT) {
@@ -51,7 +49,7 @@ public class HighlightedOverlay {
targetView.getOverlay().add(overlay); targetView.getOverlay().add(overlay);
if(isAlignmentMode) { if (isAlignmentMode) {
int[] coords = new int[2]; int[] coords = new int[2];
targetView.getLocationOnScreen(coords); targetView.getLocationOnScreen(coords);
Rect lineContentBounds = Rect lineContentBounds =
@@ -61,12 +59,11 @@ public class HighlightedOverlay {
coords[0] + contentBounds.right, coords[0] + contentBounds.right,
coords[1] + contentBounds.bottom); coords[1] + contentBounds.bottom);
final Drawable lineOverlay = LinesDrawable.getInstance(density, margin, padding, lineContentBounds); final Drawable lineOverlay =
LinesDrawable.getInstance(density, margin, padding, lineContentBounds);
targetView.setLayerType(View.LAYER_TYPE_SOFTWARE, null); targetView.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
targetView.getRootView().getOverlay().add(lineOverlay); targetView.getRootView().getOverlay().add(lineOverlay);
} }
} }

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

@@ -10,11 +10,10 @@ package com.facebook.flipper.plugins.inspector;
import android.app.Application; import android.app.Application;
import android.content.Context; import android.content.Context;
import android.support.v4.view.ViewCompat;
import android.view.accessibility.AccessibilityEvent;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.accessibility.AccessibilityEvent;
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;
@@ -29,10 +28,8 @@ import com.facebook.flipper.plugins.console.iface.NullScriptingEnvironment;
import com.facebook.flipper.plugins.console.iface.ScriptingEnvironment; import com.facebook.flipper.plugins.console.iface.ScriptingEnvironment;
import com.facebook.flipper.plugins.inspector.descriptors.ApplicationDescriptor; import com.facebook.flipper.plugins.inspector.descriptors.ApplicationDescriptor;
import com.facebook.flipper.plugins.inspector.descriptors.utils.AccessibilityUtil; import com.facebook.flipper.plugins.inspector.descriptors.utils.AccessibilityUtil;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Stack;
import javax.annotation.Nullable; import javax.annotation.Nullable;
public class InspectorFlipperPlugin implements FlipperPlugin { public class InspectorFlipperPlugin implements FlipperPlugin {
@@ -145,7 +142,8 @@ public class InspectorFlipperPlugin implements FlipperPlugin {
connection.receive("getAXRoot", mGetAXRoot); connection.receive("getAXRoot", mGetAXRoot);
connection.receive("getAXNodes", mGetAXNodes); connection.receive("getAXNodes", mGetAXNodes);
connection.receive("onRequestAXFocus", mOnRequestAXFocus); connection.receive("onRequestAXFocus", mOnRequestAXFocus);
connection.receive("shouldShowLithoAccessibilitySettings", mShouldShowLithoAccessibilitySettings); connection.receive(
"shouldShowLithoAccessibilitySettings", mShouldShowLithoAccessibilitySettings);
if (mExtensionCommands != null) { if (mExtensionCommands != null) {
for (ExtensionCommand extensionCommand : mExtensionCommands) { for (ExtensionCommand extensionCommand : mExtensionCommands) {
@@ -178,7 +176,10 @@ public class InspectorFlipperPlugin implements FlipperPlugin {
@Override @Override
public void onReceiveOnMainThread(FlipperObject params, FlipperResponder responder) public void onReceiveOnMainThread(FlipperObject params, FlipperResponder responder)
throws Exception { throws Exception {
responder.success(new FlipperObject.Builder().put("showLithoAccessibilitySettings", mShowLithoAccessibilitySettings).build()); responder.success(
new FlipperObject.Builder()
.put("showLithoAccessibilitySettings", mShowLithoAccessibilitySettings)
.build());
} }
}; };
@@ -196,7 +197,8 @@ public class InspectorFlipperPlugin implements FlipperPlugin {
@Override @Override
public void onReceiveOnMainThread(FlipperObject params, FlipperResponder responder) public void onReceiveOnMainThread(FlipperObject params, FlipperResponder responder)
throws Exception { throws Exception {
// applicationWrapper is not used by accessibility, but is a common ancestor for multiple view roots // applicationWrapper is not used by accessibility, but is a common ancestor for multiple
// view roots
responder.success(getAXNode(trackObject(mApplication))); responder.success(getAXNode(trackObject(mApplication)));
} }
}; };
@@ -204,8 +206,8 @@ public class InspectorFlipperPlugin implements FlipperPlugin {
final FlipperReceiver mGetNodes = final FlipperReceiver mGetNodes =
new MainThreadFlipperReceiver(mConnection) { new MainThreadFlipperReceiver(mConnection) {
@Override @Override
public void onReceiveOnMainThread(final FlipperObject params, final FlipperResponder responder) public void onReceiveOnMainThread(
throws Exception { final FlipperObject params, final FlipperResponder responder) throws Exception {
final FlipperArray ids = params.getArray("ids"); final FlipperArray ids = params.getArray("ids");
final FlipperArray.Builder result = new FlipperArray.Builder(); final FlipperArray.Builder result = new FlipperArray.Builder();
@@ -231,8 +233,8 @@ public class InspectorFlipperPlugin implements FlipperPlugin {
final FlipperReceiver mGetAXNodes = final FlipperReceiver mGetAXNodes =
new MainThreadFlipperReceiver(mConnection) { new MainThreadFlipperReceiver(mConnection) {
@Override @Override
public void onReceiveOnMainThread(final FlipperObject params, final FlipperResponder responder) public void onReceiveOnMainThread(
throws Exception { final FlipperObject params, final FlipperResponder responder) throws Exception {
final FlipperArray ids = params.getArray("ids"); final FlipperArray ids = params.getArray("ids");
final FlipperArray.Builder result = new FlipperArray.Builder(); final FlipperArray.Builder result = new FlipperArray.Builder();
@@ -247,7 +249,8 @@ public class InspectorFlipperPlugin implements FlipperPlugin {
// sent request for non-existent node, potentially in error // sent request for non-existent node, potentially in error
if (node == null) { if (node == null) {
// some nodes may be null since we are searching through all current and previous known nodes // some nodes may be null since we are searching through all current and previous
// known nodes
if (forAccessibilityEvent) { if (forAccessibilityEvent) {
continue; continue;
} }
@@ -280,8 +283,8 @@ public class InspectorFlipperPlugin implements FlipperPlugin {
final FlipperReceiver mOnRequestAXFocus = final FlipperReceiver mOnRequestAXFocus =
new MainThreadFlipperReceiver(mConnection) { new MainThreadFlipperReceiver(mConnection) {
@Override @Override
public void onReceiveOnMainThread(final FlipperObject params, final FlipperResponder responder) public void onReceiveOnMainThread(
throws Exception { final FlipperObject params, final FlipperResponder responder) throws Exception {
final String nodeId = params.getString("id"); final String nodeId = params.getString("id");
final Object obj = mObjectTracker.get(nodeId); final Object obj = mObjectTracker.get(nodeId);
@@ -320,7 +323,7 @@ public class InspectorFlipperPlugin implements FlipperPlugin {
} }
descriptor.setValue(obj, path, value); descriptor.setValue(obj, path, value);
responder.success(ax ? getAXNode(nodeId): null); responder.success(ax ? getAXNode(nodeId) : null);
} }
}; };
@@ -378,7 +381,10 @@ public class InspectorFlipperPlugin implements FlipperPlugin {
@Override @Override
public void onReceiveOnMainThread(final FlipperObject params, FlipperResponder responder) public void onReceiveOnMainThread(final FlipperObject params, FlipperResponder responder)
throws Exception { throws Exception {
responder.success(new FlipperObject.Builder().put("isSearchActive", ApplicationDescriptor.getSearchActive()).build()); responder.success(
new FlipperObject.Builder()
.put("isSearchActive", ApplicationDescriptor.getSearchActive())
.build());
} }
}; };
@@ -390,7 +396,8 @@ public class InspectorFlipperPlugin implements FlipperPlugin {
final String query = params.getString("query"); final String query = params.getString("query");
final boolean axEnabled = params.getBoolean("axEnabled"); final boolean axEnabled = params.getBoolean("axEnabled");
final SearchResultNode matchTree = searchTree(query.toLowerCase(), mApplication, axEnabled); final SearchResultNode matchTree =
searchTree(query.toLowerCase(), mApplication, axEnabled);
final FlipperObject results = matchTree == null ? null : matchTree.toFlipperObject(); final FlipperObject results = matchTree == null ? null : matchTree.toFlipperObject();
final FlipperObject response = final FlipperObject response =
new FlipperObject.Builder().put("results", results).put("query", query).build(); new FlipperObject.Builder().put("results", results).put("query", query).build();
@@ -407,24 +414,35 @@ public class InspectorFlipperPlugin implements FlipperPlugin {
@Override @Override
public boolean onHoverEvent(MotionEvent event) { public boolean onHoverEvent(MotionEvent event) {
// if in layout inspector and talkback is running, override the first click to locate the clicked view // if in layout inspector and talkback is running, override the first click to locate the
if (mConnection != null && AccessibilityUtil.isTalkbackEnabled(getContext()) && event.getPointerCount() == 1) { // clicked view
FlipperObject params = new FlipperObject.Builder() if (mConnection != null
&& AccessibilityUtil.isTalkbackEnabled(getContext())
&& event.getPointerCount() == 1) {
FlipperObject params =
new FlipperObject.Builder()
.put("type", "usage") .put("type", "usage")
.put("eventName", "accessibility:clickToInspectTalkbackRunning").build(); .put("eventName", "accessibility:clickToInspectTalkbackRunning")
.build();
mConnection.send("track", params); mConnection.send("track", params);
final int action = event.getAction(); final int action = event.getAction();
switch (action) { switch (action) {
case MotionEvent.ACTION_HOVER_ENTER: { case MotionEvent.ACTION_HOVER_ENTER:
{
event.setAction(MotionEvent.ACTION_DOWN); event.setAction(MotionEvent.ACTION_DOWN);
} break; }
case MotionEvent.ACTION_HOVER_MOVE: { break;
case MotionEvent.ACTION_HOVER_MOVE:
{
event.setAction(MotionEvent.ACTION_MOVE); event.setAction(MotionEvent.ACTION_MOVE);
} break; }
case MotionEvent.ACTION_HOVER_EXIT: { break;
case MotionEvent.ACTION_HOVER_EXIT:
{
event.setAction(MotionEvent.ACTION_UP); event.setAction(MotionEvent.ACTION_UP);
} break; }
break;
} }
return onTouchEvent(event); return onTouchEvent(event);
} }
@@ -459,15 +477,14 @@ public class InspectorFlipperPlugin implements FlipperPlugin {
int y = touchY; int y = touchY;
Object node = mApplication; Object node = mApplication;
@Override @Override
public void finish() { public void finish() {
mConnection.send(ax ? "selectAX" : "select", new FlipperObject.Builder().put("path", path).build()); mConnection.send(
ax ? "selectAX" : "select", new FlipperObject.Builder().put("path", path).build());
} }
@Override @Override
public void continueWithOffset( public void continueWithOffset(final int childIndex, final int offsetX, final int offsetY) {
final int childIndex, final int offsetX, final int offsetY) {
final Touch touch = this; final Touch touch = this;
new ErrorReportingRunnable(mConnection) { new ErrorReportingRunnable(mConnection) {
@@ -507,7 +524,8 @@ public class InspectorFlipperPlugin implements FlipperPlugin {
descriptor.axHitTest(mApplication, createTouch(touchX, touchY, true)); descriptor.axHitTest(mApplication, createTouch(touchX, touchY, true));
} }
private void setHighlighted(final String id, final boolean highlighted, final boolean isAlignmentMode) throws Exception { private void setHighlighted(
final String id, final boolean highlighted, final boolean isAlignmentMode) throws Exception {
final Object obj = mObjectTracker.get(id); final Object obj = mObjectTracker.get(id);
if (obj == null) { if (obj == null) {
return; return;
@@ -545,7 +563,8 @@ public class InspectorFlipperPlugin implements FlipperPlugin {
if (isMatch || childTrees != null) { if (isMatch || childTrees != null) {
final String id = trackObject(obj); final String id = trackObject(obj);
FlipperObject node = getNode(id); FlipperObject node = getNode(id);
return new SearchResultNode(id, isMatch, node, childTrees, axEnabled && hasAXNode(node) ? getAXNode(id) : null); return new SearchResultNode(
id, isMatch, node, childTrees, axEnabled && hasAXNode(node) ? getAXNode(id) : null);
} }
return null; return null;
} }

4
android/src/main/java/com/facebook/flipper/plugins/inspector/InspectorValue.java
View File

@@ -15,8 +15,8 @@ public class InspectorValue<T> implements FlipperValue {
/** /**
* Descrive the type of data this value contains. This will influence how values are parsed and * Descrive the type of data this value contains. This will influence how values are parsed and
* displayed by the Flipper desktop app. For example colors will be parse as integers and displayed * displayed by the Flipper desktop app. For example colors will be parse as integers and
* using hex values and be editable using a color picker. * displayed using hex values and be editable using a color picker.
* *
* <p>Do not extends this list of types without adding support for the type in the desktop * <p>Do not extends this list of types without adding support for the type in the desktop
* Inspector. * Inspector.

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

@@ -9,15 +9,12 @@
package com.facebook.flipper.plugins.inspector; package com.facebook.flipper.plugins.inspector;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.ColorFilter; import android.graphics.ColorFilter;
import android.graphics.Paint;
import android.graphics.DashPathEffect; import android.graphics.DashPathEffect;
import android.graphics.Paint;
import android.graphics.PixelFormat; import android.graphics.PixelFormat;
import android.graphics.Rect; import android.graphics.Rect;
import android.graphics.Region;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.text.TextPaint;
import javax.annotation.Nullable; import javax.annotation.Nullable;
public class LinesDrawable extends Drawable { public class LinesDrawable extends Drawable {
@@ -67,7 +64,7 @@ public class LinesDrawable extends Drawable {
dashPaint.setColor(0xFF800000); dashPaint.setColor(0xFF800000);
dashPaint.setStyle(Paint.Style.STROKE); dashPaint.setStyle(Paint.Style.STROKE);
dashPaint.setStrokeWidth(3); dashPaint.setStrokeWidth(3);
dashPaint.setPathEffect(new DashPathEffect(new float[]{10, 10}, 0)); dashPaint.setPathEffect(new DashPathEffect(new float[] {10, 10}, 0));
canvas.drawLine(mContentBounds.right, 0, mContentBounds.right, 100000, dashPaint); canvas.drawLine(mContentBounds.right, 0, mContentBounds.right, 100000, dashPaint);
canvas.drawLine(mContentBounds.left, 0, mContentBounds.left, 100000, dashPaint); canvas.drawLine(mContentBounds.left, 0, mContentBounds.left, 100000, dashPaint);

22
android/src/main/java/com/facebook/flipper/plugins/inspector/NodeDescriptor.java
View File

@@ -44,8 +44,9 @@ public abstract class NodeDescriptor<T> {
} }
/** /**
* Invalidate a node. This tells Flipper that this node is no longer valid and its properties and/or * Invalidate a node. This tells Flipper that this node is no longer valid and its properties
* children have changed. This will trigger Flipper to re-query this node getting any new data. * and/or children have changed. This will trigger Flipper to re-query this node getting any new
* data.
*/ */
protected final void invalidate(final T node) { protected final void invalidate(final T node) {
if (mConnection != null) { if (mConnection != null) {
@@ -64,8 +65,9 @@ public abstract class NodeDescriptor<T> {
} }
/** /**
* Invalidate a node in the ax tree. This tells Flipper that this node is no longer valid and its properties and/or * Invalidate a node in the ax tree. This tells Flipper that this node is no longer valid and its
* children have changed. This will trigger Flipper to re-query this node getting any new data. * properties and/or children have changed. This will trigger Flipper to re-query this node
* getting any new data.
*/ */
protected final void invalidateAX(final T node) { protected final void invalidateAX(final T node) {
if (mConnection != null) { if (mConnection != null) {
@@ -179,22 +181,22 @@ public abstract class NodeDescriptor<T> {
/** /**
* Perform hit testing on the given ax node. Either continue the search in an ax child with {@link * Perform hit testing on the given ax node. Either continue the search in an ax child with {@link
* Touch#continueWithOffset(int, int, int, boolean)} or finish the hit testing on this ax node with {@link * Touch#continueWithOffset(int, int, int, boolean)} or finish the hit testing on this ax node
* Touch#finish()} * with {@link Touch#finish()}
*/ */
public void axHitTest(T node, Touch touch) throws Exception { public void axHitTest(T node, Touch touch) throws Exception {
touch.finish(); touch.finish();
} }
/** /**
* @return A string indicating how this element should be decorated. Check with the Flipper desktop * @return A string indicating how this element should be decorated. Check with the Flipper
* app to see what values are supported. * desktop app to see what values are supported.
*/ */
public abstract String getDecoration(T node) throws Exception; public abstract String getDecoration(T node) throws Exception;
/** /**
* @return A string indicating how this element should be decorated in the AX tree. Check with the Flipper desktop * @return A string indicating how this element should be decorated in the AX tree. Check with the
* app to see what values are supported. * Flipper desktop app to see what values are supported.
*/ */
public String getAXDecoration(T node) throws Exception { public String getAXDecoration(T node) throws Exception {
return null; return null;

9
android/src/main/java/com/facebook/flipper/plugins/inspector/SearchResultNode.java
View File

@@ -19,11 +19,14 @@ public class SearchResultNode {
private final boolean isMatch; private final boolean isMatch;
private final FlipperObject element; private final FlipperObject element;
private final FlipperObject axElement; private final FlipperObject axElement;
@Nullable @Nullable private final List<SearchResultNode> children;
private final List<SearchResultNode> children;
SearchResultNode( SearchResultNode(
String id, boolean isMatch, FlipperObject element, List<SearchResultNode> children, FlipperObject axElement) { String id,
boolean isMatch,
FlipperObject element,
List<SearchResultNode> children,
FlipperObject axElement) {
this.id = id; this.id = id;
this.isMatch = isMatch; this.isMatch = isMatch;
this.element = element; this.element = element;

3
android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ActivityDescriptor.java
View File

@@ -78,7 +78,8 @@ public class ActivityDescriptor extends NodeDescriptor<Activity> {
} }
@Override @Override
public void setHighlighted(Activity node, boolean selected, boolean isAlignmentMode) throws Exception { public void setHighlighted(Activity node, boolean selected, boolean isAlignmentMode)
throws Exception {
final NodeDescriptor descriptor = descriptorForClass(Window.class); final NodeDescriptor descriptor = descriptorForClass(Window.class);
descriptor.setHighlighted(node.getWindow(), selected, isAlignmentMode); descriptor.setHighlighted(node.getWindow(), selected, isAlignmentMode);
} }

37
android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ApplicationDescriptor.java
View File

@@ -19,7 +19,6 @@ import com.facebook.flipper.plugins.inspector.ApplicationWrapper;
import com.facebook.flipper.plugins.inspector.Named; import com.facebook.flipper.plugins.inspector.Named;
import com.facebook.flipper.plugins.inspector.NodeDescriptor; import com.facebook.flipper.plugins.inspector.NodeDescriptor;
import com.facebook.flipper.plugins.inspector.Touch; import com.facebook.flipper.plugins.inspector.Touch;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@@ -79,9 +78,11 @@ public class ApplicationDescriptor extends NodeDescriptor<ApplicationWrapper> {
if (view instanceof ViewGroup && !hasDelegateAlready) { if (view instanceof ViewGroup && !hasDelegateAlready) {
// add delegate to root to catch accessibility events so we can update focus in Flipper // add delegate to root to catch accessibility events so we can update focus in Flipper
view.setAccessibilityDelegate(new View.AccessibilityDelegate() { view.setAccessibilityDelegate(
new View.AccessibilityDelegate() {
@Override @Override
public boolean onRequestSendAccessibilityEvent(ViewGroup host, View child, AccessibilityEvent event) { public boolean onRequestSendAccessibilityEvent(
ViewGroup host, View child, AccessibilityEvent event) {
if (mConnection != null) { if (mConnection != null) {
// the touchOverlay will handle the event in this case // the touchOverlay will handle the event in this case
@@ -92,32 +93,31 @@ public class ApplicationDescriptor extends NodeDescriptor<ApplicationWrapper> {
// otherwise send the necessary focus event to the plugin // otherwise send the necessary focus event to the plugin
int eventType = event.getEventType(); int eventType = event.getEventType();
if (eventType == AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED) { if (eventType == AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED) {
mConnection.send("axFocusEvent", mConnection.send(
new FlipperObject.Builder() "axFocusEvent", new FlipperObject.Builder().put("isFocus", true).build());
.put("isFocus", true) } else if (eventType
.build()); == AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED) {
} else if (eventType == AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED) { mConnection.send(
mConnection.send("axFocusEvent", "axFocusEvent", new FlipperObject.Builder().put("isFocus", false).build());
new FlipperObject.Builder()
.put("isFocus", false)
.build());
} else if (eventType == AccessibilityEvent.TYPE_VIEW_CLICKED) { } else if (eventType == AccessibilityEvent.TYPE_VIEW_CLICKED) {
mConnection.send("axFocusEvent", mConnection.send(
"axFocusEvent",
new FlipperObject.Builder() new FlipperObject.Builder()
.put("isFocus", false) .put("isFocus", false)
.put("isClick", true) .put("isClick", true)
.build()); .build());
} }
} }
return super.onRequestSendAccessibilityEvent(host, child, event); return super.onRequestSendAccessibilityEvent(host, child, event);
} }
}); });
editedDelegates.add((ViewGroup) view); editedDelegates.add((ViewGroup) view);
} else if (hasDelegateAlready) { } else if (hasDelegateAlready) {
FlipperObject params = new FlipperObject.Builder() FlipperObject params =
new FlipperObject.Builder()
.put("type", "usage") .put("type", "usage")
.put("eventName", "accessibility:hasDelegateAlready").build(); .put("eventName", "accessibility:hasDelegateAlready")
.build();
mConnection.send("track", params); mConnection.send("track", params);
} }
} }
@@ -218,7 +218,8 @@ public class ApplicationDescriptor extends NodeDescriptor<ApplicationWrapper> {
} }
@Override @Override
public void setHighlighted(ApplicationWrapper node, boolean selected, boolean isAlignmentMode) throws Exception { public void setHighlighted(ApplicationWrapper node, boolean selected, boolean isAlignmentMode)
throws Exception {
final int childCount = getChildCount(node); final int childCount = getChildCount(node);
if (childCount > 0) { if (childCount > 0) {
final Object topChild = getChildAt(node, childCount - 1); final Object topChild = getChildAt(node, childCount - 1);
@@ -242,7 +243,7 @@ public class ApplicationDescriptor extends NodeDescriptor<ApplicationWrapper> {
} }
@Override @Override
public void hitTest(ApplicationWrapper node, Touch touch) throws Exception{ public void hitTest(ApplicationWrapper node, Touch touch) throws Exception {
runHitTest(node, touch, false); runHitTest(node, touch, false);
} }

3
android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/DialogDescriptor.java
View File

@@ -58,7 +58,8 @@ public class DialogDescriptor extends NodeDescriptor<Dialog> {
} }
@Override @Override
public void setHighlighted(Dialog node, boolean selected, boolean isAlignmentMode) throws Exception { public void setHighlighted(Dialog node, boolean selected, boolean isAlignmentMode)
throws Exception {
final NodeDescriptor descriptor = descriptorForClass(Window.class); final NodeDescriptor descriptor = descriptorForClass(Window.class);
descriptor.setHighlighted(node.getWindow(), selected, isAlignmentMode); descriptor.setHighlighted(node.getWindow(), selected, isAlignmentMode);
} }

3
android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/DialogFragmentDescriptor.java
View File

@@ -71,7 +71,8 @@ public class DialogFragmentDescriptor extends NodeDescriptor<DialogFragment> {
} }
@Override @Override
public void setHighlighted(DialogFragment node, boolean selected, boolean isAlignmentMode) throws Exception { public void setHighlighted(DialogFragment node, boolean selected, boolean isAlignmentMode)
throws Exception {
final NodeDescriptor descriptor = descriptorForClass(Dialog.class); final NodeDescriptor descriptor = descriptorForClass(Dialog.class);
if (node.getDialog() != null) { if (node.getDialog() != null) {
descriptor.setHighlighted(node.getDialog(), selected, isAlignmentMode); descriptor.setHighlighted(node.getDialog(), selected, isAlignmentMode);

3
android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/FragmentDescriptor.java
View File

@@ -94,7 +94,8 @@ public class FragmentDescriptor extends NodeDescriptor<Fragment> {
} }
@Override @Override
public void setHighlighted(Fragment node, boolean selected, boolean isAlignmentMode) throws Exception { public void setHighlighted(Fragment node, boolean selected, boolean isAlignmentMode)
throws Exception {
if (node.getView() == null) { if (node.getView() == null) {
return; return;
} }

3
android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/SupportDialogFragmentDescriptor.java
View File

@@ -71,7 +71,8 @@ public class SupportDialogFragmentDescriptor extends NodeDescriptor<DialogFragme
} }
@Override @Override
public void setHighlighted(DialogFragment node, boolean selected, boolean isAlignmentMode) throws Exception { public void setHighlighted(DialogFragment node, boolean selected, boolean isAlignmentMode)
throws Exception {
final NodeDescriptor descriptor = descriptorForClass(Dialog.class); final NodeDescriptor descriptor = descriptorForClass(Dialog.class);
if (node.getDialog() != null) { if (node.getDialog() != null) {
descriptor.setHighlighted(node.getDialog(), selected, isAlignmentMode); descriptor.setHighlighted(node.getDialog(), selected, isAlignmentMode);

3
android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/SupportFragmentDescriptor.java
View File

@@ -84,7 +84,8 @@ public class SupportFragmentDescriptor extends NodeDescriptor<Fragment> {
} }
@Override @Override
public void setHighlighted(Fragment node, boolean selected, boolean isAlignmentMode) throws Exception { public void setHighlighted(Fragment node, boolean selected, boolean isAlignmentMode)
throws Exception {
if (node.getView() == null) { if (node.getView() == null) {
return; return;
} }

3
android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/TextViewDescriptor.java
View File

@@ -138,7 +138,8 @@ public class TextViewDescriptor extends NodeDescriptor<TextView> {
} }
@Override @Override
public void setHighlighted(TextView node, boolean selected, boolean isAlignmentMode) throws Exception { public void setHighlighted(TextView node, boolean selected, boolean isAlignmentMode)
throws Exception {
final NodeDescriptor descriptor = descriptorForClass(View.class); final NodeDescriptor descriptor = descriptorForClass(View.class);
descriptor.setHighlighted(node, selected, isAlignmentMode); descriptor.setHighlighted(node, selected, isAlignmentMode);
} }

4
android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ViewDescriptor.java
View File

@@ -99,7 +99,6 @@ public class ViewDescriptor extends NodeDescriptor<View> {
} }
} }
return "NULL NODEINFO OR CLASSNAME"; return "NULL NODEINFO OR CLASSNAME";
} }
@Override @Override
@@ -195,8 +194,7 @@ public class ViewDescriptor extends NodeDescriptor<View> {
viewProps.put("foreground", fromDrawable(node.getForeground())); viewProps.put("foreground", fromDrawable(node.getForeground()));
} }
return Arrays.asList( return Arrays.asList(new Named<>("View", viewProps.build()));
new Named<>("View", viewProps.build()));
} }
@Override @Override

3
android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/ViewGroupDescriptor.java
View File

@@ -243,7 +243,8 @@ public class ViewGroupDescriptor extends NodeDescriptor<ViewGroup> {
} }
@Override @Override
public void setHighlighted(ViewGroup node, boolean selected, boolean isAlignmentMode) throws Exception { public void setHighlighted(ViewGroup node, boolean selected, boolean isAlignmentMode)
throws Exception {
final NodeDescriptor descriptor = descriptorForClass(View.class); final NodeDescriptor descriptor = descriptorForClass(View.class);
descriptor.setHighlighted(node, selected, isAlignmentMode); descriptor.setHighlighted(node, selected, isAlignmentMode);
} }

8
android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/utils/AccessibilityRoleUtil.java
View File

@@ -26,9 +26,11 @@ public class AccessibilityRoleUtil {
* *
* <p>https://github.com/google/talkback/blob/master/utils/src/main/java/Role.java * <p>https://github.com/google/talkback/blob/master/utils/src/main/java/Role.java
* *
* The roles spoken by Talkback (roleStrings) should also be kept up to date and are found here: * <p>The roles spoken by Talkback (roleStrings) should also be kept up to date and are found
* here:
* *
* <p>https://github.com/google/talkback/compositor/src/main/res/values/strings.xml * <p>https://github.com/google/talkback/compositor/src/main/res/values/strings.xml
*
* <p>https://github.com/google/talkback/compositor/src/main/res/raw/compositor.json * <p>https://github.com/google/talkback/compositor/src/main/res/raw/compositor.json
*/ */
public enum AccessibilityRole { public enum AccessibilityRole {
@@ -78,7 +80,9 @@ public class AccessibilityRoleUtil {
return mValue; return mValue;
} }
public String getRoleString() { return mRoleString; } public String getRoleString() {
return mRoleString;
}
public static AccessibilityRole fromValue(String value) { public static AccessibilityRole fromValue(String value) {
for (AccessibilityRole role : AccessibilityRole.values()) { for (AccessibilityRole role : AccessibilityRole.values()) {

129
android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/utils/AccessibilityUtil.java
View File

@@ -94,13 +94,15 @@ public final class AccessibilityUtil {
} }
/** /**
* Given a {@link Context}, determine if an accessibility touch exploration service (TalkBack) is running. * Given a {@link Context}, determine if an accessibility touch exploration service (TalkBack) is
* running.
* *
* @param context The {@link Context} used to get the {@link AccessibilityManager}. * @param context The {@link Context} used to get the {@link AccessibilityManager}.
* @return {@code true} if an accessibility touch exploration service is currently running. * @return {@code true} if an accessibility touch exploration service is currently running.
*/ */
public static boolean isTalkbackEnabled(Context context) { public static boolean isTalkbackEnabled(Context context) {
return ((AccessibilityManager) context.getSystemService(ACCESSIBILITY_SERVICE)).isTouchExplorationEnabled(); return ((AccessibilityManager) context.getSystemService(ACCESSIBILITY_SERVICE))
.isTouchExplorationEnabled();
} }
/** /**
@@ -223,15 +225,18 @@ public final class AccessibilityUtil {
} }
/** /**
* Adds the state segments of Talkback's response to a given list. This should be kept up to date as * Adds the state segments of Talkback's response to a given list. This should be kept up to date
* much as necessary. Details can be seen in the source code here : * as much as necessary. Details can be seen in the source code here :
* *
* https://github.com/google/talkback/compositor/src/main/res/raw/compositor.json * <p>https://github.com/google/talkback/compositor/src/main/res/raw/compositor.json - search for
* - search for "description_for_tree_status", "get_switch_state" * "description_for_tree_status", "get_switch_state"
* *
* https://github.com/google/talkback/compositor/src/main/res/values/strings.xml * <p>https://github.com/google/talkback/compositor/src/main/res/values/strings.xml
*/ */
private static void addStateSegments(StringBuilder talkbackSegments, AccessibilityNodeInfoCompat node, AccessibilityRoleUtil.AccessibilityRole role) { private static void addStateSegments(
StringBuilder talkbackSegments,
AccessibilityNodeInfoCompat node,
AccessibilityRoleUtil.AccessibilityRole role) {
// selected status is always prepended // selected status is always prepended
if (node.isSelected()) { if (node.isSelected()) {
talkbackSegments.append("selected" + delimiter); talkbackSegments.append("selected" + delimiter);
@@ -247,14 +252,17 @@ public final class AccessibilityUtil {
} }
String roleString = role.getRoleString(); String roleString = role.getRoleString();
if (node.isCheckable() && !roleString.equals("Switch") && if (node.isCheckable()
(!role.equals(AccessibilityRoleUtil.AccessibilityRole.CHECKED_TEXT_VIEW) || node.isChecked())) { && !roleString.equals("Switch")
&& (!role.equals(AccessibilityRoleUtil.AccessibilityRole.CHECKED_TEXT_VIEW)
|| node.isChecked())) {
talkbackSegments.append((node.isChecked() ? "checked" : "not checked") + delimiter); talkbackSegments.append((node.isChecked() ? "checked" : "not checked") + delimiter);
} }
if (roleString.equals("Switch")) { if (roleString.equals("Switch")) {
CharSequence switchState = node.getText(); CharSequence switchState = node.getText();
if (TextUtils.isEmpty(switchState) || role == AccessibilityRoleUtil.AccessibilityRole.TOGGLE_BUTTON) { if (TextUtils.isEmpty(switchState)
|| role == AccessibilityRoleUtil.AccessibilityRole.TOGGLE_BUTTON) {
talkbackSegments.append((node.isChecked() ? "checked" : "not checked") + delimiter); talkbackSegments.append((node.isChecked() ? "checked" : "not checked") + delimiter);
} else { } else {
talkbackSegments.append(switchState + delimiter); talkbackSegments.append(switchState + delimiter);
@@ -271,6 +279,7 @@ public final class AccessibilityUtil {
} }
private static final int SYSTEM_ACTION_MAX = 0x01FFFFFF; private static final int SYSTEM_ACTION_MAX = 0x01FFFFFF;
private static String getHintForCustomActions(AccessibilityNodeInfoCompat node) { private static String getHintForCustomActions(AccessibilityNodeInfoCompat node) {
StringBuilder customActions = new StringBuilder(); StringBuilder customActions = new StringBuilder();
for (AccessibilityNodeInfoCompat.AccessibilityActionCompat action : node.getActionList()) { for (AccessibilityNodeInfoCompat.AccessibilityActionCompat action : node.getActionList()) {
@@ -294,15 +303,18 @@ public final class AccessibilityUtil {
return actions.length() > 0 ? "Actions: " + actions : ""; return actions.length() > 0 ? "Actions: " + actions : "";
} }
// currently this is not used because the Talkback source logic seems erroneous resulting in get_hint_for_actions never // currently this is not used because the Talkback source logic seems erroneous resulting in
// get_hint_for_actions never
// returning any strings - see the TO DO in getTalkbackHint below once source is fixed // returning any strings - see the TO DO in getTalkbackHint below once source is fixed
private static String getHintForActions(AccessibilityNodeInfoCompat node) { private static String getHintForActions(AccessibilityNodeInfoCompat node) {
StringBuilder actions = new StringBuilder(); StringBuilder actions = new StringBuilder();
for (AccessibilityNodeInfoCompat.AccessibilityActionCompat action : node.getActionList()) { for (AccessibilityNodeInfoCompat.AccessibilityActionCompat action : node.getActionList()) {
int id = action.getId(); int id = action.getId();
CharSequence label = action.getLabel(); CharSequence label = action.getLabel();
if (id != AccessibilityNodeInfoCompat.ACTION_CLICK && id != AccessibilityNodeInfoCompat.ACTION_LONG_CLICK && if (id != AccessibilityNodeInfoCompat.ACTION_CLICK
!TextUtils.isEmpty(label) && id <= SYSTEM_ACTION_MAX) { && id != AccessibilityNodeInfoCompat.ACTION_LONG_CLICK
&& !TextUtils.isEmpty(label)
&& id <= SYSTEM_ACTION_MAX) {
actions.append(label + delimiter); actions.append(label + delimiter);
} }
} }
@@ -346,19 +358,18 @@ public final class AccessibilityUtil {
return ""; return "";
} }
/** /**
* Creates the text that Google's TalkBack screen reader will read aloud for a given {@link View}'s hint. * Creates the text that Google's TalkBack screen reader will read aloud for a given {@link
* This hint is generally ported over from Google's TalkBack screen reader, and this should be kept up to * View}'s hint. This hint is generally ported over from Google's TalkBack screen reader, and this
* date with their implementation (as much as necessary). Hints can be turned off by user, so it may not * should be kept up to date with their implementation (as much as necessary). Hints can be turned
* actually be spoken and this method assumes the selection style is double tapping (it can also be set to * off by user, so it may not actually be spoken and this method assumes the selection style is
* keyboard or single tap but the general idea for the hint is the same). Details can be seen in their * double tapping (it can also be set to keyboard or single tap but the general idea for the hint
* source code here: * is the same). Details can be seen in their source code here:
* *
* https://github.com/google/talkback/compositor/src/main/res/raw/compositor.json * <p>https://github.com/google/talkback/compositor/src/main/res/raw/compositor.json - search for
* - search for "get_hint_from_node" * "get_hint_from_node"
* *
* https://github.com/google/talkback/compositor/src/main/res/values/strings.xml * <p>https://github.com/google/talkback/compositor/src/main/res/values/strings.xml
* *
* @param view The {@link View} to evaluate for a hint. * @param view The {@link View} to evaluate for a hint.
* @return {@code String} representing the hint talkback will say when a {@link View} is focused. * @return {@code String} representing the hint talkback will say when a {@link View} is focused.
@@ -378,24 +389,31 @@ public final class AccessibilityUtil {
if (role == AccessibilityRoleUtil.AccessibilityRole.DROP_DOWN_LIST) { if (role == AccessibilityRoleUtil.AccessibilityRole.DROP_DOWN_LIST) {
return "Double tap to change"; return "Double tap to change";
} else if (role == AccessibilityRoleUtil.AccessibilityRole.PAGER) { } else if (role == AccessibilityRoleUtil.AccessibilityRole.PAGER) {
if (supportsAction(node, AccessibilityNodeInfoCompat.ACTION_SCROLL_FORWARD) || supportsAction(node, AccessibilityNodeInfoCompat.ACTION_SCROLL_BACKWARD)) { if (supportsAction(node, AccessibilityNodeInfoCompat.ACTION_SCROLL_FORWARD)
|| supportsAction(node, AccessibilityNodeInfoCompat.ACTION_SCROLL_BACKWARD)) {
return "Swipe with two fingers to switch pages"; return "Swipe with two fingers to switch pages";
} else { } else {
return "No more pages"; return "No more pages";
} }
} else if (role == AccessibilityRoleUtil.AccessibilityRole.SEEK_CONTROL && } else if (role == AccessibilityRoleUtil.AccessibilityRole.SEEK_CONTROL
(supportsAction(node, AccessibilityNodeInfoCompat.ACTION_SCROLL_FORWARD) || supportsAction(node, AccessibilityNodeInfoCompat.ACTION_SCROLL_BACKWARD))) { && (supportsAction(node, AccessibilityNodeInfoCompat.ACTION_SCROLL_FORWARD)
|| supportsAction(node, AccessibilityNodeInfoCompat.ACTION_SCROLL_BACKWARD))) {
return "Use volume keys to adjust"; return "Use volume keys to adjust";
} else { } else {
// first custom actions // first custom actions
String segmentToAdd = getHintForCustomActions(node); String segmentToAdd = getHintForCustomActions(node);
if (segmentToAdd.length() > 0) { hint.append(segmentToAdd + delimiter); } if (segmentToAdd.length() > 0) {
hint.append(segmentToAdd + delimiter);
}
// TODO: add getHintForActions(node) here if Talkback source gets fixed. // TODO: add getHintForActions(node) here if Talkback source gets fixed.
// Currently the "get_hint_for_actions" in the compositor source never adds to Talkback output // Currently the "get_hint_for_actions" in the compositor source never adds to Talkback
// because of a mismatched if condition/body. If this changes, we should also add a getHintForActions // output
// method here. Source at https://github.com/google/talkback/compositor/src/main/res/raw/compositor.json // because of a mismatched if condition/body. If this changes, we should also add a
// getHintForActions
// method here. Source at
// https://github.com/google/talkback/compositor/src/main/res/raw/compositor.json
// then normal tap (special case for EditText) // then normal tap (special case for EditText)
if (role == AccessibilityRoleUtil.AccessibilityRole.EDIT_TEXT) { if (role == AccessibilityRoleUtil.AccessibilityRole.EDIT_TEXT) {
@@ -404,12 +422,16 @@ public final class AccessibilityUtil {
} }
} else { } else {
segmentToAdd = getHintForClick(node); segmentToAdd = getHintForClick(node);
if (segmentToAdd.length() > 0) { hint.append(segmentToAdd + delimiter); } if (segmentToAdd.length() > 0) {
hint.append(segmentToAdd + delimiter);
}
} }
// then long press // then long press
segmentToAdd = getHintForLongClick(node); segmentToAdd = getHintForLongClick(node);
if (segmentToAdd.length() > 0) { hint.append(segmentToAdd + delimiter); } if (segmentToAdd.length() > 0) {
hint.append(segmentToAdd + delimiter);
}
} }
} }
node.recycle(); node.recycle();
@@ -421,11 +443,12 @@ public final class AccessibilityUtil {
* This may be any combination of the {@link View}'s {@code text}, {@code contentDescription}, and * This may be any combination of the {@link View}'s {@code text}, {@code contentDescription}, and
* the {@code text} and {@code contentDescription} of any ancestor {@link View}. * the {@code text} and {@code contentDescription} of any ancestor {@link View}.
* *
* This description is generally ported over from Google's TalkBack screen reader, and this should be kept up to * <p>This description is generally ported over from Google's TalkBack screen reader, and this
* date with their implementation (as much as necessary). Details can be seen in their source code here: * should be kept up to date with their implementation (as much as necessary). Details can be seen
* in their source code here:
* *
* https://github.com/google/talkback/compositor/src/main/res/raw/compositor.json * <p>https://github.com/google/talkback/compositor/src/main/res/raw/compositor.json - search for
* - search for "get_description_for_tree", "append_description_for_tree", "description_for_tree_nodes" * "get_description_for_tree", "append_description_for_tree", "description_for_tree_nodes"
* *
* @param view The {@link View} to evaluate. * @param view The {@link View} to evaluate.
* @return {@code String} representing what talkback will say when a {@link View} is focused. * @return {@code String} representing what talkback will say when a {@link View} is focused.
@@ -449,7 +472,8 @@ public final class AccessibilityUtil {
if (roleString == null) { if (roleString == null) {
roleString = role.getRoleString(); roleString = role.getRoleString();
} }
boolean disabled = AccessibilityEvaluationUtil.isActionableForAccessibility(node) && !node.isEnabled(); boolean disabled =
AccessibilityEvaluationUtil.isActionableForAccessibility(node) && !node.isEnabled();
// EditText's prioritize their own text content over a contentDescription so skip this // EditText's prioritize their own text content over a contentDescription so skip this
if (!TextUtils.isEmpty(contentDescription) && (!isEditText || !hasNodeText)) { if (!TextUtils.isEmpty(contentDescription) && (!isEditText || !hasNodeText)) {
@@ -461,10 +485,14 @@ public final class AccessibilityUtil {
talkbackSegments.append(contentDescription + delimiter); talkbackSegments.append(contentDescription + delimiter);
// then role // then role
if (roleString.length() > 0) { talkbackSegments.append(roleString + delimiter); } if (roleString.length() > 0) {
talkbackSegments.append(roleString + delimiter);
}
// lastly disabled is appended if applicable // lastly disabled is appended if applicable
if (disabled) { talkbackSegments.append("disabled" + delimiter); } if (disabled) {
talkbackSegments.append("disabled" + delimiter);
}
return removeFinalDelimiter(talkbackSegments); return removeFinalDelimiter(talkbackSegments);
} }
@@ -473,8 +501,12 @@ public final class AccessibilityUtil {
if (hasNodeText) { if (hasNodeText) {
// skip status checks for EditText, but description, role, and disabled are included // skip status checks for EditText, but description, role, and disabled are included
talkbackSegments.append(nodeText + delimiter); talkbackSegments.append(nodeText + delimiter);
if (roleString.length() > 0) { talkbackSegments.append(roleString + delimiter); } if (roleString.length() > 0) {
if (disabled) { talkbackSegments.append("disabled" + delimiter); } talkbackSegments.append(roleString + delimiter);
}
if (disabled) {
talkbackSegments.append("disabled" + delimiter);
}
return removeFinalDelimiter(talkbackSegments); return removeFinalDelimiter(talkbackSegments);
} }
@@ -511,9 +543,9 @@ public final class AccessibilityUtil {
} }
/** /**
* Creates a {@link FlipperObject} of useful properties of AccessibilityNodeInfo, to be shown in the * Creates a {@link FlipperObject} of useful properties of AccessibilityNodeInfo, to be shown in
* Flipper Layout Inspector accessibility extension. All properties are immutable since they are all derived from * the Flipper Layout Inspector accessibility extension. All properties are immutable since they
* various {@link View} properties. This is a more complete list than * are all derived from various {@link View} properties. This is a more complete list than
* getAccessibilityNodeInfoProperties returns. * getAccessibilityNodeInfoProperties returns.
* *
* @param view The {@link View} to derive the AccessibilityNodeInfo properties from. * @param view The {@link View} to derive the AccessibilityNodeInfo properties from.
@@ -608,8 +640,8 @@ public final class AccessibilityUtil {
} }
/** /**
* Modifies a {@link FlipperObject.Builder} to add Talkback-specific Accessibiltiy properties to be * Modifies a {@link FlipperObject.Builder} to add Talkback-specific Accessibiltiy properties to
* shown in the Flipper Layout Inspector. * be shown in the Flipper Layout Inspector.
* *
* @param props The {@link FlipperObject.Builder} to add the properties to. * @param props The {@link FlipperObject.Builder} to add the properties to.
* @param view The {@link View} to derive the properties from. * @param view The {@link View} to derive the properties from.
@@ -634,7 +666,8 @@ public final class AccessibilityUtil {
// This needs to be an empty string to be mutable. See t20470623. // This needs to be an empty string to be mutable. See t20470623.
CharSequence contentDescription = CharSequence contentDescription =
view.getContentDescription() != null ? view.getContentDescription() : ""; view.getContentDescription() != null ? view.getContentDescription() : "";
props.put("content-description", InspectorValue.mutable(contentDescription)) props
.put("content-description", InspectorValue.mutable(contentDescription))
.put("focusable", InspectorValue.mutable(view.isFocusable())) .put("focusable", InspectorValue.mutable(view.isFocusable()))
.put("selected", InspectorValue.mutable(view.isSelected())) .put("selected", InspectorValue.mutable(view.isSelected()))
.put("enabled", InspectorValue.mutable(view.isEnabled())) .put("enabled", InspectorValue.mutable(view.isEnabled()))

7
android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/utils/AndroidRootResolver.java
View File

@@ -96,7 +96,12 @@ public final class AndroidRootResolver {
viewsField.setAccessible(true); viewsField.setAccessible(true);
paramsField = clazz.getDeclaredField(WINDOW_PARAMS_FIELD); paramsField = clazz.getDeclaredField(WINDOW_PARAMS_FIELD);
paramsField.setAccessible(true); paramsField.setAccessible(true);
} catch (InvocationTargetException | IllegalAccessException | RuntimeException | NoSuchMethodException | NoSuchFieldException | ClassNotFoundException ignored) { } catch (InvocationTargetException
| IllegalAccessException
| RuntimeException
| NoSuchMethodException
| NoSuchFieldException
| ClassNotFoundException ignored) {
} }
} }
} }

1
android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/utils/ViewAccessibilityHelper.java
View File

@@ -44,5 +44,4 @@ public final class ViewAccessibilityHelper {
return nodeInfo; return nodeInfo;
} }
} }

22
android/src/main/java/com/facebook/flipper/plugins/litho/DebugComponentDescriptor.java
View File

@@ -11,6 +11,14 @@ import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.support.v4.util.Pair; import android.support.v4.util.Pair;
import android.view.View; import android.view.View;
import com.facebook.flipper.core.FlipperDynamic;
import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.plugins.inspector.HighlightedOverlay;
import com.facebook.flipper.plugins.inspector.InspectorValue;
import com.facebook.flipper.plugins.inspector.Named;
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.Component;
import com.facebook.litho.ComponentContext; import com.facebook.litho.ComponentContext;
import com.facebook.litho.DebugComponent; import com.facebook.litho.DebugComponent;
@@ -20,14 +28,6 @@ import com.facebook.litho.StateContainer;
import com.facebook.litho.annotations.Prop; import com.facebook.litho.annotations.Prop;
import com.facebook.litho.annotations.State; import com.facebook.litho.annotations.State;
import com.facebook.litho.reference.Reference; import com.facebook.litho.reference.Reference;
import com.facebook.flipper.core.FlipperDynamic;
import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.plugins.inspector.HighlightedOverlay;
import com.facebook.flipper.plugins.inspector.InspectorValue;
import com.facebook.flipper.plugins.inspector.Named;
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.yoga.YogaAlign; import com.facebook.yoga.YogaAlign;
import com.facebook.yoga.YogaDirection; import com.facebook.yoga.YogaDirection;
import com.facebook.yoga.YogaEdge; import com.facebook.yoga.YogaEdge;
@@ -63,8 +63,7 @@ public class DebugComponentDescriptor extends NodeDescriptor<DebugComponent> {
} }
@Override @Override
public void applyStateOverrides( public void applyStateOverrides(String key, StateContainer stateContainer) {
String key, StateContainer stateContainer) {
final List<Pair<String[], FlipperDynamic>> overrides = mOverrides.get(key); final List<Pair<String[], FlipperDynamic>> overrides = mOverrides.get(key);
if (overrides == null) { if (overrides == null) {
return; return;
@@ -497,7 +496,8 @@ public class DebugComponentDescriptor extends NodeDescriptor<DebugComponent> {
return descriptor.matches(query, node); return descriptor.matches(query, node);
} }
private static void applyLayoutOverride(DebugLayoutNode node, String[] path, FlipperDynamic value) { private static void applyLayoutOverride(
DebugLayoutNode node, String[] path, FlipperDynamic value) {
switch (path[0]) { switch (path[0]) {
case "background": case "background":
node.setBackgroundColor(value.asInt()); node.setBackgroundColor(value.asInt());

15
android/src/main/java/com/facebook/flipper/plugins/litho/GenerateLithoAccessibilityRenderExtensionCommand.java
View File

@@ -4,7 +4,6 @@ package com.facebook.flipper.plugins.litho;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import com.facebook.litho.LithoView;
import com.facebook.flipper.core.FlipperConnection; import com.facebook.flipper.core.FlipperConnection;
import com.facebook.flipper.core.FlipperObject; import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.core.FlipperReceiver; import com.facebook.flipper.core.FlipperReceiver;
@@ -13,10 +12,11 @@ import com.facebook.flipper.plugins.common.MainThreadFlipperReceiver;
import com.facebook.flipper.plugins.inspector.ApplicationWrapper; import com.facebook.flipper.plugins.inspector.ApplicationWrapper;
import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin; import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin;
import com.facebook.flipper.plugins.inspector.ObjectTracker; import com.facebook.flipper.plugins.inspector.ObjectTracker;
import com.facebook.litho.LithoView;
import java.util.Stack; import java.util.Stack;
public final class GenerateLithoAccessibilityRenderExtensionCommand implements InspectorFlipperPlugin.ExtensionCommand { public final class GenerateLithoAccessibilityRenderExtensionCommand
implements InspectorFlipperPlugin.ExtensionCommand {
@Override @Override
public String command() { public String command() {
@@ -27,8 +27,8 @@ public final class GenerateLithoAccessibilityRenderExtensionCommand implements I
public FlipperReceiver receiver(final ObjectTracker tracker, final FlipperConnection connection) { public FlipperReceiver receiver(final ObjectTracker tracker, final FlipperConnection connection) {
return new MainThreadFlipperReceiver(connection) { return new MainThreadFlipperReceiver(connection) {
@Override @Override
public void onReceiveOnMainThread(final FlipperObject params, final FlipperResponder responder) public void onReceiveOnMainThread(
throws Exception { final FlipperObject params, final FlipperResponder responder) throws Exception {
final String applicationId = params.getString("applicationId"); final String applicationId = params.getString("applicationId");
// check that the application is valid // check that the application is valid
@@ -56,7 +56,8 @@ public final class GenerateLithoAccessibilityRenderExtensionCommand implements I
}; };
} }
private void forceRerenderAllLithoViews(boolean forceLithoAXRender, ApplicationWrapper applicationWrapper) { private void forceRerenderAllLithoViews(
boolean forceLithoAXRender, ApplicationWrapper applicationWrapper) {
// iterate through tree and rerender all litho views // iterate through tree and rerender all litho views
Stack<ViewGroup> lithoViewSearchStack = new Stack<>(); Stack<ViewGroup> lithoViewSearchStack = new Stack<>();
@@ -70,7 +71,7 @@ public final class GenerateLithoAccessibilityRenderExtensionCommand implements I
ViewGroup v = lithoViewSearchStack.pop(); ViewGroup v = lithoViewSearchStack.pop();
if (v instanceof LithoView) { if (v instanceof LithoView) {
// TODO: uncomment once Litho open source updates // TODO: uncomment once Litho open source updates
// ((LithoView) v).rerenderForAccessibility(forceLithoAXRender); // ((LithoView) v).rerenderForAccessibility(forceLithoAXRender);
} else { } else {
for (int i = 0; i < v.getChildCount(); i++) { for (int i = 0; i < v.getChildCount(); i++) {
View child = v.getChildAt(i); View child = v.getChildAt(i);

2
android/src/main/java/com/facebook/flipper/plugins/litho/LithoFlipperDescriptors.java
View File

@@ -2,9 +2,9 @@
package com.facebook.flipper.plugins.litho; package com.facebook.flipper.plugins.litho;
import com.facebook.flipper.plugins.inspector.DescriptorMapping;
import com.facebook.litho.DebugComponent; import com.facebook.litho.DebugComponent;
import com.facebook.litho.LithoView; import com.facebook.litho.LithoView;
import com.facebook.flipper.plugins.inspector.DescriptorMapping;
public final class LithoFlipperDescriptors { public final class LithoFlipperDescriptors {

7
android/src/main/java/com/facebook/flipper/plugins/litho/LithoViewDescriptor.java
View File

@@ -4,13 +4,13 @@ package com.facebook.flipper.plugins.litho;
import android.graphics.Rect; import android.graphics.Rect;
import android.view.ViewGroup; import android.view.ViewGroup;
import com.facebook.litho.DebugComponent;
import com.facebook.litho.LithoView;
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 com.facebook.flipper.plugins.inspector.Named; import com.facebook.flipper.plugins.inspector.Named;
import com.facebook.flipper.plugins.inspector.NodeDescriptor; import com.facebook.flipper.plugins.inspector.NodeDescriptor;
import com.facebook.flipper.plugins.inspector.Touch; import com.facebook.flipper.plugins.inspector.Touch;
import com.facebook.litho.DebugComponent;
import com.facebook.litho.LithoView;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@@ -125,7 +125,8 @@ public class LithoViewDescriptor extends NodeDescriptor<LithoView> {
} }
@Override @Override
public void setHighlighted(LithoView node, boolean selected, boolean isAlignmentMode) throws Exception { public void setHighlighted(LithoView node, boolean selected, boolean isAlignmentMode)
throws Exception {
final NodeDescriptor descriptor = descriptorForClass(ViewGroup.class); final NodeDescriptor descriptor = descriptorForClass(ViewGroup.class);
descriptor.setHighlighted(node, selected, isAlignmentMode); descriptor.setHighlighted(node, selected, isAlignmentMode);
} }

1
android/src/main/java/com/facebook/flipper/plugins/network/FlipperOkhttpInterceptor.java
View File

@@ -13,7 +13,6 @@ import com.facebook.flipper.plugins.network.NetworkReporter.ResponseInfo;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Random;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
import javax.annotation.Nullable; import javax.annotation.Nullable;

18
android/src/main/java/com/facebook/flipper/plugins/sharedpreferences/SharedPreferencesFlipperPlugin.java
View File

@@ -86,16 +86,18 @@ public class SharedPreferencesFlipperPlugin implements FlipperPlugin {
* Creates a {@link android.content.SharedPreferences} plugin for Flipper * Creates a {@link android.content.SharedPreferences} plugin for Flipper
* *
* @param context The context to retrieve the preferences from. * @param context The context to retrieve the preferences from.
* @param descriptors A list of {@link SharedPreferencesDescriptor}s * @param descriptors A list of {@link SharedPreferencesDescriptor}s that describe the list of
* that describe the list of preferences to retrieve. * preferences to retrieve.
*/ */
public SharedPreferencesFlipperPlugin(Context context, List<SharedPreferencesDescriptor> descriptors) { public SharedPreferencesFlipperPlugin(
Context context, List<SharedPreferencesDescriptor> descriptors) {
if (context == null) { if (context == null) {
throw new IllegalArgumentException("Given null context"); throw new IllegalArgumentException("Given null context");
} }
mSharedPreferences = new HashMap<>(descriptors.size()); mSharedPreferences = new HashMap<>(descriptors.size());
for (SharedPreferencesDescriptor descriptor : descriptors) { for (SharedPreferencesDescriptor descriptor : descriptors) {
SharedPreferences preferences = context.getSharedPreferences(descriptor.name, descriptor.mode); SharedPreferences preferences =
context.getSharedPreferences(descriptor.name, descriptor.mode);
preferences.registerOnSharedPreferenceChangeListener(onSharedPreferenceChangeListener); preferences.registerOnSharedPreferenceChangeListener(onSharedPreferenceChangeListener);
mSharedPreferences.put(preferences, descriptor); mSharedPreferences.put(preferences, descriptor);
} }
@@ -107,12 +109,13 @@ public class SharedPreferencesFlipperPlugin implements FlipperPlugin {
} }
private SharedPreferences getSharedPreferencesFor(String name) { private SharedPreferences getSharedPreferencesFor(String name) {
for (Map.Entry<SharedPreferences, SharedPreferencesDescriptor> entry : mSharedPreferences.entrySet()) { for (Map.Entry<SharedPreferences, SharedPreferencesDescriptor> entry :
mSharedPreferences.entrySet()) {
if (entry.getValue().name.equals(name)) { if (entry.getValue().name.equals(name)) {
return entry.getKey(); return entry.getKey();
} }
} }
throw new IllegalStateException("Unknown shared preferences " +name); throw new IllegalStateException("Unknown shared preferences " + name);
} }
private FlipperObject getFlipperObjectFor(String name) { private FlipperObject getFlipperObjectFor(String name) {
@@ -139,7 +142,8 @@ public class SharedPreferencesFlipperPlugin implements FlipperPlugin {
@Override @Override
public void onReceive(FlipperObject params, FlipperResponder responder) { public void onReceive(FlipperObject params, FlipperResponder responder) {
FlipperObject.Builder builder = new FlipperObject.Builder(); FlipperObject.Builder builder = new FlipperObject.Builder();
for (Map.Entry<SharedPreferences, SharedPreferencesDescriptor> entry : mSharedPreferences.entrySet()) { for (Map.Entry<SharedPreferences, SharedPreferencesDescriptor> entry :
mSharedPreferences.entrySet()) {
builder.put(entry.getValue().name, getFlipperObjectFor(entry.getKey())); builder.put(entry.getValue().name, getFlipperObjectFor(entry.getKey()));
} }
responder.success(builder.build()); responder.success(builder.build());

2
android/src/test/java/com/facebook/flipper/plugins/console/ConsoleFlipperPluginTest.java
View File

@@ -13,10 +13,10 @@ import static org.hamcrest.MatcherAssert.assertThat;
import com.facebook.flipper.core.FlipperObject; import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.testing.FlipperConnectionMock; import com.facebook.flipper.testing.FlipperConnectionMock;
import com.facebook.flipper.testing.FlipperResponderMock; import com.facebook.flipper.testing.FlipperResponderMock;
import org.robolectric.RobolectricTestRunner;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class ConsoleFlipperPluginTest { public class ConsoleFlipperPluginTest {

2
android/src/test/java/com/facebook/flipper/plugins/console/ConsoleSonarPluginTest.java
View File

@@ -13,10 +13,10 @@ import static org.hamcrest.MatcherAssert.assertThat;
import com.facebook.flipper.core.FlipperObject; import com.facebook.flipper.core.FlipperObject;
import com.facebook.flipper.testing.FlipperConnectionMock; import com.facebook.flipper.testing.FlipperConnectionMock;
import com.facebook.flipper.testing.FlipperResponderMock; import com.facebook.flipper.testing.FlipperResponderMock;
import org.robolectric.RobolectricTestRunner;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class ConsoleSonarPluginTest { public class ConsoleSonarPluginTest {

2
android/src/test/java/com/facebook/flipper/plugins/console/JavascriptSessionTest.java
View File

@@ -9,7 +9,6 @@ package com.facebook.flipper.plugins.console;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import org.robolectric.RobolectricTestRunner;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
@@ -17,6 +16,7 @@ import org.json.JSONObject;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mozilla.javascript.ContextFactory; import org.mozilla.javascript.ContextFactory;
import org.robolectric.RobolectricTestRunner;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class JavascriptSessionTest { public class JavascriptSessionTest {

2
android/src/test/java/com/facebook/flipper/plugins/inspector/ApplicationWrapperTest.java
View File

@@ -14,13 +14,13 @@ import android.app.Activity;
import android.app.Application; import android.app.Application;
import android.app.Application.ActivityLifecycleCallbacks; import android.app.Application.ActivityLifecycleCallbacks;
import android.os.Bundle; import android.os.Bundle;
import org.robolectric.RobolectricTestRunner;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mockito; import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock; import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer; import org.mockito.stubbing.Answer;
import org.robolectric.RobolectricTestRunner;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class ApplicationWrapperTest { public class ApplicationWrapperTest {

2
android/src/test/java/com/facebook/flipper/plugins/inspector/DescriptorMappingTest.java
View File

@@ -14,10 +14,10 @@ import com.facebook.flipper.core.FlipperConnection;
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 com.facebook.flipper.testing.FlipperConnectionMock; import com.facebook.flipper.testing.FlipperConnectionMock;
import org.robolectric.RobolectricTestRunner;
import java.util.List; import java.util.List;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class DescriptorMappingTest { public class DescriptorMappingTest {

8
android/src/test/java/com/facebook/flipper/plugins/inspector/InspectorFlipperPluginTest.java
View File

@@ -26,19 +26,18 @@ import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin.TouchOverla
import com.facebook.flipper.plugins.inspector.descriptors.ApplicationDescriptor; import com.facebook.flipper.plugins.inspector.descriptors.ApplicationDescriptor;
import com.facebook.flipper.testing.FlipperConnectionMock; import com.facebook.flipper.testing.FlipperConnectionMock;
import com.facebook.flipper.testing.FlipperResponderMock; import com.facebook.flipper.testing.FlipperResponderMock;
import org.robolectric.RobolectricTestRunner;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import javax.annotation.Nullable;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mockito; import org.mockito.Mockito;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import javax.annotation.Nullable;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class InspectorFlipperPluginTest { public class InspectorFlipperPluginTest {
@@ -270,7 +269,8 @@ public class InspectorFlipperPluginTest {
hasItem( hasItem(
new FlipperObject.Builder() new FlipperObject.Builder()
.put( .put(
"path", new FlipperArray.Builder().put("com.facebook.flipper").put("test").put("3")) "path",
new FlipperArray.Builder().put("com.facebook.flipper").put("test").put("3"))
.build())); .build()));
} }

8
android/src/test/java/com/facebook/flipper/plugins/inspector/InspectorSonarPluginTest.java
View File

@@ -26,19 +26,18 @@ import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin.TouchOverla
import com.facebook.flipper.plugins.inspector.descriptors.ApplicationDescriptor; import com.facebook.flipper.plugins.inspector.descriptors.ApplicationDescriptor;
import com.facebook.flipper.testing.FlipperConnectionMock; import com.facebook.flipper.testing.FlipperConnectionMock;
import com.facebook.flipper.testing.FlipperResponderMock; import com.facebook.flipper.testing.FlipperResponderMock;
import org.robolectric.RobolectricTestRunner;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import javax.annotation.Nullable;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mockito; import org.mockito.Mockito;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import javax.annotation.Nullable;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class InspectorSonarPluginTest { public class InspectorSonarPluginTest {
@@ -270,7 +269,8 @@ public class InspectorSonarPluginTest {
hasItem( hasItem(
new FlipperObject.Builder() new FlipperObject.Builder()
.put( .put(
"path", new FlipperArray.Builder().put("com.facebook.flipper").put("test").put("3")) "path",
new FlipperArray.Builder().put("com.facebook.flipper").put("test").put("3"))
.build())); .build()));
} }

2
android/src/test/java/com/facebook/flipper/plugins/inspector/descriptors/ViewGroupDescriptorTest.java
View File

@@ -15,10 +15,10 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import com.facebook.flipper.plugins.inspector.Touch; import com.facebook.flipper.plugins.inspector.Touch;
import org.robolectric.RobolectricTestRunner;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mockito; import org.mockito.Mockito;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)