Merge pull request #121 from OpenSRP/trasifex-client

Configure transifex client and pull swahili translations
opensrp · Oct 14, 2020 · 3a8eeef · 3a8eeef
2 parents dda0c5f + 60f853c
commit 3a8eeef
Show file tree

Hide file tree

Showing 11 changed files with 69 additions and 18 deletions.
diff --git a/.tx/config b/.tx/config
@@ -0,0 +1,8 @@
+[main]
+host = https://www.transifex.com
+
+[opensrp-client-chw-hf.strings-xml--master]
+file_filter = opensrp-chw-hf/src/main/res/values-<lang>/strings.xml
+source_file = opensrp-chw-hf/src/main/res/values/strings.xml
+source_lang = en
+type = ANDROID
diff --git a/build.gradle b/build.gradle
@@ -43,12 +43,10 @@ allprojects {
         maven { url "https://repo.maven.apache.org/maven2" }
         maven { url "https://cloudant.github.io/cloudant-sync-eap/repository" }
         maven { url 'https://maven.fabric.io/public' }
-        maven {
-            url "https://s3.amazonaws.com/repo.commonsware.com"
-        }
-        maven { url "https://s3.amazonaws.com/repo.commonsware.com" }
+        maven { url "https://s3.amazonaws.com/repo.commonsware.com"}
         maven { url "https://dl.bintray.com/ona/rdt-capture" }
         maven { url 'https://dl.bintray.com/ibm-watson-health/ibm-fhir-server-releases'}
+        maven { url "http://dl.bintray.com/ona/kujaku" }
     }
 }
 

