From 736deb1cb53df04865fcaca8dffcf16fe452c757 Mon Sep 17 00:00:00 2001
From: Chris Arriola <arriolac279@gmail.com>
Date: Fri, 25 Apr 2014 11:48:44 -0700
Subject: [PATCH 1/7] 4 spaces instead of 2.

---
 configs/SquareAndroid.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configs/SquareAndroid.xml b/configs/SquareAndroid.xml
index f32574e..f098591 100644
--- a/configs/SquareAndroid.xml
+++ b/configs/SquareAndroid.xml
@@ -4,9 +4,9 @@
   <option name="IGNORE_SAME_INDENTS_FOR_LANGUAGES" value="true"/>
   <option name="OTHER_INDENT_OPTIONS">
     <value>
-      <option name="INDENT_SIZE" value="2"/>
+      <option name="INDENT_SIZE" value="4"/>
       <option name="CONTINUATION_INDENT_SIZE" value="4"/>
-      <option name="TAB_SIZE" value="2"/>
+      <option name="TAB_SIZE" value="4"/>
       <option name="USE_TAB_CHARACTER" value="false"/>
       <option name="SMART_TABS" value="false"/>
       <option name="LABEL_INDENT_SIZE" value="0"/>
@@ -215,4 +215,4 @@
       <option name="TAB_SIZE" value="2"/>
     </indentOptions>
   </codeStyleSettings>
-</code_scheme>
\ No newline at end of file
+</code_scheme>

From 3d90de8d4502e565ba64cd5dc79c60a4aeb382ba Mon Sep 17 00:00:00 2001
From: Chris Arriola <arriolac279@gmail.com>
Date: Fri, 25 Apr 2014 12:17:50 -0700
Subject: [PATCH 2/7] Java indent 4.

---
 configs/SquareAndroid.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/configs/SquareAndroid.xml b/configs/SquareAndroid.xml
index f098591..bca8810 100644
--- a/configs/SquareAndroid.xml
+++ b/configs/SquareAndroid.xml
@@ -179,9 +179,9 @@
     <option name="VARIABLE_ANNOTATION_WRAP" value="1"/>
     <option name="PARENT_SETTINGS_INSTALLED" value="true"/>
     <indentOptions>
-      <option name="INDENT_SIZE" value="2"/>
+      <option name="INDENT_SIZE" value="4"/>
       <option name="CONTINUATION_INDENT_SIZE" value="4"/>
-      <option name="TAB_SIZE" value="2"/>
+      <option name="TAB_SIZE" value="4"/>
     </indentOptions>
   </codeStyleSettings>
   <codeStyleSettings language="JavaScript">
@@ -210,9 +210,9 @@
   </codeStyleSettings>
   <codeStyleSettings language="XML">
     <indentOptions>
-      <option name="INDENT_SIZE" value="2"/>
+      <option name="INDENT_SIZE" value="4"/>
       <option name="CONTINUATION_INDENT_SIZE" value="4"/>
-      <option name="TAB_SIZE" value="2"/>
+      <option name="TAB_SIZE" value="4"/>
     </indentOptions>
   </codeStyleSettings>
 </code_scheme>

From d8c43cb919e4c609c4f2ad07f020866ac8da02b7 Mon Sep 17 00:00:00 2001
From: Chris Arriola <arriolac279@gmail.com>
Date: Mon, 28 Apr 2014 11:11:08 -0700
Subject: [PATCH 3/7] Adding SquareAndroid2.xml.

---
 configs/SquareAndroid2.xml | 180 +++++++++++++++++++++++++++++++++++++
 install.sh                 |   2 +-
 2 files changed, 181 insertions(+), 1 deletion(-)
 create mode 100644 configs/SquareAndroid2.xml

