Merge branch 'develop' into feature/fga/timeline-multi-forward

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/CounterAtom.kt

@@ -8,43 +8,39 @@
 
 package io.element.android.libraries.designsystem.atomic.atoms
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement.spacedBy
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.sizeIn
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
 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.text.TextStyle
 import androidx.compose.ui.text.rememberTextMeasurer
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.coerceAtLeast
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
-import io.element.android.compound.tokens.generated.SemanticColors
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.text.toDp
 import io.element.android.libraries.designsystem.theme.components.Text
 
 private const val MAX_COUNT = 99
-private const val MAX_COUNT_STRING = "$MAX_COUNT+"
+private const val MAX_COUNT_STRING = "+$MAX_COUNT"
 
 /**
  * A counter atom that displays a number in a circle.
  * Figma link : https://www.figma.com/design/G1xy0HDZKJf5TCRFmKb5d5/Compound-Android-Components?node-id=2805-2649&m=dev
  *
  * @param count The number to display. If the number is greater than [MAX_COUNT], the counter will display [MAX_COUNT_STRING].
- * If the number is less than 1, just a dot will be displayed instead.
+ * If the number is less than 1, the counter will not be displayed.
  * @param modifier The modifier to apply to this layout.
  * @param containerColor The background color of the counter. When null, uses [isCritical] to pick a default.
- * @param contentColor The text color inside the counter. When null, uses [SemanticColors.textOnSolidPrimary].
- * @param contentPadding The padding to apply to the text inside the counter.
+ * @param contentColor The text color inside the counter. When null, uses [textOnSolidPrimary].
  * @param textStyle The style to apply to the text inside the counter.
- * @param dotSize The size of the dot when [count] is less than 1. It defaults to `12.0.dp`.
  * @param isCritical If true, the counter will use a critical color scheme, otherwise it will use an accent color scheme.
  * Only used when [containerColor] is null.
  */
