diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/compose/EditGroupScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/compose/EditGroupScreen.kt index 15cb2b6f15..c159178935 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/compose/EditGroupScreen.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/compose/EditGroupScreen.kt @@ -1,18 +1,15 @@ package org.thoughtcrime.securesms.groups.compose import android.widget.Toast -import androidx.compose.animation.animateContentSize import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size -import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items @@ -349,7 +346,7 @@ private fun MemberOptionsDialog( ) } - if (BuildConfig.DEBUG && member.canPromote) { + if (false && member.canPromote) { this += BottomOptionsDialogItem( title = context.getString(R.string.adminPromoteToAdmin), iconRes = R.drawable.ic_profile_default, @@ -359,8 +356,8 @@ private fun MemberOptionsDialog( if (BuildConfig.DEBUG && member.canResendInvite) { this += BottomOptionsDialogItem( - title = "Resend invite", - iconRes = R.drawable.ic_arrow_left, + title = "Resend invitation", + iconRes = R.drawable.ic_mail, onClick = onResendInvite ) } @@ -368,7 +365,7 @@ private fun MemberOptionsDialog( if (BuildConfig.DEBUG && member.canResendPromotion) { this += BottomOptionsDialogItem( title = "Resend promotion", - iconRes = R.drawable.ic_arrow_left, + iconRes = R.drawable.ic_mail, onClick = onResendPromotion ) } diff --git a/app/src/main/java/org/thoughtcrime/securesms/ui/components/BottomOptionsDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/ui/components/BottomOptionsDialog.kt index b02ad013b1..90cb4df37f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/ui/components/BottomOptionsDialog.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/ui/components/BottomOptionsDialog.kt @@ -3,9 +3,7 @@ package org.thoughtcrime.securesms.ui.components import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.RoundedCornerShape @@ -82,9 +80,12 @@ private fun MemberModalBottomSheetOptionItem( verticalAlignment = CenterVertically, ) { Icon( - painterResource(leadingIcon), + painter = painterResource(leadingIcon), modifier = Modifier.size(24.dp), - contentDescription = null) + tint = LocalColors.current.text, + contentDescription = null + ) + Text( modifier = Modifier.weight(1f), style = LocalType.current.large, diff --git a/app/src/main/res/drawable/ic_mail.xml b/app/src/main/res/drawable/ic_mail.xml new file mode 100644 index 0000000000..67a21c3500 --- /dev/null +++ b/app/src/main/res/drawable/ic_mail.xml @@ -0,0 +1,14 @@ + + + + diff --git a/libsession/src/main/java/org/session/libsession/messaging/groups/GroupManagerV2.kt b/libsession/src/main/java/org/session/libsession/messaging/groups/GroupManagerV2.kt index 0657e51802..d78aa87904 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/groups/GroupManagerV2.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/groups/GroupManagerV2.kt @@ -1,6 +1,5 @@ package org.session.libsession.messaging.groups -import org.session.libsession.messaging.messages.control.GroupUpdated import org.session.libsession.utilities.recipients.Recipient import org.session.libsignal.protos.SignalServiceProtos.DataMessage.GroupUpdateDeleteMemberContentMessage import org.session.libsignal.utilities.AccountId