Merge pull request #5913 from element-hq/feature/bma/compound_6.4.3
Sync compound tokens https://github.com/element-hq/compound-design-tokens/releases/tag/v6.4.3
This commit is contained in:
@@ -21,8 +21,6 @@ import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.shape.CircleShape
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.automirrored.filled.Backspace
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Alignment
|
||||
@@ -40,6 +38,7 @@ import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import androidx.compose.ui.unit.times
|
||||
import io.element.android.compound.theme.ElementTheme
|
||||
import io.element.android.compound.tokens.generated.CompoundIcons
|
||||
import io.element.android.libraries.designsystem.preview.ElementPreview
|
||||
import io.element.android.libraries.designsystem.preview.PreviewsDayNight
|
||||
import io.element.android.libraries.designsystem.text.toSp
|
||||
@@ -206,7 +205,8 @@ private fun PinKeypadBackButton(
|
||||
onClick = onClick,
|
||||
) {
|
||||
Icon(
|
||||
imageVector = Icons.AutoMirrored.Filled.Backspace,
|
||||
modifier = Modifier.size(28.dp),
|
||||
imageVector = CompoundIcons.BackspaceSolid(),
|
||||
contentDescription = stringResource(CommonStrings.a11y_delete),
|
||||
)
|
||||
}
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -52,6 +52,12 @@ object CompoundIcons {
|
||||
@Composable fun Audio(): ImageVector {
|
||||
return ImageVector.vectorResource(R.drawable.ic_compound_audio)
|
||||
}
|
||||
@Composable fun Backspace(): ImageVector {
|
||||
return ImageVector.vectorResource(R.drawable.ic_compound_backspace)
|
||||
}
|
||||
@Composable fun BackspaceSolid(): ImageVector {
|
||||
return ImageVector.vectorResource(R.drawable.ic_compound_backspace_solid)
|
||||
}
|
||||
@Composable fun Block(): ImageVector {
|
||||
return ImageVector.vectorResource(R.drawable.ic_compound_block)
|
||||
}
|
||||
@@ -301,6 +307,9 @@ object CompoundIcons {
|
||||
@Composable fun LeftPanelClose(): ImageVector {
|
||||
return ImageVector.vectorResource(R.drawable.ic_compound_left_panel_close)
|
||||
}
|
||||
@Composable fun LeftPanelOpen(): ImageVector {
|
||||
return ImageVector.vectorResource(R.drawable.ic_compound_left_panel_open)
|
||||
}
|
||||
@Composable fun Link(): ImageVector {
|
||||
return ImageVector.vectorResource(R.drawable.ic_compound_link)
|
||||
}
|
||||
@@ -523,6 +532,9 @@ object CompoundIcons {
|
||||
@Composable fun SpotlightView(): ImageVector {
|
||||
return ImageVector.vectorResource(R.drawable.ic_compound_spotlight_view)
|
||||
}
|
||||
@Composable fun Sticker(): ImageVector {
|
||||
return ImageVector.vectorResource(R.drawable.ic_compound_sticker)
|
||||
}
|
||||
@Composable fun Strikethrough(): ImageVector {
|
||||
return ImageVector.vectorResource(R.drawable.ic_compound_strikethrough)
|
||||
}
|
||||
@@ -643,6 +655,8 @@ object CompoundIcons {
|
||||
AskToJoinSolid(),
|
||||
Attachment(),
|
||||
Audio(),
|
||||
Backspace(),
|
||||
BackspaceSolid(),
|
||||
Block(),
|
||||
Bold(),
|
||||
Calendar(),
|
||||
@@ -726,6 +740,7 @@ object CompoundIcons {
|
||||
Labs(),
|
||||
Leave(),
|
||||
LeftPanelClose(),
|
||||
LeftPanelOpen(),
|
||||
Link(),
|
||||
Linux(),
|
||||
ListBulleted(),
|
||||
@@ -800,6 +815,7 @@ object CompoundIcons {
|
||||
Spinner(),
|
||||
Spotlight(),
|
||||
SpotlightView(),
|
||||
Sticker(),
|
||||
Strikethrough(),
|
||||
SwitchCameraSolid(),
|
||||
TakePhoto(),
|
||||
@@ -849,6 +865,8 @@ object CompoundIcons {
|
||||
R.drawable.ic_compound_ask_to_join_solid,
|
||||
R.drawable.ic_compound_attachment,
|
||||
R.drawable.ic_compound_audio,
|
||||
R.drawable.ic_compound_backspace,
|
||||
R.drawable.ic_compound_backspace_solid,
|
||||
R.drawable.ic_compound_block,
|
||||
R.drawable.ic_compound_bold,
|
||||
R.drawable.ic_compound_calendar,
|
||||
@@ -932,6 +950,7 @@ object CompoundIcons {
|
||||
R.drawable.ic_compound_labs,
|
||||
R.drawable.ic_compound_leave,
|
||||
R.drawable.ic_compound_left_panel_close,
|
||||
R.drawable.ic_compound_left_panel_open,
|
||||
R.drawable.ic_compound_link,
|
||||
R.drawable.ic_compound_linux,
|
||||
R.drawable.ic_compound_list_bulleted,
|
||||
@@ -1006,6 +1025,7 @@ object CompoundIcons {
|
||||
R.drawable.ic_compound_spinner,
|
||||
R.drawable.ic_compound_spotlight,
|
||||
R.drawable.ic_compound_spotlight_view,
|
||||
R.drawable.ic_compound_sticker,
|
||||
R.drawable.ic_compound_strikethrough,
|
||||
R.drawable.ic_compound_switch_camera_solid,
|
||||
R.drawable.ic_compound_take_photo,
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:autoMirrored="true"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<group>
|
||||
<clip-path
|
||||
android:pathData="M0,0h24v24H0z"/>
|
||||
<path
|
||||
android:pathData="M21.167,3.75L7.417,3.75c-0.633,0 -1.128,0.32 -1.458,0.807L1,12l4.96,7.434c0.33,0.486 0.824,0.816 1.457,0.816h13.75A1.84,1.84 0,0 0,23 18.417L23,5.583a1.84,1.84 0,0 0,-1.833 -1.833m0,14.667L7.48,18.417L3.2,12l4.272,-6.417h13.695zM10.542,16.583 L13.833,13.293 17.124,16.583 18.417,15.291L15.126,12l3.29,-3.29 -1.292,-1.293 -3.29,3.29 -3.291,-3.29L9.25,8.709 12.54,12l-3.29,3.29z"
|
||||
android:fillColor="#FF000000"/>
|
||||
</group>
|
||||
</vector>
|
||||
@@ -0,0 +1,10 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:autoMirrored="true"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:pathData="M21.15,4H7.283c-0.638,0 -1.137,0.311 -1.47,0.782l-4.66,6.73a0.87,0.87 0,0 0,0 0.986l4.66,6.72c0.333,0.462 0.832,0.782 1.47,0.782h13.869C22.168,20 23,19.2 23,18.222V5.778C23,4.8 22.168,4 21.15,4m-3.42,11.822a0.947,0.947 0,0 1,-1.304 0l-2.672,-2.569 -2.672,2.57a0.947,0.947 0,0 1,-1.303 0,0.86 0.86,0 0,1 0,-1.254L12.45,12 9.779,9.431a0.86,0.86 0,0 1,0 -1.253,0.947 0.947,0 0,1 1.303,0l2.672,2.569 2.672,-2.57a0.947,0.947 0,0 1,1.304 0c0.36,0.347 0.36,0.907 0,1.254L15.058,12l2.672,2.569a0.877,0.877 0,0 1,0 1.253"
|
||||
android:fillColor="#FF000000"/>
|
||||
</vector>
|
||||
@@ -0,0 +1,9 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:pathData="M12.5,9.2v5.6q0,0.35 0.3,0.475t0.55,-0.125l2.45,-2.45q0.3,-0.3 0.3,-0.7t-0.3,-0.7l-2.45,-2.45q-0.25,-0.25 -0.55,-0.125t-0.3,0.475M5,19q-0.824,0 -1.412,-0.587A1.93,1.93 0,0 1,3 17L3,7q0,-0.824 0.587,-1.412A1.93,1.93 0,0 1,5 5h14q0.824,0 1.413,0.588Q21,6.175 21,7v10q0,0.824 -0.587,1.413A1.93,1.93 0,0 1,19 19zM8,17L8,7L5,7v10zM10,17h9L19,7h-9z"
|
||||
android:fillColor="#FF000000"/>
|
||||
</vector>
|
||||
@@ -0,0 +1,10 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:pathData="M17,2a5,5 0,0 1,5 4.999v5.335a5,5 0,0 1,-1.58 3.647l-4.978,4.667A5,5 0,0 1,12.023 22L7,22l-0.258,-0.007A5,5 0,0 1,2 17L2,7a5,5 0,0 1,5 -5zM7,4a3,3 0,0 0,-3 3v10a3,3 0,0 0,2.999 3L12,20v-4a4,4 0,0 1,4 -4h4L20,6.999A3,3 0,0 0,17 4zM16,14a2,2 0,0 0,-2 2v3.251l0.074,-0.062 4.978,-4.666q0.252,-0.238 0.441,-0.523z"
|
||||
android:fillColor="#FF000000"
|
||||
android:fillType="evenOdd"/>
|
||||
</vector>
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -10,6 +10,8 @@ files = [
|
||||
"ic_compound_arrow_right.xml",
|
||||
"ic_compound_arrow_up_right.xml",
|
||||
"ic_compound_attachment.xml",
|
||||
"ic_compound_backspace.xml",
|
||||
"ic_compound_backspace_solid.xml",
|
||||
"ic_compound_block.xml",
|
||||
"ic_compound_chart.xml",
|
||||
"ic_compound_chat.xml",
|
||||
|
||||
Reference in New Issue
Block a user