fix(res): add indents for namespace declarations (PR #2114)

Co-authored-by: bagipro <bugi@bugi>
skylot · Mar 1, 2024 · 2fdd496 · 2fdd496
1 parent 278e3c2
commit 2fdd496
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/jadx-core/src/main/java/jadx/core/xmlgen/BinaryXMLParser.java b/jadx-core/src/main/java/jadx/core/xmlgen/BinaryXMLParser.java
@@ -303,7 +303,7 @@ private void parseAttribute(int i, boolean newLine, Set<String> attrCache) throw
 
 		String shortNsName = null;
 		if (attributeNS != -1) {
-			shortNsName = getAttributeNS(attributeNS);
+			shortNsName = getAttributeNS(attributeNS, newLine);
 		}
 		String attrName = getValidTagAttributeName(getAttributeName(attributeName));
 		String attrFullName = shortNsName != null ? shortNsName + ":" + attrName : attrName;
@@ -340,7 +340,7 @@ private void parseAttribute(int i, boolean newLine, Set<String> attrCache) throw
 		writer.add('"');
 	}
 
-	private String getAttributeNS(int attributeNS) {
+	private String getAttributeNS(int attributeNS, boolean newLine) {
 		String attrUrl = getString(attributeNS);
 		if (attrUrl == null || attrUrl.isEmpty()) {
 			if (isResInternalId(attributeNS)) {
@@ -351,12 +351,12 @@ private String getAttributeNS(int attributeNS) {
 		}
 		String attrName = nsMap.get(attrUrl);
 		if (attrName == null) {
-			attrName = generateNameForNS(attrUrl);
+			attrName = generateNameForNS(attrUrl, newLine);
 		}
 		return attrName;
 	}
 
-	private String generateNameForNS(String attrUrl) {
+	private String generateNameForNS(String attrUrl, boolean newLine) {
 		String attrName;
 		if (ANDROID_NS_URL.equals(attrUrl)) {
 			attrName = ANDROID_NS_VALUE;
@@ -372,6 +372,11 @@ private String generateNameForNS(String attrUrl) {
 				}
 			}
 		}
+		if (newLine) {
+			writer.startLine().addIndent();
+		} else {
+			writer.add(' ');
+		}
 		writer.add("xmlns:").add(attrName).add("=\"").add(attrUrl).add("\" ");
 		return attrName;
 	}