SES-4753 : Manage Members

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/settings/ConversationSettingsNavHost.kt

@@ -182,7 +182,7 @@ fun ConversationSettingsNavHost(
 
                 val viewModel =
                     hiltViewModel<ManageGroupMembersViewModel, ManageGroupMembersViewModel.Factory> { factory ->
-                        factory.create(data.groupAddress)
+                        factory.create(data.groupAddress, navigator)
                     }
 
                 ManageGroupMembersScreen(

app/src/main/java/org/thoughtcrime/securesms/groups/BaseGroupMembersViewModel.kt

@@ -90,15 +90,15 @@ abstract class BaseGroupMembersViewModel(
     ).stateIn(viewModelScope, SharingStarted.Lazily, emptyList())
 
     // Output: List of only NON-ADMINS
-    @OptIn(FlowPreview::class)
-    val nonAdminMembers: StateFlow<List<GroupMemberState>> = combine(
-        groupInfo.map { it?.second.orEmpty() },
-        mutableSearchQuery.debounce(100L),
-        ::filterContacts
-    )
+    val nonAdminMembers: StateFlow<List<GroupMemberState>> = members
         .map { list -> list.filter { !it.showAsAdmin } }
         .stateIn(viewModelScope, SharingStarted.Lazily, emptyList())
 
+    val hasNonAdminMembers: StateFlow<Boolean> =
+        groupInfo
+            .map { pair -> pair?.second.orEmpty().any { !it.showAsAdmin } }
+            .stateIn(viewModelScope, SharingStarted.Lazily, false)
+
     fun onSearchQueryChanged(query: String) {
         mutableSearchQuery.value = query
     }

app/src/main/java/org/thoughtcrime/securesms/groups/ManageGroupMembersViewModel.kt

@@ -33,15 +33,18 @@ import org.session.libsession.utilities.StringSubstitutionConstants.GROUP_NAME_K
 import org.session.libsession.utilities.StringSubstitutionConstants.NAME_KEY
 import org.session.libsession.utilities.StringSubstitutionConstants.OTHER_NAME_KEY
 import org.session.libsignal.utilities.AccountId
+import org.thoughtcrime.securesms.conversation.v2.settings.ConversationSettingsDestination
 import org.thoughtcrime.securesms.database.RecipientRepository
 import org.thoughtcrime.securesms.ui.CollapsibleFooterItemData
 import org.thoughtcrime.securesms.ui.GetString
+import org.thoughtcrime.securesms.ui.UINavigator
 import org.thoughtcrime.securesms.util.AvatarUtils
 
 
 @HiltViewModel(assistedFactory = ManageGroupMembersViewModel.Factory::class)
 class ManageGroupMembersViewModel @AssistedInject constructor(
     @Assisted private val groupAddress: Address.Group,
+    @Assisted private val navigator: UINavigator<ConversationSettingsDestination>,
     @param:ApplicationContext private val context: Context,
     storage: StorageProtocol,
     private val configFactory: ConfigFactoryProtocol,
@@ -65,10 +68,6 @@ class ManageGroupMembersViewModel @AssistedInject constructor(
     private val mutableInProgress = MutableStateFlow(false)
     val inProgress: StateFlow<Boolean> get() = mutableInProgress
 
-    // show action bottom sheet
-    private val _clickedMember: MutableStateFlow<GroupMemberState?> = MutableStateFlow(null)
-    val clickedMember: StateFlow<GroupMemberState?> get() = _clickedMember
-
     // Output: errors
     private val mutableError = MutableStateFlow<String?>(null)
     val error: StateFlow<String?> get() = mutableError
@@ -89,6 +88,26 @@ class ManageGroupMembersViewModel @AssistedInject constructor(
 
     private val footerCollapsed = MutableStateFlow(false)
 
+   private val optionsList: List<OptionsItem> by lazy {
+        listOf(
+            OptionsItem(
+                name = context.getString(R.string.membersInvite),
+                icon = R.drawable.ic_user_round_plus,
+                onClick = ::navigateInviteContacts
+            ),
+            OptionsItem(
+                name = context.getString(R.string.accountIdOrOnsInvite),
+                icon = R.drawable.ic_user_round_search,
+                onClick = {
+                    // TODO: Add navigation
+                }
+            )
+        )
+    }
+
+    private val _uiState = MutableStateFlow(UiState(options = optionsList))
+    val uiState: StateFlow<UiState> = _uiState
+
     val collapsibleFooterState: StateFlow<CollapsibleFooterState> =
         combine(_mutableSelectedMembers, footerCollapsed) { selected, isCollapsed ->
             val count = selected.size
@@ -189,6 +208,17 @@ class ManageGroupMembersViewModel @AssistedInject constructor(
         mutableSearchFocused.value = isFocused
     }
 
+    private fun navigateInviteContacts() {
+        viewModelScope.launch {
+            navigator.navigate(
+                ConversationSettingsDestination.RouteInviteToGroup(
+                    groupAddress,
+                    excludingAccountIDsFromContactSelection.toList()
+                )
+            )
+        }
+    }
+
     fun onContactSelected(contacts: Set<Address>) {
         performGroupOperation(
             showLoading = false,
@@ -222,12 +252,12 @@ class ManageGroupMembersViewModel @AssistedInject constructor(
             }
         ) {
             // Look up current member configs once
-            val membersCfg = configFactory.withGroupConfigs(groupId) { it.groupMembers }
-
-            // Build per-member invites with their own shareHistory flag
-            val invites = selectedMembers.value.distinct().map { member ->
-                val shareHistory = membersCfg?.getOrNull(member.accountId.hexString)?.supplement == true
-                MemberInvite(id = member.accountId, shareHistory = shareHistory)
+            val invites: List<MemberInvite> = configFactory.withGroupConfigs(groupId) { cfg ->
+                selectedMembers.value.map { member ->
+                    val shareHistory =
+                        cfg.groupMembers.getOrNull(member.accountId.hexString)?.supplement == true
+                    MemberInvite(id = member.accountId, shareHistory = shareHistory)
+                }
             }
 
             removeSearchState(true)
@@ -324,20 +354,6 @@ class ManageGroupMembersViewModel @AssistedInject constructor(
         }
     }
 
-    fun onMemberClicked(groupMember: GroupMemberState){
-        // if the member is clickable (ie, not 'you') but is an admin with no possible actions,
-        // show a toast mentioning they can't be removed
-        if(!groupMember.canEdit && groupMember.showAsAdmin){
-            mutableError.value = context.getString(R.string.adminCannotBeRemoved)
-        } else { // otherwise pass in the clicked member to display the action sheet
-            _clickedMember.value = groupMember
-        }
-    }
-
-    fun hideActionBottomSheet(){
-        _clickedMember.value = null
-    }
-
     fun clearSelection(){
         _mutableSelectedMembers.value = emptySet()
     }
@@ -352,20 +368,37 @@ class ManageGroupMembersViewModel @AssistedInject constructor(
         showRemoveMember.value = visible
     }
 
-    fun onCommand(command : Commands){
-        when (command){
-            is Commands.ShowRemoveDialog -> {
-                toggleRemoveDialog(true)
-            }
-            is Commands.DismissRemoveDialog -> {
-                toggleRemoveDialog(false)
-            }
-            is Commands.RemoveMembers -> {
-                onRemoveContact(command.removeMessages)
-            }
+    fun onCommand(command: Commands) {
+        when (command) {
+            is Commands.ShowRemoveDialog -> toggleRemoveDialog(true)
+
+            is Commands.DismissRemoveDialog -> toggleRemoveDialog(false)
+
+            is Commands.RemoveMembers -> onRemoveContact(command.removeMessages)
+
+            is Commands.ClearSelection,
+
+            is Commands.CloseFooter -> clearSelection()
+
+            is Commands.ToggleFooter -> toggleFooter()
+
+            is Commands.DismissError -> onDismissError()
+
+            is Commands.DismissResend -> onDismissResend()
+
+            is Commands.MemberClick -> onMemberItemClicked(command.member)
+
+            is Commands.RemoveSearchState -> removeSearchState(command.clearSelection)
+
+            is Commands.SearchFocusChange -> onSearchFocusChanged(command.focus)
+
+            is Commands.SearchQueryChange -> onSearchQueryChanged(command.query)
         }
     }
 
+    data class UiState(
+        val options : List<OptionsItem> = emptyList()
+    )
     data class CollapsibleFooterState(
         val visible: Boolean = false,
         val collapsed: Boolean = false,
@@ -390,11 +423,32 @@ class ManageGroupMembersViewModel @AssistedInject constructor(
     sealed interface Commands {
         data object ShowRemoveDialog : Commands
         data object DismissRemoveDialog : Commands
+
+        data object DismissError : Commands
+
+        data object DismissResend : Commands
+
+        data object ToggleFooter : Commands
+
+        data object CloseFooter : Commands
+
+        data object ClearSelection : Commands
+
+        data class RemoveSearchState(val clearSelection : Boolean) : Commands
+
+        data class SearchQueryChange(val query : String) : Commands
+
+        data class SearchFocusChange(val focus : Boolean) : Commands
         data class RemoveMembers(val removeMessages: Boolean) : Commands
+
+        data class MemberClick(val member: GroupMemberState) : Commands
     }
 
     @AssistedFactory
     interface Factory {
-        fun create(groupAddress: Address.Group): ManageGroupMembersViewModel
+        fun create(
+            groupAddress: Address.Group,
+            navigator: UINavigator<ConversationSettingsDestination>
+        ): ManageGroupMembersViewModel
     }
 }