From 3237ef80a323d1eff23121fc4cac7c8145138e0f Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Wed, 9 Sep 2026 10:11:20 -0400 Subject: [PATCH] Update share contact colors. --- .../res/layout/conversation_item_received_shared_contact.xml | 2 +- .../main/res/layout/conversation_item_sent_shared_contact.xml | 2 +- .../java/org/signal/core/ui/compose/theme/ExtendedColors.kt | 4 ++++ .../main/java/org/signal/core/ui/compose/theme/SignalTheme.kt | 4 ++++ core/ui/src/main/res/values-night/material3_colors.xml | 2 ++ core/ui/src/main/res/values/material3_colors.xml | 2 ++ core/ui/src/main/res/values/material3_colors_dark.xml | 2 ++ core/ui/src/main/res/values/material3_colors_light.xml | 2 ++ 8 files changed, 18 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/conversation_item_received_shared_contact.xml b/app/src/main/res/layout/conversation_item_received_shared_contact.xml index aec0fd93f5..1094eb0520 100644 --- a/app/src/main/res/layout/conversation_item_received_shared_contact.xml +++ b/app/src/main/res/layout/conversation_item_received_shared_contact.xml @@ -15,5 +15,5 @@ app:contact_footerIconColor="@color/conversation_item_recv_icon_color" app:contact_footerAlpha="0.7" app:contact_actionTextColor="@color/signal_colorOnSurface" - app:contact_actionBackgroundColor="@color/signal_colorTransparent5" + app:contact_actionBackgroundColor="@color/signal_colorSurfaceVariantFill" tools:background="@color/signal_colorPrimary"/> diff --git a/app/src/main/res/layout/conversation_item_sent_shared_contact.xml b/app/src/main/res/layout/conversation_item_sent_shared_contact.xml index 835678d939..ca9b0997ae 100644 --- a/app/src/main/res/layout/conversation_item_sent_shared_contact.xml +++ b/app/src/main/res/layout/conversation_item_sent_shared_contact.xml @@ -13,6 +13,6 @@ app:contact_captionColor="@color/conversation_item_sent_text_secondary_color" app:contact_chevronColor="@color/signal_colorTransparent3" app:contact_footerIconColor="@color/conversation_item_sent_text_secondary_color" - app:contact_actionTextColor="@color/signal_colorOnPrimary" + app:contact_actionTextColor="@color/signal_colorOnCustom" app:contact_actionBackgroundColor="@color/signal_colorTransparent2" tools:background="@color/signal_colorPrimary"/> diff --git a/core/ui/src/main/java/org/signal/core/ui/compose/theme/ExtendedColors.kt b/core/ui/src/main/java/org/signal/core/ui/compose/theme/ExtendedColors.kt index 77f9b42887..a30a0fd945 100644 --- a/core/ui/src/main/java/org/signal/core/ui/compose/theme/ExtendedColors.kt +++ b/core/ui/src/main/java/org/signal/core/ui/compose/theme/ExtendedColors.kt @@ -7,6 +7,7 @@ import androidx.compose.ui.graphics.Color @Immutable data class ExtendedColors( val neutralSurface: Color, + val neutralFill: Color, val colorOnCustom: Color, val colorOnCustomVariant: Color, val colorSurface1: Color, @@ -14,6 +15,7 @@ data class ExtendedColors( val colorSurface3: Color, val colorSurface4: Color, val colorSurface5: Color, + val colorSurfaceVariantFill: Color, val colorTransparent1: Color, val colorTransparent2: Color, val colorTransparent3: Color, @@ -37,6 +39,7 @@ data class ExtendedColors( val LocalExtendedColors = staticCompositionLocalOf { ExtendedColors( neutralSurface = Color.Unspecified, + neutralFill = Color.Unspecified, colorOnCustom = Color.Unspecified, colorOnCustomVariant = Color.Unspecified, colorSurface1 = Color.Unspecified, @@ -44,6 +47,7 @@ val LocalExtendedColors = staticCompositionLocalOf { colorSurface3 = Color.Unspecified, colorSurface4 = Color.Unspecified, colorSurface5 = Color.Unspecified, + colorSurfaceVariantFill = Color.Unspecified, colorTransparent1 = Color.Unspecified, colorTransparent2 = Color.Unspecified, colorTransparent3 = Color.Unspecified, diff --git a/core/ui/src/main/java/org/signal/core/ui/compose/theme/SignalTheme.kt b/core/ui/src/main/java/org/signal/core/ui/compose/theme/SignalTheme.kt index 77678b8a8a..08b624188f 100644 --- a/core/ui/src/main/java/org/signal/core/ui/compose/theme/SignalTheme.kt +++ b/core/ui/src/main/java/org/signal/core/ui/compose/theme/SignalTheme.kt @@ -104,6 +104,7 @@ private val lightColorScheme = lightColorScheme( private val lightExtendedColors = ExtendedColors( neutralSurface = Color(0x99FFFFFF), + neutralFill = Color(0x1A000000), colorOnCustom = Color(0xFFFFFFFF), colorOnCustomVariant = Color(0xB3FFFFFF), colorSurface1 = Color(0xFFF2F5F9), @@ -111,6 +112,7 @@ private val lightExtendedColors = ExtendedColors( colorSurface3 = Color(0xFFE8ECF4), colorSurface4 = Color(0xFFE6EAF3), colorSurface5 = Color(0xFFE3E7F1), + colorSurfaceVariantFill = Color(0xCCFFFFFF), colorTransparent1 = Color(0x14FFFFFF), colorTransparent2 = Color(0x29FFFFFF), colorTransparent3 = Color(0x8FFFFFFF), @@ -133,6 +135,7 @@ private val lightExtendedColors = ExtendedColors( private val darkExtendedColors = ExtendedColors( neutralSurface = Color(0x14FFFFFF), + neutralFill = Color(0x33FFFFFF), colorOnCustom = Color(0xFFFFFFFF), colorOnCustomVariant = Color(0x18FFFFFF), colorSurface1 = Color(0xFF23242A), @@ -140,6 +143,7 @@ private val darkExtendedColors = ExtendedColors( colorSurface3 = Color(0xFF2C2F37), colorSurface4 = Color(0xFF2E3039), colorSurface5 = Color(0xFF31343E), + colorSurfaceVariantFill = Color(0x33FFFFFF), colorTransparent1 = Color(0x0AFFFFFF), colorTransparent2 = Color(0x1FFFFFFF), colorTransparent3 = Color(0x29FFFFFF), diff --git a/core/ui/src/main/res/values-night/material3_colors.xml b/core/ui/src/main/res/values-night/material3_colors.xml index 221ed486fd..f6b7cbf849 100644 --- a/core/ui/src/main/res/values-night/material3_colors.xml +++ b/core/ui/src/main/res/values-night/material3_colors.xml @@ -7,6 +7,7 @@ @color/signal_dark_colorSecondaryContainer @color/signal_dark_colorSurface @color/signal_dark_colorSurfaceVariant + @color/signal_dark_colorSurfaceVariantFill @color/signal_dark_colorBackground @color/signal_dark_colorError @color/signal_dark_colorErrorContainer @@ -20,6 +21,7 @@ @color/signal_dark_colorOnBackground @color/signal_dark_colorOutline @color/signal_dark_neutralSurface + @color/signal_dark_neutralFill @color/signal_dark_colorOnCustom @color/signal_dark_colorOnCustomVariant diff --git a/core/ui/src/main/res/values/material3_colors.xml b/core/ui/src/main/res/values/material3_colors.xml index 45de06b7de..48ee2416ea 100644 --- a/core/ui/src/main/res/values/material3_colors.xml +++ b/core/ui/src/main/res/values/material3_colors.xml @@ -7,6 +7,7 @@ @color/signal_light_colorSecondaryContainer @color/signal_light_colorSurface @color/signal_light_colorSurfaceVariant + @color/signal_light_colorSurfaceVariantFill @color/signal_light_colorBackground @color/signal_light_colorError @color/signal_light_colorErrorContainer @@ -20,6 +21,7 @@ @color/signal_light_colorOnBackground @color/signal_light_colorOutline @color/signal_light_neutralSurface + @color/signal_dark_neutralFill @color/signal_light_colorOnCustom @color/signal_light_colorOnCustomVariant diff --git a/core/ui/src/main/res/values/material3_colors_dark.xml b/core/ui/src/main/res/values/material3_colors_dark.xml index 3aafffb683..98beaf3ce0 100644 --- a/core/ui/src/main/res/values/material3_colors_dark.xml +++ b/core/ui/src/main/res/values/material3_colors_dark.xml @@ -6,6 +6,7 @@ #414659 #1B1C1F #303133 + #33FFFFFF #1B1C1F #FFB4A9 #930006 @@ -19,6 +20,7 @@ #E2E1E5 #5C5E65 #14FFFFFF + #33FFFFFF #FFFFFF #B3FFFFFF diff --git a/core/ui/src/main/res/values/material3_colors_light.xml b/core/ui/src/main/res/values/material3_colors_light.xml index 9b1f569329..4b349e5f30 100644 --- a/core/ui/src/main/res/values/material3_colors_light.xml +++ b/core/ui/src/main/res/values/material3_colors_light.xml @@ -6,6 +6,7 @@ #DCE5F9 #FBFCFF #E7EBF3 + #CCFFFFFF #FBFCFF #BA1B1B #FFDAD4 @@ -19,6 +20,7 @@ #1B1D1D #808389 #99FFFFFF + #1A000000 #FFFFFF #B3FFFFFF