jeka/utun2
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move Android message action to member details and translate radio call UI

Browse Source
This commit is contained in:
evgeny committed 2026-10-19 14:03:24 +02:00
1 parent 25376197db
commit b57c8e5041
3 files changed
+41 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tools/chatgui-android/app/src/main/java/com/utun/chat/ui/screens/MemberListScreen.kt
+13 -9
View File
@@ -109,7 +109,6 @@ fun MemberListScreen(
onClick = { viewModel.showMemberDetail(channel.id, m.nodeId) },
onCall = { viewModel.startCall(channel.id, m.nodeId, m.name) },
onRadioCall = { com.utun.chat.data.RadioCallController.start(channel.id, m.nodeId) },
onMessage = { viewModel.startDm(channel.id, m.nodeId, m.name) },
onRadioMute = { viewModel.toggleMemberRadioMute(channel.id, m.nodeId) }
)
}
@@ -130,6 +129,7 @@ fun MemberListScreen(
canEdit = member != null,
onFiles = { onFiles(detail.nodeId) },
onInvite = { viewModel.showPmInvite(detail.nodeId, member?.name ?: detail.name, channel.id) },
onMessage = { viewModel.startDm(channel.id, detail.nodeId, member?.name ?: detail.name) },
onConnect = {
Log.i("utun-gui", "Member detail connect: channel=${channel.id} node=${detail.nodeId}")
viewModel.connectMemberNode(channel.id, detail.nodeId)
@@ -184,7 +184,6 @@ private fun MemberListItem(
onClick: () -> Unit,
onCall: () -> Unit,
onRadioCall: () -> Unit,
onMessage: () -> Unit,
onRadioMute: () -> Unit
) {
val onlineColor = when {
@@ -283,9 +282,6 @@ private fun MemberListItem(
IconButton(onClick = onCall, enabled = member.online, modifier = actionModifier) {
Icon(Icons.Filled.Call, stringResource(R.string.call))
}
IconButton(onClick = onMessage, modifier = actionModifier) {
Icon(Icons.AutoMirrored.Filled.Message, stringResource(R.string.message))
}
}
}
}
@@ -307,6 +303,7 @@ private fun MemberDetailCard(
canEdit: Boolean,
onFiles: () -> Unit,
onInvite: () -> Unit,
onMessage: () -> Unit,
onConnect: () -> Unit,
onEdit: () -> Unit
) {
@@ -401,10 +398,17 @@ private fun MemberDetailCard(
}
if (!isSelf) {
TextButton(onClick = onInvite) {
Icon(Icons.Filled.Add, stringResource(R.string.invite_to_group))
Spacer(Modifier.width(4.dp))
Text(stringResource(R.string.invite_to_group))
Row(verticalAlignment = Alignment.CenterVertically) {
TextButton(onClick = onMessage) {
Icon(Icons.AutoMirrored.Filled.Message, stringResource(R.string.message))
Spacer(Modifier.width(4.dp))
Text(stringResource(R.string.message))
}
TextButton(onClick = onInvite) {
Icon(Icons.Filled.Add, stringResource(R.string.invite_to_group))
Spacer(Modifier.width(4.dp))
Text(stringResource(R.string.invite_to_group))
}
}
}
Spacer(Modifier.height(4.dp))