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.

Sign up for GitHub

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] 디자인 QA #107

Merged
merged 1 commit into from
Feb 20, 2024
Merged

[Feature] 디자인 QA #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 13 additions & 13 deletions presentation/src/main/kotlin/ac/dnd/mour/android/presentation/common/theme/Typography.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ private val EmptyTextStyle = TextStyle(
)

val Typography = Typography(
defaultFontFamily = FontFamily.Default,
defaultFontFamily = FontFamily(Font(R.font.pretendard)),
h1 = EmptyTextStyle,
h2 = EmptyTextStyle,
h3 = EmptyTextStyle,
Expand All @@ -31,62 +31,62 @@ val Typography = Typography(
)

val Headline0 = TextStyle(
fontFamily = FontFamily.Default,
fontFamily = FontFamily(Font(R.font.pretendard)),
fontWeight = FontWeight.SemiBold,
fontSize = 24.sp
)
val Headline1 = TextStyle(
fontFamily = FontFamily.Default,
fontFamily = FontFamily(Font(R.font.pretendard)),
fontWeight = FontWeight.SemiBold,
fontSize = 20.sp
)
val Headline2 = TextStyle(
fontFamily = FontFamily.Default,
fontFamily = FontFamily(Font(R.font.pretendard)),
fontWeight = FontWeight.SemiBold,
fontSize = 18.sp
)
val Headline3 = TextStyle(
fontFamily = FontFamily.Default,
fontFamily = FontFamily(Font(R.font.pretendard)),
fontWeight = FontWeight.SemiBold,
fontSize = 16.sp
)
val Body0 = TextStyle(
fontFamily = FontFamily.Default,
fontFamily = FontFamily(Font(R.font.pretendard)),
fontWeight = FontWeight.Normal,
fontSize = 16.sp
)
val Body1 = TextStyle(
fontFamily = FontFamily.Default,
fontFamily = FontFamily(Font(R.font.pretendard)),
fontWeight = FontWeight.Normal,
fontSize = 14.sp
)
val Body2 = TextStyle(
fontFamily = FontFamily.Default,
fontFamily = FontFamily(Font(R.font.pretendard)),
fontWeight = FontWeight.Normal,
fontSize = 12.sp
)
val Caption1 = TextStyle(
fontFamily = FontFamily.Default,
fontFamily = FontFamily(Font(R.font.pretendard)),
fontWeight = FontWeight.Normal,
fontSize = 12.sp
)
val Caption2 = TextStyle(
fontFamily = FontFamily.Default,
fontFamily = FontFamily(Font(R.font.pretendard)),
fontWeight = FontWeight.Medium,
fontSize = 12.sp
)
val Caption3 = TextStyle(
fontFamily = FontFamily.Default,
fontFamily = FontFamily(Font(R.font.pretendard)),
fontWeight = FontWeight.Normal,
fontSize = 10.sp
)
val Caption4 = TextStyle(
fontFamily = FontFamily.Default,
fontFamily = FontFamily(Font(R.font.pretendard)),
fontWeight = FontWeight.SemiBold,
fontSize = 10.sp
)
val Caption5 = TextStyle(
fontFamily = FontFamily.Default,
fontFamily = FontFamily(Font(R.font.pretendard)),
fontWeight = FontWeight.Medium,
fontSize = 10.sp
)
2 changes: 1 addition & 1 deletion presentation/src/main/kotlin/ac/dnd/mour/android/presentation/ui/main/home/HomeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ private fun HomeBottomBarScreen(
onClick: (Int) -> Unit
) {
BottomNavigation(
elevation = 3.dp,
elevation = 15.dp,
backgroundColor = Gray000,
modifier = Modifier
.fillMaxWidth()
Expand Down
Loading
Loading