feat(meeting): select participants [WPB-25049]

app/src/main/kotlin/com/wire/android/di/accountScoped/SearchModule.kt

@@ -23,9 +23,9 @@ import com.wire.kalium.logic.CoreLogic
 import com.wire.kalium.logic.data.user.UserId
 import com.wire.kalium.logic.feature.search.FederatedSearchParser
 import com.wire.kalium.logic.feature.search.IsFederationSearchAllowedUseCase
-import com.wire.kalium.logic.feature.search.SearchByHandleUseCase
+import com.wire.kalium.logic.feature.search.SearchUsersByHandleUseCase
 import com.wire.kalium.logic.feature.search.SearchScope
-import com.wire.kalium.logic.feature.search.SearchUsersUseCase
+import com.wire.kalium.logic.feature.search.SearchUsersByNameUseCase
 import dev.zacsweers.metro.BindingContainer
 import dev.zacsweers.metro.Provides
 
@@ -39,10 +39,10 @@ class SearchModule {
     ): SearchScope = coreLogic.getSessionScope(currentAccount).search
 
     @Provides
-    fun provideSearchUsersUseCase(searchScope: SearchScope): SearchUsersUseCase = searchScope.searchUsers
+    fun provideSearchUsersByNameUseCase(searchScope: SearchScope): SearchUsersByNameUseCase = searchScope.searchUsersByName
 
     @Provides
-    fun provideSearchByHandleUseCase(searchScope: SearchScope): SearchByHandleUseCase = searchScope.searchByHandle
+    fun provideSearchUsersByHandleUseCase(searchScope: SearchScope): SearchUsersByHandleUseCase = searchScope.searchUsersByHandle
 
     @Provides
     fun provideFederatedSearchParser(searchScope: SearchScope): FederatedSearchParser = searchScope.federatedSearchParser

app/src/main/kotlin/com/wire/android/navigation/MainNavHost.kt

@@ -30,14 +30,16 @@ import com.ramcosta.composedestinations.DestinationsNavHost
 import com.ramcosta.composedestinations.generated.app.destinations.ConversationScreenDestination
 import com.ramcosta.composedestinations.generated.app.destinations.NewLoginPasswordScreenDestination
 import com.ramcosta.composedestinations.generated.app.destinations.NewLoginVerificationCodeScreenDestination
+import com.ramcosta.composedestinations.generated.app.destinations.OtherUserProfileScreenDestination
 import com.ramcosta.composedestinations.generated.app.navArgs
 import com.ramcosta.composedestinations.generated.app.navgraphs.NewConversationGraph
 import com.ramcosta.composedestinations.generated.app.navgraphs.PersonalToTeamMigrationGraph
-import com.ramcosta.composedestinations.generated.cells.destinations.SearchScreenDestination
 import com.ramcosta.composedestinations.generated.app.navgraphs.WireRootGraph
 import com.ramcosta.composedestinations.generated.app.navtype.groupConversationDetailsNavBackArgsNavType
 import com.ramcosta.composedestinations.generated.app.navtype.imagesPreviewNavBackArgsNavType
 import com.ramcosta.composedestinations.generated.app.navtype.mediaGalleryNavBackArgsNavType
+import com.ramcosta.composedestinations.generated.cells.destinations.SearchScreenDestination
+import com.ramcosta.composedestinations.generated.meetings.navgraphs.NewMeetingGraph
 import com.ramcosta.composedestinations.generated.sketch.destinations.DrawingCanvasScreenDestination
 import com.ramcosta.composedestinations.generated.sketch.navtype.drawingCanvasNavBackArgsNavType
 import com.ramcosta.composedestinations.manualcomposablecalls.composable
@@ -48,12 +50,15 @@ import com.ramcosta.composedestinations.scope.resultBackNavigator
 import com.ramcosta.composedestinations.scope.resultRecipient
 import com.ramcosta.composedestinations.spec.Direction
 import com.wire.android.feature.cells.ui.cellViewModel
+import com.wire.android.feature.meetings.navigation.MeetingNavigator
+import com.wire.android.feature.meetings.ui.newMeetingViewModel
 import com.wire.android.feature.sketch.model.DrawingCanvasNavBackArgs
 import com.wire.android.navigation.transition.LocalSharedTransitionScope
 import com.wire.android.ui.authentication.loginEmailViewModel
 import com.wire.android.ui.home.conversations.ConversationScreen
 import com.wire.android.ui.home.newConversationViewModel
 import com.wire.android.ui.home.settings.teamMigrationViewModel
