From 0c86e57c44a8e43f69591b784f4e5d842a9a0ea3 Mon Sep 17 00:00:00 2001
From: Jiayu Liu <jimexist@gmail.com>
Date: Mon, 6 Jun 2016 16:26:21 +0800
Subject: [PATCH 1/7] renaming

---
 configs/codestyles/{Square.xml => Mada.xml}            | 10 +++++-----
 .../codestyles/{SquareAndroid.xml => MadaAndroid.xml}  |  4 ++--
 configs/inspection/{Square.xml => Mada.xml}            |  2 +-
 install.bat                                            |  6 +++---
 install.sh                                             |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)
 rename configs/codestyles/{Square.xml => Mada.xml} (98%)
 rename configs/codestyles/{SquareAndroid.xml => MadaAndroid.xml} (99%)
 rename configs/inspection/{Square.xml => Mada.xml} (88%)

diff --git a/configs/codestyles/Square.xml b/configs/codestyles/Mada.xml
similarity index 98%
rename from configs/codestyles/Square.xml
rename to configs/codestyles/Mada.xml
index 0d5bd27..481d0fa 100644
--- a/configs/codestyles/Square.xml
+++ b/configs/codestyles/Mada.xml
@@ -1,11 +1,11 @@
-<code_scheme name="Square">
+<code_scheme name="Mada">
   <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="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" />
@@ -25,7 +25,7 @@
       <package name="" withSubpackages="true" static="true" />
     </value>
   </option>
-  <option name="RIGHT_MARGIN" value="100" />
+  <option name="RIGHT_MARGIN" value="160" />
   <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" />
@@ -278,4 +278,4 @@
       <option name="TAB_SIZE" value="2" />
     </indentOptions>
   </codeStyleSettings>
-</code_scheme>
\ No newline at end of file
+</code_scheme>
diff --git a/configs/codestyles/SquareAndroid.xml b/configs/codestyles/MadaAndroid.xml
similarity index 99%
rename from configs/codestyles/SquareAndroid.xml
rename to configs/codestyles/MadaAndroid.xml
index 9601db8..04c9641 100644
--- a/configs/codestyles/SquareAndroid.xml
+++ b/configs/codestyles/MadaAndroid.xml
@@ -1,4 +1,4 @@
-<code_scheme name="SquareAndroid">
+<code_scheme name="MadaAndroid">
   <option name="USE_SAME_INDENTS" value="true" />
   <option name="IGNORE_SAME_INDENTS_FOR_LANGUAGES" value="true" />
   <option name="OTHER_INDENT_OPTIONS">
@@ -380,4 +380,4 @@
       </rules>
     </arrangement>
   </codeStyleSettings>
-</code_scheme>
\ No newline at end of file
+</code_scheme>
diff --git a/configs/inspection/Square.xml b/configs/inspection/Mada.xml
similarity index 88%
rename from configs/inspection/Square.xml
rename to configs/inspection/Mada.xml
index 361afca..bd76814 100644
--- a/configs/inspection/Square.xml
+++ b/configs/inspection/Mada.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inspections version="1.0" is_locked="false">
-  <option name="myName" value="Square" />
+  <option name="myName" value="Mada" />
   <inspection_tool class="FallthruInSwitchStatement" enabled="true" level="ERROR" enabled_by_default="true" />
   <inspection_tool class="UnnecessarySemicolon" enabled="true" level="ERROR" enabled_by_default="true" />
 </inspections>
diff --git a/install.bat b/install.bat
index a2b416c..6a2d7a5 100644
--- a/install.bat
+++ b/install.bat
@@ -1,6 +1,6 @@
-REM Installs Square's IntelliJ configs into your user configs.
+REM Installs Mada's IntelliJ configs into your user configs.
 @echo off
-echo Installing Square IntelliJ configs...
+echo Installing Mada IntelliJ configs...
 
 setlocal enableDelayedExpansion
 
@@ -9,7 +9,7 @@ for /D %%i in (%userprofile%\.IdeaIC*) do call :copy_config %%i
 for /D %%i in (%userprofile%\.IntelliJIdea*) do call :copy_config %%i
 
 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 'Mada' or 'MadaAndroid'.
 exit /b
 
 REM sub function for copy config files
diff --git a/install.sh b/install.sh
index aacb8e9..e6516a4 100755
--- a/install.sh
+++ b/install.sh
@@ -26,4 +26,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 'Mada' or 'MadaAndroid'."

From 104d1e81a431811ad348c677bd69916692c09e03 Mon Sep 17 00:00:00 2001
From: Jiayu Liu <jimexist@gmail.com>
Date: Mon, 6 Jun 2016 16:33:47 +0800
Subject: [PATCH 2/7] java indentation to 4

---
 README.md                   | 2 +-
 configs/codestyles/Mada.xml | 4 ++--
 install.sh                  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 9ad7c0e..e3d28d5 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 Java Code Styles
 ================
 
-IntelliJ IDEA code style settings for Square's Java and Android projects.
+IntelliJ IDEA code style settings for Mada's Java and Android projects.
 
 
 Installation
diff --git a/configs/codestyles/Mada.xml b/configs/codestyles/Mada.xml
index 481d0fa..9587056 100644
--- a/configs/codestyles/Mada.xml
+++ b/configs/codestyles/Mada.xml
@@ -188,9 +188,9 @@
     <option name="ENUM_CONSTANTS_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="JSON">
diff --git a/install.sh b/install.sh
index e6516a4..557d58b 100755
--- a/install.sh
+++ b/install.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Installs Square's IntelliJ configs into your user configs.
+# Installs Mada's IntelliJ configs into your user configs.
 
-echo "Installing Square IntelliJ configs..."
+echo "Installing Mada IntelliJ configs..."
 
 CONFIGS="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/configs"
 

From 5a3875284f3d36b1948bd2a997a57885bf7c1b1b Mon Sep 17 00:00:00 2001
From: Jiayu Liu <jimexist@gmail.com>
Date: Mon, 6 Jun 2016 16:36:05 +0800
Subject: [PATCH 3/7] continuation size to 8

---
 configs/codestyles/Mada.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configs/codestyles/Mada.xml b/configs/codestyles/Mada.xml
index 9587056..b76b4ac 100644
--- a/configs/codestyles/Mada.xml
+++ b/configs/codestyles/Mada.xml
@@ -4,7 +4,7 @@
   <option name="OTHER_INDENT_OPTIONS">
     <value>
       <option name="INDENT_SIZE" value="4" />
-      <option name="CONTINUATION_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" />
@@ -189,7 +189,7 @@
     <option name="PARENT_SETTINGS_INSTALLED" value="true" />
     <indentOptions>
       <option name="INDENT_SIZE" value="4" />
-      <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      <option name="CONTINUATION_INDENT_SIZE" value="8" />
       <option name="TAB_SIZE" value="4" />
     </indentOptions>
   </codeStyleSettings>

From 15de8264576b7412a7415fe14511a1b1372fa49a Mon Sep 17 00:00:00 2001
From: Jiayu Liu <jimexist@gmail.com>
Date: Mon, 6 Jun 2016 16:50:59 +0800
Subject: [PATCH 4/7] keep 4 for xml indentation

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

diff --git a/configs/codestyles/Mada.xml b/configs/codestyles/Mada.xml
index b76b4ac..f6161b9 100644
--- a/configs/codestyles/Mada.xml
+++ b/configs/codestyles/Mada.xml
@@ -273,9 +273,9 @@
   </codeStyleSettings>
   <codeStyleSettings language="XML">
     <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>
 </code_scheme>

From de92beb2d44101c424195006fb4017b63f4eb0da Mon Sep 17 00:00:00 2001
From: Jiayu Liu <jimexist@gmail.com>
Date: Mon, 6 Jun 2016 17:07:43 +0800
Subject: [PATCH 5/7] align multiline param

---
 configs/codestyles/Mada.xml        | 12 ++++++------
 configs/codestyles/MadaAndroid.xml | 14 +++++++-------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/configs/codestyles/Mada.xml b/configs/codestyles/Mada.xml
index f6161b9..ed7a4e5 100644
--- a/configs/codestyles/Mada.xml
+++ b/configs/codestyles/Mada.xml
@@ -38,7 +38,7 @@
   <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_PARAMETERS" value="true" />
   <option name="ALIGN_MULTILINE_FOR" value="false" />
   <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
   <option name="CALL_PARAMETERS_WRAP" value="1" />
@@ -108,7 +108,7 @@
   <codeStyleSettings language="CoffeeScript">
     <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
     <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
