Fix reference and integration issues

.gitignore

@@ -8,3 +8,4 @@ build/
 .externalNativeBuild
 .cxx
 **/build
+**/jacoco.exec

gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.0.1-SNAPSHOT
+VERSION_NAME=0.0.3-SNAPSHOT
 VERSION_CODE=1
 GROUP=org.smartregister
 POM_SETTING_DESCRIPTION=OpenSRP Client Tasking Library
@@ -29,4 +29,4 @@ org.gradle.jvmargs=-Xmx2048m
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
+android.enableJetifier=true

opensrp-tasking/build.gradle

@@ -39,6 +39,11 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
+
+        debug {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
     }
 
     dexOptions {
@@ -50,8 +55,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility 1.8
-        targetCompatibility 1.8
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
         coreLibraryDesugaringEnabled true
     }
 
@@ -88,9 +93,11 @@ dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation 'androidx.appcompat:appcompat:1.1.0'
 
-    api 'org.smartregister:opensrp-client-core:1.13.4-SNAPSHOT'
-    api ('org.smartregister:opensrp-client-native-form:1.13.2-SNAPSHOT'){
+    api 'org.smartregister:opensrp-client-core:1.15.3-SNAPSHOT'
+    api ('org.smartregister:opensrp-client-native-form:1.13.2-SNAPSHOT') {
         transitive = true
+        exclude group: 'org.smartregister', module: 'opensrp-client-simprints'
+        exclude group: 'com.ibm.fhir', module: 'fhir-model'
         exclude group: 'org.smartregister', module: 'opensrp-client-core'
     }
 
@@ -100,7 +107,13 @@ dependencies {
         exclude group: 'com.android.support', module: 'appcompat-v7'
     }
 
-    api 'io.ona.kujaku:library:0.8.3'
+    implementation 'org.smartregister:opensrp-client-reporting:0.0.6-RVL-SNAPSHOT@aar'
+
+    implementation ('io.ona.kujaku:library:0.8.3') {
+        transitive = true
+        exclude group: 'com.android.volley'
+        exclude group: 'stax', module: 'stax-api'
+    }
     implementation 'xerces:xercesImpl:2.12.0'
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.5'
@@ -116,6 +129,16 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 
+    testImplementation 'org.mockito:mockito-inline:2.13.0'
+    testImplementation 'org.robolectric:robolectric:4.2'
+    testImplementation 'org.robolectric:shadows-multidex:4.2'
+    // PowerMock
+    def powerMockVersion = '2.0.0'
+    testImplementation "org.powermock:powermock-module-junit4:$powerMockVersion"
+    testImplementation "org.powermock:powermock-module-junit4-rule:$powerMockVersion"
+    testImplementation "org.powermock:powermock-api-mockito2:$powerMockVersion"
+    testImplementation "org.powermock:powermock-classloading-xstream:$powerMockVersion"
+
 }
 
 task jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest']) {

opensrp-tasking/src/main/java/org/smartregister/tasking/TaskingLibrary.java

@@ -1,6 +1,9 @@
 package org.smartregister.tasking;
 
+import android.content.Context;
+
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.smartregister.CoreLibrary;
 import org.smartregister.repository.AllSharedPreferences;
@@ -9,7 +12,11 @@
 import org.smartregister.repository.StructureRepository;
 import org.smartregister.repository.TaskNotesRepository;
 import org.smartregister.repository.TaskRepository;
+import org.smartregister.tasking.util.TaskingLibraryConfiguration;
 import org.smartregister.util.AppExecutors;
