Merge branch 'develop' into feature/fga/space_flow_inject_room

2025-10-27 11:41:26 +01:00 · 2025-10-27 11:41:26 +01:00 · 819e916e3c
commit 819e916e3c
parent 7f04a9fcf7 9baf948b35
75 changed files with 561 additions and 337 deletions
--- a/features/enterprise/api/src/main/kotlin/io/element/android/features/enterprise/api/EnterpriseService.kt
+++ b/features/enterprise/api/src/main/kotlin/io/element/android/features/enterprise/api/EnterpriseService.kt
@ -7,6 +7,7 @@

 package io.element.android.features.enterprise.api

+import androidx.compose.ui.graphics.Color
 import io.element.android.compound.colors.SemanticColorsLightDark
 import io.element.android.libraries.matrix.api.core.SessionId
 import kotlinx.coroutines.flow.Flow
@ -24,6 +25,8 @@ interface EnterpriseService {
     */
    suspend fun overrideBrandColor(sessionId: SessionId?, brandColor: String?)

+    fun brandColorsFlow(sessionId: SessionId?): Flow<Color?>
+
    fun semanticColorsFlow(sessionId: SessionId?): Flow<SemanticColorsLightDark>

    fun firebasePushGateway(): String?
--- a/features/enterprise/impl-foss/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseService.kt
+++ b/features/enterprise/impl-foss/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseService.kt
@ -7,6 +7,7 @@

 package io.element.android.features.enterprise.impl

+import androidx.compose.ui.graphics.Color
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
 import io.element.android.compound.colors.SemanticColorsLightDark
@ -27,6 +28,10 @@ class DefaultEnterpriseService : EnterpriseService {

    override suspend fun overrideBrandColor(sessionId: SessionId?, brandColor: String?) = Unit

+    override fun brandColorsFlow(sessionId: SessionId?): Flow<Color?> {
+        return flowOf(null)
+    }
+
    override fun semanticColorsFlow(sessionId: SessionId?): Flow<SemanticColorsLightDark> {
        return flowOf(SemanticColorsLightDark.default)
    }
--- a/features/enterprise/impl-foss/src/test/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseServiceTest.kt
+++ b/features/enterprise/impl-foss/src/test/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseServiceTest.kt
@ -51,6 +51,16 @@ class DefaultEnterpriseServiceTest {
        }
    }

+    @Test
+    fun `brandColorsFlow always emits null`() = runTest {
+        val defaultEnterpriseService = DefaultEnterpriseService()
+        defaultEnterpriseService.brandColorsFlow(null).test {
+            val initialState = awaitItem()
+            assertThat(initialState).isNull()
+            awaitComplete()
+        }
+    }
+
    @Test
    fun `semanticColorsFlow always emits the same value for a session`() = runTest {
        val defaultEnterpriseService = DefaultEnterpriseService()
--- a/features/enterprise/test/src/main/kotlin/io/element/android/features/enterprise/test/FakeEnterpriseService.kt
+++ b/features/enterprise/test/src/main/kotlin/io/element/android/features/enterprise/test/FakeEnterpriseService.kt
@ -7,6 +7,7 @@

 package io.element.android.features.enterprise.test

+import androidx.compose.ui.graphics.Color
 import io.element.android.compound.colors.SemanticColorsLightDark
 import io.element.android.features.enterprise.api.BugReportUrl
 import io.element.android.features.enterprise.api.EnterpriseService
@ -27,6 +28,7 @@ class FakeEnterpriseService(
    private val firebasePushGatewayResult: () -> String? = { lambdaError() },
    private val unifiedPushDefaultPushGatewayResult: () -> String? = { lambdaError() },
 ) : EnterpriseService {
+    private val brandColorState = MutableStateFlow<Color?>(null)
    private val semanticColorsState = MutableStateFlow(initialSemanticColors)

    override suspend fun isEnterpriseUser(sessionId: SessionId): Boolean = simulateLongTask {
@ -45,6 +47,10 @@ class FakeEnterpriseService(
        overrideBrandColorResult(sessionId, brandColor)
    }

+    override fun brandColorsFlow(sessionId: SessionId?): Flow<Color?> {
+        return brandColorState.asStateFlow()
+    }
+
    override fun semanticColorsFlow(sessionId: SessionId?): Flow<SemanticColorsLightDark> {
        return semanticColorsState.asStateFlow()
    }
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesView.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesView.kt
@ -9,6 +9,7 @@ package io.element.android.features.home.impl.spaces

 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@ -57,20 +58,24 @@ fun HomeSpacesView(
        item {
            HorizontalDivider()
        }
-        state.spaceRooms.forEach { spaceRoom ->
-            item(spaceRoom.roomId) {
-                val isInvitation = spaceRoom.state == CurrentUserMembership.INVITED
-                SpaceRoomItemView(
-                    spaceRoom = spaceRoom,
-                    showUnreadIndicator = isInvitation && spaceRoom.roomId !in state.seenSpaceInvites,
-                    hideAvatars = isInvitation && state.hideInvitesAvatar,
-                    onClick = {
-                        onSpaceClick(spaceRoom.roomId)
-                    },
-                    onLongClick = {
-                        // TODO
-                    },
-                )
+        itemsIndexed(
+            items = state.spaceRooms,
+            key = { _, spaceRoom -> spaceRoom.roomId }
+        ) { index, spaceRoom ->
+            val isInvitation = spaceRoom.state == CurrentUserMembership.INVITED
+            SpaceRoomItemView(
+                spaceRoom = spaceRoom,
+                showUnreadIndicator = isInvitation && spaceRoom.roomId !in state.seenSpaceInvites,
+                hideAvatars = isInvitation && state.hideInvitesAvatar,
+                onClick = {
+                    onSpaceClick(spaceRoom.roomId)
+                },
+                onLongClick = {
+                    // TODO
+                },
+            )
+            if (index != state.spaceRooms.lastIndex) {
+                HorizontalDivider()
            }
        }
    }
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceView.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceView.kt
@ -7,6 +7,7 @@

 package io.element.android.features.space.impl.root

+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
@ -14,6 +15,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
@ -186,32 +188,36 @@ private fun SpaceViewContent(
                HorizontalDivider()
            }
        }
-        state.children.forEach { spaceRoom ->
-            item {
-                val isInvitation = spaceRoom.state == CurrentUserMembership.INVITED
-                val isCurrentlyJoining = state.isJoining(spaceRoom.roomId)
-                SpaceRoomItemView(
-                    spaceRoom = spaceRoom,
-                    showUnreadIndicator = isInvitation && spaceRoom.roomId !in state.seenSpaceInvites,
-                    hideAvatars = isInvitation && state.hideInvitesAvatar,
-                    onClick = {
-                        onRoomClick(spaceRoom)
+        itemsIndexed(
+            items = state.children,
+            key = { _, spaceRoom -> spaceRoom.roomId }
+        ) { index, spaceRoom ->
+            val isInvitation = spaceRoom.state == CurrentUserMembership.INVITED
+            val isCurrentlyJoining = state.isJoining(spaceRoom.roomId)
+            SpaceRoomItemView(
+                spaceRoom = spaceRoom,
+                showUnreadIndicator = isInvitation && spaceRoom.roomId !in state.seenSpaceInvites,
+                hideAvatars = isInvitation && state.hideInvitesAvatar,
+                onClick = {
+                    onRoomClick(spaceRoom)
+                },
+                onLongClick = {
+                    // TODO
+                },
+                trailingAction = spaceRoom.trailingAction(isCurrentlyJoining = isCurrentlyJoining) {
+                    state.eventSink(SpaceEvents.Join(spaceRoom))
+                },
+                bottomAction = spaceRoom.inviteButtons(
+                    onAcceptClick = {
+                        state.eventSink(SpaceEvents.AcceptInvite(spaceRoom))
                    },
-                    onLongClick = {
-                        // TODO
-                    },
-                    trailingAction = spaceRoom.trailingAction(isCurrentlyJoining = isCurrentlyJoining) {
-                        state.eventSink(SpaceEvents.Join(spaceRoom))
-                    },
-                    bottomAction = spaceRoom.inviteButtons(
-                        onAcceptClick = {
-                            state.eventSink(SpaceEvents.AcceptInvite(spaceRoom))
-                        },
-                        onDeclineClick = {
-                            state.eventSink(SpaceEvents.DeclineInvite(spaceRoom))
-                        }
-                    )
+                    onDeclineClick = {
+                        state.eventSink(SpaceEvents.DeclineInvite(spaceRoom))
+                    }
                )
+            )
+            if (index != state.children.lastIndex) {
+                HorizontalDivider()
            }
        }
        if (state.hasMoreToLoad) {
@ -266,7 +272,7 @@ private fun SpaceViewTopBar(
                    modifier = Modifier
                        .clip(roundedCornerShape)
                        // TODO enable when screen ready for space
-                        // .clickable(onClick = onDetailsClick)
+                        .clickable(enabled = false, onClick = onDetailsClick)
                )
            }
        },
@ -338,10 +344,10 @@ private fun SpaceAvatarAndNameRow(
        )
        Text(
            modifier = Modifier
-                .padding(horizontal = 8.dp)
-                .semantics {
-                    heading()
-                },
+                    .padding(horizontal = 8.dp)
+                    .semantics {
+                        heading()
+                    },
            text = name ?: stringResource(CommonStrings.common_no_space_name),
            style = ElementTheme.typography.fontBodyLgMedium,
            fontStyle = FontStyle.Italic.takeIf { name == null },