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

Jump to bottom

[chore] 폰트 수정 #42

Merged
merged 1 commit into from
May 24, 2024
Merged

[chore] 폰트 수정 #42

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
54 changes: 27 additions & 27 deletions app/src/main/java/org/sopt/kream/theme/Type.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,108 +25,108 @@ val Typography =
// Head
val head1Bold =
TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_bold)),
fontFamily = FontFamily(Font(R.font.notosans_bold)),
fontSize = 18.sp,
)
val head2Bold =
TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_bold)),
fontFamily = FontFamily(Font(R.font.notosans_bold)),
fontSize = 15.sp,
)

// Body1
val body1Regular =
TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_regular)),
fontFamily = FontFamily(Font(R.font.notosans_regular)),
fontSize = 17.sp,
)

// Body2
val body2Regular =
TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_regular)),
fontFamily = FontFamily(Font(R.font.notosans_regular)),
fontSize = 14.sp,
)
val body2SemiBold =
TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_semibold)),
fontFamily = FontFamily(Font(R.font.notosans_semibold)),
fontSize = 14.sp,
)

// Body3
val body3Regular =
TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_regular)),
fontFamily = FontFamily(Font(R.font.notosans_regular)),
fontSize = 13.sp,
)
val body3SemiBold =
TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_semibold)),
fontFamily = FontFamily(Font(R.font.notosans_semibold)),
fontSize = 13.sp,
)

// Body4
val body4Regular =
TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_regular)),
fontFamily = FontFamily(Font(R.font.notosans_regular)),
fontSize = 12.sp,
)
val body4SemiBold =
TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_semibold)),
fontFamily = FontFamily(Font(R.font.notosans_semibold)),
fontSize = 12.sp,
)
val body4Bold =
TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_bold)),
fontFamily = FontFamily(Font(R.font.notosans_bold)),
fontSize = 12.sp,
)

// Body5
val body5Regular =
TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_regular)),
fontFamily = FontFamily(Font(R.font.notosans_regular)),
fontSize = 11.sp,
)
val body5SemiBold =
TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_semibold)),
fontFamily = FontFamily(Font(R.font.notosans_semibold)),
fontSize = 11.sp,
)

// Body6
val body6Regular =
TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_regular)),
fontFamily = FontFamily(Font(R.font.notosans_regular)),
fontSize = 10.sp,
)
val body6SemiBold =
TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_semibold)),
fontFamily = FontFamily(Font(R.font.notosans_semibold)),
fontSize = 10.sp,
)

// Body7
val body7Regular =
TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_regular)),
fontFamily = FontFamily(Font(R.font.notosans_regular)),
fontSize = 9.sp,
)
val body7Bold =
TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_bold)),
fontFamily = FontFamily(Font(R.font.notosans_bold)),
fontSize = 9.sp,
)

// Body8
val body8Regular =
TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_regular)),
fontFamily = FontFamily(Font(R.font.notosans_regular)),
fontSize = 8.sp,
)
val body8SemiBold =
TextStyle(
fontFamily = FontFamily(Font(R.font.notosanskr_semibold)),
fontFamily = FontFamily(Font(R.font.notosans_semibold)),
fontSize = 8.sp,
)

Expand All @@ -138,15 +138,15 @@ val robotoBold =

val notosanskr =
FontFamily(
Font(R.font.notosanskr_black, FontWeight.Black, FontStyle.Normal),
Font(R.font.notosanskr_bold, FontWeight.Bold, FontStyle.Normal),
Font(R.font.notosanskr_light, FontWeight.Light, FontStyle.Normal),
Font(R.font.notosanskr_extrabold, FontWeight.ExtraBold, FontStyle.Normal),
Font(R.font.notosanskr_extralight, FontWeight.ExtraLight, FontStyle.Normal),
Font(R.font.notosanskr_medium, FontWeight.Medium, FontStyle.Normal),
Font(R.font.notosanskr_regular, FontWeight.Normal, FontStyle.Normal),
Font(R.font.notosanskr_semibold, FontWeight.SemiBold, FontStyle.Normal),
Font(R.font.notosanskr_thin, FontWeight.Thin, FontStyle.Normal),
Font(R.font.notosans_black, FontWeight.Black, FontStyle.Normal),
Font(R.font.notosans_bold, FontWeight.Bold, FontStyle.Normal),
Font(R.font.notosans_light, FontWeight.Light, FontStyle.Normal),
Font(R.font.notosans_extrabold, FontWeight.ExtraBold, FontStyle.Normal),
Font(R.font.notosans_extralight, FontWeight.ExtraLight, FontStyle.Normal),
Font(R.font.notosans_medium, FontWeight.Medium, FontStyle.Normal),
Font(R.font.notosans_regular, FontWeight.Normal, FontStyle.Normal),
Font(R.font.notosans_semibold, FontWeight.SemiBold, FontStyle.Normal),
Font(R.font.notosans_thin, FontWeight.Thin, FontStyle.Normal),
)

val Roboto =
Expand Down
Binary file added app/src/main/res/font/notosans_black.ttf
View file
Open in desktop
Binary file not shown.
Binary file modified app/src/main/res/font/notosans_bold.ttf
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/res/font/notosans_extrabold.ttf
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/res/font/notosans_extralight.ttf
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/res/font/notosans_light.ttf
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/res/font/notosans_medium.ttf
View file
Open in desktop
Binary file not shown.
Binary file modified app/src/main/res/font/notosans_regular.ttf
View file
Open in desktop
Binary file not shown.
Binary file modified app/src/main/res/font/notosans_semibold.ttf
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/res/font/notosans_thin.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed app/src/main/res/font/notosanskr_black.otf
View file
Open in desktop
Binary file not shown.
Binary file removed app/src/main/res/font/notosanskr_bold.otf
View file
Open in desktop
Binary file not shown.
Binary file removed app/src/main/res/font/notosanskr_extrabold.otf
View file
Open in desktop
Binary file not shown.
Binary file removed app/src/main/res/font/notosanskr_extralight.otf
View file
Open in desktop
Binary file not shown.
Binary file removed app/src/main/res/font/notosanskr_light.otf
View file
Open in desktop
Binary file not shown.
Binary file removed app/src/main/res/font/notosanskr_medium.otf
View file
Open in desktop
Binary file not shown.
Binary file removed app/src/main/res/font/notosanskr_regular.otf
View file
Open in desktop
Binary file not shown.
Binary file removed app/src/main/res/font/notosanskr_semibold.otf
View file
Open in desktop
Binary file not shown.
Binary file removed app/src/main/res/font/notosanskr_thin.otf
View file
Open in desktop
Binary file not shown.
Loading