From 8923e3e030a995c1b6b05c65313860600e342e7e Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Tue, 11 Aug 2026 11:32:20 -0300 Subject: [PATCH] More UI polish items for media-send. --- .../java/org/thoughtcrime/securesms/util/RemoteConfig.kt | 2 +- .../org/signal/mediasend/screens/edit/AddAMessageRow.kt | 8 +++++--- .../org/signal/mediasend/screens/edit/MediaEditScreen.kt | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt b/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt index c0ff5e73b2..01a7a37516 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt @@ -1472,7 +1472,7 @@ object RemoteConfig { @JvmStatic @get:JvmName("useNewMediaSendFlow") val useNewMediaSendFlow: Boolean by remoteBoolean( - key = "android.useNewMediaSendFlow", + key = "android.useNewMediaSendFlow.2", defaultValue = false, hotSwappable = true ) diff --git a/feature/media-send/src/main/java/org/signal/mediasend/screens/edit/AddAMessageRow.kt b/feature/media-send/src/main/java/org/signal/mediasend/screens/edit/AddAMessageRow.kt index 789fa7cf16..5113bfc83e 100644 --- a/feature/media-send/src/main/java/org/signal/mediasend/screens/edit/AddAMessageRow.kt +++ b/feature/media-send/src/main/java/org/signal/mediasend/screens/edit/AddAMessageRow.kt @@ -10,6 +10,7 @@ import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.padding import androidx.compose.foundation.shape.RoundedCornerShape @@ -82,7 +83,7 @@ fun AddAMessageRow( modifier = Modifier .background(color = MaterialTheme.colorScheme.surfaceVariant, shape = RoundedCornerShape(24.dp)) .weight(1f) - .heightIn(min = 40.dp) + .heightIn(min = 44.dp) .then( if (viewOnce) { // A view-once send cannot carry a body, so the row becomes a static label rather than an entry point. @@ -117,6 +118,7 @@ fun AddAMessageRow( message?.takeIf { it.isNotBlank() } ?: stringResource(if (isReply) R.string.AddAMessageRow__add_a_reply else R.string.AddAMessageRow__message), Modifier .weight(1f) + .height(44.dp) .padding(end = if (viewOnceAvailable) 0.dp else 16.dp, top = 10.dp, bottom = 10.dp) ) } @@ -143,8 +145,8 @@ fun AddAMessageRow( onLongClick = if (canScheduleSend) scheduleSendMenuController::show else null, onLongClickLabel = stringResource(R.string.AddAMessageRow__schedule_send), colors = IconButtons.iconButtonColors( - containerColor = recipientChatColor ?: MaterialTheme.colorScheme.onSecondaryContainer, - contentColor = if (recipientChatColor != null) SignalTheme.colors.colorOnCustom else MaterialTheme.colorScheme.secondaryContainer, + containerColor = recipientChatColor ?: MaterialTheme.colorScheme.primaryContainer, + contentColor = if (recipientChatColor != null) SignalTheme.colors.colorOnCustom else MaterialTheme.colorScheme.onPrimaryContainer, disabledContainerColor = DisabledNextButtonColor, disabledContentColor = MaterialTheme.colorScheme.secondaryContainer ), diff --git a/feature/media-send/src/main/java/org/signal/mediasend/screens/edit/MediaEditScreen.kt b/feature/media-send/src/main/java/org/signal/mediasend/screens/edit/MediaEditScreen.kt index 28a2f7e6a0..8fd42d7ed9 100644 --- a/feature/media-send/src/main/java/org/signal/mediasend/screens/edit/MediaEditScreen.kt +++ b/feature/media-send/src/main/java/org/signal/mediasend/screens/edit/MediaEditScreen.kt @@ -402,7 +402,7 @@ internal fun MediaEditScreen( val displayName: String? by displayNameState MediaEditControl( - faded = isDragging, + faded = isDragging || isImageEditing, modifier = Modifier .align(Alignment.TopCenter) .padding(top = 10.dp)