From e26810d8149bda9669513cd12e55d287f9cb7134 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 22 Sep 2022 09:29:10 -0300
Subject: [PATCH] Don't treat no forum filter results as the user having no
forums
---
.../kotlin/org/briarproject/briar/desktop/forums/ForumScreen.kt | 2 +-
.../org/briarproject/briar/desktop/forums/ForumViewModel.kt | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/forums/ForumScreen.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/forums/ForumScreen.kt
index 55b598364c..91ce4ac692 100644
--- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/forums/ForumScreen.kt
+++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/forums/ForumScreen.kt
@@ -49,7 +49,7 @@ fun ForumScreen(
onCancelButtonClicked = { addDialogVisible.value = false }
)
- if (viewModel.forumList.value.isEmpty()) {
+ if (viewModel.noForumsYet.value) {
NoForumsYet { addDialogVisible.value = true }
} else {
Row(modifier = Modifier.fillMaxWidth()) {
diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/forums/ForumViewModel.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/forums/ForumViewModel.kt
index cb766dfa20..5b3e28d083 100644
--- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/forums/ForumViewModel.kt
+++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/forums/ForumViewModel.kt
@@ -77,6 +77,8 @@ class ForumViewModel @Inject constructor(
}.sortedByDescending { it.timestamp }
}
+ val noForumsYet = derivedStateOf { _fullForumList.isEmpty() }
+
private val _selectedGroupItem = mutableStateOf<GroupItem?>(null)
val selectedGroupItem = _selectedGroupItem.asState()
--
GitLab