diff --git a/core/ui/src/main/kotlin/com/afternote/core/ui/calendar/BottomSheetCalendar.kt b/core/ui/src/main/kotlin/com/afternote/core/ui/calendar/BottomSheetCalendar.kt index f413e2262..d18a8600e 100644 --- a/core/ui/src/main/kotlin/com/afternote/core/ui/calendar/BottomSheetCalendar.kt +++ b/core/ui/src/main/kotlin/com/afternote/core/ui/calendar/BottomSheetCalendar.kt @@ -68,7 +68,8 @@ fun BottomSheetCalendar( .width(36.dp) .height(4.dp) .clip(CircleShape) - .background(Color(0xFFDDDDDD)), + // 근사 토큰: 원본 #DDDDDD → 최근접 gray3(#E0E0E0, 채널당 +3) + .background(AfternoteDesign.colors.gray3), ) }, ) { @@ -141,7 +142,8 @@ fun DatePickerContent( Modifier .fillMaxWidth() .background( - color = Color(0xFFF5F5F5), + // 근사 토큰: 원본 #F5F5F5 → 최근접 gray1(#FAFAFA, 채널당 +5) + color = AfternoteDesign.colors.gray1, shape = RoundedCornerShape(12.dp), ).padding(horizontal = 16.dp, vertical = 18.dp), ) { @@ -156,7 +158,7 @@ fun DatePickerContent( OutlinedCard( colors = CardDefaults.cardColors(containerColor = Color.White), - border = BorderStroke(1.dp, Color(0xFF000000).copy(alpha = 0.05f)), + border = BorderStroke(1.dp, AfternoteDesign.colors.black.copy(alpha = 0.05f)), modifier = Modifier.fillMaxWidth(), ) { Column(modifier = Modifier.padding(vertical = 16.dp)) { @@ -202,7 +204,7 @@ fun DatePickerContent( Text( text = label, modifier = Modifier.weight(1f), - color = Color(0xFF000000).copy(alpha = 0.3f), + color = AfternoteDesign.colors.black.copy(alpha = 0.3f), style = AfternoteDesign.typography.footnoteCaption, textAlign = TextAlign.Center, ) @@ -249,8 +251,10 @@ fun PickerDayCell( return } - val bgColor = if (model.isSelected) Color(0xFF1A1A1A) else Color.Transparent - val textColor = if (model.isSelected) Color.White else Color(0xFF888888) + // 근사 토큰: 선택 셀 bg 원본 #1A1A1A → gray9(#212121, 채널당 +7) + val bgColor = if (model.isSelected) AfternoteDesign.colors.gray9 else Color.Transparent + // 근사 토큰: 미선택 텍스트 원본 #888888 → gray6(#757575, 채널당 -19). 토큰화 7곳 중 시각 차 가장 큼. + val textColor = if (model.isSelected) AfternoteDesign.colors.white else AfternoteDesign.colors.gray6 Box( modifier = diff --git a/core/ui/src/main/kotlin/com/afternote/core/ui/theme/Color.kt b/core/ui/src/main/kotlin/com/afternote/core/ui/theme/Color.kt index 67e5834fd..ade43cf43 100644 --- a/core/ui/src/main/kotlin/com/afternote/core/ui/theme/Color.kt +++ b/core/ui/src/main/kotlin/com/afternote/core/ui/theme/Color.kt @@ -8,7 +8,7 @@ import androidx.compose.ui.graphics.Color private val White = Color(0xFFFFFFFF) -private val Black = Color(0xFF000000) +internal val Black = Color(0xFF000000) private val IconBk = Color(0xFF000000).copy(alpha = 0.6F) diff --git a/core/ui/src/main/kotlin/com/afternote/core/ui/theme/Shadow.kt b/core/ui/src/main/kotlin/com/afternote/core/ui/theme/Shadow.kt index f864d1503..d89dab243 100644 --- a/core/ui/src/main/kotlin/com/afternote/core/ui/theme/Shadow.kt +++ b/core/ui/src/main/kotlin/com/afternote/core/ui/theme/Shadow.kt @@ -1,6 +1,5 @@ package com.afternote.core.ui.theme -import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.shadow.Shadow import androidx.compose.ui.unit.DpOffset import androidx.compose.ui.unit.dp @@ -9,14 +8,14 @@ val toggleShadow_1: Shadow = Shadow( radius = 3.dp, spread = 0.dp, - color = Color(0xFF000000).copy(alpha = 0.1f), + color = Black.copy(alpha = 0.1f), offset = DpOffset(x = 0.dp, 1.dp), ) val toggleShadow_2: Shadow = Shadow( radius = 2.dp, - spread = -1.dp, - color = Color(0xFF000000).copy(alpha = 0.1f), + spread = (-1).dp, + color = Black.copy(alpha = 0.1f), offset = DpOffset(x = 0.dp, 1.dp), ) diff --git a/feature/onboarding/presentation/src/main/java/com/afternote/feature/onboarding/presentation/login/LoginScreen.kt b/feature/onboarding/presentation/src/main/java/com/afternote/feature/onboarding/presentation/login/LoginScreen.kt index 74e6bffd9..ecc4a8053 100644 --- a/feature/onboarding/presentation/src/main/java/com/afternote/feature/onboarding/presentation/login/LoginScreen.kt +++ b/feature/onboarding/presentation/src/main/java/com/afternote/feature/onboarding/presentation/login/LoginScreen.kt @@ -261,8 +261,8 @@ private fun SocialLoginGroup( contentPadding = PaddingValues(12.dp), colors = ButtonDefaults.outlinedButtonColors( - // 💡 주의: 0xF2F2F2 앞에 투명도(FF)를 붙여야 색상이 정상적으로 보입니다. - containerColor = Color(0xFFF2F2F2), + // 근사 토큰: 원본 #F2F2F2 → 최근접 gray2(#EEEEEE, 채널당 -4) + containerColor = AfternoteDesign.colors.gray2, contentColor = AfternoteDesign.colors.gray8, ), border = BorderStroke(1.dp, AfternoteDesign.colors.gray3), diff --git a/feature/onboarding/presentation/src/screenshotTestDebug/reference/com/afternote/feature/onboarding/presentation/login/LoginScreenScreenshotTestKt/loginScreenInitialScreenshot_748aa731_0.png b/feature/onboarding/presentation/src/screenshotTestDebug/reference/com/afternote/feature/onboarding/presentation/login/LoginScreenScreenshotTestKt/loginScreenInitialScreenshot_748aa731_0.png index 40939ae01..80cf04275 100644 Binary files a/feature/onboarding/presentation/src/screenshotTestDebug/reference/com/afternote/feature/onboarding/presentation/login/LoginScreenScreenshotTestKt/loginScreenInitialScreenshot_748aa731_0.png and b/feature/onboarding/presentation/src/screenshotTestDebug/reference/com/afternote/feature/onboarding/presentation/login/LoginScreenScreenshotTestKt/loginScreenInitialScreenshot_748aa731_0.png differ