Updated icons

This commit is contained in:
SessionHero01 2024-10-25 10:07:48 +11:00
parent 6abe6c682c
commit 122838d9ae
No known key found for this signature in database
4 changed files with 23 additions and 12 deletions

View File

@ -1,18 +1,15 @@
package org.thoughtcrime.securesms.groups.compose package org.thoughtcrime.securesms.groups.compose
import android.widget.Toast import android.widget.Toast
import androidx.compose.animation.animateContentSize
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.layout.widthIn
import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.items
@ -349,7 +346,7 @@ private fun MemberOptionsDialog(
) )
} }
if (BuildConfig.DEBUG && member.canPromote) { if (false && member.canPromote) {
this += BottomOptionsDialogItem( this += BottomOptionsDialogItem(
title = context.getString(R.string.adminPromoteToAdmin), title = context.getString(R.string.adminPromoteToAdmin),
iconRes = R.drawable.ic_profile_default, iconRes = R.drawable.ic_profile_default,
@ -359,8 +356,8 @@ private fun MemberOptionsDialog(
if (BuildConfig.DEBUG && member.canResendInvite) { if (BuildConfig.DEBUG && member.canResendInvite) {
this += BottomOptionsDialogItem( this += BottomOptionsDialogItem(
title = "Resend invite", title = "Resend invitation",
iconRes = R.drawable.ic_arrow_left, iconRes = R.drawable.ic_mail,
onClick = onResendInvite onClick = onResendInvite
) )
} }
@ -368,7 +365,7 @@ private fun MemberOptionsDialog(
if (BuildConfig.DEBUG && member.canResendPromotion) { if (BuildConfig.DEBUG && member.canResendPromotion) {
this += BottomOptionsDialogItem( this += BottomOptionsDialogItem(
title = "Resend promotion", title = "Resend promotion",
iconRes = R.drawable.ic_arrow_left, iconRes = R.drawable.ic_mail,
onClick = onResendPromotion onClick = onResendPromotion
) )
} }

View File

@ -3,9 +3,7 @@ package org.thoughtcrime.securesms.ui.components
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.shape.RoundedCornerShape
@ -82,9 +80,12 @@ private fun MemberModalBottomSheetOptionItem(
verticalAlignment = CenterVertically, verticalAlignment = CenterVertically,
) { ) {
Icon( Icon(
painterResource(leadingIcon), painter = painterResource(leadingIcon),
modifier = Modifier.size(24.dp), modifier = Modifier.size(24.dp),
contentDescription = null) tint = LocalColors.current.text,
contentDescription = null
)
Text( Text(
modifier = Modifier.weight(1f), modifier = Modifier.weight(1f),
style = LocalType.current.large, style = LocalType.current.large,

View File

@ -0,0 +1,14 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="50dp"
android:height="50dp"
android:viewportWidth="50"
android:viewportHeight="50">
<path
android:pathData="M8.333,10.417C7.183,10.417 6.25,11.349 6.25,12.5V37.5C6.25,38.651 7.183,39.583 8.333,39.583H41.667C42.817,39.583 43.75,38.651 43.75,37.5V12.5C43.75,11.349 42.817,10.417 41.667,10.417H8.333ZM2.083,12.5C2.083,9.048 4.882,6.25 8.333,6.25H41.667C45.118,6.25 47.917,9.048 47.917,12.5V37.5C47.917,40.952 45.118,43.75 41.667,43.75H8.333C4.882,43.75 2.083,40.952 2.083,37.5V12.5Z"
android:fillColor="#000000"
android:fillType="evenOdd"/>
<path
android:pathData="M2.408,13.466C3.025,12.495 4.313,12.208 5.284,12.825L23.965,24.696C24.276,24.889 24.634,24.992 25,24.992C25.366,24.992 25.725,24.889 26.035,24.696C26.037,24.695 26.038,24.694 26.04,24.693L44.716,12.825C45.687,12.208 46.975,12.495 47.592,13.466C48.209,14.437 47.922,15.724 46.951,16.341L28.252,28.224C27.277,28.834 26.15,29.158 25,29.158C23.85,29.158 22.723,28.834 21.748,28.224L21.737,28.216L3.049,16.341C2.078,15.724 1.791,14.437 2.408,13.466Z"
android:fillColor="#000000"
android:fillType="evenOdd"/>
</vector>

View File

@ -1,6 +1,5 @@
package org.session.libsession.messaging.groups package org.session.libsession.messaging.groups
import org.session.libsession.messaging.messages.control.GroupUpdated
import org.session.libsession.utilities.recipients.Recipient import org.session.libsession.utilities.recipients.Recipient
import org.session.libsignal.protos.SignalServiceProtos.DataMessage.GroupUpdateDeleteMemberContentMessage import org.session.libsignal.protos.SignalServiceProtos.DataMessage.GroupUpdateDeleteMemberContentMessage
import org.session.libsignal.utilities.AccountId import org.session.libsignal.utilities.AccountId