From 0930d80f39bcc6d06c25ce814ecea49c3688f3c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=BCrten?= <sebastian@mobanisto.de>
Date: Tue, 18 Jan 2022 11:05:02 +0100
Subject: [PATCH] Don't display no contacts screen when search returns no
results
---
.../briarproject/briar/desktop/contact/ContactsViewModel.kt | 4 ++++
.../briar/desktop/conversation/PrivateMessageScreen.kt | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactsViewModel.kt b/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactsViewModel.kt
index 848ab77a18..344c1a5b3b 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactsViewModel.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactsViewModel.kt
@@ -43,6 +43,10 @@ abstract class ContactsViewModel(
private val _fullContactList = mutableStateListOf<BaseContactItem>()
+ val noContactsYet = derivedStateOf {
+ _fullContactList.isEmpty()
+ }
+
val contactList = derivedStateOf {
_fullContactList.filter(::filterContactItem).sortedByDescending { it.timestamp }
}
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/conversation/PrivateMessageScreen.kt b/src/main/kotlin/org/briarproject/briar/desktop/conversation/PrivateMessageScreen.kt
index 67554765f3..321e7a6a93 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/conversation/PrivateMessageScreen.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/conversation/PrivateMessageScreen.kt
@@ -46,7 +46,7 @@ fun PrivateMessageScreen(
var isContactDialogVisible by remember { mutableStateOf(false) }
if (isContactDialogVisible) AddContactDialog(onClose = { isContactDialogVisible = false })
- if (viewModel.contactList.value.isEmpty()) {
+ if (viewModel.noContactsYet.value) {
NoContactsYet(onContactAdd = { isContactDialogVisible = true })
return
}
--
GitLab