-    <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+    <option name="ALIGN_MULTILINE_PARAMETERS" value="true" />
     <option name="METHOD_PARAMETERS_WRAP" value="1" />
     <option name="PARENT_SETTINGS_INSTALLED" value="true" />
   </codeStyleSettings>
@@ -117,7 +117,7 @@
     <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_PARAMETERS" value="true" />
     <option name="ALIGN_MULTILINE_FOR" value="false" />
     <option name="CALL_PARAMETERS_WRAP" value="1" />
     <option name="METHOD_PARAMETERS_WRAP" value="1" />
@@ -158,7 +158,7 @@
     <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_PARAMETERS" value="true" />
     <option name="ALIGN_MULTILINE_FOR" value="false" />
     <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
     <option name="CALL_PARAMETERS_WRAP" value="1" />
@@ -208,7 +208,7 @@
     <option name="KEEP_LINE_BREAKS" value="false" />
     <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
     <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
-    <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+    <option name="ALIGN_MULTILINE_PARAMETERS" value="true" />
     <option name="ALIGN_MULTILINE_FOR" value="false" />
     <option name="BINARY_OPERATION_WRAP" value="5" />
     <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
@@ -252,7 +252,7 @@
   <codeStyleSettings language="TypeScript">
     <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
     <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
-    <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+    <option name="ALIGN_MULTILINE_PARAMETERS" value="true" />
     <option name="ALIGN_MULTILINE_FOR" value="false" />
     <option name="CALL_PARAMETERS_WRAP" value="1" />
     <option name="METHOD_PARAMETERS_WRAP" value="1" />
diff --git a/configs/codestyles/MadaAndroid.xml b/configs/codestyles/MadaAndroid.xml
index 04c9641..482747b 100644
--- a/configs/codestyles/MadaAndroid.xml
+++ b/configs/codestyles/MadaAndroid.xml
@@ -40,7 +40,7 @@
   <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_PARAMETERS" value="true" />
   <option name="ALIGN_MULTILINE_FOR" value="false" />
   <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
   <option name="CALL_PARAMETERS_WRAP" value="1" />
@@ -114,7 +114,7 @@
     <option name="KEEP_LINE_BREAKS" value="false" />
     <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
     <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
-    <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+    <option name="ALIGN_MULTILINE_PARAMETERS" value="true" />
     <option name="METHOD_PARAMETERS_WRAP" value="1" />
     <option name="PARENT_SETTINGS_INSTALLED" value="true" />
   </codeStyleSettings>
@@ -124,7 +124,7 @@
     <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_PARAMETERS" value="true" />
     <option name="ALIGN_MULTILINE_FOR" value="false" />
     <option name="CALL_PARAMETERS_WRAP" value="1" />
     <option name="METHOD_PARAMETERS_WRAP" value="1" />
@@ -160,7 +160,7 @@
     <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_PARAMETERS" value="true" />
     <option name="ALIGN_MULTILINE_FOR" value="false" />
     <option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACES" value="true" />
     <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
@@ -206,7 +206,7 @@
     <option name="KEEP_LINE_BREAKS" value="false" />
     <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
     <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
-    <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+    <option name="ALIGN_MULTILINE_PARAMETERS" value="true" />
     <option name="ALIGN_MULTILINE_FOR" value="false" />
     <option name="CALL_PARAMETERS_WRAP" value="1" />
     <option name="METHOD_PARAMETERS_WRAP" value="1" />
@@ -227,7 +227,7 @@
     </indentOptions>
   </codeStyleSettings>
   <codeStyleSettings language="kotlin">
-    <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+    <option name="ALIGN_MULTILINE_PARAMETERS" value="true" />
     <option name="CALL_PARAMETERS_WRAP" value="1" />
     <option name="METHOD_PARAMETERS_WRAP" value="1" />
     <indentOptions>
@@ -244,7 +244,7 @@
     <option name="KEEP_LINE_BREAKS" value="false" />
     <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
     <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
-    <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+    <option name="ALIGN_MULTILINE_PARAMETERS" value="true" />
     <option name="ALIGN_MULTILINE_FOR" value="false" />
     <option name="CALL_PARAMETERS_WRAP" value="1" />
     <option name="METHOD_PARAMETERS_WRAP" value="1" />

