diff --git a/README.md b/README.md index dcc3aac..d7c6579 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,25 @@ Java Code Styles ================ -IntelliJ IDEA code style settings for Square's Java and Android projects. +IntelliJ IDEA code style settings for Voyager's Android projects. +Notable changes from Square's +----------------------------- +* All annotations always consume one line each, same as enum constants. +* Multiple parameters (Wrap if long and aligned). +* New line after ‘}’ on try-catch, switch, if-else statements (easier editing if using command line text editors such as vim). +* Force usage of braces on for and if-else statements even if only having a single line of code. +* 100 fixed column width. +* Ensure right margin not exceeded. +* Field (‘m’) and Static (’s’) auto removal for getters and setters of var name. + Installation ------------ * Run the `install.sh` script. * Restart IntelliJ if it's running. - * Open IntelliJ Project Settings -> Code Styles, change the code style for the - project to the one you want. + * Open IntelliJ Project Settings -> Code Styles, change the code style to 'VoyagerAndroid' License diff --git a/configs/codestyles/Square.xml b/configs/codestyles/Square.xml deleted file mode 100644 index 0d5bd27..0000000 --- a/configs/codestyles/Square.xml +++ /dev/null @@ -1,281 +0,0 @@ - - - - - \ No newline at end of file diff --git a/configs/codestyles/SquareAndroid.xml b/configs/codestyles/VoyagerAndroid.xml similarity index 71% rename from configs/codestyles/SquareAndroid.xml rename to configs/codestyles/VoyagerAndroid.xml index 9601db8..831d8f3 100644 --- a/configs/codestyles/SquareAndroid.xml +++ b/configs/codestyles/VoyagerAndroid.xml @@ -1,4 +1,4 @@ - + + + - - - + +