dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-05-13 19:23:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

android: restore footer counter (#990)

Browse Source
This commit is contained in:
JRoberts
2022-08-31 12:26:41 +04:00
committed by GitHub
parent 73447ce22b
commit a1562bf0e7
4 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/android/app/src/main/java/chat/simplex/app/views/chat/ChatView.kt
+1 -1
View File
@@ -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)
}
}
}
apps/android/app/src/main/java/chat/simplex/app/views/chat/group/AddGroupMembersView.kt
+3 -8
View File
@@ -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<Long>() }
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<Contact>,
selectedContacts: SnapshotStateList<Long>,
selectedRole: MutableState<GroupMemberRole>,
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 = {},
apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupChatInfoView.kt
+1 -1
View File
@@ -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)
}
}
}
apps/android/app/src/main/java/chat/simplex/app/views/newchat/AddGroupView.kt
+1 -1
View File
@@ -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)
}
}
}