android-apps-mirrors/SimpleX-Chat
0
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2025-06-28 20:29:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

align more

Browse source
This commit is contained in:
spaced4ndy 2025-06-27 13:22:29 +04:00
parent 86953de2f4
commit a7a2d53a7e
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt
View file

@ -1677,8 +1677,8 @@ data class Contact(
val active get() = contactStatus == ContactStatus.Active val active get() = contactStatus == ContactStatus.Active
override val nextConnect get() = sendMsgToConnect override val nextConnect get() = sendMsgToConnect
val nextSendGrpInv get() = contactGroupMemberId != null && !contactGrpInvSent val nextSendGrpInv get() = contactGroupMemberId != null && !contactGrpInvSent
val nextConnectPrepared get() = preparedContact != null && activeConn == null val nextConnectPrepared get() = preparedContact != null && (activeConn == null || activeConn.connStatus == ConnStatus.Prepared)
val nextAcceptContactRequest get() = contactRequestId != null && activeConn == null val nextAcceptContactRequest get() = contactRequestId != null && (activeConn == null || activeConn.connStatus == ConnStatus.New)
val sendMsgToConnect get() = nextSendGrpInv || nextConnectPrepared val sendMsgToConnect get() = nextSendGrpInv || nextConnectPrepared
override val incognito get() = contactConnIncognito override val incognito get() = contactConnIncognito
override fun featureEnabled(feature: ChatFeature) = when (feature) { override fun featureEnabled(feature: ChatFeature) = when (feature) {

2
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ComposeView.kt
View file

@ -511,6 +511,7 @@ fun ComposeView(
withContext(Dispatchers.Main) { withContext(Dispatchers.Main) {
chatsCtx.updateContact(chat.remoteHostId, contact) chatsCtx.updateContact(chat.remoteHostId, contact)
clearState() clearState()
chatModel.setContactNetworkStatus(contact, NetworkStatus.Connected())
} }
} }
} }
@ -523,6 +524,7 @@ fun ComposeView(
withContext(Dispatchers.Main) { withContext(Dispatchers.Main) {
chatsCtx.updateContact(chat.remoteHostId, contact) chatsCtx.updateContact(chat.remoteHostId, contact)
clearState() clearState()
chatModel.setContactNetworkStatus(contact, NetworkStatus.Connected())
} }
} }
} }

5
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatPreviewView.kt
View file

@ -346,7 +346,10 @@ fun ChatPreviewView(
@Composable @Composable
fun chatStatusImage() { fun chatStatusImage() {
if (cInfo is ChatInfo.Direct) { if (cInfo is ChatInfo.Direct) {
if (cInfo.contact.active && cInfo.contact.activeConn != null) { if (
cInfo.contact.active &&
(cInfo.contact.activeConn?.connStatus == ConnStatus.Ready || cInfo.contact.activeConn?.connStatus == ConnStatus.SndReady)
) {
val descr = contactNetworkStatus?.statusString val descr = contactNetworkStatus?.statusString
when (contactNetworkStatus) { when (contactNetworkStatus) {
is NetworkStatus.Connected -> is NetworkStatus.Connected ->