Adjust typography in SelectedUser component (#2768)
* Adjust typography in `SelectedUser` component * Set 2 max lines for `SelectedUser` component. Also update the theme token references. * Update screenshots --------- Co-authored-by: ElementBot <benoitm+elementbot@element.io>
This commit is contained in:
parent
47fd2e85d4
commit
c690b38b0f
44 changed files with 93 additions and 90 deletions
1
changelog.d/2760.bugfix
Normal file
1
changelog.d/2760.bugfix
Normal file
|
|
@ -0,0 +1 @@
|
|||
Adjust the typography used in the selected user component so a user's display name fits better.
|
||||
|
|
@ -25,7 +25,6 @@ import androidx.compose.foundation.layout.size
|
|||
import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.foundation.shape.CircleShape
|
||||
import androidx.compose.material.ripple.rememberRipple
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.ui.Alignment
|
||||
|
|
@ -33,8 +32,10 @@ import androidx.compose.ui.Modifier
|
|||
import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.ui.draw.clipToBounds
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.text.style.TextAlign
|
||||
import androidx.compose.ui.text.style.TextOverflow
|
||||
import androidx.compose.ui.unit.dp
|
||||
import io.element.android.compound.theme.ElementTheme
|
||||
import io.element.android.compound.tokens.generated.CompoundIcons
|
||||
import io.element.android.libraries.designsystem.components.avatar.Avatar
|
||||
import io.element.android.libraries.designsystem.components.avatar.AvatarSize
|
||||
|
|
@ -67,13 +68,14 @@ fun SelectedUser(
|
|||
modifier = Modifier.clipToBounds(),
|
||||
text = matrixUser.getBestName(),
|
||||
overflow = TextOverflow.Ellipsis,
|
||||
maxLines = 1,
|
||||
style = MaterialTheme.typography.bodyLarge,
|
||||
maxLines = 2,
|
||||
style = ElementTheme.typography.fontBodyMdRegular,
|
||||
textAlign = TextAlign.Center,
|
||||
)
|
||||
}
|
||||
if (canRemove) {
|
||||
Surface(
|
||||
color = MaterialTheme.colorScheme.primary,
|
||||
color = ElementTheme.colors.textPrimary,
|
||||
modifier = Modifier
|
||||
.clip(CircleShape)
|
||||
.size(20.dp)
|
||||
|
|
@ -87,7 +89,7 @@ fun SelectedUser(
|
|||
Icon(
|
||||
imageVector = CompoundIcons.Close(),
|
||||
contentDescription = stringResource(id = CommonStrings.action_remove),
|
||||
tint = MaterialTheme.colorScheme.onPrimary,
|
||||
tint = ElementTheme.colors.iconOnSolidPrimary,
|
||||
modifier = Modifier.padding(2.dp)
|
||||
)
|
||||
}
|
||||
|
|
@ -99,7 +101,7 @@ fun SelectedUser(
|
|||
@Composable
|
||||
internal fun SelectedUserPreview() = ElementPreview {
|
||||
SelectedUser(
|
||||
aMatrixUser(),
|
||||
aMatrixUser(displayName = "John Doe"),
|
||||
canRemove = true,
|
||||
onUserRemoved = {},
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:72ef49a1eca78f466fc672b974f32e27151984d001f693f339798ba1d220f4ae
|
||||
size 30295
|
||||
oid sha256:f38b34258aaeb8729838b60ba65849078e40602e2a7e8e58a64e1bc6fb2fea88
|
||||
size 29865
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3d7f9c575314946018bcd1874080dcb3b4289dd0ff6d2bc2227a0c889ad7dc8d
|
||||
size 83722
|
||||
oid sha256:e35affb35dd30ec4af59e9578a26eda8ee03e7f5b4aba102196239ea5a859d52
|
||||
size 83273
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0473d3e5b0319219f5b2882f83ce0671fa280d5189415991206f69d5a53d9e0f
|
||||
size 28812
|
||||
oid sha256:58d461b92f149926d2705267971c88a6c2d56c688493b360c3b0429b2e452e53
|
||||
size 28489
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f538ad81c2149dd602516b816da7a13f8c2b0c7c91ecf71427086904e4592098
|
||||
size 80986
|
||||
oid sha256:e3c08a0b3926652b62acba0a8710d06399ac15fac98b23c40ff797c5de2d11f3
|
||||
size 80692
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:430c04eb784c1dd16811268dd1e8a9849e5fc191ca1fbea34359feb5a3872d0e
|
||||
size 26229
|
||||
oid sha256:5d35a587f1bbc80a7c941ffa95b4d342bcef4bc38aad124888ef78ee08780247
|
||||
size 25870
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:33eb14ad0f5b9a8cd73122b87f217e76e0d0527df009bd2669643153671bd889
|
||||
size 57450
|
||||
oid sha256:46ff5bd2c47b0dc16573ce09ee993262d7d5b74e7c24a0dd811e11c1ae5f1262
|
||||
size 57054
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:131198fb731da1f4d8be51c9832a1acc5847a9ccd6bfe9e5c71cf05eed08e918
|
||||
size 25436
|
||||
oid sha256:30b5b2a8f215241acdc365b18e849a635962f6120f1d863572d92a09d98fbb9d
|
||||
size 25076
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6e044b924c9c148788189980498c768875ca3ac4db6e048dfefa105b04586caa
|
||||
size 56246
|
||||
oid sha256:737ef3ac49bd1d1115089bf58fd9056634e64f2f61e12bad271575790d02b940
|
||||
size 55869
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:86db40c2332f3eeb0a2df891574a264f4318d7de30a2b1f86b720d61398785c6
|
||||
size 84824
|
||||
oid sha256:2fe73b4f444fd4d42d99de9705ca5a73ee95cc954ab39ec874208277dac9b131
|
||||
size 84224
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:76e22c3fa11d9916e8f60886cfe9d699935bf9db8b410322e4de04c69038abf8
|
||||
size 81458
|
||||
oid sha256:495521b5b0d4cb90ebd5be62975673965bd103c5bba12c43c3c6b2d6003acbfb
|
||||
size 81045
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b85a1bc4512b44cdfa710dca25e186a817da9e96bc02f5933cdabc625e76926e
|
||||
size 30445
|
||||
oid sha256:0ebc8308b8fde4864cc9ebfe9d9462386ee7c5e51afcb61634d0e45fc60a8063
|
||||
size 30019
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e76f387930eb2836eaeceb9cf05924915b60e0e2a57713252835ddc372ebf54e
|
||||
size 27933
|
||||
oid sha256:69a3058a0d58907d53433525e789ec315e9dc812106ee092f0e19fe32693dd32
|
||||
size 27497
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ba5a600e59b501abde572dcb380f5dbb55404863402bc9f8fde9bbcf18e1dca8
|
||||
size 46120
|
||||
oid sha256:c7017942d00ccb2793eda1b7896ef096737ab855e7aa081cd867c6dd65d99908
|
||||
size 45948
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d50c5367f08b3f91d88f450553ce15047f66833cc1c6924833948b0eef090d6c
|
||||
size 40167
|
||||
oid sha256:b2e1d5fb42d42e4e12b56e386317efab47cfdb415ea7b51f6a1d0202cb20c6cb
|
||||
size 40408
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:80fba23f10ab9ae7f62be6357c95e0ed24bedc99ef491a5b8175eb958bcaad21
|
||||
size 28992
|
||||
oid sha256:44983e477d8dfe77ff29bc5be8bf8095639492f0b6f6448a69adb5c36fdb50b2
|
||||
size 28497
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5b04e83b350724ec6082775ef7d736cb95dc3d3e51311308f27f15c9f5f646e8
|
||||
size 26853
|
||||
oid sha256:20d315cdb06e0408f7da15d2c960e95a329873a6a05b52c3ea1193ba020f3b95
|
||||
size 26524
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ee56607041333747b606761771e00fcd135b4d2c8e06067f30e85127300bed9b
|
||||
size 45226
|
||||
oid sha256:fa100d28a0fd1d89d96ed188eb716d009e8198ccaf04d4582ac136be1bf36a4b
|
||||
size 45034
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5281dddbe8fc37a65e9c6050627f5d326f990477a48bce88fb419a9eef277245
|
||||
size 38400
|
||||
oid sha256:8d3d52c31948ffcfa1600ad755bc6183a1737b0b0ad58d47cfd2f30eaa4a8351
|
||||
size 38467
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:56873f51dd8de6630f5423f796687049a920bddafb5af17a47e4f901a5d9f360
|
||||
size 71767
|
||||
oid sha256:9554fbc2927f9f0e99c47df476ad219f4664f0351635e4183a47b969a54fd9bd
|
||||
size 71943
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:34efa87358c4529d0f67729fd417a3d52dc5a0031192dbf123bcc667d6e78391
|
||||
size 56803
|
||||
oid sha256:279658180c4402f0c85aa9c79f4ff21f31c5c3004ba6da8dca9464b95a29288e
|
||||
size 55747
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4818ed45a985359112ee92c38148f1030647ead270727525fed1cf1f5c493180
|
||||
size 66293
|
||||
oid sha256:1ad92e642b5f93f9f80336ba89bf3f5c343ed814e48f59800747a61886b4b549
|
||||
size 65951
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:57b0cd541704cd82962e03d2173bb37350d2f91bf1f3d6121314bdccad50c8e6
|
||||
size 66255
|
||||
oid sha256:6051bfc6f14353c3591acd6d8964f973880c05d923649ec0f6941a27dd1ae008
|
||||
size 65917
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ebd6484e81803758298b4ff0e19a042918d85c29e3828a561c83328a9b3e4d73
|
||||
size 60644
|
||||
oid sha256:aa991225b68802dea704202bc9bcfa01eeb28a49660d888f6a5c4a33026bffd2
|
||||
size 60445
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:77bca4e3380c63dba4e7def0937770c6d5b1ae5bde61e4743ecde035431fb8be
|
||||
size 64625
|
||||
oid sha256:8bb41968ae644485c0e3dd51f23ffee1cfabf62d2c72df9efc577545913c87fb
|
||||
size 64304
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b265ee7f4eb6c56e531004af6daae9ad89167b027d089fa960fc17553ec80131
|
||||
size 66783
|
||||
oid sha256:fd67125b3738e7d5fa88cbdcb45b08521e9cd1b2d66fcfefc2c209390dc051e4
|
||||
size 66790
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:eb629e088198030a3a9a09c8cfc815a87e831dc6f5e26b225d17c61883585e50
|
||||
size 58902
|
||||
oid sha256:da8a5be1f5631f24966baa8d430e2a992ce5228a821c6fbf6395deb2cfcf075a
|
||||
size 58490
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f4dd6cbcd17c5c97c240a1244f3233f0f228612b317cc8f6b3f39a0d0d2b05fd
|
||||
size 70120
|
||||
oid sha256:7ff20b46baf79c6e648870f9004afcc8f2fb613b9e3ab2cc4f5dd7af63a0dbb9
|
||||
size 69763
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9d1cf36a65fc7e916a15a0a6eab4e5eaba47f8df5d39d5cb9fe75b137138a96d
|
||||
size 69609
|
||||
oid sha256:34399cf5697534a6766af2fc9cb6af1602e308548c5b6c7c20b7ad89e8c0e62d
|
||||
size 69718
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:fa0b65d6cd2eac2746a2ba1598f075a6d5d144cfc62fbde8e7e17c5b69d85f1c
|
||||
size 53497
|
||||
oid sha256:214c985100177029d3dad2a0a141ba4a964ea82353cb06744236108ce8ac309f
|
||||
size 52409
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:417ca17376f6e296a8955390c800191ebdccf8b358dbc738f438b70c2568606e
|
||||
size 64439
|
||||
oid sha256:28c9020725779cf02b05e7581ac91ff2cc22cc94b086d9ce825b392d8517d0d9
|
||||
size 64159
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a73ae445a25011b1c376f93b7e7203b023e23a027aa2a44d109008a1cca98406
|
||||
size 64193
|
||||
oid sha256:021f2ecc61aac6f7e856f088a7000b89ab7f757eb417b2d716f88df4f820d329
|
||||
size 63910
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a98762c06334da0cc53d04826623850b15d3fc5fdf7cdf8f50f896574a048d0d
|
||||
size 58356
|
||||
oid sha256:f97240954027f0fd342c7da80e45a96d9adcfb97d5d0e13dda784fc3b0c95f87
|
||||
size 58217
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b6a02199d5c7b5bf4ff0251d437f071e2ce54440b1e0b4519305e0080f7ed6ec
|
||||
size 60375
|
||||
oid sha256:29027fe574ca4681e532b127d609e0e71a9f6095a56ee81db33dd258cbb4701b
|
||||
size 60085
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5898156b9c4ce053ab24728b0679bf6d2d0873459a7b1e4951f8f9ce646e4074
|
||||
size 62587
|
||||
oid sha256:ee463af6686a4b06cdc53fd7895f987012128c8ebeadfb72b02a217c23214ea0
|
||||
size 62651
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6648e7dc5c97e27efbf347380fc3ae3c67866595b086e1adefe36a274bf3afc2
|
||||
size 56314
|
||||
oid sha256:a716ef67b9c6b3873013aaa53988b1094f55c944cb82f86d508e2c6b063fc4d8
|
||||
size 55828
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5d984c253b4990220acebfe91d33fb7f4201fb7a976bea48b2bc04e4788ddee2
|
||||
size 67263
|
||||
oid sha256:4d3cce385286394c91dc2faea3ee0033b829d2a2fa67203c50c42c96ce19a13b
|
||||
size 66971
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d43c967fc2eca972c4c563afad5a3161de80424441c0853f20f27e297e421844
|
||||
size 8004
|
||||
oid sha256:09e2cd93c41c94e71e0ea3710c9e6014e64c6d7e7b52445e2d93a704fcf444f9
|
||||
size 7847
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:016da4bfe577460531337a6c301aa4490dcbeb22f6b3b793e0cbdd9393189403
|
||||
size 8234
|
||||
oid sha256:50096674e6cd310c3d223aca438b1f7d74ad563511ea4eea5734d011215e7889
|
||||
size 8076
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f967cfcfdc0d25779d534dd36d08783a2715aec303b9888ce3b5c9935d903755
|
||||
size 8927
|
||||
oid sha256:c31619c01740b09c1b8216450d35620fa08596d78ab860490d0c70de2a131804
|
||||
size 9064
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5c6bbdae568e7448cba22e9524a9d66e3e1406aacc5de88c15a0e06e9d9d0564
|
||||
size 9061
|
||||
oid sha256:7a8a8500e4034d96f9f275e08835b4c169ae53b4ef7e23b956817bb782270f94
|
||||
size 9212
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4be12a6f8868fac70004572533f79a1e43bb96ce9dba45688229da74372bd3ee
|
||||
size 73558
|
||||
oid sha256:ef7e8aed157d4f57e115fdbea7838b3493fdc7d35d08fefae3452457039242d3
|
||||
size 71258
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e5e25a638a07cb844dde029258591114cad61f2cd03596e3e2e6fe198852047d
|
||||
size 72518
|
||||
oid sha256:27b29a858028600ec9be0cf37c8541b831456ec83564f657a43641289152b42a
|
||||
size 70724
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue