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

Expand AX tree when clicking-to-inspect

Browse Source 
Summary: Adds expanding functionality to ax tree when click-to-inspect is used. Highlight/selection priority is given to the ax tree if in ax mode and the main tree otherwise.

Reviewed By: danielbuechele

Differential Revision: D9206028

fbshipit-source-id: 364b3cfc2e68dbce6006c36002353295aa7cdd07
This commit is contained in:
Sara Valderrama
2018-08-08 08:57:31 -07:00
committed by Facebook Github Bot
parent a725a8fa68
commit 047b6ed7b7
8 changed files with 159 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
android/src/main/java/com/facebook/sonar/plugins/inspector/InspectorSonarPlugin.java
View File

@@ -427,49 +427,61 @@ public class InspectorSonarPlugin implements SonarPlugin {
}
}
void hitTest(final int touchX, final int touchY) throws Exception {
private Touch createTouch(final int touchX, final int touchY, final boolean ax) throws Exception {
final SonarArray.Builder path = new SonarArray.Builder();
path.put(trackObject(mApplication));
final Touch touch =
new Touch() {
int x = touchX;
int y = touchY;
Object node = mApplication;
return new Touch() {
int x = touchX;
int y = touchY;
Object node = mApplication;
@Override
public void finish() {
mConnection.send("select", new SonarObject.Builder().put("path", path).build());
}
@Override
public void continueWithOffset(
@Override
public void finish() {
mConnection.send(ax ? "selectAX" : "select", new SonarObject.Builder().put("path", path).build());
}
@Override
public void continueWithOffset(
final int childIndex, final int offsetX, final int offsetY) {
final Touch touch = this;
new ErrorReportingRunnable(mConnection) {
@Override
protected void runOrThrow() throws Exception {
x -= offsetX;
y -= offsetY;
node = assertNotNull(descriptorForObject(node).getChildAt(node, childIndex));
path.put(trackObject(node));
final NodeDescriptor<Object> descriptor = descriptorForObject(node);
descriptor.hitTest(node, touch);
}
}.run();
}
final Touch touch = this;
new ErrorReportingRunnable(mConnection) {
@Override
public boolean containedIn(int l, int t, int r, int b) {
return x >= l && x <= r && y >= t && y <= b;
}
};
protected void runOrThrow() throws Exception {
x -= offsetX;
y -= offsetY;
if (ax) {
node = assertNotNull(descriptorForObject(node).getAXChildAt(node, childIndex));
} else {
node = assertNotNull(descriptorForObject(node).getChildAt(node, childIndex));
}
path.put(trackObject(node));
final NodeDescriptor<Object> descriptor = descriptorForObject(node);
if (ax) {
descriptor.axHitTest(node, touch);
} else {
descriptor.hitTest(node, touch);
}
}
}.run();
}
@Override
public boolean containedIn(int l, int t, int r, int b) {
return x >= l && x <= r && y >= t && y <= b;
}
};
}
void hitTest(final int touchX, final int touchY) throws Exception {
final NodeDescriptor<Object> descriptor = descriptorForObject(mApplication);
descriptor.hitTest(mApplication, touch);
descriptor.hitTest(mApplication, createTouch(touchX, touchY, false));
descriptor.axHitTest(mApplication, createTouch(touchX, touchY, true));
}
private void setHighlighted(final String id, final boolean highlighted, final boolean isAlignmentMode) throws Exception {

9
android/src/main/java/com/facebook/sonar/plugins/inspector/NodeDescriptor.java
View File

@@ -177,6 +177,15 @@ public abstract class NodeDescriptor<T> {
*/
public abstract void hitTest(T node, Touch touch) throws Exception;
/**
* 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#finish()}
*/
public void axHitTest(T node, Touch touch) throws Exception {
touch.finish();
}
/**
* @return A string indicating how this element should be decorated. Check with the Sonar desktop
* app to see what values are supported.

15
android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/ApplicationDescriptor.java
View File

@@ -210,12 +210,11 @@ public class ApplicationDescriptor extends NodeDescriptor<ApplicationWrapper> {
}
}
@Override
public void hitTest(ApplicationWrapper node, Touch touch) {
private void runHitTest(ApplicationWrapper node, Touch touch, boolean ax) throws Exception {
final int childCount = getChildCount(node);
for (int i = childCount - 1; i >= 0; i--) {
final Object child = getChildAt(node, i);
final Object child = ax ? getAXChildAt(node, i) : getChildAt(node, i);
if (child instanceof Activity || child instanceof ViewGroup) {
touch.continueWithOffset(i, 0, 0);
return;
@@ -225,6 +224,16 @@ public class ApplicationDescriptor extends NodeDescriptor<ApplicationWrapper> {
touch.finish();
}
@Override
public void hitTest(ApplicationWrapper node, Touch touch) throws Exception{
runHitTest(node, touch, false);
}
@Override
public void axHitTest(ApplicationWrapper node, Touch touch) throws Exception {
runHitTest(node, touch, true);
}
@Override
public @Nullable String getDecoration(ApplicationWrapper obj) {
return null;

6
android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/TextViewDescriptor.java
View File

@@ -149,6 +149,12 @@ public class TextViewDescriptor extends NodeDescriptor<TextView> {
descriptor.hitTest(node, touch);
}
@Override
public void axHitTest(TextView node, Touch touch) throws Exception {
final NodeDescriptor descriptor = descriptorForClass(View.class);
descriptor.axHitTest(node, touch);
}
@Override
public @Nullable String getDecoration(TextView node) throws Exception {
final NodeDescriptor descriptor = descriptorForClass(View.class);

5
android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/ViewDescriptor.java
View File

@@ -534,6 +534,11 @@ public class ViewDescriptor extends NodeDescriptor<View> {
touch.finish();
}
@Override
public void axHitTest(View node, Touch touch) {
touch.finish();
}
@Override
public @Nullable String getDecoration(View obj) {
return null;

17
android/src/main/java/com/facebook/sonar/plugins/inspector/descriptors/ViewGroupDescriptor.java
View File

@@ -248,13 +248,12 @@ public class ViewGroupDescriptor extends NodeDescriptor<ViewGroup> {
descriptor.setHighlighted(node, selected, isAlignmentMode);
}
@Override
public void hitTest(ViewGroup node, Touch touch) {
private void runHitTest(ViewGroup node, Touch touch) {
for (int i = node.getChildCount() - 1; i >= 0; i--) {
final View child = node.getChildAt(i);
if (child instanceof HiddenNode
|| child.getVisibility() != View.VISIBLE
|| shouldSkip(child)) {
|| child.getVisibility() != View.VISIBLE
|| shouldSkip(child)) {
continue;
}
@@ -277,6 +276,16 @@ public class ViewGroupDescriptor extends NodeDescriptor<ViewGroup> {
touch.finish();
}
@Override
public void hitTest(ViewGroup node, Touch touch) {
runHitTest(node, touch);
}
@Override
public void axHitTest(ViewGroup node, Touch touch) {
runHitTest(node, touch);
}
private static boolean shouldSkip(View view) {
Object tag = view.getTag(R.id.sonar_skip_view_traversal);
if (!(tag instanceof Boolean)) {

6
android/src/main/java/com/facebook/sonar/plugins/litho/LithoViewDescriptor.java
View File

@@ -135,6 +135,12 @@ public class LithoViewDescriptor extends NodeDescriptor<LithoView> {
touch.continueWithOffset(0, 0, 0);
}
@Override
public void axHitTest(LithoView node, Touch touch) throws Exception {
final NodeDescriptor descriptor = descriptorForClass(ViewGroup.class);
descriptor.axHitTest(node, touch);
}
@Override
public String getDecoration(LithoView node) throws Exception {
final NodeDescriptor descriptor = descriptorForClass(ViewGroup.class);