diff --git a/configs/SquareAndroid2.xml b/configs/SquareAndroid2.xml
new file mode 100644
index 0000000..a59e2d5
--- /dev/null
+++ b/configs/SquareAndroid2.xml
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<code_scheme name="SquareAndroid2">
+  <option name="USE_SAME_INDENTS" value="true" />
+  <option name="IGNORE_SAME_INDENTS_FOR_LANGUAGES" value="true" />
+  <option name="OTHER_INDENT_OPTIONS">
+    <value>
+      <option name="INDENT_SIZE" value="4" />
+      <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      <option name="TAB_SIZE" value="4" />
+      <option name="USE_TAB_CHARACTER" value="false" />
+      <option name="SMART_TABS" value="false" />
+      <option name="LABEL_INDENT_SIZE" value="0" />
+      <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+      <option name="USE_RELATIVE_INDENTS" value="false" />
+    </value>
+  </option>
+  <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
+  <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
+  <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
+    <value />
+  </option>
+  <option name="IMPORT_LAYOUT_TABLE">
+    <value>
+      <package name="" withSubpackages="true" static="false" />
+      <emptyLine />
+      <package name="" withSubpackages="true" static="true" />
+    </value>
+  </option>
+  <option name="RIGHT_MARGIN" value="100" />
+  <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
+  <option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
+  <option name="JD_P_AT_EMPTY_LINES" value="false" />
+  <option name="JD_DO_NOT_WRAP_ONE_LINE_COMMENTS" value="true" />
+  <option name="JD_KEEP_EMPTY_PARAMETER" value="false" />
+  <option name="JD_KEEP_EMPTY_RETURN" value="false" />
+  <option name="JD_PRESERVE_LINE_FEEDS" value="true" />
+  <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
+  <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
+  <option name="KEEP_LINE_BREAKS" value="false" />
+  <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
+  <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
+  <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+  <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
+  <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+  <option name="ALIGN_MULTILINE_FOR" value="false" />
+  <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
+  <option name="CALL_PARAMETERS_WRAP" value="1" />
+  <option name="METHOD_PARAMETERS_WRAP" value="1" />
+  <option name="RESOURCE_LIST_WRAP" value="1" />
+  <option name="EXTENDS_LIST_WRAP" value="1" />
+  <option name="THROWS_LIST_WRAP" value="1" />
+  <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+  <option name="THROWS_KEYWORD_WRAP" value="1" />
+  <option name="METHOD_CALL_CHAIN_WRAP" value="5" />
+  <option name="BINARY_OPERATION_WRAP" value="5" />
+  <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
+  <option name="TERNARY_OPERATION_WRAP" value="1" />
+  <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+  <option name="FOR_STATEMENT_WRAP" value="1" />
+  <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+  <option name="ASSIGNMENT_WRAP" value="1" />
+  <option name="WRAP_COMMENTS" value="true" />
+  <option name="ASSERT_STATEMENT_WRAP" value="1" />
+  <option name="IF_BRACE_FORCE" value="1" />
+  <option name="DOWHILE_BRACE_FORCE" value="1" />
+  <option name="WHILE_BRACE_FORCE" value="1" />
+  <option name="METHOD_ANNOTATION_WRAP" value="1" />
+  <option name="CLASS_ANNOTATION_WRAP" value="1" />
+  <option name="FIELD_ANNOTATION_WRAP" value="1" />
+  <option name="PARAMETER_ANNOTATION_WRAP" value="1" />
+  <option name="VARIABLE_ANNOTATION_WRAP" value="1" />
+  <option name="ENUM_CONSTANTS_WRAP" value="1" />
+  <XML>
+    <option name="XML_ATTRIBUTE_WRAP" value="4" />
+    <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
+  </XML>
+  <ADDITIONAL_INDENT_OPTIONS fileType="php">
+    <option name="INDENT_SIZE" value="2" />
+    <option name="CONTINUATION_INDENT_SIZE" value="4" />
+    <option name="TAB_SIZE" value="2" />
+  </ADDITIONAL_INDENT_OPTIONS>
+  <ADDITIONAL_INDENT_OPTIONS fileType="scala">
+    <option name="INDENT_SIZE" value="2" />
+    <option name="CONTINUATION_INDENT_SIZE" value="2" />
+    <option name="TAB_SIZE" value="2" />
+  </ADDITIONAL_INDENT_OPTIONS>
+  <ADDITIONAL_INDENT_OPTIONS fileType="sql">
+    <option name="INDENT_SIZE" value="2" />
+    <option name="CONTINUATION_INDENT_SIZE" value="4" />
+    <option name="TAB_SIZE" value="2" />
+  </ADDITIONAL_INDENT_OPTIONS>
+  <codeStyleSettings language="Groovy">
+    <option name="KEEP_LINE_BREAKS" value="false" />
+    <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
+    <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
+    <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+    <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
+    <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+    <option name="ALIGN_MULTILINE_FOR" value="false" />
+    <option name="CALL_PARAMETERS_WRAP" value="1" />
+    <option name="METHOD_PARAMETERS_WRAP" value="1" />
+    <option name="EXTENDS_LIST_WRAP" value="1" />
+    <option name="THROWS_LIST_WRAP" value="1" />
+    <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+    <option name="THROWS_KEYWORD_WRAP" value="1" />
+    <option name="METHOD_CALL_CHAIN_WRAP" value="5" />
+    <option name="BINARY_OPERATION_WRAP" value="5" />
+    <option name="TERNARY_OPERATION_WRAP" value="1" />
+    <option name="FOR_STATEMENT_WRAP" value="1" />
+    <option name="ASSIGNMENT_WRAP" value="1" />
+    <option name="ASSERT_STATEMENT_WRAP" value="1" />
+    <option name="IF_BRACE_FORCE" value="1" />
+    <option name="WHILE_BRACE_FORCE" value="1" />
+    <option name="METHOD_ANNOTATION_WRAP" value="1" />
+    <option name="CLASS_ANNOTATION_WRAP" value="1" />
+    <option name="FIELD_ANNOTATION_WRAP" value="1" />
+    <option name="PARAMETER_ANNOTATION_WRAP" value="1" />
+    <option name="VARIABLE_ANNOTATION_WRAP" value="1" />
+    <option name="PARENT_SETTINGS_INSTALLED" value="true" />
+    <indentOptions>
+      <option name="INDENT_SIZE" value="2" />
+      <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      <option name="TAB_SIZE" value="2" />
+    </indentOptions>
+  </codeStyleSettings>
+  <codeStyleSettings language="JAVA">
+    <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
+    <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
+    <option name="KEEP_LINE_BREAKS" value="false" />
+    <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
+    <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
+    <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+    <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
+    <option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
+    <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+    <option name="ALIGN_MULTILINE_FOR" value="false" />
+    <option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
+    <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+    <option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
+    <option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACES" value="true" />
+    <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
+    <option name="CALL_PARAMETERS_WRAP" value="5" />
+    <option name="METHOD_PARAMETERS_WRAP" value="5" />
+    <option name="RESOURCE_LIST_WRAP" value="1" />
+    <option name="EXTENDS_LIST_WRAP" value="5" />
+    <option name="THROWS_LIST_WRAP" value="5" />
+    <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+    <option name="THROWS_KEYWORD_WRAP" value="1" />
+    <option name="METHOD_CALL_CHAIN_WRAP" value="5" />
+    <option name="BINARY_OPERATION_WRAP" value="5" />
+    <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
+    <option name="TERNARY_OPERATION_WRAP" value="5" />
+    <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+    <option name="FOR_STATEMENT_WRAP" value="1" />
+    <option name="ARRAY_INITIALIZER_WRAP" value="5" />
+    <option name="ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE" value="true" />
+    <option name="ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE" value="true" />
+    <option name="ASSIGNMENT_WRAP" value="5" />
+    <option name="WRAP_COMMENTS" value="true" />
+    <option name="ASSERT_STATEMENT_WRAP" value="1" />
+    <option name="IF_BRACE_FORCE" value="1" />
+    <option name="DOWHILE_BRACE_FORCE" value="1" />
+    <option name="WHILE_BRACE_FORCE" value="1" />
+    <option name="METHOD_ANNOTATION_WRAP" value="5" />
+    <option name="CLASS_ANNOTATION_WRAP" value="5" />
+    <option name="FIELD_ANNOTATION_WRAP" value="5" />
+    <option name="PARAMETER_ANNOTATION_WRAP" value="5" />
+    <option name="VARIABLE_ANNOTATION_WRAP" value="5" />
+    <option name="PARENT_SETTINGS_INSTALLED" value="true" />
+    <indentOptions>
+      <option name="CONTINUATION_INDENT_SIZE" value="4" />
+    </indentOptions>
+  </codeStyleSettings>
+  <codeStyleSettings language="XML">
+    <indentOptions>
+      <option name="CONTINUATION_INDENT_SIZE" value="4" />
+    </indentOptions>
+  </codeStyleSettings>
+</code_scheme>
+
diff --git a/install.sh b/install.sh
index 17fe044..e45744f 100755
--- a/install.sh
+++ b/install.sh
@@ -12,4 +12,4 @@ done
 
 echo "Done."
 echo ""
