better hex conversion

src/main/java/com/reandroid/apk/PathSanitizer.java

@@ -16,6 +16,7 @@
 package com.reandroid.apk;
 
 import com.reandroid.archive.InputSource;
+import com.reandroid.arsc.util.HexUtil;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -148,7 +149,7 @@ public class PathSanitizer {
     }
     private static String createUniqueName(String name){
         int hash = name.hashCode();
-        return String.format("alias_%08x", hash).toLowerCase();
+        return "alias_" + HexUtil.toHexNoPrefix8(hash);
     }
     private static boolean isGoodSimpleName(String name){
         if(name==null){

src/main/java/com/reandroid/apk/ResourceIds.java

@@ -1,4 +1,4 @@
- /*
+/*
   *  Copyright (C) 2022 github.com/REAndroid
   *
   *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,6 +19,7 @@ import com.reandroid.arsc.chunk.PackageBlock;
 import com.reandroid.arsc.chunk.TableBlock;
 import com.reandroid.arsc.group.EntryGroup;
 import com.reandroid.arsc.pool.SpecStringPool;
+import com.reandroid.arsc.util.HexUtil;
 import com.reandroid.arsc.util.ResNameMap;
 import com.reandroid.json.JSONArray;
 import com.reandroid.json.JSONObject;
@@ -379,7 +380,7 @@ import java.util.*;
                 type.add(entry);
             }
             public String getHexId(){
-                return String.format("0x%02x", id);
+                return HexUtil.toHex2(id);
             }
             public JSONObject toJson(){
                 JSONObject jsonObject=new JSONObject();
@@ -575,7 +576,7 @@ import java.util.*;
                     return entryMap.get(entryId);
                 }
                 public String getHexId(){
-                    return String.format("0x%02x", id);
+                    return HexUtil.toHex2(id);
                 }
                 public void add(Entry entry){
                     if(entry==null){
@@ -733,7 +734,7 @@ import java.util.*;
                                 | (getEntryId() & 0xffff);
                     }
                     public String getHexId(){
-                        return String.format("0x%08x", getResourceId());
+                        return HexUtil.toHex8(getResourceId());
                     }
 
                     public void writeXml(String indent, Writer writer) throws IOException{

src/main/java/com/reandroid/apk/TableBlockJson.java

@@ -21,6 +21,7 @@ import com.reandroid.arsc.chunk.StagedAlias;
 import com.reandroid.arsc.chunk.TableBlock;
 import com.reandroid.arsc.chunk.TypeBlock;
 import com.reandroid.arsc.container.SpecTypePair;
+import com.reandroid.arsc.util.HexUtil;
 import com.reandroid.json.JSONObject;
 
 import java.io.File;
@@ -73,7 +74,7 @@ public class TableBlockJson {
     private String getFileName(TypeBlock typeBlock){
         StringBuilder builder=new StringBuilder();
         builder.append(String.format("%03d-", typeBlock.getIndex()));
-        builder.append(String.format("0x%02x", typeBlock.getTypeId()));
+        builder.append(HexUtil.toHex2(typeBlock.getTypeId()));
         String name= typeBlock.getTypeName();
         builder.append('-').append(name);
         builder.append(typeBlock.getResConfig().getQualifiers());
@@ -81,7 +82,7 @@ public class TableBlockJson {
     }
     private String getDirName(PackageBlock packageBlock){
         StringBuilder builder=new StringBuilder();
-        builder.append(String.format("0x%02x", packageBlock.getId()));
+        builder.append(HexUtil.toHex2((byte) packageBlock.getId()));
         builder.append("-");
         builder.append(packageBlock.getIndex());
         String name= ApkUtil.sanitizeForFileName(packageBlock.getName());

src/main/java/com/reandroid/apk/xmldecoder/BagDecoderAttr.java

@@ -16,6 +16,7 @@
 package com.reandroid.apk.xmldecoder;
 
 import com.reandroid.apk.XmlHelper;
+import com.reandroid.arsc.util.HexUtil;
 import com.reandroid.arsc.value.Entry;
 import com.reandroid.arsc.value.ResTableMapEntry;
 import com.reandroid.arsc.value.ValueType;
@@ -58,7 +59,7 @@ class BagDecoderAttr<OUTPUT> extends BagDecoder<OUTPUT>{
             int rawVal = item.getData();
             String value;
             if(item.getBagItem().getValueType() == ValueType.INT_HEX){
-                value = String.format("0x%08x", rawVal);
+                value = HexUtil.toHex8(rawVal);
             }else {
                 value = String.valueOf(rawVal);
             }

src/main/java/com/reandroid/apk/xmlencoder/EncodeMaterials.java

@@ -1,4 +1,4 @@
- /*
+/*
  *  Copyright (C) 2022 github.com/REAndroid
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,28 +13,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- package com.reandroid.apk.xmlencoder;
+package com.reandroid.apk.xmlencoder;
 
- import com.reandroid.apk.APKLogger;
+import com.reandroid.apk.APKLogger;
- import com.reandroid.apk.FrameworkApk;
+import com.reandroid.apk.FrameworkApk;
- import com.reandroid.apk.ResourceIds;
+import com.reandroid.apk.ResourceIds;
- import com.reandroid.arsc.chunk.PackageBlock;
+import com.reandroid.arsc.chunk.PackageBlock;
- import com.reandroid.arsc.chunk.TableBlock;
+import com.reandroid.arsc.chunk.TableBlock;
- import com.reandroid.arsc.chunk.TypeBlock;
+import com.reandroid.arsc.chunk.TypeBlock;
- import com.reandroid.arsc.container.SpecTypePair;
+import com.reandroid.arsc.container.SpecTypePair;
- import com.reandroid.arsc.decoder.ValueDecoder;
+import com.reandroid.arsc.decoder.ValueDecoder;
- import com.reandroid.arsc.group.EntryGroup;
+import com.reandroid.arsc.group.EntryGroup;
- import com.reandroid.arsc.item.SpecString;
+import com.reandroid.arsc.item.SpecString;
- import com.reandroid.arsc.util.FrameworkTable;
+import com.reandroid.arsc.util.FrameworkTable;
- import com.reandroid.arsc.util.ResNameMap;
+import com.reandroid.arsc.util.HexUtil;
- import com.reandroid.arsc.value.Entry;
+import com.reandroid.arsc.util.ResNameMap;
- import com.reandroid.common.Frameworks;
+import com.reandroid.arsc.value.Entry;
+import com.reandroid.common.Frameworks;
 
- import java.util.HashSet;
+import java.util.HashSet;
- import java.util.Set;
+import java.util.Set;
- import java.util.regex.Matcher;
+import java.util.regex.Matcher;
 
- public class EncodeMaterials {
+public class EncodeMaterials {
     private final Set<ResourceIds.Table.Package> packageIdSet = new HashSet<>();
     private PackageBlock currentPackage;
     private final Set<FrameworkTable> frameworkTables = new HashSet<>();
@@ -136,7 +137,7 @@
             return entry.getResourceId();
         }
         throw new EncodeException("Framework entry not found: " +
-                 "packageId="+String.format("0x%02x", packageId)+
+                "packageId=" + HexUtil.toHex2((byte) packageId)+
                 ", type="+type+
                 ", name="+name);
     }
@@ -356,4 +357,4 @@
         return encodeMaterials;
     }
 
- }
+}

src/main/java/com/reandroid/archive2/ArchiveEntry.java

@@ -17,6 +17,7 @@ package com.reandroid.archive2;
 
 import com.reandroid.archive2.block.CentralEntryHeader;
 import com.reandroid.archive2.block.LocalFileHeader;
+import com.reandroid.arsc.util.HexUtil;
 
 import java.util.zip.ZipEntry;
 
@@ -116,6 +117,7 @@ public class ArchiveEntry extends ZipEntry {
 
     @Override
     public String toString(){
-        return "["+ getFileOffset()+"] "+getName()+getComment()+String.format(" 0x%08x", getCrc());
+        return "["+ getFileOffset()+"] " + getName() + getComment()
+                + HexUtil.toHex(" 0x", getCrc(), 8);
     }
 }

src/main/java/com/reandroid/archive2/block/CentralEntryHeader.java

@@ -16,6 +16,7 @@
 package com.reandroid.archive2.block;
 
 import com.reandroid.archive2.ZipSignature;
+import com.reandroid.arsc.util.HexUtil;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -134,12 +135,12 @@ public class CentralEntryHeader extends CommonHeader {
             builder.append(", ");
         }
         builder.append("SIG=").append(getSignature());
-        builder.append(", versionMadeBy=").append(String.format("0x%04x", getVersionMadeBy()));
+        builder.append(", versionMadeBy=").append(HexUtil.toHex4((short) getVersionMadeBy()));
-        builder.append(", versionExtract=").append(String.format("0x%04x", getVersionExtract()));
+        builder.append(", versionExtract=").append(HexUtil.toHex4((short) getVersionExtract()));
         builder.append(", GP={").append(getGeneralPurposeFlag()).append("}");
         builder.append(", method=").append(getMethod());
         builder.append(", date=").append(getDate());
-        builder.append(", crc=").append(String.format("0x%08x", getCrc()));
+        builder.append(", crc=").append(HexUtil.toHex8(getCrc()));
         builder.append(", cSize=").append(getCompressedSize());
         builder.append(", size=").append(getSize());
         builder.append(", fileNameLength=").append(getFileNameLength());

src/main/java/com/reandroid/archive2/block/CommonHeader.java

@@ -16,6 +16,7 @@
 package com.reandroid.archive2.block;
 
 import com.reandroid.archive2.ZipSignature;
+import com.reandroid.arsc.util.HexUtil;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -287,12 +288,12 @@ public abstract class CommonHeader extends ZipHeader {
             builder.append(", ");
         }
         builder.append("SIG=").append(getSignature());
-        builder.append(", versionMadeBy=").append(String.format("0x%04x", getVersionMadeBy()));
+        builder.append(", versionMadeBy=").append(HexUtil.toHex4((short) getVersionMadeBy()));
-        builder.append(", platform=").append(String.format("0x%02x", getPlatform()));
+        builder.append(", platform=").append(HexUtil.toHex2((byte) getPlatform()));
         builder.append(", GP={").append(getGeneralPurposeFlag()).append("}");
         builder.append(", method=").append(getMethod());
         builder.append(", date=").append(getDate());
-        builder.append(", crc=").append(String.format("0x%08x", getCrc()));
+        builder.append(", crc=").append(HexUtil.toHex8(getCrc()));
         builder.append(", cSize=").append(getCompressedSize());
         builder.append(", size=").append(getSize());
         builder.append(", fileNameLength=").append(getFileNameLength());

src/main/java/com/reandroid/archive2/block/DataDescriptor.java

@@ -16,6 +16,7 @@
 package com.reandroid.archive2.block;
 
 import com.reandroid.archive2.ZipSignature;
+import com.reandroid.arsc.util.HexUtil;
 
 public class DataDescriptor extends ZipHeader{
     public DataDescriptor() {
@@ -44,7 +45,7 @@ public class DataDescriptor extends ZipHeader{
     public String toString(){
         StringBuilder builder = new StringBuilder();
         builder.append(getSignature());
-        builder.append(", crc=").append(String.format("0x%08x", getCrc()));
+        builder.append(", crc=").append(HexUtil.toHex8(getCrc()));
         builder.append(", compressed=").append(getCompressedSize());
         builder.append(", size=").append(getSize());
         return builder.toString();

src/main/java/com/reandroid/archive2/block/EndRecord.java

@@ -16,6 +16,7 @@
 package com.reandroid.archive2.block;
 
 import com.reandroid.archive2.ZipSignature;
+import com.reandroid.arsc.util.HexUtil;
 
 public class EndRecord extends ZipHeader{
     public EndRecord() {
@@ -78,7 +79,7 @@ public class EndRecord extends ZipHeader{
         builder.append(", total dirs=").append(getTotalNumberOfDirectories());
         builder.append(", length=").append(getLengthOfCentralDirectory());
         builder.append(", offset=").append(getOffsetOfCentralDirectory());
-        builder.append(", last=").append(String.format("0x%08x", getLastShort()));
+        builder.append(", last=").append(HexUtil.toHex8(getLastShort()));
         return builder.toString();
     }
 

src/main/java/com/reandroid/archive2/block/SignatureId.java

@@ -16,6 +16,7 @@
 package com.reandroid.archive2.block;
 
 import com.reandroid.arsc.decoder.ValueDecoder;
+import com.reandroid.arsc.util.HexUtil;
 
 import java.util.Objects;
 
@@ -39,7 +40,7 @@ public class SignatureId implements Comparable<SignatureId>{
         if (this.name != null) {
             return name + FILE_EXT_RAW;
         }
-        return String.format("0x%08x", id) + FILE_EXT_RAW;
+        return HexUtil.toHex8(id) + FILE_EXT_RAW;
     }
     @Override
     public boolean equals(Object obj) {
@@ -66,7 +67,7 @@ public class SignatureId implements Comparable<SignatureId>{
         if (name != null) {
             return name;
         }
-        return "UNKNOWN(" + String.format("0x%08x", id) + ")";
+        return "UNKNOWN(" + HexUtil.toHex8(id) + ")";
     }
     public static SignatureId valueOf(String name) {
         if (name == null) {

src/main/java/com/reandroid/archive2/io/CountingInputStream.java

@@ -15,6 +15,8 @@
  */
 package com.reandroid.archive2.io;
 
+import com.reandroid.arsc.util.HexUtil;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.zip.CRC32;
@@ -124,6 +126,6 @@ public class CountingInputStream<T extends InputStream> extends InputStream {
         if(!mFinished || crc==null){
             return "[" + size + "]: " + inputStream.getClass().getSimpleName();
         }
-        return "[size=" + size +", crc=" + String.format("0x%08x", mCheckSum) + "]: " + inputStream.getClass().getSimpleName();
+        return "[size=" + size +", crc=" + HexUtil.toHex8(mCheckSum) + "]: " + inputStream.getClass().getSimpleName();
     }
 }

src/main/java/com/reandroid/arsc/chunk/ChunkType.java

@@ -1,4 +1,4 @@
- /*
+/*
  *  Copyright (C) 2022 github.com/REAndroid
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,6 +15,8 @@
  */
 package com.reandroid.arsc.chunk;
 
+import com.reandroid.arsc.util.HexUtil;
+
 public enum ChunkType {
     NULL((short)0x0000),
 
@@ -45,7 +47,7 @@ public enum ChunkType {
 
     @Override
     public String toString(){
-        return name()+String.format("(0x%04x)", ((int) ID));
+        return name() + "(" + HexUtil.toHex4(ID) + ")";
     }
 
     public static ChunkType get(short id){

src/main/java/com/reandroid/arsc/chunk/PackageBlock.java

@@ -29,6 +29,7 @@ import com.reandroid.arsc.list.StagedAliasList;
 import com.reandroid.arsc.pool.SpecStringPool;
 import com.reandroid.arsc.pool.TableStringPool;
 import com.reandroid.arsc.pool.TypeStringPool;
+import com.reandroid.arsc.util.HexUtil;
 import com.reandroid.arsc.value.Entry;
 import com.reandroid.arsc.value.LibraryInfo;
 import com.reandroid.arsc.value.ResConfig;
@@ -466,7 +467,7 @@ public class PackageBlock extends Chunk<PackageHeader>
         StringBuilder builder=new StringBuilder();
         builder.append(super.toString());
         builder.append(", id=");
-        builder.append(String.format("0x%02x", getId()));
+        builder.append(HexUtil.toHex2((byte) getId()));
         builder.append(", name=");
         builder.append(getName());
         int libCount=getLibraryBlock().getLibraryCount();

src/main/java/com/reandroid/arsc/chunk/SpecBlock.java

@@ -1,4 +1,4 @@
- /*
+/*
  *  Copyright (C) 2022 github.com/REAndroid
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,18 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- package com.reandroid.arsc.chunk;
+package com.reandroid.arsc.chunk;
 
- import com.reandroid.arsc.array.TypeBlockArray;
+import com.reandroid.arsc.array.TypeBlockArray;
- import com.reandroid.arsc.container.SpecTypePair;
+import com.reandroid.arsc.container.SpecTypePair;
- import com.reandroid.arsc.header.SpecHeader;
+import com.reandroid.arsc.header.SpecHeader;
- import com.reandroid.arsc.item.*;
+import com.reandroid.arsc.item.*;
- import com.reandroid.json.JSONConvert;
+import com.reandroid.arsc.util.HexUtil;
- import com.reandroid.json.JSONObject;
+import com.reandroid.json.JSONConvert;
+import com.reandroid.json.JSONObject;
 
- import java.util.List;
+import java.util.List;
 
- public class SpecBlock extends Chunk<SpecHeader> implements JSONConvert<JSONObject> {
+public class SpecBlock extends Chunk<SpecHeader> implements JSONConvert<JSONObject> {
     private final SpecFlagsArray specFlagsArray;
     public SpecBlock() {
         super(new SpecHeader(), 1);
@@ -150,7 +151,7 @@
                 if(appendOnce){
                     builder.append('|');
                 }
-                 builder.append(String.format("0x%02x", flagValueInt));
+                builder.append(HexUtil.toHex2((byte) flagValueInt));
             }
             return builder.toString();
         }
@@ -159,4 +160,4 @@
     public static final String NAME_spec = "spec";
     public static final String NAME_spec_flags = "spec_flags";
     public static final String NAME_flag = "flag";
- }
+}

src/main/java/com/reandroid/arsc/chunk/xml/ResXmlAttribute.java

@@ -21,6 +21,7 @@ import com.reandroid.arsc.io.BlockReader;
 import com.reandroid.arsc.item.*;
 import com.reandroid.arsc.pool.ResXmlStringPool;
 import com.reandroid.arsc.pool.StringPool;
+import com.reandroid.arsc.util.HexUtil;
 import com.reandroid.arsc.value.AttributeValue;
 import com.reandroid.arsc.value.ValueItem;
 import com.reandroid.arsc.value.ValueType;
@@ -419,10 +420,10 @@ public class ResXmlAttribute extends ValueItem implements AttributeValue, Compar
             if(group==null){
                 //Lets ignore such error until XML encoder implemented
                 //throw new XMLException("Failed to decode attribute name: "
-                //+ String.format("@0x%08x", resourceId));
+                //HexUtil.toHex8("@0x", resourceId));
-                name=String.format("@0x%08x", resourceId);
+                name = HexUtil.toHex8("@0x", resourceId);
             }else {
-                name=group.getSpecName();
+                name = group.getSpecName();
             }
         }
         String prefix = getNamePrefix();
@@ -445,7 +446,7 @@ public class ResXmlAttribute extends ValueItem implements AttributeValue, Compar
         if(fullName!=null ){
             int id=getNameResourceID();
             if(id!=0){
-                fullName=fullName+"(@"+String.format("0x%08x",id)+")";
+                fullName=fullName+"(@"+ HexUtil.toHex8(id)+")";
             }
             String valStr;
             ValueType valueType=getValueType();
@@ -456,7 +457,7 @@ public class ResXmlAttribute extends ValueItem implements AttributeValue, Compar
             }else if (valueType==ValueType.INT_DEC){
                 valStr = String.valueOf(getData());
             }else {
-                valStr = "["+valueType+"] " + String.format("0x%08x",getData());
+                valStr = "["+valueType+"] " + HexUtil.toHex8(getData());
             }
             if(valStr!=null){
                 return fullName+"=\""+valStr+"\"";

src/main/java/com/reandroid/arsc/container/SpecTypePair.java

@@ -27,6 +27,7 @@ import com.reandroid.arsc.io.BlockReader;
 import com.reandroid.arsc.item.TypeString;
 import com.reandroid.arsc.pool.SpecStringPool;
 import com.reandroid.arsc.pool.TableStringPool;
+import com.reandroid.arsc.util.HexUtil;
 import com.reandroid.arsc.value.Entry;
 import com.reandroid.arsc.value.ResConfig;
 import com.reandroid.json.JSONConvert;
@@ -338,7 +339,7 @@ public class SpecTypePair extends BlockContainer<Block>
     @Override
     public String toString(){
         StringBuilder builder=new StringBuilder();
-        builder.append(String.format("0x%02x", getTypeId()));
+        builder.append(HexUtil.toHex2(getTypeId()));
         builder.append(" (");
         TypeString ts = getTypeString();
         if(ts!=null){

src/main/java/com/reandroid/arsc/decoder/ColorUtil.java

@@ -15,6 +15,7 @@
  */
 package com.reandroid.arsc.decoder;
 
+import com.reandroid.arsc.util.HexUtil;
 import com.reandroid.arsc.value.ValueType;
 
 import java.util.regex.Matcher;
@@ -43,7 +44,7 @@ public class ColorUtil {
             default:
                 return null;
         }
-        String hex = String.format("%08x", data);
+        String hex = HexUtil.toHexNoPrefix8(data);
         return "#" + hex.substring(index);
     }
     public static ValueDecoder.EncodeResult encode(String hexColor){

src/main/java/com/reandroid/arsc/decoder/Decoder.java

@@ -1,4 +1,4 @@
- /*
+/*
  *  Copyright (C) 2022 github.com/REAndroid
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,6 +25,7 @@ import com.reandroid.arsc.chunk.xml.AndroidManifestBlock;
 import com.reandroid.arsc.chunk.xml.ResXmlDocument;
 import com.reandroid.arsc.group.EntryGroup;
 import com.reandroid.arsc.util.FrameworkTable;
+import com.reandroid.arsc.util.HexUtil;
 import com.reandroid.arsc.value.AttributeValue;
 import com.reandroid.arsc.value.Value;
 import com.reandroid.arsc.value.ValueType;
@@ -57,7 +58,7 @@ public class Decoder {
         return null;
     }
     private String hexResourceName(int resourceId){
-        return String.format("@0x%08x", resourceId);
+        return HexUtil.toHex8("@0x", resourceId);
     }
     public String decodeValue(Value value){
         if(value==null){

src/main/java/com/reandroid/arsc/decoder/ValueDecoder.java

@@ -20,6 +20,7 @@ import com.reandroid.arsc.chunk.TableBlock;
 import com.reandroid.arsc.group.EntryGroup;
 import com.reandroid.arsc.item.TableString;
 import com.reandroid.arsc.pool.TableStringPool;
+import com.reandroid.arsc.util.HexUtil;
 import com.reandroid.arsc.value.*;
 import com.reandroid.arsc.value.attribute.AttributeBag;
 import com.reandroid.common.EntryStore;
@@ -265,11 +266,11 @@ public class ValueDecoder {
     public static String decodeAttributeName(EntryStore store, PackageBlock currentPackage, int resourceId){
         EntryGroup entryGroup=searchEntryGroup(store, currentPackage, resourceId);
         if(entryGroup==null){
-            return String.format("@0x%08x", resourceId);
+            return HexUtil.toHex8("@0x", resourceId);
         }
-        Entry entry =entryGroup.pickOne();
+        Entry entry = entryGroup.pickOne();
-        if(entry ==null){
+        if(entry == null){
-            return String.format("@0x%08x", resourceId);
+            return HexUtil.toHex8("@0x", resourceId);
         }
         String prefix=null;
         if(currentPackage!=null){
@@ -705,7 +706,7 @@ public class ValueDecoder {
     }
 
     private static String decodeHex(int rawVal){
-        return String.format("0x%x", rawVal);
+        return HexUtil.toHex(rawVal, 1);
     }
     private static String decodeInt(int rawVal){
         return String.valueOf(rawVal);
@@ -786,7 +787,7 @@ public class ValueDecoder {
         return entry1;
     }
     private static String toHexResourceId(int resourceId){
-        return String.format("0x%08x", resourceId);
+        return HexUtil.toHex8(resourceId);
     }
     private static boolean isEqualString(String str1, String str2){
         if(isEmpty(str1)){
@@ -810,7 +811,7 @@ public class ValueDecoder {
         }
         @Override
         public String toString(){
-            return valueType+": "+String.format("0x%08x", value);
+            return valueType+": "+HexUtil.toHex8(value);
         }
     }
 

src/main/java/com/reandroid/arsc/header/HeaderBlock.java

@@ -1,4 +1,4 @@
- /*
+/*
  *  Copyright (C) 2022 github.com/REAndroid
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,11 +27,12 @@ import com.reandroid.arsc.item.ByteArray;
 import com.reandroid.arsc.item.IntegerItem;
 import com.reandroid.arsc.item.ShortItem;
 import com.reandroid.arsc.util.HexBytesWriter;
+import com.reandroid.arsc.util.HexUtil;
 
 import java.io.*;
 import java.util.List;
 
- public class HeaderBlock extends ExpandableBlockContainer implements BlockLoad {
+public class HeaderBlock extends ExpandableBlockContainer implements BlockLoad {
     private final ShortItem mType;
     private final ShortItem mHeaderSize;
     private final IntegerItem mChunkSize;
@@ -218,7 +219,7 @@ import java.util.List;
             builder.append(type.toString());
         }else {
             builder.append("Unknown type=");
-            builder.append(String.format("0x%02x", (0xffff & t)));
+            builder.append(HexUtil.toHex4(t));
         }
         builder.append("{ValueHeader=");
         builder.append(getHeaderSize());

src/main/java/com/reandroid/arsc/item/ByteItem.java

@@ -1,4 +1,4 @@
- /*
+/*
   *  Copyright (C) 2022 github.com/REAndroid
   *
   *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,9 @@
 package com.reandroid.arsc.item;
 
 
-public class ByteItem extends BlockItem {
+ import com.reandroid.arsc.util.HexUtil;
+
+ public class ByteItem extends BlockItem {
     public ByteItem() {
         super(1);
     }
@@ -47,7 +49,7 @@ public class ByteItem extends BlockItem {
         return 0xff & get();
     }
     public String toHex(){
-        return String.format("0x%02x", unsignedInt());
+        return HexUtil.toHex2(get());
     }
     @Override
     public String toString(){

src/main/java/com/reandroid/arsc/item/IntegerItem.java

@@ -1,4 +1,4 @@
- /*
+/*
  *  Copyright (C) 2022 github.com/REAndroid
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,13 +15,13 @@
  */
 package com.reandroid.arsc.item;
 
+import com.reandroid.arsc.io.BlockReader;
+import com.reandroid.arsc.util.HexUtil;
 
- import com.reandroid.arsc.io.BlockReader;
+import java.io.IOException;
+import java.io.InputStream;
 
- import java.io.IOException;
+public class IntegerItem extends BlockItem implements ReferenceItem{
- import java.io.InputStream;
-
- public class IntegerItem extends BlockItem implements ReferenceItem{
     private int mCache;
     public IntegerItem(){
         super(4);
@@ -50,7 +50,7 @@ package com.reandroid.arsc.item;
         return get() & 0x00000000ffffffffL;
     }
     public String toHex(){
-        return String.format("0x%08x", get());
+        return HexUtil.toHex8(get());
     }
     @Override
     protected void onBytesChanged() {

src/main/java/com/reandroid/arsc/item/LongItem.java

@@ -1,4 +1,4 @@
- /*
+/*
  *  Copyright (C) 2022 github.com/REAndroid
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,6 +15,8 @@
  */
 package com.reandroid.arsc.item;
 
+import com.reandroid.arsc.util.HexUtil;
+
 public class LongItem extends BlockItem{
     private long mCache;
     public LongItem() {
@@ -31,7 +33,7 @@ public class LongItem extends BlockItem{
         return mCache;
     }
     public String toHex(){
-        return String.format("0x%016x", get());
+        return HexUtil.toHex(get(), 16);
     }
 
     @Override

src/main/java/com/reandroid/arsc/item/ResXmlID.java

@@ -1,4 +1,4 @@
- /*
+/*
  *  Copyright (C) 2022 github.com/REAndroid
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +17,7 @@ package com.reandroid.arsc.item;
 
 import com.reandroid.arsc.chunk.xml.ResXmlDocument;
 import com.reandroid.arsc.pool.ResXmlStringPool;
+import com.reandroid.arsc.util.HexUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -90,7 +91,7 @@ public class ResXmlID extends IntegerItem {
             builder.append(getIndex());
         }
         builder.append(':');
-        builder.append(String.format("0x%08x", get()));
+        builder.append(HexUtil.toHex8(get()));
         builder.append('}');
         return builder.toString();
     }

src/main/java/com/reandroid/arsc/item/ShortItem.java

@@ -1,4 +1,4 @@
- /*
+/*
  *  Copyright (C) 2022 github.com/REAndroid
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,12 +15,13 @@
  */
 package com.reandroid.arsc.item;
 
- import com.reandroid.arsc.io.BlockReader;
+import com.reandroid.arsc.io.BlockReader;
+import com.reandroid.arsc.util.HexUtil;
 
- import java.io.IOException;
+import java.io.IOException;
- import java.io.InputStream;
+import java.io.InputStream;
 
- public class ShortItem extends BlockItem {
+public class ShortItem extends BlockItem {
     private short mCache;
 
     public ShortItem(){
@@ -46,7 +47,7 @@ package com.reandroid.arsc.item;
         return 0xffff & get();
     }
     public String toHex(){
-        return String.format("0x%04x", unsignedInt());
+        return HexUtil.toHex4(get());
     }
     @Override
     protected void onBytesChanged() {

src/main/java/com/reandroid/arsc/item/SpecFlag.java

@@ -1,4 +1,4 @@
- /*
+/*
  *  Copyright (C) 2022 github.com/REAndroid
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,6 +16,7 @@
 package com.reandroid.arsc.item;
 
 import com.reandroid.arsc.chunk.SpecBlock;
+import com.reandroid.arsc.util.HexUtil;
 
 public class SpecFlag extends IndirectItem<SpecFlagsArray> {
     public SpecFlag(SpecFlagsArray specFlagsArray, int offset) {
@@ -58,7 +59,7 @@ public class SpecFlag extends IndirectItem<SpecFlagsArray> {
         }
         int val = getInteger();
         if(val != 0){
-            return String.format("0x%08x", val);
+            return HexUtil.toHex8(val);
         }
         return "";
     }

src/main/java/com/reandroid/arsc/item/TypeString.java

@@ -17,6 +17,7 @@ package com.reandroid.arsc.item;
 
 
 import com.reandroid.arsc.pool.TypeStringPool;
+import com.reandroid.arsc.util.HexUtil;
 
 public class TypeString extends StringItem {
     public TypeString(boolean utf8) {
@@ -40,6 +41,6 @@ public class TypeString extends StringItem {
     }
     @Override
     public String toString(){
-        return String.format("0x%02x", getId())+':'+get();
+        return HexUtil.toHex2((byte) getId())+':'+get();
     }
 }

src/main/java/com/reandroid/arsc/util/HexBytesWriter.java

@@ -106,7 +106,7 @@ public class HexBytesWriter {
         }
     }
     private void writeHex(Writer writer, byte b) throws IOException {
-        String hex = String.format("%02x", (0xff & b)).toUpperCase();
+        String hex = HexUtil.toHex(null, (0xff & b), 2).toUpperCase();
         writer.write(hex);
     }
     private void writeString(Writer writer, int width, int position) throws IOException {

src/main/java/com/reandroid/arsc/util/HexUtil.java

@@ -0,0 +1,84 @@
+/*
+  *  Copyright (C) 2022 github.com/REAndroid
+  *
+  *  Licensed under the Apache License, Version 2.0 (the "License");
+  *  you may not use this file except in compliance with the License.
+  *  You may obtain a copy of the License at
+  *
+  *      http://www.apache.org/licenses/LICENSE-2.0
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  */
+package com.reandroid.arsc.util;
+
+public class HexUtil {
+    public static String toHex2(byte num){
+        return toHex((long)(num & 0x00000000000000ffL), 2);
+    }
+    public static String toHex4(short num){
+        return toHex((long)(num & 0x000000000000ffffL), 4);
+    }
+    public static String toHex8(int num){
+        return toHex(num, 8);
+    }
+    public static String toHex8(long num){
+        return toHex(num, 8);
+    }
+    public static String toHex(int num, int minLength){
+        return toHex((0x00000000ffffffffL & num), minLength);
+    }
+    public static String toHex(long num, int minLength){
+        String hex = Long.toHexString(num);
+        StringBuilder builder = new StringBuilder();
+        builder.append('0');
+        builder.append('x');
+        int rem = minLength - hex.length();
+        for(int i=0; i < rem; i++){
+            builder.append('0');
+        }
+        builder.append(hex);
+        return builder.toString();
+    }
+    public static String toHexNoPrefix8(int num){
+        return toHex(null, (0x00000000ffffffffL & num), 8);
+    }
+    public static String toHexNoPrefix(int num, int minLength){
+        return toHex(null, (0x00000000ffffffffL & num), minLength);
+    }
+    public static String toHex8(String prefix, int num){
+        return toHex(prefix, (0x00000000ffffffffL & num), 8);
+    }
+    public static String toHex(String prefix, int num, int minLength){
+        return toHex(prefix, (0x00000000ffffffffL & num), minLength);
+    }
+    public static String toHex(String prefix, long num, int minLength){
+        String hex = Long.toHexString(num);
+        StringBuilder builder = new StringBuilder();
+        if(prefix != null){
+            builder.append(prefix);
+        }
+        int rem = minLength - hex.length();
+        for(int i=0; i < rem; i++){
+            builder.append('0');
+        }
+        builder.append(hex);
+        return builder.toString();
+    }
+    public static int parseHex(String hexString){
+        hexString = trim0x(hexString);
+        return (int) Long.parseLong(hexString, 16);
+    }
+    private static String trim0x(String hexString){
+        if(hexString == null || hexString.length() < 3){
+            return hexString;
+        }
+        if(hexString.charAt(0) == '0' && hexString.charAt(1) == 'x'){
+            hexString = hexString.substring(2);
+        }
+        return hexString;
+    }
+}

src/main/java/com/reandroid/arsc/value/Entry.java

@@ -29,6 +29,7 @@ import com.reandroid.arsc.io.BlockReader;
 import com.reandroid.arsc.item.*;
 import com.reandroid.arsc.pool.SpecStringPool;
 import com.reandroid.arsc.pool.TableStringPool;
+import com.reandroid.arsc.util.HexUtil;
 import com.reandroid.json.JSONConvert;
 import com.reandroid.json.JSONObject;
 
@@ -429,7 +430,7 @@ public class Entry extends Block implements JSONConvert<JSONObject> {
     @Override
     public String toString(){
         StringBuilder builder = new StringBuilder();
-        builder.append(String.format("0x%08x", getResourceId()));
+        builder.append(HexUtil.toHex8(getResourceId()));
         builder.append(' ');
         ResConfig resConfig = getResConfig();
         if(resConfig!=null){

src/main/java/com/reandroid/arsc/value/EntryHeaderMap.java

@@ -1,4 +1,4 @@
- /*
+/*
  *  Copyright (C) 2022 github.com/REAndroid
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,6 +15,7 @@
  */
 package com.reandroid.arsc.value;
 
+import com.reandroid.arsc.util.HexUtil;
 import com.reandroid.json.JSONObject;
 
 public class EntryHeaderMap extends ValueHeader {
@@ -92,7 +93,7 @@ public class EntryHeaderMap extends ValueHeader {
         int parentId = getParentId();
         if(parentId!=0){
             builder.append(", parentId=");
-            builder.append(String.format("0x%08x", getParentId()));
+            builder.append(HexUtil.toHex8(getParentId()));
         }
         builder.append(", count=").append(getValuesCount());
         return builder.toString();

src/main/java/com/reandroid/arsc/value/LibraryInfo.java

@@ -1,4 +1,4 @@
- /*
+/*
  *  Copyright (C) 2022 github.com/REAndroid
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,6 +20,7 @@ import com.reandroid.arsc.base.BlockCounter;
 import com.reandroid.arsc.io.BlockReader;
 import com.reandroid.arsc.item.FixedLengthString;
 import com.reandroid.arsc.item.IntegerItem;
+import com.reandroid.arsc.util.HexUtil;
 import com.reandroid.json.JSONConvert;
 import com.reandroid.json.JSONObject;
 
@@ -117,7 +118,7 @@ public class LibraryInfo extends Block implements JSONConvert<JSONObject> {
     public String toString(){
         StringBuilder builder=new StringBuilder();
         builder.append("LIBRARY{");
-        builder.append(String.format("0x%02x", getPackageId()));
+        builder.append(HexUtil.toHex2((byte) getPackageId()));
         builder.append(':');
         String name=getPackageName();
         if(name==null){

src/main/java/com/reandroid/arsc/value/ResValueMap.java

@@ -1,4 +1,4 @@
- /*
+/*
  *  Copyright (C) 2022 github.com/REAndroid
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +17,7 @@ package com.reandroid.arsc.value;
 
 import com.reandroid.arsc.base.Block;
 import com.reandroid.arsc.chunk.PackageBlock;
+import com.reandroid.arsc.util.HexUtil;
 import com.reandroid.json.JSONObject;
 
 public class ResValueMap extends ValueItem implements AttributeValue{
@@ -110,7 +111,7 @@ public class ResValueMap extends ValueItem implements AttributeValue{
     }
     @Override
     public String toString(){
-        return "name="+String.format("0x%08x", getName())
+        return "name=" + HexUtil.toHex8(getName())
                 +", "+super.toString();
     }
 

src/main/java/com/reandroid/arsc/value/StagedAliasEntry.java

@@ -1,6 +1,22 @@
+/*
+ *  Copyright (C) 2022 github.com/REAndroid
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.reandroid.arsc.value;
 
 import com.reandroid.arsc.item.ByteArray;
+import com.reandroid.arsc.util.HexUtil;
 import com.reandroid.json.JSONConvert;
 import com.reandroid.json.JSONObject;
 
@@ -32,8 +48,8 @@ public class StagedAliasEntry extends ByteArray implements JSONConvert<JSONObjec
     }
     @Override
     public String toString(){
-        return "stagedResId="+String.format("0x%08x",getStagedResId())
+        return "stagedResId=" + HexUtil.toHex8(getStagedResId())
-                +", finalizedResId="+String.format("0x%08x",getFinalizedResId());
+                +", finalizedResId=" + HexUtil.toHex8(getFinalizedResId());
     }
     @Override
     public JSONObject toJson() {

src/main/java/com/reandroid/arsc/value/ValueItem.java

@@ -24,13 +24,14 @@ import com.reandroid.arsc.item.ReferenceItem;
 import com.reandroid.arsc.item.StringItem;
 import com.reandroid.arsc.pool.StringPool;
 import com.reandroid.arsc.pool.TableStringPool;
+import com.reandroid.arsc.util.HexUtil;
 import com.reandroid.json.JSONConvert;
 import com.reandroid.json.JSONObject;
 
 import java.io.IOException;
 import java.util.Objects;
 
- public abstract class ValueItem extends BlockItem implements Value,
+public abstract class ValueItem extends BlockItem implements Value,
         JSONConvert<JSONObject>{
     private ReferenceItem mStringReference;
     private final int sizeOffset;
@@ -303,7 +304,7 @@ import java.util.Objects;
         if(valueType!=null){
             builder.append(valueType);
         }else {
-             builder.append(String.format("0x%02x", (0xff & getType())));
+            builder.append(HexUtil.toHex2(getType()));
         }
         builder.append(", data=");
         int data = getData();
@@ -312,10 +313,10 @@ import java.util.Objects;
             if(tableString!=null){
                 builder.append(tableString.getHtml());
             }else {
-                 builder.append(String.format("0x%08x", data));
+                builder.append(HexUtil.toHex8(data));
             }
         }else {
-             builder.append(String.format("0x%08x", data));
+            builder.append(HexUtil.toHex8(data));
         }
         return builder.toString();
     }
@@ -328,4 +329,4 @@ import java.util.Objects;
 
     public static final String NAME_data = "data";
     public static final String NAME_value_type = "value_type";
- }
+}

src/main/java/com/reandroid/arsc/value/array/ArrayBagItem.java

@@ -1,4 +1,4 @@
- /*
+/*
  *  Copyright (C) 2022 github.com/REAndroid
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,16 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- package com.reandroid.arsc.value.array;
+package com.reandroid.arsc.value.array;
 
- import com.reandroid.arsc.decoder.ValueDecoder;
+import com.reandroid.arsc.decoder.ValueDecoder;
- import com.reandroid.arsc.item.StringItem;
+import com.reandroid.arsc.item.StringItem;
- import com.reandroid.arsc.item.TableString;
+import com.reandroid.arsc.item.TableString;
- import com.reandroid.arsc.value.ValueType;
+import com.reandroid.arsc.util.HexUtil;
- import com.reandroid.arsc.value.bag.BagItem;
+import com.reandroid.arsc.value.ValueType;
- import com.reandroid.arsc.value.ResValueMap;
+import com.reandroid.arsc.value.bag.BagItem;
+import com.reandroid.arsc.value.ResValueMap;
 
- public class ArrayBagItem extends BagItem {
+public class ArrayBagItem extends BagItem {
     private ArrayBagItem(ResValueMap valueMap) {
         super(valueMap);
     }
@@ -42,7 +43,7 @@
         if (hasStringValue()) {
             builder.append(getStringValue());
         } else {
-             builder.append(String.format("0x%08x", getValue()));
+            builder.append(HexUtil.toHex8(getValue()));
         }
         builder.append("</item>");
         return builder.toString();
@@ -92,4 +93,4 @@
     public static ArrayBagItem reference(int resourceId) {
         return create(ValueType.REFERENCE, resourceId);
     }
- }
+}

src/main/java/com/reandroid/arsc/value/attribute/AttributeBagItem.java

@@ -1,4 +1,4 @@
- /*
+/*
  *  Copyright (C) 2022 github.com/REAndroid
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +17,7 @@ package com.reandroid.arsc.value.attribute;
 
 import com.reandroid.arsc.chunk.PackageBlock;
 import com.reandroid.arsc.group.EntryGroup;
+import com.reandroid.arsc.util.HexUtil;
 import com.reandroid.arsc.value.Entry;
 import com.reandroid.arsc.value.ResValueMap;
 import com.reandroid.common.EntryStore;
@@ -36,7 +37,7 @@ public class AttributeBagItem {
     public String getNameOrHex(EntryStore entryStore){
         String name=getName(entryStore);
         if(name==null){
-            name=String.format("@0x%08x", getBagItem().getName());
+            name=HexUtil.toHex8("@0x", getBagItem().getName());
         }
         return name;
     }
@@ -162,7 +163,7 @@ public class AttributeBagItem {
         }
         ResValueMap item=getBagItem();
         builder.append(getNameOrHex());
-        builder.append("=").append(String.format("0x%x", item.getData()));
+        builder.append("=").append(HexUtil.toHex8(item.getData()));
         return builder.toString();
     }
 
@@ -214,6 +215,4 @@ public class AttributeBagItem {
         }
         return null;
     }
-
-
 }

src/main/java/com/reandroid/arsc/value/plurals/PluralsBagItem.java

@@ -18,6 +18,7 @@
  import com.reandroid.arsc.chunk.TableBlock;
  import com.reandroid.arsc.item.StringItem;
  import com.reandroid.arsc.item.TableString;
+ import com.reandroid.arsc.util.HexUtil;
  import com.reandroid.arsc.value.*;
  import com.reandroid.arsc.value.bag.BagItem;
 
@@ -83,7 +84,7 @@
      }
 
      private String formattedRefValue() {
-         return String.format("@0x%08x", getValue());
+         return HexUtil.toHex8("@0x", getValue());
      }
 
      @Override

src/main/java/com/reandroid/arsc/value/style/StyleBagItem.java

@@ -1,4 +1,4 @@
- /*
+/*
  *  Copyright (C) 2022 github.com/REAndroid
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,20 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- package com.reandroid.arsc.value.style;
+package com.reandroid.arsc.value.style;
 
- import com.reandroid.arsc.decoder.ValueDecoder;
+import com.reandroid.arsc.decoder.ValueDecoder;
- import com.reandroid.arsc.item.StringItem;
+import com.reandroid.arsc.item.StringItem;
- import com.reandroid.arsc.item.TableString;
+import com.reandroid.arsc.item.TableString;
- import com.reandroid.arsc.value.attribute.AttributeBag;
+import com.reandroid.arsc.util.HexUtil;
- import com.reandroid.arsc.value.attribute.AttributeBagItem;
+import com.reandroid.arsc.value.attribute.AttributeBag;
- import com.reandroid.arsc.value.bag.BagItem;
+import com.reandroid.arsc.value.attribute.AttributeBagItem;
- import com.reandroid.arsc.value.Entry;
+import com.reandroid.arsc.value.bag.BagItem;
- import com.reandroid.arsc.value.ResValueMap;
+import com.reandroid.arsc.value.Entry;
- import com.reandroid.arsc.value.ValueType;
+import com.reandroid.arsc.value.ResValueMap;
- import com.reandroid.common.EntryStore;
+import com.reandroid.arsc.value.ValueType;
+import com.reandroid.common.EntryStore;
 
- public class StyleBagItem extends BagItem {
+public class StyleBagItem extends BagItem {
     private StyleBagItem(ResValueMap bagItem) {
         super(bagItem);
     }
@@ -109,7 +110,7 @@
         builder.append("<item name=\"");
         String name = getName();
         if (name == null) {
-             name = String.format("@0x%08x", getNameId());
+            name = HexUtil.toHex8("@0x", getNameId());
         }
         builder.append(name);
         builder.append("\">");
@@ -121,7 +122,7 @@
             val = getValueAsReference();
         }
         if (val == null) {
-             val = String.format("0x%08x", getValue());
+            val = HexUtil.toHex8(getValue());
         }
         builder.append(val);
         builder.append("</item>");
@@ -186,4 +187,4 @@
     public static StyleBagItem enumOrFlag(AttributeBag attr, String valueString) {
         return encoded(attr.encodeEnumOrFlagValue(valueString));
     }
- }
+}