dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-08-29 09:49:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui: rejected group previews (#5665)

Browse Source
This commit is contained in:
spaced4ndy
2025-02-26 09:27:43 +00:00
committed by Evgeny Poberezkin
parent f701ffa4e0
commit 1fcb352db4
5 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt
+5
View File
@@ -1910,6 +1910,7 @@ data class GroupMember (
}
val memberActive: Boolean get() = when (this.memberStatus) {
GroupMemberStatus.MemRejected -> false
GroupMemberStatus.MemRemoved -> false
GroupMemberStatus.MemLeft -> false
GroupMemberStatus.MemGroupDeleted -> false
@@ -1925,6 +1926,7 @@ data class GroupMember (
}
val memberCurrent: Boolean get() = when (this.memberStatus) {
GroupMemberStatus.MemRejected -> false
GroupMemberStatus.MemRemoved -> false
GroupMemberStatus.MemLeft -> false
GroupMemberStatus.MemGroupDeleted -> false
@@ -2028,6 +2030,7 @@ enum class GroupMemberCategory {
@Serializable
enum class GroupMemberStatus {
@SerialName("rejected") MemRejected,
@SerialName("removed") MemRemoved,
@SerialName("left") MemLeft,
@SerialName("deleted") MemGroupDeleted,
@@ -2042,6 +2045,7 @@ enum class GroupMemberStatus {
@SerialName("creator") MemCreator;
val text: String get() = when (this) {
MemRejected -> generalGetString(MR.strings.group_member_status_rejected)
MemRemoved -> generalGetString(MR.strings.group_member_status_removed)
MemLeft -> generalGetString(MR.strings.group_member_status_left)
MemGroupDeleted -> generalGetString(MR.strings.group_member_status_group_deleted)
@@ -2057,6 +2061,7 @@ enum class GroupMemberStatus {
}
val shortText: String get() = when (this) {
MemRejected -> generalGetString(MR.strings.group_member_status_rejected)
MemRemoved -> generalGetString(MR.strings.group_member_status_removed)
MemLeft -> generalGetString(MR.strings.group_member_status_left)
MemGroupDeleted -> generalGetString(MR.strings.group_member_status_group_deleted)
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatPreviewView.kt
+3 -1
View File
@@ -70,6 +70,7 @@ fun ChatPreviewView(
}
is ChatInfo.Group ->
when (cInfo.groupInfo.membership.memberStatus) {
GroupMemberStatus.MemRejected -> inactiveIcon()
GroupMemberStatus.MemLeft -> inactiveIcon()
GroupMemberStatus.MemRemoved -> inactiveIcon()
GroupMemberStatus.MemGroupDeleted -> inactiveIcon()
@@ -156,7 +157,7 @@ fun ChatPreviewView(
else
if (chat.chatInfo.incognito) Indigo else MaterialTheme.colors.primary
)
GroupMemberStatus.MemAccepted -> chatPreviewTitleText(MaterialTheme.colors.secondary)
GroupMemberStatus.MemAccepted, GroupMemberStatus.MemRejected -> chatPreviewTitleText(MaterialTheme.colors.secondary)
else -> chatPreviewTitleText(
if (deleting)
MaterialTheme.colors.secondary
@@ -237,6 +238,7 @@ fun ChatPreviewView(
}
is ChatInfo.Group ->
when (cInfo.groupInfo.membership.memberStatus) {
GroupMemberStatus.MemRejected -> Text(stringResource(MR.strings.group_preview_rejected))
GroupMemberStatus.MemInvited -> Text(groupInvitationPreviewText(currentUserProfileDisplayName, cInfo.groupInfo))
GroupMemberStatus.MemAccepted -> Text(stringResource(MR.strings.group_connection_pending), color = MaterialTheme.colors.secondary)
else -> {}
apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml
+2
View File
@@ -418,6 +418,7 @@
<string name="member_contact_send_direct_message">send direct message</string>
<string name="group_preview_you_are_invited">you are invited to group</string>
<string name="group_preview_join_as">join as %s</string>
<string name="group_preview_rejected">rejected</string>
<string name="group_connection_pending">connecting…</string>
<string name="tap_to_start_new_chat">Tap to start a new chat</string>
<string name="chat_with_developers">Chat with the developers</string>
@@ -1622,6 +1623,7 @@
<string name="group_member_role_owner">owner</string>
<!-- GroupMemberStatus -->
<string name="group_member_status_rejected">rejected</string>
<string name="group_member_status_removed">removed</string>
<string name="group_member_status_left">left</string>
<string name="group_member_status_group_deleted">group deleted</string>