Merge branch 'release/0.4.1' into main

Author: ganfra

.editorconfig

@@ -14,10 +14,19 @@ ij_smart_tabs = false
 ij_visual_guides = none
 ij_wrap_on_typing = false
 
-# Ktlint rule, for more information see https://pinterest.github.io/ktlint/faq/#why-is-editorconfig-property-disabled_rules-deprecated-and-how-do-i-resolve-this
+# Ktlint rule, for more information see https://pinterest.github.io/ktlint/1.1.1/faq/#how-do-i-enable-or-disable-a-rule
 ktlint_standard_wrapping = disabled
 ktlint_standard_trailing-comma-on-call-site = disabled
-
+ktlint_standard_trailing-comma-on-declaration-site = disabled
+ktlint_standard_multiline-expression-wrapping = disabled
+ktlint_standard_string-template-indent = disabled
+ktlint_standard_spacing-between-declarations-with-annotations = disabled
+ktlint_standard_function-signature = disabled
+ktlint_standard_annotation = disabled
+ktlint_standard_parameter-list-wrapping = disabled
+ktlint_standard_indent = disabled
+ktlint_standard_blank-line-before-declaration = disabled
+ktlint_function_naming_ignore_when_annotated_with=Composable
 
 [*.java]
 ij_java_align_consecutive_assignments = false

.github/renovate.json

@@ -18,12 +18,6 @@
       ],
       "groupName" : "kotlin"
     },
-    {
-      "matchPackageNames" : [
-        "org.jetbrains.kotlinx.kover"
-      ],
-      "enabled" : false
-    },
     {
       "matchPackagePatterns" : [
         "^org.maplibre"

.github/workflows/fork-pr-notice.yml

@@ -0,0 +1,31 @@
+name: Community PR notice
+
+on:
+  workflow_dispatch:
+  pull_request_target:
+    types:
+      - opened
+      - reopened
+
+jobs:
+  welcome:
+    runs-on: ubuntu-latest
+    name: Welcome comment
+    if: github.event.pull_request.fork != null
+    steps:
+      - name: Add auto-generated commit warning
+        uses: actions/github-script@v7
+        with:
+          script: |
+            github.rest.issues.createComment({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: `Thank you for your contribution! Here are a few things to check in the PR to ensure it's reviewed as quickly as possible:
+            
+              - Your branch should be based on \`origin/develop\`, at least when it was created.
+              - There is a changelog entry in the \`changelog.d\` folder with [the Towncrier format](https://towncrier.readthedocs.io/en/latest/tutorial.html#creating-news-fragments).
+              - The test pass locally running \`./gradlew test\`.
+              - The code quality check suite pass locally running \`./gradlew runQualityChecks\`.
+              - If you modified anything related to the UI, including previews, you'll have to run the \`Record screenshots\` GH action in your forked repo: that will generate compatible new screenshots. However, given Github Actions limitations, **it will prevent the CI from running temporarily**, until you upload a new commit after that one. To do so, just pull the latest changes and push [an empty commit](https://coderwall.com/p/vkdekq/git-commit-allow-empty).`
+            })

.github/workflows/maestro.yml

@@ -24,27 +24,31 @@ jobs:
       cancel-in-progress: true
     steps:
       - name: Remove Run-Maestro label
-        if: ${{ github.event.label.name == 'Run-Maestro' }}
+        if: ${{ github.event_name == 'pull_request' && github.event.label.name == 'Run-Maestro' }}
         uses: actions-ecosystem/action-remove-labels@v1
         with:
           labels: Run-Maestro
       - uses: actions/checkout@v4
+        if: (github.event_name == 'pull_request' && github.event.pull_request.fork == null) || github.event_name == 'workflow_dispatch'
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881
           ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
       - uses: actions/setup-java@v4
         name: Use JDK 17
+        if: (github.event_name == 'pull_request' && github.event.pull_request.fork == null) || github.event_name == 'workflow_dispatch'
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '17'
       - name: Assemble debug APK
         run: ./gradlew :app:assembleDebug $CI_GRADLE_ARG_PROPERTIES
+        if: (github.event_name == 'pull_request' && github.event.pull_request.fork == null) || github.event_name == 'workflow_dispatch'
         env:
           ELEMENT_ANDROID_MAPTILER_API_KEY: ${{ secrets.MAPTILER_KEY }}
           ELEMENT_ANDROID_MAPTILER_LIGHT_MAP_ID: ${{ secrets.MAPTILER_LIGHT_MAP_ID }}
           ELEMENT_ANDROID_MAPTILER_DARK_MAP_ID: ${{ secrets.MAPTILER_DARK_MAP_ID }}
       - uses: mobile-dev-inc/[email protected]
+        if: (github.event_name == 'pull_request' && github.event.pull_request.fork == null) || github.event_name == 'workflow_dispatch'
         with:
           api-key: ${{ secrets.MAESTRO_CLOUD_API_KEY }}
           # Doc says (https://github.com/mobile-dev-inc/action-maestro-cloud#android):

.github/workflows/nightlyReports.yml

@@ -33,15 +33,15 @@ jobs:
         run: ./gradlew verifyPaparazziDebug $CI_GRADLE_ARG_PROPERTIES
 
       - name: 📈 Generate kover report and verify coverage
-        run: ./gradlew koverMergedReport koverMergedVerify $CI_GRADLE_ARG_PROPERTIES -Pci-build=true
+        run: ./gradlew :app:koverHtmlReport :app:koverXmlReport :app:koverVerify $CI_GRADLE_ARG_PROPERTIES -Pci-build=true
 
       - name: ✅ Upload kover report
         if: always()
         uses: actions/upload-artifact@v4
         with:
           name: kover-results
           path: |
-            **/build/reports/kover/merged
+            **/build/reports/kover
 
       - name: 🔊 Publish results to Sonar
         env:

.github/workflows/recordScreenshots.yml

@@ -26,7 +26,7 @@ jobs:
         uses: nschloe/[email protected]
         with:
           persist-credentials: false
-          ref: ${{ github.event.pull_request.head.ref }}
+          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.ref || github.ref }}
       - name: ⏬ Checkout with LFS (Branch)
         if: github.event_name == 'workflow_dispatch'
         uses: nschloe/[email protected]
