anyproto/anytype-kotlin
1
0
Fork 0
mirror of https://github.com/anyproto/anytype-kotlin.git synced 2025-06-08 05:47:05 +09:00
Code Activity

DROID-3626 Space chat | Prohibit adding a chat widget + ui improvements (#2511)

Browse source
This commit is contained in:
Konstantin Ivanov 2025-06-06 15:48:31 +02:00 • committed by GitHub
parent 78853bf951
commit a4e5d16e16
Signed by: github
GPG key ID: B5690EEEBB952194
4 changed files with 51 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

25
presentation/src/main/java/com/anytypeio/anytype/presentation/widgets/SelectWidgetSourceViewModel.kt
View file

@ -10,6 +10,7 @@ import com.anytypeio.anytype.core_models.DVFilterCondition
import com.anytypeio.anytype.core_models.Id
import com.anytypeio.anytype.core_models.ObjectType
import com.anytypeio.anytype.core_models.Relations
import com.anytypeio.anytype.core_models.multiplayer.SpaceUxType
import com.anytypeio.anytype.core_models.widgets.BundledWidgetSourceIds
import com.anytypeio.anytype.domain.base.Resultat
import com.anytypeio.anytype.domain.base.fold
@ -73,13 +74,15 @@ class SelectWidgetSourceViewModel(
var config : Config = Config.None
val viewState = flow {
val hasChat = !spaceViews.get(vmParams.space)?.chatId.isNullOrEmpty()
emitAll(
combine(
stateData
.asFlow(),
suggested.filterIsInstance<SuggestedWidgetsState.Default>()
) { state, suggested ->
stateData.asFlow(),
suggested.filterIsInstance<SuggestedWidgetsState.Default>(),
spaceViews.observe(vmParams.space)
) { state, suggested, spaceView ->
val hasChat = !spaceView.chatId.isNullOrEmpty()
val isChatSpace = spaceView.spaceUxType == SpaceUxType.CHAT
when(state) {
is ObjectSearchView.Success -> {
state.copy(
@ -89,7 +92,8 @@ class SelectWidgetSourceViewModel(
resolveSuggestedResults(
suggested = suggested,
query = query,
hasChat = hasChat
hasChat = hasChat,
isChatSpace = isChatSpace
)
)
// Widgets from existing objects
@ -105,7 +109,8 @@ class SelectWidgetSourceViewModel(
resolveSuggestedResults(
suggested = suggested,
query = query,
hasChat = hasChat
hasChat = hasChat,
isChatSpace = isChatSpace
)
)
}
@ -135,7 +140,8 @@ class SelectWidgetSourceViewModel(
private fun resolveSuggestedResults(
suggested: SuggestedWidgetsState.Default,
query: String,
hasChat: Boolean
hasChat: Boolean,
isChatSpace: Boolean
) = buildList {
// Adding system widgets if matched by query
@ -152,7 +158,8 @@ class SelectWidgetSourceViewModel(
if (contains(BundledWidgetSourceIds.ALL_OBJECTS)) {
add(BundledWidgetSourceView.AllObjects)
}
if (contains(BundledWidgetSourceIds.CHAT) && hasChat) {
// Chat widget can only be added if the space has chat AND is not a chat space itself
if (contains(BundledWidgetSourceIds.CHAT) && hasChat && !isChatSpace) {
add(BundledWidgetSourceView.Chat)
}
if (contains(BundledWidgetSourceIds.RECENT)) {