Use circle progress from libs

android-json-form-wizard/build.gradle

@@ -72,6 +72,7 @@ repositories {
 }
 
 dependencies {
+    implementation files('libs/circleProgressbar.aar')
     implementation('org.smartregister:opensrp-client-simprints:1.1.0-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'com.android.support', module: 'appcompat-v7'
@@ -126,13 +127,7 @@ dependencies {
     }
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
 
-    implementation('io.ona.CircleProgressbar:lib:0.1.0@aar') {
-        exclude group: 'com.android.support.constraint', module: 'constraint-layout'
-        exclude group: 'com.android.support', module: 'design'
-        exclude group: 'com.android.support', module: 'appcompat-v7'
-        exclude group: 'com.android.support.test', module: 'runner'
-        exclude group: 'com.android.support.test.espresso', module: 'espresso-core'
-    }
+
     implementation 'com.jakewharton.timber:timber:5.0.1'
     implementation "org.greenrobot:eventbus:3.2.0"
     implementation 'androidx.multidex:multidex:2.0.1'

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

@@ -372,41 +372,37 @@ public Pair<String[], JSONObject> getCalculationAddressAndValue(View view) throw
 
     @Override
     public void refreshCalculationLogic(String parentKey, String childKey, boolean popup, String stepName, boolean isForNextStep) {
-        appExecutors.diskIO().execute(() ->{
-            Set<String> viewsIds = calculationDependencyMap.get(stepName + "_" + parentKey);
-            if (parentKey == null || viewsIds == null)
-                viewsIds = calculationLogicViews.keySet();
-            for (String viewId : viewsIds) {
-                try {
-                    View curView = calculationLogicViews.get(viewId);
-                    if (curView == null) {
-                        Timber.w("calculationLogicViews Missing %s", viewId);
-                        continue;
+        Set<String> viewsIds = calculationDependencyMap.get(stepName + "_" + parentKey);
+        if (parentKey == null || viewsIds == null)
+            viewsIds = calculationLogicViews.keySet();
+        for (String viewId : viewsIds) {
+            try {
+                View curView = calculationLogicViews.get(viewId);
+                if (curView == null) {
+                    Timber.w("calculationLogicViews Missing %s", viewId);
+                    continue;
+                }
+                Pair<String[], JSONObject> addressAndValue = getCalculationAddressAndValue(curView);
+                if (addressAndValue != null && addressAndValue.first != null) {
+                    String[] address = addressAndValue.first;
+                    JSONObject valueSource = addressAndValue.second;
+                    Facts curValueMap;
+                    if (valueSource.length() > 0) {
+                        curValueMap = getValueFromAddress(address, popup, valueSource);
+                    } else {
+                        curValueMap = getValueFromAddress(address, popup);
                     }
-                    Pair<String[], JSONObject> addressAndValue = getCalculationAddressAndValue(curView);
-                    if (addressAndValue != null && addressAndValue.first != null) {
-                        String[] address = addressAndValue.first;
-                        JSONObject valueSource = addressAndValue.second;
-                        Facts curValueMap;
-                        if (valueSource.length() > 0) {
-                            curValueMap = getValueFromAddress(address, popup, valueSource);
-                        } else {
-                            curValueMap = getValueFromAddress(address, popup);
-                        }
-                        //update ui
-                        appExecutors.mainThread().execute(() -> {
-                            updateCalculation(curValueMap, curView, address, isForNextStep);
-                        });
+                    //update ui
+                    updateCalculation(curValueMap, curView, address, isForNextStep);
 
-                    }
+                }
 
-                } catch (Exception e) {
-                    Timber.e(e, "%s refreshCalculationLogic()", this.getClass().getCanonicalName());
+            } catch (Exception e) {
+                Timber.e(e, "%s refreshCalculationLogic()", this.getClass().getCanonicalName());
 
-                }
             }
+        }
 
-        });
 
     }
 
@@ -629,26 +625,24 @@ public JSONObject getObjectUsingAddress(String[] address, boolean popup, JSONObj
      */
     @Override
     public void refreshConstraints(String parentKey, String childKey, boolean popup) {
-        appExecutors.diskIO().execute(()->{
-            initComparisons();
+        initComparisons();
 
-            // Priorities constraints on the view that has just been changed
-            String changedViewKey = parentKey;
-            if (changedViewKey != null && childKey != null) {
-                changedViewKey = changedViewKey + ":" + childKey;
-            }
+        // Priorities constraints on the view that has just been changed
+        String changedViewKey = parentKey;
+        if (changedViewKey != null && childKey != null) {
+            changedViewKey = changedViewKey + ":" + childKey;
+        }
 
-            if (changedViewKey != null && (constrainedViews != null && constrainedViews.containsKey(changedViewKey))) {
-                checkViewConstraints(constrainedViews.get(changedViewKey), popup);
-            }
+        if (changedViewKey != null && (constrainedViews != null && constrainedViews.containsKey(changedViewKey))) {
+            checkViewConstraints(constrainedViews.get(changedViewKey), popup);
+        }
 
-            for (View curView : constrainedViews.values()) {
-                String viewKey = getViewKey(curView);
-                if (changedViewKey == null || (!TextUtils.isEmpty(viewKey) && !viewKey.equals(changedViewKey))) {
-                    checkViewConstraints(curView, popup);
-                }
+        for (View curView : constrainedViews.values()) {
+            String viewKey = getViewKey(curView);
+            if (changedViewKey == null || (!TextUtils.isEmpty(viewKey) && !viewKey.equals(changedViewKey))) {
+                checkViewConstraints(curView, popup);
             }
-        });
+        }
 
     }
 

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

@@ -57,6 +57,7 @@ public class JsonFormConstants {
     public static final String BEHAVIOUR = "behaviour";
     public static final String RESULT = "result";
     public static final String VALUE = "value";
+    public static final String V_EQUALS = "v_equals";
     public static final String KEYS = "keys";
     public static final String SECOND_VALUE = "second_value";
     public static final String OPENMRS_ENTITY_PARENT = "openmrs_entity_parent";
@@ -148,6 +149,7 @@ public class JsonFormConstants {
     public static final String EXPANDED = "expanded";
     public static final String EXPAND_ON_TEXT_CHANGE = "expand_on_text_change";
     public static final String NUMBER = "number";
+    public static final String PASSWORD = "password";
     public static final String TOP_MARGIN = "top_margin";
     public static final String BOTTOM_MARGIN = "bottom_margin";
     public static final String LEFT_MARGIN = "left_margin";

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/Utils.java

@@ -56,10 +56,13 @@
 import org.json.JSONObject;
 import org.yaml.snakeyaml.Yaml;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URLDecoder;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -75,6 +78,7 @@
 import java.util.Scanner;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
+import java.util.zip.GZIPInputStream;
 
 import timber.log.Timber;
 
@@ -1041,6 +1045,29 @@ public static String extractValueFromJson(String value)
         return  value;
     }
 
+    public static String decompress(String str, String outEncoding) {
+        if (str == null || str.length() == 0) {
+            return str;
+        }
+
+        try {
+            String decode = URLDecoder.decode(str, "UTF-8");
+
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            ByteArrayInputStream in = new ByteArrayInputStream(decode.getBytes("ISO-8859-1"));
+            GZIPInputStream gunzip = new GZIPInputStream(in);
+            byte[] buffer = new byte[256];
+            int n;
+            while ((n = gunzip.read(buffer)) >= 0) {
+                out.write(buffer, 0, n);
+            }
+            return out.toString(outEncoding);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
 }
 
 

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/validators/edittext/ReferenceFieldValidator.java

@@ -0,0 +1,25 @@
+package com.vijay.jsonwizard.validators.edittext;
+
+import androidx.annotation.NonNull;
+
+import com.rengwuxian.materialedittext.MaterialEditText;
+import com.rengwuxian.materialedittext.validation.METValidator;
+
+import org.jetbrains.annotations.NotNull;
+
+public class ReferenceFieldValidator extends METValidator {
+    MaterialEditText referenceField;
+    public ReferenceFieldValidator(@NonNull @NotNull String errorMessage,MaterialEditText referenceField) {
+        super(errorMessage);
+        this.referenceField = referenceField;
+    }
+
+    @Override
+    public boolean isValid(@NonNull @NotNull CharSequence charSequence, boolean isEmpty) {
+        if(!isEmpty) {
+            String referenceText = referenceField.getText().toString();
+            return referenceText.equals(charSequence.toString());
+        }
+        return true;
+    }
+}

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

@@ -1,24 +1,12 @@
 package com.vijay.jsonwizard.widgets;
 
-import static com.vijay.jsonwizard.constants.JsonFormConstants.DEFAULT_CUMULATIVE_VALIDATION_ERR;
-import static com.vijay.jsonwizard.constants.JsonFormConstants.DEFAULT_RELATIVE_MAX_VALIDATION_ERR;
-import static com.vijay.jsonwizard.constants.JsonFormConstants.DEFAULT_RELATIVE_MIN_VALIDATION_ERR;
-import static com.vijay.jsonwizard.constants.JsonFormConstants.KEY;
-import static com.vijay.jsonwizard.constants.JsonFormConstants.RELATED_FIELDS;
-import static com.vijay.jsonwizard.constants.JsonFormConstants.RELATIVE_VALIDATION_EXCEPTION;
-import static com.vijay.jsonwizard.constants.JsonFormConstants.STEP1;
-import static com.vijay.jsonwizard.constants.JsonFormConstants.V_CUMULATIVE_TOTAL;
-import static com.vijay.jsonwizard.constants.JsonFormConstants.V_RELATIVE_MAX;
-import static com.vijay.jsonwizard.constants.JsonFormConstants.V_RELATIVE_MIN;
-import static com.vijay.jsonwizard.utils.FormUtils.fields;
-import static com.vijay.jsonwizard.utils.FormUtils.getFieldJSONObject;
-
 import android.content.Context;
 import android.text.Editable;
 import android.text.InputFilter;
 import android.text.InputType;
 import android.text.TextUtils;
 import android.text.TextWatcher;
+import android.text.method.PasswordTransformationMethod;
 import android.util.Patterns;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -43,6 +31,7 @@
 import com.vijay.jsonwizard.validators.edittext.MaxNumericValidator;
 import com.vijay.jsonwizard.validators.edittext.MinLengthValidator;
 import com.vijay.jsonwizard.validators.edittext.MinNumericValidator;
+import com.vijay.jsonwizard.validators.edittext.ReferenceFieldValidator;
 import com.vijay.jsonwizard.validators.edittext.ReferenceValidator;
 import com.vijay.jsonwizard.validators.edittext.RelativeNumericValidator;
 import com.vijay.jsonwizard.validators.edittext.RequiredValidator;
@@ -60,6 +49,19 @@
 
 import timber.log.Timber;
 
+import static com.vijay.jsonwizard.constants.JsonFormConstants.DEFAULT_CUMULATIVE_VALIDATION_ERR;
+import static com.vijay.jsonwizard.constants.JsonFormConstants.DEFAULT_RELATIVE_MAX_VALIDATION_ERR;
+import static com.vijay.jsonwizard.constants.JsonFormConstants.DEFAULT_RELATIVE_MIN_VALIDATION_ERR;
+import static com.vijay.jsonwizard.constants.JsonFormConstants.KEY;
+import static com.vijay.jsonwizard.constants.JsonFormConstants.RELATED_FIELDS;
+import static com.vijay.jsonwizard.constants.JsonFormConstants.RELATIVE_VALIDATION_EXCEPTION;
+import static com.vijay.jsonwizard.constants.JsonFormConstants.STEP1;
+import static com.vijay.jsonwizard.constants.JsonFormConstants.V_CUMULATIVE_TOTAL;
+import static com.vijay.jsonwizard.constants.JsonFormConstants.V_RELATIVE_MAX;
+import static com.vijay.jsonwizard.constants.JsonFormConstants.V_RELATIVE_MIN;
+import static com.vijay.jsonwizard.utils.FormUtils.fields;
+import static com.vijay.jsonwizard.utils.FormUtils.getFieldJSONObject;
+
 public class EditTextFactory implements FormWidgetFactory {
 
     public static final int MIN_LENGTH = 0;
@@ -117,7 +119,6 @@ protected List<View> attachJson(String stepName, Context context, JsonFormFragme
         RelativeLayout editTextLayout = rootLayout.findViewById(R.id.edit_text_layout);
         MaterialEditText editText = editTextLayout.findViewById(R.id.edit_text);
         ImageView editButton = editTextLayout.findViewById(R.id.material_edit_text_edit_button);
-
         FormUtils.setEditButtonAttributes(jsonObject, editText, editButton, listener);
         attachLayout(stepName, context, formFragment, jsonObject, editText, editButton);
 
@@ -179,6 +180,7 @@ public void run() {
         FormUtils.toggleEditTextVisibility(jsonObject, editText);
 
         addRequiredValidator(jsonObject, editText);
+        addEqualsValidator(formFragment,jsonObject,editText);
         addLengthValidator(jsonObject, editText);
         addRegexValidator(jsonObject, editText);
         addEmailValidator(jsonObject, editText);
@@ -190,15 +192,19 @@ public void run() {
         addCumulativeTotalValidator(jsonObject, formFragment, editText, stepName, (JsonApi) context);
         // edit type check
         String editType = jsonObject.optString(JsonFormConstants.EDIT_TYPE);
+        editText.setSingleLine(false);
         if (!TextUtils.isEmpty(editType)) {
             if (JsonFormConstants.NUMBER.equals(editType)) {
                 editText.setRawInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_DECIMAL);
             } else if (JsonFormConstants.NAME.equals(editType)) {
                 editText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_CAP_WORDS);
             }
-        }
+            else if (JsonFormConstants.PASSWORD.equals(editType))
+            {
+                editText.setTransformationMethod(PasswordTransformationMethod.getInstance());
+            }
 
-        editText.setSingleLine(false);
+        }
         editText.addTextChangedListener(new GenericTextWatcher(stepName, formFragment, editText));
         attachRefreshLogic(context, jsonObject, editText);
     }
@@ -212,6 +218,15 @@ private void attachInfoIcon(String stepName, JSONObject jsonObject, RelativeLayo
 
     }
 
+    private void addEqualsValidator(JsonFormFragment formFragment,JSONObject jsonObject, MaterialEditText editText) throws JSONException {
+        JSONObject requiredObject = jsonObject.optJSONObject(JsonFormConstants.V_EQUALS);
+        if (requiredObject != null) {
+            String referencedValue = requiredObject.optString(JsonFormConstants.VALUE,"");
+            MaterialEditText referencedEditText = (MaterialEditText) formFragment.getJsonApi().getFormDataView(referencedValue);
+            editText.addValidator(new ReferenceFieldValidator(requiredObject.getString(JsonFormConstants.ERR),referencedEditText));
+            FormUtils.setRequiredOnHint(editText);
+        }
+    }
     private void addRequiredValidator(JSONObject jsonObject, MaterialEditText editText) throws JSONException {
         JSONObject requiredObject = jsonObject.optJSONObject(JsonFormConstants.V_REQUIRED);
         if (requiredObject != null) {

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

@@ -4,6 +4,7 @@
 import android.os.Build;
 import android.text.InputType;
 import android.text.TextUtils;
+import android.text.method.PasswordTransformationMethod;
 import android.util.Patterns;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -144,6 +145,10 @@ protected void makeFromJson(String stepName, Context context, JsonFormFragment f
             } else if ("name".equals(editType)) {
                 editText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_CAP_WORDS);
             }
+            else if ("password".equals(editType))
+            {
+                editText.setTransformationMethod(PasswordTransformationMethod.getInstance());
+            }
         }
 
         editText.addTextChangedListener(new GenericTextWatcher(stepName, formFragment, editText));

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

@@ -355,8 +355,8 @@ private void appendHealthData(JSONObject returnObject, WidgetArgs widgetArgs) {
             JSONObject currentHeight = getSingleStepJsonObject(widgetArgs, STEP1, OptibpConstants.HEIGHT);
             JSONObject currentWeight = getSingleStepJsonObject(widgetArgs, STEP1, OptibpConstants.CURRENTWEIGHT);
             if (currentHeight != null && currentWeight != null) {
-                returnObject.put(OptibpConstants.HEIGHT, Integer.parseInt(currentHeight.optString(VALUE)));
-                returnObject.put(OptibpConstants.WEIGHT, Integer.parseInt(currentWeight.optString(VALUE)));
+                returnObject.put(OptibpConstants.HEIGHT, (int) Double.parseDouble(currentHeight.optString(VALUE)));
+                returnObject.put(OptibpConstants.WEIGHT, (int) Double.parseDouble(currentWeight.optString(VALUE)));
             }
         } catch (JSONException e) {
             Timber.e(e);

android-json-form-wizard/src/test/java/com/vijay/jsonwizard/activities/JsonFormActivityTest.java

@@ -618,4 +618,9 @@ public void testGetViewKey() throws Exception {
         assertEquals(key + ":" + childKey, returnKey);
 
     }
-}
+
+    @Test
+    public void testGetCOuntSHouldReturnTheCorrectCount() {
+        assertEquals("1", activity.getCount());
+    }
+}

gradle.properties

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