Rebase/element x ios 1.8.4

.gitattributes

@@ -1,4 +1,4 @@
 UITests/Sources/__Snapshots__/** filter=lfs diff=lfs merge=lfs -text
 UnitTests/Resources/** filter=lfs diff=lfs merge=lfs -text
 UnitTests/__Snapshots__/** filter=lfs diff=lfs merge=lfs -text
-PreviewTests/__Snapshots__/** filter=lfs diff=lfs merge=lfs -text
+PreviewTests/Sources/__Snapshots__/** filter=lfs diff=lfs merge=lfs -text

.githooks/post-checkout

@@ -1,9 +1,3 @@
 #!/bin/sh
-command -v git-lfs >/dev/null 2>&1 || { echo >&2 "\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting '.git/hooks/post-checkout'.\n"; exit 2; }
+command -v git-lfs >/dev/null 2>&1 || { echo >&2 "\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting the 'post-checkout' file in the hooks directory (set by 'core.hookspath'; usually '.git/hooks').\n"; exit 2; }
 git lfs post-checkout "$@"
-
-#!/bin/bash
-export PATH="$PATH:/opt/homebrew/bin"
-
-# ignores updates of 'secrets.xcconfig' to avoid pushing sensitive data by mistake
-git update-index --assume-unchanged ElementX/SupportingFiles/secrets.xcconfig

.githooks/post-commit

@@ -1,3 +1,3 @@
 #!/bin/sh
-command -v git-lfs >/dev/null 2>&1 || { echo >&2 "\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting '.git/hooks/post-commit'.\n"; exit 2; }
+command -v git-lfs >/dev/null 2>&1 || { echo >&2 "\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting the 'post-commit' file in the hooks directory (set by 'core.hookspath'; usually '.git/hooks').\n"; exit 2; }
 git lfs post-commit "$@"

.githooks/post-merge

@@ -1,3 +1,3 @@
 #!/bin/sh
-command -v git-lfs >/dev/null 2>&1 || { echo >&2 "\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting '.git/hooks/post-merge'.\n"; exit 2; }
+command -v git-lfs >/dev/null 2>&1 || { echo >&2 "\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting the 'post-merge' file in the hooks directory (set by 'core.hookspath'; usually '.git/hooks').\n"; exit 2; }
 git lfs post-merge "$@"

.github/ISSUE_TEMPLATE/bug.yml

@@ -68,7 +68,7 @@ body:
     attributes:
       label: Will you send logs?
       description:  |
-        Did you know that you can shake your phone to submit logs for this issue? Trigger the defect, then shake your phone and you will see a popup asking if you would like to open the bug report screen. Click YES, and describe the issue, mentioning that you have also filed a bug (it's helpful if you can include a link to the bug). Send the report to submit anonymous logs to the developers.
+        You can submit logs for this issue from the login screen or the application settings by chosing `Report a problem`. Describe the issue, mentioning that you have also filed a bug (it's helpful if you can include a link to the bug). Send the report to submit anonymous logs to the developers.
       options:
         - 'Yes'
         - 'No'

.github/workflows/integration-tests.yml

@@ -59,23 +59,6 @@ jobs:
           path: ~/Library/Logs/scan/IntegrationTests-IntegrationTests.log
           retention-days: 2
           if-no-files-found: ignore
-
-      - name: Checkout gh-pages branch (for perf stats)
-        if: always()
-        uses: actions/checkout@v4
-        with:
-          ref: gh-pages
-          path: gh-pages
-
-      - name: Post-process archive to obtain performance metrics and upload to gh-pages
-        if: always()
-        run: |
-          ./Tools/Scripts/parsePerformanceMetrics.sh ~/Library/Logs/scan/IntegrationTests-IntegrationTests.log $GITHUB_SHA | tee perf-results.csv
-          cat perf-results.csv >> $GITHUB_WORKSPACE/gh-pages/performance/perf-data.csv
-          cd $GITHUB_WORKSPACE/gh-pages/performance/
-          git add .
-          git commit -m "Results for $GITHUB_SHA"
-          git push
 
       - name: Collect coverage
         run: xcresultparser -q -o cobertura -t ElementX -p $(pwd) fastlane/test_output/IntegrationTests.xcresult > fastlane/test_output/integration-cobertura.xml
@@ -87,3 +70,15 @@ jobs:
           token: ${{ secrets.CODECOV_TOKEN }}
           flags: integrationtests
 
+      - name: Collect test results
+        if: ${{ !cancelled() }}
+        run: xcresultparser -q -o junit -p $(pwd) fastlane/test_output/IntegrationTests.xcresult > fastlane/test_output/integration-junit.xml
+
+      - name: Upload test results to Codecov
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@v1
+        continue-on-error: true
+        with:
+          fail_ci_if_error: false
+          token: ${{ secrets.CODECOV_TOKEN }}
+          flags: integrationtests

.github/workflows/translations-pr.yml

@@ -28,7 +28,7 @@ jobs:
         run: swift run tools generate-sas
 
       - name: Create PR for Translations
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ secrets.ELEMENT_BOT_TOKEN }}
           commit-message: Translations update

.github/workflows/ui_tests.yml

@@ -30,6 +30,9 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gems-
 
+      - name: Free disk space
+        run: ci_scripts/free_space.sh
+
       - name: Setup environment
         run: source ci_scripts/ci_common.sh && setup_github_actions_environment
 
@@ -64,4 +67,16 @@ jobs:
           fail_ci_if_error: true
           token: ${{ secrets.CODECOV_TOKEN }}
           flags: uitests
-
+
+      - name: Collect test results
+        if: ${{ !cancelled() }}
+        run: xcresultparser -q -o junit -p $(pwd) fastlane/test_output/UITests.xcresult > fastlane/test_output/ui-junit.xml
+
+      - name: Upload test results to Codecov
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@v1
+        continue-on-error: true
+        with:
+          fail_ci_if_error: false
+          token: ${{ secrets.CODECOV_TOKEN }}
+          flags: uitests

.github/workflows/unit_tests.yml

@@ -65,3 +65,18 @@ jobs:
           fail_ci_if_error: true
           token: ${{ secrets.CODECOV_TOKEN }}
           flags: unittests
+
+      - name: Collect test results
+        if: ${{ !cancelled() }}
+        run: |
+          xcresultparser -q -o junit -p $(pwd) fastlane/test_output/UnitTests.xcresult > fastlane/test_output/unit-junit.xml
+          xcresultparser -q -o junit -p $(pwd) fastlane/test_output/PreviewTests.xcresult > fastlane/test_output/preview-junit.xml
+
+      - name: Upload test results to Codecov
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@v1
+        continue-on-error: true
+        with:
+          fail_ci_if_error: false
+          token: ${{ secrets.CODECOV_TOKEN }}
+          flags: unittests

.swiftlint.yml

@@ -60,6 +60,12 @@ custom_rules:
     message: "Please use explicit spacing in HStacks."
     severity: warning
 
+  compound_color_conversion:
+    regex: "UIColor\\(\\.compound"
+    match_kinds: identifier
+    message: "Please use the UIColor token directly to ensure the colour scheme is honoured."
+    severity: warning
+
   print_deprecation:
     regex: "\\b(print)\\b"
     match_kinds: identifier