mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-03 06:55:41 +00:00
Icon in BigIcon have a iconPrimary color according to Figma.
This commit is contained in:
-1
@@ -121,7 +121,6 @@ private fun FullscreenAnnouncementHeader(
|
|||||||
subTitle = announcement.subtitle(),
|
subTitle = announcement.subtitle(),
|
||||||
iconStyle = BigIcon.Style.Default(
|
iconStyle = BigIcon.Style.Default(
|
||||||
vectorIcon = announcement.icon(),
|
vectorIcon = announcement.icon(),
|
||||||
usePrimaryTint = true,
|
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-2
@@ -70,8 +70,7 @@ private fun SignedOutHeader() {
|
|||||||
title = stringResource(id = R.string.screen_signed_out_title),
|
title = stringResource(id = R.string.screen_signed_out_title),
|
||||||
subTitle = stringResource(id = R.string.screen_signed_out_subtitle_v2),
|
subTitle = stringResource(id = R.string.screen_signed_out_subtitle_v2),
|
||||||
iconStyle = BigIcon.Style.Default(
|
iconStyle = BigIcon.Style.Default(
|
||||||
CompoundIcons.Devices(),
|
vectorIcon = CompoundIcons.Devices(),
|
||||||
usePrimaryTint = true,
|
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -357,7 +357,7 @@ private fun EmptySpaceView(
|
|||||||
IconTitleSubtitleMolecule(
|
IconTitleSubtitleMolecule(
|
||||||
title = stringResource(R.string.screen_space_empty_state_title),
|
title = stringResource(R.string.screen_space_empty_state_title),
|
||||||
subTitle = null,
|
subTitle = null,
|
||||||
iconStyle = BigIcon.Style.Default(vectorIcon = CompoundIcons.Room(), usePrimaryTint = true),
|
iconStyle = BigIcon.Style.Default(vectorIcon = CompoundIcons.Room()),
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
.padding(top = 40.dp, start = 24.dp, end = 24.dp, bottom = 24.dp),
|
.padding(top = 40.dp, start = 24.dp, end = 24.dp, bottom = 24.dp),
|
||||||
|
|||||||
+2
@@ -32,6 +32,8 @@ import io.element.android.libraries.designsystem.theme.components.Text
|
|||||||
/**
|
/**
|
||||||
* IconTitleSubtitleMolecule is a molecule which displays an icon, a title and a subtitle.
|
* IconTitleSubtitleMolecule is a molecule which displays an icon, a title and a subtitle.
|
||||||
*
|
*
|
||||||
|
* Ref: https://www.figma.com/design/G1xy0HDZKJf5TCRFmKb5d5/Compound-Android-Components?node-id=1964-3385
|
||||||
|
*
|
||||||
* @param title the title to display
|
* @param title the title to display
|
||||||
* @param subTitle the subtitle to display
|
* @param subTitle the subtitle to display
|
||||||
* @param iconStyle the style of the [BigIcon] to display
|
* @param iconStyle the style of the [BigIcon] to display
|
||||||
|
|||||||
+1
-5
@@ -53,13 +53,11 @@ object BigIcon {
|
|||||||
* @param vectorIcon the [ImageVector] to display
|
* @param vectorIcon the [ImageVector] to display
|
||||||
* @param contentDescription the content description of the icon, if any. It defaults to `null`
|
* @param contentDescription the content description of the icon, if any. It defaults to `null`
|
||||||
* @param useCriticalTint whether the icon and background should be rendered using critical tint
|
* @param useCriticalTint whether the icon and background should be rendered using critical tint
|
||||||
* @param usePrimaryTint whether the icon should be rendered using primary tint
|
|
||||||
*/
|
*/
|
||||||
data class Default(
|
data class Default(
|
||||||
val vectorIcon: ImageVector,
|
val vectorIcon: ImageVector,
|
||||||
val contentDescription: String? = null,
|
val contentDescription: String? = null,
|
||||||
val useCriticalTint: Boolean = false,
|
val useCriticalTint: Boolean = false,
|
||||||
val usePrimaryTint: Boolean = false,
|
|
||||||
) : Style
|
) : Style
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -129,10 +127,8 @@ object BigIcon {
|
|||||||
val iconTint = when (style) {
|
val iconTint = when (style) {
|
||||||
is Style.Default -> if (style.useCriticalTint) {
|
is Style.Default -> if (style.useCriticalTint) {
|
||||||
ElementTheme.colors.iconCriticalPrimary
|
ElementTheme.colors.iconCriticalPrimary
|
||||||
} else if (style.usePrimaryTint) {
|
|
||||||
ElementTheme.colors.iconPrimary
|
|
||||||
} else {
|
} else {
|
||||||
ElementTheme.colors.iconSecondary
|
ElementTheme.colors.iconPrimary
|
||||||
}
|
}
|
||||||
Style.Alert,
|
Style.Alert,
|
||||||
Style.AlertSolid -> ElementTheme.colors.iconCriticalPrimary
|
Style.AlertSolid -> ElementTheme.colors.iconCriticalPrimary
|
||||||
|
|||||||
-1
@@ -71,7 +71,6 @@ fun MediaFileView(
|
|||||||
modifier = Modifier.align(Alignment.CenterHorizontally),
|
modifier = Modifier.align(Alignment.CenterHorizontally),
|
||||||
style = BigIcon.Style.Default(
|
style = BigIcon.Style.Default(
|
||||||
vectorIcon = icon,
|
vectorIcon = icon,
|
||||||
usePrimaryTint = true,
|
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
if (info != null) {
|
if (info != null) {
|
||||||
|
|||||||
Reference in New Issue
Block a user