From 81d18f48e841a0c359b921607eb281f1e7a10ca2 Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor.tumbleson@gmail.com>
Date: Mon, 23 May 2022 06:51:08 -0400
Subject: [PATCH 1/2] style: reorg getAttributes (StyledString)

---
 .../main/java/brut/androlib/res/decoder/StyledString.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/StyledString.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/StyledString.java
index 7c0016278c..540ca0ba9c 100644
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/StyledString.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/StyledString.java
@@ -82,9 +82,10 @@ public String getName() {
         public Map<String, String> getAttributes() {
             int separatorIdx = tag.indexOf(';');
             return separatorIdx == -1 ? null : ATTRIBUTES_SPLITTER.split(
-                    tag.substring(separatorIdx + 1, tag.endsWith(";") ? tag.length() - 1 : tag.length()));
+                tag.substring(separatorIdx + 1, tag.endsWith(";") ? tag.length() - 1 : tag.length())
+            );
         }
-    
+
         @Override
         public int compareTo(Span o) {
             int res = Integer.compare(firstChar, o.firstChar);

From a0ac16bbc4e4e0f1b66acb30a87cf81dbbf78b5a Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor.tumbleson@gmail.com>
Date: Mon, 23 May 2022 06:51:21 -0400
Subject: [PATCH 2/2] test: assertion for aapt2 string (#2815)

---
 .../src/test/resources/aapt2/testapp/res/values/strings.xml      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/brut.apktool/apktool-lib/src/test/resources/aapt2/testapp/res/values/strings.xml b/brut.apktool/apktool-lib/src/test/resources/aapt2/testapp/res/values/strings.xml
index 8a121e7ea6..00e47e58c4 100644
--- a/brut.apktool/apktool-lib/src/test/resources/aapt2/testapp/res/values/strings.xml
+++ b/brut.apktool/apktool-lib/src/test/resources/aapt2/testapp/res/values/strings.xml
@@ -4,4 +4,5 @@
     <string name="long_string_32767" />
     <string name="surrogate_issue_2299">🔆</string>
     <string name="html_string_issue_2632"><ul> <li><b>aaaaa aa aaaaa</b> – aaaaaaa aaaaaaaaaa aa aaaaaaaa aaaaaa aaaaa (aaaa) aaaa aaaaaaaaa aaaaa aa aaaaaaaaa aaaaaaa aaaa</li> <li><b>aaaaaaaaa aaaaaaaaaaaaaaa aaaaaaaa</b> – aaaaaaa aaaaaaaaaa aaaaaaaaa aaaa aaaaaa aa aaaa aaaa aaaa aaaa aaaaaaa aaaaaaaaaaaaa, aaaaaa aaa aaaaaaaaaa (aaa) aaaaaaaaaaaaaaa</li> <li><b>aaaaaaaaaaa aaaaaa aaaaaaaaaa</b> – aaaaaaaaaa aaaa aaaaaa aa a aaa aa aaaaaa aaa aaaaaaa (aaaaa aaaaaaaa) aaaaaaaa aa aaaaaa aaaaa aaa aaaa</li> </ul></string>
+    <string name="styled_string_issue_2815">Quickly zoom in on the screen to display content more clearly.<br/><br/> <b>To zoom in:</b><br/> 1. Use shortcut to start magnification<br/> 2. Tap the screen<br/> 3. Drag 2 fingers to move around screen<br/> 4. Pinch with 2 fingers to adjust zoom<br/> 5. Use shortcut to stop magnification<br/><br/> <b>To zoom in temporarily:</b><br/> 1. Use shortcut to start magnification<br/> 2. Touch &amp; hold anywhere on the screen<br/> 3. Drag finger to move around screen<br/> 4. Lift finger to stop magnification</string>
 </resources>