From e911d1a0c482a2cc0f42ecdaf7a9b3c3cc87407a Mon Sep 17 00:00:00 2001 From: Saeed Masoumi Date: Wed, 23 Dec 2015 23:06:41 +0330 Subject: [PATCH 1/8] Added 6thsolution style settings, removed Square and SquareAndroid styles --- README.md | 2 +- configs/codestyles/6thsolution.xml | 223 +++++++++++ configs/codestyles/Square.xml | 281 ------------- configs/codestyles/SquareAndroid.xml | 372 ------------------ .../{Square.xml => 6thsolution.xml} | 2 +- install.sh | 6 +- 6 files changed, 228 insertions(+), 658 deletions(-) create mode 100644 configs/codestyles/6thsolution.xml delete mode 100644 configs/codestyles/Square.xml delete mode 100644 configs/codestyles/SquareAndroid.xml rename configs/inspection/{Square.xml => 6thsolution.xml} (87%) diff --git a/README.md b/README.md index dcc3aac..981018a 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 6thsolution's Android projects. Installation diff --git a/configs/codestyles/6thsolution.xml b/configs/codestyles/6thsolution.xml new file mode 100644 index 0000000..1d5f7c9 --- /dev/null +++ b/configs/codestyles/6thsolution.xml @@ -0,0 +1,223 @@ + + + + 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/SquareAndroid.xml deleted file mode 100644 index 74c58f8..0000000 --- a/configs/codestyles/SquareAndroid.xml +++ /dev/null @@ -1,372 +0,0 @@ - - - - - \ No newline at end of file diff --git a/configs/inspection/Square.xml b/configs/inspection/6thsolution.xml similarity index 87% rename from configs/inspection/Square.xml rename to configs/inspection/6thsolution.xml index 361afca..a92d3a7 100644 --- a/configs/inspection/Square.xml +++ b/configs/inspection/6thsolution.xml @@ -1,6 +1,6 @@ - diff --git a/install.sh b/install.sh index b7617b1..c7ff996 100755 --- a/install.sh +++ b/install.sh @@ -1,7 +1,7 @@ #!/bin/bash -# Installs Square's IntelliJ configs into your user configs. +# Installs 6thsolution's IntelliJ configs into your user configs. -echo "Installing Square IntelliJ configs..." +echo "Installing 6thsolution IntelliJ configs..." CONFIGS="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/configs" @@ -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 '6thsolution'." From 98f52dee29aabd1bac4a1dfa65bcf03aca85604d Mon Sep 17 00:00:00 2001 From: Saeed Masoumi Date: Fri, 25 Dec 2015 22:05:41 +0330 Subject: [PATCH 2/8] force javadoc to wrap at right margin --- configs/codestyles/6thsolution.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/codestyles/6thsolution.xml b/configs/codestyles/6thsolution.xml index 1d5f7c9..339b85a 100644 --- a/configs/codestyles/6thsolution.xml +++ b/configs/codestyles/6thsolution.xml @@ -27,6 +27,7 @@