From c0356ec6a129b750ced7a304eaaf47fcdee1c188 Mon Sep 17 00:00:00 2001 From: Felipe Lima Date: Fri, 19 Jun 2015 14:25:25 -0700 Subject: [PATCH] Updates Airbnb code style --- README.md | 2 +- configs/{Square.xml => Airbnb.xml} | 98 ++---------- configs/AirbnbAndroid.xml | 220 ++++++++++++++++++++++++++ configs/SquareAndroid.xml | 245 ----------------------------- install.sh | 6 +- 5 files changed, 235 insertions(+), 336 deletions(-) rename configs/{Square.xml => Airbnb.xml} (64%) create mode 100644 configs/AirbnbAndroid.xml delete mode 100644 configs/SquareAndroid.xml diff --git a/README.md b/README.md index f11a6a4..c528a28 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 Airbnb's Java and Android projects (forked from Square's). Installation diff --git a/configs/Square.xml b/configs/Airbnb.xml similarity index 64% rename from configs/Square.xml rename to configs/Airbnb.xml index 12864cf..33a5779 100644 --- a/configs/Square.xml +++ b/configs/Airbnb.xml @@ -1,6 +1,6 @@ - - + - - + \ No newline at end of file diff --git a/configs/AirbnbAndroid.xml b/configs/AirbnbAndroid.xml new file mode 100644 index 0000000..51ec5e2 --- /dev/null +++ b/configs/AirbnbAndroid.xml @@ -0,0 +1,220 @@ + + + + \ No newline at end of file diff --git a/configs/SquareAndroid.xml b/configs/SquareAndroid.xml deleted file mode 100644 index bc6a103..0000000 --- a/configs/SquareAndroid.xml +++ /dev/null @@ -1,245 +0,0 @@ - - - - - - - diff --git a/install.sh b/install.sh index 5477a0a..e3b0b32 100755 --- a/install.sh +++ b/install.sh @@ -1,7 +1,7 @@ #!/bin/bash -# Installs Square's IntelliJ configs into your user configs. +# Installs Airbnb's IntelliJ configs into your user configs. -echo "Installing Square code style configs..." +echo "Installing Airbnb code style configs..." CONFIGS="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/configs" @@ -20,4 +20,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 'Airbnb' or 'AirbnbAndroid'."