From 3d279ac314f721e6f4556d41020b47c665373229 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 18 Apr 2024 12:08:08 +0200 Subject: [PATCH] Use SuperButton on JoinRoomView, and set all button to size Large --- .../features/joinroom/impl/JoinRoomView.kt | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomView.kt b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomView.kt index 6802e7f77c..d13fa3902b 100644 --- a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomView.kt +++ b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomView.kt @@ -38,6 +38,7 @@ import io.element.android.libraries.designsystem.atomic.pages.HeaderFooterPage import io.element.android.libraries.designsystem.components.avatar.Avatar 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.button.SuperButton import io.element.android.libraries.designsystem.preview.ElementPreview import io.element.android.libraries.designsystem.preview.PreviewsDayNight import io.element.android.libraries.designsystem.theme.components.Button @@ -97,7 +98,7 @@ private fun JoinRoomFooter( text = stringResource(CommonStrings.action_retry), onClick = onRetry, modifier = modifier.fillMaxWidth(), - size = ButtonSize.Medium, + size = ButtonSize.Large, ) } else { val joinAuthorisationStatus = state.joinAuthorisationStatus @@ -108,30 +109,33 @@ private fun JoinRoomFooter( text = stringResource(CommonStrings.action_decline), onClick = onDeclineInvite, modifier = Modifier.weight(1f), - size = ButtonSize.Medium, + size = ButtonSize.Large, ) Button( text = stringResource(CommonStrings.action_accept), onClick = onAcceptInvite, modifier = Modifier.weight(1f), - size = ButtonSize.Medium, + size = ButtonSize.Large, ) } } JoinAuthorisationStatus.CanJoin -> { - Button( - text = stringResource(R.string.screen_join_room_join_action), + SuperButton( onClick = onJoinRoom, modifier = modifier.fillMaxWidth(), - size = ButtonSize.Medium, - ) + buttonSize = ButtonSize.Large, + ) { + Text( + text = stringResource(R.string.screen_join_room_join_action), + ) + } } JoinAuthorisationStatus.CanKnock -> { Button( text = stringResource(R.string.screen_join_room_knock_action), onClick = onJoinRoom, modifier = modifier.fillMaxWidth(), - size = ButtonSize.Medium, + size = ButtonSize.Large, ) } JoinAuthorisationStatus.Unknown -> Unit