From 466c0f11b2d19bbcd3a87ebc6d94b6dd1009670d Mon Sep 17 00:00:00 2001
From: Chuck Greb <chuck@usebutton.com>
Date: Fri, 15 Dec 2017 09:41:30 -0500
Subject: [PATCH 1/6] Square -> Button

---
 README.md                                                   | 4 +++-
 configs/codestyles/{Square.xml => Button.xml}               | 4 ++--
 configs/codestyles/{SquareAndroid.xml => ButtonAndroid.xml} | 4 ++--
 configs/inspection/{Square.xml => Button.xml}               | 0
 install.sh                                                  | 6 +++---
 5 files changed, 10 insertions(+), 8 deletions(-)
 rename configs/codestyles/{Square.xml => Button.xml} (99%)
 rename configs/codestyles/{SquareAndroid.xml => ButtonAndroid.xml} (99%)
 rename configs/inspection/{Square.xml => Button.xml} (100%)

diff --git a/README.md b/README.md
index 9ad7c0e..1919494 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,9 @@
 Java Code Styles
 ================
 
-IntelliJ IDEA code style settings for Square's Java and Android projects.
+IntelliJ IDEA code style settings for Button's Java and Android projects.
+
+Based on original [Square code style](https://github.com/button/java-code-styles) project.
 
 
 Installation
diff --git a/configs/codestyles/Square.xml b/configs/codestyles/Button.xml
similarity index 99%
rename from configs/codestyles/Square.xml
rename to configs/codestyles/Button.xml
index d07d02a..75e5787 100644
--- a/configs/codestyles/Square.xml
+++ b/configs/codestyles/Button.xml
@@ -1,4 +1,4 @@
-<code_scheme name="Square">
+<code_scheme name="Button">
   <option name="USE_SAME_INDENTS" value="true" />
   <option name="IGNORE_SAME_INDENTS_FOR_LANGUAGES" value="true" />
   <option name="OTHER_INDENT_OPTIONS">
@@ -299,4 +299,4 @@
     <option name="METHOD_PARAMETERS_WRAP" value="1" />
     <option name="EXTENDS_LIST_WRAP" value="1" />
   </codeStyleSettings>
-</code_scheme>
\ No newline at end of file
+</code_scheme>
diff --git a/configs/codestyles/SquareAndroid.xml b/configs/codestyles/ButtonAndroid.xml
similarity index 99%
rename from configs/codestyles/SquareAndroid.xml
rename to configs/codestyles/ButtonAndroid.xml
index d4ce731..78b8c2a 100644
--- a/configs/codestyles/SquareAndroid.xml
+++ b/configs/codestyles/ButtonAndroid.xml
@@ -1,4 +1,4 @@
-<code_scheme name="SquareAndroid">
+<code_scheme name="ButtonAndroid">
   <option name="USE_SAME_INDENTS" value="true" />
   <option name="IGNORE_SAME_INDENTS_FOR_LANGUAGES" value="true" />
   <option name="OTHER_INDENT_OPTIONS">
@@ -379,4 +379,4 @@
       </rules>
     </arrangement>
   </codeStyleSettings>
-</code_scheme>
\ No newline at end of file
+</code_scheme>
diff --git a/configs/inspection/Square.xml b/configs/inspection/Button.xml
similarity index 100%
rename from configs/inspection/Square.xml
rename to configs/inspection/Button.xml
diff --git a/install.sh b/install.sh
index a03a9a1..53b5c38 100755
--- a/install.sh
+++ b/install.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Installs Square's IntelliJ configs into your user configs.
+# Installs Button's IntelliJ configs into your user configs.
 
-echo "Installing Square IntelliJ configs..."
+echo "Installing Button IntelliJ configs..."
 
 CONFIGS="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/configs"
 
@@ -30,4 +30,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 'Button' or 'ButtonAndroid'."

From a0716d226cbcba518e654d0fac130b976d530424 Mon Sep 17 00:00:00 2001
From: Chuck Greb <chuck@usebutton.com>
Date: Fri, 15 Dec 2017 10:12:46 -0500
Subject: [PATCH 2/6] Java indent 2 -> 4 spaces

---
 configs/codestyles/Button.xml        | 12 ++++++------
 configs/codestyles/ButtonAndroid.xml | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/configs/codestyles/Button.xml b/configs/codestyles/Button.xml
index 75e5787..d00db97 100644
--- a/configs/codestyles/Button.xml
+++ b/configs/codestyles/Button.xml
@@ -3,9 +3,9 @@
   <option name="IGNORE_SAME_INDENTS_FOR_LANGUAGES" value="true" />
   <option name="OTHER_INDENT_OPTIONS">
     <value>
-      <option name="INDENT_SIZE" value="2" />
-      <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      <option name="TAB_SIZE" value="2" />
+      <option name="INDENT_SIZE" value="4" />
+      <option name="CONTINUATION_INDENT_SIZE" value="8" />
+      <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" />
@@ -193,9 +193,9 @@
     <option name="ENUM_CONSTANTS_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" />
+      <option name="INDENT_SIZE" value="4" />
+      <option name="CONTINUATION_INDENT_SIZE" value="8" />
+      <option name="TAB_SIZE" value="4" />
     </indentOptions>
   </codeStyleSettings>
   <codeStyleSettings language="JSON">
diff --git a/configs/codestyles/ButtonAndroid.xml b/configs/codestyles/ButtonAndroid.xml
index 78b8c2a..a683ef9 100644
--- a/configs/codestyles/ButtonAndroid.xml
+++ b/configs/codestyles/ButtonAndroid.xml
@@ -3,9 +3,9 @@
   <option name="IGNORE_SAME_INDENTS_FOR_LANGUAGES" value="true" />
   <option name="OTHER_INDENT_OPTIONS">
     <value>
-      <option name="INDENT_SIZE" value="2" />
-      <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      <option name="TAB_SIZE" value="2" />
+      <option name="INDENT_SIZE" value="4" />
+      <option name="CONTINUATION_INDENT_SIZE" value="8" />
+      <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" />
@@ -192,9 +192,9 @@
     <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" />
+      <option name="INDENT_SIZE" value="4" />
+      <option name="CONTINUATION_INDENT_SIZE" value="8" />
+      <option name="TAB_SIZE" value="4" />
     </indentOptions>
   </codeStyleSettings>
   <codeStyleSettings language="JSON">

From e9c0cd8d5cb904062856670dbf09fad3fa758ee0 Mon Sep 17 00:00:00 2001
From: Chuck Greb <ecgreb@users.noreply.github.com>
Date: Fri, 15 Dec 2017 10:30:23 -0500
Subject: [PATCH 3/6] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1919494..2c4685f 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ Java Code Styles
 
 IntelliJ IDEA code style settings for Button's Java and Android projects.
 
-Based on original [Square code style](https://github.com/button/java-code-styles) project.
+Based on original [Square project](https://github.com/button/java-code-styles).
 
 
 Installation

From c2e157826cc84fc48b51d9c23b94b2788e47619f Mon Sep 17 00:00:00 2001
From: Chuck Greb <chuck@usebutton.com>
Date: Thu, 11 Jan 2018 11:17:21 -0500
Subject: [PATCH 4/6] Updates imports style and annotation line wraps

---
 configs/codestyles/ButtonAndroid.xml | 81 ++++++++++++++--------------
 1 file changed, 41 insertions(+), 40 deletions(-)

diff --git a/configs/codestyles/ButtonAndroid.xml b/configs/codestyles/ButtonAndroid.xml
index a683ef9..ffbd591 100644
--- a/configs/codestyles/ButtonAndroid.xml
+++ b/configs/codestyles/ButtonAndroid.xml
@@ -1,18 +1,6 @@
 <code_scheme name="ButtonAndroid">
   <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="8" />
-      <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">
@@ -20,8 +8,14 @@
   </option>
   <option name="IMPORT_LAYOUT_TABLE">
     <value>
+      <package name="android" withSubpackages="true" static="false" />
+      <emptyLine />
+      <package name="com.usebutton" withSubpackages="true" static="false" />
+      <emptyLine />
       <package name="" withSubpackages="true" static="false" />
       <emptyLine />
+      <package name="java" withSubpackages="true" static="false" />
+      <emptyLine />
       <package name="" withSubpackages="true" static="true" />
     </value>
   </option>
@@ -89,6 +83,31 @@
     <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="999" />
     <option name="IMPORT_NESTED_CLASSES" value="true" />
   </JetCodeStyleSettings>
+  <Objective-C-extensions>
+    <file>
+      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
+      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
+      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
+      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
+      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
+      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
+      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
+      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
+      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
+    </file>
+    <class>
+      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
+      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
+      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
+      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
+      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
+      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
+    </class>
+    <extensions>
+      <pair source="cpp" header="h" />
+      <pair source="c" header="h" />
+    </extensions>
+  </Objective-C-extensions>
   <XML>
     <option name="XML_ALIGN_ATTRIBUTES" value="false" />
     <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
@@ -146,16 +165,10 @@
     <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" />
@@ -185,17 +198,10 @@
     <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="PARENT_SETTINGS_INSTALLED" value="true" />
-    <indentOptions>
-      <option name="INDENT_SIZE" value="4" />
-      <option name="CONTINUATION_INDENT_SIZE" value="8" />
-      <option name="TAB_SIZE" value="4" />
-    </indentOptions>
   </codeStyleSettings>
   <codeStyleSettings language="JSON">
     <option name="KEEP_LINE_BREAKS" value="false" />
@@ -226,15 +232,6 @@
       <option name="TAB_SIZE" value="2" />
     </indentOptions>
   </codeStyleSettings>
-  <codeStyleSettings language="kotlin">
-    <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="1" />
-    <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
-    <option name="CALL_PARAMETERS_WRAP" value="1" />
-    <option name="METHOD_PARAMETERS_WRAP" value="1" />
-    <option name="EXTENDS_LIST_WRAP" value="1" />
-  </codeStyleSettings>
   <codeStyleSettings language="SQL">
     <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
     <option name="PARENT_SETTINGS_INSTALLED" value="true" />
@@ -263,11 +260,6 @@
     <option name="PARENT_SETTINGS_INSTALLED" value="true" />
   </codeStyleSettings>
   <codeStyleSettings language="XML">
-    <indentOptions>
-      <option name="INDENT_SIZE" value="2" />
-      <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      <option name="TAB_SIZE" value="2" />
-    </indentOptions>
     <arrangement>
       <rules>
         <section>
@@ -379,4 +371,13 @@
       </rules>
     </arrangement>
   </codeStyleSettings>
-</code_scheme>
+  <codeStyleSettings language="kotlin">
+    <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="1" />
+    <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+    <option name="CALL_PARAMETERS_WRAP" value="1" />
+    <option name="METHOD_PARAMETERS_WRAP" value="1" />
+    <option name="EXTENDS_LIST_WRAP" value="1" />
+  </codeStyleSettings>
+</code_scheme>
\ No newline at end of file

From 11068c76f42d86aa225df4e8b8d3eb953e96895a Mon Sep 17 00:00:00 2001
From: Chuck Greb <chuck@usebutton.com>
Date: Wed, 17 Jan 2018 14:32:41 -0500
Subject: [PATCH 5/6] Updates XML continuation indent from 8 to 4 spaces

---
 configs/codestyles/ButtonAndroid.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/configs/codestyles/ButtonAndroid.xml b/configs/codestyles/ButtonAndroid.xml
index ffbd591..e908d65 100644
--- a/configs/codestyles/ButtonAndroid.xml
+++ b/configs/codestyles/ButtonAndroid.xml
@@ -260,6 +260,9 @@
     <option name="PARENT_SETTINGS_INSTALLED" value="true" />
   </codeStyleSettings>
   <codeStyleSettings language="XML">
+    <indentOptions>
+      <option name="CONTINUATION_INDENT_SIZE" value="4" />
+    </indentOptions>
     <arrangement>
       <rules>
         <section>

From e3825d1767abb370f692d3d8479608e2c17d355d Mon Sep 17 00:00:00 2001
From: Pedro Veloso <pedro@usebutton.com>
Date: Fri, 13 Mar 2020 15:30:02 -0400
Subject: [PATCH 6/6] Add JavaDoc rules for newer IDE codestyle file format

---
 configs/codestyles/ButtonAndroid.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/configs/codestyles/ButtonAndroid.xml b/configs/codestyles/ButtonAndroid.xml
index e908d65..5f8d5a4 100644
--- a/configs/codestyles/ButtonAndroid.xml
+++ b/configs/codestyles/ButtonAndroid.xml
@@ -74,6 +74,13 @@
   </AndroidXmlCodeStyleSettings>
   <JavaCodeStyleSettings>
     <option name="CLASS_NAMES_IN_JAVADOC" value="3" />
+    <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" />
   </JavaCodeStyleSettings>
   <JetCodeStyleSettings>
     <option name="PACKAGES_TO_USE_STAR_IMPORTS">