benya/Messenger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

android: remove duplicate forward action in multi-select
Some checks failed
CI / test (push) Failing after 2m16s
Details

Browse Source
This commit is contained in:
Codex
2026-03-09 15:19:01 +03:00
parent 0adcc97f0f
commit 375f5756d3
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
android/CHANGELOG.md
View File

@@ -330,3 +330,6 @@
- long-press enters multi-select mode directly. - long-press enters multi-select mode directly.
- Hid single-selection action bars while contextual menu is visible to avoid mixed UX states. - 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. - 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.

25
android/app/src/main/java/ru/daemonlord/messenger/ui/chat/ChatScreen.kt
View File

@@ -381,21 +381,18 @@ fun ChatScreen(
Button(onClick = { onToggleReaction("\uD83D\uDE02") }) { Text("\uD83D\uDE02") } Button(onClick = { onToggleReaction("\uD83D\uDE02") }) { Text("\uD83D\uDE02") }
} }
} }
Row( if (state.actionState.mode == MessageSelectionMode.SINGLE) {
modifier = Modifier Row(
.fillMaxWidth() modifier = Modifier
.background(MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.88f)) .fillMaxWidth()
.padding(horizontal = 12.dp, vertical = 6.dp), .background(MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.88f))
horizontalArrangement = Arrangement.spacedBy(8.dp), .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,
) { ) {
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") }
} }
} }
} }