Utilize HSL to create disabled component via chat color.

This commit is contained in:
Alex Hart
2026-08-26 15:22:20 -04:00
committed by Michelle Tang
parent 034e50fedf
commit ce5971237f
3 changed files with 167 additions and 6 deletions
@@ -28,6 +28,7 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.Role
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import org.signal.core.ui.compose.ColorProfiles
import org.signal.core.ui.compose.DayNightPreviews
import org.signal.core.ui.compose.DropdownMenus
import org.signal.core.ui.compose.IconButtons
@@ -37,9 +38,6 @@ import org.signal.core.ui.compose.theme.SignalTheme
import org.signal.mediasend.R
import org.signal.mediasend.test.TestTags
/** Mirrors the legacy send button's disabled tint, which has no equivalent in the core-ui color scheme. */
private val DisabledNextButtonColor = Color(0xFF777777)
/**
* Mirrors the legacy send button's size. Has to be stated rather than left to the [IconButtons.IconButton] default of
* 40dp: the default draws the container inside the 48dp of layout that [androidx.compose.material3.minimumInteractiveComponentSize]
@@ -146,6 +144,8 @@ fun AddAMessageRow(
Box {
val scheduleSendMenuController = remember { DropdownMenus.MenuController() }
val nextButtonColor = recipientChatColor ?: MaterialTheme.colorScheme.primaryContainer
IconButtons.IconButton(
enabled = enabled,
onClick = onNextClick,
@@ -153,10 +153,10 @@ fun AddAMessageRow(
onLongClick = if (canScheduleSend) scheduleSendMenuController::show else null,
onLongClickLabel = stringResource(R.string.AddAMessageRow__schedule_send),
colors = IconButtons.iconButtonColors(
containerColor = recipientChatColor ?: MaterialTheme.colorScheme.primaryContainer,
containerColor = nextButtonColor,
contentColor = if (recipientChatColor != null) SignalTheme.colors.colorOnCustom else MaterialTheme.colorScheme.onPrimaryContainer,
disabledContainerColor = DisabledNextButtonColor,
disabledContentColor = MaterialTheme.colorScheme.secondaryContainer
disabledContainerColor = ColorProfiles.disabledContainer(nextButtonColor),
disabledContentColor = ColorProfiles.disabledContent()
),
modifier = Modifier
.testTag(TestTags.ADD_A_MESSAGE_NEXT_BUTTON)
@@ -244,6 +244,19 @@ private fun AddAMessageRowKnownRecipientPreview() {
@DayNightPreviews
@Composable
private fun AddAMessageRowDisabledPreview() {
Previews.Preview {
AddAMessageRow(
message = null,
onEvent = {},
onNextClick = {},
enabled = false
)
}
}
@DayNightPreviews
@Composable
private fun AddAMessageRowDisabledKnownRecipientPreview() {
Previews.Preview {
AddAMessageRow(
message = null,
@@ -255,6 +268,21 @@ private fun AddAMessageRowDisabledPreview() {
}
}
/** A chat color that starts out pale, where a plain interpolation towards the chrome would barely move. */
@DayNightPreviews
@Composable
private fun AddAMessageRowDisabledPaleRecipientPreview() {
Previews.Preview {
AddAMessageRow(
message = null,
onEvent = {},
onNextClick = {},
enabled = false,
recipientChatColor = Color(0xFFF5E0A0)
)
}
}
@DayNightPreviews
@Composable
private fun AddAMessageRowLongContentPreview() {