From 0931f57bda5f95d55c2fa1a3cdcba2f56017f5df Mon Sep 17 00:00:00 2001 From: Lytsing Huang Date: Fri, 7 Nov 2014 12:10:13 +0800 Subject: [PATCH 01/10] add Android Code Style in Intellij Idea / Android Studio, see http://stackoverflow.com/questions/16710367/android-code-style-in-intellij-idea-android-studio --- README.md | 2 +- configs/AndroidStyle.xml | 175 +++++++++++++++++++++++++++++++++++++++ install.sh | 2 +- 3 files changed, 177 insertions(+), 2 deletions(-) create mode 100644 configs/AndroidStyle.xml diff --git a/README.md b/README.md index f11a6a4..7749236 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 iBoxPay's Java and Android projects. Installation diff --git a/configs/AndroidStyle.xml b/configs/AndroidStyle.xml new file mode 100644 index 0000000..672c4e5 --- /dev/null +++ b/configs/AndroidStyle.xml @@ -0,0 +1,175 @@ + + + + + + diff --git a/install.sh b/install.sh index a461c00..5fa2636 100755 --- a/install.sh +++ b/install.sh @@ -15,4 +15,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 'Square' or 'SquareAndroid' or 'AndroidStyle'." From 94c049a835f9cebe38979dc4e2ac8f6b2b0f81b1 Mon Sep 17 00:00:00 2001 From: Lytsing Huang Date: Fri, 6 Feb 2015 07:37:35 +0800 Subject: [PATCH 02/10] copy configs/Square.xml to configs/iBoxPay.xml --- configs/iBoxPay.xml | 248 ++++++++++++++++++++++++++++++++++++++++++++ install.sh | 2 +- 2 files changed, 249 insertions(+), 1 deletion(-) create mode 100644 configs/iBoxPay.xml diff --git a/configs/iBoxPay.xml b/configs/iBoxPay.xml new file mode 100644 index 0000000..e5c6fcf --- /dev/null +++ b/configs/iBoxPay.xml @@ -0,0 +1,248 @@ + + + + + + + diff --git a/install.sh b/install.sh index 5fa2636..af3c682 100755 --- a/install.sh +++ b/install.sh @@ -15,4 +15,4 @@ done echo "Done." echo "" -echo "Restart IntelliJ and/or AndroidStudio, go to preferences, and apply 'Square' or 'SquareAndroid' or 'AndroidStyle'." +echo "Restart IntelliJ and/or AndroidStudio, go to preferences, and apply 'iBoxPay' or 'AndroidStyle'." From d8a600781027a6b11f81777b148328a7265a851b Mon Sep 17 00:00:00 2001 From: Lytsing Huang Date: Fri, 6 Feb 2015 08:03:22 +0800 Subject: [PATCH 03/10] rename Square ==> iBoxPay --- install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index af3c682..ce273df 100755 --- a/install.sh +++ b/install.sh @@ -1,7 +1,7 @@ #!/bin/bash -# Installs Square's IntelliJ configs into your user configs. +# Installs iBoxPay's IntelliJ configs into your user configs. -echo "Installing Square code style configs..." +echo "Installing iBoxPay code style configs..." for i in $HOME/Library/Preferences/IntelliJIdea*/codestyles \ $HOME/Library/Preferences/IdeaIC*/codestyles \ From 87afcc94e1a4b615432a41df5d54f4b0e457cf6c Mon Sep 17 00:00:00 2001 From: Lytsing Huang Date: Fri, 6 Feb 2015 08:18:39 +0800 Subject: [PATCH 04/10] iBoxPay style,set tab sizes is 4 --- configs/iBoxPay.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/iBoxPay.xml b/configs/iBoxPay.xml index e5c6fcf..cdae3c0 100644 --- a/configs/iBoxPay.xml +++ b/configs/iBoxPay.xml @@ -1,11 +1,11 @@ - + \ No newline at end of file diff --git a/configs/Square.xml b/configs/Square.xml deleted file mode 100644 index bf3cec9..0000000 --- a/configs/Square.xml +++ /dev/null @@ -1,248 +0,0 @@ - - - - - - - diff --git a/configs/SquareAndroid.xml b/configs/SquareAndroid.xml deleted file mode 100644 index 47dff00..0000000 --- a/configs/SquareAndroid.xml +++ /dev/null @@ -1,219 +0,0 @@ - - - - - - \ No newline at end of file From 022c6cb31050443e1475df045312dcc6247855e0 Mon Sep 17 00:00:00 2001 From: huangliqing Date: Fri, 26 Jan 2018 18:28:37 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E8=A1=8C=E6=9C=80=E9=95=BF=E8=AE=BE?= =?UTF-8?q?=E5=AE=9A120=EF=BC=8C100=E5=A4=AA=E5=AE=B9=E6=98=93=E8=B6=85,?= =?UTF-8?q?=E7=8E=B0=E4=BB=A3=E6=98=BE=E7=A4=BA=E5=99=A8=E5=BE=88=E5=A4=A7?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- configs/AndroidStyle.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/AndroidStyle.xml b/configs/AndroidStyle.xml index 3acc0cd..156d17f 100644 --- a/configs/AndroidStyle.xml +++ b/configs/AndroidStyle.xml @@ -66,7 +66,7 @@ - \ No newline at end of file + From 9c9801d06b5119fc43371a49d19b9d8eb868cbc8 Mon Sep 17 00:00:00 2001 From: huangliqing Date: Thu, 8 Mar 2018 16:40:57 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E5=9C=A8=E7=A1=85=E8=B0=B7=E7=9A=84?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E5=9C=88=E5=B7=AE=E4=B8=8D=E5=A4=9A10?= =?UTF-8?q?=E5=B9=B4=E5=89=8D=E5=B7=B2=E7=BB=8F=E9=80=90=E6=B8=90=E4=BB=8E?= =?UTF-8?q?4=E7=A9=BA=E6=A0=BC=E7=BC=A9=E8=BF=9B=E6=94=B9=E4=B8=BA2?= =?UTF-8?q?=E7=A9=BA=E6=A0=BC=E7=BC=A9=E8=BF=9B=EF=BC=8C=E6=89=80=E4=BB=A5?= =?UTF-8?q?=E5=9B=BD=E5=86=85=E8=BF=99=E4=B8=80=E5=9D=97=E6=9C=80=E5=A5=BD?= =?UTF-8?q?=E8=83=BD=E5=A4=9F=E4=B8=8E=E6=97=B6=E4=BF=B1=E8=BF=9B=E3=80=82?= =?UTF-8?q?=E4=B8=BB=E8=A6=814=E7=A9=BA=E6=A0=BC=E7=BC=A9=E8=BF=9B?= =?UTF-8?q?=E5=9C=A8=E7=A8=8D=E5=BE=AE=E9=80=BB=E8=BE=91=E5=A4=8D=E6=9D=82?= =?UTF-8?q?=E4=B8=80=E7=82=B9=E7=9A=84=E4=BB=A3=E7=A0=81=E9=87=8C=EF=BC=8C?= =?UTF-8?q?=E5=B0=B1=E7=9B=B4=E6=8E=A5=E8=B6=85=E8=BF=87120=E8=A1=8C?= =?UTF-8?q?=E7=9A=84=E5=AE=BD=E5=BA=A6=E9=99=90=E5=88=B6=E4=BA=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- configs/iBoxPay.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/iBoxPay.xml b/configs/iBoxPay.xml index cdae3c0..a9633f1 100644 --- a/configs/iBoxPay.xml +++ b/configs/iBoxPay.xml @@ -5,7 +5,7 @@