diff --git a/opensrp-chw-hf/build.gradle b/opensrp-chw-hf/build.gradle
@@ -148,7 +148,8 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation('org.smartregister:opensrp-client-chw-core:1.4.7-SNAPSHOT@aar') {
+    implementation('org.smartregister:opensrp-client-chw-core:1.5.7-ALPHA1-SNAPSHOT@aar') {
+//    implementation(project(":opensrp-chw-core")) {
         transitive = true
         exclude group: 'com.android.support', module: 'appcompat-v7'
         exclude group: 'androidx.legacy', module: 'legacy-support-v4'

diff --git a/...srp-chw-hf/src/main/java/org/smartregister/chw/hf/activity/FamilyProfileMenuActivity.java b/...srp-chw-hf/src/main/java/org/smartregister/chw/hf/activity/FamilyProfileMenuActivity.java
@@ -24,12 +24,10 @@ protected void onCreate(Bundle savedInstanceState) {
 
         Fragment fragment;
         switch (menuOption) {
-            case CoreConstants.MenuType.ChangeHead:
-                fragment = FamilyProfileChangeHead.newInstance(familyBaseEntityId);
-                break;
             case CoreConstants.MenuType.ChangePrimaryCare:
                 fragment = FamilyProfileChangePrimaryCG.newInstance(familyBaseEntityId);
                 break;
+            case CoreConstants.MenuType.ChangeHead:
             default:
                 fragment = FamilyProfileChangeHead.newInstance(familyBaseEntityId);
                 break;

diff --git a/...hw-hf/src/main/java/org/smartregister/chw/hf/activity/HfStockInventoryReportActivity.java b/...hw-hf/src/main/java/org/smartregister/chw/hf/activity/HfStockInventoryReportActivity.java
@@ -26,7 +26,7 @@ public List<StockUsageItemModel> getStockUsageItemReportList(String month, Strin
         List<StockUsageItemModel> stockUsageItemModelsList = new ArrayList<>();
         for (String item : getItems()) {
             String usage = providerName.equalsIgnoreCase(this.getString(R.string.all_chw)) ? StockUsageReportDao.getAllStockUsageForMonth(month, item, year) : StockUsageReportDao.getStockUsageForMonth(month, item, year, providerName);
-            stockUsageItemModelsList.add(new StockUsageItemModel(stockUsageReportUtils.getFormattedItem(item), stockUsageReportUtils.getUnitOfMeasure(item), usage, providerName));
+            stockUsageItemModelsList.add(new StockUsageItemModel(stockUsageReportUtils.getFormattedItem(item, this), stockUsageReportUtils.getUnitOfMeasure(item, this), usage, providerName));
         }
         return stockUsageItemModelsList;
     }

diff --git a/...p-chw-hf/src/main/java/org/smartregister/chw/hf/activity/ProvidersReportListActivity.java b/...p-chw-hf/src/main/java/org/smartregister/chw/hf/activity/ProvidersReportListActivity.java
@@ -39,8 +39,8 @@ protected List<String> getProviderList() {
         List<String> arrayList = new LinkedList<>();
         List<String> providers = new ArrayList<>();
         arrayList.add(this.getString(R.string.all_chw));
-        if (stockUsageReportUtils.getPreviousMonths().size() > 0) {
-            for (Map.Entry<String, String> entry : stockUsageReportUtils.getPreviousMonths().entrySet()) {
+        if (stockUsageReportUtils.getPreviousMonths(this).size() > 0) {
+            for (Map.Entry<String, String> entry : stockUsageReportUtils.getPreviousMonths(this).entrySet()) {
                 providers.addAll(getDBProviders(entry.getKey(), entry.getValue()));
             }
         }

diff --git a/opensrp-chw-hf/src/main/java/org/smartregister/chw/hf/adapter/ServiceActivityAdapter.java b/opensrp-chw-hf/src/main/java/org/smartregister/chw/hf/adapter/ServiceActivityAdapter.java
@@ -41,13 +41,9 @@ public ServiceActivityViewHolder onCreateViewHolder(@NonNull ViewGroup parent, i
     public void onBindViewHolder(@NonNull ServiceActivityViewHolder holder, int position) {
         String Item = serviceItems.get(position);
         holder.serviceItem.setText(Item);
-        holder.view.setOnClickListener(new View.OnClickListener() {
-
-            @Override
-            public void onClick(View v) {
-                Intent intent = getIntent(context, Item);
-                context.startActivity(intent);
-            }
+        holder.view.setOnClickListener(v -> {
+            Intent intent = getIntent(context, Item);
+            context.startActivity(intent);
         });
     }
 

diff --git a/opensrp-chw-hf/src/main/java/org/smartregister/chw/hf/custom_view/HfNavigationMenu.java b/opensrp-chw-hf/src/main/java/org/smartregister/chw/hf/custom_view/HfNavigationMenu.java
@@ -6,6 +6,7 @@
 import org.apache.commons.lang3.tuple.Pair;
 import org.smartregister.chw.core.custom_views.NavigationMenu;
 import org.smartregister.chw.core.utils.CoreConstants;
+import org.smartregister.chw.hf.activity.HfHIA2ReportsActivity;
 import org.smartregister.chw.hf.activity.ProvidersReportListActivity;
 import org.smartregister.chw.hf.activity.ServiceActivity;
 
@@ -38,6 +39,11 @@ public boolean hasStockReport() {
         return true;
     }
 
+    @Override
+    public boolean hasCommunityResponders() {
+        return false;
+    }
+
     @Override
     public Intent getStockReportIntent(Activity activity) {
         return new Intent(activity, ProvidersReportListActivity.class);
@@ -47,4 +53,14 @@ public Intent getStockReportIntent(Activity activity) {
     public Intent getServiceReportIntent(Activity activity) {
         return new Intent(activity, ServiceActivity.class);
     }
+
+    @Override
+    public String childNavigationMenuCountString() {
+        return null;
+    }
+
+    @Override
+    public Intent getHIA2ReportActivityIntent(Activity activity) {
+        return new Intent(activity, HfHIA2ReportsActivity.class);
+    }
 }
diff --git a/opensrp-chw-hf/src/main/res/values-sw/strings.xml b/opensrp-chw-hf/src/main/res/values-sw/strings.xml
@@ -0,0 +1,30 @@
+<resources>
+    <string name="app_name">Kituoni</string>
+    <string name="logo">Nembo</string>
+    <string name="login_title">USAID Boresha Afya\nKituo cha Afya</string>
+    <string name="nav_logo">USAID Boresha Afya Kituo cha Afya</string>
+    <string name="due_only">Amepewa rufaa</string>
+
+    <string name="clicked_sick_child">Umebonyeza kitendo cha ufuatiliaji wa mtoto mgonjwa</string>
+    <string name="clicked_malaria_diagnosis">Umebonyeza kitendo cha utambuzi wa malaria</string>
+    <string name="referral_for">Rufaa kwa %s</string>
+    <string name="full_referral_info">Angalia taarifa za rufaa</string>
+    <string name="back_to_referrals">Rudi kwa rufaa</string>
+    <string name="mark_done">Imefanyika</string>
+    <string name="mark_as_done">Imefanyika</string>
+    <string name="view_profile">Angalia taarifa za huyu</string>
+    <string name="chw_phone">Simu ya Mja</string>
+    <string name="chw">Mja</string>
+    <string name="referral_date">Tarehe ya rufaa</string>
+    <string name="problem">Tatizo</string>
+    <string name="phone">Simu</string>
+    <string name="client_name_age_suffix">%s, %s</string>
+    <string name="mark_as_done_title">Imefanyika?</string>
+    <string name="mark_as_done_message">Rufaa itafungwa na haitakwepo.</string>
+    <string name="phone_not_provided">Namba ya simu haijatolewa</string>
+    <string name="anc_danger_sign_prefix">Dalili za hatari wakati la ujazito; Dalili: %s</string>
+    <string name="referral_day">Rufaa %s iliyopita</string>
+    <string name="fp_update_family_planning">Update usajili wa uzazi wa mpango</string>
+    <string name="error_opening_profile">Tatizo kufungua taarifa za mteja</string>
+    <string name="family">Kaya ya %s</string>
+</resources>
diff --git a/opensrp-chw-hf/src/main/res/values/strings.xml b/opensrp-chw-hf/src/main/res/values/strings.xml
@@ -26,4 +26,5 @@
     <string name="referral_day">Referral %s ago</string>
     <string name="fp_update_family_planning">Update Family planning Registration</string>
     <string name="error_opening_profile">Error opening client\'s profile</string>
+    <string name="family">%s Family</string>
 </resources>
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1,4 @@
 include ':opensrp-chw-hf'
+
+//include ':opensrp-chw-core'
+//project(":opensrp-chw-core").projectDir = new File("../opensrp-client-chw-core/opensrp-chw-core")