diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/ChatView.kt b/apps/android/app/src/main/java/chat/simplex/app/views/chat/ChatView.kt index c6744f1361..d95afec8ed 100644 --- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/ChatView.kt +++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/ChatView.kt @@ -198,7 +198,7 @@ fun ChatView(chatModel: ChatModel) { close = close, modifier = Modifier, background = if (isInDarkTheme()) MaterialTheme.colors.background else SettingsBackgroundLight ) { - AddGroupMembersView(groupInfo, chatModel, true, close) + AddGroupMembersView(groupInfo, chatModel, close) } } } diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/AddGroupMembersView.kt b/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/AddGroupMembersView.kt index 28cbd1c48d..252543d150 100644 --- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/AddGroupMembersView.kt +++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/AddGroupMembersView.kt @@ -31,7 +31,7 @@ import chat.simplex.app.views.chat.ChatInfoToolbarTitle import chat.simplex.app.views.helpers.* @Composable -fun AddGroupMembersView(groupInfo: GroupInfo, chatModel: ChatModel, showFooterCounter: Boolean = true, close: () -> Unit) { +fun AddGroupMembersView(groupInfo: GroupInfo, chatModel: ChatModel, close: () -> Unit) { val selectedContacts = remember { mutableStateListOf() } val selectedRole = remember { mutableStateOf(GroupMemberRole.Admin) } @@ -41,7 +41,6 @@ fun AddGroupMembersView(groupInfo: GroupInfo, chatModel: ChatModel, showFooterCo contactsToAdd = getContactsToAdd(chatModel), selectedContacts = selectedContacts, selectedRole = selectedRole, - showFooterCounter = showFooterCounter, inviteMembers = { withApi { selectedContacts.forEach { @@ -79,7 +78,6 @@ fun AddGroupMembersLayout( contactsToAdd: List, selectedContacts: SnapshotStateList, selectedRole: MutableState, - showFooterCounter: Boolean, inviteMembers: () -> Unit, clearSelection: () -> Unit, addContact: (Long) -> Unit, @@ -124,10 +122,8 @@ fun AddGroupMembersLayout( InviteMembersButton(inviteMembers, disabled = selectedContacts.isEmpty()) } } - if (showFooterCounter) { - SectionCustomFooter { - InviteSectionFooter(selectedContactsCount = selectedContacts.count(), clearSelection) - } + SectionCustomFooter { + InviteSectionFooter(selectedContactsCount = selectedContacts.count(), clearSelection) } SectionSpacer() @@ -351,7 +347,6 @@ fun PreviewAddGroupMembersLayout() { contactsToAdd = listOf(Contact.sampleData, Contact.sampleData, Contact.sampleData), selectedContacts = remember { mutableStateListOf() }, selectedRole = remember { mutableStateOf(GroupMemberRole.Admin) }, - showFooterCounter = true, inviteMembers = {}, clearSelection = {}, addContact = {}, diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupChatInfoView.kt b/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupChatInfoView.kt index 84250861da..587b3f40aa 100644 --- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupChatInfoView.kt +++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupChatInfoView.kt @@ -51,7 +51,7 @@ fun GroupChatInfoView(chatModel: ChatModel, close: () -> Unit) { close = close, modifier = Modifier, background = if (isInDarkTheme()) MaterialTheme.colors.background else SettingsBackgroundLight ) { - AddGroupMembersView(groupInfo, chatModel, true, close) + AddGroupMembersView(groupInfo, chatModel, close) } } } diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/newchat/AddGroupView.kt b/apps/android/app/src/main/java/chat/simplex/app/views/newchat/AddGroupView.kt index 3f1ce2ef7f..f18ccecbcd 100644 --- a/apps/android/app/src/main/java/chat/simplex/app/views/newchat/AddGroupView.kt +++ b/apps/android/app/src/main/java/chat/simplex/app/views/newchat/AddGroupView.kt @@ -50,7 +50,7 @@ fun AddGroupView(chatModel: ChatModel, close: () -> Unit) { close = close, modifier = Modifier, background = if (isInDarkTheme()) MaterialTheme.colors.background else SettingsBackgroundLight ) { - AddGroupMembersView(groupInfo, chatModel, false, close) + AddGroupMembersView(groupInfo, chatModel, close) } } }