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

android: fix interactions for member w/t contact - verify/fix connection buttons visible, member info can be opened via avatar in chat view (#2727)

Browse Source
This commit is contained in:
spaced4ndy
2023-07-19 21:12:48 +04:00
committed by GitHub
parent 572e3b7d32
commit 1aedfd6e5a
2 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/ChatView.kt
View File

@@ -713,19 +713,14 @@ fun BoxWithConstraintsScope.ChatItemsList(
val showMember = showMemberImage(member, prevItem)
Row(Modifier.padding(start = 8.dp, end = if (voiceWithTransparentBack) 12.dp else 66.dp).then(swipeableModifier)) {
if (showMember) {
val contactId = member.memberContactId
if (contactId == null) {
Box(
Modifier
.clip(CircleShape)
.clickable {
showMemberInfo(chat.chatInfo.groupInfo, member)
}
) {
MemberImage(member)
} else {
Box(
Modifier
.clip(CircleShape)
.clickable {
showMemberInfo(chat.chatInfo.groupInfo, member)
}
) {
MemberImage(member)
}
}
Spacer(Modifier.size(4.dp))
} else {

22
apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/group/GroupMemberInfoView.kt
View File

@@ -242,22 +242,22 @@ fun GroupMemberInfoLayout(
val contactId = member.memberContactId
if (member.memberActive) {
if (contactId != null) {
SectionView {
SectionView {
if (contactId != null) {
if (knownDirectChat(contactId) != null || groupInfo.fullGroupPreferences.directMessages.on) {
OpenChatButton(onClick = { openDirectChat(contactId) })
}
if (connectionCode != null) {
VerifyCodeButton(member.verified, verifyClicked)
}
if (cStats != null && cStats.ratchetSyncAllowed) {
SynchronizeConnectionButton(syncMemberConnection)
} else if (developerTools) {
SynchronizeConnectionButtonForce(syncMemberConnectionForce)
}
}
SectionDividerSpaced()
if (connectionCode != null) {
VerifyCodeButton(member.verified, verifyClicked)
}
if (cStats != null && cStats.ratchetSyncAllowed) {
SynchronizeConnectionButton(syncMemberConnection)
} else if (developerTools) {
SynchronizeConnectionButtonForce(syncMemberConnectionForce)
}
}
SectionDividerSpaced()
}
if (member.contactLink != null) {