+import com.wire.kalium.logic.data.user.UserId
 
 @OptIn(ExperimentalAnimationApi::class, ExperimentalSharedTransitionApi::class)
 @Composable
@@ -64,6 +69,14 @@ fun MainNavHost(
     modifier: Modifier = Modifier,
 ) {
     val navHostEngine = rememberWireNavHostEngine(Alignment.Center)
+    val meetingNavigator = remember(navigator) {
+        MeetingNavigator(
+            navigator = navigator,
+            navigateToProfile = { userId: UserId ->
+                navigator.navigate(NavigationCommand(OtherUserProfileScreenDestination(userId = userId)))
+            }
+        )
+    }
     SharedTransitionLayout(modifier = modifier) {
         CompositionLocalProvider(LocalSharedTransitionScope provides this) {
             DestinationsNavHost(
@@ -80,6 +93,17 @@ fun MainNavHost(
                     // 👇 To make LoginTypeSelector available to all destinations as a non-navigation parameter if provided
                     if (loginTypeSelector != null) dependency(loginTypeSelector)
 
+                    // 👇 To tie NewConversationViewModel to nested NewConversationGraph,
+                    // making it shared between all screens that belong to it
+                    navGraph(NewConversationGraph) {
+                        val parentEntry = remember(navBackStackEntry) {
+                            navController.getBackStackEntry(NewConversationGraph.route)
+                        }
+                        dependency(
+                            newConversationViewModel(parentEntry)
+                        )
+                    }
+
                     // 👇 To reuse LoginEmailViewModel from NewLoginPasswordScreen on NewLoginVerificationCodeScreen
                     destination(NewLoginVerificationCodeScreenDestination) {
                         val loginPasswordEntry = remember(navBackStackEntry) {
@@ -118,6 +142,16 @@ fun MainNavHost(
                         }
                         dependency(teamMigrationViewModel(parentEntry))
                     }
+
+                    // 👇 To tie NewMeetingViewModel to nested NewMeetingGraph, making it shared between all screens that belong to it
+                    // Also, make MeetingNavigator available to all destinations from NewMeetingGraph as a non-navigation parameter
+                    navGraph(NewMeetingGraph) {
+                        val parentEntry = remember(navBackStackEntry) {
+                            navController.getBackStackEntry(NewMeetingGraph.route)
+                        }
+                        dependency(newMeetingViewModel(parentEntry))
+                        dependency(meetingNavigator)
+                    }
                 },
                 manualComposableCallsBuilder = {
                     /**

app/src/main/kotlin/com/wire/android/ui/home/newconversation/channelhistory/ChannelHistoryScreen.kt

@@ -17,19 +17,20 @@
  */
 package com.wire.android.ui.home.newconversation.channelhistory
 
-import com.wire.android.navigation.annotation.app.WireNewConversationDestination
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
+import com.ramcosta.composedestinations.generated.app.destinations.ChannelHistoryCustomScreenDestination
 import com.ramcosta.composedestinations.result.NavResult
 import com.ramcosta.composedestinations.result.ResultRecipient
 import com.wire.android.R
 import com.wire.android.model.Clickable
 import com.wire.android.navigation.NavigationCommand
 import com.wire.android.navigation.Navigator
+import com.wire.android.navigation.annotation.app.WireNewConversationDestination
 import com.wire.android.navigation.style.SlideNavigationAnimation
 import com.wire.android.ui.common.WirePromotionCard
 import com.wire.android.ui.common.colorsScheme
@@ -38,7 +39,6 @@ import com.wire.android.ui.common.scaffold.WireScaffold
 import com.wire.android.ui.common.topappbar.NavigationIconType
 import com.wire.android.ui.common.topappbar.WireCenterAlignedTopAppBar
 import com.wire.android.ui.common.typography
-import com.ramcosta.composedestinations.generated.app.destinations.ChannelHistoryCustomScreenDestination
 import com.wire.android.ui.home.conversations.details.options.ArrowType
 import com.wire.android.ui.home.conversations.details.options.GroupConversationOptionsItem
 import com.wire.android.ui.home.newconversation.NewConversationViewModel

app/src/main/kotlin/com/wire/android/ui/home/newconversation/groupOptions/GroupOptionsScreen.kt

@@ -19,7 +19,6 @@
 
 package com.wire.android.ui.home.newconversation.groupOptions
 
-import com.wire.android.navigation.annotation.app.WireNewConversationDestination
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -36,12 +35,18 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextDecoration
+import com.ramcosta.composedestinations.generated.app.destinations.ChannelAccessOnCreateScreenDestination
+import com.ramcosta.composedestinations.generated.app.destinations.ChannelHistoryScreenDestination
+import com.ramcosta.composedestinations.generated.app.destinations.ConversationScreenDestination
+import com.ramcosta.composedestinations.generated.app.destinations.HomeScreenDestination
+import com.ramcosta.composedestinations.generated.app.destinations.NewGroupConversationSearchPeopleScreenDestination
 import com.wire.android.BuildConfig
 import com.wire.android.R
 import com.wire.android.model.Clickable
 import com.wire.android.navigation.BackStackMode
 import com.wire.android.navigation.NavigationCommand
 import com.wire.android.navigation.Navigator
+import com.wire.android.navigation.annotation.app.WireNewConversationDestination
 import com.wire.android.ui.common.TextWithLinkSuffix
 import com.wire.android.ui.common.WireDialog
 import com.wire.android.ui.common.WireDialogButtonProperties
@@ -55,17 +60,12 @@ import com.wire.android.ui.common.topappbar.NavigationIconType
 import com.wire.android.ui.common.topappbar.WireCenterAlignedTopAppBar
 import com.wire.android.ui.common.typography
 import com.wire.android.ui.common.upgradetoapps.UpgradeToGetAppsBanner
-import com.ramcosta.composedestinations.generated.app.destinations.ChannelAccessOnCreateScreenDestination
-import com.ramcosta.composedestinations.generated.app.destinations.ChannelHistoryScreenDestination
-import com.ramcosta.composedestinations.generated.app.destinations.ConversationScreenDestination
-import com.ramcosta.composedestinations.generated.app.destinations.HomeScreenDestination
-import com.ramcosta.composedestinations.generated.app.destinations.NewGroupConversationSearchPeopleScreenDestination
 import com.wire.android.ui.home.conversations.details.options.ArrowType
 import com.wire.android.ui.home.conversations.details.options.GroupConversationOptionsItem
+import com.wire.android.ui.home.newconversation.NewConversationViewModel
 import com.wire.android.ui.home.newconversation.channelaccess.ChannelAccessType
 import com.wire.android.ui.home.newconversation.channelhistory.ChannelHistoryType
 import com.wire.android.ui.home.newconversation.channelhistory.name
-import com.wire.android.ui.home.newconversation.NewConversationViewModel
 import com.wire.android.ui.home.newconversation.common.CreateGroupErrorDialog
 import com.wire.android.ui.home.newconversation.common.CreateGroupState
 import com.wire.android.ui.home.settings.SwitchState

core/di/src/main/kotlin/com/wire/android/di/ViewModelScoped.kt

@@ -171,6 +171,12 @@ interface ScopedArgs {
 @Stable
 interface PreviewProvider {
     val previews: List<Any> get() = emptyList()
+
+    companion object {
+        fun of(vararg previews: Any) = object : PreviewProvider {
+            override val previews: List<Any> = previews.toList()
+        }
+    }
 }
 object EmptyPreviewProvider : PreviewProvider
 

core/di/src/main/kotlin/com/wire/android/di/metro/MetroViewModelGraph.kt

@@ -59,7 +59,7 @@
     key: String? = null,
     previewProvider: PreviewProvider = EmptyPreviewProvider,
     viewModelStoreOwner: ViewModelStoreOwner = checkNotNull(LocalViewModelStoreOwner.current) {
         "No ViewModelStoreOwner was provided via LocalViewModelStoreOwner"
     },
 ): VM where VM : ViewModel = previewProvider.findPreviewOr {
     metroViewModel(
@@ -112,9 +112,13 @@
 inline fun <reified VM, reified Factory> sessionKeyedAssistedMetroViewModel(
     key: String? = null,
     previewProvider: PreviewProvider = EmptyPreviewProvider,
+    viewModelStoreOwner: ViewModelStoreOwner = checkNotNull(LocalViewModelStoreOwner.current) {
+        "No ViewModelStoreOwner was provided via LocalViewModelStoreOwner"
+    },
     crossinline createViewModel: Factory.() -> VM,
 ): VM where VM : ViewModel, Factory : ManualViewModelAssistedFactory = previewProvider.findPreviewOr {
     assistedMetroViewModel<VM, Factory>(
+        viewModelStoreOwner = viewModelStoreOwner,
         key = sessionKeyedMetroViewModelKey(
             defaultKey = VM::class.qualifiedName,
             key = key,
@@ -137,9 +141,13 @@
 inline fun <reified VM, reified S, reified Factory> sessionKeyedAssistedMetroViewModelAs(
     key: String? = null,
     previewProvider: PreviewProvider = EmptyPreviewProvider,
+    viewModelStoreOwner: ViewModelStoreOwner = checkNotNull(LocalViewModelStoreOwner.current) {
+        "No ViewModelStoreOwner was provided via LocalViewModelStoreOwner"
+    },
     crossinline createViewModel: Factory.() -> VM,
 ): S where VM : ViewModel, VM : S, Factory : ManualViewModelAssistedFactory = previewProvider.findPreviewOr {
     assistedMetroViewModel<VM, Factory>(
+        viewModelStoreOwner = viewModelStoreOwner,
         key = sessionKeyedMetroViewModelKey(
             defaultKey = VM::class.qualifiedName,
             key = key,

core/di/stability/di-debug.stability

@@ -25,21 +25,23 @@ internal fun com.wire.android.di.manualScopedViewModelFactory(create: @[Extensio
     - create: STABLE (function type)
 
 @Composable
-public fun com.wire.android.di.metro.sessionKeyedAssistedMetroViewModel(key: kotlin.String?, previewProvider: com.wire.android.di.PreviewProvider, createViewModel: @[ExtensionFunctionType] kotlin.Function1<Factory of com.wire.android.di.metro.sessionKeyedAssistedMetroViewModel, VM of com.wire.android.di.metro.sessionKeyedAssistedMetroViewModel>): VM of com.wire.android.di.metro.sessionKeyedAssistedMetroViewModel
-  skippable: true
+public fun com.wire.android.di.metro.sessionKeyedAssistedMetroViewModel(key: kotlin.String?, previewProvider: com.wire.android.di.PreviewProvider, viewModelStoreOwner: androidx.lifecycle.ViewModelStoreOwner, createViewModel: @[ExtensionFunctionType] kotlin.Function1<Factory of com.wire.android.di.metro.sessionKeyedAssistedMetroViewModel, VM of com.wire.android.di.metro.sessionKeyedAssistedMetroViewModel>): VM of com.wire.android.di.metro.sessionKeyedAssistedMetroViewModel
+  skippable: false
   restartable: true
   params:
     - key: STABLE (class with no mutable properties)
     - previewProvider: STABLE (marked @Stable or @Immutable)
+    - viewModelStoreOwner: RUNTIME (requires runtime check)
     - createViewModel: STABLE (function type)
 
 @Composable
-public fun com.wire.android.di.metro.sessionKeyedAssistedMetroViewModelAs(key: kotlin.String?, previewProvider: com.wire.android.di.PreviewProvider, createViewModel: @[ExtensionFunctionType] kotlin.Function1<Factory of com.wire.android.di.metro.sessionKeyedAssistedMetroViewModelAs, VM of com.wire.android.di.metro.sessionKeyedAssistedMetroViewModelAs>): S of com.wire.android.di.metro.sessionKeyedAssistedMetroViewModelAs
-  skippable: true
+public fun com.wire.android.di.metro.sessionKeyedAssistedMetroViewModelAs(key: kotlin.String?, previewProvider: com.wire.android.di.PreviewProvider, viewModelStoreOwner: androidx.lifecycle.ViewModelStoreOwner, createViewModel: @[ExtensionFunctionType] kotlin.Function1<Factory of com.wire.android.di.metro.sessionKeyedAssistedMetroViewModelAs, VM of com.wire.android.di.metro.sessionKeyedAssistedMetroViewModelAs>): S of com.wire.android.di.metro.sessionKeyedAssistedMetroViewModelAs
+  skippable: false
   restartable: true
   params:
     - key: STABLE (class with no mutable properties)
     - previewProvider: STABLE (marked @Stable or @Immutable)
+    - viewModelStoreOwner: RUNTIME (requires runtime check)
     - createViewModel: STABLE (function type)
 
 @Composable

core/search/src/main/kotlin/com/wire/android/model/Contact.kt

@@ -17,9 +17,11 @@
  */
 package com.wire.android.model
 
+import androidx.compose.runtime.Stable
 import com.wire.android.ui.home.conversationslist.model.Membership
 import com.wire.kalium.logic.data.user.ConnectionState
 
+@Stable
 data class Contact(
     val id: String,
     val domain: String,

core/search/src/main/kotlin/com/wire/android/search/SearchMetroViewModelBindings.kt

@@ -35,8 +35,8 @@
     @ManualViewModelAssistedFactoryKey(SearchManualViewModelFactory::class)
     fun searchManualViewModelFactory(factory: SearchViewModelFactory): ManualViewModelAssistedFactory =
         object : SearchManualViewModelFactory {
-            override fun searchUserViewModel(conversationId: ConversationId?): SearchUserViewModel =
-                factory.searchUserViewModel(conversationId)
+            override fun searchUserViewModel(conversationId: ConversationId?, onlyConnectedContacts: Boolean): SearchUserViewModel =
+                factory.searchUserViewModel(conversationId, onlyConnectedContacts)
 
             override fun searchAppsViewModel(protocolInfo: Conversation.ProtocolInfo?): SearchAppsViewModel =
                 factory.searchAppsViewModel(protocolInfo)

core/search/src/main/kotlin/com/wire/android/search/SearchUsersAndAppsScreen.kt

@@ -72,6 +72,7 @@ import com.wire.android.ui.common.topappbar.WireCenterAlignedTopAppBar
 import com.wire.android.ui.common.topappbar.search.SearchTopBar
 import com.wire.android.util.ui.UIText
 import com.wire.kalium.logic.data.conversation.Conversation
+import com.wire.kalium.logic.data.id.ConversationId
 import kotlinx.collections.immutable.ImmutableSet
 import kotlinx.collections.immutable.persistentSetOf
 import kotlinx.coroutines.launch
@@ -83,19 +84,21 @@ fun SearchUsersAndAppsScreen(
     searchTitle: String,
     selectedContacts: ImmutableSet<Contact>,
     onContactChecked: (Boolean, Contact) -> Unit,
-    onOpenUserProfile: (Contact) -> Unit,
-    onAppClicked: (Contact) -> Unit,
     onClose: () -> Unit,
     navigationIconType: NavigationIconType,
     itemActionType: ItemActionType,
     modifier: Modifier = Modifier,
+    conversationId: ConversationId? = null,
+    onlyConnectedContacts: Boolean = false,
     shouldHideBottomActionForSearch: Boolean = false,
     shouldHideBottomActionForServices: Boolean = false,
     isAppsTabVisible: Boolean = false,
     isConversationAppsEnabled: Boolean = true,
     initialPage: SearchPeopleTabItem = SearchPeopleTabItem.PEOPLE,
     conversationProtocol: Conversation.ProtocolInfo? = null,
     peopleBottomActions: (@Composable (FocusRequester) -> Unit)? = null,
+    onOpenUserProfile: (Contact) -> Unit = {},
+    onAppClicked: (Contact) -> Unit = {},
 ) {
     val searchBarState = rememberSearchbarState()
     val scope = rememberCoroutineScope()
@@ -211,6 +214,8 @@ fun SearchUsersAndAppsScreen(
                     when (tabs[pageIndex]) {
                         SearchPeopleTabItem.PEOPLE -> {
                             SearchAllPeopleOrContactsScreen(
+                                conversationId = conversationId,
+                                onlyConnectedContacts = onlyConnectedContacts,
                                 searchQuery = searchBarState.searchQueryTextState.text.toString(),
                                 contactsSelected = selectedContacts,
                                 onOpenUserProfile = onOpenUserProfile,
@@ -268,7 +273,9 @@ private fun SearchAllPeopleOrContactsScreen(
     actionType: ItemActionType,
     onOpenUserProfile: (Contact) -> Unit,
     onContactChecked: (Boolean, Contact) -> Unit,
-    searchUserViewModel: SearchUserViewModel = searchUserViewModel(),
+    conversationId: ConversationId? = null,
+    onlyConnectedContacts: Boolean = false,
+    searchUserViewModel: SearchUserViewModel = searchUserViewModel(conversationId, onlyConnectedContacts),
     lazyListState: LazyListState = rememberLazyListState(),
     firstContactFocusRequester: FocusRequester? = null,
     nextFocusRequester: FocusRequester? = null,