diff --git a/components-compose/src/main/java/uk/gov/hmrc/components/compose/ui/theme/Color.kt b/components-compose/src/main/java/uk/gov/hmrc/components/compose/ui/theme/Color.kt index 1e05920b..f7488f73 100644 --- a/components-compose/src/main/java/uk/gov/hmrc/components/compose/ui/theme/Color.kt +++ b/components-compose/src/main/java/uk/gov/hmrc/components/compose/ui/theme/Color.kt @@ -19,16 +19,12 @@ import androidx.compose.ui.graphics.Color // Light theme colors val HmrcBlack = Color(0xFF0B0C0C) -val HmrcWhite = Color(0xFFFFFFFF) -val HmrcWhiteBackground = Color(0xFFFFFFFF) -val HmrcGreen1 = Color(0xFF00703C) val HmrcGreen2 = Color(0xFF85994B) -val HmrcBlue = Color(0xFF1D70B8) val HmrcTeal = Color(0xFF28A197) val HmrcRed = Color(0xFFD4351C) +// val HmrcGrey1 = Color(0xFF505A5F) val HmrcGrey2 = Color(0xFFB1B4B6) -val HmrcGrey3 = Color(0xFFF3F2F1) val HmrcPink = Color(0xFFCA2B75) val HmrcYellow = Color(0xFFFFBF47) val HmrcAlwaysBlack = Color(0xFF0B0C0C) @@ -37,14 +33,42 @@ val HmrcTransparent = Color.Transparent // Dark theme colors val HmrcBlackDark = Color(0xFFFFFFFF) -val HmrcWhiteDark = Color(0xFF0B0C0C) -val HmrcWhiteBackgroundDark = Color(0xFF262626) -val HmrcGreen1Dark = Color(0xFF69B134) val HmrcGreen2Dark = Color(0xFF28A197) -val HmrcBlueDark = Color(0xFF5BC0C6) val HmrcRedDark = Color(0xFFEB66CA) val HmrcGrey1Dark = Color(0xFFB1B4B6) val HmrcGrey2Dark = Color(0xFF6F777B) -val HmrcGrey3Dark = Color(0xFF0B0C0C) val HmrcPinkDark = Color(0xFFBB94FF) val HmrcYellowDark = Color(0xFFFEFF4F) + +// light mode colours that pair with the changing dark mode colors +val HmrcWhite = Color(0xFFFFFFFF) +val HmrcWhiteBackground = Color(0xFFFFFFFF) +val HmrcBlue = Color(0xFF1D70B8) +val HmrcGreen1 = Color(0xFF00703C) +val HmrcGrey3 = Color(0xFFF3F2F1) + +// old dark mode colors (to be removed once all changes are made) +val HmrcWhiteDark = Color(0xFF0B0C0C) +val HmrcWhiteBackgroundDark = Color(0xFF262626) +val HmrcBlueDark = Color(0xFF5BC0C6) +val HmrcGreen1Dark = Color(0xFF69B134) +val HmrcGrey3Dark = Color(0xFF0B0C0C) + +// new light mode colors (name changes) + +val HmrcPrimaryGrey = Color(0xFF282D30) +val HmrcDarkGrey = Color(0xFF505A5F) +val HmrcMidGrey = Color(0xFFB1B4B6) +val HmrcLightGrey = Color(0xFFF3F2F1) +val HmrcPrimaryTeal = Color(0xFF5BC0C6) +val HmrcPrimaryYellow = Color(0xFFFFDD00) +val HmrcPrimaryLightBlue = Color(0xFFD7E4F2) + +// new dark mode colors +val HmrcPrimaryGreen = Color(0xFF188659) +val HmrcPrimaryRed = Color(0xFFF26954) +val HmrcDarkNavy = Color(0xFF0D1C29) +val HmrcDarkNavy2 = Color(0xFF061625) +val HmrcDarkNavy3 = Color(0xFF092537) +val HmrcNavy = Color(0xFF0A2740) +// mid-navy still to be added to excel spreadsheet diff --git a/components/src/main/res/values-night/colors.xml b/components/src/main/res/values-night/colors.xml index 4b0bd6fc..5a8797e0 100644 --- a/components/src/main/res/values-night/colors.xml +++ b/components/src/main/res/values-night/colors.xml @@ -18,19 +18,63 @@ #FFFFFFFF - #FF0B0C0C - #FF262626 - #FF69B134 #FF28A197 - #FF5BC0C6 #FFEB66CA #FFB1B4B6 #FF6F777B - #FF0B0C0C #FFFEFF4F #FFBB94FF @color/hmrc_always_white @color/hmrc_teal @color/hmrc_teal + + #FF0B0C0C + #FF262626 + #FF5BC0C6 + #FF69B134 + #FF0B0C0C + + + #FF188659 + #FFF26954 + #FF0D1C29 + #FF061625 + #FF092537 + #FF0A2740 + + + + + + @color/hmrc_white + + + @color/hmrc_dark_navy_2 + + + @color/hmrc_dark_navy_3 + @color/hmrc_white + @color/hmrc_white + + + @color/hmrc_navy + + + @color/hmrc_dark_navy_2 + @color/hmrc_dark_navy_3 + + + @color/hmrc_primary_green + @color/hmrc_white + @color/hmrc_transparent + @color/hmrc_white + + + @color/hmrc_dark_navy_3 + + + @color/hmrc_primary_green + + \ No newline at end of file diff --git a/components/src/main/res/values/colors.xml b/components/src/main/res/values/colors.xml index aafa63d1..b72c3470 100644 --- a/components/src/main/res/values/colors.xml +++ b/components/src/main/res/values/colors.xml @@ -19,18 +19,12 @@ #000 #fff - #FF0B0C0C - #FFFFFFFF - #FFFFFFFF - #FF00703C #FF85994B - #FF1D70B8 #FF28A197 #FFD4351C #FF505A5F #FFB1B4B6 - #FFF3F2F1 #FFCA2B75 #FFFFBF47 @@ -52,4 +46,66 @@ #003078 #003078 + + #FFFFFFFF + #FFFFFFFF + #FF1D70B8 + #FF00703C + #FFF3F2F1 + + + #FF282D30 + #FF505A5F + #FFB1B4B6 + #FFF3F2F1 + #FF5BC0C6 + #FFFFDD00 + #FFD7E4F2 + + #00000000 + + + #FF188659 + #FFF26954 + #FF0D1C29 + #FF061625 + #FF092537 + #FF0A2740 + + + + + @color/hmrc_black + + + @color/hmrc_light_grey + + + @color/hmrc_white + @color/hmrc_blue + @color/hmrc_black + + + @color/hmrc_blue + + + @color/hmrc_grey_3 + @color/hmrc_white + + + @color/hmrc_green_1 + @color/hmrc_white + @color/hmrc_transparent + @color/hmrc_white + + + @color/hmrc_white + + + @color/hmrc_green_1 + + + + + \ No newline at end of file