Show senders in MAX group chats
This commit is contained in:
@@ -22,8 +22,8 @@ android {
|
||||
applicationId = "xyz.kusoft.qmax"
|
||||
minSdk = 26
|
||||
targetSdk = 36
|
||||
versionCode = 59
|
||||
versionName = "1.0.2"
|
||||
versionCode = 60
|
||||
versionName = "1.0.3"
|
||||
|
||||
buildConfigField("String", "QMAX_DEFAULT_SERVER_URL", "\"https://qmax.kusoft.xyz\"")
|
||||
buildConfigField("String", "QMAX_DEFAULT_PAIRING_CODE", "\"qmax-MxRq4h2HQBEIFs6k\"")
|
||||
|
||||
@@ -689,6 +689,14 @@ private fun ChatListScreen(
|
||||
}
|
||||
}
|
||||
|
||||
LaunchedEffect(state.session?.userName) {
|
||||
if (state.session != null &&
|
||||
ContextCompat.checkSelfPermission(context, Manifest.permission.READ_CONTACTS) == PackageManager.PERMISSION_GRANTED
|
||||
) {
|
||||
importPhoneContacts()
|
||||
}
|
||||
}
|
||||
|
||||
TelegramChatListContent(
|
||||
state = state,
|
||||
filteredChats = filteredChats,
|
||||
@@ -4013,6 +4021,7 @@ private fun ChatScreen(vm: QMaxViewModel) {
|
||||
is TimelineItem.Day -> DaySeparator(item.label)
|
||||
is TimelineItem.Message -> MessageRow(
|
||||
message = item.message,
|
||||
showSenderName = chat.kind.equals("Group", ignoreCase = true),
|
||||
session = session,
|
||||
vm = vm,
|
||||
imagePreviewSources = imagePreviewSources,
|
||||
@@ -4776,6 +4785,7 @@ private fun LinkifiedMessageText(
|
||||
@Composable
|
||||
private fun MessageRow(
|
||||
message: MessageDto,
|
||||
showSenderName: Boolean,
|
||||
session: QMaxSession,
|
||||
vm: QMaxViewModel,
|
||||
imagePreviewSources: List<String>,
|
||||
@@ -4850,6 +4860,19 @@ private fun MessageRow(
|
||||
Column(
|
||||
modifier = bubbleModifier
|
||||
) {
|
||||
if (showSenderName && !outgoing) {
|
||||
message.senderName?.takeIf { it.isNotBlank() }?.let { senderName ->
|
||||
Text(
|
||||
text = senderName,
|
||||
color = QMaxBlue,
|
||||
style = MaterialTheme.typography.labelMedium,
|
||||
fontWeight = FontWeight.SemiBold,
|
||||
maxLines = 1,
|
||||
overflow = TextOverflow.Ellipsis,
|
||||
modifier = Modifier.padding(start = 8.dp, end = 8.dp, top = 6.dp, bottom = 2.dp)
|
||||
)
|
||||
}
|
||||
}
|
||||
message.forwardedFrom?.takeIf { it.isNotBlank() }?.let {
|
||||
ForwardedFromBlock(
|
||||
name = it,
|
||||
|
||||
Reference in New Issue
Block a user