Skip to content

[ticket 640] added nickname to note #687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AleksPlekhov wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[ticket 640] added nickname to note #687

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad6b745
[ticket 640] added nickname to note
AleksPlekhov Mar 26, 2026
7863d25
[640] added check for empty value
AleksPlekhov Apr 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 26 additions & 5 deletions app/src/main/java/com/bitchat/android/ui/LocationNotesSheet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ fun LocationNotesSheet(
onDraftChange = { draft = it },
sendButtonEnabled = sendButtonEnabled,
accentGreen = accentGreen,
nickname = nickname,
onSend = {
val content = draft.trim()
if (content.isNotEmpty()) {
Expand Down Expand Up @@ -451,19 +452,38 @@ private fun LocationNotesInputSection(
onDraftChange: (String) -> Unit,
sendButtonEnabled: Boolean,
accentGreen: Color,
nickname: String?,
onSend: () -> Unit
) {
val isDark = isSystemInDarkTheme()
val colorScheme = MaterialTheme.colorScheme
Row(

Column(
modifier = Modifier
.fillMaxWidth()
.background(color = colorScheme.background)
.padding(horizontal = 12.dp, vertical = 8.dp), // Match main chat padding
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(8.dp) // Match main chat spacing
.padding(horizontal = 12.dp, vertical = 8.dp)
) {
if (nickname != null) {
Comment thread
AleksPlekhov marked this conversation as resolved.
Outdated
val baseName = nickname.split("#", limit = 2).firstOrNull() ?: nickname
Row(verticalAlignment = Alignment.CenterVertically) {
Text(
text = "@$baseName",
fontFamily = FontFamily.Monospace,
fontSize = 12.sp,
fontWeight = FontWeight.SemiBold,
color = colorScheme.onSurface
)
Spacer(modifier = Modifier.width(4.dp))
}
Spacer(modifier = Modifier.height(4.dp))
}

Row(
modifier = Modifier.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(8.dp)
) {
// Text input with placeholder overlay (matches main chat exactly)
Box(
modifier = Modifier.weight(1f)
Expand Down Expand Up @@ -532,6 +552,7 @@ private fun LocationNotesInputSection(
}
}
}
}
}

/**
Expand Down