diff --git a/README.md b/README.md index dcc3aac..2d98a4b 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ 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 ------------ - * Run the `install.sh` script. + * On Unix, run the `install.sh` script. Windows users should use `install.bat` instead. * 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/codestyles/6thsolution.xml b/configs/codestyles/6thsolution.xml new file mode 100644 index 0000000..77ae599 --- /dev/null +++ b/configs/codestyles/6thsolution.xml @@ -0,0 +1,232 @@ + + + + \ 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 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.bat b/install.bat new file mode 100644 index 0000000..a2b416c --- /dev/null +++ b/install.bat @@ -0,0 +1,22 @@ +REM Installs Square's IntelliJ configs into your user configs. +@echo off +echo Installing Square IntelliJ configs... + +setlocal enableDelayedExpansion + +for /D %%i in (%userprofile%\.AndroidStudio*) do call :copy_config %%i +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'. +exit /b + +REM sub function for copy config files +:copy_config +set config_dir=%~1\config +echo Installing to !config_dir! +xcopy /s configs !config_dir! +echo Done. +echo. +exit /b 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'."