@@ -43,8 +43,8 @@ jobs:
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
       - name: Record screenshots
+        id: record
         run: ./.github/workflows/scripts/recordScreenshots.sh
         env:
-          GITHUB_TOKEN: ${{ secrets.DANGER_GITHUB_API_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.DANGER_GITHUB_API_TOKEN || secrets.GITHUB_TOKEN }}
           GITHUB_REPOSITORY: ${{ secrets.GITHUB_REPOSITORY }}
-

.github/workflows/scripts/recordScreenshots.sh

@@ -68,11 +68,27 @@ echo "Record screenshots"
 ./gradlew recordPaparazziDebug --stacktrace -PpreDexEnable=false --max-workers 4 --warn
 
 echo "Committing changes"
-git config user.name "ElementBot"
-git config user.email "[email protected]"
+git config http.sslVerify false
+
+if [[ -z ${INPUT_AUTHOR_NAME} ]]; then
+  git config user.name "ElementBot"
+else
+  git config --local user.name "${INPUT_AUTHOR_NAME}"
+fi
+
+if [[ -z ${INPUT_AUTHOR_EMAIL} ]]; then
+  git config user.email "[email protected]"
+else
+  git config --local user.name "${INPUT_AUTHOR_EMAIL}"
+fi
 git add -A
 git commit -m "Update screenshots"
 
+GITHUB_REPO="https://$GITHUB_ACTOR:$TOKEN@github.com/$REPO.git"
 echo "Pushing changes"
-git push "https://$TOKEN@github.com/$REPO.git" $BRANCH
+if [[ -z ${GITHUB_ACTOR} ]]; then
+  echo "No GITHUB_ACTOR env var"
+  GITHUB_REPO="https://$TOKEN@github.com/$REPO.git"
+fi
+git push $GITHUB_REPO "$BRANCH"
 echo "Done!"

.github/workflows/tests.yml

@@ -55,15 +55,15 @@ jobs:
         run: ./gradlew verifyPaparazziDebug $CI_GRADLE_ARG_PROPERTIES
 
       - name: 📈Generate kover report and verify coverage
-        run: ./gradlew koverMergedReport koverMergedVerify $CI_GRADLE_ARG_PROPERTIES -Pci-build=true
+        run: ./gradlew :app:koverHtmlReport :app:koverXmlReport :app:koverVerify $CI_GRADLE_ARG_PROPERTIES -Pci-build=true
 
       - name: 🚫 Upload kover failed coverage reports
         if: failure()
         uses: actions/upload-artifact@v4
         with:
           name: kover-error-report
           path: |
-            **/kover/merged/verification/errors.txt
+            app/build/reports/kover/verify.err
 
       - name: ✅ Upload kover report (disabled)
         if: always()
@@ -83,4 +83,4 @@ jobs:
         if: always()
         uses: codecov/codecov-action@v3
         # with:
-        #  files: build/reports/kover/merged/xml/report.xml
+        #  files: build/reports/kover/xml/report.xml

.maestro/tests/account/logout.yaml

@@ -6,12 +6,10 @@ appId: ${APP_ID}
 - takeScreenshot: build/maestro/900-SignOutScreen
 - back
 - tapOn: "Sign out"
-- tapOn:
-    id: "sign-out-submit"
 # Ensure cancel cancels
-- tapOn: "Cancel"
 - tapOn:
-    id: "sign-out-submit"
+    id: "dialog-negative"
+- tapOn: "Sign out"
 - tapOn:
     id: "dialog-positive"
 - runFlow: ../assertions/assertInitDisplayed.yaml

.maestro/tests/roomList/createAndDeleteDM.yaml

@@ -9,5 +9,5 @@ appId: ${APP_ID}
     index: 1
 - takeScreenshot: build/maestro/330-createAndDeleteDM
 - tapOn: "maestroelement2"
-- tapOn: "Leave room"
+- tapOn: "Leave conversation"
 - tapOn: "Leave"