Merge branch 'master' into health_pulse

Author: jkuester

.github/workflows/publish.yml

@@ -621,6 +621,58 @@ jobs:
         ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD_LUMBINI_CHIS }}
         ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD_LUMBINI_CHIS }}
 
+    - name: Unpack secrets moh_civ_coach
+      env:
+        ANDROID_SECRETS_KEY: ${{ secrets.ANDROID_SECRETS_KEY_MOH_CIV_COACH }}
+        ANDROID_SECRETS_IV: ${{ secrets.ANDROID_SECRETS_IV_MOH_CIV_COACH }}
+      run: make org=moh_civ_coach keydec
+
+    - name: Assemble moh_civ_coach
+      uses: maierj/[email protected]
+      with:
+        lane: build
+        options: '{ "flavor": "moh_civ_coach" }'
+      env:
+        ANDROID_KEYSTORE_PATH: moh_civ_coach.keystore
+        ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD_MOH_CIV_COACH }}
+        ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD_MOH_CIV_COACH }}
+
+    - name: Bundle moh_civ_coach
+      uses: maierj/[email protected]
+      with:
+        lane: bundle
+        options: '{ "flavor": "moh_civ_coach" }'
+      env:
+        ANDROID_KEYSTORE_PATH: moh_civ_coach.keystore
+        ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD_MOH_CIV_COACH }}
+        ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD_MOH_CIV_COACH }}
+
+    - name: Unpack secrets moh_civ_coach_uat
+      env:
+        ANDROID_SECRETS_KEY: ${{ secrets.ANDROID_SECRETS_KEY_MOH_CIV_COACH_UAT }}
+        ANDROID_SECRETS_IV: ${{ secrets.ANDROID_SECRETS_IV_MOH_CIV_COACH_UAT }}
+      run: make org=moh_civ_coach_uat keydec
+
+    - name: Assemble moh_civ_coach_uat
+      uses: maierj/[email protected]
+      with:
+        lane: build
+        options: '{ "flavor": "moh_civ_coach_uat" }'
+      env:
+        ANDROID_KEYSTORE_PATH: moh_civ_coach_uat.keystore
+        ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD_MOH_CIV_COACH_UAT }}
+        ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD_MOH_CIV_COACH_UAT }}
+
+    - name: Bundle moh_civ_coach_uat
+      uses: maierj/[email protected]
+      with:
+        lane: bundle
+        options: '{ "flavor": "moh_civ_coach_uat" }'
+      env:
+        ANDROID_KEYSTORE_PATH: moh_civ_coach_uat.keystore
+        ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD_MOH_CIV_COACH_UAT }}
+        ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD_MOH_CIV_COACH_UAT }}
+
     - name: GitHub release
       uses: softprops/action-gh-release@v1
       if: startsWith(github.ref, 'refs/tags/')

README.md

@@ -1,28 +1,28 @@
-CHT Android App
-===============
+# CHT Android
 
