From cb2b0b0276d6ceb66592390fcdb6f444dcfe75d2 Mon Sep 17 00:00:00 2001
From: Quentin HUET <quentin.huet@chauffeur-prive.com>
Date: Wed, 12 Oct 2016 09:34:04 +0200
Subject: [PATCH 1/7] TECH add cp code styles and inspection rules

---
 configs/codestyles/SquareAndroid.xml | 82 +++++++++++++++++-----------
 configs/inspection/Square.xml        |  6 +-
 2 files changed, 51 insertions(+), 37 deletions(-)

diff --git a/configs/codestyles/SquareAndroid.xml b/configs/codestyles/SquareAndroid.xml
index 9601db8..f1700d2 100644
--- a/configs/codestyles/SquareAndroid.xml
+++ b/configs/codestyles/SquareAndroid.xml
@@ -13,6 +13,7 @@
       <option name="USE_RELATIVE_INDENTS" value="false" />
     </value>
   </option>
+  <option name="USE_EXTERNAL_ANNOTATIONS" value="true" />
   <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">
@@ -79,16 +80,37 @@
     </option>
   </AndroidXmlCodeStyleSettings>
   <JavaCodeStyleSettings>
+    <option name="DO_NOT_WRAP_AFTER_SINGLE_ANNOTATION" value="true" />
     <option name="CLASS_NAMES_IN_JAVADOC" value="3" />
   </JavaCodeStyleSettings>
-  <JetCodeStyleSettings>
-    <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-      <value />
-    </option>
-    <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="999" />
-    <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="999" />
-    <option name="IMPORT_NESTED_CLASSES" value="true" />
-  </JetCodeStyleSettings>
+  <Objective-C-extensions>
+    <option name="GENERATE_INSTANCE_VARIABLES_FOR_PROPERTIES" value="ASK" />
+    <option name="RELEASE_STYLE" value="IVAR" />
+    <option name="TYPE_QUALIFIERS_PLACEMENT" value="BEFORE" />
+    <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" />
@@ -153,15 +175,17 @@
     </indentOptions>
   </codeStyleSettings>
   <codeStyleSettings language="JAVA">
+    <option name="RIGHT_MARGIN" value="100" />
     <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="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+    <option name="ALIGN_MULTILINE_EXTENDS_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="1" />
@@ -169,10 +193,9 @@
     <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="EXTENDS_KEYWORD_WRAP" value="2" />
+    <option name="METHOD_CALL_CHAIN_WRAP" value="2" />
+    <option name="BINARY_OPERATION_WRAP" value="1" />
     <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" />
@@ -180,22 +203,17 @@
     <option name="ARRAY_INITIALIZER_WRAP" value="1" />
     <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="1" />
     <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="CLASS_ANNOTATION_WRAP" value="5" />
     <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="2" />
     <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="JSON">
     <option name="KEEP_LINE_BREAKS" value="false" />
@@ -226,16 +244,6 @@
       <option name="TAB_SIZE" value="2" />
     </indentOptions>
   </codeStyleSettings>
-  <codeStyleSettings language="kotlin">
-    <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
-    <option name="CALL_PARAMETERS_WRAP" value="1" />
-    <option name="METHOD_PARAMETERS_WRAP" value="1" />
-    <indentOptions>
-      <option name="INDENT_SIZE" value="2" />
-      <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      <option name="TAB_SIZE" value="2" />
-    </indentOptions>
-  </codeStyleSettings>
   <codeStyleSettings language="SQL">
     <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
     <option name="PARENT_SETTINGS_INSTALLED" value="true" />
@@ -265,9 +273,7 @@
   </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>
@@ -310,7 +316,7 @@
             </match>
           </rule>
         </section>
-         <section>
+        <section>
           <rule>
             <match>
               <AND>
@@ -380,4 +386,14 @@
       </rules>
     </arrangement>
   </codeStyleSettings>
+  <codeStyleSettings language="kotlin">
+    <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+    <option name="CALL_PARAMETERS_WRAP" value="1" />
+    <option name="METHOD_PARAMETERS_WRAP" value="1" />
+    <indentOptions>
+      <option name="INDENT_SIZE" value="2" />
+      <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      <option name="TAB_SIZE" value="2" />
+    </indentOptions>
+  </codeStyleSettings>
 </code_scheme>
\ No newline at end of file
diff --git a/configs/inspection/Square.xml b/configs/inspection/Square.xml
index 361afca..e408e32 100644
--- a/configs/inspection/Square.xml
+++ b/configs/inspection/Square.xml
@@ -1,7 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inspections version="1.0" is_locked="false">
+<inspections profile_name="Square" version="1.0">
   <option name="myName" value="Square" />
   <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>
