Bug fixes/updates

- Fix app crashes if context null in JsonFormFragment during App Properties loading - Fix off by one on Numeric Date Picker updateDate function - Fix numeric date picker documentation formatting on README
opensrp · Feb 10, 2020 · d824bd3 · d824bd3
1 parent 3584fa4
commit d824bd3
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -2058,14 +2058,14 @@ Create a class implementing [MultiSelectListRepository]([https://github.com/Open
 > `"repositoryClass": "<fqn of sorting repository class>"`
 
 
- ![Sample Form Screenshot] (https://user-images.githubusercontent.com/2793306/68639670-7c959100-052f-11ea-8cc9-e5ddf2c288ff.png)
+ [Sample Form Screenshot](https://user-images.githubusercontent.com/2793306/68639670-7c959100-052f-11ea-8cc9-e5ddf2c288ff.png)
 
 ## Configurability
 
 By placing a file named `app.properties` in your implementation assets folder (See sample app) , one can configure certain aspects of the app
 
 ### Configurable Settings
 
-| Configuration                         | Type    | Default | Description                                             |
-| --------------------------------------| ------- | ------- | --------------------------------------------------------|          |
-| `widget.datepicker.is.numeric`        | Boolean | false    | Use numeric date picker instead of Android default     |
+| Configuration                             | Type  | Default  | Description                                       		 	      |
+| --------------------------------------| ------- | --------- | ---------------------------------------------------------------|
+| `widget.datepicker.is.numeric`  | Boolean | false   | Use numeric date picker instead of Android default |
diff --git a/...-json-form-wizard/src/main/java/com/vijay/jsonwizard/activities/JsonFormBaseActivity.java b/...-json-form-wizard/src/main/java/com/vijay/jsonwizard/activities/JsonFormBaseActivity.java
@@ -114,7 +114,7 @@ public void init(String json) {
     public synchronized void initializeFormFragment() {
         isFormFragmentInitialized = true;
         getSupportFragmentManager().beginTransaction()
-                .add(R.id.container, JsonFormFragment.getFormFragment(JsonFormConstants.FIRST_STEP_NAME, this)).commitAllowingStateLoss();
+                .add(R.id.container, JsonFormFragment.getFormFragment(JsonFormConstants.FIRST_STEP_NAME)).commitAllowingStateLoss();
     }
 
     public void onFormStart() {

diff --git a/...oid-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/DatePickerDialog.java b/...oid-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/DatePickerDialog.java
@@ -106,7 +106,7 @@ public void onShow(DialogInterface dialog) {
 
             }
 
-            if (datePicker.getMaxDate() == 0 && datePicker.getMaxDate() == 0) {
+            if (datePicker.getMinDate() == 0 && datePicker.getMaxDate() == 0) {
 
                 calendar.setTime(date);
             }

diff --git a/...id-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/NumericDatePicker.java b/...id-json-form-wizard/src/main/java/com/vijay/jsonwizard/customviews/NumericDatePicker.java
@@ -309,11 +309,11 @@ public void setOnDateChangedListener(DatePicker.OnDateChangedListener onDateChan
     @Override
     public void updateDate(int year, int month, int dayOfMonth) {
 
-        if (isMaxConstraintViolated(year, month, dayOfMonth)) {
+        if (isMaxConstraintViolated(year, month + 1, dayOfMonth)) {
             throw new IllegalStateException("You have set a date later than the Maximum allowed date settings");
         }
 
-        if (isMinConstraintViolated(year, month, dayOfMonth)) {
+        if (isMinConstraintViolated(year, month + 1, dayOfMonth)) {
             throw new IllegalStateException("You have set a date later than the Minimum allowed date settings");
         }
 

diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/fragments/JsonFormFragment.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/fragments/JsonFormFragment.java
@@ -74,25 +74,20 @@ public class JsonFormFragment extends MvpFragment<JsonFormFragmentPresenter, Jso
     private static NativeFormsProperties nativeFormProperties;
 
     public static JsonFormFragment getFormFragment(String stepName) {
-        return getFormFragment(stepName, null);
-    }
-
-    public static JsonFormFragment getFormFragment(String stepName, Context context) {
         JsonFormFragment jsonFormFragment = new JsonFormFragment();
         Bundle bundle = new Bundle();
         bundle.putString(JsonFormConstants.JSON_FORM_KEY.STEPNAME, stepName);
         jsonFormFragment.setArguments(bundle);
 
-        if (context != null) {
-            nativeFormProperties = Utils.getProperties(context);
-        }
         return jsonFormFragment;
     }
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         setHasOptionsMenu(true);
         super.onCreate(savedInstanceState);
+
+        nativeFormProperties = Utils.getProperties(getContext());
     }
 
     @Override

diff --git a/...json-form-wizard/src/main/java/com/vijay/jsonwizard/fragments/JsonWizardFormFragment.java b/...json-form-wizard/src/main/java/com/vijay/jsonwizard/fragments/JsonWizardFormFragment.java
@@ -254,6 +254,11 @@ public void updateVisibilityOfNextAndSave(boolean next, boolean save) {
                 previousButton.setVisibility(View.GONE);
             }
         }
+
+        //hide wizard nav bar if stepcount is zero
+        if (Integer.valueOf(getCount()) < 2) {
+            navigationToolbar.setVisibility(View.GONE);
+        }
     }
 
     /**

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=1.7.17-SNAPSHOT
+VERSION_NAME=1.7.18-SNAPSHOT
 VERSION_CODE=1
 GROUP=org.smartregister
 POM_SETTING_DESCRIPTION=OpenSRP Client Native Form Json Wizard