Skip to content

Commit 13cd6e9

Browse files
authored
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
2 parents 13fb012 + eef7452 commit 13cd6e9

File tree

31 files changed

+116
-51
lines changed

31 files changed

+116
-51
lines changed

features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/keypad/PinKeypad.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ import androidx.compose.foundation.layout.Spacer
2121
import androidx.compose.foundation.layout.fillMaxWidth
2222
import androidx.compose.foundation.layout.size
2323
import androidx.compose.foundation.shape.CircleShape
24-
import androidx.compose.material.icons.Icons
25-
import androidx.compose.material.icons.automirrored.filled.Backspace
2624
import androidx.compose.material3.Text
2725
import androidx.compose.runtime.Composable
2826
import androidx.compose.ui.Alignment
@@ -40,6 +38,7 @@ import androidx.compose.ui.unit.dp
4038
import androidx.compose.ui.unit.sp
4139
import androidx.compose.ui.unit.times
4240
import io.element.android.compound.theme.ElementTheme
41+
import io.element.android.compound.tokens.generated.CompoundIcons
4342
import io.element.android.libraries.designsystem.preview.ElementPreview
4443
import io.element.android.libraries.designsystem.preview.PreviewsDayNight
4544
import io.element.android.libraries.designsystem.text.toSp
@@ -206,7 +205,8 @@ private fun PinKeypadBackButton(
206205
onClick = onClick,
207206
) {
208207
Icon(
209-
imageVector = Icons.AutoMirrored.Filled.Backspace,
208+
modifier = Modifier.size(28.dp),
209+
imageVector = CompoundIcons.BackspaceSolid(),
210210
contentDescription = stringResource(CommonStrings.a11y_delete),
211211
)
212212
}
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading

libraries/compound/src/main/kotlin/io/element/android/compound/tokens/generated/CompoundIcons.kt

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,12 @@ object CompoundIcons {
5252
@Composable fun Audio(): ImageVector {
5353
return ImageVector.vectorResource(R.drawable.ic_compound_audio)
5454
}
55+
@Composable fun Backspace(): ImageVector {
56+
return ImageVector.vectorResource(R.drawable.ic_compound_backspace)
57+
}
58+
@Composable fun BackspaceSolid(): ImageVector {
59+
return ImageVector.vectorResource(R.drawable.ic_compound_backspace_solid)
60+
}
5561
@Composable fun Block(): ImageVector {
5662
return ImageVector.vectorResource(R.drawable.ic_compound_block)
5763
}
@@ -301,6 +307,9 @@ object CompoundIcons {
301307
@Composable fun LeftPanelClose(): ImageVector {
302308
return ImageVector.vectorResource(R.drawable.ic_compound_left_panel_close)
303309
}
310+
@Composable fun LeftPanelOpen(): ImageVector {
311+
return ImageVector.vectorResource(R.drawable.ic_compound_left_panel_open)
312+
}
304313
@Composable fun Link(): ImageVector {
305314
return ImageVector.vectorResource(R.drawable.ic_compound_link)
306315
}
@@ -523,6 +532,9 @@ object CompoundIcons {
523532
@Composable fun SpotlightView(): ImageVector {
524533
return ImageVector.vectorResource(R.drawable.ic_compound_spotlight_view)
525534
}
535+
@Composable fun Sticker(): ImageVector {
536+
return ImageVector.vectorResource(R.drawable.ic_compound_sticker)
537+
}
526538
@Composable fun Strikethrough(): ImageVector {
527539
return ImageVector.vectorResource(R.drawable.ic_compound_strikethrough)
528540
}
@@ -643,6 +655,8 @@ object CompoundIcons {
643655
AskToJoinSolid(),
644656
Attachment(),
645657
Audio(),
658+
Backspace(),
659+
BackspaceSolid(),
646660
Block(),
647661
Bold(),
648662
Calendar(),
@@ -726,6 +740,7 @@ object CompoundIcons {
726740
Labs(),
727741
Leave(),
728742
LeftPanelClose(),
743+
LeftPanelOpen(),
729744
Link(),
730745
Linux(),
731746
ListBulleted(),
@@ -800,6 +815,7 @@ object CompoundIcons {
800815
Spinner(),
801816
Spotlight(),
802817
SpotlightView(),
818+
Sticker(),
803819
Strikethrough(),
804820
SwitchCameraSolid(),
805821
TakePhoto(),
@@ -849,6 +865,8 @@ object CompoundIcons {
849865
R.drawable.ic_compound_ask_to_join_solid,
850866
R.drawable.ic_compound_attachment,
851867
R.drawable.ic_compound_audio,
868+
R.drawable.ic_compound_backspace,
869+
R.drawable.ic_compound_backspace_solid,
852870
R.drawable.ic_compound_block,
853871
R.drawable.ic_compound_bold,
854872
R.drawable.ic_compound_calendar,
@@ -932,6 +950,7 @@ object CompoundIcons {
932950
R.drawable.ic_compound_labs,
933951
R.drawable.ic_compound_leave,
934952
R.drawable.ic_compound_left_panel_close,
953+
R.drawable.ic_compound_left_panel_open,
935954
R.drawable.ic_compound_link,
936955
R.drawable.ic_compound_linux,
937956
R.drawable.ic_compound_list_bulleted,
@@ -1006,6 +1025,7 @@ object CompoundIcons {
10061025
R.drawable.ic_compound_spinner,
10071026
R.drawable.ic_compound_spotlight,
10081027
R.drawable.ic_compound_spotlight_view,
1028+
R.drawable.ic_compound_sticker,
10091029
R.drawable.ic_compound_strikethrough,
10101030
R.drawable.ic_compound_switch_camera_solid,
10111031
R.drawable.ic_compound_take_photo,
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:autoMirrored="true"
5+
android:viewportWidth="24"
6+
android:viewportHeight="24">
7+
<group>
8+
<clip-path
9+
android:pathData="M0,0h24v24H0z"/>
10+
<path
11+
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"
12+
android:fillColor="#FF000000"/>
13+
</group>
14+
</vector>
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:autoMirrored="true"
5+
android:viewportWidth="24"
6+
android:viewportHeight="24">
7+
<path
8+
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"
9+
android:fillColor="#FF000000"/>
10+
</vector>
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24">
6+
<path
7+
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"
8+
android:fillColor="#FF000000"/>
9+
</vector>

0 commit comments

Comments
 (0)