Skip to content

Commit

Permalink
fix(res): set empty parent for styles without a parent, remove duplic…
Browse files Browse the repository at this point in the history
…ated code
  • Loading branch information
nitram84 committed Apr 7, 2023
1 parent 63c1b09 commit 378c747
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions jadx-core/src/main/java/jadx/core/xmlgen/ResXmlGen.java
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,10 @@ private void addValue(ICodeWriter cw, ResourceEntry ri) {
addSimpleValue(cw, ri.getTypeName(), ri.getTypeName(), "name", ri.getKeyName(), valueStr);
} else {
cw.startLine();
cw.add('<').add(ri.getTypeName()).add(' ');
cw.add('<').add(ri.getTypeName()).add(" name=\"");
String itemTag = "item";
if (ri.getTypeName().equals("attr") && !ri.getNamedValues().isEmpty()) {
cw.add("name=\"").add(ri.getKeyName());
cw.add(ri.getKeyName());
int type = ri.getNamedValues().get(0).getRawValue().getData();
if ((type & ValuesParser.ATTR_TYPE_ENUM) != 0) {
itemTag = "enum";
Expand All @@ -125,13 +125,14 @@ private void addValue(ICodeWriter cw, ResourceEntry ri) {
}
cw.add("\"");
} else {
cw.add("name=\"").add(ri.getKeyName()).add('\"');
cw.add(ri.getKeyName()).add('\"');
}
cw.add(" parent=\"");
if (ri.getParentRef() != 0) {
String parent = vp.decodeValue(TYPE_REFERENCE, ri.getParentRef());
cw.add(" parent=\"").add(parent).add('\"');
cw.add(parent);
}
cw.add(">");
cw.add("\">");

cw.incIndent();
for (RawNamedValue value : ri.getNamedValues()) {
Expand Down

0 comments on commit 378c747

Please sign in to comment.