From 677a9b6d1036147ae62da6efd1e4496d8581cad6 Mon Sep 17 00:00:00 2001
From: Jiayu Liu <jimexist@gmail.com>
Date: Fri, 12 Aug 2016 16:29:24 +0800
Subject: [PATCH 6/7] fix java continuation style

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

diff --git a/configs/codestyles/Mada.xml b/configs/codestyles/Mada.xml
index ed7a4e5..ea53284 100644
--- a/configs/codestyles/Mada.xml
+++ b/configs/codestyles/Mada.xml
@@ -189,7 +189,7 @@
     <option name="PARENT_SETTINGS_INSTALLED" value="true" />
     <indentOptions>
       <option name="INDENT_SIZE" value="4" />
-      <option name="CONTINUATION_INDENT_SIZE" value="8" />
+      <option name="CONTINUATION_INDENT_SIZE" value="4" />
       <option name="TAB_SIZE" value="4" />
     </indentOptions>
   </codeStyleSettings>

From 7e8691455c03dab1ba06c16838f257c16f7fb9a3 Mon Sep 17 00:00:00 2001
From: Jiayu Liu <jimexist@gmail.com>
Date: Sun, 14 Aug 2016 18:33:08 +0800
Subject: [PATCH 7/7] annotation wrapping

---
 configs/codestyles/Mada.xml | 39 ++++++-------------------------------
 1 file changed, 6 insertions(+), 33 deletions(-)

diff --git a/configs/codestyles/Mada.xml b/configs/codestyles/Mada.xml
index ea53284..65ab851 100644
--- a/configs/codestyles/Mada.xml
+++ b/configs/codestyles/Mada.xml
@@ -1,18 +1,6 @@
 <code_scheme name="Mada">
   <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">
@@ -38,7 +26,6 @@
   <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="true" />
   <option name="ALIGN_MULTILINE_FOR" value="false" />
   <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
   <option name="CALL_PARAMETERS_WRAP" value="1" />
@@ -117,7 +104,6 @@
     <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="true" />
     <option name="ALIGN_MULTILINE_FOR" value="false" />
     <option name="CALL_PARAMETERS_WRAP" value="1" />
     <option name="METHOD_PARAMETERS_WRAP" value="1" />
@@ -133,11 +119,10 @@
     <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="METHOD_ANNOTATION_WRAP" value="0" />
+    <option name="CLASS_ANNOTATION_WRAP" value="0" />
+    <option name="FIELD_ANNOTATION_WRAP" value="0" />
     <option name="PARAMETER_ANNOTATION_WRAP" value="1" />
-    <option name="VARIABLE_ANNOTATION_WRAP" value="1" />
     <option name="ENUM_CONSTANTS_WRAP" value="1" />
     <option name="PARENT_SETTINGS_INSTALLED" value="true" />
     <indentOptions>
@@ -158,7 +143,6 @@
     <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="true" />
     <option name="ALIGN_MULTILINE_FOR" value="false" />
     <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
     <option name="CALL_PARAMETERS_WRAP" value="1" />
@@ -180,17 +164,13 @@
     <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="FIELD_ANNOTATION_WRAP" value="0" />
     <option name="PARAMETER_ANNOTATION_WRAP" value="1" />
-    <option name="VARIABLE_ANNOTATION_WRAP" value="1" />
+    <option name="VARIABLE_ANNOTATION_WRAP" value="2" />
     <option name="ENUM_CONSTANTS_WRAP" value="1" />
     <option name="PARENT_SETTINGS_INSTALLED" value="true" />
     <indentOptions>
-      <option name="INDENT_SIZE" value="4" />
       <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      <option name="TAB_SIZE" value="4" />
     </indentOptions>
   </codeStyleSettings>
   <codeStyleSettings language="JSON">
@@ -271,11 +251,4 @@
     <option name="WHILE_BRACE_FORCE" value="1" />
     <option name="PARENT_SETTINGS_INSTALLED" value="true" />
   </codeStyleSettings>
-  <codeStyleSettings language="XML">
-    <indentOptions>
-      <option name="INDENT_SIZE" value="4" />
-      <option name="CONTINUATION_INDENT_SIZE" value="8" />
-      <option name="TAB_SIZE" value="4" />
-    </indentOptions>
-  </codeStyleSettings>
-</code_scheme>
+</code_scheme>
\ No newline at end of file