diff --git a/core-android/design-system/src/main/java/dev/love/winter/designsystem/tokens/BorderRadiusToken.kt b/core-android/design-system/src/main/java/dev/love/winter/designsystem/BorderRadiusToken.kt similarity index 65% rename from core-android/design-system/src/main/java/dev/love/winter/designsystem/tokens/BorderRadiusToken.kt rename to core-android/design-system/src/main/java/dev/love/winter/designsystem/BorderRadiusToken.kt index 1e1a798..bded08e 100644 --- a/core-android/design-system/src/main/java/dev/love/winter/designsystem/tokens/BorderRadiusToken.kt +++ b/core-android/design-system/src/main/java/dev/love/winter/designsystem/BorderRadiusToken.kt @@ -1,4 +1,4 @@ -package dev.love.winter.designsystem.tokens +package dev.love.winter.designsystem import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape @@ -20,9 +20,9 @@ import androidx.compose.ui.unit.dp * - Pill: Components that are completely rounded on their sides */ -internal val BorderRadiusExtraSmall = RoundedCornerShape(2.dp) -internal val BorderRadiusSmall = RoundedCornerShape(4.dp) -internal val BorderRadiusMedium = RoundedCornerShape(8.dp) -internal val BorderRadiusLarge = RoundedCornerShape(16.dp) -internal val BorderRadiusExtraLarge = RoundedCornerShape(24.dp) -internal val BorderRadiusPill = CircleShape +val BorderRadiusExtraSmall = RoundedCornerShape(2.dp) +val BorderRadiusSmall = RoundedCornerShape(4.dp) +val BorderRadiusMedium = RoundedCornerShape(8.dp) +val BorderRadiusLarge = RoundedCornerShape(16.dp) +val BorderRadiusExtraLarge = RoundedCornerShape(24.dp) +val BorderRadiusPill = CircleShape diff --git a/core-android/design-system/src/main/java/dev/love/winter/designsystem/ColorToken.kt b/core-android/design-system/src/main/java/dev/love/winter/designsystem/ColorToken.kt new file mode 100644 index 0000000..a2e7b8d --- /dev/null +++ b/core-android/design-system/src/main/java/dev/love/winter/designsystem/ColorToken.kt @@ -0,0 +1,275 @@ +package dev.love.winter.designsystem + +import androidx.compose.ui.graphics.Color + +// Brand - Primary +val Primary50 = Color(0xFFF1F1FF) +val Primary100 = Color(0xFFDBDFFF) +val Primary200 = Color(0xFFC1C8FF) +val Primary300 = Color(0xFF9397FF) +val Primary400 = Color(0xFF7278FF) +val Primary500 = Color(0xFF5653FF) +val Primary600 = Color(0xFF4745E4) +val Primary700 = Color(0xFF3B39AF) +val Primary800 = Color(0xFF2B2A85) +val Primary900 = Color(0xFF131243) + +// Blue (Use when brand color is no longer blue) +val Blue50 = Color(0xFFF1F1FF) +val Blue100 = Color(0xFFDBDFFF) +val Blue200 = Color(0xFFC1C8FF) +val Blue300 = Color(0xFF9397FF) +val Blue400 = Color(0xFF7278FF) +val Blue500 = Color(0xFF5653FF) +val Blue600 = Color(0xFF4745E4) +val Blue700 = Color(0xFF3B39AF) +val Blue800 = Color(0xFF2B2A85) +val Blue900 = Color(0xFF131243) + +// Neutral - Grey +val Grey50 = Color(0xFFFDFDFD) +val Grey100 = Color(0xFFF4F4F5) +val Grey200 = Color(0xFFE7E7EA) +val Grey300 = Color(0xFFD9D9DC) +val Grey400 = Color(0xFFBFC0C9) +val Grey500 = Color(0xFF8D8F9B) +val Grey600 = Color(0xFF60626C) +val Grey700 = Color(0xFF484951) +val Grey800 = Color(0xFF313237) +val Grey900 = Color(0xFF18181B) + +// Semantic - Green +val Green50 = Color(0xFFECFAF3) +val Green100 = Color(0xFFC3EEDB) +val Green200 = Color(0xFFA5E6CA) +val Green300 = Color(0xFF7CDAB1) +val Green400 = Color(0xFF63D3A2) +val Green500 = Color(0xFF3CC88B) +val Green600 = Color(0xFF37B67E) +val Green700 = Color(0xFF247E57) +val Green800 = Color(0xFF115B3A) +val Green900 = Color(0xFF0F3122) + +// Semantic - Yellow +val Yellow50 = Color(0xFFFFF7E9) +val Yellow100 = Color(0xFFFFEAC7) +val Yellow200 = Color(0xFFFFDA9A) +val Yellow300 = Color(0xFFFFCD78) +val Yellow400 = Color(0xFFFFBD49) +val Yellow500 = Color(0xFFFFAF24) +val Yellow600 = Color(0xFFF2A522) +val Yellow700 = Color(0xFFC7881A) +val Yellow800 = Color(0xFF825911) +val Yellow900 = Color(0xFF4A340E) + +// Semantic - Red +val Red50 = Color(0xFFFCEBEB) +val Red100 = Color(0xFFFFD7D7) +val Red200 = Color(0xFFF2A1A1) +val Red300 = Color(0xFFEC7676) +val Red400 = Color(0xFFE85B5B) +val Red500 = Color(0xFFE23232) +val Red600 = Color(0xFFCE2E2E) +val Red700 = Color(0xFFA02424) +val Red800 = Color(0xFF6C1A1A) +val Red900 = Color(0xFF401111) + +/** + * Component Token - Background (Light Theme) + */ +val BackgroundLight = Grey50 +val BackgroundContainerLight = Grey100 +val BackgroundObjectLight = Grey200 +val BackgroundModalLight = Grey50 +val BackgroundBrandLight = Primary500 +val BackgroundBrandSubtleLight = Primary50 +val BackgroundPositiveLight = Green50 +val BackgroundWarningLight = Yellow50 +val BackgroundNegativeLight = Red50 +val BackgroundContrastLight = Grey900 +val BackgroundDisabledLight = Grey100 +val BackgroundOverlayLight = Grey900.copy(alpha = 0.5f) + +/** + * Component Token - Background (Dark Theme) + */ +val BackgroundDark = Grey900 +val BackgroundContainerDark = Grey800 +val BackgroundObjectDark = Grey700 +val BackgroundModalDark = Grey800 +val BackgroundBrandDark = Primary500 +val BackgroundBrandSubtleDark = Primary900 +val BackgroundPositiveDark = Green900 +val BackgroundWarningDark = Yellow900 +val BackgroundNegativeDark = Red900 +val BackgroundContrastDark = Grey50 +val BackgroundDisabledDark = Grey800 +val BackgroundOverlayDark = Grey900.copy(alpha = 0.7f) + +/** + * Component Token - Stroke (Light Theme) + */ +val StrokeNeutralSubtleLight = Grey100 +val StrokeNeutralLight = Grey200 +val StrokeNeutralStrongLight = Grey300 +val StrokeBrandLight = Primary500 +val StrokePositiveLight = Green500 +val StrokeWarningLight = Yellow500 +val StrokeNegativeLight = Red500 + +/** + * Component Token - Stroke (Dark Theme) + */ +val StrokeNeutralSubtleDark = Grey800 +val StrokeNeutralDark = Grey700 +val StrokeNeutralStrongDark = Grey600 +val StrokeBrandDark = Primary600 +val StrokePositiveDark = Green600 +val StrokeWarningDark = Yellow600 +val StrokeNegativeDark = Red600 + +/** + * Component Token - Text (Light Theme) + */ +val TextTitleLight = Grey900 +val TextSubtitleLight = Grey700 +val TextBodyLight = Grey800 +val TextCaptionLight = Grey600 +val TextPlaceholderLight = Grey500 +val TextDisabledLight = Grey400 +val TextOnColorDarkLight = Grey50 +val TextOnColorLightLight = Grey900 +val TextOnContrastLight = Grey50 +val TextLinkLight = Primary600 +val TextBrandLight = Primary500 +val TextPositiveLight = Green200 +val TextWarningLight = Yellow700 +val TextNegativeLight = Red600 + +/** + * Component Token - Text (Dark Theme) + */ +val TextTitleDark = Grey50 +val TextSubtitleDark = Grey200 +val TextBodyDark = Grey100 +val TextCaptionDark = Grey300 +val TextPlaceholderDark = Grey500 +val TextDisabledDark = Grey600 +val TextOnColorDarkDark = Grey50 +val TextOnColorLightDark = Grey900 +val TextOnContrastDark = Grey900 +val TextLinkDark = Primary300 +val TextBrandDark = Primary500 +val TextPositiveDark = Green700 +val TextWarningDark = Yellow200 +val TextNegativeDark = Red200 + +/** + * Component Token - Icon (Light Theme) + */ +val IconNeutralSubtleLight = Grey500 +val IconNeutralLight = Grey600 +val IconNeutralStrongLight = Grey900 +val IconBrandLight = Primary500 +val IconPositiveLight = Green600 +val IconWarningLight = Yellow600 +val IconNegativeLight = Red600 +val IconOnColorDarkLight = Grey50 +val IconOnColorLightLight = Grey900 +val IconOnContrastLight = Grey50 +val IconDisabledLight = Grey400 + +/** + * Component Token - Icon (Dark Theme) + */ +val IconNeutralSubtleDark = Grey500 +val IconNeutralDark = Grey300 +val IconNeutralStrongDark = Grey300 +val IconBrandDark = Primary500 +val IconPositiveDark = Green600 +val IconWarningDark = Yellow500 +val IconNegativeDark = Red500 +val IconOnColorDarkDark = Grey50 +val IconOnColorLightDark = Grey900 +val IconOnContrastDark = Grey900 +val IconDisabledDark = Grey600 + +/** + * Component Token - Button (Light Theme) + */ +val ButtonPrimaryDefaultLight = Grey900 +val ButtonPrimaryActiveLight = Grey800 +val ButtonPrimaryDisabledLight = Grey100 +val ButtonSecondaryDefaultLight = Grey300 +val ButtonSecondaryActiveLight = Grey400 +val ButtonSecondaryDisabledLight = Grey100 +val ButtonTertiaryDefaultLight = Grey900 +val ButtonTertiaryActiveLight = Grey700 +val ButtonTertiaryDisabledLight = Grey400 +val ButtonBrandDefaultLight = Primary500 +val ButtonBrandActiveLight = Primary600 +val ButtonBrandDisabledLight = Grey100 +val ButtonCriticalDefaultLight = Red600 +val ButtonCriticalActiveLight = Red700 +val ButtonCriticalDisabledLight = Grey100 + +/** + * Component Token - Button (Dark Theme) + */ +val ButtonPrimaryDefaultDark = Grey50 +val ButtonPrimaryActiveDark = Grey200 +val ButtonPrimaryDisabledDark = Grey800 +val ButtonSecondaryDefaultDark = Grey600 +val ButtonSecondaryActiveDark = Grey700 +val ButtonSecondaryDisabledDark = Grey800 +val ButtonTertiaryDefaultDark = Grey50 +val ButtonTertiaryActiveDark = Grey300 +val ButtonTertiaryDisabledDark = Grey600 +val ButtonBrandDefaultDark = Primary500 +val ButtonBrandActiveDark = Primary600 +val ButtonBrandDisabledDark = Grey800 +val ButtonCriticalDefaultDark = Red600 +val ButtonCriticalActiveDark = Red700 +val ButtonCriticalDisabledDark = Grey800 + +/** + * Component Token - Input (Light Theme) + */ +val InputDefaultLight = Grey300 +val InputActiveLight = Grey300 +val InputActiveCursorLight = Primary500 +val InputSelectedLight = Grey900 +val InputPositiveLight = Green500 +val InputNegativeLight = Red500 +val InputDisabledLight = Grey300 + +/** + * Component Token - Input (Dark Theme) + */ +val InputDefaultDark = Grey700 +val InputActiveDark = Primary500 +val InputActiveCursorDark = Primary200 +val InputSelectedDark = Grey50 +val InputPositiveDark = Green300 +val InputNegativeDark = Red300 +val InputDisabledDark = Grey700 + +/** + * Component Token - Tag (Light Theme) + */ +val TagNeutralLight = Grey200 +val TagBrandStrongLight = Primary500 +val TagBrandSubtleLight = Primary100 +val TagPositiveLight = Green100 +val TagWarningLight = Yellow100 +val TagNegativeLight = Red100 + +/** + * Component Token - Tag (Dark Theme) + */ +val TagNeutralDark = Grey700 +val TagBrandStrongDark = Primary600 +val TagBrandSubtleDark = Primary100 +val TagPositiveDark = Green100 +val TagWarningDark = Yellow100 +val TagNegativeDark = Red100 diff --git a/core-android/design-system/src/main/java/dev/love/winter/designsystem/tokens/SpacingToken.kt b/core-android/design-system/src/main/java/dev/love/winter/designsystem/SpacingToken.kt similarity index 57% rename from core-android/design-system/src/main/java/dev/love/winter/designsystem/tokens/SpacingToken.kt rename to core-android/design-system/src/main/java/dev/love/winter/designsystem/SpacingToken.kt index 94933bc..08ecdfa 100644 --- a/core-android/design-system/src/main/java/dev/love/winter/designsystem/tokens/SpacingToken.kt +++ b/core-android/design-system/src/main/java/dev/love/winter/designsystem/SpacingToken.kt @@ -1,4 +1,4 @@ -package dev.love.winter.designsystem.tokens +package dev.love.winter.designsystem import androidx.compose.ui.unit.dp @@ -14,10 +14,10 @@ import androidx.compose.ui.unit.dp * - When stacking components, use the same spacing between all elements in the group */ -internal val SpacingExtraExtraSmall = 4.dp -internal val SpacingExtraSmall = 8.dp -internal val SpacingSmall = 16.dp -internal val SpacingMedium = 24.dp -internal val SpacingLarge = 32.dp -internal val SpacingExtraLarge = 40.dp -internal val SpacingExtraExtraLarge = 48.dp +val SpacingExtraExtraSmall = 4.dp +val SpacingExtraSmall = 8.dp +val SpacingSmall = 16.dp +val SpacingMedium = 24.dp +val SpacingLarge = 32.dp +val SpacingExtraLarge = 40.dp +val SpacingExtraExtraLarge = 48.dp diff --git a/core-android/design-system/src/main/java/dev/love/winter/designsystem/tokens/TypographyToken.kt b/core-android/design-system/src/main/java/dev/love/winter/designsystem/TypographyToken.kt similarity index 83% rename from core-android/design-system/src/main/java/dev/love/winter/designsystem/tokens/TypographyToken.kt rename to core-android/design-system/src/main/java/dev/love/winter/designsystem/TypographyToken.kt index 10a0d54..a1c4e0b 100644 --- a/core-android/design-system/src/main/java/dev/love/winter/designsystem/tokens/TypographyToken.kt +++ b/core-android/design-system/src/main/java/dev/love/winter/designsystem/TypographyToken.kt @@ -1,4 +1,4 @@ -package dev.love.winter.designsystem.tokens +package dev.love.winter.designsystem import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontFamily @@ -13,21 +13,21 @@ import androidx.compose.ui.unit.sp * Avoid using this style for long texts. */ -internal val FontLarge = TextStyle( +val FontLarge = TextStyle( fontFamily = FontFamily.Default, fontWeight = FontWeight.Medium, fontSize = 28.sp, lineHeight = 34.sp, ) -internal val FontMedium = TextStyle( +val FontMedium = TextStyle( fontFamily = FontFamily.Default, fontWeight = FontWeight.Medium, fontSize = 24.sp, lineHeight = 30.sp, ) -internal val FontSmall = TextStyle( +val FontSmall = TextStyle( fontFamily = FontFamily.Default, fontWeight = FontWeight.Medium, fontSize = 18.sp, @@ -41,21 +41,21 @@ internal val FontSmall = TextStyle( * You can apply this style in short texts that need to stand out when compared to body text, * like section titles, card titles, page titles, etc. */ -internal val TitleLarge = TextStyle( +val TitleLarge = TextStyle( fontFamily = FontFamily.Default, fontWeight = FontWeight.Medium, fontSize = 16.sp, lineHeight = 22.sp, ) -internal val TitleMedium = TextStyle( +val TitleMedium = TextStyle( fontFamily = FontFamily.Default, fontWeight = FontWeight.Medium, fontSize = 14.sp, lineHeight = 18.sp, ) -internal val TitleSmall = TextStyle( +val TitleSmall = TextStyle( fontFamily = FontFamily.Default, fontWeight = FontWeight.Medium, fontSize = 12.sp, @@ -68,35 +68,35 @@ internal val TitleSmall = TextStyle( * The body font style is ideal for regular text content, such as paragraphs, or descriptions. * The body styles are suitable both for long and short text, where readability and legibility are essential. */ -internal val BodyExtraLarge = TextStyle( +val BodyExtraLarge = TextStyle( fontFamily = FontFamily.Default, fontWeight = FontWeight.Normal, fontSize = 18.sp, lineHeight = 24.sp, ) -internal val BodyLarge = TextStyle( +val BodyLarge = TextStyle( fontFamily = FontFamily.Default, fontWeight = FontWeight.Normal, fontSize = 16.sp, lineHeight = 22.sp, ) -internal val BodyMedium = TextStyle( +val BodyMedium = TextStyle( fontFamily = FontFamily.Default, fontWeight = FontWeight.Normal, fontSize = 14.sp, lineHeight = 18.sp, ) -internal val BodySmall = TextStyle( +val BodySmall = TextStyle( fontFamily = FontFamily.Default, fontWeight = FontWeight.Normal, fontSize = 12.sp, lineHeight = 16.sp, ) -internal val BodyExtraSmall = TextStyle( +val BodyExtraSmall = TextStyle( fontFamily = FontFamily.Default, fontWeight = FontWeight.Normal, fontSize = 10.sp, @@ -109,21 +109,21 @@ internal val BodyExtraSmall = TextStyle( * The action font style is suitable for text elements that represent interactive or actionable items, * such as buttons, input, and links. Use it to distinguish interactive elements from regular text. */ -internal val ActionLarge = TextStyle( +val ActionLarge = TextStyle( fontFamily = FontFamily.Default, fontWeight = FontWeight.Medium, fontSize = 16.sp, lineHeight = 20.sp, ) -internal val ActionMedium = TextStyle( +val ActionMedium = TextStyle( fontFamily = FontFamily.Default, fontWeight = FontWeight.Medium, fontSize = 14.sp, lineHeight = 18.sp, ) -internal val ActionSmall = TextStyle( +val ActionSmall = TextStyle( fontFamily = FontFamily.Default, fontWeight = FontWeight.SemiBold, fontSize = 12.sp, @@ -136,7 +136,7 @@ internal val ActionSmall = TextStyle( * The caption font style is used for supporting text that provides context and complements visual elements, * like icons, images, tags, etc. Avoid using this style in long texts. */ -internal val CaptionLarge = TextStyle( +val CaptionLarge = TextStyle( fontFamily = FontFamily.Default, fontWeight = FontWeight.Medium, fontSize = 14.sp, @@ -144,7 +144,7 @@ internal val CaptionLarge = TextStyle( letterSpacing = 0.56.sp, ) -internal val CaptionMedium = TextStyle( +val CaptionMedium = TextStyle( fontFamily = FontFamily.Default, fontWeight = FontWeight.Medium, fontSize = 12.sp, @@ -152,7 +152,7 @@ internal val CaptionMedium = TextStyle( letterSpacing = 0.48.sp, ) -internal val CaptionSmall = TextStyle( +val CaptionSmall = TextStyle( fontFamily = FontFamily.Default, fontWeight = FontWeight.Medium, fontSize = 10.sp, diff --git a/core-android/design-system/src/main/java/dev/love/winter/designsystem/tokens/ColorToken.kt b/core-android/design-system/src/main/java/dev/love/winter/designsystem/tokens/ColorToken.kt deleted file mode 100644 index 84809aa..0000000 --- a/core-android/design-system/src/main/java/dev/love/winter/designsystem/tokens/ColorToken.kt +++ /dev/null @@ -1,275 +0,0 @@ -package dev.love.winter.designsystem.tokens - -import androidx.compose.ui.graphics.Color - -// Brand - Primary -internal val Primary50 = Color(0xFFF1F1FF) -internal val Primary100 = Color(0xFFDBDFFF) -internal val Primary200 = Color(0xFFC1C8FF) -internal val Primary300 = Color(0xFF9397FF) -internal val Primary400 = Color(0xFF7278FF) -internal val Primary500 = Color(0xFF5653FF) -internal val Primary600 = Color(0xFF4745E4) -internal val Primary700 = Color(0xFF3B39AF) -internal val Primary800 = Color(0xFF2B2A85) -internal val Primary900 = Color(0xFF131243) - -// Blue (Use when brand color is no longer blue) -internal val Blue50 = Color(0xFFF1F1FF) -internal val Blue100 = Color(0xFFDBDFFF) -internal val Blue200 = Color(0xFFC1C8FF) -internal val Blue300 = Color(0xFF9397FF) -internal val Blue400 = Color(0xFF7278FF) -internal val Blue500 = Color(0xFF5653FF) -internal val Blue600 = Color(0xFF4745E4) -internal val Blue700 = Color(0xFF3B39AF) -internal val Blue800 = Color(0xFF2B2A85) -internal val Blue900 = Color(0xFF131243) - -// Neutral - Grey -internal val Grey50 = Color(0xFFFDFDFD) -internal val Grey100 = Color(0xFFF4F4F5) -internal val Grey200 = Color(0xFFE7E7EA) -internal val Grey300 = Color(0xFFD9D9DC) -internal val Grey400 = Color(0xFFBFC0C9) -internal val Grey500 = Color(0xFF8D8F9B) -internal val Grey600 = Color(0xFF60626C) -internal val Grey700 = Color(0xFF484951) -internal val Grey800 = Color(0xFF313237) -internal val Grey900 = Color(0xFF18181B) - -// Semantic - Green -internal val Green50 = Color(0xFFECFAF3) -internal val Green100 = Color(0xFFC3EEDB) -internal val Green200 = Color(0xFFA5E6CA) -internal val Green300 = Color(0xFF7CDAB1) -internal val Green400 = Color(0xFF63D3A2) -internal val Green500 = Color(0xFF3CC88B) -internal val Green600 = Color(0xFF37B67E) -internal val Green700 = Color(0xFF247E57) -internal val Green800 = Color(0xFF115B3A) -internal val Green900 = Color(0xFF0F3122) - -// Semantic - Yellow -internal val Yellow50 = Color(0xFFFFF7E9) -internal val Yellow100 = Color(0xFFFFEAC7) -internal val Yellow200 = Color(0xFFFFDA9A) -internal val Yellow300 = Color(0xFFFFCD78) -internal val Yellow400 = Color(0xFFFFBD49) -internal val Yellow500 = Color(0xFFFFAF24) -internal val Yellow600 = Color(0xFFF2A522) -internal val Yellow700 = Color(0xFFC7881A) -internal val Yellow800 = Color(0xFF825911) -internal val Yellow900 = Color(0xFF4A340E) - -// Semantic - Red -internal val Red50 = Color(0xFFFCEBEB) -internal val Red100 = Color(0xFFFFD7D7) -internal val Red200 = Color(0xFFF2A1A1) -internal val Red300 = Color(0xFFEC7676) -internal val Red400 = Color(0xFFE85B5B) -internal val Red500 = Color(0xFFE23232) -internal val Red600 = Color(0xFFCE2E2E) -internal val Red700 = Color(0xFFA02424) -internal val Red800 = Color(0xFF6C1A1A) -internal val Red900 = Color(0xFF401111) - -/** - * Component Token - Background (Light Theme) - */ -internal val BackgroundLight = Grey50 -internal val BackgroundContainerLight = Grey100 -internal val BackgroundObjectLight = Grey200 -internal val BackgroundModalLight = Grey50 -internal val BackgroundBrandLight = Primary500 -internal val BackgroundBrandSubtleLight = Primary50 -internal val BackgroundPositiveLight = Green50 -internal val BackgroundWarningLight = Yellow50 -internal val BackgroundNegativeLight = Red50 -internal val BackgroundContrastLight = Grey900 -internal val BackgroundDisabledLight = Grey100 -internal val BackgroundOverlayLight = Grey900.copy(alpha = 0.5f) - -/** - * Component Token - Background (Dark Theme) - */ -internal val BackgroundDark = Grey900 -internal val BackgroundContainerDark = Grey800 -internal val BackgroundObjectDark = Grey700 -internal val BackgroundModalDark = Grey800 -internal val BackgroundBrandDark = Primary500 -internal val BackgroundBrandSubtleDark = Primary900 -internal val BackgroundPositiveDark = Green900 -internal val BackgroundWarningDark = Yellow900 -internal val BackgroundNegativeDark = Red900 -internal val BackgroundContrastDark = Grey50 -internal val BackgroundDisabledDark = Grey800 -internal val BackgroundOverlayDark = Grey900.copy(alpha = 0.7f) - -/** - * Component Token - Stroke (Light Theme) - */ -internal val StrokeNeutralSubtleLight = Grey100 -internal val StrokeNeutralLight = Grey200 -internal val StrokeNeutralStrongLight = Grey300 -internal val StrokeBrandLight = Primary500 -internal val StrokePositiveLight = Green500 -internal val StrokeWarningLight = Yellow500 -internal val StrokeNegativeLight = Red500 - -/** - * Component Token - Stroke (Dark Theme) - */ -internal val StrokeNeutralSubtleDark = Grey800 -internal val StrokeNeutralDark = Grey700 -internal val StrokeNeutralStrongDark = Grey600 -internal val StrokeBrandDark = Primary600 -internal val StrokePositiveDark = Green600 -internal val StrokeWarningDark = Yellow600 -internal val StrokeNegativeDark = Red600 - -/** - * Component Token - Text (Light Theme) - */ -internal val TextTitleLight = Grey900 -internal val TextSubtitleLight = Grey700 -internal val TextBodyLight = Grey800 -internal val TextCaptionLight = Grey600 -internal val TextPlaceholderLight = Grey500 -internal val TextDisabledLight = Grey400 -internal val TextOnColorDarkLight = Grey50 -internal val TextOnColorLightLight = Grey900 -internal val TextOnContrastLight = Grey50 -internal val TextLinkLight = Primary600 -internal val TextBrandLight = Primary500 -internal val TextPositiveLight = Green200 -internal val TextWarningLight = Yellow700 -internal val TextNegativeLight = Red600 - -/** - * Component Token - Text (Dark Theme) - */ -internal val TextTitleDark = Grey50 -internal val TextSubtitleDark = Grey200 -internal val TextBodyDark = Grey100 -internal val TextCaptionDark = Grey300 -internal val TextPlaceholderDark = Grey500 -internal val TextDisabledDark = Grey600 -internal val TextOnColorDarkDark = Grey50 -internal val TextOnColorLightDark = Grey900 -internal val TextOnContrastDark = Grey900 -internal val TextLinkDark = Primary300 -internal val TextBrandDark = Primary500 -internal val TextPositiveDark = Green700 -internal val TextWarningDark = Yellow200 -internal val TextNegativeDark = Red200 - -/** - * Component Token - Icon (Light Theme) - */ -internal val IconNeutralSubtleLight = Grey500 -internal val IconNeutralLight = Grey600 -internal val IconNeutralStrongLight = Grey900 -internal val IconBrandLight = Primary500 -internal val IconPositiveLight = Green600 -internal val IconWarningLight = Yellow600 -internal val IconNegativeLight = Red600 -internal val IconOnColorDarkLight = Grey50 -internal val IconOnColorLightLight = Grey900 -internal val IconOnContrastLight = Grey50 -internal val IconDisabledLight = Grey400 - -/** - * Component Token - Icon (Dark Theme) - */ -internal val IconNeutralSubtleDark = Grey500 -internal val IconNeutralDark = Grey300 -internal val IconNeutralStrongDark = Grey300 -internal val IconBrandDark = Primary500 -internal val IconPositiveDark = Green600 -internal val IconWarningDark = Yellow500 -internal val IconNegativeDark = Red500 -internal val IconOnColorDarkDark = Grey50 -internal val IconOnColorLightDark = Grey900 -internal val IconOnContrastDark = Grey900 -internal val IconDisabledDark = Grey600 - -/** - * Component Token - Button (Light Theme) - */ -internal val ButtonPrimaryDefaultLight = Grey900 -internal val ButtonPrimaryActiveLight = Grey800 -internal val ButtonPrimaryDisabledLight = Grey100 -internal val ButtonSecondaryDefaultLight = Grey300 -internal val ButtonSecondaryActiveLight = Grey400 -internal val ButtonSecondaryDisabledLight = Grey100 -internal val ButtonTertiaryDefaultLight = Grey900 -internal val ButtonTertiaryActiveLight = Grey700 -internal val ButtonTertiaryDisabledLight = Grey400 -internal val ButtonBrandDefaultLight = Primary500 -internal val ButtonBrandActiveLight = Primary600 -internal val ButtonBrandDisabledLight = Grey100 -internal val ButtonCriticalDefaultLight = Red600 -internal val ButtonCriticalActiveLight = Red700 -internal val ButtonCriticalDisabledLight = Grey100 - -/** - * Component Token - Button (Dark Theme) - */ -internal val ButtonPrimaryDefaultDark = Grey50 -internal val ButtonPrimaryActiveDark = Grey200 -internal val ButtonPrimaryDisabledDark = Grey800 -internal val ButtonSecondaryDefaultDark = Grey600 -internal val ButtonSecondaryActiveDark = Grey700 -internal val ButtonSecondaryDisabledDark = Grey800 -internal val ButtonTertiaryDefaultDark = Grey50 -internal val ButtonTertiaryActiveDark = Grey300 -internal val ButtonTertiaryDisabledDark = Grey600 -internal val ButtonBrandDefaultDark = Primary500 -internal val ButtonBrandActiveDark = Primary600 -internal val ButtonBrandDisabledDark = Grey800 -internal val ButtonCriticalDefaultDark = Red600 -internal val ButtonCriticalActiveDark = Red700 -internal val ButtonCriticalDisabledDark = Grey800 - -/** - * Component Token - Input (Light Theme) - */ -internal val InputDefaultLight = Grey300 -internal val InputActiveLight = Grey300 -internal val InputActiveCursorLight = Primary500 -internal val InputSelectedLight = Grey900 -internal val InputPositiveLight = Green500 -internal val InputNegativeLight = Red500 -internal val InputDisabledLight = Grey300 - -/** - * Component Token - Input (Dark Theme) - */ -internal val InputDefaultDark = Grey700 -internal val InputActiveDark = Primary500 -internal val InputActiveCursorDark = Primary200 -internal val InputSelectedDark = Grey50 -internal val InputPositiveDark = Green300 -internal val InputNegativeDark = Red300 -internal val InputDisabledDark = Grey700 - -/** - * Component Token - Tag (Light Theme) - */ -internal val TagNeutralLight = Grey200 -internal val TagBrandStrongLight = Primary500 -internal val TagBrandSubtleLight = Primary100 -internal val TagPositiveLight = Green100 -internal val TagWarningLight = Yellow100 -internal val TagNegativeLight = Red100 - -/** - * Component Token - Tag (Dark Theme) - */ -internal val TagNeutralDark = Grey700 -internal val TagBrandStrongDark = Primary600 -internal val TagBrandSubtleDark = Primary100 -internal val TagPositiveDark = Green100 -internal val TagWarningDark = Yellow100 -internal val TagNegativeDark = Red100 diff --git a/core-android/ui-component/build.gradle.kts b/core-android/ui-component/build.gradle.kts new file mode 100644 index 0000000..b70eb01 --- /dev/null +++ b/core-android/ui-component/build.gradle.kts @@ -0,0 +1,14 @@ +import dev.love.winter.convention.extension.setNamespace + +plugins { + id("winter.android.library") + id("winter.compose.library") +} + +android { + setNamespace("uicomponent") +} + +dependencies { + implementation(projects.coreAndroid.designSystem) +} \ No newline at end of file diff --git a/core-android/ui-component/src/main/AndroidManifest.xml b/core-android/ui-component/src/main/AndroidManifest.xml new file mode 100644 index 0000000..a5918e6 --- /dev/null +++ b/core-android/ui-component/src/main/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/core-android/design-system/src/main/java/dev/love/winter/designsystem/api/ColorCatalogApi.kt b/core-android/ui-component/src/main/java/dev/love/winter/uicomponent/api/ColorCatalogApi.kt similarity index 75% rename from core-android/design-system/src/main/java/dev/love/winter/designsystem/api/ColorCatalogApi.kt rename to core-android/ui-component/src/main/java/dev/love/winter/uicomponent/api/ColorCatalogApi.kt index 737061a..616c4bb 100644 --- a/core-android/design-system/src/main/java/dev/love/winter/designsystem/api/ColorCatalogApi.kt +++ b/core-android/ui-component/src/main/java/dev/love/winter/uicomponent/api/ColorCatalogApi.kt @@ -1,68 +1,68 @@ -package dev.love.winter.designsystem.api +package dev.love.winter.uicomponent.api import androidx.compose.runtime.Immutable import androidx.compose.ui.graphics.Color -import dev.love.winter.designsystem.theme.Colors -import dev.love.winter.designsystem.tokens.Blue100 -import dev.love.winter.designsystem.tokens.Blue200 -import dev.love.winter.designsystem.tokens.Blue300 -import dev.love.winter.designsystem.tokens.Blue400 -import dev.love.winter.designsystem.tokens.Blue50 -import dev.love.winter.designsystem.tokens.Blue500 -import dev.love.winter.designsystem.tokens.Blue600 -import dev.love.winter.designsystem.tokens.Blue700 -import dev.love.winter.designsystem.tokens.Blue800 -import dev.love.winter.designsystem.tokens.Blue900 -import dev.love.winter.designsystem.tokens.Green100 -import dev.love.winter.designsystem.tokens.Green200 -import dev.love.winter.designsystem.tokens.Green300 -import dev.love.winter.designsystem.tokens.Green400 -import dev.love.winter.designsystem.tokens.Green50 -import dev.love.winter.designsystem.tokens.Green500 -import dev.love.winter.designsystem.tokens.Green600 -import dev.love.winter.designsystem.tokens.Green700 -import dev.love.winter.designsystem.tokens.Green800 -import dev.love.winter.designsystem.tokens.Green900 -import dev.love.winter.designsystem.tokens.Grey100 -import dev.love.winter.designsystem.tokens.Grey200 -import dev.love.winter.designsystem.tokens.Grey300 -import dev.love.winter.designsystem.tokens.Grey400 -import dev.love.winter.designsystem.tokens.Grey50 -import dev.love.winter.designsystem.tokens.Grey500 -import dev.love.winter.designsystem.tokens.Grey600 -import dev.love.winter.designsystem.tokens.Grey700 -import dev.love.winter.designsystem.tokens.Grey800 -import dev.love.winter.designsystem.tokens.Grey900 -import dev.love.winter.designsystem.tokens.Primary100 -import dev.love.winter.designsystem.tokens.Primary200 -import dev.love.winter.designsystem.tokens.Primary300 -import dev.love.winter.designsystem.tokens.Primary400 -import dev.love.winter.designsystem.tokens.Primary50 -import dev.love.winter.designsystem.tokens.Primary500 -import dev.love.winter.designsystem.tokens.Primary600 -import dev.love.winter.designsystem.tokens.Primary700 -import dev.love.winter.designsystem.tokens.Primary800 -import dev.love.winter.designsystem.tokens.Primary900 -import dev.love.winter.designsystem.tokens.Red100 -import dev.love.winter.designsystem.tokens.Red200 -import dev.love.winter.designsystem.tokens.Red300 -import dev.love.winter.designsystem.tokens.Red400 -import dev.love.winter.designsystem.tokens.Red50 -import dev.love.winter.designsystem.tokens.Red500 -import dev.love.winter.designsystem.tokens.Red600 -import dev.love.winter.designsystem.tokens.Red700 -import dev.love.winter.designsystem.tokens.Red800 -import dev.love.winter.designsystem.tokens.Red900 -import dev.love.winter.designsystem.tokens.Yellow100 -import dev.love.winter.designsystem.tokens.Yellow200 -import dev.love.winter.designsystem.tokens.Yellow300 -import dev.love.winter.designsystem.tokens.Yellow400 -import dev.love.winter.designsystem.tokens.Yellow50 -import dev.love.winter.designsystem.tokens.Yellow500 -import dev.love.winter.designsystem.tokens.Yellow600 -import dev.love.winter.designsystem.tokens.Yellow700 -import dev.love.winter.designsystem.tokens.Yellow800 -import dev.love.winter.designsystem.tokens.Yellow900 +import dev.love.winter.designsystem.Blue100 +import dev.love.winter.designsystem.Blue200 +import dev.love.winter.designsystem.Blue300 +import dev.love.winter.designsystem.Blue400 +import dev.love.winter.designsystem.Blue50 +import dev.love.winter.designsystem.Blue500 +import dev.love.winter.designsystem.Blue600 +import dev.love.winter.designsystem.Blue700 +import dev.love.winter.designsystem.Blue800 +import dev.love.winter.designsystem.Blue900 +import dev.love.winter.designsystem.Green100 +import dev.love.winter.designsystem.Green200 +import dev.love.winter.designsystem.Green300 +import dev.love.winter.designsystem.Green400 +import dev.love.winter.designsystem.Green50 +import dev.love.winter.designsystem.Green500 +import dev.love.winter.designsystem.Green600 +import dev.love.winter.designsystem.Green700 +import dev.love.winter.designsystem.Green800 +import dev.love.winter.designsystem.Green900 +import dev.love.winter.designsystem.Grey100 +import dev.love.winter.designsystem.Grey200 +import dev.love.winter.designsystem.Grey300 +import dev.love.winter.designsystem.Grey400 +import dev.love.winter.designsystem.Grey50 +import dev.love.winter.designsystem.Grey500 +import dev.love.winter.designsystem.Grey600 +import dev.love.winter.designsystem.Grey700 +import dev.love.winter.designsystem.Grey800 +import dev.love.winter.designsystem.Grey900 +import dev.love.winter.designsystem.Primary100 +import dev.love.winter.designsystem.Primary200 +import dev.love.winter.designsystem.Primary300 +import dev.love.winter.designsystem.Primary400 +import dev.love.winter.designsystem.Primary50 +import dev.love.winter.designsystem.Primary500 +import dev.love.winter.designsystem.Primary600 +import dev.love.winter.designsystem.Primary700 +import dev.love.winter.designsystem.Primary800 +import dev.love.winter.designsystem.Primary900 +import dev.love.winter.designsystem.Red100 +import dev.love.winter.designsystem.Red200 +import dev.love.winter.designsystem.Red300 +import dev.love.winter.designsystem.Red400 +import dev.love.winter.designsystem.Red50 +import dev.love.winter.designsystem.Red500 +import dev.love.winter.designsystem.Red600 +import dev.love.winter.designsystem.Red700 +import dev.love.winter.designsystem.Red800 +import dev.love.winter.designsystem.Red900 +import dev.love.winter.designsystem.Yellow100 +import dev.love.winter.designsystem.Yellow200 +import dev.love.winter.designsystem.Yellow300 +import dev.love.winter.designsystem.Yellow400 +import dev.love.winter.designsystem.Yellow50 +import dev.love.winter.designsystem.Yellow500 +import dev.love.winter.designsystem.Yellow600 +import dev.love.winter.designsystem.Yellow700 +import dev.love.winter.designsystem.Yellow800 +import dev.love.winter.designsystem.Yellow900 +import dev.love.winter.uicomponent.theme.Colors import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf diff --git a/core-android/design-system/src/main/java/dev/love/winter/designsystem/component/button/Button.kt b/core-android/ui-component/src/main/java/dev/love/winter/uicomponent/component/button/Button.kt similarity index 92% rename from core-android/design-system/src/main/java/dev/love/winter/designsystem/component/button/Button.kt rename to core-android/ui-component/src/main/java/dev/love/winter/uicomponent/component/button/Button.kt index cefb2d4..ddbce9d 100644 --- a/core-android/design-system/src/main/java/dev/love/winter/designsystem/component/button/Button.kt +++ b/core-android/ui-component/src/main/java/dev/love/winter/uicomponent/component/button/Button.kt @@ -1,4 +1,4 @@ -package dev.love.winter.designsystem.component.button +package dev.love.winter.uicomponent.component.button import android.content.res.Configuration import androidx.compose.animation.animateColorAsState @@ -27,16 +27,16 @@ import androidx.compose.ui.semantics.stateDescription import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import dev.love.winter.designsystem.component.button.spec.ButtonColors -import dev.love.winter.designsystem.component.button.spec.ButtonIcon -import dev.love.winter.designsystem.component.button.spec.ButtonShape -import dev.love.winter.designsystem.component.button.spec.ButtonState -import dev.love.winter.designsystem.component.button.spec.ButtonType -import dev.love.winter.designsystem.interaction.PressableState -import dev.love.winter.designsystem.interaction.pressable -import dev.love.winter.designsystem.interaction.rememberPressedState -import dev.love.winter.designsystem.interaction.updateScale -import dev.love.winter.designsystem.theme.WinterTheme +import dev.love.winter.uicomponent.component.button.spec.ButtonColors +import dev.love.winter.uicomponent.component.button.spec.ButtonIcon +import dev.love.winter.uicomponent.component.button.spec.ButtonShape +import dev.love.winter.uicomponent.component.button.spec.ButtonState +import dev.love.winter.uicomponent.component.button.spec.ButtonType +import dev.love.winter.uicomponent.interaction.PressableState +import dev.love.winter.uicomponent.interaction.pressable +import dev.love.winter.uicomponent.interaction.rememberPressedState +import dev.love.winter.uicomponent.interaction.updateScale +import dev.love.winter.uicomponent.theme.WinterTheme private const val PRESSED_SCALE = 0.95f private const val DURATION_ANIMATION = 100 diff --git a/core-android/design-system/src/main/java/dev/love/winter/designsystem/component/button/spec/ButtonIcon.kt b/core-android/ui-component/src/main/java/dev/love/winter/uicomponent/component/button/spec/ButtonIcon.kt similarity index 87% rename from core-android/design-system/src/main/java/dev/love/winter/designsystem/component/button/spec/ButtonIcon.kt rename to core-android/ui-component/src/main/java/dev/love/winter/uicomponent/component/button/spec/ButtonIcon.kt index d2d15e8..af6817d 100644 --- a/core-android/design-system/src/main/java/dev/love/winter/designsystem/component/button/spec/ButtonIcon.kt +++ b/core-android/ui-component/src/main/java/dev/love/winter/uicomponent/component/button/spec/ButtonIcon.kt @@ -1,4 +1,4 @@ -package dev.love.winter.designsystem.component.button.spec +package dev.love.winter.uicomponent.component.button.spec import androidx.annotation.DrawableRes diff --git a/core-android/design-system/src/main/java/dev/love/winter/designsystem/component/button/spec/ButtonShape.kt b/core-android/ui-component/src/main/java/dev/love/winter/uicomponent/component/button/spec/ButtonShape.kt similarity index 95% rename from core-android/design-system/src/main/java/dev/love/winter/designsystem/component/button/spec/ButtonShape.kt rename to core-android/ui-component/src/main/java/dev/love/winter/uicomponent/component/button/spec/ButtonShape.kt index 87f2028..0aa906c 100644 --- a/core-android/design-system/src/main/java/dev/love/winter/designsystem/component/button/spec/ButtonShape.kt +++ b/core-android/ui-component/src/main/java/dev/love/winter/uicomponent/component/button/spec/ButtonShape.kt @@ -1,11 +1,11 @@ -package dev.love.winter.designsystem.component.button.spec +package dev.love.winter.uicomponent.component.button.spec import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Shape import androidx.compose.ui.text.TextStyle import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import dev.love.winter.designsystem.theme.WinterTheme +import dev.love.winter.uicomponent.theme.WinterTheme /** * ButtonSize diff --git a/core-android/design-system/src/main/java/dev/love/winter/designsystem/component/button/spec/ButtonState.kt b/core-android/ui-component/src/main/java/dev/love/winter/uicomponent/component/button/spec/ButtonState.kt similarity index 90% rename from core-android/design-system/src/main/java/dev/love/winter/designsystem/component/button/spec/ButtonState.kt rename to core-android/ui-component/src/main/java/dev/love/winter/uicomponent/component/button/spec/ButtonState.kt index c72af35..23046c6 100644 --- a/core-android/design-system/src/main/java/dev/love/winter/designsystem/component/button/spec/ButtonState.kt +++ b/core-android/ui-component/src/main/java/dev/love/winter/uicomponent/component/button/spec/ButtonState.kt @@ -1,4 +1,4 @@ -package dev.love.winter.designsystem.component.button.spec +package dev.love.winter.uicomponent.component.button.spec import androidx.compose.runtime.Immutable import androidx.compose.ui.graphics.Color diff --git a/core-android/design-system/src/main/java/dev/love/winter/designsystem/component/button/spec/ButtonType.kt b/core-android/ui-component/src/main/java/dev/love/winter/uicomponent/component/button/spec/ButtonType.kt similarity index 98% rename from core-android/design-system/src/main/java/dev/love/winter/designsystem/component/button/spec/ButtonType.kt rename to core-android/ui-component/src/main/java/dev/love/winter/uicomponent/component/button/spec/ButtonType.kt index 8703b68..e55accf 100644 --- a/core-android/design-system/src/main/java/dev/love/winter/designsystem/component/button/spec/ButtonType.kt +++ b/core-android/ui-component/src/main/java/dev/love/winter/uicomponent/component/button/spec/ButtonType.kt @@ -1,8 +1,8 @@ -package dev.love.winter.designsystem.component.button.spec +package dev.love.winter.uicomponent.component.button.spec import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color -import dev.love.winter.designsystem.theme.WinterTheme +import dev.love.winter.uicomponent.theme.WinterTheme /** * ButtonType diff --git a/core-android/design-system/src/main/java/dev/love/winter/designsystem/component/text/Text.kt b/core-android/ui-component/src/main/java/dev/love/winter/uicomponent/component/text/Text.kt similarity index 97% rename from core-android/design-system/src/main/java/dev/love/winter/designsystem/component/text/Text.kt rename to core-android/ui-component/src/main/java/dev/love/winter/uicomponent/component/text/Text.kt index 95a18c0..cac536c 100644 --- a/core-android/design-system/src/main/java/dev/love/winter/designsystem/component/text/Text.kt +++ b/core-android/ui-component/src/main/java/dev/love/winter/uicomponent/component/text/Text.kt @@ -1,4 +1,4 @@ -package dev.love.winter.designsystem.component.text +package dev.love.winter.uicomponent.component.text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -13,7 +13,7 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.TextUnit -import dev.love.winter.designsystem.theme.WinterTheme +import dev.love.winter.uicomponent.theme.WinterTheme import java.util.Locale import androidx.compose.material3.Text as MaterialText diff --git a/core-android/design-system/src/main/java/dev/love/winter/designsystem/interaction/Press.kt b/core-android/ui-component/src/main/java/dev/love/winter/uicomponent/interaction/Press.kt similarity index 96% rename from core-android/design-system/src/main/java/dev/love/winter/designsystem/interaction/Press.kt rename to core-android/ui-component/src/main/java/dev/love/winter/uicomponent/interaction/Press.kt index c8f95d3..7e0adb5 100644 --- a/core-android/design-system/src/main/java/dev/love/winter/designsystem/interaction/Press.kt +++ b/core-android/ui-component/src/main/java/dev/love/winter/uicomponent/interaction/Press.kt @@ -1,4 +1,4 @@ -package dev.love.winter.designsystem.interaction +package dev.love.winter.uicomponent.interaction import androidx.compose.foundation.gestures.detectTapGestures import androidx.compose.runtime.Composable diff --git a/core-android/design-system/src/main/java/dev/love/winter/designsystem/interaction/Scale.kt b/core-android/ui-component/src/main/java/dev/love/winter/uicomponent/interaction/Scale.kt similarity index 95% rename from core-android/design-system/src/main/java/dev/love/winter/designsystem/interaction/Scale.kt rename to core-android/ui-component/src/main/java/dev/love/winter/uicomponent/interaction/Scale.kt index 0e61958..a7531e1 100644 --- a/core-android/design-system/src/main/java/dev/love/winter/designsystem/interaction/Scale.kt +++ b/core-android/ui-component/src/main/java/dev/love/winter/uicomponent/interaction/Scale.kt @@ -1,4 +1,4 @@ -package dev.love.winter.designsystem.interaction +package dev.love.winter.uicomponent.interaction import androidx.compose.animation.core.AnimationSpec import androidx.compose.animation.core.Spring diff --git a/core-android/design-system/src/main/java/dev/love/winter/designsystem/theme/BorderRadius.kt b/core-android/ui-component/src/main/java/dev/love/winter/uicomponent/theme/BorderRadius.kt similarity index 62% rename from core-android/design-system/src/main/java/dev/love/winter/designsystem/theme/BorderRadius.kt rename to core-android/ui-component/src/main/java/dev/love/winter/uicomponent/theme/BorderRadius.kt index b21c879..4170e3d 100644 --- a/core-android/design-system/src/main/java/dev/love/winter/designsystem/theme/BorderRadius.kt +++ b/core-android/ui-component/src/main/java/dev/love/winter/uicomponent/theme/BorderRadius.kt @@ -1,14 +1,14 @@ -package dev.love.winter.designsystem.theme +package dev.love.winter.uicomponent.theme import androidx.compose.runtime.Immutable import androidx.compose.runtime.staticCompositionLocalOf import androidx.compose.ui.graphics.Shape -import dev.love.winter.designsystem.tokens.BorderRadiusExtraLarge -import dev.love.winter.designsystem.tokens.BorderRadiusExtraSmall -import dev.love.winter.designsystem.tokens.BorderRadiusLarge -import dev.love.winter.designsystem.tokens.BorderRadiusMedium -import dev.love.winter.designsystem.tokens.BorderRadiusPill -import dev.love.winter.designsystem.tokens.BorderRadiusSmall +import dev.love.winter.designsystem.BorderRadiusExtraLarge +import dev.love.winter.designsystem.BorderRadiusExtraSmall +import dev.love.winter.designsystem.BorderRadiusLarge +import dev.love.winter.designsystem.BorderRadiusMedium +import dev.love.winter.designsystem.BorderRadiusPill +import dev.love.winter.designsystem.BorderRadiusSmall @Immutable data class BorderRadius( diff --git a/core-android/design-system/src/main/java/dev/love/winter/designsystem/theme/Colors.kt b/core-android/ui-component/src/main/java/dev/love/winter/uicomponent/theme/Colors.kt similarity index 50% rename from core-android/design-system/src/main/java/dev/love/winter/designsystem/theme/Colors.kt rename to core-android/ui-component/src/main/java/dev/love/winter/uicomponent/theme/Colors.kt index afa7988..622d1cf 100644 --- a/core-android/design-system/src/main/java/dev/love/winter/designsystem/theme/Colors.kt +++ b/core-android/ui-component/src/main/java/dev/love/winter/uicomponent/theme/Colors.kt @@ -1,178 +1,178 @@ -package dev.love.winter.designsystem.theme +package dev.love.winter.uicomponent.theme import androidx.compose.material3.darkColorScheme import androidx.compose.material3.lightColorScheme import androidx.compose.runtime.Immutable import androidx.compose.runtime.staticCompositionLocalOf import androidx.compose.ui.graphics.Color -import dev.love.winter.designsystem.tokens.BackgroundBrandDark -import dev.love.winter.designsystem.tokens.BackgroundBrandLight -import dev.love.winter.designsystem.tokens.BackgroundBrandSubtleDark -import dev.love.winter.designsystem.tokens.BackgroundBrandSubtleLight -import dev.love.winter.designsystem.tokens.BackgroundContainerDark -import dev.love.winter.designsystem.tokens.BackgroundContainerLight -import dev.love.winter.designsystem.tokens.BackgroundContrastDark -import dev.love.winter.designsystem.tokens.BackgroundContrastLight -import dev.love.winter.designsystem.tokens.BackgroundDark -import dev.love.winter.designsystem.tokens.BackgroundDisabledDark -import dev.love.winter.designsystem.tokens.BackgroundDisabledLight -import dev.love.winter.designsystem.tokens.BackgroundLight -import dev.love.winter.designsystem.tokens.BackgroundModalDark -import dev.love.winter.designsystem.tokens.BackgroundModalLight -import dev.love.winter.designsystem.tokens.BackgroundNegativeDark -import dev.love.winter.designsystem.tokens.BackgroundNegativeLight -import dev.love.winter.designsystem.tokens.BackgroundObjectDark -import dev.love.winter.designsystem.tokens.BackgroundObjectLight -import dev.love.winter.designsystem.tokens.BackgroundOverlayDark -import dev.love.winter.designsystem.tokens.BackgroundOverlayLight -import dev.love.winter.designsystem.tokens.BackgroundPositiveDark -import dev.love.winter.designsystem.tokens.BackgroundPositiveLight -import dev.love.winter.designsystem.tokens.BackgroundWarningDark -import dev.love.winter.designsystem.tokens.BackgroundWarningLight -import dev.love.winter.designsystem.tokens.ButtonBrandActiveDark -import dev.love.winter.designsystem.tokens.ButtonBrandActiveLight -import dev.love.winter.designsystem.tokens.ButtonBrandDefaultDark -import dev.love.winter.designsystem.tokens.ButtonBrandDefaultLight -import dev.love.winter.designsystem.tokens.ButtonBrandDisabledDark -import dev.love.winter.designsystem.tokens.ButtonBrandDisabledLight -import dev.love.winter.designsystem.tokens.ButtonCriticalActiveDark -import dev.love.winter.designsystem.tokens.ButtonCriticalActiveLight -import dev.love.winter.designsystem.tokens.ButtonCriticalDefaultDark -import dev.love.winter.designsystem.tokens.ButtonCriticalDefaultLight -import dev.love.winter.designsystem.tokens.ButtonCriticalDisabledDark -import dev.love.winter.designsystem.tokens.ButtonCriticalDisabledLight -import dev.love.winter.designsystem.tokens.ButtonPrimaryActiveDark -import dev.love.winter.designsystem.tokens.ButtonPrimaryActiveLight -import dev.love.winter.designsystem.tokens.ButtonPrimaryDefaultDark -import dev.love.winter.designsystem.tokens.ButtonPrimaryDefaultLight -import dev.love.winter.designsystem.tokens.ButtonPrimaryDisabledDark -import dev.love.winter.designsystem.tokens.ButtonPrimaryDisabledLight -import dev.love.winter.designsystem.tokens.ButtonSecondaryActiveDark -import dev.love.winter.designsystem.tokens.ButtonSecondaryActiveLight -import dev.love.winter.designsystem.tokens.ButtonSecondaryDefaultDark -import dev.love.winter.designsystem.tokens.ButtonSecondaryDefaultLight -import dev.love.winter.designsystem.tokens.ButtonSecondaryDisabledDark -import dev.love.winter.designsystem.tokens.ButtonSecondaryDisabledLight -import dev.love.winter.designsystem.tokens.ButtonTertiaryActiveDark -import dev.love.winter.designsystem.tokens.ButtonTertiaryActiveLight -import dev.love.winter.designsystem.tokens.ButtonTertiaryDefaultDark -import dev.love.winter.designsystem.tokens.ButtonTertiaryDefaultLight -import dev.love.winter.designsystem.tokens.ButtonTertiaryDisabledDark -import dev.love.winter.designsystem.tokens.ButtonTertiaryDisabledLight -import dev.love.winter.designsystem.tokens.Green100 -import dev.love.winter.designsystem.tokens.Green400 -import dev.love.winter.designsystem.tokens.Green600 -import dev.love.winter.designsystem.tokens.Green800 -import dev.love.winter.designsystem.tokens.Green900 -import dev.love.winter.designsystem.tokens.Grey100 -import dev.love.winter.designsystem.tokens.Grey200 -import dev.love.winter.designsystem.tokens.Grey300 -import dev.love.winter.designsystem.tokens.Grey400 -import dev.love.winter.designsystem.tokens.Grey50 -import dev.love.winter.designsystem.tokens.Grey600 -import dev.love.winter.designsystem.tokens.Grey700 -import dev.love.winter.designsystem.tokens.Grey800 -import dev.love.winter.designsystem.tokens.Grey900 -import dev.love.winter.designsystem.tokens.IconBrandDark -import dev.love.winter.designsystem.tokens.IconBrandLight -import dev.love.winter.designsystem.tokens.IconDisabledDark -import dev.love.winter.designsystem.tokens.IconDisabledLight -import dev.love.winter.designsystem.tokens.IconNegativeDark -import dev.love.winter.designsystem.tokens.IconNegativeLight -import dev.love.winter.designsystem.tokens.IconNeutralDark -import dev.love.winter.designsystem.tokens.IconNeutralLight -import dev.love.winter.designsystem.tokens.IconNeutralStrongDark -import dev.love.winter.designsystem.tokens.IconNeutralStrongLight -import dev.love.winter.designsystem.tokens.IconNeutralSubtleDark -import dev.love.winter.designsystem.tokens.IconNeutralSubtleLight -import dev.love.winter.designsystem.tokens.IconOnColorDarkDark -import dev.love.winter.designsystem.tokens.IconOnColorDarkLight -import dev.love.winter.designsystem.tokens.IconOnColorLightDark -import dev.love.winter.designsystem.tokens.IconOnColorLightLight -import dev.love.winter.designsystem.tokens.IconOnContrastDark -import dev.love.winter.designsystem.tokens.IconOnContrastLight -import dev.love.winter.designsystem.tokens.IconPositiveDark -import dev.love.winter.designsystem.tokens.IconPositiveLight -import dev.love.winter.designsystem.tokens.IconWarningDark -import dev.love.winter.designsystem.tokens.IconWarningLight -import dev.love.winter.designsystem.tokens.InputActiveCursorDark -import dev.love.winter.designsystem.tokens.InputActiveCursorLight -import dev.love.winter.designsystem.tokens.InputActiveDark -import dev.love.winter.designsystem.tokens.InputActiveLight -import dev.love.winter.designsystem.tokens.InputDefaultDark -import dev.love.winter.designsystem.tokens.InputDefaultLight -import dev.love.winter.designsystem.tokens.InputDisabledDark -import dev.love.winter.designsystem.tokens.InputDisabledLight -import dev.love.winter.designsystem.tokens.InputNegativeDark -import dev.love.winter.designsystem.tokens.InputNegativeLight -import dev.love.winter.designsystem.tokens.InputPositiveDark -import dev.love.winter.designsystem.tokens.InputPositiveLight -import dev.love.winter.designsystem.tokens.InputSelectedDark -import dev.love.winter.designsystem.tokens.InputSelectedLight -import dev.love.winter.designsystem.tokens.Primary100 -import dev.love.winter.designsystem.tokens.Primary400 -import dev.love.winter.designsystem.tokens.Primary500 -import dev.love.winter.designsystem.tokens.Primary800 -import dev.love.winter.designsystem.tokens.Primary900 -import dev.love.winter.designsystem.tokens.Red100 -import dev.love.winter.designsystem.tokens.Red400 -import dev.love.winter.designsystem.tokens.Red500 -import dev.love.winter.designsystem.tokens.Red800 -import dev.love.winter.designsystem.tokens.Red900 -import dev.love.winter.designsystem.tokens.StrokeBrandDark -import dev.love.winter.designsystem.tokens.StrokeBrandLight -import dev.love.winter.designsystem.tokens.StrokeNegativeDark -import dev.love.winter.designsystem.tokens.StrokeNegativeLight -import dev.love.winter.designsystem.tokens.StrokeNeutralDark -import dev.love.winter.designsystem.tokens.StrokeNeutralLight -import dev.love.winter.designsystem.tokens.StrokeNeutralStrongDark -import dev.love.winter.designsystem.tokens.StrokeNeutralStrongLight -import dev.love.winter.designsystem.tokens.StrokeNeutralSubtleDark -import dev.love.winter.designsystem.tokens.StrokeNeutralSubtleLight -import dev.love.winter.designsystem.tokens.StrokePositiveDark -import dev.love.winter.designsystem.tokens.StrokePositiveLight -import dev.love.winter.designsystem.tokens.StrokeWarningDark -import dev.love.winter.designsystem.tokens.StrokeWarningLight -import dev.love.winter.designsystem.tokens.TagBrandStrongDark -import dev.love.winter.designsystem.tokens.TagBrandStrongLight -import dev.love.winter.designsystem.tokens.TagBrandSubtleDark -import dev.love.winter.designsystem.tokens.TagBrandSubtleLight -import dev.love.winter.designsystem.tokens.TagNegativeDark -import dev.love.winter.designsystem.tokens.TagNegativeLight -import dev.love.winter.designsystem.tokens.TagNeutralDark -import dev.love.winter.designsystem.tokens.TagNeutralLight -import dev.love.winter.designsystem.tokens.TagPositiveDark -import dev.love.winter.designsystem.tokens.TagPositiveLight -import dev.love.winter.designsystem.tokens.TagWarningDark -import dev.love.winter.designsystem.tokens.TagWarningLight -import dev.love.winter.designsystem.tokens.TextBodyDark -import dev.love.winter.designsystem.tokens.TextBodyLight -import dev.love.winter.designsystem.tokens.TextBrandDark -import dev.love.winter.designsystem.tokens.TextBrandLight -import dev.love.winter.designsystem.tokens.TextCaptionDark -import dev.love.winter.designsystem.tokens.TextCaptionLight -import dev.love.winter.designsystem.tokens.TextDisabledDark -import dev.love.winter.designsystem.tokens.TextDisabledLight -import dev.love.winter.designsystem.tokens.TextLinkDark -import dev.love.winter.designsystem.tokens.TextLinkLight -import dev.love.winter.designsystem.tokens.TextNegativeDark -import dev.love.winter.designsystem.tokens.TextNegativeLight -import dev.love.winter.designsystem.tokens.TextOnColorDarkDark -import dev.love.winter.designsystem.tokens.TextOnColorDarkLight -import dev.love.winter.designsystem.tokens.TextOnColorLightDark -import dev.love.winter.designsystem.tokens.TextOnColorLightLight -import dev.love.winter.designsystem.tokens.TextOnContrastDark -import dev.love.winter.designsystem.tokens.TextOnContrastLight -import dev.love.winter.designsystem.tokens.TextPlaceholderDark -import dev.love.winter.designsystem.tokens.TextPlaceholderLight -import dev.love.winter.designsystem.tokens.TextPositiveDark -import dev.love.winter.designsystem.tokens.TextPositiveLight -import dev.love.winter.designsystem.tokens.TextSubtitleDark -import dev.love.winter.designsystem.tokens.TextSubtitleLight -import dev.love.winter.designsystem.tokens.TextTitleDark -import dev.love.winter.designsystem.tokens.TextTitleLight -import dev.love.winter.designsystem.tokens.TextWarningDark -import dev.love.winter.designsystem.tokens.TextWarningLight +import dev.love.winter.designsystem.BackgroundBrandDark +import dev.love.winter.designsystem.BackgroundBrandLight +import dev.love.winter.designsystem.BackgroundBrandSubtleDark +import dev.love.winter.designsystem.BackgroundBrandSubtleLight +import dev.love.winter.designsystem.BackgroundContainerDark +import dev.love.winter.designsystem.BackgroundContainerLight +import dev.love.winter.designsystem.BackgroundContrastDark +import dev.love.winter.designsystem.BackgroundContrastLight +import dev.love.winter.designsystem.BackgroundDark +import dev.love.winter.designsystem.BackgroundDisabledDark +import dev.love.winter.designsystem.BackgroundDisabledLight +import dev.love.winter.designsystem.BackgroundLight +import dev.love.winter.designsystem.BackgroundModalDark +import dev.love.winter.designsystem.BackgroundModalLight +import dev.love.winter.designsystem.BackgroundNegativeDark +import dev.love.winter.designsystem.BackgroundNegativeLight +import dev.love.winter.designsystem.BackgroundObjectDark +import dev.love.winter.designsystem.BackgroundObjectLight +import dev.love.winter.designsystem.BackgroundOverlayDark +import dev.love.winter.designsystem.BackgroundOverlayLight +import dev.love.winter.designsystem.BackgroundPositiveDark +import dev.love.winter.designsystem.BackgroundPositiveLight +import dev.love.winter.designsystem.BackgroundWarningDark +import dev.love.winter.designsystem.BackgroundWarningLight +import dev.love.winter.designsystem.ButtonBrandActiveDark +import dev.love.winter.designsystem.ButtonBrandActiveLight +import dev.love.winter.designsystem.ButtonBrandDefaultDark +import dev.love.winter.designsystem.ButtonBrandDefaultLight +import dev.love.winter.designsystem.ButtonBrandDisabledDark +import dev.love.winter.designsystem.ButtonBrandDisabledLight +import dev.love.winter.designsystem.ButtonCriticalActiveDark +import dev.love.winter.designsystem.ButtonCriticalActiveLight +import dev.love.winter.designsystem.ButtonCriticalDefaultDark +import dev.love.winter.designsystem.ButtonCriticalDefaultLight +import dev.love.winter.designsystem.ButtonCriticalDisabledDark +import dev.love.winter.designsystem.ButtonCriticalDisabledLight +import dev.love.winter.designsystem.ButtonPrimaryActiveDark +import dev.love.winter.designsystem.ButtonPrimaryActiveLight +import dev.love.winter.designsystem.ButtonPrimaryDefaultDark +import dev.love.winter.designsystem.ButtonPrimaryDefaultLight +import dev.love.winter.designsystem.ButtonPrimaryDisabledDark +import dev.love.winter.designsystem.ButtonPrimaryDisabledLight +import dev.love.winter.designsystem.ButtonSecondaryActiveDark +import dev.love.winter.designsystem.ButtonSecondaryActiveLight +import dev.love.winter.designsystem.ButtonSecondaryDefaultDark +import dev.love.winter.designsystem.ButtonSecondaryDefaultLight +import dev.love.winter.designsystem.ButtonSecondaryDisabledDark +import dev.love.winter.designsystem.ButtonSecondaryDisabledLight +import dev.love.winter.designsystem.ButtonTertiaryActiveDark +import dev.love.winter.designsystem.ButtonTertiaryActiveLight +import dev.love.winter.designsystem.ButtonTertiaryDefaultDark +import dev.love.winter.designsystem.ButtonTertiaryDefaultLight +import dev.love.winter.designsystem.ButtonTertiaryDisabledDark +import dev.love.winter.designsystem.ButtonTertiaryDisabledLight +import dev.love.winter.designsystem.Green100 +import dev.love.winter.designsystem.Green400 +import dev.love.winter.designsystem.Green600 +import dev.love.winter.designsystem.Green800 +import dev.love.winter.designsystem.Green900 +import dev.love.winter.designsystem.Grey100 +import dev.love.winter.designsystem.Grey200 +import dev.love.winter.designsystem.Grey300 +import dev.love.winter.designsystem.Grey400 +import dev.love.winter.designsystem.Grey50 +import dev.love.winter.designsystem.Grey600 +import dev.love.winter.designsystem.Grey700 +import dev.love.winter.designsystem.Grey800 +import dev.love.winter.designsystem.Grey900 +import dev.love.winter.designsystem.IconBrandDark +import dev.love.winter.designsystem.IconBrandLight +import dev.love.winter.designsystem.IconDisabledDark +import dev.love.winter.designsystem.IconDisabledLight +import dev.love.winter.designsystem.IconNegativeDark +import dev.love.winter.designsystem.IconNegativeLight +import dev.love.winter.designsystem.IconNeutralDark +import dev.love.winter.designsystem.IconNeutralLight +import dev.love.winter.designsystem.IconNeutralStrongDark +import dev.love.winter.designsystem.IconNeutralStrongLight +import dev.love.winter.designsystem.IconNeutralSubtleDark +import dev.love.winter.designsystem.IconNeutralSubtleLight +import dev.love.winter.designsystem.IconOnColorDarkDark +import dev.love.winter.designsystem.IconOnColorDarkLight +import dev.love.winter.designsystem.IconOnColorLightDark +import dev.love.winter.designsystem.IconOnColorLightLight +import dev.love.winter.designsystem.IconOnContrastDark +import dev.love.winter.designsystem.IconOnContrastLight +import dev.love.winter.designsystem.IconPositiveDark +import dev.love.winter.designsystem.IconPositiveLight +import dev.love.winter.designsystem.IconWarningDark +import dev.love.winter.designsystem.IconWarningLight +import dev.love.winter.designsystem.InputActiveCursorDark +import dev.love.winter.designsystem.InputActiveCursorLight +import dev.love.winter.designsystem.InputActiveDark +import dev.love.winter.designsystem.InputActiveLight +import dev.love.winter.designsystem.InputDefaultDark +import dev.love.winter.designsystem.InputDefaultLight +import dev.love.winter.designsystem.InputDisabledDark +import dev.love.winter.designsystem.InputDisabledLight +import dev.love.winter.designsystem.InputNegativeDark +import dev.love.winter.designsystem.InputNegativeLight +import dev.love.winter.designsystem.InputPositiveDark +import dev.love.winter.designsystem.InputPositiveLight +import dev.love.winter.designsystem.InputSelectedDark +import dev.love.winter.designsystem.InputSelectedLight +import dev.love.winter.designsystem.Primary100 +import dev.love.winter.designsystem.Primary400 +import dev.love.winter.designsystem.Primary500 +import dev.love.winter.designsystem.Primary800 +import dev.love.winter.designsystem.Primary900 +import dev.love.winter.designsystem.Red100 +import dev.love.winter.designsystem.Red400 +import dev.love.winter.designsystem.Red500 +import dev.love.winter.designsystem.Red800 +import dev.love.winter.designsystem.Red900 +import dev.love.winter.designsystem.StrokeBrandDark +import dev.love.winter.designsystem.StrokeBrandLight +import dev.love.winter.designsystem.StrokeNegativeDark +import dev.love.winter.designsystem.StrokeNegativeLight +import dev.love.winter.designsystem.StrokeNeutralDark +import dev.love.winter.designsystem.StrokeNeutralLight +import dev.love.winter.designsystem.StrokeNeutralStrongDark +import dev.love.winter.designsystem.StrokeNeutralStrongLight +import dev.love.winter.designsystem.StrokeNeutralSubtleDark +import dev.love.winter.designsystem.StrokeNeutralSubtleLight +import dev.love.winter.designsystem.StrokePositiveDark +import dev.love.winter.designsystem.StrokePositiveLight +import dev.love.winter.designsystem.StrokeWarningDark +import dev.love.winter.designsystem.StrokeWarningLight +import dev.love.winter.designsystem.TagBrandStrongDark +import dev.love.winter.designsystem.TagBrandStrongLight +import dev.love.winter.designsystem.TagBrandSubtleDark +import dev.love.winter.designsystem.TagBrandSubtleLight +import dev.love.winter.designsystem.TagNegativeDark +import dev.love.winter.designsystem.TagNegativeLight +import dev.love.winter.designsystem.TagNeutralDark +import dev.love.winter.designsystem.TagNeutralLight +import dev.love.winter.designsystem.TagPositiveDark +import dev.love.winter.designsystem.TagPositiveLight +import dev.love.winter.designsystem.TagWarningDark +import dev.love.winter.designsystem.TagWarningLight +import dev.love.winter.designsystem.TextBodyDark +import dev.love.winter.designsystem.TextBodyLight +import dev.love.winter.designsystem.TextBrandDark +import dev.love.winter.designsystem.TextBrandLight +import dev.love.winter.designsystem.TextCaptionDark +import dev.love.winter.designsystem.TextCaptionLight +import dev.love.winter.designsystem.TextDisabledDark +import dev.love.winter.designsystem.TextDisabledLight +import dev.love.winter.designsystem.TextLinkDark +import dev.love.winter.designsystem.TextLinkLight +import dev.love.winter.designsystem.TextNegativeDark +import dev.love.winter.designsystem.TextNegativeLight +import dev.love.winter.designsystem.TextOnColorDarkDark +import dev.love.winter.designsystem.TextOnColorDarkLight +import dev.love.winter.designsystem.TextOnColorLightDark +import dev.love.winter.designsystem.TextOnColorLightLight +import dev.love.winter.designsystem.TextOnContrastDark +import dev.love.winter.designsystem.TextOnContrastLight +import dev.love.winter.designsystem.TextPlaceholderDark +import dev.love.winter.designsystem.TextPlaceholderLight +import dev.love.winter.designsystem.TextPositiveDark +import dev.love.winter.designsystem.TextPositiveLight +import dev.love.winter.designsystem.TextSubtitleDark +import dev.love.winter.designsystem.TextSubtitleLight +import dev.love.winter.designsystem.TextTitleDark +import dev.love.winter.designsystem.TextTitleLight +import dev.love.winter.designsystem.TextWarningDark +import dev.love.winter.designsystem.TextWarningLight @Immutable data class Colors( diff --git a/core-android/design-system/src/main/java/dev/love/winter/designsystem/theme/Icon.kt b/core-android/ui-component/src/main/java/dev/love/winter/uicomponent/theme/Icon.kt similarity index 93% rename from core-android/design-system/src/main/java/dev/love/winter/designsystem/theme/Icon.kt rename to core-android/ui-component/src/main/java/dev/love/winter/uicomponent/theme/Icon.kt index 1f0010f..815226d 100644 --- a/core-android/design-system/src/main/java/dev/love/winter/designsystem/theme/Icon.kt +++ b/core-android/ui-component/src/main/java/dev/love/winter/uicomponent/theme/Icon.kt @@ -1,18 +1,8 @@ -package dev.love.winter.designsystem.theme +package dev.love.winter.uicomponent.theme import androidx.compose.runtime.Immutable import androidx.compose.runtime.staticCompositionLocalOf import dev.love.winter.designsystem.R -import dev.love.winter.designsystem.tokens.DateTimeIcon -import dev.love.winter.designsystem.tokens.GlobalIcon -import dev.love.winter.designsystem.tokens.IconResource -import dev.love.winter.designsystem.tokens.InputIcon -import dev.love.winter.designsystem.tokens.LocationIcon -import dev.love.winter.designsystem.tokens.LogoIcon -import dev.love.winter.designsystem.tokens.MessageIcon -import dev.love.winter.designsystem.tokens.NavigationIcon -import dev.love.winter.designsystem.tokens.NotificationIcon -import dev.love.winter.designsystem.tokens.PurchaseIcon @Immutable data class Icon( @@ -27,7 +17,7 @@ data class Icon( val logo: LogoIcon, ) -internal val IconTheme = Icon( +val IconTheme = Icon( global = GlobalIcon( home = IconResource( filled = R.drawable.ic_home_filled, diff --git a/core-android/design-system/src/main/java/dev/love/winter/designsystem/tokens/IconToken.kt b/core-android/ui-component/src/main/java/dev/love/winter/uicomponent/theme/IconToken.kt similarity index 98% rename from core-android/design-system/src/main/java/dev/love/winter/designsystem/tokens/IconToken.kt rename to core-android/ui-component/src/main/java/dev/love/winter/uicomponent/theme/IconToken.kt index d9a1f47..52ba480 100644 --- a/core-android/design-system/src/main/java/dev/love/winter/designsystem/tokens/IconToken.kt +++ b/core-android/ui-component/src/main/java/dev/love/winter/uicomponent/theme/IconToken.kt @@ -1,4 +1,4 @@ -package dev.love.winter.designsystem.tokens +package dev.love.winter.uicomponent.theme import androidx.annotation.DrawableRes import androidx.compose.runtime.Immutable diff --git a/core-android/design-system/src/main/java/dev/love/winter/designsystem/theme/Spacing.kt b/core-android/ui-component/src/main/java/dev/love/winter/uicomponent/theme/Spacing.kt similarity index 61% rename from core-android/design-system/src/main/java/dev/love/winter/designsystem/theme/Spacing.kt rename to core-android/ui-component/src/main/java/dev/love/winter/uicomponent/theme/Spacing.kt index 6664165..0bb72b7 100644 --- a/core-android/design-system/src/main/java/dev/love/winter/designsystem/theme/Spacing.kt +++ b/core-android/ui-component/src/main/java/dev/love/winter/uicomponent/theme/Spacing.kt @@ -1,15 +1,15 @@ -package dev.love.winter.designsystem.theme +package dev.love.winter.uicomponent.theme import androidx.compose.runtime.Immutable import androidx.compose.runtime.staticCompositionLocalOf import androidx.compose.ui.unit.Dp -import dev.love.winter.designsystem.tokens.SpacingExtraExtraLarge -import dev.love.winter.designsystem.tokens.SpacingExtraExtraSmall -import dev.love.winter.designsystem.tokens.SpacingExtraLarge -import dev.love.winter.designsystem.tokens.SpacingExtraSmall -import dev.love.winter.designsystem.tokens.SpacingLarge -import dev.love.winter.designsystem.tokens.SpacingMedium -import dev.love.winter.designsystem.tokens.SpacingSmall +import dev.love.winter.designsystem.SpacingExtraExtraLarge +import dev.love.winter.designsystem.SpacingExtraExtraSmall +import dev.love.winter.designsystem.SpacingExtraLarge +import dev.love.winter.designsystem.SpacingExtraSmall +import dev.love.winter.designsystem.SpacingLarge +import dev.love.winter.designsystem.SpacingMedium +import dev.love.winter.designsystem.SpacingSmall @Immutable data class Spacing( diff --git a/core-android/design-system/src/main/java/dev/love/winter/designsystem/theme/Theme.kt b/core-android/ui-component/src/main/java/dev/love/winter/uicomponent/theme/Theme.kt similarity index 97% rename from core-android/design-system/src/main/java/dev/love/winter/designsystem/theme/Theme.kt rename to core-android/ui-component/src/main/java/dev/love/winter/uicomponent/theme/Theme.kt index d269e08..ba984f2 100644 --- a/core-android/design-system/src/main/java/dev/love/winter/designsystem/theme/Theme.kt +++ b/core-android/ui-component/src/main/java/dev/love/winter/uicomponent/theme/Theme.kt @@ -1,4 +1,4 @@ -package dev.love.winter.designsystem.theme +package dev.love.winter.uicomponent.theme import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.ColorScheme diff --git a/core-android/design-system/src/main/java/dev/love/winter/designsystem/theme/Typography.kt b/core-android/ui-component/src/main/java/dev/love/winter/uicomponent/theme/Typography.kt similarity index 60% rename from core-android/design-system/src/main/java/dev/love/winter/designsystem/theme/Typography.kt rename to core-android/ui-component/src/main/java/dev/love/winter/uicomponent/theme/Typography.kt index 3d19e8c..862186f 100644 --- a/core-android/design-system/src/main/java/dev/love/winter/designsystem/theme/Typography.kt +++ b/core-android/ui-component/src/main/java/dev/love/winter/uicomponent/theme/Typography.kt @@ -1,25 +1,25 @@ -package dev.love.winter.designsystem.theme +package dev.love.winter.uicomponent.theme import androidx.compose.runtime.Immutable import androidx.compose.runtime.staticCompositionLocalOf import androidx.compose.ui.text.TextStyle -import dev.love.winter.designsystem.tokens.ActionLarge -import dev.love.winter.designsystem.tokens.ActionMedium -import dev.love.winter.designsystem.tokens.ActionSmall -import dev.love.winter.designsystem.tokens.BodyExtraLarge -import dev.love.winter.designsystem.tokens.BodyExtraSmall -import dev.love.winter.designsystem.tokens.BodyLarge -import dev.love.winter.designsystem.tokens.BodyMedium -import dev.love.winter.designsystem.tokens.BodySmall -import dev.love.winter.designsystem.tokens.CaptionLarge -import dev.love.winter.designsystem.tokens.CaptionMedium -import dev.love.winter.designsystem.tokens.CaptionSmall -import dev.love.winter.designsystem.tokens.FontLarge -import dev.love.winter.designsystem.tokens.FontMedium -import dev.love.winter.designsystem.tokens.FontSmall -import dev.love.winter.designsystem.tokens.TitleLarge -import dev.love.winter.designsystem.tokens.TitleMedium -import dev.love.winter.designsystem.tokens.TitleSmall +import dev.love.winter.designsystem.ActionLarge +import dev.love.winter.designsystem.ActionMedium +import dev.love.winter.designsystem.ActionSmall +import dev.love.winter.designsystem.BodyExtraLarge +import dev.love.winter.designsystem.BodyExtraSmall +import dev.love.winter.designsystem.BodyLarge +import dev.love.winter.designsystem.BodyMedium +import dev.love.winter.designsystem.BodySmall +import dev.love.winter.designsystem.CaptionLarge +import dev.love.winter.designsystem.CaptionMedium +import dev.love.winter.designsystem.CaptionSmall +import dev.love.winter.designsystem.FontLarge +import dev.love.winter.designsystem.FontMedium +import dev.love.winter.designsystem.FontSmall +import dev.love.winter.designsystem.TitleLarge +import dev.love.winter.designsystem.TitleMedium +import dev.love.winter.designsystem.TitleSmall @Immutable data class Typography( diff --git a/gradle/dependencyGraph.gradle b/gradle/dependencyGraph.gradle index f2056c2..f8e11d4 100644 --- a/gradle/dependencyGraph.gradle +++ b/gradle/dependencyGraph.gradle @@ -1,7 +1,6 @@ // from: https://github.com/DroidKaigi/conference-app-2021/blob/main/gradle/dependencyGraph.gradle // from: https://github.com/JakeWharton/SdkSearch/blob/3351cad9bfacb0a364858e843774147143f58c7a/gradle/projectDependencyGraph.gradle -// brew install graphviz -// JAVA_HOME="/Applications/Android Studio.app/Contents/jbr/Contents/Home" ./gradlew projectDependencyGraph --no-configuration-cache +// ./gradlew projectDependencyGraph --no-configuration-cache tasks.register('projectDependencyGraph') { doLast { def dotFileName = 'project.dot' diff --git a/sample/design-system-catalog/build.gradle.kts b/sample/design-system-catalog/build.gradle.kts index 8f9c706..2e404be 100644 --- a/sample/design-system-catalog/build.gradle.kts +++ b/sample/design-system-catalog/build.gradle.kts @@ -19,6 +19,6 @@ android { dependencies { implementation(projects.sample.common) - implementation(projects.coreAndroid.designSystem) + implementation(projects.coreAndroid.uiComponent) implementation(libs.androidX.appcompat) } diff --git a/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/MainActivity.kt b/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/MainActivity.kt index 39d68fb..b5d1d2e 100644 --- a/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/MainActivity.kt +++ b/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/MainActivity.kt @@ -5,7 +5,7 @@ import androidx.activity.compose.setContent import androidx.activity.enableEdgeToEdge import androidx.appcompat.app.AppCompatActivity import dagger.hilt.android.AndroidEntryPoint -import dev.love.winter.designsystem.theme.WinterTheme +import dev.love.winter.uicomponent.theme.WinterTheme @AndroidEntryPoint class MainActivity : AppCompatActivity() { diff --git a/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/Navigation.kt b/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/Navigation.kt index 99ab40f..918c595 100644 --- a/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/Navigation.kt +++ b/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/Navigation.kt @@ -19,8 +19,6 @@ import androidx.navigation3.runtime.entryProvider import androidx.navigation3.runtime.rememberNavBackStack import androidx.navigation3.runtime.rememberSaveableStateHolderNavEntryDecorator import androidx.navigation3.ui.NavDisplay -import dev.love.winter.designsystem.component.text.Text -import dev.love.winter.designsystem.theme.WinterTheme import dev.love.winter.dscatalog.catalog.button.ButtonRoute import dev.love.winter.dscatalog.designtokens.borderradius.BorderRadiusRoute import dev.love.winter.dscatalog.designtokens.color.ColorRoute @@ -28,6 +26,8 @@ import dev.love.winter.dscatalog.designtokens.icons.ColorsRoute import dev.love.winter.dscatalog.designtokens.spacing.SpacingRoute import dev.love.winter.dscatalog.designtokens.typography.TypographyRoute import dev.love.winter.dscatalog.home.HomeRoute +import dev.love.winter.uicomponent.component.text.Text +import dev.love.winter.uicomponent.theme.WinterTheme @Composable fun Navigation( diff --git a/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/catalog/button/Screen.kt b/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/catalog/button/Screen.kt index 4adb79d..e8db556 100644 --- a/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/catalog/button/Screen.kt +++ b/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/catalog/button/Screen.kt @@ -15,13 +15,13 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import dev.love.winter.designsystem.component.button.Button -import dev.love.winter.designsystem.component.button.spec.ButtonIcon -import dev.love.winter.designsystem.component.button.spec.ButtonShape -import dev.love.winter.designsystem.component.button.spec.ButtonState -import dev.love.winter.designsystem.component.button.spec.ButtonType -import dev.love.winter.designsystem.component.text.Text -import dev.love.winter.designsystem.theme.WinterTheme +import dev.love.winter.uicomponent.component.button.Button +import dev.love.winter.uicomponent.component.button.spec.ButtonIcon +import dev.love.winter.uicomponent.component.button.spec.ButtonShape +import dev.love.winter.uicomponent.component.button.spec.ButtonState +import dev.love.winter.uicomponent.component.button.spec.ButtonType +import dev.love.winter.uicomponent.component.text.Text +import dev.love.winter.uicomponent.theme.WinterTheme import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf diff --git a/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/designtokens/borderradius/Data.kt b/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/designtokens/borderradius/Data.kt index cc543bb..7bc39b2 100644 --- a/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/designtokens/borderradius/Data.kt +++ b/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/designtokens/borderradius/Data.kt @@ -4,8 +4,8 @@ import androidx.annotation.DrawableRes import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.graphics.Shape -import dev.love.winter.designsystem.theme.WinterTheme import dev.love.winter.dscatalog.R +import dev.love.winter.uicomponent.theme.WinterTheme import dev.love.winter.sample.common.R as CommonR class Data diff --git a/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/designtokens/borderradius/Screen.kt b/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/designtokens/borderradius/Screen.kt index b7f7b23..9e7e4c8 100644 --- a/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/designtokens/borderradius/Screen.kt +++ b/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/designtokens/borderradius/Screen.kt @@ -25,9 +25,9 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import dev.love.winter.designsystem.component.text.Text -import dev.love.winter.designsystem.theme.WinterTheme import dev.love.winter.sample.common.R +import dev.love.winter.uicomponent.component.text.Text +import dev.love.winter.uicomponent.theme.WinterTheme private const val ASPECT_COLUMN_RATIO_TOKEN = 0.5f private const val ASPECT_COLUMN_RATIO_PX = 0.3f diff --git a/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/designtokens/color/Screen.kt b/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/designtokens/color/Screen.kt index b9db28d..a58d9c2 100644 --- a/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/designtokens/color/Screen.kt +++ b/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/designtokens/color/Screen.kt @@ -28,15 +28,15 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import dev.love.winter.designsystem.api.ColorToken -import dev.love.winter.designsystem.api.brandColorTokens -import dev.love.winter.designsystem.api.greenColorTokens -import dev.love.winter.designsystem.api.neutralColorTokens -import dev.love.winter.designsystem.api.redColorTokens -import dev.love.winter.designsystem.api.yellowColorTokens -import dev.love.winter.designsystem.component.text.Text -import dev.love.winter.designsystem.theme.WinterTheme import dev.love.winter.sample.common.R +import dev.love.winter.uicomponent.api.ColorToken +import dev.love.winter.uicomponent.api.brandColorTokens +import dev.love.winter.uicomponent.api.greenColorTokens +import dev.love.winter.uicomponent.api.neutralColorTokens +import dev.love.winter.uicomponent.api.redColorTokens +import dev.love.winter.uicomponent.api.yellowColorTokens +import dev.love.winter.uicomponent.component.text.Text +import dev.love.winter.uicomponent.theme.WinterTheme import kotlinx.collections.immutable.ImmutableList @Composable diff --git a/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/designtokens/icons/Data.kt b/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/designtokens/icons/Data.kt index 9ed6ee1..0270e36 100644 --- a/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/designtokens/icons/Data.kt +++ b/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/designtokens/icons/Data.kt @@ -2,8 +2,8 @@ package dev.love.winter.dscatalog.designtokens.icons import androidx.compose.runtime.Composable import androidx.compose.runtime.remember -import dev.love.winter.designsystem.theme.WinterTheme -import dev.love.winter.designsystem.tokens.IconResource +import dev.love.winter.uicomponent.theme.IconResource +import dev.love.winter.uicomponent.theme.WinterTheme import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf diff --git a/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/designtokens/icons/Screen.kt b/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/designtokens/icons/Screen.kt index 1739d9c..b060314 100644 --- a/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/designtokens/icons/Screen.kt +++ b/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/designtokens/icons/Screen.kt @@ -21,10 +21,10 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview -import dev.love.winter.designsystem.component.text.Text -import dev.love.winter.designsystem.theme.WinterTheme -import dev.love.winter.designsystem.tokens.IconResource import dev.love.winter.dscatalog.R +import dev.love.winter.uicomponent.component.text.Text +import dev.love.winter.uicomponent.theme.IconResource +import dev.love.winter.uicomponent.theme.WinterTheme import dev.love.winter.sample.common.R as CommonR private const val ASPECT_COLUMN_RATIO_TOKEN = 0.65f diff --git a/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/designtokens/spacing/Screen.kt b/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/designtokens/spacing/Screen.kt index d2cbe39..4ad3a48 100644 --- a/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/designtokens/spacing/Screen.kt +++ b/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/designtokens/spacing/Screen.kt @@ -24,9 +24,9 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Dp -import dev.love.winter.designsystem.component.text.Text -import dev.love.winter.designsystem.theme.WinterTheme import dev.love.winter.dscatalog.R +import dev.love.winter.uicomponent.component.text.Text +import dev.love.winter.uicomponent.theme.WinterTheme import dev.love.winter.sample.common.R as CommonR private const val ASPECT_COLUMN_RATIO_TOKEN = 0.5f diff --git a/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/designtokens/typography/Data.kt b/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/designtokens/typography/Data.kt index 345abd7..e13faf0 100644 --- a/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/designtokens/typography/Data.kt +++ b/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/designtokens/typography/Data.kt @@ -3,7 +3,7 @@ package dev.love.winter.dscatalog.designtokens.typography import androidx.compose.runtime.Composable import androidx.compose.runtime.Immutable import androidx.compose.ui.text.TextStyle -import dev.love.winter.designsystem.theme.WinterTheme +import dev.love.winter.uicomponent.theme.WinterTheme sealed class TypographyListItem { data class Header( diff --git a/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/designtokens/typography/Screen.kt b/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/designtokens/typography/Screen.kt index e641017..1d54dc3 100644 --- a/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/designtokens/typography/Screen.kt +++ b/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/designtokens/typography/Screen.kt @@ -16,8 +16,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview -import dev.love.winter.designsystem.component.text.Text -import dev.love.winter.designsystem.theme.WinterTheme +import dev.love.winter.uicomponent.component.text.Text +import dev.love.winter.uicomponent.theme.WinterTheme import dev.love.winter.sample.common.R as CommonR @Composable diff --git a/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/home/Screen.kt b/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/home/Screen.kt index c044be0..c863590 100644 --- a/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/home/Screen.kt +++ b/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/home/Screen.kt @@ -35,16 +35,16 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation3.runtime.NavKey -import dev.love.winter.designsystem.component.button.Button -import dev.love.winter.designsystem.component.button.spec.ButtonIcon -import dev.love.winter.designsystem.component.button.spec.ButtonShape -import dev.love.winter.designsystem.component.text.Text -import dev.love.winter.designsystem.theme.WinterTheme import dev.love.winter.dscatalog.Catalog import dev.love.winter.dscatalog.home.component.LanguageSelectionDialog import dev.love.winter.dscatalog.home.component.findActivity import dev.love.winter.sample.common.R import dev.love.winter.sample.common.util.LocaleManager +import dev.love.winter.uicomponent.component.button.Button +import dev.love.winter.uicomponent.component.button.spec.ButtonIcon +import dev.love.winter.uicomponent.component.button.spec.ButtonShape +import dev.love.winter.uicomponent.component.text.Text +import dev.love.winter.uicomponent.theme.WinterTheme import kotlinx.coroutines.flow.collectLatest import kotlin.system.exitProcess diff --git a/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/home/component/LanguageSelectionDialog.kt b/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/home/component/LanguageSelectionDialog.kt index 2e27b6d..eea29f8 100644 --- a/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/home/component/LanguageSelectionDialog.kt +++ b/sample/design-system-catalog/src/main/java/dev/love/winter/dscatalog/home/component/LanguageSelectionDialog.kt @@ -18,9 +18,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.res.stringResource import androidx.compose.ui.window.Dialog -import dev.love.winter.designsystem.component.text.Text -import dev.love.winter.designsystem.theme.WinterTheme import dev.love.winter.sample.common.R +import dev.love.winter.uicomponent.component.text.Text +import dev.love.winter.uicomponent.theme.WinterTheme private data class Language( val displayName: String, diff --git a/settings.gradle.kts b/settings.gradle.kts index 373a535..f8096c5 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -7,7 +7,10 @@ pluginManagement { rootProject.name = "LanguageStudy" include(":app") -include(":core-android:design-system") +include( + ":core-android:design-system", + ":core-android:ui-component", +) include(":sample:common") include(":sample:design-system-catalog")