Validate on save function on tests from 2.1.16

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/ExpansionPanelGenericPopupDialog.java

@@ -1,5 +1,7 @@
 package com.vijay.jsonwizard.customviews;
 
+import static android.view.inputmethod.InputMethodManager.HIDE_NOT_ALWAYS;
+
 import android.app.Activity;
 import android.app.Dialog;
 import android.app.DialogFragment;
@@ -37,8 +39,6 @@
 
 import timber.log.Timber;
 
-import static android.view.inputmethod.InputMethodManager.HIDE_NOT_ALWAYS;
-
 /**
  * Performs the expansion panel's {@link com.vijay.jsonwizard.widgets.ExpansionPanelFactory} functionality, which includes
  * Reading and assigning values on load
@@ -208,10 +208,12 @@ private void attachOkDialogButton(ViewGroup dialogView) {
         okButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                passData();
-                getJsonApi().setGenericPopup(null);
-                getJsonApi().updateGenericPopupSecondaryValues(new JSONArray(), getStepName());
-                ExpansionPanelGenericPopupDialog.this.dismissAllowingStateLoss();
+                if (getFormFragment().saveWithoutClosingForm(false)) {
+                    passTestData();
+                    getJsonApi().setGenericPopup(null);
+                    getJsonApi().updateGenericPopupSecondaryValues(new JSONArray(), getStepName());
+                    ExpansionPanelGenericPopupDialog.this.dismissAllowingStateLoss();
+                }
             }
         });
     }
@@ -350,7 +352,7 @@ public void setContext(Context context) throws IllegalStateException {
     }
 
     @Override
-    protected void passData() {
+    protected void passTestData() {
         if (!TextUtils.isEmpty(getWidgetType()) && getWidgetType().equals(JsonFormConstants.EXPANSION_PANEL)) {
             onDataPass(getParentKey(), getChildKey());
         } else {

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/GenericPopupDialog.java

@@ -403,10 +403,12 @@ private void attachDialogOkButton(ViewGroup dialogView) {
         okButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                passData();
-                getJsonApi().setGenericPopup(null);
-                getJsonApi().updateGenericPopupSecondaryValues(null, getStepName());
-                GenericPopupDialog.this.dismiss();
+                if (getFormFragment().saveWithoutClosingForm(false)) {
+                    passTestData();
+                    getJsonApi().setGenericPopup(null);
+                    getJsonApi().updateGenericPopupSecondaryValues(null, getStepName());
+                    GenericPopupDialog.this.dismiss();
+                }
             }
         });
     }
@@ -431,7 +433,7 @@ public void setContext(Context context) throws IllegalStateException {
         this.context = context;
     }
 
-    protected void passData() {
+    protected void passTestData() {
         onGenericDataPass(getParentKey(), getChildKey());
     }
 

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/fragments/JsonFormFragment.java

@@ -472,6 +472,17 @@ public boolean save(boolean skipValidation) {
 
         return false;
     }
+    public boolean saveWithoutClosingForm(boolean skipValidation) {
+        try {
+            mMainView.setTag(R.id.skip_validation, skipValidation);
+            return presenter.onSaveWithoutClosingForm(mMainView);
+        } catch (Exception e) {
+            Timber.e(e, " --> save");
+            return false;
+        }
+
+
+    }
 
     public boolean shouldSkipStep() {
         return shouldSkipStep;

android-json-form-wizard/src/main/java/com/vijay/jsonwizard/presenters/JsonFormFragmentPresenter.java

@@ -1,5 +1,8 @@
 package com.vijay.jsonwizard.presenters;
 
+import static com.vijay.jsonwizard.utils.FormUtils.dpToPixels;
+import static com.vijay.jsonwizard.utils.FormUtils.getDynamicLabelInfoList;
+
 import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -92,9 +95,6 @@
 
 import timber.log.Timber;
 
-import static com.vijay.jsonwizard.utils.FormUtils.dpToPixels;
-import static com.vijay.jsonwizard.utils.FormUtils.getDynamicLabelInfoList;
-
 /**
  * Created by vijay on 5/14/15.
  */
@@ -654,6 +654,32 @@ public void onSaveClick(LinearLayout mainView) {
         }
     }
 
+    public boolean onSaveWithoutClosingForm(LinearLayout mainView) {
+        validateAndWriteValues();
+        checkAndStopCountdownAlarm();
+        boolean isFormValid = isFormValid();
+        if (isFormValid || Boolean.parseBoolean(mainView.getTag(R.id.skip_validation).toString())) {
+            Utils.removeGeneratedDynamicRules(formFragment);
+            Intent returnIntent = new Intent();
+            getView().onFormFinish();
+            returnIntent.putExtra("json", formUtils.addFormDetails(getView().getCurrentJsonState()));
+            returnIntent.putExtra(JsonFormConstants.SKIP_VALIDATION,
+                    Boolean.valueOf(mainView.getTag(R.id.skip_validation).toString()));
+            return true;
+        } else {
+            if (showErrorsOnSubmit()) {
+                launchErrorDialog();
+                getView().showToast(getView().getContext().getResources()
+                        .getString(R.string.json_form_error_msg, getInvalidFields().size()));
+            } else {
+                getView().showSnackBar(getView().getContext().getResources()
+                        .getString(R.string.json_form_error_msg, getInvalidFields().size()));
+
+            }
+            return false;
+        }
+    }
+
     public boolean showErrorsOnSubmit() {
         JSONObject entireJsonForm = formFragment.getJsonApi().getmJSONObject();
         return entireJsonForm.optBoolean(JsonFormConstants.SHOW_ERRORS_ON_SUBMIT, false);