-
+</inspections>
\ No newline at end of file

From c458ef7dfd291e3883f5a1256c6fe113fe723b41 Mon Sep 17 00:00:00 2001
From: Quentin HUET <quentin.huet@chauffeur-prive.com>
Date: Wed, 12 Oct 2016 10:30:22 +0200
Subject: [PATCH 2/7] TECH rebrand files with our company name

---
 configs/codestyles/{Square.xml => ChauffeurPrive.xml}             | 0
 .../codestyles/{SquareAndroid.xml => ChauffeurPriveAndroid.xml}   | 0
 configs/inspection/{Square.xml => ChauffeurPrive.xml}             | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename configs/codestyles/{Square.xml => ChauffeurPrive.xml} (100%)
 rename configs/codestyles/{SquareAndroid.xml => ChauffeurPriveAndroid.xml} (100%)
 rename configs/inspection/{Square.xml => ChauffeurPrive.xml} (100%)

diff --git a/configs/codestyles/Square.xml b/configs/codestyles/ChauffeurPrive.xml
similarity index 100%
rename from configs/codestyles/Square.xml
rename to configs/codestyles/ChauffeurPrive.xml
diff --git a/configs/codestyles/SquareAndroid.xml b/configs/codestyles/ChauffeurPriveAndroid.xml
similarity index 100%
rename from configs/codestyles/SquareAndroid.xml
rename to configs/codestyles/ChauffeurPriveAndroid.xml
diff --git a/configs/inspection/Square.xml b/configs/inspection/ChauffeurPrive.xml
similarity index 100%
rename from configs/inspection/Square.xml
rename to configs/inspection/ChauffeurPrive.xml

From e2f809993f608f21ab38856861bbd05212dc53bb Mon Sep 17 00:00:00 2001
From: Quentin HUET <quentin.huet@chauffeur-prive.com>
Date: Wed, 12 Oct 2016 10:36:26 +0200
Subject: [PATCH 3/7] TECH rebrand install files

---
 README.md   | 2 +-
 install.bat | 6 +++---
 install.sh  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 9ad7c0e..dbc64f1 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 ChauffeurPrive's Java and Android projects.
 
 
 Installation
diff --git a/install.bat b/install.bat
index a2b416c..76f4565 100644
--- a/install.bat
+++ b/install.bat
@@ -1,6 +1,6 @@
-REM Installs Square's IntelliJ configs into your user configs.
+REM Installs ChauffeurPrive's IntelliJ configs into your user configs.
 @echo off
-echo Installing Square IntelliJ configs...
+echo Installing ChauffeurPrive 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 'ChauffeurPrive' or 'ChauffeurPriveAndroid'.
 exit /b
 
 REM sub function for copy config files
diff --git a/install.sh b/install.sh
index a03a9a1..a62b462 100755
--- a/install.sh
+++ b/install.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Installs Square's IntelliJ configs into your user configs.
 
-echo "Installing Square IntelliJ configs..."
+echo "Installing Chauffeur-Prive 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 'ChauffeurPrive' or 'ChauffeurPriveAndroid'."

From 8f8cdf710e49a78052fc18fc48901a656be2322c Mon Sep 17 00:00:00 2001
From: Quentin HUET <quentin.huet@epitech.eu>
Date: Wed, 12 Oct 2016 12:02:21 +0200
Subject: [PATCH 4/7] Update with ChauffeurPrive code styles

* TECH add cp code styles and inspection rules

* TECH rebrand files with our company name

* TECH rebrand install files

* TECH changed company name used inside of config files
---
 configs/codestyles/ChauffeurPrive.xml        | 4 ++--
 configs/codestyles/ChauffeurPriveAndroid.xml | 4 ++--
 configs/inspection/ChauffeurPrive.xml        | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/configs/codestyles/ChauffeurPrive.xml b/configs/codestyles/ChauffeurPrive.xml
index 0d5bd27..39607e8 100644
--- a/configs/codestyles/ChauffeurPrive.xml
+++ b/configs/codestyles/ChauffeurPrive.xml
@@ -1,4 +1,4 @@
-<code_scheme name="Square">
+<code_scheme name="ChauffeurPrive">
   <option name="USE_SAME_INDENTS" value="true" />
   <option name="IGNORE_SAME_INDENTS_FOR_LANGUAGES" value="true" />
   <option name="OTHER_INDENT_OPTIONS">
