Design fixes for room detail, dm & room member detail screens (#363)

* Design fixes for room detail, dm & room member detail screens.

* Record new screenshots, improve RoomDetailsStateProvider.

* Move MainActionButton to its own component in the design system.

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt

@@ -70,7 +70,6 @@ class MessagesPresenter @Inject constructor(
         }
 
         val networkConnectionStatus by networkMonitor.connectivity.collectAsState(initial = networkMonitor.currentConnectivityStatus)
-        println(networkConnectionStatus)
 
         LaunchedEffect(syncUpdateFlow) {
             roomAvatar.value =

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsStateProvider.kt

@@ -17,6 +17,7 @@
 package io.element.android.features.roomdetails.impl
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import io.element.android.features.roomdetails.impl.members.details.aRoomMemberDetailsState
 import io.element.android.libraries.architecture.Async
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.RoomMember
@@ -30,8 +31,8 @@ open class RoomDetailsStateProvider : PreviewParameterProvider<RoomDetailsState>
             aRoomDetailsState().copy(isEncrypted = false),
             aRoomDetailsState().copy(roomAlias = null),
             aRoomDetailsState().copy(memberCount = Async.Failure(Throwable())),
-            aRoomDetailsState().copy(roomType = RoomDetailsType.Dm(aDmRoomMember()), roomName = "Daniel"),
+            aDmRoomDetailsState().copy(roomName = "Daniel"),
-            aRoomDetailsState().copy(roomType = RoomDetailsType.Dm(aDmRoomMember(isIgnored = true)), roomName = "Daniel"),
+            aDmRoomDetailsState(isDmMemberIgnored = true).copy(roomName = "Daniel"),
             // Add other state here
         )
 }
@@ -74,3 +75,7 @@ fun aRoomDetailsState() = RoomDetailsState(
     roomMemberDetailsState = null,
     eventSink = {}
 )
+
+fun aDmRoomDetailsState(isDmMemberIgnored: Boolean = false) = aRoomDetailsState().copy(
+    roomType = RoomDetailsType.Dm(aDmRoomMember(isIgnored = isDmMemberIgnored)), roomMemberDetailsState = aRoomMemberDetailsState()
+)

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt

@@ -16,8 +16,10 @@
 
 package io.element.android.features.roomdetails.impl
 
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -45,7 +47,7 @@ import androidx.compose.ui.unit.dp
 import io.element.android.features.roomdetails.blockuser.BlockUserDialogs
 import io.element.android.features.roomdetails.blockuser.BlockUserSection
 import io.element.android.features.roomdetails.impl.members.details.RoomMemberHeaderSection
-import io.element.android.features.roomdetails.impl.members.details.RoomMemberShareSection
+import io.element.android.features.roomdetails.impl.members.details.RoomMemberMainActionsSection
 import io.element.android.libraries.architecture.Async
 import io.element.android.libraries.architecture.isLoading
 import io.element.android.libraries.designsystem.ElementTextStyles
@@ -60,6 +62,7 @@ import io.element.android.libraries.designsystem.components.preferences.Preferen
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
 import io.element.android.libraries.designsystem.theme.LocalColors
+import io.element.android.libraries.designsystem.components.button.MainActionButton
 import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
@@ -99,7 +102,7 @@ fun RoomDetailsView(
                         roomName = state.roomName,
                         roomAlias = state.roomAlias
                     )
-                    RoomShareSection(onShareRoom = onShareRoom)
+                    MainActionsSection(onShareRoom = onShareRoom)
                 }
                 is RoomDetailsType.Dm -> {
                     val member = state.roomType.roomMember
@@ -108,9 +111,10 @@ fun RoomDetailsView(
                         userId = member.userId.value,
                         userName = state.roomName
                     )
-                    RoomMemberShareSection(onShareUser = ::onShareMember)
+                    RoomMemberMainActionsSection(onShareUser = ::onShareMember)
                 }
             }
