Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,13 @@
<color name="__privateButtonSecondaryOnDarkDisabledBackground">#ff0b121d</color>
<color name="__privateButtonSecondaryOnDarkDisabledForeground">#33ffffff</color>
<color name="__privateButtonSecondaryOnDarkNormalBackground">#1affffff</color>
<color name="__privateButtonSecondaryOnDarkPressedBackground">#ff010913</color>
<color name="__privateButtonSecondaryOnDarkPressedBackground">#33ffffff</color>
<color name="__privateButtonSecondaryPressedBackground">#ff010913</color>
<color name="__privateCardButtonContainedFill">#cc000000</color>
<color name="__privateChipDisabledBackground">#ff0b121d</color>
<color name="__privateChipOnDarkOnBackground">#ff054184</color>
<color name="__privateChipOnDarkOnDismissIcon">#80ffffff</color>
<color name="__privateChipOnDarkOnFill">#ff024daf</color>
<color name="__privateChipOnDarkPressedStroke">#ff054184</color>
<color name="__privateInfoBannerDefault">#ff131d2b</color>
<color name="__privateInfoBannerError">#ffff649c</color>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,13 @@
<color name="__privateButtonSecondaryOnDarkDisabledBackground">#ff0b121d</color>
<color name="__privateButtonSecondaryOnDarkDisabledForeground">#33ffffff</color>
<color name="__privateButtonSecondaryOnDarkNormalBackground">#1affffff</color>
<color name="__privateButtonSecondaryOnDarkPressedBackground">#ff010913</color>
<color name="__privateButtonSecondaryOnDarkPressedBackground">#ff04182d</color>
<color name="__privateButtonSecondaryPressedBackground">#ffc1c7cf</color>
<color name="__privateCardButtonContainedFill">#ccffffff</color>
<color name="__privateChipDisabledBackground">#ffe0e4e9</color>
<color name="__privateChipOnDarkOnBackground">#ffffffff</color>
<color name="__privateChipOnDarkOnDismissIcon">#ff626971</color>
<color name="__privateChipOnDarkOnFill">#ff154679</color>
<color name="__privateChipOnDarkPressedStroke">#ffffffff</color>
<color name="__privateInfoBannerDefault">#ffeff3f8</color>
<color name="__privateInfoBannerError">#ffe70866</color>
Expand Down
2 changes: 1 addition & 1 deletion backpack-common/src/main/res/values/backpack.radii.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

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

<dimen name="bpkBorderRadiusFull">9999dp</dimen>
<dimen name="bpkBorderRadiusFull">100dp</dimen>
<dimen name="bpkBorderRadiusXl">40dp</dimen>
<dimen name="bpkBorderRadiusMd">12dp</dimen>
<dimen name="bpkBorderRadiusNavTabs">18dp</dimen>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp

