Skip to content

Commit 724afd9

Browse files
Update tokens
1 parent 967ed2f commit 724afd9

File tree

8 files changed

+17
-15
lines changed

8 files changed

+17
-15
lines changed

backpack-common/src/main/res/values-night/backpack.internal.color.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,13 @@
4848
<color name="__privateButtonSecondaryOnDarkDisabledBackground">#ff0b121d</color>
4949
<color name="__privateButtonSecondaryOnDarkDisabledForeground">#33ffffff</color>
5050
<color name="__privateButtonSecondaryOnDarkNormalBackground">#1affffff</color>
51-
<color name="__privateButtonSecondaryOnDarkPressedBackground">#ff010913</color>
51+
<color name="__privateButtonSecondaryOnDarkPressedBackground">#33ffffff</color>
5252
<color name="__privateButtonSecondaryPressedBackground">#ff010913</color>
5353
<color name="__privateCardButtonContainedFill">#cc000000</color>
5454
<color name="__privateChipDisabledBackground">#ff0b121d</color>
5555
<color name="__privateChipOnDarkOnBackground">#ff054184</color>
5656
<color name="__privateChipOnDarkOnDismissIcon">#80ffffff</color>
57+
<color name="__privateChipOnDarkOnFill">#ff024daf</color>
5758
<color name="__privateChipOnDarkPressedStroke">#ff054184</color>
5859
<color name="__privateInfoBannerDefault">#ff131d2b</color>
5960
<color name="__privateInfoBannerError">#ffff649c</color>

backpack-common/src/main/res/values/backpack.internal.color.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,13 @@
4848
<color name="__privateButtonSecondaryOnDarkDisabledBackground">#ff0b121d</color>
4949
<color name="__privateButtonSecondaryOnDarkDisabledForeground">#33ffffff</color>
5050
<color name="__privateButtonSecondaryOnDarkNormalBackground">#1affffff</color>
51-
<color name="__privateButtonSecondaryOnDarkPressedBackground">#ff010913</color>
51+
<color name="__privateButtonSecondaryOnDarkPressedBackground">#ff04182d</color>
5252
<color name="__privateButtonSecondaryPressedBackground">#ffc1c7cf</color>
5353
<color name="__privateCardButtonContainedFill">#ccffffff</color>
5454
<color name="__privateChipDisabledBackground">#ffe0e4e9</color>
5555
<color name="__privateChipOnDarkOnBackground">#ffffffff</color>
5656
<color name="__privateChipOnDarkOnDismissIcon">#ff626971</color>
57+
<color name="__privateChipOnDarkOnFill">#ff154679</color>
5758
<color name="__privateChipOnDarkPressedStroke">#ffffffff</color>
5859
<color name="__privateInfoBannerDefault">#ffeff3f8</color>
5960
<color name="__privateInfoBannerError">#ffe70866</color>

backpack-common/src/main/res/values/backpack.radii.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
<!-- THIS FILE IS AUTO GENERATED. DO NOT MODIFY! -->
2222

23-
<dimen name="bpkBorderRadiusFull">9999dp</dimen>
23+
<dimen name="bpkBorderRadiusFull">100dp</dimen>
2424
<dimen name="bpkBorderRadiusXl">40dp</dimen>
2525
<dimen name="bpkBorderRadiusMd">12dp</dimen>
2626
<dimen name="bpkBorderRadiusNavTabs">18dp</dimen>

backpack-compose/src/main/kotlin/net/skyscanner/backpack/compose/tokens/BpkBorderRadius.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import androidx.compose.ui.unit.Dp
2525
import androidx.compose.ui.unit.dp
2626

