Merge pull request #195 from AbhiTheModder/patch-1

Fix duplicate `res/` directory in APK refactor output

Author: REAndroid

src/main/java/com/reandroid/apkeditor/refactor/AutoRefactor.java

@@ -19,6 +19,7 @@
 import com.reandroid.apk.ApkModule;
 import com.reandroid.apk.ResFile;
 import com.reandroid.arsc.chunk.TableBlock;
+import com.reandroid.arsc.chunk.PackageBlock;
 import com.reandroid.identifiers.PackageIdentifier;
 import com.reandroid.identifiers.TableIdentifier;
 import com.reandroid.identifiers.TypeIdentifier;
@@ -42,7 +43,7 @@ public int refactorFilePaths(){
         int renameCount = 0;
         List<ResFile> resFileList = mApkModule.listResFiles();
         for(ResFile resFile:resFileList){
-            String path = RefactorUtil.RES_DIR + "/" + resFile.buildPath();
+            String path = resFile.buildPath(PackageBlock.RES_DIRECTORY_NAME);
             if(path.equals(resFile.getFilePath())){
                 continue;
             }

src/main/java/com/reandroid/apkeditor/refactor/RefactorUtil.java

@@ -127,6 +127,4 @@ public static boolean isGoodName(String name){
     }
     private static final Pattern PATTERN_GOOD_NAME =Pattern.compile("^[A-Za-z]{2,15}[_.A-Za-z0-9]*$");
     private static final Pattern PATTERN_GENERATED_NAME=Pattern.compile("^.+_(0x[0-9a-f]{7,8})$");
-
-    public static final String RES_DIR="res";
 }