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

Revert D19987003: Add theme information for Application, Activity and View descriptors

Browse Source 
Differential Revision:
D19987003

Original commit changeset: c9b51311d287

fbshipit-source-id: c4536cfbb5e2a4fd198b5039067d89b2b8b5b92b
This commit is contained in:
Pascal Hartig
2020-02-20 05:13:48 -08:00
committed by Facebook Github Bot
parent ea1c21c8c3
commit 35eeebffd0
4 changed files with 3 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,6 @@ import com.facebook.flipper.core.FlipperObject;
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.utils.ContextDescriptorUtils;
import com.facebook.flipper.plugins.inspector.descriptors.utils.stethocopies.FragmentActivityAccessor;
import com.facebook.flipper.plugins.inspector.descriptors.utils.stethocopies.FragmentCompat;
import com.facebook.flipper.plugins.inspector.descriptors.utils.stethocopies.FragmentManagerAccessor;
@@ -66,7 +65,7 @@ public class ActivityDescriptor extends NodeDescriptor<Activity> {
@Override
public List<Named<FlipperObject>> getData(Activity node) {
return Collections.singletonList(new Named<>("Theme", ContextDescriptorUtils.themeData(node)));
return Collections.EMPTY_LIST;
}
@Override

4
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.NodeDescriptor;
import com.facebook.flipper.plugins.inspector.Touch;
import com.facebook.flipper.plugins.inspector.descriptors.utils.ContextDescriptorUtils;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -205,8 +204,7 @@ public class ApplicationDescriptor extends NodeDescriptor<ApplicationWrapper> {
@Override
public List<Named<FlipperObject>> getData(ApplicationWrapper node) {
return Collections.singletonList(
new Named<>("Theme", ContextDescriptorUtils.themeData(node.getApplication())));
return Collections.EMPTY_LIST;
}
@Override

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

@@ -38,7 +38,6 @@ import com.facebook.flipper.plugins.inspector.Touch;
import com.facebook.flipper.plugins.inspector.descriptors.utils.AccessibilityEvaluationUtil;
import com.facebook.flipper.plugins.inspector.descriptors.utils.AccessibilityRoleUtil;
import com.facebook.flipper.plugins.inspector.descriptors.utils.AccessibilityUtil;
import com.facebook.flipper.plugins.inspector.descriptors.utils.ContextDescriptorUtils;
import com.facebook.flipper.plugins.inspector.descriptors.utils.EnumMapping;
import com.facebook.flipper.plugins.inspector.descriptors.utils.stethocopies.ResourcesUtil;
import java.lang.reflect.Field;
@@ -191,9 +190,7 @@ public class ViewDescriptor extends NodeDescriptor<View> {
viewProps.put("foreground", fromDrawable(node.getForeground()));
}
return Arrays.asList(
new Named<>("View", viewProps.build()),
new Named<>("Theme", ContextDescriptorUtils.themeData(node.getContext())));
return Arrays.asList(new Named<>("View", viewProps.build()));
}
@Override

121
android/src/main/java/com/facebook/flipper/plugins/inspector/descriptors/utils/ContextDescriptorUtils.java
View File

@@ -1,121 +0,0 @@
/*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
package com.facebook.flipper.plugins.inspector.descriptors.utils;
import android.content.Context;
import android.content.res.AssetManager;
import android.content.res.Resources;
import android.util.Log;
import android.util.TypedValue;
import com.facebook.flipper.core.FlipperObject;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;
public final class ContextDescriptorUtils {
private static String TAG = "ContextDescriptor";
private static Field sThemeImplField;
private static Field sThemeImplThemeKeyField;
private static Field sThemeImplAssetManagerField;
private static Field sThemeKeyResIdField;
private static Method sAssetManagerGetStyleAttributesMethod;
private ContextDescriptorUtils() {}
public static FlipperObject themeData(Context context) {
FlipperObject.Builder themeData = new FlipperObject.Builder();
Map<String, FlipperObject.Builder> builders = collectThemeValues(context);
for (Map.Entry<String, FlipperObject.Builder> entry : builders.entrySet()) {
themeData.put(entry.getKey(), entry.getValue().build());
}
return themeData.build();
}
private static Map<String, FlipperObject.Builder> collectThemeValues(Context context) {
Map<String, FlipperObject.Builder> builderMap = new HashMap<>(3);
try {
Resources.Theme theme = context.getTheme();
AssetManager assetManager = context.getAssets();
final Object themeImpl;
final Object themeKey;
// Nasty reflection to get a list of theme attributes that apply to this context.
if (sThemeImplField == null
|| sThemeImplThemeKeyField == null
|| sThemeKeyResIdField == null
|| sThemeImplAssetManagerField == null) {
sThemeImplField = theme.getClass().getDeclaredField("mThemeImpl");
sThemeImplField.setAccessible(true);
themeImpl = sThemeImplField.get(theme);
sThemeImplThemeKeyField = themeImpl.getClass().getDeclaredField("mKey");
sThemeImplThemeKeyField.setAccessible(true);
sThemeImplAssetManagerField = themeImpl.getClass().getDeclaredField("mAssets");
sThemeImplAssetManagerField.setAccessible(true);
sAssetManagerGetStyleAttributesMethod =
assetManager.getClass().getDeclaredMethod("getStyleAttributes", int.class);
sAssetManagerGetStyleAttributesMethod.setAccessible(true);
themeKey = sThemeImplThemeKeyField.get(themeImpl);
sThemeKeyResIdField = themeKey.getClass().getDeclaredField("mResId");
sThemeKeyResIdField.setAccessible(true);
} else {
themeImpl = sThemeImplField.get(theme);
themeKey = sThemeImplThemeKeyField.get(themeImpl);
}
int[] appliedThemeResIds = (int[]) sThemeKeyResIdField.get(themeKey);
TypedValue typedValue = new TypedValue();
Resources resources = context.getResources();
for (int themeId : appliedThemeResIds) {
String name = resources.getResourceName(themeId);
// The res id array can have duplicates
if (builderMap.containsKey(name)) {
continue;
}
FlipperObject.Builder builder = new FlipperObject.Builder();
builderMap.put(name, builder);
int[] attributes =
(int[]) sAssetManagerGetStyleAttributesMethod.invoke(assetManager, themeId);
for (int attribute : attributes) {
if (!theme.resolveAttribute(attribute, typedValue, true)) {
continue;
}
String attributeName = context.getResources().getResourceName(attribute);
String[] nameParts = attributeName.split(":");
if (nameParts.length < 2) {
Log.d(TAG, "Unknown attribute name format " + attributeName);
} else {
attributeName = nameParts[1].split("/")[1];
}
String strValue = TypedValue.coerceToString(typedValue.type, typedValue.data);
if (strValue == null) {
strValue = "null";
} else if (strValue.startsWith("@")) {
int resId = Integer.parseInt(strValue.substring(1));
if (resId == 0) {
strValue = "null";
} else {
strValue = context.getResources().getResourceName(resId);
}
}
builder.put(attributeName, strValue);
}
}
} catch (Throwable ignored) {
Log.d(TAG, "Failed to generate theme attribute data!", ignored);
}
return builderMap;
}
}