+import org.smartregister.view.activity.DrishtiApplication;
+
+import io.ona.kujaku.data.realm.RealmDatabase;
 
 /**
  * Created by samuelgithengi on 6/10/20.
@@ -24,23 +31,27 @@ public class TaskingLibrary {
     private EventClientRepository eventClientRepository;
     private AllSharedPreferences allSharedPreferences;
 
-    private float locationBuffer;
+    private String digitalGlobeConnectId;
+    private String mapboxAccessToken;
+
+    private RealmDatabase realmDatabase;
+    private TaskingLibraryConfiguration taskingLibraryConfiguration;
 
-    public void init() {
-        instance = new TaskingLibrary();
+    public static void init(@NonNull TaskingLibraryConfiguration taskingLibraryConfiguration) {
+        instance = new TaskingLibrary(taskingLibraryConfiguration);
     }
 
     public static TaskingLibrary getInstance() {
         return instance;
     }
 
+    public TaskingLibrary(@NonNull TaskingLibraryConfiguration taskingLibraryConfiguration) {
+        this.taskingLibraryConfiguration = taskingLibraryConfiguration;
+    }
+
     @NonNull
     public AppExecutors getAppExecutors() {
-        if (appExecutors == null) {
-            appExecutors = new AppExecutors();
-        }
-
-        return appExecutors;
+        return taskingLibraryConfiguration.getAppExecutors();
     }
 
     @NonNull
@@ -86,8 +97,36 @@ public AllSharedPreferences getAllSharedPreferences() {
 
     @NonNull
     public Repository getRepository() {
-        //return CoreLibrary.getInstance().context().
-        return null;
+        return DrishtiApplication.getInstance().getRepository();
+    }
+
+    @Nullable
+    public String getDigitalGlobeConnectId() {
+        return digitalGlobeConnectId;
+    }
+
+    public void setDigitalGlobeConnectId(@Nullable String digitalGlobeConnectId) {
+        this.digitalGlobeConnectId = digitalGlobeConnectId;
+    }
+
+    @Nullable
+    public String getMapboxAccessToken() {
+        return mapboxAccessToken;
+    }
+
+    public void setMapboxAccessToken(String mapboxAccessToken) {
+        this.mapboxAccessToken = mapboxAccessToken;
+    }
+
+    public RealmDatabase getRealmDatabase(@NonNull Context context) {
+        if (realmDatabase == null) {
+            realmDatabase = RealmDatabase.init(context);
+        }
+
+        return realmDatabase;
+    }
 
+    public TaskingLibraryConfiguration getTaskingLibraryConfiguration() {
+        return taskingLibraryConfiguration;
     }
 }

opensrp-tasking/src/main/java/org/smartregister/tasking/activity/TaskRegisterActivity.java

@@ -24,12 +24,11 @@
 import java.util.List;
 
 import timber.log.Timber;
-//import static org.smartregister.tasking.util.FamilyConstants.Intent.START_REGISTRATION;
 
 /**
  * Created by samuelgithengi on 3/11/19.
  */
