diff --git a/README.md b/README.md index 9ad7c0e..27c604d 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ Java Code Styles ================ -IntelliJ IDEA code style settings for Square's Java and Android projects. +IntelliJ IDEA code style settings for my Java and Android projects. Thanks to Square +for creating the scripts needed to make this work. :) Installation diff --git a/configs/codestyles/Kevin.xml b/configs/codestyles/Kevin.xml new file mode 100644 index 0000000..1dd44b9 --- /dev/null +++ b/configs/codestyles/Kevin.xml @@ -0,0 +1,157 @@ + + + \ No newline at end of file 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 9601db8..0000000 --- a/configs/codestyles/SquareAndroid.xml +++ /dev/null @@ -1,383 +0,0 @@ - - - - - \ No newline at end of file diff --git a/configs/inspection/Kevin.xml b/configs/inspection/Kevin.xml new file mode 100644 index 0000000..6d3c24e --- /dev/null +++ b/configs/inspection/Kevin.xml @@ -0,0 +1,63 @@ + + + + diff --git a/configs/inspection/Square.xml b/configs/inspection/Square.xml deleted file mode 100644 index 361afca..0000000 --- a/configs/inspection/Square.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/install.bat b/install.bat index a2b416c..a0b6b3f 100644 --- a/install.bat +++ b/install.bat @@ -1,6 +1,6 @@ -REM Installs Square's IntelliJ configs into your user configs. +REM Installs IntelliJ configs into your user configs. @echo off -echo Installing Square IntelliJ configs... +echo Installing IntelliJ/Android Studio 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 You must restart IntelliJ/Android Studio before you can use these configs!!! exit /b REM sub function for copy config files diff --git a/install.sh b/install.sh index aacb8e9..92d0cc4 100755 --- a/install.sh +++ b/install.sh @@ -1,7 +1,7 @@ #!/bin/bash -# Installs Square's IntelliJ configs into your user configs. +# Installs your IntelliJ configs into your user configs. -echo "Installing Square IntelliJ configs..." +echo "Installing IntelliJ and Android Studio 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 "You must restart IntelliJ and/or Android Studio before your new code styles are visible!!!"