move formutils factory methods into formutils

fix codacy util class naming
opensrp · Jul 9, 2021 · f7a4606 · f7a4606
1 parent 95a6544
commit f7a4606
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 22 deletions.
diff --git a/...zard/src/main/java/com/vijay/jsonwizard/activities/FormConfigurationJsonFormActivity.java b/...zard/src/main/java/com/vijay/jsonwizard/activities/FormConfigurationJsonFormActivity.java
@@ -15,7 +15,6 @@
 import com.vijay.jsonwizard.interfaces.OnFormFetchedCallback;
 import com.vijay.jsonwizard.utils.AppExecutors;
 import com.vijay.jsonwizard.utils.FormUtils;
-import com.vijay.jsonwizard.utils.FormUtilsFactory;
 import com.vijay.jsonwizard.utils.NativeFormLangUtils;
 
 import org.json.JSONException;
@@ -45,7 +44,7 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     protected FormUtils getFormUtils(){
-        return FormUtilsFactory.newInstance();
+        return FormUtils.newInstance();
     }
 
     private void checkIfFormUpdate(@NonNull JSONObject formJsonObject) {

diff --git a/...-wizard/src/main/java/com/vijay/jsonwizard/activities/NoLocaleJsonWizardFormActivity.java b/...-wizard/src/main/java/com/vijay/jsonwizard/activities/NoLocaleJsonWizardFormActivity.java
@@ -1,11 +1,10 @@
 package com.vijay.jsonwizard.activities;
 
 import com.vijay.jsonwizard.utils.FormUtils;
-import com.vijay.jsonwizard.utils.FormUtilsFactory;
 
 public class NoLocaleJsonWizardFormActivity extends JsonWizardFormActivity {
     @Override
     protected FormUtils getFormUtils() {
-        return FormUtilsFactory.noLocaleInstance();
+        return FormUtils.newInstanceWithNoLocale();
     }
 }
diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/FormUtils.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/FormUtils.java
@@ -104,6 +104,19 @@ public class FormUtils {
     private Utils utils = new Utils();
     private GenericDialogInterface genericDialogInterface;
 
+    public static FormUtils newInstance(){
+        return new FormUtils();
+    }
+
+    public static FormUtils newInstanceWithNoLocale(){
+        return new FormUtils(){
+            @Override
+            protected String getLocaleFormIdentity(Context context, String formIdentity) {
+                return formIdentity;
+            }
+        };
+    }
+
     public static Point getViewLocationOnScreen(View view) {
         int[] location = new int[2];
         view.getLocationOnScreen(location);

diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/FormUtilsFactory.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/utils/FormUtilsFactory.java