mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-02 21:32:34 +00:00
Use SuperButton on JoinRoomView, and set all button to size Large
This commit is contained in:
+12
-8
@@ -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.Avatar
|
||||||
import io.element.android.libraries.designsystem.components.avatar.AvatarSize
|
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.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.ElementPreview
|
||||||
import io.element.android.libraries.designsystem.preview.PreviewsDayNight
|
import io.element.android.libraries.designsystem.preview.PreviewsDayNight
|
||||||
import io.element.android.libraries.designsystem.theme.components.Button
|
import io.element.android.libraries.designsystem.theme.components.Button
|
||||||
@@ -97,7 +98,7 @@ private fun JoinRoomFooter(
|
|||||||
text = stringResource(CommonStrings.action_retry),
|
text = stringResource(CommonStrings.action_retry),
|
||||||
onClick = onRetry,
|
onClick = onRetry,
|
||||||
modifier = modifier.fillMaxWidth(),
|
modifier = modifier.fillMaxWidth(),
|
||||||
size = ButtonSize.Medium,
|
size = ButtonSize.Large,
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
val joinAuthorisationStatus = state.joinAuthorisationStatus
|
val joinAuthorisationStatus = state.joinAuthorisationStatus
|
||||||
@@ -108,30 +109,33 @@ private fun JoinRoomFooter(
|
|||||||
text = stringResource(CommonStrings.action_decline),
|
text = stringResource(CommonStrings.action_decline),
|
||||||
onClick = onDeclineInvite,
|
onClick = onDeclineInvite,
|
||||||
modifier = Modifier.weight(1f),
|
modifier = Modifier.weight(1f),
|
||||||
size = ButtonSize.Medium,
|
size = ButtonSize.Large,
|
||||||
)
|
)
|
||||||
Button(
|
Button(
|
||||||
text = stringResource(CommonStrings.action_accept),
|
text = stringResource(CommonStrings.action_accept),
|
||||||
onClick = onAcceptInvite,
|
onClick = onAcceptInvite,
|
||||||
modifier = Modifier.weight(1f),
|
modifier = Modifier.weight(1f),
|
||||||
size = ButtonSize.Medium,
|
size = ButtonSize.Large,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
JoinAuthorisationStatus.CanJoin -> {
|
JoinAuthorisationStatus.CanJoin -> {
|
||||||
Button(
|
SuperButton(
|
||||||
text = stringResource(R.string.screen_join_room_join_action),
|
|
||||||
onClick = onJoinRoom,
|
onClick = onJoinRoom,
|
||||||
modifier = modifier.fillMaxWidth(),
|
modifier = modifier.fillMaxWidth(),
|
||||||
size = ButtonSize.Medium,
|
buttonSize = ButtonSize.Large,
|
||||||
)
|
) {
|
||||||
|
Text(
|
||||||
|
text = stringResource(R.string.screen_join_room_join_action),
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
JoinAuthorisationStatus.CanKnock -> {
|
JoinAuthorisationStatus.CanKnock -> {
|
||||||
Button(
|
Button(
|
||||||
text = stringResource(R.string.screen_join_room_knock_action),
|
text = stringResource(R.string.screen_join_room_knock_action),
|
||||||
onClick = onJoinRoom,
|
onClick = onJoinRoom,
|
||||||
modifier = modifier.fillMaxWidth(),
|
modifier = modifier.fillMaxWidth(),
|
||||||
size = ButtonSize.Medium,
|
size = ButtonSize.Large,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
JoinAuthorisationStatus.Unknown -> Unit
|
JoinAuthorisationStatus.Unknown -> Unit
|
||||||
|
|||||||
Reference in New Issue
Block a user