Fix: Correct order of resource config flags for qualifiers

REAndroid · May 1, 2024 · 3c31e3e · 3c31e3e
1 parent 635c275
commit 3c31e3e
Showing 1 changed file with 19 additions and 17 deletions.
diff --git a/src/main/java/com/reandroid/arsc/value/ResConfig.java b/src/main/java/com/reandroid/arsc/value/ResConfig.java
@@ -1230,35 +1230,37 @@ public String build(){
 
             appendLanguageAndRegion();
 
-            appendFlag(resConfig.getOrientation());
-            appendFlag(resConfig.getTouchscreen());
-            appendFlag(resConfig.getDensity());
-            appendFlag(resConfig.getKeyboard());
-            appendFlag(resConfig.getNavigation());
-            appendFlag(resConfig.getInputFlagsKeysHidden());
-            appendFlag(resConfig.getInputFlagsNavHidden());
             appendFlag(resConfig.getGender());
 
-            appendScreenWidthHeight();
-
-            appendPrefixedNumber("v", resConfig.getSdkVersion());
-            // append resConfig.getMinorVersion()
-            appendFlag(resConfig.getScreenLayoutSize());
-            appendFlag(resConfig.getScreenLayoutLong());
             appendFlag(resConfig.getScreenLayoutDir());
-
-            appendFlag(resConfig.getUiModeType());
-            appendFlag(resConfig.getUiModeNight());
-
             appendDp("sw", resConfig.getSmallestScreenWidthDp());
             appendDp("w", resConfig.getScreenWidthDp());
             appendDp("h", resConfig.getScreenHeightDp());
 
+            appendFlag(resConfig.getScreenLayoutSize());
+            appendFlag(resConfig.getScreenLayoutLong());
             appendFlag(resConfig.getScreenLayoutRound());
 
             appendFlag(resConfig.getColorModeWide());
             appendFlag(resConfig.getColorModeHdr());
 
+            appendFlag(resConfig.getOrientation());
+            appendFlag(resConfig.getUiModeType());
+            appendFlag(resConfig.getUiModeNight());
+
+            appendFlag(resConfig.getDensity());
+
+            appendFlag(resConfig.getTouchscreen());
+            appendFlag(resConfig.getInputFlagsKeysHidden());
+            appendFlag(resConfig.getKeyboard());
+            appendFlag(resConfig.getInputFlagsNavHidden());
+            appendFlag(resConfig.getNavigation());
+
+            appendScreenWidthHeight();
+
+            // append resConfig.getMinorVersion()
+            appendPrefixedNumber("v", resConfig.getSdkVersion());
+
             //appendLocaleNumberingSystem();
             appendUnknownBytes();