Fixed custom validator

Author: konifar

example/build.gradle

@@ -86,6 +86,10 @@ dependencies {
         transitive = true
     }
 
+    //==================== Debug ====================
+    debugImplementation depends.stetho.core
+    debugImplementation depends.stetho.okhttp3
+    
     //==================== Test ====================
     testImplementation depends.junit
     testImplementation depends.mockitoKotlin

example/src/main/AndroidManifest.xml

@@ -6,6 +6,7 @@
 
 
     <application
+        android:name=".App"
         android:allowBackup="true"
         android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher"

example/src/main/java/co/kyash/vtl/example/App.kt

@@ -0,0 +1,16 @@
+package co.kyash.vtl.example
+
+import android.app.Application
+import com.facebook.stetho.Stetho
+
+class App : Application() {
+
+    override fun onCreate() {
+        super.onCreate()
+        setUpStetho()
+    }
+
+    private fun setUpStetho() {
+        Stetho.initializeWithDefaults(this)
+    }
+}

example/src/main/java/co/kyash/vtl/example/MainActivity.kt

@@ -9,11 +9,13 @@ import android.widget.Toast
 import co.kyash.vtl.ValidatableView
 import co.kyash.vtl.example.api.MaterialDesignColorsApi
 import co.kyash.vtl.example.databinding.ActivityMainBinding
+import co.kyash.vtl.example.validators.MaterialDesignColorsValidator
 import co.kyash.vtl.validators.AsciiOnlyValidator
 import co.kyash.vtl.validators.EmailValidator
 import co.kyash.vtl.validators.NumberOnlyValidator
 import co.kyash.vtl.validators.RequiredValidator
 import com.crashlytics.android.Crashlytics
+import com.facebook.stetho.okhttp3.StethoInterceptor
 import com.squareup.moshi.Moshi
 import io.fabric.sdk.android.Fabric
 import io.reactivex.Completable
@@ -42,7 +44,7 @@ class MainActivity : AppCompatActivity() {
             .baseUrl("https://raw.githubusercontent.com")
             .addConverterFactory(MoshiConverterFactory.create(Moshi.Builder().build()))
             .addCallAdapterFactory(RxJava2CallAdapterFactory.createAsync())
-            .client(OkHttpClient.Builder().build())
+            .client(OkHttpClient.Builder().addNetworkInterceptor(StethoInterceptor()).build())
             .build()
             .create(MaterialDesignColorsApi::class.java)
 
@@ -68,6 +70,8 @@ class MainActivity : AppCompatActivity() {
         validatableViewsForTriggerFocusChanged.addAll(arrayOf(
                 binding.email2.register(EmailValidator(getString(R.string.validation_error_email)))
         ))
+
+        binding.colors.register(MaterialDesignColorsValidator(api, this))
     }
 
     private fun onSubmitClick(@Suppress("UNUSED_PARAMETER") view: View) {

example/src/main/java/co/kyash/vtl/example/validators/MaterialDesignColorsValidator.kt

@@ -18,8 +18,8 @@ class MaterialDesignColorsValidator(
                 .onErrorResumeNext { Single.error(VtlValidationFailureException(context.getString(R.string.validation_error_server))) }
                 .flatMapCompletable { list ->
                     if (text?.trim() != null) {
-                        list.filter { it == text }
-                                .first { return@flatMapCompletable Completable.complete() }
+                        list.filter { it == text.trim().toLowerCase() }
+                                .forEach { return@flatMapCompletable Completable.complete() }
                     }
                     return@flatMapCompletable Completable.error(VtlValidationFailureException(getErrorMessage()))
                 }

example/src/main/res/layout/activity_main.xml

@@ -184,7 +184,7 @@
                 <TextView
                     style="@style/Description"
                     android:layout_marginTop="@dimen/space_8dp"
-                    android:text="@string/validator_colors" />
+                    android:text="@string/validator_colors_description" />
 
                 <android.support.v7.widget.CardView
                     android:layout_width="match_parent"
@@ -206,11 +206,11 @@
                         <co.kyash.vtl.ValidatableTextInputLayout
                             android:id="@+id/colors"
                             style="@style/InputRow"
-                            app:trigger="focus_changed">
+                            app:trigger="text_changed">
 
                             <EditText
                                 style="@style/BaseEditText"
-                                android:hint="@string/first_name"
+                                android:hint="@string/material_design_colors"
                                 android:inputType="text" />
 
                         </co.kyash.vtl.ValidatableTextInputLayout>

example/src/main/res/values/strings.xml

@@ -13,6 +13,8 @@
     <string name="ascii">Ascii Only</string>
     <string name="submit">Submit</string>
 
+    <string name="material_design_colors">Material design colors</string>
+
     <string name="validation_error_required">Required</string>
     <string name="validation_error_email">Invalid email</string>
     <string name="validation_error_number_only">Input only number</string>

versions.gradle

@@ -13,6 +13,7 @@ ext {
             supportLibrary  : "26.1.0",
             espresso        : "3.0.1",
             retrofit        : "2.3.0",
+            stetho          : "1.5.0",
             kotshi          : "0.3.0-beta1",
     ]
 
@@ -54,6 +55,12 @@ ext {
                     compiler: "com.android.databinding:compiler:3.0.1",
             ],
 
+            //==================== Debug ====================
+            stetho       : [
+                    core   : "com.facebook.stetho:stetho:$versions.stetho",
+                    okhttp3: "com.facebook.stetho:stetho-okhttp3:$versions.stetho",
+            ],
+
             //==================== Test ====================
             junit        : "junit:junit:4.12",
             mockitoKotlin: "com.nhaarman:mockito-kotlin:1.5.0",