Make icons in the Chat screen top bar 16dp (#6733)
* Make icons in the Chat screen top bar 16dp. This matches the designs in Figma. * Fix the padding between the title and the icons * Update screenshots --------- Co-authored-by: ElementBot <android@element.io>
This commit is contained in:
parent
f0b9ce567a
commit
70452842d3
4 changed files with 14 additions and 7 deletions
|
|
@ -15,6 +15,7 @@ import androidx.compose.foundation.layout.Row
|
|||
import androidx.compose.foundation.layout.RowScope
|
||||
import androidx.compose.foundation.layout.WindowInsets
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||
import androidx.compose.runtime.Composable
|
||||
|
|
@ -91,9 +92,12 @@ internal fun MessagesViewTopBar(
|
|||
modifier = titleModifier
|
||||
)
|
||||
|
||||
val iconModifier = Modifier.size(16.dp)
|
||||
|
||||
when (dmUserIdentityState) {
|
||||
IdentityState.Verified -> {
|
||||
Icon(
|
||||
modifier = iconModifier,
|
||||
imageVector = CompoundIcons.Verified(),
|
||||
tint = ElementTheme.colors.iconSuccessPrimary,
|
||||
contentDescription = null,
|
||||
|
|
@ -101,6 +105,7 @@ internal fun MessagesViewTopBar(
|
|||
}
|
||||
IdentityState.VerificationViolation -> {
|
||||
Icon(
|
||||
modifier = iconModifier,
|
||||
imageVector = CompoundIcons.ErrorSolid(),
|
||||
tint = ElementTheme.colors.iconCriticalPrimary,
|
||||
contentDescription = null,
|
||||
|
|
@ -112,11 +117,13 @@ internal fun MessagesViewTopBar(
|
|||
when (sharedHistoryIcon) {
|
||||
SharedHistoryIcon.NONE -> Unit
|
||||
SharedHistoryIcon.SHARED -> Icon(
|
||||
modifier = iconModifier,
|
||||
imageVector = CompoundIcons.History(),
|
||||
tint = ElementTheme.colors.iconInfoPrimary,
|
||||
contentDescription = stringResource(CommonStrings.common_shared_history),
|
||||
)
|
||||
SharedHistoryIcon.WORLD_READABLE -> Icon(
|
||||
modifier = iconModifier,
|
||||
imageVector = CompoundIcons.UserProfileSolid(),
|
||||
tint = ElementTheme.colors.iconInfoPrimary,
|
||||
contentDescription = stringResource(CommonStrings.common_world_readable_history),
|
||||
|
|
@ -150,7 +157,7 @@ private fun RoomAvatarAndNameRow(
|
|||
)
|
||||
Text(
|
||||
modifier = Modifier
|
||||
.padding(horizontal = 8.dp)
|
||||
.padding(start = 8.dp)
|
||||
.semantics {
|
||||
heading()
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e26887bd81e10726414e1833029b4b51e22e534684a230777ca50f86024af994
|
||||
size 56430
|
||||
oid sha256:dc098d35a0af82ec65dee8ccadf6df83246fbbc7933239fd940de938a4dd4476
|
||||
size 55995
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ce44cf850169736008a3f3fc21a2be4fb044badfae631b0284ce379b325879df
|
||||
size 55533
|
||||
oid sha256:fb5305c7ccf69c49fde95cd3601bf2ee103988775b366cb2ee3fcd04e8673729
|
||||
size 55131
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c64b270815016ecd157fe430538090afc8f94c4ec2402a6c6de01ff1d762db94
|
||||
size 131744
|
||||
oid sha256:23aabf96e5dc84257968a77ad406a8f3952b24fa8d8c03612bddfc08b6c990c6
|
||||
size 131751
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue