IntenseFinance/simplex-chat
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

android: improve group invitations design (#830)

Browse Source
This commit is contained in:
JRoberts
2022-07-22 12:28:02 +04:00
committed by GitHub
parent 8469f921b7
commit 348ff612e9
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIGroupInvitationView.kt
View File

@@ -44,12 +44,15 @@ fun CIGroupInvitationView(
Row(
Modifier
.defaultMinSize(minWidth = 220.dp)
.padding(top = 4.dp, bottom = 12.dp)
.padding(horizontal = 2.dp)
.padding(bottom = 3.dp)
.padding(end = 2.dp)
) {
ProfileImage(size = 60.dp, icon = Icons.Filled.SupervisedUserCircle, color = iconColor)
Spacer(Modifier.padding(horizontal = 4.dp))
Column {
Spacer(Modifier.padding(horizontal = 3.dp))
Column(
Modifier.defaultMinSize(minHeight = 60.dp),
verticalArrangement = Arrangement.Center
) {
Text(p.displayName, style = MaterialTheme.typography.caption, fontWeight = FontWeight.Medium, maxLines = 2, overflow = TextOverflow.Ellipsis)
if (p.fullName != "" && p.displayName != p.fullName) {
Text(p.fullName, maxLines = 2, overflow = TextOverflow.Ellipsis)
@@ -82,7 +85,7 @@ fun CIGroupInvitationView(
Box(
Modifier
.width(IntrinsicSize.Min)
.padding(vertical = 6.dp, horizontal = 12.dp),
.padding(vertical = 3.dp, horizontal = 12.dp),
contentAlignment = Alignment.BottomEnd
) {
Column(
@@ -92,7 +95,7 @@ fun CIGroupInvitationView(
horizontalAlignment = Alignment.Start
) {
groupInfoView()
Divider(Modifier.fillMaxWidth().padding(bottom = 8.dp))
Divider(Modifier.fillMaxWidth().padding(bottom = 4.dp))
if (action) {
groupInvitationText()
Text(stringResource(R.string.group_invitation_tap_to_join), color = MaterialTheme.colors.primary)

6
apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ChatPreviewView.kt
View File

@@ -86,8 +86,10 @@ fun ChatPreviewView(chat: Chat, stopped: Boolean) {
Text(stringResource(R.string.contact_connection_pending), color = HighOrLowlight)
}
is ChatInfo.Group ->
if (cInfo.groupInfo.membership.memberStatus == GroupMemberStatus.MemAccepted) {
Text(stringResource(R.string.group_connection_pending), color = HighOrLowlight)
when (cInfo.groupInfo.membership.memberStatus) {
GroupMemberStatus.MemInvited -> Text(stringResource(R.string.you_are_invited_to_group))
GroupMemberStatus.MemAccepted -> Text(stringResource(R.string.group_connection_pending), color = HighOrLowlight)
else -> {}
}
else -> {}
}