Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[feature/font] Pretendard 폰트 스타일 적용 #60

Merged
merged 2 commits into from
Sep 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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,
),
)
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.