From 7ebea0746ea7f60b2d1dab7d3e8720180c5c0263 Mon Sep 17 00:00:00 2001 From: Chuck Greb Date: Tue, 18 Feb 2014 14:20:09 -0500 Subject: [PATCH 1/6] Apply Mapzen specific styles --- README.md | 3 +- configs/Mapzen.xml | 320 ++++++++++++++++++++++++++++++++++++++ configs/MapzenAndroid.xml | 314 +++++++++++++++++++++++++++++++++++++ configs/Square.xml | 247 ----------------------------- configs/SquareAndroid.xml | 218 -------------------------- install.sh | 12 +- 6 files changed, 642 insertions(+), 472 deletions(-) create mode 100644 configs/Mapzen.xml create mode 100644 configs/MapzenAndroid.xml delete mode 100644 configs/Square.xml delete mode 100644 configs/SquareAndroid.xml diff --git a/README.md b/README.md index f11a6a4..35572ba 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 Mapzen's Java and Android projects. Installation @@ -11,3 +11,4 @@ Installation * Restart IntelliJ if it's running. * Open IntelliJ Project Settings -> Code Styles, change the code style for the project to the one you want. + diff --git a/configs/Mapzen.xml b/configs/Mapzen.xml new file mode 100644 index 0000000..9079d5c --- /dev/null +++ b/configs/Mapzen.xml @@ -0,0 +1,320 @@ + + + + + + diff --git a/configs/MapzenAndroid.xml b/configs/MapzenAndroid.xml new file mode 100644 index 0000000..328471e --- /dev/null +++ b/configs/MapzenAndroid.xml @@ -0,0 +1,314 @@ + + + + + + + diff --git a/configs/Square.xml b/configs/Square.xml deleted file mode 100644 index 3b3d125..0000000 --- a/configs/Square.xml +++ /dev/null @@ -1,247 +0,0 @@ - - - - - - - diff --git a/configs/SquareAndroid.xml b/configs/SquareAndroid.xml deleted file mode 100644 index f32574e..0000000 --- a/configs/SquareAndroid.xml +++ /dev/null @@ -1,218 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/install.sh b/install.sh index 17fe044..dbd480b 100755 --- a/install.sh +++ b/install.sh @@ -1,15 +1,15 @@ #!/bin/bash -# Installs Square's IntelliJ configs into your user configs. +# Installs Mapzen's IntelliJ configs into your user configs. -echo "Installing Square code style configs..." +echo "Installing Mapzen code style configs..." -for i in $HOME/Library/Preferences/IntelliJIdea*/codestyles \ - $HOME/Library/Preferences/IdeaIC*/codestyles \ - $HOME/Library/Preferences/AndroidStudio*/codestyles +for i in $HOME/.IntelliJIdea*/config/codestyles \ + $HOME/.IdeaIC*/config/codestyles \ + $HOME/.AndroidStudio*/config/codestyles do cp -frv $( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/configs/* $i 2> /dev/null 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 'Mapzen' or 'MapzenAndroid'." From f204ed2a3f09e9c5d30a8535ed9098a71cf4be79 Mon Sep 17 00:00:00 2001 From: Chuck Greb Date: Wed, 19 Feb 2014 11:51:53 -0500 Subject: [PATCH 2/6] Keep line breaks when reformatting --- configs/MapzenAndroid.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/MapzenAndroid.xml b/configs/MapzenAndroid.xml index 328471e..7dd1cd3 100644 --- a/configs/MapzenAndroid.xml +++ b/configs/MapzenAndroid.xml @@ -147,7 +147,6 @@ - - + + + \ No newline at end of file From e0ccf74ac8980e9d49ecafdd3712dab9edc8adcc Mon Sep 17 00:00:00 2001 From: Chuck Greb Date: Mon, 3 Aug 2015 14:48:58 -0400 Subject: [PATCH 4/6] Modify install script to support OS X --- install.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/install.sh b/install.sh index dbd480b..76e932b 100755 --- a/install.sh +++ b/install.sh @@ -5,7 +5,11 @@ echo "Installing Mapzen code style configs..." for i in $HOME/.IntelliJIdea*/config/codestyles \ $HOME/.IdeaIC*/config/codestyles \ - $HOME/.AndroidStudio*/config/codestyles + $HOME/.AndroidStudio*/config/codestyles \ + $HOME/Library/Preferences/IntelliJIdea*/codestyles \ + $HOME/Library/Preferences/IdeaIC*/codestyles \ + $HOME/Library/Preferences/AndroidStudio*/codestyles + do cp -frv $( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/configs/* $i 2> /dev/null done From d4707fc5a8dbc963c8a9b9f02cee2521cbaa20db Mon Sep 17 00:00:00 2001 From: Chuck Greb Date: Tue, 31 May 2016 14:06:35 -0400 Subject: [PATCH 5/6] Update style --- configs/MapzenAndroid.xml | 215 ++++++++++++++++++++++++++------------ 1 file changed, 148 insertions(+), 67 deletions(-) diff --git a/configs/MapzenAndroid.xml b/configs/MapzenAndroid.xml index a0c340a..5dc954e 100644 --- a/configs/MapzenAndroid.xml +++ b/configs/MapzenAndroid.xml @@ -1,4 +1,4 @@ - + +