diff --git a/android/CHANGELOG.md b/android/CHANGELOG.md index 2b1868d..d1d3115 100644 --- a/android/CHANGELOG.md +++ b/android/CHANGELOG.md @@ -330,3 +330,6 @@ - long-press enters multi-select mode directly. - Hid single-selection action bars while contextual menu is visible to avoid mixed UX states. - Improved multi-select visual affordance with per-message selection indicator circles. + +### Step 55 - Chat multi-select action cleanup +- Removed duplicate forward action in multi-select mode (`Forward selected`), leaving a single clear forward action button. diff --git a/android/app/src/main/java/ru/daemonlord/messenger/ui/chat/ChatScreen.kt b/android/app/src/main/java/ru/daemonlord/messenger/ui/chat/ChatScreen.kt index cf1c5d9..ed1a660 100644 --- a/android/app/src/main/java/ru/daemonlord/messenger/ui/chat/ChatScreen.kt +++ b/android/app/src/main/java/ru/daemonlord/messenger/ui/chat/ChatScreen.kt @@ -381,21 +381,18 @@ fun ChatScreen( Button(onClick = { onToggleReaction("\uD83D\uDE02") }) { Text("\uD83D\uDE02") } } } - Row( - modifier = Modifier - .fillMaxWidth() - .background(MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.88f)) - .padding(horizontal = 12.dp, vertical = 6.dp), - horizontalArrangement = Arrangement.spacedBy(8.dp), - ) { - if (state.actionState.mode == MessageSelectionMode.SINGLE && state.selectedMessage != null) { - Button(onClick = { onReplySelected(state.selectedMessage) }) { Text("Reply") } - } - Button( - onClick = onForwardSelected, - enabled = state.actionState.mode == MessageSelectionMode.MULTI, + if (state.actionState.mode == MessageSelectionMode.SINGLE) { + Row( + modifier = Modifier + .fillMaxWidth() + .background(MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.88f)) + .padding(horizontal = 12.dp, vertical = 6.dp), + horizontalArrangement = Arrangement.spacedBy(8.dp), ) { - Text(if (state.actionState.mode == MessageSelectionMode.MULTI) "Forward selected" else "Forward") + if (state.selectedMessage != null) { + Button(onClick = { onReplySelected(state.selectedMessage) }) { Text("Reply") } + } + Button(onClick = onForwardSelected) { Text("Forward") } } } }