+            Spacer(Modifier.height(26.dp))
 
             if (state.roomTopic != null) {
                 TopicSection(roomTopic = state.roomTopic)
@@ -129,20 +133,15 @@ fun RoomDetailsView(
                 SecuritySection()
             }
 
-            when (state.roomType) {
+            if (state.roomType is RoomDetailsType.Dm && state.roomMemberDetailsState != null) {
-                RoomDetailsType.Room -> {
-                    OtherActionsSection(onLeaveRoom = {
-                        state.eventSink(RoomDetailsEvent.LeaveRoom(needsConfirmation = true))
-                    })
-                }
-                is RoomDetailsType.Dm -> {
-                    if (state.roomMemberDetailsState != null) {
                 val roomMemberState = state.roomMemberDetailsState
                 BlockUserSection(roomMemberState)
                 BlockUserDialogs(roomMemberState)
             }
-                }
+
-            }
+            OtherActionsSection(onLeaveRoom = {
+                state.eventSink(RoomDetailsEvent.LeaveRoom(needsConfirmation = true))
+            })
 
             if (state.displayLeaveRoomWarning != null) {
                 ConfirmLeaveRoomDialog(
@@ -163,13 +162,9 @@ fun RoomDetailsView(
 }
 
 @Composable
-internal fun RoomShareSection(onShareRoom: () -> Unit, modifier: Modifier = Modifier) {
+internal fun MainActionsSection(onShareRoom: () -> Unit, modifier: Modifier = Modifier) {
-    PreferenceCategory(modifier = modifier) {
+    Row(modifier.fillMaxWidth(), horizontalArrangement = Arrangement.Center) {
-        PreferenceText(
+        MainActionButton(title = stringResource(R.string.screen_room_details_share_room_title), icon = Icons.Outlined.Share, onClick = onShareRoom)
-            title = stringResource(R.string.screen_room_details_share_room_title),
-            icon = Icons.Outlined.Share,
-            onClick = onShareRoom,
-        )
     }
 }
 

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberDetailsView.kt

@@ -16,8 +16,10 @@
 
 package io.element.android.features.roomdetails.impl.members.details
 
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -27,7 +29,6 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Block
 import androidx.compose.material.icons.outlined.ChatBubbleOutline
 import androidx.compose.material.icons.outlined.Share
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -41,18 +42,16 @@ import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import io.element.android.features.roomdetails.blockuser.BlockUserDialogs
 import io.element.android.features.roomdetails.blockuser.BlockUserSection
-import io.element.android.features.roomdetails.impl.R
 import io.element.android.libraries.designsystem.ElementTextStyles
 import io.element.android.libraries.designsystem.components.avatar.Avatar
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.designsystem.components.button.BackButton
-import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog
 import io.element.android.libraries.designsystem.components.preferences.PreferenceCategory
 import io.element.android.libraries.designsystem.components.preferences.PreferenceText
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
-import io.element.android.libraries.designsystem.theme.LocalColors
+import io.element.android.libraries.designsystem.components.button.MainActionButton
 import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
@@ -83,7 +82,9 @@ fun RoomMemberDetailsView(
                 userName = state.userName,
             )
 
-            RoomMemberShareSection(onShareUser = onShareUser)
+            RoomMemberMainActionsSection(onShareUser = onShareUser)
+
+            Spacer(modifier = Modifier.height(26.dp))
 
             SendMessageSection(onSendMessage = {
                 // TODO implement send DM
@@ -117,18 +118,14 @@ internal fun RoomMemberHeaderSection(
             Spacer(modifier = Modifier.height(6.dp))
         }
         Text(userId, style = ElementTextStyles.Regular.body, color = MaterialTheme.colorScheme.secondary)
-        Spacer(Modifier.height(32.dp))
+        Spacer(Modifier.height(40.dp))
     }
 }
 
 @Composable
-internal fun RoomMemberShareSection(onShareUser: () -> Unit, modifier: Modifier = Modifier) {
+internal fun RoomMemberMainActionsSection(onShareUser: () -> Unit, modifier: Modifier = Modifier) {
-    PreferenceCategory(modifier = modifier) {
+    Row(modifier.fillMaxWidth(), horizontalArrangement = Arrangement.Center) {
-        PreferenceText(
+        MainActionButton(title = stringResource(StringR.string.action_share), icon = Icons.Outlined.Share, onClick = onShareUser)
-            title = stringResource(StringR.string.action_share),
-            icon = Icons.Outlined.Share,
-            onClick = onShareUser,
-        )
     }
 }
 

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/MainActionButton.kt

@@ -0,0 +1,103 @@
+/*
+ * 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.
+ */
+
+package io.element.android.libraries.designsystem.components.button
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Share
+import androidx.compose.material.ripple.rememberRipple
+import androidx.compose.material3.LocalContentColor
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import io.element.android.libraries.designsystem.ElementTextStyles
+import io.element.android.libraries.designsystem.preview.ElementPreviewDark
+import io.element.android.libraries.designsystem.preview.ElementPreviewLight
+import io.element.android.libraries.designsystem.theme.components.Icon
+import io.element.android.libraries.designsystem.theme.components.Text
+
+@Composable
+fun MainActionButton(
+    title: String,
+    icon: ImageVector,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    enabled: Boolean = true,
+    contentDescription: String = title,
+) {
+    val ripple = rememberRipple(bounded = false)
+    val interactionSource = MutableInteractionSource()
+    Column(
+        modifier.clickable(
+            enabled = enabled,
+            interactionSource = interactionSource,
+            onClick = onClick,
+            indication = ripple
+        ),
+        horizontalAlignment = Alignment.CenterHorizontally,
+    ) {
+        val tintColor = if (enabled) LocalContentColor.current else MaterialTheme.colorScheme.secondary
+        Icon(
+            icon,
+            contentDescription = contentDescription,
+            tint = tintColor,
+        )
+        Spacer(modifier = Modifier.height(14.dp))
+        Text(
+            title,
+            style = ElementTextStyles.Regular.bodyMD.copy(fontWeight = FontWeight.Medium),
+            color = tintColor,
+        )
+    }
+}
+
+@Preview
+@Composable
+internal fun MainActionButtonLightPreview() {
+    ElementPreviewLight {
+        ContentsToPreview()
+    }
+}
+
+@Preview
+@Composable
+internal fun MainActionButtonDarkPreview() {
+    ElementPreviewDark {
+        ContentsToPreview()
+    }
+}
+
+@Composable
+private fun ContentsToPreview() {
+    Row(Modifier.padding(10.dp)) {
+        MainActionButton(title = "Share", icon = Icons.Outlined.Share, onClick = { })
+        Spacer(modifier = Modifier.width(20.dp))
+        MainActionButton(title = "Share", icon = Icons.Outlined.Share, onClick = { }, enabled = false)
+    }
+}