Merge branch 'release/0.2.0' into main

Author: bmarty

.github/workflows/build.yml

@@ -27,7 +27,7 @@ jobs:
       group: ${{ github.ref == 'refs/heads/develop' && format('build-develop-{0}-{1}', matrix.variant, github.sha) || format('build-{0}-{1}', matrix.variant, github.ref)  }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881

.github/workflows/danger.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     name: Danger main check
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: |
           npm install --save-dev @babel/plugin-transform-flow-strip-types
       - name: Danger

.github/workflows/gradle-wrapper-update.yml

@@ -8,7 +8,7 @@ jobs:
   update-gradle-wrapper:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Update Gradle Wrapper
         uses: gradle-update/update-gradle-wrapper-action@v1
         # Skip in forks

.github/workflows/gradle-wrapper-validation.yml

@@ -11,5 +11,5 @@ jobs:
     runs-on: ubuntu-latest
     # No concurrency required, this is a prerequisite to other actions and should run every time.
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: gradle/wrapper-validation-action@v1

.github/workflows/maestro.yml

@@ -24,7 +24,7 @@ jobs:
       group: ${{ format('maestro-{0}', github.ref) }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881

.github/workflows/nightly.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.repository == 'vector-im/element-x-android' }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Use JDK 17
         uses: actions/setup-java@v3
         with:

.github/workflows/nightlyReports.yml

@@ -55,7 +55,7 @@ jobs:
     name: Dependency analysis
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Use JDK 17
         uses: actions/setup-java@v3
         with:

.github/workflows/quality.yml

@@ -17,7 +17,7 @@ jobs:
     name: Search for forbidden patterns
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Run code quality check suite
         run: ./tools/check/check_code_quality.sh
 
@@ -29,7 +29,7 @@ jobs:
       group: ${{ github.ref == 'refs/heads/main' && format('check-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('check-develop-{0}', github.sha) || format('check-{0}', github.ref) }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881
@@ -52,12 +52,6 @@ jobs:
           name: linting-report
           path: |
             */build/reports/**/*.*
-      - name: 🔊 Publish results to Sonar
-        env:
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-          ORG_GRADLE_PROJECT_SONAR_LOGIN: ${{ secrets.SONAR_TOKEN }}
-        if: ${{ always() && env.SONAR_TOKEN != '' && env.ORG_GRADLE_PROJECT_SONAR_LOGIN != '' }}
-        run: ./gradlew sonar $CI_GRADLE_ARG_PROPERTIES
       - name: Prepare Danger
         if: always()
         run: |

.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
       group: ${{ github.ref == 'refs/head/main' && format('build-release-main-{0}', github.sha) }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Use JDK 17
         uses: actions/setup-java@v3
         with:

.github/workflows/sonar.yml

@@ -1,4 +1,4 @@
-name: Code Quality Checks
+name: Sonar
 
 on:
   workflow_dispatch:
@@ -10,18 +10,18 @@ on:
 # Enrich gradle.properties for CI/CD
 env:
   GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -XX:MaxMetaspaceSize=512m -Dkotlin.daemon.jvm.options="-Xmx2g" -Dkotlin.incremental=false
-  CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 2 --no-daemon --warn
+  CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 4 --no-daemon --warn
 
 jobs:
   sonar:
-    name: Project Check Suite
+    name: Sonar Quality Checks
     runs-on: ubuntu-latest
     # Allow all jobs on main and develop. Just one per PR.
     concurrency:
       group: ${{ github.ref == 'refs/heads/main' && format('sonar-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('sonar-develop-{0}', github.sha) || format('sonar-{0}', github.ref) }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881
@@ -41,9 +41,3 @@ jobs:
           ORG_GRADLE_PROJECT_SONAR_LOGIN: ${{ secrets.SONAR_TOKEN }}
         if: ${{ always() && env.SONAR_TOKEN != '' && env.ORG_GRADLE_PROJECT_SONAR_LOGIN != '' }}
         run: ./gradlew sonar $CI_GRADLE_ARG_PROPERTIES
-      - name: Prepare Danger
-        if: always()
-        run: |
-          npm install --save-dev @babel/core
-          npm install --save-dev @babel/plugin-transform-flow-strip-types
-          yarn add danger-plugin-lint-report --dev

.github/workflows/sync-localazy.yml

@@ -11,7 +11,7 @@ jobs:
     # Skip in forks
     if: github.repository == 'vector-im/element-x-android'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python 3.9
         uses: actions/setup-python@v4
         with:

.github/workflows/tests.yml

@@ -22,6 +22,16 @@ jobs:
       group: ${{ github.ref == 'refs/heads/main' && format('unit-tests-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('unit-tests-develop-{0}', github.sha) || format('unit-tests-{0}', github.ref) }}
       cancel-in-progress: true
     steps:
+      # Increase swapfile size to prevent screenshot tests getting terminated
+      # https://github.com/actions/runner-images/discussions/7188#discussioncomment-6750749
+      - name: 💽 Increase swapfile size
+        run: |
+          sudo swapoff -a
+          sudo fallocate -l 8G /mnt/swapfile
+          sudo chmod 600 /mnt/swapfile
+          sudo mkswap /mnt/swapfile
+          sudo swapon /mnt/swapfile
+          sudo swapon --show
       - name: ⏬ Checkout with LFS
         uses: nschloe/[email protected]
         with:

.maestro/tests/account/changeServer.yaml

@@ -15,7 +15,7 @@ appId: ${APP_ID}
 - tapOn: "gnuradio.org"
 - extendedWaitUntil:
     visible: "This server currently doesn’t support sliding sync."
-    timeout: 10_000
+    timeout: 10000
 - tapOn: "Cancel"
 - back
 - back

.maestro/tests/assertions/assertAnalyticsDisplayed.yaml

@@ -2,4 +2,4 @@ appId: ${APP_ID}
 ---
 - extendedWaitUntil:
     visible: "Help improve Element X dbg"
-    timeout: 10_000
+    timeout: 10000

.maestro/tests/assertions/assertHomeDisplayed.yaml

@@ -2,4 +2,4 @@ appId: ${APP_ID}
 ---
 - extendedWaitUntil:
     visible: "All Chats"
-    timeout: 10_000
+    timeout: 10000

.maestro/tests/assertions/assertInitDisplayed.yaml

@@ -2,4 +2,4 @@ appId: ${APP_ID}
 ---
 - extendedWaitUntil:
     visible: "Be in your element"
-    timeout: 10_000
+    timeout: 10000

.maestro/tests/assertions/assertLoginDisplayed.yaml

@@ -2,4 +2,4 @@ appId: ${APP_ID}
 ---
 - extendedWaitUntil:
     visible: "Change account provider"
-    timeout: 10_000
+    timeout: 10000

.maestro/tests/assertions/assertRoomListSynced.yaml

@@ -2,4 +2,4 @@ appId: ${APP_ID}
 ---
 - extendedWaitUntil:
     visible: ${ROOM_NAME}
-    timeout: 10_000
+    timeout: 10000

.maestro/tests/assertions/assertWelcomeScreenDisplayed.yaml

@@ -3,4 +3,4 @@ appId: ${APP_ID}
 - extendedWaitUntil:
     visible:
       id: "welcome_screen-title"
-    timeout: 10_000
+    timeout: 10000

.maestro/tests/roomList/timeline/messages/text.yaml

@@ -1,7 +1,8 @@
 appId: ${APP_ID}
 ---
 - takeScreenshot: build/maestro/510-Timeline
-- tapOn: "Message"
+- tapOn:
+    id: "rich_text_editor"
 - inputText: "Hello world!"
 - tapOn: "Send"
 - hideKeyboard

CHANGES.md

@@ -1,3 +1,42 @@
+Changes in Element X v0.2.0 (2023-09-18)
+========================================
+
+Features ✨
+----------
+ - Bump Rust SDK to `v0.1.54`
+ - Add a "Mute" shortcut icon and a "Notifications" section in the room details screen ([#506](https://github.com/vector-im/element-x-android/issues/506))
+ - Add a notification permission screen to the initial flow. ([#897](https://github.com/vector-im/element-x-android/issues/897))
+ - Integrate Element Call into EX by embedding a call in a WebView. ([#1300](https://github.com/vector-im/element-x-android/issues/1300))
+ - Implement Bloom effect modifier. ([#1217](https://github.com/vector-im/element-x-android/issues/1217))
+ - Set color on display name and default avatar in the timeline. ([#1224](https://github.com/vector-im/element-x-android/issues/1224))
+ - Display a thread decorator in timeline so we know when a message is coming from a thread. ([#1236](https://github.com/vector-im/element-x-android/issues/1236))
+ - [Rich text editor] Integrate rich text editor library. Note that markdown is now not supported and further formatting support will be introduced through the rich text editor. ([#1172](https://github.com/vector-im/element-x-android/issues/1172))
+ - [Rich text editor] Add formatting menu (accessible via the '+' button) ([#1261](https://github.com/vector-im/element-x-android/issues/1261))
+ - [Rich text editor] Add feature flag for rich text editor. Markdown support can now be enabled by disabling the rich text editor. ([#1289](https://github.com/vector-im/element-x-android/issues/1289))
+ - [Rich text editor] Update design ([#1332](https://github.com/vector-im/element-x-android/issues/1332))
+
+Bugfixes 🐛
+----------
+ - Make links in room topic clickable ([#612](https://github.com/vector-im/element-x-android/issues/612))
+ - Reply action: harmonize conditions in bottom sheet and swipe to reply. ([#1173](https://github.com/vector-im/element-x-android/issues/1173))
+ - Fix system bar color after login on light theme. ([#1222](https://github.com/vector-im/element-x-android/issues/1222))
+ - Fix long click on simple formatted messages ([#1232](https://github.com/vector-im/element-x-android/issues/1232))
+ - Enable polls in release build. ([#1241](https://github.com/vector-im/element-x-android/issues/1241))
+ - Fix top padding in room list when app is opened in offline mode. ([#1297](https://github.com/vector-im/element-x-android/issues/1297))
+ - [Rich text editor] Fix 'text formatting' option only partially visible ([#1335](https://github.com/vector-im/element-x-android/issues/1335))
+ - [Rich text editor] Ensure keyboard opens for reply and text formatting modes ([#1337](https://github.com/vector-im/element-x-android/issues/1337))
+ - [Rich text editor] Fix placeholder spilling onto multiple lines ([#1347](https://github.com/vector-im/element-x-android/issues/1347))
+
+Other changes
+-------------
+ - Add a sub-screen "Notifications" in the existing application Settings ([#510](https://github.com/vector-im/element-x-android/issues/510))
+ - Exclude some groups related to analytics to be included. ([#1191](https://github.com/vector-im/element-x-android/issues/1191))
+ - Use the new SyncIndicator API. ([#1244](https://github.com/vector-im/element-x-android/issues/1244))
+ - Improve RoomSummary mapping by using RoomInfo. ([#1251](https://github.com/vector-im/element-x-android/issues/1251))
+ - Ensure Posthog data are sent to "https://posthog.element.io" ([#1269](https://github.com/vector-im/element-x-android/issues/1269))
+ - New app icon, with monochrome support. ([#1363](https://github.com/vector-im/element-x-android/issues/1363))
+
+
 Changes in Element X v0.1.6 (2023-09-04)
 ========================================
 

app/build.gradle.kts

@@ -198,6 +198,7 @@ dependencies {
     allLibrariesImpl()
     allServicesImpl()
     allFeaturesImpl(rootDir, logger)
+    implementation(projects.features.call)
     implementation(projects.anvilannotations)
     implementation(projects.appnav)
     anvil(projects.anvilcodegen)

app/src/debug/res/drawable/ic_launcher_background.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#F7F07E"
+        android:fillType="evenOdd"
+        android:pathData="m0,0h108v108h-108z" />
+</vector>

app/src/main/AndroidManifest.xml

@@ -22,8 +22,9 @@
 
     <application
         android:name=".ElementXApplication"
-        android:allowBackup="true"
+        android:allowBackup="false"
         android:dataExtractionRules="@xml/data_extraction_rules"
+        android:enableOnBackInvokedCallback="true"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"

app/src/main/ic_launcher-playstore.png

@@ -17,13 +17,20 @@
 package io.element.android.x.icon
 
 import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
 import io.element.android.x.R
 
 @Preview
@@ -47,3 +54,23 @@ internal fun RoundIconPreview(
         Image(painter = painterResource(id = R.mipmap.ic_launcher_foreground), contentDescription = null)
     }
 }
+
+@Preview
+@Composable
+internal fun MonochromeIconPreview(
+    modifier: Modifier = Modifier,
+) {
+    Box(
+        modifier = modifier
+            .size(108.dp)
+            .background(Color(0xFF2F3133))
+            .clip(shape = RoundedCornerShape(32.dp)),
+        contentAlignment = Alignment.Center
+    ) {
+        Image(
+            painter = painterResource(id = R.mipmap.ic_launcher_monochrome),
+            colorFilter = ColorFilter.tint(Color(0xFFC3E0F6)),
+            contentDescription = null
+        )
+    }
+}

app/src/main/kotlin/io/element/android/x/icon/IconPreview.kt

@@ -17,6 +17,7 @@
 package io.element.android.x.initializer
 
 import android.content.Context
+import android.system.Os
 import androidx.preference.PreferenceManager
 import androidx.startup.Initializer
 import io.element.android.features.preferences.impl.developer.tracing.SharedPrefTracingConfigurationStore
@@ -57,6 +58,8 @@ class TracingInitializer : Initializer<Unit> {
         }
         bugReporter.cleanLogDirectoryIfNeeded()
         tracingService.setupTracing(tracingConfiguration)
+        // Also set env variable for rust back trace
+        Os.setenv("RUST_BACKTRACE", "1", true)
     }
 
     override fun dependencies(): List<Class<out Initializer<*>>> = mutableListOf()

app/src/main/kotlin/io/element/android/x/initializer/TracingInitializer.kt

@@ -1,6 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2023 New Vector Ltd
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_launcher_background"/>
+    <background android:drawable="@drawable/ic_launcher_background"/>
     <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-    <!-- Waiting for design monochrome android:drawable="@mipmap/ic_launcher_monochrome" /-->
+    <monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
 </adaptive-icon>