-echo "Restart IntelliJ and/or AndroidStudio, go to preferences, and apply 'Square' or 'SquareAndroid'."
+echo "Restart IntelliJ and/or AndroidStudio, go to preferences, and apply 'Square', 'SquareAndroid', or 'SquareAndroid2'."

From 4182fb827d40f402b187d0644553d5fe41feee70 Mon Sep 17 00:00:00 2001
From: Chris Arriola <arriolac279@gmail.com>
Date: Mon, 28 Apr 2014 11:26:05 -0700
Subject: [PATCH 4/7] Renaming from SquareAndroid2 to GreenHaloLabs.

---
 configs/{SquareAndroid2.xml => GreenHaloLabs.xml} | 2 +-
 install.sh                                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename configs/{SquareAndroid2.xml => GreenHaloLabs.xml} (99%)

diff --git a/configs/SquareAndroid2.xml b/configs/GreenHaloLabs.xml
similarity index 99%
rename from configs/SquareAndroid2.xml
rename to configs/GreenHaloLabs.xml
index a59e2d5..010c434 100644
--- a/configs/SquareAndroid2.xml
+++ b/configs/GreenHaloLabs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<code_scheme name="SquareAndroid2">
+<code_scheme name="GreenHaloLabs">
   <option name="USE_SAME_INDENTS" value="true" />
   <option name="IGNORE_SAME_INDENTS_FOR_LANGUAGES" value="true" />
   <option name="OTHER_INDENT_OPTIONS">
