dandri/simplex-chat
1
0 Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-10-22 13:11:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

core, ui: admission message (#5848)

Browse Source
This commit is contained in:
spaced4ndy authored and GitHub committed 2025-04-24 16:29:27 +00:00
1 parent 5262b8caca
commit 18fa5dbf04
9 files changed
+48 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt
+3 -1
View File
@@ -2569,7 +2569,7 @@ data class ChatItem (
else -> CIMergeCategory.RcvGroupEvent
}
is CIContent.SndGroupEventContent -> when (content.sndGroupEvent) {
is SndGroupEvent.UserRole, is SndGroupEvent.UserLeft -> null
is SndGroupEvent.UserRole, is SndGroupEvent.UserLeft, is SndGroupEvent.UserPendingReview -> null
else -> CIMergeCategory.SndGroupEvent
}
else -> {
@@ -4349,6 +4349,7 @@ sealed class SndGroupEvent() {
@Serializable @SerialName("memberDeleted") class MemberDeleted(val groupMemberId: Long, val profile: Profile): SndGroupEvent()
@Serializable @SerialName("userLeft") class UserLeft(): SndGroupEvent()
@Serializable @SerialName("groupUpdated") class GroupUpdated(val groupProfile: GroupProfile): SndGroupEvent()
@Serializable @SerialName("userPendingReview") class UserPendingReview(): SndGroupEvent()
val text: String get() = when (this) {
is MemberRole -> String.format(generalGetString(MR.strings.snd_group_event_changed_member_role), profile.profileViewName, role.text)
@@ -4361,6 +4362,7 @@ sealed class SndGroupEvent() {
is MemberDeleted -> String.format(generalGetString(MR.strings.snd_group_event_member_deleted), profile.profileViewName)
is UserLeft -> generalGetString(MR.strings.snd_group_event_user_left)
is GroupUpdated -> generalGetString(MR.strings.snd_group_event_group_profile_updated)
is UserPendingReview -> generalGetString(MR.strings.snd_group_event_user_pending_review)
}
}
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.kt
+13 -1
View File
@@ -636,6 +636,15 @@ fun ChatItemView(
CIEventView(eventItemViewText(reversedChatItems))
}
@Composable fun UserPendingReviewEventItemView() {
Text(
buildAnnotatedString {
withStyle(chatEventStyle.copy(fontWeight = FontWeight.Bold)) { append(cItem.content.text) }
},
Modifier.padding(horizontal = 6.dp, vertical = 6.dp)
)
}
@Composable
fun DeletedItem() {
MarkedDeletedItemView(chatsCtx, cItem, cInfo, cInfo.timedMessagesTTL, revealed, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
@@ -717,7 +726,10 @@ fun ChatItemView(
MsgContentItemDropdownMenu()
}
is CIContent.SndGroupEventContent -> {
EventItemView()
when (c.sndGroupEvent) {
is SndGroupEvent.UserPendingReview -> UserPendingReviewEventItemView()
else -> EventItemView()
}
MsgContentItemDropdownMenu()
}
is CIContent.RcvConnEventContent -> {
apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml
+1
View File
@@ -1594,6 +1594,7 @@
<string name="snd_group_event_member_deleted">you removed %1$s</string>
<string name="snd_group_event_user_left">you left</string>
<string name="snd_group_event_group_profile_updated">group profile updated</string>
<string name="snd_group_event_user_pending_review">Please wait for group moderators to review your request to join the group.</string>
<string name="rcv_group_event_1_member_connected">%s connected</string>
<string name="rcv_group_event_2_members_connected">%s and %s connected</string>