Client-chw-core master changes

build.gradle

@@ -10,6 +10,7 @@ buildscript {
         maven { url "https://repo.maven.apache.org/maven2" }
         maven { url "http://cloudant.github.io/cloudant-sync-eap/repository" }
         maven{  url "https://plugins.gradle.org/m2/" }
+        maven { url "https://dl.bintray.com/ona/kujaku" }
         mavenLocal()
     }
     dependencies {

gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=2.1.3-SNAPSHOT
+VERSION_NAME=2.1.4-SNAPSHOT
 VERSION_CODE=1
 GROUP=org.smartregister
 POM_SETTING_DESCRIPTION=OpenSRP Client Chw Core Library
@@ -13,4 +13,4 @@ POM_SETTING_DEVELOPER_ID=opensrp
 POM_SETTING_DEVELOPER_NAME=OpenSRP Onadev
 android.useAndroidX=true
 android.enableJetifier=true
-android.jetifier.blacklist=shadows
+android.jetifier.blacklist=shadows

opensrp-chw-core/build.gradle

@@ -16,7 +16,7 @@ apply plugin: 'jacoco'
 apply plugin: 'com.github.kt3k.coveralls'
 
 jacoco {
-    toolVersion = "0.8.0"
+    toolVersion = "0.8.6"
 }
 
 allprojects {
@@ -112,8 +112,12 @@ android {
 
 tasks.withType(Test) {
     jacoco.includeNoLocationClasses = true
+    testLogging {
+        events "failed"
+        exceptionFormat "full"
+    }
 }
-32
+
 dependencies {
     //implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.multidex:multidex:2.0.1'
@@ -139,7 +143,7 @@ dependencies {
         exclude group: 'xpp3', module: 'xpp3'
     }
 
-    api('org.smartregister:opensrp-client-native-form:2.1.6-SNAPSHOT@aar') {
+    api('org.smartregister:opensrp-client-native-form:2.1.13-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'com.android.support', module: 'appcompat-v7'
         exclude group: 'com.android.support', module: 'cardview-v7'
@@ -206,7 +210,7 @@ dependencies {
         exclude group: 'com.github.lecho', module: 'hellocharts-android'
     }
 
-    api('org.smartregister:opensrp-client-chw-anc:2.0.6-SNAPSHOT@aar') {
+    api('org.smartregister:opensrp-client-chw-anc:2.0.8-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'org.smartregister', module: 'opensrp-client-core'
         exclude group: 'com.android.support', module: 'appcompat-v7'

opensrp-chw-core/src/main/java/org/smartregister/chw/core/activity/CoreAncMemberProfileActivity.java

@@ -13,6 +13,8 @@
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.vijay.jsonwizard.domain.Form;
+
 import org.json.JSONObject;
 import org.smartregister.chw.anc.activity.BaseAncMemberProfileActivity;
 import org.smartregister.chw.anc.domain.MemberObject;
@@ -96,9 +98,17 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         }
     }
 
+    public Form getForm(){
+        Form form = new Form();
+        form.setActionBarBackground(R.color.family_actionbar);
+        form.setWizard(false);
+        return form;
+    }
+
     public void startFormActivity(JSONObject formJson) {
-        startActivityForResult(CoreJsonFormUtils.getJsonIntent(this, formJson,
-                Utils.metadata().familyMemberFormActivity), JsonFormUtils.REQUEST_CODE_GET_JSON);
+        startActivityForResult(
+                CoreJsonFormUtils.getJsonIntent(this, formJson,Utils.metadata().familyMemberFormActivity, getForm()),
+                JsonFormUtils.REQUEST_CODE_GET_JSON);
     }
 
     // to chw

opensrp-chw-core/src/main/java/org/smartregister/chw/core/activity/CoreChildProfileActivity.java

@@ -28,6 +28,7 @@
 import androidx.viewpager.widget.ViewPager;
 
 import com.google.android.material.appbar.AppBarLayout;
+import com.vijay.jsonwizard.domain.Form;
 
 import org.apache.commons.lang3.tuple.Triple;
 import org.jetbrains.annotations.NotNull;
@@ -167,8 +168,6 @@ protected void onCreation() {
             upArrow.setColorFilter(getResources().getColor(R.color.text_blue), PorterDuff.Mode.SRC_ATOP);
             actionBar.setHomeAsUpIndicator(upArrow);
         }
-        toolbar.setNavigationOnClickListener(v -> onBackPressed());
-        textViewTitle.setOnClickListener(v -> onBackPressed());
         appBarLayout = findViewById(R.id.collapsing_toolbar_appbarlayout);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             appBarLayout.setOutlineProvider(null);
@@ -326,10 +325,18 @@ public Context getContext() {
         return this;
     }
 
+    public Form getForm(){
+        Form form = new Form();
+        form.setActionBarBackground(R.color.family_actionbar);
+        form.setWizard(false);
+        return form;
+    }
+
     @Override
     public void startFormActivity(JSONObject jsonForm) {
-        startActivityForResult(CoreJsonFormUtils.getJsonIntent(this, jsonForm,
-                Utils.metadata().familyMemberFormActivity), JsonFormUtils.REQUEST_CODE_GET_JSON);
+        startActivityForResult(
+                CoreJsonFormUtils.getJsonIntent(this, jsonForm,Utils.metadata().familyMemberFormActivity, getForm()),
+                JsonFormUtils.REQUEST_CODE_GET_JSON);
     }
 
     @Override

opensrp-chw-core/src/main/java/org/smartregister/chw/core/activity/CoreChildRegisterActivity.java

@@ -105,17 +105,22 @@ public void startFormActivity(String formName, String entityId, String metaData)
         }
     }
 
-    @Override
-    public void startFormActivity(JSONObject jsonForm) {
-        Intent intent = new Intent(this, Utils.metadata().familyFormActivity);
-        intent.putExtra(Constants.JSON_FORM_EXTRA.JSON, jsonForm.toString());
-
+    public Form getFormConfig(){
         Form form = new Form();
         form.setName(getString(R.string.add_fam));
         form.setActionBarBackground(R.color.family_actionbar);
         form.setNavigationBackground(R.color.family_navigation);
         form.setHomeAsUpIndicator(R.mipmap.ic_cross_white);
-        intent.putExtra(JsonFormConstants.JSON_FORM_KEY.FORM, form);
+        return form;
+    }
+
+    @Override
+    public void startFormActivity(JSONObject jsonForm) {
+        Intent intent = new Intent(this, Utils.metadata().familyFormActivity);
+        intent.putExtra(Constants.JSON_FORM_EXTRA.JSON, jsonForm.toString());
+
+
+        intent.putExtra(JsonFormConstants.JSON_FORM_KEY.FORM, getFormConfig());
 
         startActivityForResult(intent, JsonFormUtils.REQUEST_CODE_GET_JSON);
     }

opensrp-chw-core/src/main/java/org/smartregister/chw/core/activity/CoreFamilyOtherMemberProfileActivity.java

@@ -213,16 +213,19 @@ protected abstract BaseProfileContract.Presenter getFamilyOtherMemberActivityPre
 
     protected abstract CoreFamilyMemberFloatingMenu getFamilyMemberFloatingMenu();
 
+    public Form getForm(){
+        Form form = new Form();
+        form.setActionBarBackground(R.color.family_actionbar);
+        form.setWizard(false);
+        return form;
+    }
+
     public void startFormActivity(JSONObject jsonForm) {
 
         Intent intent = new Intent(this, Utils.metadata().familyMemberFormActivity);
         intent.putExtra(Constants.JSON_FORM_EXTRA.JSON, jsonForm.toString());
 
-
-        Form form = new Form();
-        form.setActionBarBackground(R.color.family_actionbar);
-        form.setWizard(false);
-        intent.putExtra(JsonFormConstants.JSON_FORM_KEY.FORM, form);
+        intent.putExtra(JsonFormConstants.JSON_FORM_KEY.FORM, getForm());
 
         startActivityForResult(intent, JsonFormUtils.REQUEST_CODE_GET_JSON);
     }

opensrp-chw-core/src/main/java/org/smartregister/chw/core/activity/CoreFamilyProfileActivity.java

@@ -18,6 +18,9 @@
 import androidx.fragment.app.Fragment;
 import androidx.viewpager.widget.ViewPager;
 
+import com.vijay.jsonwizard.constants.JsonFormConstants;
+import com.vijay.jsonwizard.domain.Form;
+
 import org.apache.commons.lang3.StringUtils;
 import org.greenrobot.eventbus.EventBus;
 import org.json.JSONObject;
@@ -60,10 +63,10 @@ public abstract class CoreFamilyProfileActivity extends BaseFamilyProfileActivit
     protected String familyHead;
     protected String primaryCaregiver;
     protected String familyName;
-    private FamilyFloatingMenu familyFloatingMenu;
+    public FamilyFloatingMenu familyFloatingMenu;
 
     @Override
-    protected void setupViews() {
+    public void setupViews() {
         super.setupViews();
 
         // Update profile border
@@ -278,6 +281,23 @@ public void updateHasPhone(boolean hasPhone) {
         }
     }
 
+    public Form getFormConfig(){
+        Form form = new Form();
+        form.setActionBarBackground(R.color.family_actionbar);
+        form.setWizard(false);
+        return form;
+    }
+
+    @Override
+    public void startFormActivity(JSONObject jsonForm) {
+        Intent intent = new Intent(this, Utils.metadata().familyMemberFormActivity);
+        intent.putExtra(Constants.JSON_FORM_EXTRA.JSON, jsonForm.toString());
+
+        intent.putExtra(JsonFormConstants.JSON_FORM_KEY.FORM, getFormConfig());
+
+        startActivityForResult(intent, JsonFormUtils.REQUEST_CODE_GET_JSON);
+    }
+
     @Override
     protected void initializePresenter() {
         familyBaseEntityId = getIntent().getStringExtra(Constants.INTENT_KEY.FAMILY_BASE_ENTITY_ID);

opensrp-chw-core/src/main/java/org/smartregister/chw/core/activity/CoreFamilyRegisterActivity.java

@@ -7,13 +7,20 @@
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 
+import com.vijay.jsonwizard.constants.JsonFormConstants;
+import com.vijay.jsonwizard.domain.Form;
+
 import org.apache.commons.lang3.StringUtils;
+import org.json.JSONObject;
+import org.smartregister.chw.core.R;
 import org.smartregister.chw.core.custom_views.NavigationMenu;
 import org.smartregister.chw.core.utils.CoreConstants;
 import org.smartregister.family.activity.BaseFamilyRegisterActivity;
 import org.smartregister.family.model.BaseFamilyRegisterModel;
 import org.smartregister.family.presenter.BaseFamilyRegisterPresenter;
+import org.smartregister.family.util.Constants;
 import org.smartregister.family.util.JsonFormUtils;
+import org.smartregister.family.util.Utils;
 import org.smartregister.view.fragment.BaseRegisterFragment;
 
 public abstract class CoreFamilyRegisterActivity extends BaseFamilyRegisterActivity {
@@ -54,6 +61,27 @@ protected void onResumption() {
         }
     }
 
+    public Form getFormConfig(){
+        Form form = new Form();
+        form.setName(getString(R.string.add_fam));
+        form.setActionBarBackground(R.color.family_actionbar);
+        form.setNavigationBackground(R.color.family_navigation);
+        form.setHomeAsUpIndicator(R.mipmap.ic_cross_white);
+        form.setPreviousLabel(getResources().getString(R.string.back));
+        return form;
+    }
+
+    @Override
+    public void startFormActivity(JSONObject jsonForm) {
+        Intent intent = new Intent(this, Utils.metadata().familyFormActivity);
+        intent.putExtra(Constants.JSON_FORM_EXTRA.JSON, jsonForm.toString());
+
+
+        intent.putExtra(JsonFormConstants.JSON_FORM_KEY.FORM, getFormConfig());
+
+        startActivityForResult(intent, JsonFormUtils.REQUEST_CODE_GET_JSON);
+    }
+
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);

opensrp-chw-core/src/main/java/org/smartregister/chw/core/activity/CorePncMemberProfileActivity.java

@@ -13,6 +13,8 @@
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.vijay.jsonwizard.domain.Form;
+
 import org.json.JSONObject;
 import org.smartregister.chw.anc.domain.MemberObject;
 import org.smartregister.chw.anc.util.NCUtils;
@@ -101,10 +103,18 @@ protected static CommonPersonObjectClient getClientDetailsByBaseEntityID(@NonNul
         return getCommonPersonObjectClient(baseEntityId);
     }
 
+    public Form getForm(){
+        Form form = new Form();
+        form.setActionBarBackground(R.color.family_actionbar);
+        form.setWizard(false);
+        return form;
+    }
+
     @Override
     public void startFormActivity(JSONObject formJson) {
-        startActivityForResult(CoreJsonFormUtils.getJsonIntent(this, formJson,
-                org.smartregister.family.util.Utils.metadata().familyMemberFormActivity), JsonFormUtils.REQUEST_CODE_GET_JSON);
+        startActivityForResult(
+                CoreJsonFormUtils.getJsonIntent(this, formJson,org.smartregister.family.util.Utils.metadata().familyMemberFormActivity, getForm()),
+                JsonFormUtils.REQUEST_CODE_GET_JSON);
     }
 
     protected List<CommonPersonObjectClient> getChildren(MemberObject memberObject) {

opensrp-chw-core/src/main/java/org/smartregister/chw/core/adapter/NavigationAdapter.java

@@ -9,6 +9,7 @@
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.recyclerview.widget.RecyclerView;
 
 import org.apache.commons.lang3.StringUtils;
@@ -28,13 +29,15 @@ public class NavigationAdapter extends RecyclerView.Adapter<NavigationAdapter.My
     private Context context;
     private Map<String, Class> registeredActivities;
     private NavigationAdapterHost host;
+    private DrawerLayout drawerLayout;
 
-    public NavigationAdapter(List<NavigationOption> navigationOptions, Activity context, Map<String, Class> registeredActivities, NavigationAdapterHost host) {
+    public NavigationAdapter(List<NavigationOption> navigationOptions, Activity context, Map<String, Class> registeredActivities, NavigationAdapterHost host, DrawerLayout drawerLayout) {
         this.navigationOptionList = navigationOptions;
         this.context = context;
         this.onClickListener = new NavigationListener(context, this);
         this.registeredActivities = registeredActivities;
         this.host = host;
+        this.drawerLayout = drawerLayout;
     }
 
     public String getSelectedView() {
@@ -58,17 +61,28 @@ public MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType)
     public void onBindViewHolder(@NonNull MyViewHolder holder, int position) {
         NavigationOption model = navigationOptionList.get(position);
         holder.tvName.setText(context.getResources().getText(model.getTitleID()));
-        holder.tvCount.setText(String.format(Locale.getDefault(), "%d", model.getRegisterCount()));
+        if (model.hasRegisterCount()) {
+            holder.tvCount.setText(String.format(Locale.getDefault(), "%d", model.getRegisterCount()));
+        } else {
+            holder.tvCount.setText(null);
+        }
         holder.ivIcon.setImageResource(model.getResourceID());
 
         holder.getView().setTag(model.getMenuTitle());
 
 
-        if (host.getSelectedView().equals(model.getMenuTitle())) {
+        if (host.getSelectedView().equals(model.getMenuTitle()) && model.getResourceID() == model.getResourceActiveID()) {
+            holder.itemView.setBackgroundColor(context.getResources().getColor(R.color.navigation_item_selected));
+            holder.tvCount.setTextColor(context.getResources().getColor(R.color.navigation_item_unselected));
+            holder.tvName.setTextColor(context.getResources().getColor(R.color.navigation_item_unselected));
+            holder.ivIcon.setImageResource(model.getResourceID());
+        } else if (host.getSelectedView() != null && host.getSelectedView().equals(model.getMenuTitle())) {
+            holder.itemView.setBackgroundColor(context.getResources().getColor(android.R.color.transparent));
             holder.tvCount.setTextColor(context.getResources().getColor(R.color.navigation_item_selected));
             holder.tvName.setTextColor(context.getResources().getColor(R.color.navigation_item_selected));
             holder.ivIcon.setImageResource(model.getResourceActiveID());
         } else {
+            holder.itemView.setBackgroundColor(context.getResources().getColor(android.R.color.transparent));
             holder.tvCount.setTextColor(context.getResources().getColor(R.color.navigation_item_unselected));
             holder.tvName.setTextColor(context.getResources().getColor(R.color.navigation_item_unselected));
             holder.ivIcon.setImageResource(model.getResourceID());
@@ -97,7 +111,12 @@ private MyViewHolder(View view) {
             ivIcon = view.findViewById(R.id.ivIcon);
 
             if (onClickListener != null) {
-                view.setOnClickListener(onClickListener);
+                view.setOnClickListener(v -> {
+                    if (drawerLayout != null) {
+                        drawerLayout.closeDrawers();
+                    }
+                    onClickListener.onClick(v);
+                });
             }
 
             myView = view;