diff --git a/README.md b/README.md index ca4c72a..298b159 100644 --- a/README.md +++ b/README.md @@ -19,13 +19,13 @@ Example ``` public class MainActivity extends AppCompatActivity { - @NotNull(value = 1, error = R.string.input_need) - @Reg(value = 2, error = R.string.reg_error, reg = "^0{0,1}(13[0-9]|15[7-9]|153|156|18[7-9])[0-9]{8}$") + @NotNull(order = 1, error = R.string.input_need) + @Reg(order = 2, error = R.string.reg_error, reg = "^0{0,1}(13[0-9]|15[7-9]|153|156|18[7-9])[0-9]{8}$") @BindView(R.id.inputLayout) TextInputLayout inputLayout; - @NotNull(value = 3, error = R.string.input_need) - @Reg(value = 4, error = R.string.reg_error, reg = "^[0-9][0-9]{5}$") + @NotNull(order = 3, error = R.string.input_need) + @Reg(order = 4, error = R.string.reg_error, reg = "^[0-9][0-9]{5}$") @BindView(R.id.zipcodeLayout) TextInputLayout zipcodeLayout; @@ -47,6 +47,7 @@ public class MainActivity extends AppCompatActivity { } } + ``` ## Step1 Inject your TextInputLayout with @NotNull or @Reg diff --git a/example/src/main/java/pub/zilla/example/MainActivity.java b/example/src/main/java/pub/zilla/example/MainActivity.java index ee97f4f..e75e00b 100644 --- a/example/src/main/java/pub/zilla/example/MainActivity.java +++ b/example/src/main/java/pub/zilla/example/MainActivity.java @@ -15,13 +15,13 @@ public class MainActivity extends AppCompatActivity { - @NotNull(value = 1, error = R.string.input_need) - @Reg(value = 2, error = R.string.reg_error, reg = "^0{0,1}(13[0-9]|15[7-9]|153|156|18[7-9])[0-9]{8}$") + @NotNull(order = 1, error = R.string.input_need) + @Reg(order = 2, error = R.string.reg_error, reg = "^0{0,1}(13[0-9]|15[7-9]|153|156|18[7-9])[0-9]{8}$") @BindView(R.id.inputLayout) TextInputLayout inputLayout; - @NotNull(value = 3, error = R.string.input_need) - @Reg(value = 4, error = R.string.reg_error, reg = "^[0-9][0-9]{5}$") + @NotNull(order = 3, error = R.string.input_need) + @Reg(order = 4, error = R.string.reg_error, reg = "^[0-9][0-9]{5}$") @BindView(R.id.zipcodeLayout) TextInputLayout zipcodeLayout; diff --git a/valizilla/build.gradle b/valizilla/build.gradle index 93bdf0c..028aac9 100644 --- a/valizilla/build.gradle +++ b/valizilla/build.gradle @@ -8,8 +8,8 @@ android { // applicationId "pub.zilla.validzilla" minSdkVersion 19 targetSdkVersion 25 - versionCode 1 - versionName "1.0" + versionCode 8 + versionName "1.1.2" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/valizilla/src/main/java/pub/zilla/validzilla/ValiZilla.java b/valizilla/src/main/java/pub/zilla/validzilla/ValiZilla.java index 7090bd5..e87add2 100644 --- a/valizilla/src/main/java/pub/zilla/validzilla/ValiZilla.java +++ b/valizilla/src/main/java/pub/zilla/validzilla/ValiZilla.java @@ -103,11 +103,11 @@ private static ValiWapper getFieldsFromCache(Class c) { reg = field.getAnnotation(Reg.class); if (notNull != null || reg != null) { if (notNull != null) { - ValiModel valiModel = new ValiModel(notNull.value(), notNull.error(), null, field); + ValiModel valiModel = new ValiModel(notNull.order(), notNull.error(), null, field); wapper.addValiModel(valiModel); } if (reg != null) { - ValiModel valiModel = new ValiModel(reg.value(), reg.error(), reg.reg(), field); + ValiModel valiModel = new ValiModel(reg.order(), reg.error(), reg.reg(), field); wapper.addValiModel(valiModel); } } diff --git a/valizilla/src/main/java/pub/zilla/validzilla/an/NotNull.java b/valizilla/src/main/java/pub/zilla/validzilla/an/NotNull.java index a8303ba..9296f6e 100644 --- a/valizilla/src/main/java/pub/zilla/validzilla/an/NotNull.java +++ b/valizilla/src/main/java/pub/zilla/validzilla/an/NotNull.java @@ -17,7 +17,7 @@ * * @return */ - int value(); + int order(); /** * Error message diff --git a/valizilla/src/main/java/pub/zilla/validzilla/an/Reg.java b/valizilla/src/main/java/pub/zilla/validzilla/an/Reg.java index 22ba6fa..4c0f581 100644 --- a/valizilla/src/main/java/pub/zilla/validzilla/an/Reg.java +++ b/valizilla/src/main/java/pub/zilla/validzilla/an/Reg.java @@ -17,7 +17,7 @@ * * @return */ - int value(); + int order(); /** * Error message