Merge pull request #4110 from dhis2/release/3.2.0

Release 3.2.0 [skip size]

Author: andresmr

.github/pull_request_template.md

@@ -1,25 +1,18 @@
 ## Description
-Please include a summary of the change and include the related jira issue if it exists.
 
-[ jira issue ](https://dhis2.atlassian.net/browse/ANDROAPP-
+Summarize the change and link
+the [JIRA issue](https://dhis2.atlassian.net/browse/ANDROAPP-<ISSUE-NUMBER>).
 
-## Solution description
-If this PR is a fix include a brief description on how the issue is solved.
-## Covered unit test cases
-Describe the tests that you ran to verify your changes.
-## Where did you test this issue?
-- [ ] Smartphone Emulator
-- [ ] Tablet Emulator
-- [ ] Smartphone
-- [ ] Tablet
-## Which Android versions did you test this issue?
-- [ ] 4.4
-- [ ] 5.X - 6.X
-- [ ] 7.X
-- [ ] 8.X
-- [ ] 9.X - 10.X
-- [ ] 11.X - 13.X
-- [ ] Other
-## Checklist
-- [ ] My code follows the style guidelines of this project
-- [ ] I have performed a self-review of my own code
+## Solution Description
+
+Briefly describe how the issue is resolved.
+
+## Title Format
+
+`<type>: [JIRA-ISSUE] Description`
+
+- `<type>` Follow [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) (e.g., `fix`, `feat`).
+- Add the **JIRA issue number** in `[ANDROAPP-XXXX]`.
+- Include a brief description.
+- Append `[skip ci]` to skip CI if needed.
+- Append `[skip size]` to skip PR size limitation.

.github/workflows/build-release-candidate.yml

@@ -13,8 +13,8 @@ on:
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  # This workflow contains a single job called "greet"
-  greet:
+
+  build-release-candidate:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
 
@@ -44,7 +44,7 @@ jobs:
         fileName: 'dhis_keystore.jks'
         encodedString: ${{ secrets.KEYSTORE }}
     - name: build prod
-      run: ./gradlew app:assembleDhisRelease
+      run: ./gradlew app:assembleDhisRelease app:assembleDhisPlayServicesRelease
       env:
         SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
         SIGNING_KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
@@ -57,9 +57,16 @@ jobs:
       id: read-version
       run: echo "::set-output name=vName::$(grep 'vName' libs.versions.toml | awk -F' = ' '{print $2}' | tr -d '"')"
 
-    # Upload Artifact Build
-    - name: Upload Android artifacts
-      uses: actions/upload-artifact@v3
+    # Upload DhisRelease APK
+    - name: Upload DhisRelease APK
+      uses: actions/upload-artifact@v4.6.1
       with:
-        name: ${{ env.repository_name }} - Android APK
+        name: ${{ env.repository_name }} - DhisRelease APK
         path: ${{ env.main_project_module }}/build/outputs/apk/dhis/release/dhis2-v${{ steps.read-version.outputs.vName }}.apk
+
+    # Upload DhisPlayServicesRelease APK
+    - name: Upload DhisPlayServicesRelease APK
+      uses: actions/[email protected]
+      with:
+        name: ${{ env.repository_name }} - DhisPlayServicesRelease APK
+        path: ${{ env.main_project_module }}/build/outputs/apk/dhisPlayServices/release/dhis2-v${{ steps.read-version.outputs.vName }}-googlePlay.apk

.github/workflows/continuous-delivery.yml

@@ -45,6 +45,8 @@ jobs:
       # Create APK Debug
       - name: Build apk debug project (APK) - ${{ env.main_project_module }} module
         run: ./gradlew assembleDhisDebug
+        env:
+          SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
 
       - name: Read version name from file
         working-directory: ./gradle

.tx/config

@@ -64,3 +64,19 @@ source_file  = tracker/src/main/res/values/strings.xml
 source_lang  = en
 type         = ANDROID
 minimum_perc = 0
+
+[o:hisp-uio:p:dhis2-android-capture-app:r:aggregates-strings-xml]
+file_filter  = aggregates/src/commonMain/composeResources/values-<lang>/strings.xml
+source_file  = aggregates/src/commonMain/composeResources/values/strings.xml
+source_lang  = en
+type         = ANDROID
+minimum_perc = 0
+resource_name = Aggregates
+
+[o:hisp-uio:p:dhis2-android-capture-app:r:commonskmm-strings-xml]
+file_filter  = commonskmm/src/commonMain/composeResources/values-<lang>/strings.xml
+source_file  = commonskmm/src/commonMain/composeResources/values/strings.xml
+source_lang  = en
+type         = ANDROID
+minimum_perc = 0
+resource_name = CommonsKMM

Jenkinsfile

@@ -12,11 +12,24 @@ pipeline {
 
     options {
         buildDiscarder(logRotator(daysToKeepStr: '5'))
-        timeout(time: 50)
         disableConcurrentBuilds(abortPrevious: true)
+        skipStagesAfterUnstable()
     }
 
     stages {
+        stage('Check for [skip ci]') {
+            when {
+                expression {
+                    return isSkipCI()
+                }
+            }
+            steps {
+                script {
+                    currentBuild.result = 'UNSTABLE' // Mark build as a warning instead of an error
+                    echo "⚠️ Warning: Skipping CI because '[skip ci]' was found in the PR title or description."
+                }
+            }
+        }
         stage('Change to JAVA 17') {
             steps {
                 script {
@@ -26,6 +39,24 @@ pipeline {
                 }
             }
         }
+        stage('Check PR Size') {
+            when {
+                expression {
+                    return !isSkipSizeCheck()
+                }
+            }
+            environment {
+                GIT_BRANCH = "${env.CHANGE_BRANCH}"
+                GIT_BRANCH_DEST = "${env.CHANGE_TARGET == null ? '' : env.CHANGE_TARGET}"
+            }
+            steps {
+                script {
+                    echo "Checking PR Size against ${env.CHANGE_TARGET ?: 'None (CI build)'}"
+                    sh 'chmod +x ./scripts/check_pr_size.sh'
+                    sh './scripts/check_pr_size.sh'
+                }
+            }
+        }
         stage('Lint Check') {
             steps {
                 script {
@@ -74,24 +105,31 @@ pipeline {
                             }
                         }
                     }
-                stage('Deploy compose-table module Tests') {
+                stage('Deploy and Run UI Tests') {
                     environment {
                         BROWSERSTACK = credentials('android-browserstack')
-                        compose_table_apk = sh(returnStdout: true, script: 'find compose-table/build/outputs -iname "*.apk" | sed -n 1p')
-                        compose_table_apk_path = "${env.WORKSPACE}/${compose_table_apk}"
-                        buildTag = "${env.GIT_BRANCH} - table"
+                        app_apk = sh(returnStdout: true, script: 'find app/build/outputs/apk/dhisUITesting -iname "*.apk"')
+                        test_apk = sh(returnStdout: true, script: 'find app/build/outputs/apk/androidTest -iname "*.apk"')
+                        app_apk_path = "${env.WORKSPACE}/${app_apk}"
+                        test_apk_path = "${env.WORKSPACE}/${test_apk}"
+                        buildTag = "${env.GIT_BRANCH}"
                     }
                     steps {
                         dir("${env.WORKSPACE}/scripts"){
                             script {
-                                echo 'Browserstack deployment and running compose-table module tests'
-                                sh 'chmod +x browserstackJenkinsCompose.sh'
-                                sh './browserstackJenkinsCompose.sh'
+                                echo 'Browserstack deployment and running tests'
+                                sh 'chmod +x browserstackJenkins.sh'
+                                sh './browserstackJenkins.sh'
                             }
                         }
                     }
                 }
-                stage('Deploy and Run UI Tests') {
+                stage('Run UI Tests in Landscape') {
+                    when {
+                        expression {
+                            return JOB_NAME.startsWith('android-multibranch-PUSH')
+                        }
+                    }
                     environment {
                         BROWSERSTACK = credentials('android-browserstack')
                         app_apk = sh(returnStdout: true, script: 'find app/build/outputs/apk/dhisUITesting -iname "*.apk"')
@@ -104,8 +142,8 @@ pipeline {
                         dir("${env.WORKSPACE}/scripts"){
                             script {
                                 echo 'Browserstack deployment and running tests'
-                                sh 'chmod +x browserstackJenkins.sh'
-                                sh './browserstackJenkins.sh'
+                                sh 'chmod +x browserstackJenkinsLandscape.sh'
+                                sh './browserstackJenkinsLandscape.sh'
                             }
                         }
                     }
@@ -163,3 +201,15 @@ def custom_msg(){
   def JENKINS_LOG= "*Job:* $JOB_NAME\n *Branch:* $BRANCH_NAME\n *Build Number:* $BUILD_NUMBER (<${BUILD_URL}|Open>)"
   return JENKINS_LOG
 }
+
+def isSkipCI() {
+    def prTitle = env.CHANGE_TITLE ?: ""
+    def prDescription = env.CHANGE_DESCRIPTION ?: ""
+    return (prTitle.contains("[skip ci]") || prDescription.contains("[skip ci]"))
+}
+
+def isSkipSizeCheck() {
+    def prTitle = env.CHANGE_TITLE ?: ""
+    def prDescription = env.CHANGE_DESCRIPTION ?: ""
+    return (prTitle.contains("[skip size]") || prDescription.contains("[skip size]"))
+}

RELEASE.md

@@ -1,5 +1,146 @@
-# Release notes - Android App for DHIS2 - 3.1.1.1
+<table>
+<tr>
+<td>
+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>42</strong>, <strong>41</strong>, <strong>40</strong>.
+</td>
+</tr> 
+<tr> 
+<td colspan="2" bgcolor="white">
 
 ### Bug
 
-[ANDROAPP-6797](https://dhis2.atlassian.net/browse/ANDROAPP-6797) Update rule engine
+[ANDROAPP-5770](https://dhis2.atlassian.net/browse/ANDROAPP-5770) IllegalStateException: Expected BringIntoViewRequester to not be used before parents are placed.
+
+[ANDROAPP-6616](https://dhis2.atlassian.net/browse/ANDROAPP-6616) Cannot sync after referring TEI  to an org unit where user does not have write access
+
+[ANDROAPP-6662](https://dhis2.atlassian.net/browse/ANDROAPP-6662) \[Data Set\] App crashes after exiting the org unit dialog \(using the x\)
+
+[ANDROAPP-6704](https://dhis2.atlassian.net/browse/ANDROAPP-6704) Large option set renders inconsistenly in DS
+
+[ANDROAPP-6740](https://dhis2.atlassian.net/browse/ANDROAPP-6740) Incorrect order when displaying rules in feedback/indicator widget
+
+[ANDROAPP-6754](https://dhis2.atlassian.net/browse/ANDROAPP-6754) Update Bottom sheet dialog to new usage for edge to edge devices
+
+[ANDROAPP-6761](https://dhis2.atlassian.net/browse/ANDROAPP-6761) User able to create new events after completing enrollment
+
+[ANDROAPP-6775](https://dhis2.atlassian.net/browse/ANDROAPP-6775) Selecting report periods when creating a datasets can freeze the app
+
+[ANDROAPP-6801](https://dhis2.atlassian.net/browse/ANDROAPP-6801) Crash when using breaking the glass to access to a TEI
+
+[ANDROAPP-6826](https://dhis2.atlassian.net/browse/ANDROAPP-6826) Aggregates Total column is not been displayed
+
+[ANDROAPP-6854](https://dhis2.atlassian.net/browse/ANDROAPP-6854) Add edge to edge to DatasetInstance screen
+
+[ANDROAPP-6867](https://dhis2.atlassian.net/browse/ANDROAPP-6867) Make whole data set table screen scrollable
+
+[ANDROAPP-6873](https://dhis2.atlassian.net/browse/ANDROAPP-6873) Clear button not updating value in cell for certain inputs
+
+[ANDROAPP-6874](https://dhis2.atlassian.net/browse/ANDROAPP-6874) Move a category to row is not working as expected
+
+[ANDROAPP-6880](https://dhis2.atlassian.net/browse/ANDROAPP-6880) Clear input dialog and cell selection when changing section
+
+[ANDROAPP-6882](https://dhis2.atlassian.net/browse/ANDROAPP-6882) Cursor slides to the end when typing
+
+[ANDROAPP-6883](https://dhis2.atlassian.net/browse/ANDROAPP-6883) Input dialog is hidden behind keyboard on certain devices
+
+[ANDROAPP-6884](https://dhis2.atlassian.net/browse/ANDROAPP-6884) Period tags in section details is not displaying in user friendly format
+
+[ANDROAPP-6886](https://dhis2.atlassian.net/browse/ANDROAPP-6886) Some forms are crashing
+
+[ANDROAPP-6887](https://dhis2.atlassian.net/browse/ANDROAPP-6887) Keyboard type not changing when navigate from one data type to other using next
+
+[ANDROAPP-6888](https://dhis2.atlassian.net/browse/ANDROAPP-6888) Button to reset cell size doesnt exist
+
+[ANDROAPP-6889](https://dhis2.atlassian.net/browse/ANDROAPP-6889) Multiple cells are being selected simultaneously, even disabled total cells.
+
+[ANDROAPP-6892](https://dhis2.atlassian.net/browse/ANDROAPP-6892) Latest automatically generated apks are crashing when opening any dataset
+
+[ANDROAPP-6895](https://dhis2.atlassian.net/browse/ANDROAPP-6895) Handling Errors in cells
+
+[ANDROAPP-6896](https://dhis2.atlassian.net/browse/ANDROAPP-6896) Input Field Error: Missing Red Line and Label in inputDialog
+
+[ANDROAPP-6899](https://dhis2.atlassian.net/browse/ANDROAPP-6899) Implement persist table resizing layout
+
+[ANDROAPP-6900](https://dhis2.atlassian.net/browse/ANDROAPP-6900) Suppress 'Default' Text in Input Shell with Single 'Value' Column
+
+[ANDROAPP-6902](https://dhis2.atlassian.net/browse/ANDROAPP-6902) Unable to save coordinates
+
+[ANDROAPP-6903](https://dhis2.atlassian.net/browse/ANDROAPP-6903) Tapping on the "x" in the org unit dialog deletes the value in the cell
+
+[ANDROAPP-6911](https://dhis2.atlassian.net/browse/ANDROAPP-6911) Missing rowHeaders
+
+[ANDROAPP-6913](https://dhis2.atlassian.net/browse/ANDROAPP-6913) Resized table is lost when moving between sections
+
+[ANDROAPP-6915](https://dhis2.atlassian.net/browse/ANDROAPP-6915) Lateral scrolling alignment issues
+
+[ANDROAPP-6916](https://dhis2.atlassian.net/browse/ANDROAPP-6916) No space between column headers
+
+[ANDROAPP-6922](https://dhis2.atlassian.net/browse/ANDROAPP-6922) unable to delete value from cell
+
+[ANDROAPP-6934](https://dhis2.atlassian.net/browse/ANDROAPP-6934) Unable to re-open data set
+
+[ANDROAPP-6936](https://dhis2.atlassian.net/browse/ANDROAPP-6936) Auto-Scroll Misalignment on Cell Selection
+
+[ANDROAPP-6963](https://dhis2.atlassian.net/browse/ANDROAPP-6963) Datasets: unable to select option in multiselect value type
+
+[ANDROAPP-6981](https://dhis2.atlassian.net/browse/ANDROAPP-6981) Incorrect display of greyed fields
+
+[ANDROAPP-6982](https://dhis2.atlassian.net/browse/ANDROAPP-6982) Unable to add "." or "-" in numeric value types
+
+[ANDROAPP-7005](https://dhis2.atlassian.net/browse/ANDROAPP-7005) Unable to download APK "software update" in Android versions > 10
+
+### Feature
+
+[ANDROAPP-6371](https://dhis2.atlassian.net/browse/ANDROAPP-6371) Implement period picker in data sets
+
+[ANDROAPP-6426](https://dhis2.atlassian.net/browse/ANDROAPP-6426) Quick actions in TEI Dashboard
+
+[ANDROAPP-6469](https://dhis2.atlassian.net/browse/ANDROAPP-6469) Display GPS coordinate accuracy in UI \[Data Set\]
+
+[ANDROAPP-6638](https://dhis2.atlassian.net/browse/ANDROAPP-6638) Support feature:  Disable automatic grouping of data elements
+
+[ANDROAPP-6640](https://dhis2.atlassian.net/browse/ANDROAPP-6640) Support feature: Pivot: categories as rows, data elements as columns
+
+[ANDROAPP-6641](https://dhis2.atlassian.net/browse/ANDROAPP-6641) Support feature: Move a category to rows
+
+[ANDROAPP-6642](https://dhis2.atlassian.net/browse/ANDROAPP-6642) Support feature: Content before and after a section
+
+[ANDROAPP-6758](https://dhis2.atlassian.net/browse/ANDROAPP-6758) Implement ListCardTitle overflow in Map Cards
+
+[ANDROAPP-6767](https://dhis2.atlassian.net/browse/ANDROAPP-6767) Support feature: "Render vertically"
+
+[ANDROAPP-6788](https://dhis2.atlassian.net/browse/ANDROAPP-6788) Implement period picker in filters
+
+[ANDROAPP-6796](https://dhis2.atlassian.net/browse/ANDROAPP-6796) Merge all category combinations in one table
+
+[ANDROAPP-6802](https://dhis2.atlassian.net/browse/ANDROAPP-6802) DatasetInstanceScreen: Saving and complete workflow
+
+[ANDROAPP-6812](https://dhis2.atlassian.net/browse/ANDROAPP-6812) Support feature: multi header rows
+
+[ANDROAPP-6832](https://dhis2.atlassian.net/browse/ANDROAPP-6832) Implement InputDialog Text value types actions
+
+[ANDROAPP-6833](https://dhis2.atlassian.net/browse/ANDROAPP-6833) Implement dates \(date, datetime, time\) value types actions
+
+[ANDROAPP-6834](https://dhis2.atlassian.net/browse/ANDROAPP-6834) Implement InputDialog File and Image value types actions
+
+[ANDROAPP-6835](https://dhis2.atlassian.net/browse/ANDROAPP-6835) Implement InputDialog Org Unit value type actions
+
+[ANDROAPP-6836](https://dhis2.atlassian.net/browse/ANDROAPP-6836) Implement go to next cell
+
+[ANDROAPP-6837](https://dhis2.atlassian.net/browse/ANDROAPP-6837) Implement validation error parsing
+
+[ANDROAPP-6841](https://dhis2.atlassian.net/browse/ANDROAPP-6841) Support feature: Title and subtitle
+
+[ANDROAPP-6855](https://dhis2.atlassian.net/browse/ANDROAPP-6855) Implement legends in dataset input dialog
+
+[ANDROAPP-6864](https://dhis2.atlassian.net/browse/ANDROAPP-6864) Implement optionset input \[Data Set\]
+
+[ANDROAPP-6878](https://dhis2.atlassian.net/browse/ANDROAPP-6878) Yes Only type cell layout
+
+Remember to check the [Android app documentation](https://docs.dhis2.org/en/use/android-app/about-this-guide.html) for detailed information of the features included in the App and how to configure DHIS2 to use it.
+
+For support contact us at [DHIS2 community](https://community.dhis2.org) if you have any issue.
+</td>
+</tr>
+</table>

aggregates/.gitignore

@@ -0,0 +1 @@
+/build