@@ -54,51 +50,41 @@ fun CounterAtom(
     modifier: Modifier = Modifier,
     containerColor: Color? = null,
     contentColor: Color? = null,
-    contentPadding: PaddingValues = PaddingValues.Zero,
     textStyle: TextStyle = CounterAtomDefaults.textStyle,
-    dotSize: Dp = 12.0.dp,
     isCritical: Boolean = false,
 ) {
+    if (count < 1) return
     val countAsText = when (count) {
-        in Int.MIN_VALUE..0 -> null
-        in 1..MAX_COUNT -> count.toString()
+        in 0..MAX_COUNT -> count.toString()
         else -> MAX_COUNT_STRING
     }
-
-    val minSingleDigitSize = if (countAsText?.length == 1) {
-        val textMeasurer = rememberTextMeasurer()
-        // Measure the maximum count string size
-        val textLayoutResult = textMeasurer.measure(
-            text = countAsText,
-            style = textStyle
-        )
-        val textSize = textLayoutResult.size
-        maxOf(textSize.width, textSize.height)
-    } else {
-        0
-    }
-
-    androidx.compose.material3.Badge(
-        modifier = modifier.then(
-            if (countAsText == null) Modifier.sizeIn(minWidth = dotSize, minHeight = dotSize) else Modifier
-        ),
-        containerColor = containerColor ?: if (isCritical) ElementTheme.colors.iconCriticalPrimary else ElementTheme.colors.iconAccentPrimary,
-        contentColor = contentColor ?: ElementTheme.colors.textOnSolidPrimary,
-        content = countAsText?.let {
-            @Composable {
-                Text(
-                    modifier = Modifier.sizeIn(
-                        minWidth = (minSingleDigitSize.toDp() - 8.dp).coerceAtLeast(0.dp),
-                        minHeight = minSingleDigitSize.toDp()
-                    ).padding(contentPadding),
-                    text = countAsText,
-                    style = textStyle,
-                    color = contentColor ?: ElementTheme.colors.textOnSolidPrimary,
-                    textAlign = TextAlign.Center,
-                )
-            }
-        }
+    val textMeasurer = rememberTextMeasurer()
+    // Measure the maximum count string size
+    val textLayoutResult = textMeasurer.measure(
+        text = MAX_COUNT_STRING,
+        style = textStyle
     )
+    val textSize = textLayoutResult.size
+    val squareSize = maxOf(textSize.width, textSize.height)
+    Box(
+        modifier = modifier
+            .size(squareSize.toDp() + 1.dp)
+            .clip(CircleShape)
+            .background(
+                containerColor ?: if (isCritical) {
+                    ElementTheme.colors.iconCriticalPrimary
+                } else {
+                    ElementTheme.colors.iconAccentPrimary
+                }
+            )
+    ) {
+        Text(
+            modifier = Modifier.align(Alignment.Center),
+            text = countAsText,
+            style = textStyle,
+            color = contentColor ?: ElementTheme.colors.textOnSolidPrimary,
+        )
+    }
 }
 
 object CounterAtomDefaults {
@@ -109,7 +95,7 @@ object CounterAtomDefaults {
 @PreviewsDayNight
 @Composable
 internal fun CounterAtomPreview() = ElementPreview {
-    Row(horizontalArrangement = spacedBy(2.dp), verticalAlignment = Alignment.CenterVertically) {
+    Column(verticalArrangement = spacedBy(2.dp)) {
         CounterAtom(count = 0)
         CounterAtom(count = 4)
         CounterAtom(count = 99)

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/UnreadIndicatorAtom.kt

@@ -9,16 +9,15 @@
 package io.element.android.libraries.designsystem.atomic.atoms
 
 import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.background
 import androidx.compose.foundation.border
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.shape.CircleShape
 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.semantics.contentDescription
 import androidx.compose.ui.semantics.semantics
@@ -38,36 +37,35 @@ fun UnreadIndicatorAtom(
     isVisible: Boolean = true,
     contentDescription: String? = null,
     border: BorderStroke? = null,
-    contentPadding: PaddingValues = PaddingValues.Zero,
 ) {
     when {
         !isVisible -> Spacer(modifier = modifier.size(size))
-        else -> count?.let {
-            CounterAtom(
-                count = count.toInt(),
-                modifier = modifier
-                    .semantics {
-                        contentDescription?.let { this.contentDescription = it }
-                    }
-                    .then(if (border != null) Modifier.border(border, RoundedCornerShape(percent = 50)) else Modifier),
-                containerColor = color,
-                contentColor = ElementTheme.colors.bgCanvasDefault,
-                textStyle = ElementTheme.typography.fontBodySmMedium,
-                contentPadding = contentPadding,
-            )
-        }
+        count != null && count >= 1 -> CounterAtom(
+            count = count.toInt(),
+            modifier = modifier
+                .semantics {
+                    contentDescription?.let { this.contentDescription = it }
+                }
+                .then(if (border != null) Modifier.border(border, CircleShape) else Modifier),
+            containerColor = color,
+            contentColor = ElementTheme.colors.bgCanvasDefault,
+            textStyle = ElementTheme.typography.fontBodySmMedium,
+        )
+        else -> Box(
+            modifier = modifier
+                .semantics {
+                    contentDescription?.let { this.contentDescription = it }
+                }
+                .size(size)
+                .clip(CircleShape)
+                .background(color)
+                .then(if (border != null) Modifier.border(border, CircleShape) else Modifier),
+        )
     }
 }
 
 @PreviewsDayNight
 @Composable
 internal fun UnreadIndicatorAtomPreview() = ElementPreview {
-    Row(horizontalArrangement = Arrangement.spacedBy(2.dp), verticalAlignment = Alignment.CenterVertically) {
-        UnreadIndicatorAtom(count = null)
-        UnreadIndicatorAtom(count = 0)
-        UnreadIndicatorAtom(count = 1)
-        UnreadIndicatorAtom(count = 10)
-        UnreadIndicatorAtom(count = 99)
-        UnreadIndicatorAtom(count = 999)
-    }
+    UnreadIndicatorAtom()
 }

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/HorizontalFloatingToolbar.kt

@@ -8,18 +8,17 @@
 package io.element.android.libraries.designsystem.theme.components
 
 import androidx.compose.animation.core.FiniteAnimationSpec
-import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.RowScope
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.widthIn
-import androidx.compose.material3.BadgedBox
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.FilledIconButton
 import androidx.compose.material3.FloatingToolbarColors
 import androidx.compose.material3.FloatingToolbarDefaults
 import androidx.compose.material3.FloatingToolbarHorizontalFabPosition
@@ -29,6 +28,7 @@ import androidx.compose.material3.TooltipAnchorPosition
 import androidx.compose.material3.TooltipDefaults
 import androidx.compose.material3.rememberTooltipState
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shape
@@ -139,20 +139,8 @@ fun HorizontalFloatingToolbarItem(
                 contentColor = ElementTheme.colors.iconSecondary,
             )
         }
-        BadgedBox(
-            badge = {
-                counter?.let {
-                    CounterAtom(
-                        count = it,
-                        // Tweak the offset so it's centered on the icon
-                        modifier = Modifier.offset(x = (-16).dp, y = 10.dp),
-                        contentPadding = PaddingValues(vertical = 0.5.dp),
-                        textStyle = ElementTheme.typography.fontBodySmMedium,
-                    )
-                }
-            }
-        ) {
-            IconButton(
+        Box {
+            FilledIconButton(
                 modifier = Modifier.widthIn(min = 56.dp),
                 colors = colors,
                 onClick = onClick,
@@ -163,6 +151,15 @@ fun HorizontalFloatingToolbarItem(
                     contentDescription = tooltipLabel,
                 )
             }
+            if (counter != null) {
+                CounterAtom(
+                    modifier = Modifier
+                        .align(Alignment.TopEnd)
+                        .padding(top = 6.dp, end = 3.dp),
+                    count = counter,
+                    textStyle = ElementTheme.typography.fontBodyXsMedium,
+                )
+            }
         }
     }
 }
@@ -175,47 +172,18 @@ fun HorizontalFloatingToolbarSeparator(modifier: Modifier = Modifier) {
 @PreviewsDayNight
 @Composable
 internal fun HorizontalFloatingToolbarPreview() = ElementPreview {
-    Column {
-        ContentToPreview(
-            count = 1,
-            floatingActionButton = {
-                FloatingActionButton(
-                    onClick = {},
-                ) {
-                    Icon(
-                        imageVector = CompoundIcons.Plus(),
-                        contentDescription = null,
-                    )
-                }
+    ContentToPreview(
+        floatingActionButton = {
+            FloatingActionButton(
+                onClick = {},
+            ) {
+                Icon(
+                    imageVector = CompoundIcons.Plus(),
+                    contentDescription = null,
+                )
             }
-        )
-        ContentToPreview(
-            count = 99,
-            floatingActionButton = {
-                FloatingActionButton(
-                    onClick = {},
-                ) {
-                    Icon(
-                        imageVector = CompoundIcons.Plus(),
-                        contentDescription = null,
-                    )
-                }
-            }
-        )
-        ContentToPreview(
-            count = 999,
-            floatingActionButton = {
-                FloatingActionButton(
-                    onClick = {},
-                ) {
-                    Icon(
-                        imageVector = CompoundIcons.Plus(),
-                        contentDescription = null,
-                    )
-                }
-            }
-        )
-    }
+        }
+    )
 }
 
 @PreviewsDayNight
@@ -229,11 +197,10 @@ internal fun HorizontalFloatingToolbarNoFabPreview() = ElementPreview {
 @OptIn(ExperimentalMaterial3ExpressiveApi::class, ExperimentalMaterial3Api::class)
 @Composable
 private fun ContentToPreview(
-    count: Int? = 6,
     floatingActionButton: (@Composable () -> Unit)?,
 ) {
     HorizontalFloatingToolbar(
-        modifier = Modifier.padding(horizontal = 28.dp, vertical = 16.dp),
+        modifier = Modifier.padding(28.dp),
         floatingActionButton = floatingActionButton,
     ) {
         listOf(
@@ -247,7 +214,7 @@ private fun ContentToPreview(
                 icon = icon,
                 tooltipLabel = "Label",
                 isSelected = index == 0,
-                counter = if (index == 0) count else null,
+                counter = if (index == 0) 6 else null,
                 forceRenderingTooltip = true,
                 onClick = { },
             )

libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt

@@ -170,4 +170,11 @@ enum class FeatureFlags(
         isFinished = false,
         isInLabs = false,
     ),
+    NativeCall(
+        key = "feature.native_call",
+        title = "Native calls (experimental)",
+        description = "Place calls with the native MatrixRTC stack instead of the Element Call WebView.",
+        defaultValue = { false },
+        isFinished = false,
+    ),
 }

libraries/matrix/impl/build.gradle.kts

@@ -20,16 +20,47 @@ android {
 
 setupDependencyInjection()
 
+// Temporary: `-PelementCallLocalVersion` points this at a locally published build of
+// element-call-android, because the library has no remote repository yet. Goes with the mavenLocal
+// block in settings.gradle.kts. Only the BOM carries a version; every other artifact follows it.
+val elementCallVersion: String = providers.gradleProperty("elementCallLocalVersion")
+    .getOrElse(libs.versions.element.call.get())
+
+val usesLocalRustSdk = file("${rootDir.path}/libraries/rustsdk/matrix-rust-sdk.aar").exists()
+
+if (usesLocalRustSdk) {
+    // element-call-matrix declares the Rust SDK as an ordinary Maven dependency, so with the local
+    // AAR in place a debug classpath would carry two copies of org.matrix.rustcomponents.sdk.
+    // Point the library's dependency at the same local AAR the app is using.
+    configurations.matching { it.name.startsWith("debug") }.configureEach {
+        resolutionStrategy.dependencySubstitution {
+            substitute(module("org.matrix.rustcomponents:sdk-android"))
+                .using(project(":libraries:rustsdk"))
+                .because("the local Rust SDK AAR replaces the published one on debug builds")
+        }
+    }
+}
+
 dependencies {
     releaseImplementation(libs.matrix.sdk)
-    if (file("${rootDir.path}/libraries/rustsdk/matrix-rust-sdk.aar").exists()) {
-        println("\nNote: Using local binary of the Rust SDK.\n")
+    if (usesLocalRustSdk) {
+        println(
+            "\nNote: Using local binary of the Rust SDK." +
+                "\n      element-call-matrix is substituted onto it as well, so the native call runs" +
+                "\n      against this SDK rather than the one it was published against.\n"
+        )
         debugImplementation(projects.libraries.rustsdk)
     } else {
         debugImplementation(libs.matrix.sdk)
     }
     implementation(variantOf(libs.rustls.platform.verifier) { artifactType("aar") })
 
+    // The native call's Matrix transport. Only this module may hand it a raw SDK client.
+    implementation(platform("io.element.android:element-call-bom:$elementCallVersion"))
+    implementation(libs.element.call.api)
+    implementation(projects.features.callnative.api)
+    implementation(libs.element.call.matrix)
+
     implementation(projects.appconfig)
     implementation(projects.features.enterprise.api)
     implementation(projects.libraries.androidutils)

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/di/DefaultElementCallTransportFactory.kt

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.di
+
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.call.api.matrix.ElementCallMatrixTransport
+import io.element.android.call.matrix.ElementCallSdkTransport
+import io.element.android.features.callnative.api.ElementCallTransportFactory
+import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.android.libraries.matrix.impl.RustMatrixClient
+
+/**
+ * Gives the native call component its view of Matrix.
+ *
+ * Here because this is the only module in the app compiled against the Rust SDK, and the component's
+ * turnkey transport needs a raw SDK client. No feature module ever sees the SDK, the rule that no
+ * feature depends on `libraries/matrix/impl` still holds, and the SDK version contract is checked where
+ * the app's own SDK pin lives.
+ *
+ * The transport is built on the client's own coroutine scope, which is what ties it to the session: the
+ * component has no shutdown of its own, so cancelling that scope at logout is the only thing that stops
+ * the RTC core and its to-device subscription.
+ */
+@ContributesBinding(AppScope::class)
+class DefaultElementCallTransportFactory : ElementCallTransportFactory {
+    override fun create(client: MatrixClient): ElementCallMatrixTransport {
+        return ElementCallSdkTransport(
+            client = (client as RustMatrixClient).innerClient,
+            sessionScope = client.sessionCoroutineScope,
+        )
+    }
+}

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/InviteSender.kt

@@ -9,7 +9,6 @@
 package io.element.android.libraries.matrix.ui.model
 
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.Immutable
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.SpanStyle
@@ -21,7 +20,6 @@ import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.ui.R
 
-@Immutable
 data class InviteSender(
     val userId: UserId,
     val displayName: String,