github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-03-22 20:41:29 -05:00
Code Issues 144 Packages Projects Releases 118 Wiki Activity

Add illustration colors

Browse Source
This commit is contained in:
Patrick Honkonen
2025-02-24 16:44:51 -05:00
committed by David Perez
parent 7804d8430f
commit 60da236f3e
3 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/color/BitwardenColorScheme.kt
View File

@@ -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,
)
}

18
app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/color/ColorScheme.kt
View File

@@ -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,
),
)
}

4
app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/component/ItemHeader.kt
View File

@@ -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),
)