From d91504ba22910b0955c9491f1e3f14e7622ab820 Mon Sep 17 00:00:00 2001 From: Evgenii Kozlov Date: Fri, 16 May 2025 00:11:38 +0200 Subject: [PATCH 1/2] DROID-3622 DI fixes --- .../anytype/presentation/home/HomeScreenViewModel.kt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/home/HomeScreenViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/home/HomeScreenViewModel.kt index 8a416bb987..3b1fcf131b 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/home/HomeScreenViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/home/HomeScreenViewModel.kt @@ -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 @@ -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(), Reducer, WidgetActiveViewStateHolder by widgetActiveViewStateHolder, @@ -464,6 +466,7 @@ class HomeScreenViewModel( combine( flows = buildList> { add(spaceWidgetView) + add(spaceChatWidgetContainer.view) addAll(list.map { m -> m.view }) } ) { array -> @@ -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 create(modelClass: Class): T = HomeScreenViewModel( @@ -2671,7 +2675,8 @@ class HomeScreenViewModel( getSpaceInviteLink = getSpaceInviteLink, deleteSpace = this@Factory.deleteSpace, spaceMembers = activeSpaceMemberSubscriptionContainer, - setAsFavourite = setObjectListIsFavorite + setAsFavourite = setObjectListIsFavorite, + spaceChatWidgetContainer = spaceChatWidgetContainer ) as T } From 89ea96b0cedbfd77a739b0bd53c8c371f70e62d7 Mon Sep 17 00:00:00 2001 From: Evgenii Kozlov Date: Fri, 16 May 2025 00:13:06 +0200 Subject: [PATCH 2/2] DROID-3622 fixes --- .../anytype/presentation/widgets/SpaceChatWidgetContainer.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/widgets/SpaceChatWidgetContainer.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/widgets/SpaceChatWidgetContainer.kt index 1cf70f87ed..fa5b13aa40 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/widgets/SpaceChatWidgetContainer.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/widgets/SpaceChatWidgetContainer.kt @@ -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 = flowOf( WidgetView.SpaceChat )