Skip to content

Droid 3622 chat as system widget in shared spaces #2410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Droid 3622 chat as system widget in shared spaces #2410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d91504b
DROID-3622 DI fixes
uburoiubu May 15, 2025
89ea96b
DROID-3622 fixes
uburoiubu May 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions presentation/src/main/java/com/anytypeio/anytype/presentation/home/HomeScreenViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ import com.anytypeio.anytype.presentation.widgets.DropDownMenuAction
import com.anytypeio.anytype.presentation.widgets.LinkWidgetContainer
import com.anytypeio.anytype.presentation.widgets.ListWidgetContainer
import com.anytypeio.anytype.presentation.widgets.SpaceBinWidgetContainer
import com.anytypeio.anytype.presentation.widgets.SpaceChatWidgetContainer
import com.anytypeio.anytype.presentation.widgets.SpaceWidgetContainer
import com.anytypeio.anytype.presentation.widgets.TreePath
import com.anytypeio.anytype.presentation.widgets.TreeWidgetBranchStateHolder
Expand Down Expand Up @@ -232,7 +233,8 @@ class HomeScreenViewModel(
private val getSpaceInviteLink: GetSpaceInviteLink,
private val deleteSpace: DeleteSpace,
private val spaceMembers: ActiveSpaceMemberSubscriptionContainer,
private val setAsFavourite: SetObjectListIsFavorite
private val setAsFavourite: SetObjectListIsFavorite,
private val spaceChatWidgetContainer: SpaceChatWidgetContainer
) : NavigationViewModel<HomeScreenViewModel.Navigation>(),
Reducer<ObjectView, Payload>,
WidgetActiveViewStateHolder by widgetActiveViewStateHolder,
Expand Down Expand Up @@ -464,6 +466,7 @@ class HomeScreenViewModel(
combine(
flows = buildList<Flow<WidgetView>> {
add(spaceWidgetView)
add(spaceChatWidgetContainer.view)
addAll(list.map { m -> m.view })
}
) { array ->
Expand Down Expand Up @@ -2613,7 +2616,8 @@ class HomeScreenViewModel(
private val getSpaceInviteLink: GetSpaceInviteLink,
private val deleteSpace: DeleteSpace,
private val activeSpaceMemberSubscriptionContainer: ActiveSpaceMemberSubscriptionContainer,
private val setObjectListIsFavorite: SetObjectListIsFavorite
private val setObjectListIsFavorite: SetObjectListIsFavorite,
private val spaceChatWidgetContainer: SpaceChatWidgetContainer
) : ViewModelProvider.Factory {
@Suppress("UNCHECKED_CAST")
override fun <T : ViewModel> create(modelClass: Class<T>): T = HomeScreenViewModel(
Expand Down Expand Up @@ -2671,7 +2675,8 @@ class HomeScreenViewModel(
getSpaceInviteLink = getSpaceInviteLink,
deleteSpace = this@Factory.deleteSpace,
spaceMembers = activeSpaceMemberSubscriptionContainer,
setAsFavourite = setObjectListIsFavorite
setAsFavourite = setObjectListIsFavorite,
spaceChatWidgetContainer = spaceChatWidgetContainer
) as T
}

Expand Down
3 changes: 2 additions & 1 deletion ...tion/src/main/java/com/anytypeio/anytype/presentation/widgets/SpaceChatWidgetContainer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package com.anytypeio.anytype.presentation.widgets

import javax.inject.Inject
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.flowOf

class SpaceChatWidgetContainer : WidgetContainer {
class SpaceChatWidgetContainer @Inject constructor() : WidgetContainer {
override val view: Flow<WidgetView> = flowOf(
WidgetView.SpaceChat
)
Expand Down
Loading