remove common io library and add more attributes in default order

Author: teixeira0x

.androidide/editor/openedFiles.json

@@ -8,7 +8,6 @@ repositories {
 
 dependencies {
   implementation 'commons-cli:commons-cli:1.4'
-  implementation 'commons-io:commons-io:2.11.0'
   implementation 'org.apache.commons:commons-lang3:3.12.0'
   implementation 'org.jdom:jdom:1.1.3'
 }

app/build.gradle

@@ -1,6 +1,6 @@
 package com.bytehamster.androidxmlformatter;
 
-import com.bytehamster.androidxmlformatter.utils.FileUtil;
+import com.bytehamster.androidxmlformatter.utils.FileUtils;
 import com.bytehamster.androidxmlformatter.utils.FormatterOptions;
 import java.io.File;
 import java.io.FileInputStream;
@@ -40,7 +40,6 @@ private int run(String[] args) throws Exception {
     }
 
     List<File> files = new ArrayList<>();
-
     for (String arg : cmd.getArgList()) {
       if (arg.equals("-")) return 1;
 
@@ -55,24 +54,28 @@ private int run(String[] args) throws Exception {
       return 1;
     }
 
-    int formatted = 0;
+    int formattedCount = 0;
     for (File file : files) {
-      formatted += formatFile(file, cmd) ? 1 : 0;
+      if (formatFile(file, cmd)) {
+        formattedCount += 1;
+      }
     }
-    System.out.println(formatted + " files formated!");
+    System.out.println(formattedCount + " files formated!");
 
     return 0;
   }
 
   private void addFilesFromDir(List<File> formatFiles, File file) {
-    if (file.isFile()) {
-      if (file.getName().endsWith(".xml")) {
-        formatFiles.add(file);
+    if (file.isDirectory()) {
+      for (File f : file.listFiles()) {
+        addFilesFromDir(formatFiles, f);
       }
       return;
     }
 
-    for (File f : file.listFiles()) addFilesFromDir(formatFiles, f);
+    if (file.getName().endsWith(".xml")) {
+      formatFiles.add(file);
+    }
   }
 
   private boolean formatFile(File file, CommandLine cmd) {
@@ -86,11 +89,12 @@ private boolean formatFile(File file, CommandLine cmd) {
         cmd.hasOption(FormatterOptions.OPT_NAMESPACE_SORT)
       );
 
-      FileUtil.writeFile(file, outputter.outputString(new SAXBuilder().build(new FileInputStream(FileUtil.getFilePath(file)))).trim());
-      System.out.println("Done formatting: " + FileUtil.getFilePath(file));
+      String formatedText = outputter.outputString(new SAXBuilder().build(new FileInputStream(file))).trim();
+      FileUtils.writeFile(file, formatedText );
+      System.out.println("Done formatting: " + file);
       return true;
     } catch (Exception e) {
-      System.out.println("Error formatting: " + FileUtil.getFilePath(file) + ". Exception: " + e.getMessage());
+      System.out.println("Error formatting: " + file + ". Exception: " + e.getMessage());
       return false;
     }
   }

app/src/main/java/com/bytehamster/androidxmlformatter/Main.java

@@ -0,0 +1,36 @@
+package com.bytehamster.androidxmlformatter.utils;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.FileOutputStream;
+import java.io.FileInputStream;
+
+public class FileUtils {
+
+  public static void writeFile(File file, String content) {
+    try (FileOutputStream outputStream = new FileOutputStream(file)) {
+
+      byte[] bytes = content.getBytes();
+
+      outputStream.write(bytes);
+    } catch (IOException e) {
+      e.printStackTrace();
+    }
+  }
+
+  public static final String readFile(File file) {
+    try (FileInputStream inputStream = new FileInputStream(file)) {
+      return new String(inputStream.readAllBytes());
+    } catch (IOException ioe) {
+      return "";
+    }
+  }
+
+  public static String getFilePath(File file) {
+    try {
+      return file.getCanonicalPath();
+    } catch (Exception e) {
+      return file.getAbsolutePath();
+    }
+  }
+}

app/src/main/java/com/bytehamster/androidxmlformatter/utils/FileUtil.java

@@ -12,8 +12,8 @@ public class FormatterOptions {
   public static final String OPT_NAMESPACE_SORT = "namespace-sort";
 
   public static final String DEFAULT_INDENTION = "2";
-  public static final String DEFAULT_ATTRIBUTE_ORDER = "id,layout_width,layout_height";
-  public static final String DEFAULT_NAMESPACE_ORDER = "android,app";
+  public static final String DEFAULT_ATTRIBUTE_ORDER = "id,style,layout_width,layout_height,layout_margin,layout_marginLeft,layout_marginStart,layout_marginTop,layout_marginRight,layout_marginEnd,layout_marginBottom";
+  public static final String DEFAULT_NAMESPACE_ORDER = "xmlns,android,app,tools";
 
   public static Options getOptions(String[] args) {
     Options options = new Options();