Merge pull request #3 from Ilhasoft/hotfix/0.6.3

Release 0.6.3

Author: John Cordeiro

README.md

@@ -36,7 +36,7 @@ Latest Version: [![Latest version](https://jitpack.io/v/Ilhasoft/data-binding-va
 
 ## Sample
 
-<img width='380' src='https://raw.githubusercontent.com/Ilhasoft/data-binding-validator/master/screenshot.png'/>
+<img src="usageSample.gif" alt="...">
 
 ## Usage
 
@@ -164,6 +164,10 @@ You can add custom error messages by using the same validation rule name and add
   app:validateDateMessage="@{@string/dateErrorMessage}" />
 ```
 
+### Validating ###
+
+If you want to validate all the fields, you can simply call `validator.validate()`, to validate specific views you can call `validator.validate(view)` or `validator.validate(viewsList)`;
+
 ### Validation modes ###
 
 The validation can be applied in two way, field by field or the whole form at once. By default, it's configured field by field, however, you can call `validator.enableFormValidationMode();` to enable the validation of the whole form.

library/build.gradle

@@ -14,8 +14,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 25
-        versionCode 2
-        versionName "0.6.2"
+        versionCode 3
+        versionName "0.6.3"
         consumerProguardFiles 'proguard-rules.pro'
     }
 }

library/src/main/java/br/com/ilhasoft/support/validation/Validator.java

@@ -35,6 +35,16 @@ public boolean validate() {
         return isAllViewsValid(viewWithValidations);
     }
 
+    public boolean validate(View view) {
+        List<View> viewWithValidations = getViewsWithValidation(view);
+        return isAllViewsValid(viewWithValidations);
+    }
+
+    public <ViewType extends View> boolean validate(List<ViewType> views) {
+        List<View> viewWithValidations = getViewsWithValidation(views);
+        return isAllViewsValid(viewWithValidations);
+    }
+
     private boolean isAllViewsValid(List<View> viewWithValidations) {
         boolean allViewsValid = true;
         for (View viewWithValidation : viewWithValidations) {
@@ -78,4 +88,12 @@ private List<View> getViewsWithValidation() {
         }
         return Collections.singletonList(target.getRoot());
     }
+
+    private <ViewType extends View> List<View> getViewsWithValidation(List<ViewType> views) {
+        return ViewTagHelper.filterViewsWithTag(R.id.validator_rule, views);
+    }
+
+    private List<View> getViewsWithValidation(View view) {
+        return ViewTagHelper.filterViewWithTag(R.id.validator_rule, view);
+    }
 }

library/src/main/java/br/com/ilhasoft/support/validation/util/ViewTagHelper.java

@@ -30,14 +30,30 @@ public static List<View> getViewsByTag(ViewGroup root, int tagId) {
             if (child instanceof ViewGroup) {
                 views.addAll(getViewsByTag((ViewGroup) child, tagId));
             }
+            addViewWhenContainsTag(tagId, views, child);
+        }
+        return views;
+    }
 
-            final Object tagValue = child.getTag(tagId);
-            if (tagValue != null) {
-                views.add(child);
-            }
+    public static List<View> filterViewWithTag(int tagId, View view) {
+        List<View> viewsWithTags = new ArrayList<>();
+        addViewWhenContainsTag(tagId, viewsWithTags, view);
+        return viewsWithTags;
+    }
 
+    public static <ViewType extends View> List<View> filterViewsWithTag(int tagId, List<ViewType> views) {
+        List<View> viewsWithTags = new ArrayList<>();
+        for (View view : views) {
+            addViewWhenContainsTag(tagId, viewsWithTags, view);
+        }
+        return viewsWithTags;
+    }
+
+    private static void addViewWhenContainsTag(int tagId, List<View> views, View view) {
+        final Object tagValue = view.getTag(tagId);
+        if (tagValue != null) {
+            views.add(view);
         }
-        return views;
     }
 
 }

sample/src/main/java/br/com/ilhasoft/support/validation/sample/MainActivity.java

@@ -1,33 +1,54 @@
 package br.com.ilhasoft.support.validation.sample;
 
 import android.databinding.DataBindingUtil;
+import android.databinding.ViewDataBinding;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
 import android.widget.Toast;
 
+import java.util.Arrays;
+
 import br.com.ilhasoft.support.validation.Validator;
 import br.com.ilhasoft.support.validation.sample.databinding.ActivityMainBinding;
 
 public class MainActivity extends AppCompatActivity {
 
     private static final String TAG = "MainActivity";
 
+    private ActivityMainBinding binding;
     private Validator validator;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        ActivityMainBinding binding = DataBindingUtil.setContentView(this, R.layout.activity_main);
-        binding.validate.setOnClickListener(onValidateClickListener);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_main);
+        binding.validateName.setOnClickListener(onValidateNameClickListener);
+        binding.validateMultiple.setOnClickListener(onValidateMultipleClickListener);
+        binding.validate.setOnClickListener(onValidateAllClickListener);
 
         validator = new Validator(binding);
         validator.enableFormValidationMode();
     }
 
-    private View.OnClickListener onValidateClickListener = new View.OnClickListener() {
+    private View.OnClickListener onValidateNameClickListener = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            validator.validate(binding.name);
+        }
+    };
+
+    private View.OnClickListener onValidateMultipleClickListener = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            validator.validate(Arrays.asList(binding.username, binding.email));
+        }
+    };
+
+
+    private View.OnClickListener onValidateAllClickListener = new View.OnClickListener() {
         @Override
         public void onClick(View v) {
             if (validator.validate()) {

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

@@ -19,7 +19,7 @@
                 android:layout_height="wrap_content">
 
                 <android.support.design.widget.TextInputEditText
-                    android:id="@+id/hello"
+                    android:id="@+id/name"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:hint="Name"
@@ -31,6 +31,12 @@
 
             </android.support.design.widget.TextInputLayout>
 
+            <Button
+                android:id="@+id/validate_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Validate name" />
+
             <android.support.design.widget.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
@@ -50,6 +56,7 @@
                 android:layout_height="wrap_content">
 
                 <android.support.design.widget.TextInputEditText
+                    android:id="@+id/email"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:hint="Email"
@@ -58,6 +65,12 @@
 
             </android.support.design.widget.TextInputLayout>
 
+            <Button
+                android:id="@+id/validate_multiple"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Multiple Validation" />
+
             <android.support.design.widget.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
@@ -162,7 +175,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="10dp"
-                android:text="Validate"/>
+                android:text="Validate All"/>
+
         </LinearLayout>
     </ScrollView>
 </layout>

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

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">Support Validation</string>
+    <string name="app_name">Data Binding Validator Sample</string>
     <string name="custom_error_username">Custom message: Username not valid</string>
     <string name="custom_error_password_not_equal">Custom message: passwords are not equals!!</string>
     <string name="custom_error_cpf">Custom message: CPF is wrong man!</string>