2727
public object BpkBorderRadius {
28-
public val Full: Dp = 9_999.dp
28+
public val Full: Dp = 100.dp
2929

3030
public val Xl: Dp = 40.dp
3131

backpack-compose/src/main/kotlin/net/skyscanner/backpack/compose/tokens/BpkColors.kt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ public class BpkColors private constructor(
2929
public val canvas: Color,
3030
public val canvasContrast: Color,
3131
public val coreAccent: Color,
32-
public val coreEco: Color,
3332
public val corePrimary: Color,
3433
public val line: Color,
3534
public val lineOnDark: Color,
@@ -53,7 +52,6 @@ public class BpkColors private constructor(
5352
public val textDisabledOnDark: Color,
5453
public val textError: Color,
5554
public val textHero: Color,
56-
public val textLink: Color,
5755
public val textOnDark: Color,
5856
public val textOnLight: Color,
5957
public val textPrimary: Color,
@@ -66,7 +64,6 @@ public class BpkColors private constructor(
6664
canvas: Color = Color(0xFFFFFFFF),
6765
canvasContrast: Color = Color(0xFFEFF3F8),
6866
coreAccent: Color = Color(0xFF0062E3),
69-
coreEco: Color = Color(0xFF0FA1A9),
7067
corePrimary: Color = Color(0xFF05203C),
7168
line: Color = Color(0xFFC1C7CF),
7269
lineOnDark: Color = Color(0x80FFFFFF),
@@ -90,7 +87,6 @@ public class BpkColors private constructor(
9087
textDisabledOnDark: Color = Color(0x80FFFFFF),
9188
textError: Color = Color(0xFFE70866),
9289
textHero: Color = Color(0xFF0062E3),
93-
textLink: Color = Color(0xFF0062E3),
9490
textOnDark: Color = Color(0xFFFFFFFF),
9591
textOnLight: Color = Color(0xFF161616),
9692
textPrimary: Color = Color(0xFF161616),
@@ -102,7 +98,6 @@ public class BpkColors private constructor(
10298
canvas = canvas,
10399
canvasContrast = canvasContrast,
104100
coreAccent = coreAccent,
105-
coreEco = coreEco,
106101
corePrimary = corePrimary,
107102
line = line,
108103
lineOnDark = lineOnDark,
@@ -126,7 +121,6 @@ public class BpkColors private constructor(
126121
textDisabledOnDark = textDisabledOnDark,
127122
textError = textError,
128123
textHero = textHero,
129-
textLink = textLink,
130124
textOnDark = textOnDark,
131125
textOnLight = textOnLight,
132126
textPrimary = textPrimary,
@@ -139,7 +133,6 @@ public class BpkColors private constructor(
139133
canvas: Color = Color(0xFF010913),
140134
canvasContrast: Color = Color(0xFF010913),
141135
coreAccent: Color = Color(0xFF84E9FF),
142-
coreEco: Color = Color(0xFF0FA1A9),
143136
corePrimary: Color = Color(0xFF054184),
144137
line: Color = Color(0xFF44505F),
145138
lineOnDark: Color = Color(0xFF44505F),
@@ -163,7 +156,6 @@ public class BpkColors private constructor(
163156
textDisabledOnDark: Color = Color(0x80FFFFFF),
164157
textError: Color = Color(0xFFFF649C),
165158
textHero: Color = Color(0xFF010913),
166-
textLink: Color = Color(0xFF84E9FF),
167159
textOnDark: Color = Color(0xFFFFFFFF),
168160
textOnLight: Color = Color(0xFF010913),
169161
textPrimary: Color = Color(0xFFFFFFFF),
@@ -175,7 +167,6 @@ public class BpkColors private constructor(
175167
canvas = canvas,
176168
canvasContrast = canvasContrast,
177169
coreAccent = coreAccent,
178-
coreEco = coreEco,
179170
corePrimary = corePrimary,
180171
line = line,
181172
lineOnDark = lineOnDark,
@@ -199,7 +190,6 @@ public class BpkColors private constructor(
199190
textDisabledOnDark = textDisabledOnDark,
200191
textError = textError,
201192
textHero = textHero,
202-
textLink = textLink,
203193
textOnDark = textOnDark,
204194
textOnLight = textOnLight,
205195
textPrimary = textPrimary,

backpack-compose/src/main/kotlin/net/skyscanner/backpack/compose/tokens/internal/BpkButtonColors.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ internal object BpkButtonColors {
128128

129129
internal val secondaryOnDarkPressedBackground: Color
130130
@Composable
131-
get() = dynamicColorOf(Color(0xFF010913), Color(0xFF010913))
131+
get() = dynamicColorOf(Color(0xFF04182D), Color(0x33FFFFFF))
132132

133133
internal val secondaryPressedBackground: Color
134134
@Composable

backpack-compose/src/main/kotlin/net/skyscanner/backpack/compose/tokens/internal/BpkChipColors.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ internal object BpkChipColors {
3838
@Composable
3939
get() = dynamicColorOf(Color(0xFF626971), Color(0x80FFFFFF))
4040

41+
internal val onDarkOnFill: Color
42+
@Composable
43+
get() = dynamicColorOf(Color(0xFF154679), Color(0xFF024DAF))
44+
4145
internal val onDarkPressedStroke: Color
4246
@Composable
4347
get() = dynamicColorOf(Color(0xFFFFFFFF), Color(0xFF054184))

backpack-lint/src/main/java/net/skyscanner/backpack/lint/check/BpkDeprecatedTokens.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,11 @@ import kotlin.collections.List
2626

2727
internal object BpkDeprecatedTokens {
2828
public val deprecatedColors: List<String> = listOf(
29+
"bpkCoreEcoDay",
30+
"bpkCoreEcoNight",
31+
"bpkTextLinkNight",
32+
"bpkTextLinkDay",
33+
"bpkCoreEco",
34+
"bpkTextLink",
2935
)
3036
}

0 commit comments

Comments
 (0)