ReVanced-Mirror/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2024-07-30 02:23:42 +02:00
Code Issues Projects Releases Wiki Activity

fixed problem with <items> showing up in colors.xml

Browse Source
This commit is contained in:
Connor Tumbleson 2013-05-12 07:20:35 -05:00
parent ac745599ed
commit aa20036307
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResScalarValue.java
View File

@ -70,11 +70,13 @@ public abstract class ResScalarValue extends ResValue implements
String body = encodeAsResXmlValue(); String body = encodeAsResXmlValue();
// check for resource reference // check for resource reference
if (body.contains("@")) { if (!type.equalsIgnoreCase("color")) {
if (!res.getFilePath().contains("string")) { if (body.contains("@")) {
item = true; if (!res.getFilePath().contains("string")) {
} item = true;
} }
}
}
// check for using attrib as node or item // check for using attrib as node or item
String tagName = item ? "item" : type; String tagName = item ? "item" : type;

3
brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc001/colors.xml
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="test_color1">#ff123456</color> <color name="test_color1">#ff123456</color>
<item type="color" name="test_color2">@*android:color/white</item> <color name="test_color2">@*android:color/white</color>
<color name="test_color3">#00000000</color>
</resources> </resources>