diff --git a/app/src/main/java/org/sopt/kream/theme/Type.kt b/app/src/main/java/org/sopt/kream/theme/Type.kt index 865cd2c..317608e 100644 --- a/app/src/main/java/org/sopt/kream/theme/Type.kt +++ b/app/src/main/java/org/sopt/kream/theme/Type.kt @@ -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, ) @@ -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 = diff --git a/app/src/main/res/font/notosans_black.ttf b/app/src/main/res/font/notosans_black.ttf new file mode 100644 index 0000000..e52bac2 Binary files /dev/null and b/app/src/main/res/font/notosans_black.ttf differ diff --git a/app/src/main/res/font/notosans_bold.ttf b/app/src/main/res/font/notosans_bold.ttf index 6cf639e..d84248e 100644 Binary files a/app/src/main/res/font/notosans_bold.ttf and b/app/src/main/res/font/notosans_bold.ttf differ diff --git a/app/src/main/res/font/notosans_extrabold.ttf b/app/src/main/res/font/notosans_extrabold.ttf new file mode 100644 index 0000000..b416f0b Binary files /dev/null and b/app/src/main/res/font/notosans_extrabold.ttf differ diff --git a/app/src/main/res/font/notosans_extralight.ttf b/app/src/main/res/font/notosans_extralight.ttf new file mode 100644 index 0000000..81f0958 Binary files /dev/null and b/app/src/main/res/font/notosans_extralight.ttf differ diff --git a/app/src/main/res/font/notosans_light.ttf b/app/src/main/res/font/notosans_light.ttf new file mode 100644 index 0000000..f7a67d7 Binary files /dev/null and b/app/src/main/res/font/notosans_light.ttf differ diff --git a/app/src/main/res/font/notosans_medium.ttf b/app/src/main/res/font/notosans_medium.ttf new file mode 100644 index 0000000..a799b74 Binary files /dev/null and b/app/src/main/res/font/notosans_medium.ttf differ diff --git a/app/src/main/res/font/notosans_regular.ttf b/app/src/main/res/font/notosans_regular.ttf index 1b14d32..fa4cff5 100644 Binary files a/app/src/main/res/font/notosans_regular.ttf and b/app/src/main/res/font/notosans_regular.ttf differ diff --git a/app/src/main/res/font/notosans_semibold.ttf b/app/src/main/res/font/notosans_semibold.ttf index 616bb09..d3ed423 100644 Binary files a/app/src/main/res/font/notosans_semibold.ttf and b/app/src/main/res/font/notosans_semibold.ttf differ diff --git a/app/src/main/res/font/notosans_thin.ttf b/app/src/main/res/font/notosans_thin.ttf new file mode 100644 index 0000000..1459e79 Binary files /dev/null and b/app/src/main/res/font/notosans_thin.ttf differ diff --git a/app/src/main/res/font/notosanskr_black.otf b/app/src/main/res/font/notosanskr_black.otf deleted file mode 100644 index 3e0ac2d..0000000 Binary files a/app/src/main/res/font/notosanskr_black.otf and /dev/null differ diff --git a/app/src/main/res/font/notosanskr_bold.otf b/app/src/main/res/font/notosanskr_bold.otf deleted file mode 100644 index 6cf639e..0000000 Binary files a/app/src/main/res/font/notosanskr_bold.otf and /dev/null differ diff --git a/app/src/main/res/font/notosanskr_extrabold.otf b/app/src/main/res/font/notosanskr_extrabold.otf deleted file mode 100644 index a2e47fd..0000000 Binary files a/app/src/main/res/font/notosanskr_extrabold.otf and /dev/null differ diff --git a/app/src/main/res/font/notosanskr_extralight.otf b/app/src/main/res/font/notosanskr_extralight.otf deleted file mode 100644 index a0ef172..0000000 Binary files a/app/src/main/res/font/notosanskr_extralight.otf and /dev/null differ diff --git a/app/src/main/res/font/notosanskr_light.otf b/app/src/main/res/font/notosanskr_light.otf deleted file mode 100644 index db0a223..0000000 Binary files a/app/src/main/res/font/notosanskr_light.otf and /dev/null differ diff --git a/app/src/main/res/font/notosanskr_medium.otf b/app/src/main/res/font/notosanskr_medium.otf deleted file mode 100644 index 5311c8a..0000000 Binary files a/app/src/main/res/font/notosanskr_medium.otf and /dev/null differ diff --git a/app/src/main/res/font/notosanskr_regular.otf b/app/src/main/res/font/notosanskr_regular.otf deleted file mode 100644 index 1b14d32..0000000 Binary files a/app/src/main/res/font/notosanskr_regular.otf and /dev/null differ diff --git a/app/src/main/res/font/notosanskr_semibold.otf b/app/src/main/res/font/notosanskr_semibold.otf deleted file mode 100644 index 616bb09..0000000 Binary files a/app/src/main/res/font/notosanskr_semibold.otf and /dev/null differ diff --git a/app/src/main/res/font/notosanskr_thin.otf b/app/src/main/res/font/notosanskr_thin.otf deleted file mode 100644 index 73ec7bc..0000000 Binary files a/app/src/main/res/font/notosanskr_thin.otf and /dev/null differ