diff --git a/install.sh b/install.sh
index e45744f..a998e40 100755
--- a/install.sh
+++ b/install.sh
@@ -12,4 +12,4 @@ done
 
 echo "Done."
 echo ""
-echo "Restart IntelliJ and/or AndroidStudio, go to preferences, and apply 'Square', 'SquareAndroid', or 'SquareAndroid2'."
+echo "Restart IntelliJ and/or AndroidStudio, go to preferences, and apply 'Square', 'SquareAndroid', or 'GreenHaloLabs'."

From 6a476f4ae17bf52007c01553fa1257360fdf69c4 Mon Sep 17 00:00:00 2001
From: Chris Arriola <arriolac279@gmail.com>
Date: Tue, 29 Apr 2014 12:05:44 -0700
Subject: [PATCH 5/7] no multi-line assignment.

---
 configs/GreenHaloLabs.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/configs/GreenHaloLabs.xml b/configs/GreenHaloLabs.xml
index 010c434..11e2395 100644
--- a/configs/GreenHaloLabs.xml
+++ b/configs/GreenHaloLabs.xml
@@ -134,7 +134,6 @@
     <option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
     <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
     <option name="ALIGN_MULTILINE_FOR" value="false" />
-    <option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
     <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
     <option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
     <option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACES" value="true" />
@@ -155,7 +154,7 @@
     <option name="ARRAY_INITIALIZER_WRAP" value="5" />
     <option name="ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE" value="true" />
     <option name="ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE" value="true" />
-    <option name="ASSIGNMENT_WRAP" value="5" />
+    <option name="ASSIGNMENT_WRAP" value="1" />
     <option name="WRAP_COMMENTS" value="true" />
     <option name="ASSERT_STATEMENT_WRAP" value="1" />
     <option name="IF_BRACE_FORCE" value="1" />

From 1f3e9ef17c6323a5cbf44886a125373dc9e2060a Mon Sep 17 00:00:00 2001
From: Chris Arriola <arriolac279@gmail.com>
Date: Fri, 23 May 2014 15:03:37 -0700
Subject: [PATCH 6/7] 4 spaces instead of 2 for groovy.

---
 configs/GreenHaloLabs.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/configs/GreenHaloLabs.xml b/configs/GreenHaloLabs.xml
index 11e2395..8d3f70c 100644
--- a/configs/GreenHaloLabs.xml
+++ b/configs/GreenHaloLabs.xml
@@ -118,9 +118,7 @@
     <option name="VARIABLE_ANNOTATION_WRAP" value="1" />
     <option name="PARENT_SETTINGS_INSTALLED" value="true" />
     <indentOptions>
-      <option name="INDENT_SIZE" value="2" />
       <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      <option name="TAB_SIZE" value="2" />
     </indentOptions>
   </codeStyleSettings>
   <codeStyleSettings language="JAVA">

From 5ff90d9e3a784c5790e20d241b73568ccf8c7dda Mon Sep 17 00:00:00 2001
From: Chris Arriola <arriolac279@gmail.com>
Date: Fri, 24 Jul 2015 13:59:43 -0700
Subject: [PATCH 7/7] Changing right margin to 120.

---
 configs/GreenHaloLabs.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/GreenHaloLabs.xml b/configs/GreenHaloLabs.xml
index 8d3f70c..2faae79 100644
--- a/configs/GreenHaloLabs.xml
+++ b/configs/GreenHaloLabs.xml
@@ -26,7 +26,7 @@
       <package name="" withSubpackages="true" static="true" />
     </value>
   </option>
-  <option name="RIGHT_MARGIN" value="100" />
+  <option name="RIGHT_MARGIN" value="120" />
   <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
   <option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
   <option name="JD_P_AT_EMPTY_LINES" value="false" />