diff --git a/presentation/src/main/java/com/everymeal/presentation/ui/home/HomeScreen.kt b/presentation/src/main/java/com/everymeal/presentation/ui/home/HomeScreen.kt index 5f87b963..abe6bb31 100644 --- a/presentation/src/main/java/com/everymeal/presentation/ui/home/HomeScreen.kt +++ b/presentation/src/main/java/com/everymeal/presentation/ui/home/HomeScreen.kt @@ -44,6 +44,7 @@ import com.everymeal.presentation.components.EveryMealLineButton import com.everymeal.presentation.components.EveryMealMainBottomSheetDialog import com.everymeal.presentation.components.EveryMealRestaurantItem import com.everymeal.presentation.components.EveryMealReviewItem +import com.everymeal.presentation.ui.theme.EveryMealTypography import com.everymeal.presentation.ui.theme.EveryMeal_AndroidTheme import com.everymeal.presentation.ui.theme.Gray100 import com.everymeal.presentation.ui.theme.Gray300 @@ -288,10 +289,12 @@ fun HomeMainTopLayout( Text( text = stringResource(id = R.string.home_top_category_title, "슈니"), fontSize = 15.sp, + style = EveryMealTypography.displaySmall, color = Gray800 ) Text( text = stringResource(R.string.home_top_category_sub_title), + style = EveryMealTypography.labelSmall, fontSize = 14.sp, color = Gray500 ) diff --git a/presentation/src/main/java/com/everymeal/presentation/ui/theme/Type.kt b/presentation/src/main/java/com/everymeal/presentation/ui/theme/Type.kt index 5e481e05..2d9b4cf1 100644 --- a/presentation/src/main/java/com/everymeal/presentation/ui/theme/Type.kt +++ b/presentation/src/main/java/com/everymeal/presentation/ui/theme/Type.kt @@ -2,9 +2,18 @@ package com.everymeal.presentation.ui.theme import androidx.compose.material3.Typography import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.Font import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.sp +import com.everymeal.presentation.R + +val Pretendard = FontFamily( + Font(R.font.pretendard_bold, FontWeight.Bold), + Font(R.font.pretendard_semibold, FontWeight.SemiBold), + Font(R.font.pretendard_medium, FontWeight.Medium), + Font(R.font.pretendard_regular, FontWeight.Normal) +) val Typography = Typography( titleLarge = TextStyle( @@ -37,4 +46,67 @@ val Typography = Typography( fontWeight = FontWeight.Normal, fontSize = 16.sp, ), +) + +val EveryMealTypography = Typography( + titleLarge = TextStyle( + fontFamily = Pretendard, + fontWeight = FontWeight.Bold, + fontSize = 24.sp, + ), + titleMedium = TextStyle( + fontFamily = Pretendard, + fontWeight = FontWeight.Bold, + fontSize = 20.sp, + ), + titleSmall = TextStyle( + fontFamily = Pretendard, + fontWeight = FontWeight.Bold, + fontSize = 16.sp, + ), + displayLarge = TextStyle( + fontFamily = Pretendard, + fontWeight = FontWeight.SemiBold, + fontSize = 24.sp, + ), + displayMedium = TextStyle( + fontFamily = Pretendard, + fontWeight = FontWeight.SemiBold, + fontSize = 20.sp, + ), + displaySmall = TextStyle( + fontFamily = Pretendard, + fontWeight = FontWeight.SemiBold, + fontSize = 16.sp, + ), + labelLarge = TextStyle( + fontFamily = Pretendard, + fontWeight = FontWeight.Medium, + fontSize = 24.sp, + ), + labelMedium = TextStyle( + fontFamily = Pretendard, + fontWeight = FontWeight.Medium, + fontSize = 20.sp, + ), + labelSmall = TextStyle( + fontFamily = Pretendard, + fontWeight = FontWeight.Medium, + fontSize = 16.sp, + ), + bodyLarge = TextStyle( + fontFamily = Pretendard, + fontWeight = FontWeight.Normal, + fontSize = 24.sp, + ), + bodyMedium = TextStyle( + fontFamily = Pretendard, + fontWeight = FontWeight.Normal, + fontSize = 20.sp, + ), + bodySmall = TextStyle( + fontFamily = Pretendard, + fontWeight = FontWeight.Normal, + fontSize = 16.sp, + ), ) \ No newline at end of file diff --git a/presentation/src/main/res/font/pretendard_bold.otf b/presentation/src/main/res/font/pretendard_bold.otf new file mode 100644 index 00000000..e6d6ce88 Binary files /dev/null and b/presentation/src/main/res/font/pretendard_bold.otf differ diff --git a/presentation/src/main/res/font/pretendard_medium.otf b/presentation/src/main/res/font/pretendard_medium.otf new file mode 100644 index 00000000..ff907c42 Binary files /dev/null and b/presentation/src/main/res/font/pretendard_medium.otf differ diff --git a/presentation/src/main/res/font/pretendard_regular.otf b/presentation/src/main/res/font/pretendard_regular.otf new file mode 100644 index 00000000..858cdd30 Binary files /dev/null and b/presentation/src/main/res/font/pretendard_regular.otf differ diff --git a/presentation/src/main/res/font/pretendard_semibold.otf b/presentation/src/main/res/font/pretendard_semibold.otf new file mode 100644 index 00000000..fe81db7d Binary files /dev/null and b/presentation/src/main/res/font/pretendard_semibold.otf differ