mirror of
https://github.com/permissionlesstech/bitchat-android.git
synced 2026-07-26 15:45:27 +00:00
- Change message input from String to TextFieldValue for better cursor control - Add SlashCommandVisualTransformation to style slash commands with colored backgrounds - Maintain cursor position when selecting command suggestions
262 lines
9.3 KiB
Kotlin
262 lines
9.3 KiB
Kotlin
package com.bitchat.android.ui
|
|
|
|
import androidx.compose.foundation.*
|
|
import androidx.compose.foundation.layout.*
|
|
import androidx.compose.foundation.shape.CircleShape
|
|
import androidx.compose.foundation.shape.RoundedCornerShape
|
|
import androidx.compose.foundation.text.BasicTextField
|
|
import androidx.compose.foundation.text.KeyboardActions
|
|
import androidx.compose.foundation.text.KeyboardOptions
|
|
import androidx.compose.material.icons.Icons
|
|
import androidx.compose.material.icons.filled.*
|
|
import androidx.compose.material3.*
|
|
import androidx.compose.runtime.*
|
|
import androidx.compose.ui.Alignment
|
|
import androidx.compose.ui.Modifier
|
|
import androidx.compose.ui.graphics.Color
|
|
import androidx.compose.ui.graphics.SolidColor
|
|
import androidx.compose.ui.text.AnnotatedString
|
|
import androidx.compose.ui.text.SpanStyle
|
|
import androidx.compose.ui.text.buildAnnotatedString
|
|
import androidx.compose.ui.text.font.FontFamily
|
|
import androidx.compose.ui.text.font.FontWeight
|
|
import androidx.compose.ui.text.input.ImeAction
|
|
import androidx.compose.ui.text.input.OffsetMapping
|
|
import androidx.compose.ui.text.input.TextFieldValue
|
|
import androidx.compose.ui.text.input.TransformedText
|
|
import androidx.compose.ui.text.input.VisualTransformation
|
|
import androidx.compose.ui.text.style.TextOverflow
|
|
import androidx.compose.ui.unit.dp
|
|
import androidx.compose.ui.unit.sp
|
|
import androidx.compose.ui.focus.onFocusChanged
|
|
import androidx.compose.ui.text.withStyle
|
|
|
|
/**
|
|
* Input components for ChatScreen
|
|
* Extracted from ChatScreen.kt for better organization
|
|
*/
|
|
|
|
/**
|
|
* VisualTransformation that styles slash commands with background and color
|
|
* while preserving cursor positioning and click handling
|
|
*/
|
|
class SlashCommandVisualTransformation : VisualTransformation {
|
|
override fun filter(text: AnnotatedString): TransformedText {
|
|
val slashCommandRegex = Regex("(/\\w+)(?=\\s|$)")
|
|
val annotatedString = buildAnnotatedString {
|
|
var lastIndex = 0
|
|
|
|
slashCommandRegex.findAll(text.text).forEach { match ->
|
|
// Add text before the match
|
|
if (match.range.first > lastIndex) {
|
|
append(text.text.substring(lastIndex, match.range.first))
|
|
}
|
|
|
|
// Add the styled slash command
|
|
withStyle(
|
|
style = SpanStyle(
|
|
color = Color(0xFF00FF7F), // Bright green
|
|
fontFamily = FontFamily.Monospace,
|
|
fontWeight = FontWeight.Medium,
|
|
background = Color(0xFF2D2D2D) // Dark gray background
|
|
)
|
|
) {
|
|
append(match.value)
|
|
}
|
|
|
|
lastIndex = match.range.last + 1
|
|
}
|
|
|
|
// Add remaining text
|
|
if (lastIndex < text.text.length) {
|
|
append(text.text.substring(lastIndex))
|
|
}
|
|
}
|
|
|
|
return TransformedText(
|
|
text = annotatedString,
|
|
offsetMapping = OffsetMapping.Identity
|
|
)
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Composable
|
|
fun MessageInput(
|
|
value: TextFieldValue,
|
|
onValueChange: (TextFieldValue) -> Unit,
|
|
onSend: () -> Unit,
|
|
selectedPrivatePeer: String?,
|
|
currentChannel: String?,
|
|
nickname: String,
|
|
modifier: Modifier = Modifier
|
|
) {
|
|
val colorScheme = MaterialTheme.colorScheme
|
|
val isFocused = remember { mutableStateOf(false) }
|
|
|
|
Row(
|
|
modifier = modifier.padding(horizontal = 12.dp, vertical = 8.dp), // Reduced padding
|
|
verticalAlignment = Alignment.CenterVertically
|
|
) {
|
|
// Remove arrow from both private and channel inputs to match DM style
|
|
Text(
|
|
text = "<@$nickname>", // No arrow for both private and channel
|
|
style = MaterialTheme.typography.bodySmall.copy(fontWeight = FontWeight.Medium),
|
|
color = when {
|
|
selectedPrivatePeer != null -> Color(0xFFFF9500) // Orange for private
|
|
currentChannel != null -> Color(0xFFFF9500) // Orange for channels too
|
|
else -> colorScheme.primary
|
|
},
|
|
fontFamily = FontFamily.Monospace,
|
|
fontSize = 14.sp
|
|
)
|
|
|
|
Spacer(modifier = Modifier.width(8.dp))
|
|
|
|
// Text input
|
|
BasicTextField(
|
|
value = value,
|
|
onValueChange = onValueChange,
|
|
textStyle = MaterialTheme.typography.bodyMedium.copy(
|
|
color = colorScheme.primary,
|
|
fontFamily = FontFamily.Monospace
|
|
),
|
|
cursorBrush = SolidColor(colorScheme.primary),
|
|
keyboardOptions = KeyboardOptions(imeAction = ImeAction.Send),
|
|
keyboardActions = KeyboardActions(onSend = { onSend() }),
|
|
visualTransformation = SlashCommandVisualTransformation(),
|
|
modifier = Modifier
|
|
.weight(1f)
|
|
.onFocusChanged { focusState ->
|
|
isFocused.value = focusState.isFocused
|
|
}
|
|
)
|
|
|
|
Spacer(modifier = Modifier.width(8.dp)) // Reduced spacing
|
|
|
|
// Update send button to match input field colors
|
|
IconButton(
|
|
onClick = onSend,
|
|
modifier = Modifier.size(32.dp)
|
|
) {
|
|
Box(
|
|
modifier = Modifier
|
|
.size(30.dp)
|
|
.background(
|
|
color = if (selectedPrivatePeer != null || currentChannel != null) {
|
|
// Orange for both private messages and channels to match nickname color
|
|
Color(0xFFFF9500).copy(alpha = 0.75f)
|
|
} else if (colorScheme.background == Color.Black) {
|
|
Color(0xFF00FF00).copy(alpha = 0.75f) // Bright green for dark theme
|
|
} else {
|
|
Color(0xFF008000).copy(alpha = 0.75f) // Dark green for light theme
|
|
},
|
|
shape = CircleShape
|
|
),
|
|
contentAlignment = Alignment.Center
|
|
) {
|
|
Icon(
|
|
imageVector = Icons.Filled.KeyboardArrowRight,
|
|
contentDescription = "Send message",
|
|
modifier = Modifier.size(20.dp),
|
|
tint = if (selectedPrivatePeer != null || currentChannel != null) {
|
|
// Black arrow on orange for both private and channel modes
|
|
Color.Black
|
|
} else if (colorScheme.background == Color.Black) {
|
|
Color.Black // Black arrow on bright green in dark theme
|
|
} else {
|
|
Color.White // White arrow on dark green in light theme
|
|
}
|
|
)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
@Composable
|
|
fun CommandSuggestionsBox(
|
|
suggestions: List<CommandSuggestion>,
|
|
onSuggestionClick: (CommandSuggestion) -> Unit,
|
|
modifier: Modifier = Modifier
|
|
) {
|
|
val colorScheme = MaterialTheme.colorScheme
|
|
|
|
Column(
|
|
modifier = modifier
|
|
.background(colorScheme.surface)
|
|
.border(1.dp, colorScheme.outline.copy(alpha = 0.3f), RoundedCornerShape(4.dp))
|
|
.padding(vertical = 8.dp)
|
|
) {
|
|
suggestions.forEach { suggestion: CommandSuggestion ->
|
|
CommandSuggestionItem(
|
|
suggestion = suggestion,
|
|
onClick = { onSuggestionClick(suggestion) }
|
|
)
|
|
}
|
|
}
|
|
}
|
|
|
|
@Composable
|
|
fun CommandSuggestionItem(
|
|
suggestion: CommandSuggestion,
|
|
onClick: () -> Unit
|
|
) {
|
|
val colorScheme = MaterialTheme.colorScheme
|
|
|
|
Row(
|
|
modifier = Modifier
|
|
.fillMaxWidth()
|
|
.clickable { onClick() }
|
|
.padding(horizontal = 12.dp, vertical = 3.dp)
|
|
.background(Color.Gray.copy(alpha = 0.1f)),
|
|
verticalAlignment = Alignment.CenterVertically
|
|
) {
|
|
// Show all aliases together
|
|
val allCommands = if (suggestion.aliases.isNotEmpty()) {
|
|
listOf(suggestion.command) + suggestion.aliases
|
|
} else {
|
|
listOf(suggestion.command)
|
|
}
|
|
|
|
Text(
|
|
text = allCommands.joinToString(", "),
|
|
style = MaterialTheme.typography.bodySmall.copy(
|
|
fontFamily = FontFamily.Monospace,
|
|
fontWeight = FontWeight.Medium
|
|
),
|
|
color = colorScheme.primary,
|
|
fontSize = 11.sp
|
|
)
|
|
|
|
// Show syntax if any
|
|
suggestion.syntax?.let { syntax ->
|
|
Spacer(modifier = Modifier.width(8.dp))
|
|
Text(
|
|
text = syntax,
|
|
style = MaterialTheme.typography.bodySmall.copy(
|
|
fontFamily = FontFamily.Monospace
|
|
),
|
|
color = colorScheme.onSurface.copy(alpha = 0.8f),
|
|
fontSize = 10.sp
|
|
)
|
|
}
|
|
|
|
Spacer(modifier = Modifier.weight(1f))
|
|
|
|
// Show description
|
|
Text(
|
|
text = suggestion.description,
|
|
style = MaterialTheme.typography.bodySmall.copy(
|
|
fontFamily = FontFamily.Monospace
|
|
),
|
|
color = colorScheme.onSurface.copy(alpha = 0.7f),
|
|
fontSize = 10.sp,
|
|
maxLines = 1,
|
|
overflow = TextOverflow.Ellipsis
|
|
)
|
|
}
|
|
}
|