Merge main to develop

Jenkinsfile

@@ -6,6 +6,7 @@ pipeline {
     options {
         buildDiscarder(logRotator(daysToKeepStr: '5'))
         timeout(time: 50)
+        disableConcurrentBuilds(abortPrevious: true)
     }
 
     stages {

RELEASE.md

@@ -1,56 +1,44 @@
-Android Capture App for DHIS 2 (v2.8.2) - Patch version
+# DHIS2 Android App version 2.9 Release Notes
 <table>
 <tr> 
 <td> 
 <img src="https://s3-eu-west-1.amazonaws.com/content.dhis2.org/dhis2-android/android-chrome-384x384.png" width="800"> 
 </td> 
 <td>
-This is a patch version of the <strong>DHIS2 Android App</strong> It builds upon the last version including bug fixes that couldn't wait to the next version. 
-It includes no functional improvements neither changes in the User Interface. It means that yours users can update without experiencing any change in the UI. 
+The new <strong>DHIS2 Android App</strong> allows offline data capture across all DHIS2 data models. Data and metadata are automatically synchronized whenever there is internet access, always keeping the most relevant data for the logged user in the device.
+The app is compatible and we support <strong>2.38</strong>, <strong>2.39</strong>, <strong>40</strong>.  And has no breaking changes with <strong>2.37</strong>, <strong>2.36</strong>, <strong>2.35</strong> and <strong>2.34</strong>. 
 </td>
 </tr> 
 <tr> 
 <td colspan="2" bgcolor="white">
+## USER EXPERIENCE
 
-## Bugs fixed
-* [ANDROAPP-5463](https://dhis2.atlassian.net/browse/ANDROAPP-5463) Wrong password in already authenticated account throws invalid url
-* [ANDROAPP-5452](https://dhis2.atlassian.net/browse/ANDROAPP-5452) Notifications not displaying on devices with android 13 
-* [ANDROAPP-5426](https://dhis2.atlassian.net/browse/ANDROAPP-5426) DataSet tables not saving text values
-* [ANDROAPP-5425](https://dhis2.atlassian.net/browse/ANDROAPP-5425) App crashing when opening orgUnit field in event creation on android 5 and 6 devices
-* [ANDROAPP-5424](https://dhis2.atlassian.net/browse/ANDROAPP-5424) App not functional in Android 5.0 and 6.0 devices due to expression-parser library
-* [ANDROAPP-5403](https://dhis2.atlassian.net/browse/ANDROAPP-5403) The app displays the keyboard over the selecting menu when the user has multiple apps to use the email or phone number
-* [ANDROAPP-5401](https://dhis2.atlassian.net/browse/ANDROAPP-5401) Infinite loading when applying date filters in tracker program
-* [ANDROAPP-5399](https://dhis2.atlassian.net/browse/ANDROAPP-5399) Improve recomposition on input field in tables
-* [ANDROAPP-5396](https://dhis2.atlassian.net/browse/ANDROAPP-5396) SDK BC: handle d2ErrorCode SERVER_CONNECTION_ERROR
-* [ANDROAPP-5389](https://dhis2.atlassian.net/browse/ANDROAPP-5389) Validation Strategy - Errors
-* [ANDROAPP-5385](https://dhis2.atlassian.net/browse/ANDROAPP-5385) Program dashboard: filter by EventDate includes all EventStatus as side effect
-* [ANDROAPP-5384](https://dhis2.atlassian.net/browse/ANDROAPP-5384) Persist dataset column size when adjusted by the user and revert to default
-* [ANDROAPP-5380](https://dhis2.atlassian.net/browse/ANDROAPP-5380) Sync button crashes app after rotating device in search screen
-* [ANDROAPP-5377](https://dhis2.atlassian.net/browse/ANDROAPP-5377) A TEI enrolled in many programs display to many icons blocking the TEI info card
-* [ANDROAPP-5376](https://dhis2.atlassian.net/browse/ANDROAPP-5376) Login button doesn't work and doesn't present any error
-* [ANDROAPP-5375](https://dhis2.atlassian.net/browse/ANDROAPP-5375) App crashes with some icons
-* [ANDROAPP-5370](https://dhis2.atlassian.net/browse/ANDROAPP-5370) Navigation button does not open in some programs.
-* [ANDROAPP-5369](https://dhis2.atlassian.net/browse/ANDROAPP-5369) NullPointerException: Attempt to invoke virtual method 'java.lang.String java.lang.String.replaceAll(java.lang.String, ...
-* [ANDROAPP-5368](https://dhis2.atlassian.net/browse/ANDROAPP-5368) Org Unit value type opens the hierarchy incorrectly
-* [ANDROAPP-5363](https://dhis2.atlassian.net/browse/ANDROAPP-5363)   Wrong label displayed while navigating an error or warning
-* [ANDROAPP-5348](https://dhis2.atlassian.net/browse/ANDROAPP-5348) Errors in program rules are not shown after they have been displayed once despite the program rule being reexecuted
-* [ANDROAPP-5343](https://dhis2.atlassian.net/browse/ANDROAPP-5343) Sync flow backwards
-* [ANDROAPP-5342](https://dhis2.atlassian.net/browse/ANDROAPP-5342) Form actionable icons launch action from stored value
-* [ANDROAPP-5340](https://dhis2.atlassian.net/browse/ANDROAPP-5340) Store image and files before value type validation
-* [ANDROAPP-5335](https://dhis2.atlassian.net/browse/ANDROAPP-5335) In TEI dashboard filters appears items related to TEI
-* [ANDROAPP-5334](https://dhis2.atlassian.net/browse/ANDROAPP-5334) "All enrollments" cards show incident date even when not configured
-* [ANDROAPP-5330](https://dhis2.atlassian.net/browse/ANDROAPP-5330) App crash when deleting quantities in "Review" stage
-* [ANDROAPP-5329](https://dhis2.atlassian.net/browse/ANDROAPP-5329) The selected cell is hidden in RTStock program (and datasets) table if the first cell is selected after scroll
-* [ANDROAPP-5328](https://dhis2.atlassian.net/browse/ANDROAPP-5328) Default language not respected (or inconsistent) when changing between servers.
-* [ANDROAPP-5323](https://dhis2.atlassian.net/browse/ANDROAPP-5323) IllegalStateException: Attempting to launch an unregistered ActivityResultLauncher with contract androidx.activity.resul...
-* [ANDROAPP-5255](https://dhis2.atlassian.net/browse/ANDROAPP-5255) [LANDSCAPE] Loading bar never hides in overview screen
-* [ANDROAPP-5253](https://dhis2.atlassian.net/browse/ANDROAPP-5253) Event status filter doesn't remove checkmarks after the reset
-* [ANDROAPP-4710](https://dhis2.atlassian.net/browse/ANDROAPP-4710) Validation Strategy - Mandatory Fields
-* [ANDROAPP-4322](https://dhis2.atlassian.net/browse/ANDROAPP-4322) Analytics legends don't show event's exact date
-* [ANDROAPP-3106](https://dhis2.atlassian.net/browse/ANDROAPP-3106) [Bug]Error when searching with comma char in the values
-* This patch release updates the [Android SDK](https://github.com/dhis2/dhis2-android-sdk) to version 1.8.2.
-
-You can find in Jira details on the [bugs fixed](https://dhis2.atlassian.net/issues/?filter=10461) in this version.
+**Disable referral in tracker programs:** When users add events in a tracker program, the DHIS2 Android Capture app offers three options: Add (for new events), Schedule (for planning future evetns) and Refer (for referrals or transfers). As this third option is not used in many implementations, this new feature enables the admin user to remove that option from the menu to simplify the user experience. The referral option can be hidden using the Android Settings Web App for all programs or for each specific program.   [Jira](https://dhis2.atlassian.net/browse/ANDROAPP-4445) | [Documentation App](https://docs.dhis2.org/en/use/android-app/program-features.html#capture_app_programs_referrals) | [Documentation Webapp](https://docs.dhis2.org/en/use/android-app/settings-configuration.html#capture_app_android_settings_webapp_appearance_program) | [Screenshot](https://s3.eu-west-1.amazonaws.com/content.dhis2.org/dhis2-android/release+notes+2.9/release+feature+cards/Android-2-9-Disable-referrals.png)
+
+**Skip home screen if users only have access to one program:** The home screen of the DHIS2 Android App shows the list of programs and datasets available for the user. The first thing a user must do when using the app is to select the program or dataset to work with. In some implementations, users have access to only one program or dataset. To reduce the number of clicks and streamline the process of data entry, the App will now skip the home screen in the cases where the user has access to only one program or dataset, and will instead open directly to the program or dataset screen with the event, TEI or dataset list. [Jira](https://dhis2.atlassian.net/browse/ANDROAPP-5148) | [Documentation](https://docs.dhis2.org/en/use/android-app/android-specific-features.html#capture_app_home) | [Screenshot](https://s3.eu-west-1.amazonaws.com/content.dhis2.org/dhis2-android/release+notes+2.9/release+feature+cards/Android-2-9-Skip-home-screen.png)
+
+**Display program stage description:** The description for program stage sections was not available to the end user in previous versions of the App. To provide more context and information at the moment of data collection, the description has now been brought to the user interface and will be displayed below the section name. [Jira](https://dhis2.atlassian.net/browse/ANDROAPP-5151) | [Documentation](https://docs.dhis2.org/en/use/android-app/program-features.html#capture_app_programs_common_features_data_entry_form_program_stage_description) | [Screenshot](https://s3.eu-west-1.amazonaws.com/content.dhis2.org/dhis2-android/release+notes+2.9/release+feature+cards/Android-2-9-Program-stage-description.png)
+
+**Disable collapsible sections in forms:** Stage sections in the Android App are displayed with collapsible menus that enable the user to open one section at a time. The purpose of this accordion-like implementation is to help the user navigate very long forms. However, some implementations would prefer to list the sections one after the other. This new version of the application enables the admin user to decide if the sections should appear in extended mode. This configuration is made through the Android Settings Web App and will display the sections one after the other with the section name acting as a separator. [Jira](https://dhis2.atlassian.net/browse/ANDROAPP-5393) | [Documentation App](https://docs.dhis2.org/en/use/android-app/program-features.html#capture_app_programs_common_features_data_entry_form_collapsible_sections) | [Documentation Webapp](https://docs.dhis2.org/en/use/android-app/settings-configuration.html#capture_app_android_settings_webapp_appearance_program) | [Screenshot](https://s3.eu-west-1.amazonaws.com/content.dhis2.org/dhis2-android/release+notes+2.9/release+feature+cards/Android-2-9-Not-collapse-sections.png)
+
+**Move working lists under the search bar:** The working lists have been moved from the filters section to the main program screen. In earlier versions, the user had to open the filters to be able to see and select a working list. From this version, the working lists are always visible under the search bar, facilitating their use for filtering out Tracked Entity Instances. [Jira](https://dhis2.atlassian.net/browse/ANDROAPP-5453) | [Documentation](https://docs.dhis2.org/en/use/android-app/program-features.html#capture_app_programs_common_features_working_lists) | [Screenshot](https://s3.eu-west-1.amazonaws.com/content.dhis2.org/dhis2-android/release+notes+2.9/release+feature+cards/Android-2-9-Working-list-under-search-bar.png)
+
+**New design for Dataset, Event and TEI cards:** Cards are used for listing datasets, events and TEIs. The new design offers a cleaner and more intuitive layout, replacing the use of colored icons by descriptive text when relevant. [Jira](https://dhis2.atlassian.net/browse/ANDROAPP-5485) | [Documentation datasets](https://docs.dhis2.org/en/use/android-app/datasets-features.html#capture_app_datsets_cards_design) | [Documentation events](https://docs.dhis2.org/en/use/android-app/program-features.html#capture_app_programs_common_features_cards_design) | [Documentation TEI](https://docs.dhis2.org/en/use/android-app/program-features.html#capture_app_programs_tei_design) | [Screenshot](https://s3.eu-west-1.amazonaws.com/content.dhis2.org/dhis2-android/release+notes+2.9/release+feature+cards/Android-2-9-New-cards-design.png)
+
+**Implement changes in TEI Dashboard details:** The TEI Dashboard has been redesigned for both portrait and landscape view. The new design offers a cleaner and more intuitive layout, replacing the use of colored icons by text when relevant and moving some secondary actions to the hidden menus. [Jira](https://dhis2.atlassian.net/browse/ANDROAPP-4019) | [Screenshot](https://s3.eu-west-1.amazonaws.com/content.dhis2.org/dhis2-android/release+notes+2.9/release+feature+cards/Android-2-9-TEI-dashboard.png) | [Documentation](https://docs.dhis2.org/en/use/android-app/program-features.html#capture_app_programs_tei_design)
+
+**Data entry forms - New inputs per value type:** The inputs for all value types have been redesigned. Tappable areas and texts have been increased and selection modes are improved to offer a cleaner and more intuitive user experience. By default, the Android App will display the previous forms. Admin users are able to opt-in to use the new forms through the Android Settings Web App. [Jira](https://dhis2.atlassian.net/browse/ANDROAPP-5408) | [Documentation App](https://docs.dhis2.org/en/use/android-app/program-features.html#capture_app_programs_common_features_data_entry_form_new_inputs) | [Documentation Webapp](https://docs.dhis2.org/en/use/android-app/settings-configuration.html#capture_app_android_settings_webapp_appearance_program) | [Screenshot](https://s3.eu-west-1.amazonaws.com/content.dhis2.org/dhis2-android/release+notes+2.9/release+feature+cards/Android-2-9-New-inputs.png)
+
+**[EXPERIMENTAL] TEI Header:** The TEI Header is a title that can be added to the TEI cards and dashboards in the app. The title helps identify a TEI by displaying a summary of key information. It is formed by a concatenation of Tracked Entity Attributes and fixed text. The title is configured through a Program Indicator in the Maintenance app and is assigned to the tracker program in the Android Settings web app. This feature is experimental, and depending on feedback and adoption it will be refined and incorporated in the web Capture app. [Jira](https://dhis2.atlassian.net/browse/ANDROAPP-5402) | [Documentation App](https://docs.dhis2.org/en/use/android-app/program-features.html#capture_app_programs_tei_header) | [Documentation Webapp](https://docs.dhis2.org/en/use/android-app/settings-configuration.html#capture_app_android_settings_webapp_appearance_program_specific) | [Screenshot](https://s3.eu-west-1.amazonaws.com/content.dhis2.org/dhis2-android/release+notes+2.9/release+feature+cards/Android-2-9-TEI-Header.png)
+
+**Other improvements for User Experience**
+- Smaller improvements focussing on user experience like a new org unit selector [Jira](https://dhis2.atlassian.net/browse/ANDROAPP-4566) | | [Screenshot](https://s3.eu-west-1.amazonaws.com/content.dhis2.org/dhis2-android/release+notes+2.9/release+feature+cards/Android-2-9-Org-unit-selector.png), or adding a loading spinner during the deletion of big databases. [Jira](https://dhis2.atlassian.net/browse/ANDROAPP-4768) | [Screenshot](https://s3.eu-west-1.amazonaws.com/content.dhis2.org/dhis2-android/release+notes+2.9/release+feature+cards/Android-2-9-loading-when-deleting-data.png)
+
+## MAINTENANCE
+
+**Bug fixing:** You can find the list of bugs fixed [here](https://dhis2.atlassian.net/issues/?filter=10510).
+
+You can find in Jira details on the [new features](https://dhis2.atlassian.net/issues/?filter=10513) in this version.
 
 Remember to check the [documentation](https://www.dhis2.org/android-documentation) for detailed 
 information of the features included in the App and how to configure DHIS2 to use it. 

app/src/androidTest/java/org/dhis2/usescases/BaseTest.kt

@@ -2,11 +2,8 @@ package org.dhis2.usescases
 
 import android.content.Context
 import android.os.Build
-import androidx.test.espresso.Espresso
 import androidx.test.espresso.IdlingRegistry
-import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.intent.Intents
-import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.GrantPermissionRule
 import org.dhis2.AppTest
@@ -21,6 +18,7 @@ import org.dhis2.common.keystore.KeyStoreRobot.Companion.USERNAME
 import org.dhis2.common.mockwebserver.MockWebServerRobot
 import org.dhis2.common.preferences.PreferencesRobot
 import org.dhis2.common.rules.DisableAnimations
+import org.dhis2.commons.featureconfig.model.Feature
 import org.dhis2.commons.idlingresource.CountingIdlingResourceSingleton
 import org.dhis2.commons.idlingresource.SearchIdlingResourceSingleton
 import org.dhis2.commons.prefs.Preference
@@ -74,6 +72,7 @@ open class BaseTest {
             keyStoreRobot = providesKeyStoreRobot(context)
             preferencesRobot = providesPreferencesRobot(context)
             mockWebServerRobot = providesMockWebserverRobot(context)
+            disableComposeForms()
         }
     }
 
@@ -160,6 +159,10 @@ open class BaseTest {
         (context.applicationContext as AppTest).deleteDatabase(DB_TO_IMPORT)
     }
 
+    private fun disableComposeForms() {
+        preferencesRobot.saveValue(Feature.COMPOSE_FORMS.name, false)
+    }
+
     companion object {
         @ClassRule
         @JvmField

app/src/androidTest/java/org/dhis2/usescases/datasets/DataSetInitialRobot.kt

@@ -1,18 +1,14 @@
 package org.dhis2.usescases.datasets
 
-import androidx.compose.ui.test.junit4.ComposeTestRule
-import androidx.compose.ui.test.onNodeWithTag
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.contrib.RecyclerViewActions
 import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
-import androidx.test.espresso.matcher.ViewMatchers.hasSibling
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import org.dhis2.R
 import org.dhis2.common.BaseRobot
 import org.dhis2.utils.customviews.DateViewHolder
-import org.hamcrest.CoreMatchers.allOf
 
 
 fun dataSetInitialRobot(dataSetInitialRobot: DataSetInitialRobot.() -> Unit) {

app/src/androidTest/java/org/dhis2/usescases/datasets/DataSetTest.kt

@@ -48,7 +48,7 @@ class DataSetTest : BaseTest() {
 
     @Test
     fun shouldCreateNewDataSet() {
-        val period = "Dec 2022"
+        val period = "Oct 2023"
         val orgUnit = "Ngelehun CHC"
         startDataSetDetailActivity("ZOV1a5R4gqH", "DS EXTRA TEST", ruleDataSetDetail)
 
@@ -57,7 +57,7 @@ class DataSetTest : BaseTest() {
         }
         dataSetInitialRobot {
             clickOnInputOrgUnit()
-            orgUnitSelectorRobot(composeTestRule){
+            orgUnitSelectorRobot(composeTestRule) {
                 selectTreeOrgUnit(orgUnit)
             }
             clickOnInputPeriod()