@@ -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/ChauffeurPriveAndroid.xml b/configs/codestyles/ChauffeurPriveAndroid.xml
index f1700d2..726165c 100644
--- a/configs/codestyles/ChauffeurPriveAndroid.xml
+++ b/configs/codestyles/ChauffeurPriveAndroid.xml
@@ -1,4 +1,4 @@
-<code_scheme name="SquareAndroid">
+<code_scheme name="ChauffeurPriveAndroid">
   <option name="USE_SAME_INDENTS" value="true" />
   <option name="IGNORE_SAME_INDENTS_FOR_LANGUAGES" value="true" />
   <option name="OTHER_INDENT_OPTIONS">
@@ -396,4 +396,4 @@
       <option name="TAB_SIZE" value="2" />
     </indentOptions>
   </codeStyleSettings>
-</code_scheme>
\ No newline at end of file
+</code_scheme>
diff --git a/configs/inspection/ChauffeurPrive.xml b/configs/inspection/ChauffeurPrive.xml
index e408e32..70fa0ad 100644
--- a/configs/inspection/ChauffeurPrive.xml
+++ b/configs/inspection/ChauffeurPrive.xml
@@ -1,5 +1,5 @@
-<inspections profile_name="Square" version="1.0">
-  <option name="myName" value="Square" />
+<inspections profile_name="ChauffeurPrive" version="1.0">
+  <option name="myName" value="ChauffeurPrive" />
   <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>
\ No newline at end of file
+</inspections>

From d1bb06a065a805f333b3930e4a3807e139c8f424 Mon Sep 17 00:00:00 2001
From: Etienne Pinault <etienne.pinault@chauffeur-prive.com>
Date: Wed, 12 Oct 2016 16:54:14 +0200
Subject: [PATCH 5/7] TECH mainly modified imports order

---
 configs/codestyles/ChauffeurPriveAndroid.xml | 45 ++++++++++++++------
 1 file changed, 31 insertions(+), 14 deletions(-)

diff --git a/configs/codestyles/ChauffeurPriveAndroid.xml b/configs/codestyles/ChauffeurPriveAndroid.xml
index 726165c..47464a8 100644
--- a/configs/codestyles/ChauffeurPriveAndroid.xml
+++ b/configs/codestyles/ChauffeurPriveAndroid.xml
@@ -21,8 +21,17 @@
   </option>
   <option name="IMPORT_LAYOUT_TABLE">
     <value>
+      <package name="android" withSubpackages="true" static="false" />
+      <emptyLine />
+      <package name="butterknife" withSubpackages="true" static="false" />
+      <emptyLine />
       <package name="" withSubpackages="true" static="false" />
       <emptyLine />
+      <package name="java" withSubpackages="true" static="false" />
+      <package name="javax" withSubpackages="true" static="false" />
+      <emptyLine />
+      <package name="fr.chauffeurprive" withSubpackages="true" static="false" />
+      <emptyLine />
       <package name="" withSubpackages="true" static="true" />
     </value>
   </option>
@@ -81,6 +90,8 @@
   </AndroidXmlCodeStyleSettings>
   <JavaCodeStyleSettings>
     <option name="DO_NOT_WRAP_AFTER_SINGLE_ANNOTATION" value="true" />
+    <option name="ANNOTATION_PARAMETER_WRAP" value="5" />
+    <option name="ALIGN_MULTILINE_ANNOTATION_PARAMETERS" value="true" />
     <option name="CLASS_NAMES_IN_JAVADOC" value="3" />
   </JavaCodeStyleSettings>
   <Objective-C-extensions>
@@ -182,37 +193,43 @@
     <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_IN_CALLS" value="true" />
     <option name="ALIGN_MULTILINE_FOR" value="false" />
     <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+    <option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
     <option name="ALIGN_MULTILINE_EXTENDS_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="1" />
-    <option name="METHOD_PARAMETERS_WRAP" value="1" />
+    <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="1" />
+    <option name="EXTENDS_LIST_WRAP" value="5" />
     <option name="THROWS_LIST_WRAP" value="1" />
     <option name="EXTENDS_KEYWORD_WRAP" value="2" />
     <option name="METHOD_CALL_CHAIN_WRAP" value="2" />
-    <option name="BINARY_OPERATION_WRAP" value="1" />
+    <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_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="1" />
+    <option name="KEEP_SIMPLE_METHODS_IN_ONE_LINE" value="true" />
+    <option name="KEEP_SIMPLE_LAMBDAS_IN_ONE_LINE" value="true" />
+    <option name="KEEP_SIMPLE_CLASSES_IN_ONE_LINE" value="true" />
+    <option name="FOR_STATEMENT_WRAP" value="5" />
+    <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="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="FOR_BRACE_FORCE" value="1" />
+    <option name="WRAP_LONG_LINES" value="true" />
+    <option name="METHOD_ANNOTATION_WRAP" value="5" />
     <option name="CLASS_ANNOTATION_WRAP" value="5" />