-public class TaskRegisterActivity extends BaseRegisterActivity implements BaseRegisterContract.View {
+public abstract class TaskRegisterActivity extends BaseRegisterActivity implements BaseRegisterContract.View {
 
     private RevealJsonFormUtils jsonFormUtils;
 
@@ -94,15 +93,14 @@ public TaskRegisterContract.Presenter getPresenter() {
         return (TaskRegisterContract.Presenter) presenter;
     }
 
-    public void startFamilyRegistration(BaseTaskDetails taskDetails) {
+    public abstract void startFamilyRegistration(BaseTaskDetails taskDetails);
         /*Intent intent = new Intent(this, FamilyRegisterActivity.class);
         intent.putExtra(START_REGISTRATION, true);
         intent.putExtra(Properties.LOCATION_UUID, taskDetails.getStructureId());
         intent.putExtra(Properties.TASK_IDENTIFIER, taskDetails.getTaskId());
         intent.putExtra(Properties.TASK_BUSINESS_STATUS, taskDetails.getBusinessStatus());
         intent.putExtra(Properties.TASK_STATUS, taskDetails.getTaskStatus());
         startActivity(intent);*/
-    }
 
     public void displayIndexCaseFragment(JSONObject indexCase) {
         ((CaseClassificationContract.View) caseClassificationFragment).displayIndexCase(indexCase);

opensrp-tasking/src/main/java/org/smartregister/tasking/adapter/DownloadedOfflineMapAdapter.java

@@ -12,11 +12,10 @@
 import com.mapbox.mapboxsdk.offline.OfflineRegion;
 import com.mapbox.mapboxsdk.offline.OfflineRegionStatus;
 
-import org.smartregister.reveal.R;
-import org.smartregister.reveal.model.OfflineMapModel;
-import org.smartregister.reveal.util.Utils;
-import org.smartregister.reveal.viewholder.DownloadedOfflineMapViewHolder;
+import org.smartregister.tasking.R;
 import org.smartregister.tasking.model.OfflineMapModel;
+import org.smartregister.tasking.util.Utils;
+import org.smartregister.tasking.viewholder.DownloadedOfflineMapViewHolder;
 
 import java.util.ArrayList;
 import java.util.List;

opensrp-tasking/src/main/java/org/smartregister/tasking/adapter/TaskRegisterAdapter.java

@@ -11,11 +11,14 @@
 import org.apache.commons.lang3.StringUtils;
 import org.smartregister.domain.Task;
 import org.smartregister.tasking.R;
+import org.smartregister.tasking.TaskingLibrary;
 import org.smartregister.tasking.model.CardDetails;
 import org.smartregister.tasking.model.TaskDetails;
 import org.smartregister.tasking.util.CardDetailsUtil;
 import org.smartregister.tasking.util.Constants.Intervention;
 import org.smartregister.tasking.viewholder.TaskRegisterViewHolder;
+import org.smartregister.tasking.model.TaskDetails;
+import org.smartregister.tasking.viewholder.TaskRegisterViewHolder;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -47,7 +50,7 @@ public TaskRegisterViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int
 
     @Override
     public void onBindViewHolder(@NonNull TaskRegisterViewHolder viewHolder, int position) {
-        TaskDetails task = taskDetails.get(position);
+        /*TaskDetails task = taskDetails.get(position);
         Float distance = task.getDistanceFromUser();
         String name = task.getStructureName();
         String action = null;
@@ -57,6 +60,28 @@ public void onBindViewHolder(@NonNull TaskRegisterViewHolder viewHolder, int pos
                 name = task.getFamilyName() != null ? task.getFamilyName() : task.getStructureName() != null ? task.getStructureName() : context.getString(R.string.unenumerated_structure);
             }
             action = context.getString(R.string.record_status);
+        } else if (Intervention.MOSQUITO_COLLECTION.equals(task.getTaskCode())) {
+            name = context.getString(R.string.mosquito_collection_point);
+            action = context.getString(R.string.record_mosquito_collection);
+        } else if (Intervention.LARVAL_DIPPING.equals(task.getTaskCode())) {
+            name = context.getString(R.string.larval_breeding_site);
+            action = context.getString(R.string.record_larvacide);
+        } else if (Intervention.BCC.equals(task.getTaskCode())) {
+            viewHolder.setIcon(R.drawable.ic_bcc);
+            name = context.getString(R.string.bcc);
+            action = context.getString(R.string.record_bcc);
+            hasIcon = true;
+        } else if (Intervention.CASE_CONFIRMATION.equals(task.getTaskCode()) && task.getTaskCount() == null) {
+            viewHolder.setIcon(R.drawable.ic_classification_details);
+            viewHolder.setItemViewListener(task, registerActionHandler);
+            name = context.getString(R.string.classification_details);
+            action = context.getString(R.string.view);
+            hasIcon = true;
+        } else if (Intervention.PAOT.equals(task.getTaskCode())) {
+            name = context.getString(R.string.card_view_paot);
+            if (task.getBusinessStatus() != null) {
+                action = CardDetailsUtil.getTranslatedBusinessStatus(task.getBusinessStatus()).replaceAll(" ", "\n");
+            }
         } else {
             name = NOT_ELIGIBLE.equals(task.getBusinessStatus()) ? context.getString(R.string.ineligible_location) : task.getFamilyName();
             if (name == null) {
@@ -88,7 +113,9 @@ public void onBindViewHolder(@NonNull TaskRegisterViewHolder viewHolder, int pos
             viewHolder.setHouseNumber(context.getString(R.string.numero_sign) + " " + task.getHouseNumber());
         } else {
             viewHolder.hideHouseNumber();
-        }
+        }*/
+
+        TaskingLibrary.getInstance().getTaskingLibraryConfiguration().onTaskRegisterBindViewHolder(context, viewHolder, registerActionHandler, taskDetails.get(position), position);
     }
 
     @Override

opensrp-tasking/src/main/java/org/smartregister/tasking/contract/BaseContract.java

@@ -5,6 +5,8 @@
 import com.mapbox.geojson.Feature;
 
 import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
 import org.smartregister.commonregistry.CommonPersonObjectClient;
 import org.smartregister.domain.Task;
 
@@ -28,5 +30,15 @@ void onFormSaved(@NonNull String structureId,
     interface BaseInteractor {
 
         void saveJsonForm(String json);
+
+        org.smartregister.domain.Event saveEvent(JSONObject jsonForm, String encounterType, String bindType) throws JSONException;
+
+        void saveRegisterStructureForm(JSONObject jsonForm);
+
+        void saveMemberForm(JSONObject jsonForm, String eventType, String intervention);
+
+        void saveCaseConfirmation(JSONObject jsonForm, String eventType);
+
+        void saveLocationInterventionForm(JSONObject jsonForm);
     }
 }

opensrp-tasking/src/main/java/org/smartregister/tasking/fragment/AvailableOfflineMapsFragment.java

@@ -49,18 +49,21 @@ public class AvailableOfflineMapsFragment extends BaseOfflineMapsFragment implem
 
     private Button btnDownloadMap;
 
+    private String mapStyleAssetPath;
+
     private static Gson gson = new GsonBuilder().setDateFormat(Constants.DateFormat.EVENT_DATE_FORMAT_Z)
                 .registerTypeAdapter(DateTime.class, new DateTimeTypeConverter())
             .registerTypeAdapter(LocationProperty.class, new PropertiesConverter()).create();
 
-
-    public static AvailableOfflineMapsFragment newInstance(Bundle bundle) {
+    public static AvailableOfflineMapsFragment newInstance(Bundle bundle, @NonNull String mapStyleAssetPath) {
 
         AvailableOfflineMapsFragment fragment = new AvailableOfflineMapsFragment();
         if (bundle != null) {
             fragment.setArguments(bundle);
         }
+
         fragment.setPresenter(new AvailableOfflineMapsPresenter(fragment));
+        fragment.setMapStyleAssetPath(mapStyleAssetPath);
 
         return fragment;
     }
@@ -73,9 +76,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
         }
         btnDownloadMap = null;
 
-        new FileHttpServerTask(getContext()).execute();
-
-
+        new FileHttpServerTask(getContext(), getMapStyleAssetPath()).execute();
     }
 
     @Nullable
@@ -247,15 +248,20 @@ public void setPresenter(AvailableOfflineMapsPresenter presenter) {
 
     @Override
     public void onClick(View view) {
-        switch (view.getId()) {
-            case R.id.offline_map_checkbox:
-                updateOperationalAreasToDownload(view);
-                break;
-            case R.id.download_map:
-                initiateMapDownload();
-                break;
-            default:
-                break;
+        int viewId = view.getId();
+        if (viewId == R.id.offline_map_checkbox) {
+            updateOperationalAreasToDownload(view);
+        } else if (viewId == R.id.download_map) {
+            initiateMapDownload();
         }
     }
+
+    @NonNull
+    public String getMapStyleAssetPath() {
+        return mapStyleAssetPath;
+    }
+
+    public void setMapStyleAssetPath(String mapStyleAssetPath) {
+        this.mapStyleAssetPath = mapStyleAssetPath;
+    }
 }