SES-4753 : [Collapsible Footer Action] Manage Members and admins

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

@@ -1,11 +1,13 @@
 package org.thoughtcrime.securesms.groups
 
+import android.content.Context
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import dagger.hilt.android.lifecycle.HiltViewModel
+import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.FlowPreview
@@ -15,18 +17,22 @@ import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.debounce
+import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.withContext
+import network.loki.messenger.R
 import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.recipients.Recipient
 import org.session.libsession.utilities.recipients.shouldShowProBadge
 import org.thoughtcrime.securesms.database.RecipientRepository
 import org.thoughtcrime.securesms.dependencies.ConfigFactory
 import org.thoughtcrime.securesms.home.search.searchName
 import org.thoughtcrime.securesms.pro.ProStatusManager
+import org.thoughtcrime.securesms.ui.GetString
 import org.thoughtcrime.securesms.util.AvatarUIData
 import org.thoughtcrime.securesms.util.AvatarUtils
 
@@ -39,6 +45,7 @@ open class SelectContactsViewModel @AssistedInject constructor(
     @Assisted private val excludingAccountIDs: Set<Address>,
     @Assisted private val contactFiltering: (Recipient) -> Boolean, //  default will filter out blocked and unapproved contacts
     private val recipientRepository: RecipientRepository,
+    @param:ApplicationContext private val context: Context,
 ) : ViewModel() {
     // Input: The search query
     private val mutableSearchQuery = MutableStateFlow("")
@@ -71,6 +78,27 @@ open class SelectContactsViewModel @AssistedInject constructor(
     val currentSelected: Set<Address>
         get() = mutableSelectedContactAccountIDs.value
 
+    private val footerCollapsed = MutableStateFlow(false)
+
+    val collapsibleFooterState: StateFlow<CollapsibleFooterState> =
+        combine(mutableSelectedContactAccountIDs, footerCollapsed) { selected, isCollapsed ->
+            val count = selected.size
+            val visible = count > 0
+            val title = if (count == 0) GetString("")
+            else GetString(
+                context.resources.getQuantityString(R.plurals.contactSelected, count, count)
+            )
+
+            CollapsibleFooterState(
+                visible = visible,
+                // auto-expand when nothing is selected, otherwise keep user's choice
+                collapsed = if (!visible) false else isCollapsed,
+                footerActionTitle = title
+            )
+        }
+            .distinctUntilChanged()
+            .stateIn(viewModelScope, SharingStarted.Eagerly, CollapsibleFooterState())
+
     @OptIn(ExperimentalCoroutinesApi::class)
     private fun observeContacts() = (configFactory.configUpdateNotifications as Flow<Any>)
         .debounce(100L)
@@ -144,6 +172,16 @@ open class SelectContactsViewModel @AssistedInject constructor(
         mutableSelectedContactAccountIDs.value = emptySet()
     }
 
+    fun toggleFooter() {
+        footerCollapsed.update { !it }
+    }
+
+    data class CollapsibleFooterState(
+        val visible: Boolean = false,
+        val collapsed: Boolean = false,
+        val footerActionTitle : GetString = GetString("")
+    )
+
     @AssistedFactory
     interface Factory {
         fun create(

app/src/main/java/org/thoughtcrime/securesms/groups/compose/InviteContactsScreen.kt

@@ -4,29 +4,40 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
 import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawing
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import network.loki.messenger.R
 import org.session.libsession.utilities.Address
 import org.thoughtcrime.securesms.groups.ContactItem
 import org.thoughtcrime.securesms.groups.SelectContactsViewModel
 import org.thoughtcrime.securesms.ui.BottomFadingEdgeBox
+import org.thoughtcrime.securesms.ui.CollapsibleFooterAction
+import org.thoughtcrime.securesms.ui.CollapsibleFooterActionData
+import org.thoughtcrime.securesms.ui.CollapsibleFooterItemData
+import org.thoughtcrime.securesms.ui.GetString
 import org.thoughtcrime.securesms.ui.SearchBar
 import org.thoughtcrime.securesms.ui.components.BackAppBar
-import org.thoughtcrime.securesms.ui.components.AccentOutlineButton
 import org.thoughtcrime.securesms.ui.qaTag
 import org.thoughtcrime.securesms.ui.theme.LocalColors
 import org.thoughtcrime.securesms.ui.theme.LocalDimensions
@@ -42,17 +53,23 @@ fun InviteContactsScreen(
     viewModel: SelectContactsViewModel,
     onDoneClicked: () -> Unit,
     onBack: () -> Unit,
-    banner: @Composable ()->Unit = {}
+    banner: @Composable () -> Unit = {}
 ) {
+    val footerData by viewModel.collapsibleFooterState.collectAsState()
+
     InviteContacts(
         contacts = viewModel.contacts.collectAsState().value,
         onContactItemClicked = viewModel::onContactItemClicked,
         searchQuery = viewModel.searchQuery.collectAsState().value,
         onSearchQueryChanged = viewModel::onSearchQueryChanged,
-        onSearchQueryClear = {viewModel.onSearchQueryChanged("") },
+        onSearchQueryClear = { viewModel.onSearchQueryChanged("") },
         onDoneClicked = onDoneClicked,
         onBack = onBack,
-        banner = banner
+        banner = banner,
+        data = footerData,
+        onToggleFooter = viewModel::toggleFooter,
+        onCloseFooter = viewModel::clearSelection
+
     )
 }
 
@@ -66,15 +83,48 @@ fun InviteContacts(
     onSearchQueryClear: () -> Unit,
     onDoneClicked: () -> Unit,
     onBack: () -> Unit,
-    banner: @Composable ()->Unit = {}
+    banner: @Composable () -> Unit = {},
+    data: SelectContactsViewModel.CollapsibleFooterState,
+    onToggleFooter: () -> Unit,
+    onCloseFooter: () -> Unit,
 ) {
+    val colors = LocalColors.current
+    val trayItems = listOf(
+        CollapsibleFooterItemData(
+            label = GetString(LocalResources.current.getString(R.string.membersInvite)),
+            buttonLabel = GetString(LocalResources.current.getString(R.string.membersInviteTitle)),
+            buttonColor = colors.accent,
+            onClick = { onDoneClicked() }
+        )
+    )
+
     Scaffold(
+        contentWindowInsets = WindowInsets.safeDrawing,
         topBar = {
             BackAppBar(
                 title = stringResource(id = R.string.membersInvite),
                 onBack = onBack,
             )
         },
+        bottomBar = {
+            Box(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .windowInsetsPadding(WindowInsets.safeDrawing.only(WindowInsetsSides.Bottom))
+                    .imePadding()
+            ) {
+                CollapsibleFooterAction(
+                    data = CollapsibleFooterActionData(
+                        title = data.footerActionTitle,
+                        collapsed = data.collapsed,
+                        visible = data.visible,
+                        items = trayItems
+                    ),
+                    onCollapsedClicked = onToggleFooter,
+                    onClosedClicked = onCloseFooter
+                )
+            }
+        }
     ) { paddings ->
         Column(
             modifier = Modifier
@@ -100,18 +150,19 @@ fun InviteContacts(
 
             Spacer(modifier = Modifier.height(LocalDimensions.current.smallSpacing))
 
-            BottomFadingEdgeBox(modifier = Modifier.weight(1f)) { bottomContentPadding ->
-                if(contacts.isEmpty() && searchQuery.isEmpty()){
+            Box(modifier = Modifier.weight(1f)) {
+                if (contacts.isEmpty() && searchQuery.isEmpty()) {
                     Text(
                         text = stringResource(id = R.string.contactNone),
-                        modifier = Modifier.padding(top = LocalDimensions.current.spacing)
+                        modifier = Modifier
+                            .padding(top = LocalDimensions.current.spacing)
                             .align(Alignment.TopCenter),
                         style = LocalType.current.base.copy(color = LocalColors.current.textSecondary)
                     )
                 } else {
                     LazyColumn(
                         state = scrollState,
-                        contentPadding = PaddingValues(bottom = bottomContentPadding),
+                        contentPadding = PaddingValues(bottom = LocalDimensions.current.spacing),
                     ) {
                         multiSelectMemberList(
                             contacts = contacts,
@@ -120,27 +171,7 @@ fun InviteContacts(
                     }
                 }
             }
-
-            Spacer(modifier = Modifier.height(LocalDimensions.current.smallSpacing))
-
-            Box(
-                contentAlignment = Alignment.Center,
-                modifier = Modifier.fillMaxWidth()
-            ) {
-                AccentOutlineButton(
-                    onClick = onDoneClicked,
-                    enabled = contacts.any { it.selected },
-                    modifier = Modifier
-                        .padding(vertical = LocalDimensions.current.spacing)
-                        .qaTag(R.string.qa_invite_button),
-                ) {
-                    Text(
-                        stringResource(id = R.string.membersInviteTitle)
-                    )
-                }
-            }
         }
-
     }
 }
 
@@ -174,6 +205,13 @@ private fun PreviewSelectContacts() {
             onSearchQueryClear = {},
             onDoneClicked = {},
             onBack = {},
+            data = SelectContactsViewModel.CollapsibleFooterState(
+                collapsed = false,
+                visible = true,
+                footerActionTitle = GetString("1 Contact Selected")
+            ),
+            onToggleFooter = { },
+            onCloseFooter = { },
         )
     }
 }
@@ -192,7 +230,13 @@ private fun PreviewSelectEmptyContacts() {
             onSearchQueryClear = {},
             onDoneClicked = {},
             onBack = {},
-            banner = { GroupMinimumVersionBanner() }
+            data = SelectContactsViewModel.CollapsibleFooterState(
+                collapsed = true,
+                visible = false,
+                footerActionTitle = GetString("")
+            ),
+            onToggleFooter = { },
+            onCloseFooter = { }
         )
     }
 }
@@ -211,7 +255,13 @@ private fun PreviewSelectEmptyContactsWithSearch() {
             onSearchQueryClear = {},
             onDoneClicked = {},
             onBack = {},
-            banner = { GroupMinimumVersionBanner() }
+            data = SelectContactsViewModel.CollapsibleFooterState(
+                collapsed = true,
+                visible = false,
+                footerActionTitle = GetString("")
+            ),
+            onToggleFooter = { },
+            onCloseFooter = { }
         )
     }
 }

app/src/main/java/org/thoughtcrime/securesms/home/startconversation/group/CreateGroupViewModel.kt

@@ -46,6 +46,7 @@ class CreateGroupViewModel @AssistedInject constructor(
     excludingAccountIDs = emptySet(),
     contactFiltering = SelectContactsViewModel.Factory.defaultFiltering,
     recipientRepository = recipientRepository,
+    context = appContext
 ) {
     // Child view model to handle contact selection logic
 

app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsViewModel.kt

@@ -34,6 +34,7 @@ class BlockedContactsViewModel @Inject constructor(
     avatarUtils = avatarUtils,
     proStatusManager = proStatusManager,
     recipientRepository = recipientRepository,
+    context = context
 ) {
     private val _unblockDialog = MutableStateFlow(false)
     val unblockDialog: StateFlow<Boolean> = _unblockDialog