diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/color/BitwardenColorScheme.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/color/BitwardenColorScheme.kt index aa469e50ba..421a32a314 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/color/BitwardenColorScheme.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/color/BitwardenColorScheme.kt @@ -17,6 +17,7 @@ data class BitwardenColorScheme( val toggleButton: ToggleButtonColors, val sliderButton: SliderButtonColors, val status: StatusColors, + val illustration: IllustrationColors, ) { /** * Defines all the text colors for the app. @@ -64,8 +65,6 @@ data class BitwardenColorScheme( val reversed: Color, val badgeBackground: Color, val badgeForeground: Color, - val faviconForeground: Color, - val faviconBackground: Color, ) /** @@ -126,4 +125,13 @@ data class BitwardenColorScheme( val weak2: Color, val error: Color, ) + + /** + * Defines all the illustration colors for the app. + */ + @Immutable + data class IllustrationColors( + val outline: Color, + val backgroundPrimary: Color, + ) } diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/color/ColorScheme.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/color/ColorScheme.kt index 9b50b87185..2f9af64a9d 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/color/ColorScheme.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/color/ColorScheme.kt @@ -34,8 +34,6 @@ val darkBitwardenColorScheme: BitwardenColorScheme = BitwardenColorScheme( reversed = PrimitiveColors.gray1100, badgeBackground = PrimitiveColors.pink200, badgeForeground = PrimitiveColors.gray1100, - faviconForeground = PrimitiveColors.blue500, - faviconBackground = PrimitiveColors.blue200, ), filledButton = BitwardenColorScheme.FilledButtonColors( background = PrimitiveColors.blue400, @@ -71,6 +69,10 @@ val darkBitwardenColorScheme: BitwardenColorScheme = BitwardenColorScheme( weak2 = PrimitiveColors.yellow200, error = PrimitiveColors.red200, ), + illustration = BitwardenColorScheme.IllustrationColors( + outline = PrimitiveColors.blue500, + backgroundPrimary = PrimitiveColors.blue200, + ), ) /** @@ -104,8 +106,6 @@ val lightBitwardenColorScheme: BitwardenColorScheme = BitwardenColorScheme( reversed = PrimitiveColors.gray100, badgeBackground = PrimitiveColors.pink100, badgeForeground = PrimitiveColors.gray100, - faviconForeground = PrimitiveColors.blue700, - faviconBackground = PrimitiveColors.blue100, ), filledButton = BitwardenColorScheme.FilledButtonColors( background = PrimitiveColors.blue500, @@ -141,6 +141,10 @@ val lightBitwardenColorScheme: BitwardenColorScheme = BitwardenColorScheme( weak2 = PrimitiveColors.yellow300, error = PrimitiveColors.red300, ), + illustration = BitwardenColorScheme.IllustrationColors( + outline = PrimitiveColors.blue700, + backgroundPrimary = PrimitiveColors.blue100, + ), ) /** @@ -180,8 +184,6 @@ fun dynamicBitwardenColorScheme( reversed = materialColorScheme.inversePrimary, badgeBackground = materialColorScheme.error, badgeForeground = materialColorScheme.onError, - faviconForeground = materialColorScheme.onTertiaryContainer, - faviconBackground = materialColorScheme.tertiaryContainer, ), filledButton = BitwardenColorScheme.FilledButtonColors( background = materialColorScheme.primary, @@ -217,6 +219,10 @@ fun dynamicBitwardenColorScheme( weak2 = defaultTheme.status.weak2, error = defaultTheme.status.error, ), + illustration = BitwardenColorScheme.IllustrationColors( + outline = materialColorScheme.tertiaryContainer, + backgroundPrimary = materialColorScheme.onTertiaryContainer, + ), ) } diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/component/ItemHeader.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/component/ItemHeader.kt index 953f203b6d..ecadcab29e 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/component/ItemHeader.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/component/ItemHeader.kt @@ -188,7 +188,7 @@ private fun ItemHeaderIcon( modifier = if (iconData is IconData.Local) { modifier.then( Modifier.background( - color = BitwardenTheme.colorScheme.icon.faviconBackground, + color = BitwardenTheme.colorScheme.illustration.backgroundPrimary, shape = BitwardenTheme.shapes.favicon, ), ) @@ -199,7 +199,7 @@ private fun ItemHeaderIcon( BitwardenIcon( iconData = iconData, contentDescription = null, - tint = BitwardenTheme.colorScheme.icon.faviconForeground, + tint = BitwardenTheme.colorScheme.illustration.outline, modifier = Modifier .nullableTestTag(testTag), )