-    <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="2" />
+    <option name="FIELD_ANNOTATION_WRAP" value="5" />
+    <option name="PARAMETER_ANNOTATION_WRAP" value="5" />
+    <option name="VARIABLE_ANNOTATION_WRAP" value="5" />
+    <option name="ENUM_CONSTANTS_WRAP" value="5" />
     <option name="PARENT_SETTINGS_INSTALLED" value="true" />
   </codeStyleSettings>
   <codeStyleSettings language="JSON">
@@ -396,4 +413,4 @@
       <option name="TAB_SIZE" value="2" />
     </indentOptions>
   </codeStyleSettings>
-</code_scheme>
+</code_scheme>
\ No newline at end of file

From 0b5e83e7fcfec68e764b5ad660ca2ac61ea27dd4 Mon Sep 17 00:00:00 2001
From: Quentin HUET <quentin.huet@epitech.eu>
Date: Tue, 7 Mar 2017 18:13:47 +0100
Subject: [PATCH 6/7] TECH update code style with new guidelines

* TECH update code sttyle with new guidelines

* TECH update code sttyle with new guidelines
---
 configs/codestyles/ChauffeurPriveAndroid.xml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/configs/codestyles/ChauffeurPriveAndroid.xml b/configs/codestyles/ChauffeurPriveAndroid.xml
index 47464a8..1964047 100644
--- a/configs/codestyles/ChauffeurPriveAndroid.xml
+++ b/configs/codestyles/ChauffeurPriveAndroid.xml
@@ -95,9 +95,6 @@
     <option name="CLASS_NAMES_IN_JAVADOC" value="3" />
   </JavaCodeStyleSettings>
   <Objective-C-extensions>
-    <option name="GENERATE_INSTANCE_VARIABLES_FOR_PROPERTIES" value="ASK" />
-    <option name="RELEASE_STYLE" value="IVAR" />
-    <option name="TYPE_QUALIFIERS_PLACEMENT" value="BEFORE" />
     <file>
       <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
       <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
@@ -223,7 +220,6 @@
     <option name="DOWHILE_BRACE_FORCE" value="1" />
     <option name="WHILE_BRACE_FORCE" value="1" />
     <option name="FOR_BRACE_FORCE" value="1" />
-    <option name="WRAP_LONG_LINES" value="true" />
     <option name="METHOD_ANNOTATION_WRAP" value="5" />
     <option name="CLASS_ANNOTATION_WRAP" value="5" />
     <option name="FIELD_ANNOTATION_WRAP" value="5" />
@@ -231,6 +227,18 @@
     <option name="VARIABLE_ANNOTATION_WRAP" value="5" />
     <option name="ENUM_CONSTANTS_WRAP" value="5" />
     <option name="PARENT_SETTINGS_INSTALLED" value="true" />
+    <arrangement>
+      <groups>
+        <group>
+          <type>GETTERS_AND_SETTERS</type>
+          <order>KEEP</order>
+        </group>
+        <group>
+          <type>OVERRIDDEN_METHODS</type>
+          <order>KEEP</order>
+        </group>
+      </groups>
+    </arrangement>
   </codeStyleSettings>
   <codeStyleSettings language="JSON">
     <option name="KEEP_LINE_BREAKS" value="false" />

From 532fbd0942767752033e26b4914f87b11b6a1f6e Mon Sep 17 00:00:00 2001
From: Quentin HUET <quentin.huet@epitech.eu>
Date: Fri, 31 Mar 2017 10:11:49 +0200
Subject: [PATCH 7/7] TECH line break only when method chain has more than 100
 columns

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

diff --git a/configs/codestyles/ChauffeurPriveAndroid.xml b/configs/codestyles/ChauffeurPriveAndroid.xml
index 1964047..82640c8 100644
--- a/configs/codestyles/ChauffeurPriveAndroid.xml
+++ b/configs/codestyles/ChauffeurPriveAndroid.xml
@@ -203,7 +203,7 @@
     <option name="EXTENDS_LIST_WRAP" value="5" />
     <option name="THROWS_LIST_WRAP" value="1" />
     <option name="EXTENDS_KEYWORD_WRAP" value="2" />
-    <option name="METHOD_CALL_CHAIN_WRAP" value="2" />
+    <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" />