-The cht-android application is a thin Android wrapper to load the [CHT Core Framework](https://github.com/medic/cht-core/) web application in a Webview native container.
+![GitHub license](https://img.shields.io/github/license/medic/cht-android)
+![GitHub release](https://img.shields.io/github/v/release/medic/cht-android)
+[![Discourse](https://img.shields.io/badge/discourse-join-blue)](https://forum.communityhealthtoolkit.org/)
 
-The repository contains “flavored” configurations, where each “flavor” or “brand” is an app. This allows the application to be hardcoded to a specific CHT deployment and have a partner specific logo and display name. The app also provides some deeper integration with other android apps and native phone functions that are otherwise unavailable to webapps.
+CHT Android application is a thin Android wrapper to load the [CHT Core Framework](https://github.com/medic/cht-core/) web application in a Webview native container.
 
+The repository contains “flavored” configurations, where each “flavor” or “brand” is an app. This allows the application to be hardcoded to a specific CHT deployment and have a partner specific logo and display name. The app also provides some deeper integration with other android apps and native phone functions that are otherwise unavailable to webapps.
 
-## Release notes
+## Release Notes
 
 Checkout the release notes in the [Changelog](CHANGELOG.md) page, our you can see the full release history with the installable files for sideloading [here](https://github.com/medic/cht-android/releases).
 
-
 ## Development
 
-Development guides are available in the "Android" section of the [Community Health Toolkit Docs Site](https://docs.communityhealthtoolkit.org/core/guides/android/). You will find instructions of how to setup your development environment, build and test new features, creates new branded apps, release, publish... and so on.
+Development guides are available in the "Android" section of the [Community Health Toolkit Docs Site](https://docs.communityhealthtoolkit.org/building/branding/publishing/). You will find instructions of how to setup your development environment, build and test new features, creates new branded apps, release, and publish.
 
-## Settings page
+## Settings Page
 To open the app's Settings page, tap 5 times with one finger on the screen and then swipe right with two fingers, make sure to do this sequence fast. Once opened, you can change the URL of the CHT server and click "Save" to save the changes and close the Settings page.
 
 ## Copyright
 
 Copyright 2013-2025 Medic Mobile, Inc. <[email protected]>.
 
-
 ## License
 
 The software is provided under AGPL-3.0. Contributions to this project are accepted under the same license.

build.gradle

@@ -445,6 +445,16 @@ android {
       applicationId = 'org.medicmobile.webapp.mobile.moh_civ_uat'
     }
 
+    moh_civ_coach {
+      dimension = 'brand'
+      applicationId = 'org.medicmobile.webapp.mobile.moh_civ_coach'
+    }
+
+    moh_civ_coach_uat {
+      dimension = 'brand'
+      applicationId = 'org.medicmobile.webapp.mobile.moh_civ_coach_uat'
+    }
+
     moh_nepal_mhealth {
       dimension = 'brand'
       applicationId = 'org.medicmobile.webapp.mobile.moh_nepal_mhealth'
@@ -476,6 +486,7 @@ dependencies {
   implementation fileTree(dir: 'libs', include: ['*.jar'])
   implementation platform('org.jetbrains.kotlin:kotlin-bom:1.9.24')
   implementation 'androidx.browser:browser:1.8.0'
+  implementation 'androidx.appcompat:appcompat:1.7.1'
   implementation 'androidx.core:core:1.13.1'
   implementation 'androidx.activity:activity:1.9.0'
   implementation 'androidx.fragment:fragment:1.7.1'

secrets/secrets-moh_civ_coach.tar.gz.enc

@@ -43,6 +43,7 @@
       android:screenOrientation="portrait"
       android:configChanges="orientation|screenSize"
       android:launchMode="singleTask"
+      android:theme="@style/Theme.AppCompat.NoActionBar"
       android:exported="true"
       tools:ignore="DiscouragedApi">
       <intent-filter android:autoVerify="true">

secrets/secrets-moh_civ_coach_uat.tar.gz.enc

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
@@ -48,7 +49,8 @@
                 style="@style/borderlessButton"
                 android:onClick="onClickMoreInfo"
                 android:text="@string/btnMoreInfo"
-                android:textAllCaps="true" />
+                android:textAllCaps="true"
+                tools:ignore="UsingOnClickInXml" />
 
             <View
                 android:layout_width="0dp"
@@ -60,7 +62,8 @@
                 style="@style/borderlessButton"
                 android:onClick="onClickRetry"
                 android:text="@string/btnRetry"
-                android:textAllCaps="true" />
+                android:textAllCaps="true"
+                tools:ignore="UsingOnClickInXml" />
         </LinearLayout>
     </RelativeLayout>
 

src/main/AndroidManifest.xml

@@ -27,7 +27,7 @@
     android:layout_toStartOf="@+id/btnSaveSettings"
     android:onClick="cancelSettingsEdit"
     android:text="@string/btnCancel"
-    tools:ignore="OnClick" />
+    tools:ignore="OnClick,UsingOnClickInXml" />
   <!-- OnClick is ignored because lint generates error
 	     incorrectly.  Test with future build tool versions
 	     to see if this exception can be removed -->
@@ -38,5 +38,5 @@
     android:layout_alignParentBottom="true"
     android:onClick="verifyAndSave"
     android:text="@string/btnSave"
-    tools:ignore="OnClick" />
+    tools:ignore="OnClick,UsingOnClickInXml" />
 </RelativeLayout>

src/main/res/layout/connection_error.xml

@@ -37,7 +37,7 @@
 					style="@style/standardButton"
 					android:text="@string/btnQuit"
 					android:onClick="evtQuit"
-					tools:ignore="OnClick"
+					tools:ignore="OnClick,UsingOnClickInXml"
 					android:layout_toStartOf="@+id/btnFreeSpaceContinue"
 					android:layout_alignParentBottom="true"/>
 			<!-- OnClick is ignored because lint generates error
@@ -47,7 +47,7 @@
 					style="@style/standardButton"
 					android:text="@string/btnContinue"
 					android:onClick="evtContinue"
-					tools:ignore="OnClick"
+					tools:ignore="OnClick,UsingOnClickInXml"
 					android:layout_alignParentEnd="true"
 					android:layout_alignParentBottom="true"/>
 		</RelativeLayout>

src/main/res/layout/custom_server_form.xml

@@ -45,7 +45,7 @@
       style="@style/borderlessButton"
       android:onClick="onClickNegative"
       android:text="@string/domainAppAssociationRequestDenyButton"
-      tools:ignore="OnClick"
+      tools:ignore="OnClick,UsingOnClickInXml"
       android:layout_marginTop="10dp"/>
 
     <View
@@ -61,7 +61,7 @@
       android:onClick="onClickOk"
       android:text="@string/domainAppAssociationRequestOkButton"
       android:textColor="#ffffff"
-      tools:ignore="OnClick" />
+      tools:ignore="OnClick,UsingOnClickInXml" />
 
   </LinearLayout>