diff --git a/src/main/java/ru/touchin/templates/validation/validators/EditTextValidator.java b/src/main/java/ru/touchin/templates/validation/validators/EditTextValidator.java index 46fc435..6438764 100644 --- a/src/main/java/ru/touchin/templates/validation/validators/EditTextValidator.java +++ b/src/main/java/ru/touchin/templates/validation/validators/EditTextValidator.java @@ -145,6 +145,7 @@ public abstract class EditTextValidator extends Val * Model can be null if validation fails on primary or final checks. */ @NonNull + @Override public Observable> fullValidateAndGetModel(@NonNull final String text) { return createValidationObservable(text, true) .first(); diff --git a/src/main/java/ru/touchin/templates/validation/validators/SameTypeValidator.java b/src/main/java/ru/touchin/templates/validation/validators/SameTypeValidator.java index 6921c07..ee63bfa 100644 --- a/src/main/java/ru/touchin/templates/validation/validators/SameTypeValidator.java +++ b/src/main/java/ru/touchin/templates/validation/validators/SameTypeValidator.java @@ -5,6 +5,12 @@ import android.support.annotation.NonNull; import java.io.Serializable; +import ru.touchin.roboswag.core.utils.pairs.HalfNullablePair; +import ru.touchin.templates.validation.ValidationState; +import rx.Observable; + +import static ru.touchin.templates.validation.ValidationState.VALID; + /** * Created by Ilia Kurtov on 24/01/2017. * Class that simplifies work with {@link Validator}'s that have the same wrapper model and model type. @@ -25,4 +31,16 @@ public class SameTypeValidator extends Validator> fullValidateAndGetModel(@NonNull final TModel wrapperModel) { + return Observable.just(new HalfNullablePair<>(VALID, wrapperModel)); + } + } diff --git a/src/main/java/ru/touchin/templates/validation/validators/Validator.java b/src/main/java/ru/touchin/templates/validation/validators/Validator.java index f255f36..bb651a1 100644 --- a/src/main/java/ru/touchin/templates/validation/validators/Validator.java +++ b/src/main/java/ru/touchin/templates/validation/validators/Validator.java @@ -25,7 +25,9 @@ import java.io.Serializable; import ru.touchin.roboswag.core.observables.Changeable; import ru.touchin.roboswag.core.observables.NonNullChangeable; +import ru.touchin.roboswag.core.utils.pairs.HalfNullablePair; import ru.touchin.templates.validation.ValidationState; +import rx.Observable; /** * Created by Ilia Kurtov on 24/01/2017. @@ -87,4 +89,13 @@ public abstract class Validator> fullValidateAndGetModel(@NonNull final TWrapperModel wrapperModel); + } \ No newline at end of file