public object BpkBorderRadius {
public val Full: Dp = 9_999.dp
public val Full: Dp = 100.dp

public val Xl: Dp = 40.dp

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ public class BpkColors private constructor(
public val canvas: Color,
public val canvasContrast: Color,
public val coreAccent: Color,
public val coreEco: Color,
public val corePrimary: Color,
public val line: Color,
public val lineOnDark: Color,
Expand All @@ -53,7 +52,6 @@ public class BpkColors private constructor(
public val textDisabledOnDark: Color,
public val textError: Color,
public val textHero: Color,
public val textLink: Color,
public val textOnDark: Color,
public val textOnLight: Color,
public val textPrimary: Color,
Expand All @@ -66,7 +64,6 @@ public class BpkColors private constructor(
canvas: Color = Color(0xFFFFFFFF),
canvasContrast: Color = Color(0xFFEFF3F8),
coreAccent: Color = Color(0xFF0062E3),
coreEco: Color = Color(0xFF0FA1A9),
corePrimary: Color = Color(0xFF05203C),
line: Color = Color(0xFFC1C7CF),
lineOnDark: Color = Color(0x80FFFFFF),
Expand All @@ -90,7 +87,6 @@ public class BpkColors private constructor(
textDisabledOnDark: Color = Color(0x80FFFFFF),
textError: Color = Color(0xFFE70866),
textHero: Color = Color(0xFF0062E3),
textLink: Color = Color(0xFF0062E3),
textOnDark: Color = Color(0xFFFFFFFF),
textOnLight: Color = Color(0xFF161616),
textPrimary: Color = Color(0xFF161616),
Expand All @@ -102,7 +98,6 @@ public class BpkColors private constructor(
canvas = canvas,
canvasContrast = canvasContrast,
coreAccent = coreAccent,
coreEco = coreEco,
corePrimary = corePrimary,
line = line,
lineOnDark = lineOnDark,
Expand All @@ -126,7 +121,6 @@ public class BpkColors private constructor(
textDisabledOnDark = textDisabledOnDark,
textError = textError,
textHero = textHero,
textLink = textLink,
textOnDark = textOnDark,
textOnLight = textOnLight,
textPrimary = textPrimary,
Expand All @@ -139,7 +133,6 @@ public class BpkColors private constructor(
canvas: Color = Color(0xFF010913),
canvasContrast: Color = Color(0xFF010913),
coreAccent: Color = Color(0xFF84E9FF),
coreEco: Color = Color(0xFF0FA1A9),
corePrimary: Color = Color(0xFF054184),
line: Color = Color(0xFF44505F),
lineOnDark: Color = Color(0xFF44505F),
Expand All @@ -163,7 +156,6 @@ public class BpkColors private constructor(
textDisabledOnDark: Color = Color(0x80FFFFFF),
textError: Color = Color(0xFFFF649C),
textHero: Color = Color(0xFF010913),
textLink: Color = Color(0xFF84E9FF),
textOnDark: Color = Color(0xFFFFFFFF),
textOnLight: Color = Color(0xFF010913),
textPrimary: Color = Color(0xFFFFFFFF),
Expand All @@ -175,7 +167,6 @@ public class BpkColors private constructor(
canvas = canvas,
canvasContrast = canvasContrast,
coreAccent = coreAccent,
coreEco = coreEco,
corePrimary = corePrimary,
line = line,
lineOnDark = lineOnDark,
Expand All @@ -199,7 +190,6 @@ public class BpkColors private constructor(
textDisabledOnDark = textDisabledOnDark,
textError = textError,
textHero = textHero,
textLink = textLink,
textOnDark = textOnDark,
textOnLight = textOnLight,
textPrimary = textPrimary,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ internal object BpkButtonColors {

internal val secondaryOnDarkPressedBackground: Color
@Composable
get() = dynamicColorOf(Color(0xFF010913), Color(0xFF010913))
get() = dynamicColorOf(Color(0xFF04182D), Color(0x33FFFFFF))

internal val secondaryPressedBackground: Color
@Composable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ internal object BpkChipColors {
@Composable
get() = dynamicColorOf(Color(0xFF626971), Color(0x80FFFFFF))

internal val onDarkOnFill: Color
@Composable
get() = dynamicColorOf(Color(0xFF154679), Color(0xFF024DAF))

internal val onDarkPressedStroke: Color
@Composable
get() = dynamicColorOf(Color(0xFFFFFFFF), Color(0xFF054184))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,11 @@ import kotlin.collections.List

internal object BpkDeprecatedTokens {
public val deprecatedColors: List<String> = listOf(
"bpkCoreEcoDay",
"bpkCoreEcoNight",
"bpkTextLinkNight",
"bpkTextLinkDay",
"bpkCoreEco",
"bpkTextLink",
)
}
86 changes: 43 additions & 43 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
},
"homepage": "https://github.com/Skyscanner/backpack-android#readme",
"devDependencies": {
"@skyscanner/bpk-foundations-android": "^23.0.0",
"@skyscanner/bpk-foundations-android": "^24.0.0",
"@skyscanner/bpk-svgs": "^20.11.0"
}
}
Loading