From 134d2051ce9a680aba6b5009924853e06b7c42d5 Mon Sep 17 00:00:00 2001 From: hyeumm <20221159@sungshin.ac.kr> Date: Thu, 9 Jan 2025 22:57:40 +0900 Subject: [PATCH] =?UTF-8?q?Chore/#10:=20letter=20spacing=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roomie/presentation/dummy/ReqresRoute.kt | 18 ++++++---- .../com/wearerommies/roomie/ui/theme/Type.kt | 36 +++++++++---------- 2 files changed, 29 insertions(+), 25 deletions(-) diff --git a/app/src/main/java/com/wearerommies/roomie/presentation/dummy/ReqresRoute.kt b/app/src/main/java/com/wearerommies/roomie/presentation/dummy/ReqresRoute.kt index a214f84e..79d4034c 100644 --- a/app/src/main/java/com/wearerommies/roomie/presentation/dummy/ReqresRoute.kt +++ b/app/src/main/java/com/wearerommies/roomie/presentation/dummy/ReqresRoute.kt @@ -29,6 +29,8 @@ import coil.compose.AsyncImage import com.wearerommies.roomie.presentation.core.extension.noRippleClickable import com.wearerommies.roomie.presentation.core.extension.showToast import com.wearerommies.roomie.presentation.core.util.UiState +import com.wearerommies.roomie.ui.theme.RoomieAndroidTheme +import com.wearerommies.roomie.ui.theme.RoomieTheme @Composable fun ReqresRoute( @@ -49,6 +51,7 @@ fun ReqresRoute( .collect { sideEffect -> when (sideEffect) { is ReqresSideEffect.ShowToast -> context.showToast(message = sideEffect.message) + else -> {} } } } @@ -100,8 +103,7 @@ fun ReqresScreen( modifier = Modifier .noRippleClickable { navigateUp() }, text = "로딩 중...", - textAlign = TextAlign.Center, - fontSize = 30.sp + style = RoomieTheme.typography.caption2Sb10 ) } } @@ -146,9 +148,11 @@ fun ReqresScreen( @Preview @Composable fun ReqresScreenPreview() { - ReqresScreen( - paddingValues = PaddingValues(), - navigateUp = {}, - state = UiState.Loading - ) + RoomieAndroidTheme { + ReqresScreen( + paddingValues = PaddingValues(), + navigateUp = {}, + state = UiState.Loading + ) + } } diff --git a/app/src/main/java/com/wearerommies/roomie/ui/theme/Type.kt b/app/src/main/java/com/wearerommies/roomie/ui/theme/Type.kt index 15fc2a52..ff58ec86 100644 --- a/app/src/main/java/com/wearerommies/roomie/ui/theme/Type.kt +++ b/app/src/main/java/com/wearerommies/roomie/ui/theme/Type.kt @@ -160,119 +160,119 @@ fun RoomieTypography(): RoomieTypography { fontWeight = FontWeight.Bold, fontSize = 20.sp, lineHeight = 28.sp, - letterSpacing = (-0.5).em + letterSpacing = (-0.005).em ), heading2Sb20 = roomieTextStyle( fontFamily = PretendardSemiBold, fontWeight = FontWeight.SemiBold, fontSize = 20.sp, lineHeight = 28.sp, - letterSpacing = (-0.5).em + letterSpacing = (-0.005).em ), heading3M20 = roomieTextStyle( fontFamily = PretendardMedium, fontWeight = FontWeight.Medium, fontSize = 20.sp, lineHeight = 28.sp, - letterSpacing = (-0.5).em + letterSpacing = (-0.005).em ), heading4B18 = roomieTextStyle( fontFamily = PretendardBold, fontWeight = FontWeight.Bold, fontSize = 18.sp, lineHeight = 24.sp, - letterSpacing = (-0.5).em + letterSpacing = (-0.005).em ), heading5Sb18 = roomieTextStyle( fontFamily = PretendardSemiBold, fontWeight = FontWeight.SemiBold, fontSize = 18.sp, lineHeight = 24.sp, - letterSpacing = (-0.5).em + letterSpacing = (-0.005).em ), title1R16 = roomieTextStyle( fontFamily = PretendardRegular, fontWeight = FontWeight.Normal, fontSize = 16.sp, lineHeight = 22.sp, - letterSpacing = (-1).em + letterSpacing = (-0.01).em ), title2Sb16 = roomieTextStyle( fontFamily = PretendardSemiBold, fontWeight = FontWeight.SemiBold, fontSize = 16.sp, lineHeight = 22.sp, - letterSpacing = (-1).em + letterSpacing = (-0.01).em ), title3M16 = roomieTextStyle( fontFamily = PretendardMedium, fontWeight = FontWeight.Medium, fontSize = 16.sp, lineHeight = 22.sp, - letterSpacing = (-1).em + letterSpacing = (-0.01).em ), body1R14 = roomieTextStyle( fontFamily = PretendardRegular, fontWeight = FontWeight.Normal, fontSize = 14.sp, lineHeight = 20.sp, - letterSpacing = (-1).em + letterSpacing = (-0.01).em ), body2Sb14 = roomieTextStyle( fontFamily = PretendardSemiBold, fontWeight = FontWeight.SemiBold, fontSize = 14.sp, lineHeight = 20.sp, - letterSpacing = (-1).em + letterSpacing = (-0.01).em ), body3M14 = roomieTextStyle( fontFamily = PretendardMedium, fontWeight = FontWeight.Medium, fontSize = 14.sp, lineHeight = 20.sp, - letterSpacing = (-1).em + letterSpacing = (-0.01).em ), body4R12 = roomieTextStyle( fontFamily = PretendardRegular, fontWeight = FontWeight.Normal, fontSize = 12.sp, lineHeight = 18.sp, - letterSpacing = (-1).em + letterSpacing = (-0.01).em ), body5Sb12 = roomieTextStyle( fontFamily = PretendardSemiBold, fontWeight = FontWeight.SemiBold, fontSize = 12.sp, lineHeight = 18.sp, - letterSpacing = (-1).em + letterSpacing = (-0.01).em ), body6M12 = roomieTextStyle( fontFamily = PretendardMedium, fontWeight = FontWeight.Medium, fontSize = 12.sp, lineHeight = 18.sp, - letterSpacing = (-1).em + letterSpacing = (-0.01).em ), caption1R10 = roomieTextStyle( fontFamily = PretendardRegular, fontWeight = FontWeight.Normal, fontSize = 10.sp, lineHeight = 14.sp, - letterSpacing = (-1).em + letterSpacing = (-0.01).em ), caption2Sb10 = roomieTextStyle( fontFamily = PretendardSemiBold, fontWeight = FontWeight.SemiBold, fontSize = 10.sp, lineHeight = 14.sp, - letterSpacing = (-1).em + letterSpacing = (-0.01).em ), caption3M10 = roomieTextStyle( fontFamily = PretendardMedium, fontWeight = FontWeight.Medium, fontSize = 10.sp, lineHeight = 14.sp, - letterSpacing = (-1).em + letterSpacing = (-0.01).em ) ) -} \ No newline at end of file +}