Added array validator to check if already registered birth certificate is entered

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/activities/JsonFormActivity.java

@@ -43,6 +43,7 @@
 import com.shashank.sony.fancydialoglib.FancyAlertDialog;
 import com.shashank.sony.fancydialoglib.Icon;
 import com.vijay.jsonwizard.R;
+import com.vijay.jsonwizard.comparisons.ArrayComparison;
 import com.vijay.jsonwizard.comparisons.Comparison;
 import com.vijay.jsonwizard.comparisons.EqualToComparison;
 import com.vijay.jsonwizard.comparisons.GreaterThanComparison;
@@ -1452,6 +1453,10 @@ private void initComparisons() {
             RegexComparison regexComparison = new RegexComparison();
             functionRegex += "|" + regexComparison.getFunctionName();
             comparisons.put(regexComparison.getFunctionName(), regexComparison);
+
+            ArrayComparison arrayComparison = new ArrayComparison();
+            functionRegex += "|" + arrayComparison.getFunctionName();
+            comparisons.put(arrayComparison.getFunctionName(), arrayComparison);
         }
     }
 

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/comparisons/ArrayComparison.java

@@ -0,0 +1,29 @@
+package com.vijay.jsonwizard.comparisons;
+
+import android.util.Log;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class ArrayComparison extends Comparison {
+    private final String TAG = this.getClass().getSimpleName();
+
+    @Override
+    public boolean compare(String a, String type, String b) {
+        if (a != null && b != null) {
+            try {
+                Pattern pattern = Pattern.compile(b);
+                Matcher matcher = pattern.matcher(a);
+                return matcher.matches();
+            } catch (Exception e) {
+                Log.e(TAG, Log.getStackTraceString(e));
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public String getFunctionName() {
+        return "array";
+    }
+}

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/constants/JsonFormConstants.java

@@ -71,6 +71,7 @@ public class JsonFormConstants {
     public static final String V_MAX_LENGTH = "v_max_length";
     public static final String IS_FIXED_SIZE = "is_fixed_size";
     public static final String V_REGEX = "v_regex";
+    public static final String V_ARRAY = "v_array";
     public static final String V_EMAIL = "v_email";
     public static final String V_URL = "v_url";
     public static final String V_NUMERIC_INTEGER = "v_numeric_integer";

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/interactors/JsonFormInteractor.java

@@ -107,6 +107,7 @@ private void registerDefaultTranslatableFields() {
         defaultTranslatableWidgetFields.add(JsonFormConstants.HINT);
         defaultTranslatableWidgetFields.add(JsonFormConstants.V_REQUIRED + "." + JsonFormConstants.ERR);
         defaultTranslatableWidgetFields.add(JsonFormConstants.V_REGEX + "." + JsonFormConstants.ERR);
+        defaultTranslatableWidgetFields.add(JsonFormConstants.V_ARRAY + "." + JsonFormConstants.ERR);
         defaultTranslatableWidgetFields.add(JsonFormConstants.V_NUMERIC + "." + JsonFormConstants.ERR);
         defaultTranslatableWidgetFields.add(JsonFormConstants.V_NUMERIC_INTEGER + "." + JsonFormConstants.ERR);
         defaultTranslatableWidgetFields.add(JsonFormConstants.V_MIN + "." + JsonFormConstants.ERR);

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/EditTextFactory.java

@@ -159,6 +159,7 @@ public void run() {
         addRequiredValidator(jsonObject, editText);
         addLengthValidator(jsonObject, editText);
         addRegexValidator(jsonObject, editText);
+        addArrayValidator(jsonObject, editText);
         addEmailValidator(jsonObject, editText);
         addUrlValidator(jsonObject, editText);
         addNumericValidator(jsonObject, editText);
@@ -243,6 +244,16 @@ private void addRegexValidator(JSONObject jsonObject, MaterialEditText editText)
         }
     }
 
+    private void addArrayValidator(JSONObject jsonObject, MaterialEditText editText) throws JSONException {
+        JSONObject arrayObject = jsonObject.optJSONObject(JsonFormConstants.V_ARRAY);
+        if (arrayObject != null) {
+            String regexValue = arrayObject.optString(JsonFormConstants.VALUE);
+            if (!TextUtils.isEmpty(regexValue)) {
+                editText.addValidator(new RegexpValidator(arrayObject.getString(JsonFormConstants.ERR), regexValue));
+            }
+        }
+    }
+
     private void addEmailValidator(JSONObject jsonObject, MaterialEditText editText) throws JSONException {
         JSONObject emailObject = jsonObject.optJSONObject(JsonFormConstants.V_EMAIL);
         if (emailObject != null) {

gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=2.0.7-SNAPSHOT
+VERSION_NAME=2.0.8-SNAPSHOT
 VERSION_CODE=1
 GROUP=org.smartregister
 POM_SETTING_DESCRIPTION=OpenSRP Client Native Form Json Wizard