WD|Initial Snapdragon SDK for Facial Recognition #4

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "lib/facialrecognition"]
+	path = lib/facialrecognition
+	url = [email protected]:OpenSRP/opensrp-client-facial-recognition.git

opensrp-bidan-cloudant-nofr/build.gradle → opensrp-bidan/build.gradle

@@ -17,43 +17,11 @@ repositories {
 
 apply plugin: 'com.android.application'
 
-dependencies {
-    compile fileTree(include: ['commons-validator-1.6.jar'], dir: 'libs')
-    //    compile project(':opensrp-app')
-    compile('org.smartregister:opensrp-client-core:1.1.1-SNAPSHOT@aar') {
-        transitive = true
-        exclude group: 'com.github.bmelnychuk', module: 'atv'
-    }
-    // FORM
-    compile('org.smartregister:opensrp-client-enketo:1.0.0-SNAPSHOT@aar') {
-        transitive = true
-        exclude group: 'com.github.bmelnychuk', module: 'atv'
-        exclude group: 'com.google.guava', module: 'guava'
-    }
-    compile('com.android.support:design:22.2.1') {
-        exclude group: 'com.android.support', module: 'recyclerview-v7'
-
-    }
-    testCompile 'junit:junit:4.12'
-    testCompile('org.robolectric:robolectric:3.4') {
-
-        exclude group: 'com.google.guava', module: 'guava'
-        exclude group: 'org.apache.maven', module: 'maven-model'
-        exclude group: 'org.apache.maven', module: 'maven-ant-tasks'
-        exclude group: 'com.android.support'
-        exclude group: 'com.thoughtworks.xstream', module: 'xstream'
-    }
-    testCompile('org.robolectric:shadows-multidex:3.4-rc2') {
-        exclude group: 'com.google.guava', module: 'guava'
-    }
-    testCompile 'org.apache.maven:maven-ant-tasks:2.1.3'
-}
-
-
 android {
 
     compileSdkVersion 22
     buildToolsVersion "26.0.1"
+    enforceUniquePackageName = false
 
     defaultConfig {
         applicationId "org.smartregister.bidan_cloudant"
@@ -63,6 +31,10 @@ android {
         versionName "1.0"
         multiDexEnabled true
 
+        ndk{
+            abiFilters "armeabi"
+        }
+
         buildConfigField "long", "MAX_SERVER_TIME_DIFFERENCE", "1800000l"
         buildConfigField "boolean", "TIME_CHECK", "false"
     }
@@ -110,4 +82,49 @@ android {
         checkReleaseBuilds false
         abortOnError false
     }
-}
+}
+// Local repo
+repositories {
+//    mavenCentral()
+    flatDir {
+        dirs 'libs'
+    }
+}
+
+dependencies {
+    compile fileTree(include: ['commons-validator-1.6.jar'], dir: 'libs')
+    //    compile project(':opensrp-app')
+    compile('org.smartregister:opensrp-client-core:1.1.1-SNAPSHOT@aar') {
+        transitive = true
+        exclude group: 'com.github.bmelnychuk', module: 'atv'
+    }
+    // FORM
+    compile('org.smartregister:opensrp-client-enketo:1.0.0-SNAPSHOT@aar') {
+        transitive = true
+        exclude group: 'com.github.bmelnychuk', module: 'atv'
+        exclude group: 'com.google.guava', module: 'guava'
+    }
+    compile('com.android.support:design:22.2.1') {
+        exclude group: 'com.android.support', module: 'recyclerview-v7'
+
+    }
+    testCompile 'junit:junit:4.12'
+    testCompile('org.robolectric:robolectric:3.4') {
+
+        exclude group: 'com.google.guava', module: 'guava'
+        exclude group: 'org.apache.maven', module: 'maven-model'
+        exclude group: 'org.apache.maven', module: 'maven-ant-tasks'
+        exclude group: 'com.android.support'
+        exclude group: 'com.thoughtworks.xstream', module: 'xstream'
+    }
+    testCompile('org.robolectric:shadows-multidex:3.4-rc2') {
+        exclude group: 'com.google.guava', module: 'guava'
+    }
+    testCompile 'org.apache.maven:maven-ant-tasks:2.1.3'
+
+    // Snapdragon Facial Recognition
+//    compile project(':opensrp-facial-recognition-debug')
+    compile (name : 'opensrp-facial-recognition-debug', ext:'aar')
+
+}
+

opensrp-bidan-cloudant-nofr/src/main/java/org/smartregister/bidan/activity/BaseRegisterActivity.java → opensrp-bidan/src/main/java/org/smartregister/bidan/activity/BaseRegisterActivity.java

@@ -28,7 +28,6 @@
 import org.smartregister.view.dialog.DialogOption;
 import org.smartregister.view.dialog.DialogOptionModel;
 import org.smartregister.view.dialog.EditOption;
-import org.smartregister.view.dialog.OpenFormOption;
 import org.smartregister.view.fragment.SecuredNativeSmartRegisterFragment;
 import org.smartregister.view.viewpager.OpenSRPViewPager;
 
@@ -40,13 +39,6 @@
 import butterknife.Bind;
 import butterknife.ButterKnife;
 
-import static org.smartregister.bidan.activity.DetailMotherActivity.motherClient;
-import static org.smartregister.bidan.utils.AllConstantsINA.FormNames.KARTU_IBU_ANC_CLOSE;
-import static org.smartregister.bidan.utils.AllConstantsINA.FormNames.KARTU_IBU_ANC_RENCANA_PERSALINAN;
-import static org.smartregister.bidan.utils.AllConstantsINA.FormNames.KARTU_IBU_ANC_VISIT;
-import static org.smartregister.bidan.utils.AllConstantsINA.FormNames.KARTU_IBU_ANC_VISIT_INTEGRASI;
-import static org.smartregister.bidan.utils.AllConstantsINA.FormNames.KARTU_IBU_ANC_VISIT_LABTEST;
-import static org.smartregister.bidan.utils.AllConstantsINA.FormNames.KARTU_IBU_PNC_REGISTRATION;
 import static org.smartregister.util.Utils.getValue;
 import org.smartregister.util.Log;
 /**
@@ -86,7 +78,6 @@ public void onPageSelected(int position) {
 
 //        ziggyService = context().ziggyService();
 
-
     }
 
     protected String[] formNames() {