From 88a009e8a56acc661c90fd0e106017eb0245767a Mon Sep 17 00:00:00 2001
From: Akash Yadav <itsaky01@gmail.com>
Date: Thu, 9 Jun 2022 22:24:33 +0530
Subject: [PATCH] Changed the directory names for HOME and SYSROOT directory

---
 .idea/codeStyles/Project.xml                      | 15 +++++++++++----
 .../itsaky/androidide/app/BaseApplication.java    |  2 +-
 .../com/itsaky/androidide/utils/Environment.java  |  4 ++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index d0987f24d..4efcc0c4d 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,7 +1,13 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <JavaCodeStyleSettings>
-      <option name="SPACE_BEFORE_OPENING_ANGLE_BRACKET_IN_TYPE_PARAMETER" value="true" />
+      <option name="GENERATE_FINAL_LOCALS" value="true" />
+      <option name="GENERATE_FINAL_PARAMETERS" value="true" />
+      <option name="SPACE_AFTER_CLOSING_ANGLE_BRACKET_IN_TYPE_ARGUMENT" value="true" />
+      <option name="CLASS_NAMES_IN_JAVADOC" value="3" />
+      <option name="USE_FQ_CLASS_NAMES" value="true" />
+      <option name="INSERT_INNER_CLASS_IMPORTS" value="true" />
+      <option name="JD_DO_NOT_WRAP_ONE_LINE_COMMENTS" value="true" />
     </JavaCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
@@ -38,7 +44,8 @@
       <option name="DOWHILE_BRACE_FORCE" value="3" />
       <option name="FOR_BRACE_FORCE" value="3" />
       <indentOptions>
-        <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
+        <option name="INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
       </indentOptions>
       <arrangement>
         <groups>
@@ -48,11 +55,11 @@
           </group>
           <group>
             <type>OVERRIDDEN_METHODS</type>
-            <order>KEEP</order>
+            <order>BY_NAME</order>
           </group>
           <group>
             <type>DEPENDENT_METHODS</type>
-            <order>BREADTH_FIRST</order>
+            <order>DEPTH_FIRST</order>
           </group>
         </groups>
         <rules>
diff --git a/common/src/main/java/com/itsaky/androidide/app/BaseApplication.java b/common/src/main/java/com/itsaky/androidide/app/BaseApplication.java
index 4f6fec35d..b3fd5f040 100755
--- a/common/src/main/java/com/itsaky/androidide/app/BaseApplication.java
+++ b/common/src/main/java/com/itsaky/androidide/app/BaseApplication.java
@@ -133,7 +133,7 @@ public abstract class BaseApplication extends MultiDexApplication {
   }
 
   public File getRootDir() {
-    return new File(getIDEDataDir(), "framework");
+    return new File(getIDEDataDir(), "home");
   }
 
   @SuppressLint("SdCardPath")
diff --git a/common/src/main/java/com/itsaky/androidide/utils/Environment.java b/common/src/main/java/com/itsaky/androidide/utils/Environment.java
index 072841c62..3d5a22d44 100755
--- a/common/src/main/java/com/itsaky/androidide/utils/Environment.java
+++ b/common/src/main/java/com/itsaky/androidide/utils/Environment.java
@@ -40,7 +40,7 @@ public final class Environment {
   public static final Map<String, String> ENV_VARS = new HashMap<>();
   public static final String PROJECTS_FOLDER = "AndroidIDEProjects";
   public static final String DEFAULT_ROOT = "/data/data/com.itsaky.androidide/files";
-  public static final String DEFAULT_HOME = DEFAULT_ROOT + "/framework";
+  public static final String DEFAULT_HOME = DEFAULT_ROOT + "/home";
   private static final String DEFAULT_JAVA_HOME = DEFAULT_HOME + "/jdk";
   private static final String DEFAULT_ANDROID_HOME = DEFAULT_HOME + "/android-sdk";
   private static final ILogger LOG = ILogger.newInstance("Environment");
@@ -80,7 +80,7 @@ public final class Environment {
   public static void init() {
     final BaseApplication app = BaseApplication.getBaseInstance();
     ROOT = app.getIDEDataDir();
-    SYSROOT = mkdirIfNotExits(new File(app.getIDEDataDir(), "sysroot"));
+    SYSROOT = mkdirIfNotExits(new File(app.getIDEDataDir(), "usr"));
     HOME = mkdirIfNotExits(app.getRootDir());
     ANDROIDIDE_HOME = mkdirIfNotExits(new File(HOME, ".androidide"));
     TMP_DIR = mkdirIfNotExits(new File(SYSROOT, "tmp"));