Skip to content

Commit

Permalink
[FEAT] 앱에서 사용되는 폰트 및 TextStyle 추가
Browse files Browse the repository at this point in the history
  • Loading branch information
easyhooon committed Jan 30, 2024
1 parent 1cd54c3 commit ed60494
Show file tree
Hide file tree
Showing 9 changed files with 65 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
package com.nexters.ilab.android.core.designsystem.theme

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.FontStyle
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.sp
import com.nexters.ilab.android.core.designsystem.R

val pretendardFamily = FontFamily(
Font(R.font.pretendard_bold, FontWeight.Bold, FontStyle.Normal),
Font(R.font.pretendard_semi_bold, FontWeight.SemiBold, FontStyle.Normal),
Font(R.font.pretendard_medium, FontWeight.Medium, FontStyle.Normal),
Font(R.font.pretendard_regular, FontWeight.Normal, FontStyle.Normal),
)

val Title1 = TextStyle(
fontFamily = pretendardFamily,
fontWeight = FontWeight.Bold,
fontSize = 28.sp,
lineHeight = 39.sp,
)

val Title2 = TextStyle(
fontFamily = pretendardFamily,
fontWeight = FontWeight.SemiBold,
fontSize = 20.sp,
lineHeight = 28.sp,
)

val Subtitle1 = TextStyle(
fontFamily = pretendardFamily,
fontWeight = FontWeight.SemiBold,
fontSize = 18.sp,
lineHeight = 25.sp,
)

val Subtitle2 = TextStyle(
fontFamily = pretendardFamily,
fontWeight = FontWeight.SemiBold,
fontSize = 16.sp,
lineHeight = 22.sp,
)

val Contents1 = TextStyle(
fontFamily = pretendardFamily,
fontWeight = FontWeight.Medium,
fontSize = 16.sp,
lineHeight = 24.sp,
)

val Contents2 = TextStyle(
fontFamily = pretendardFamily,
fontWeight = FontWeight.Normal,
fontSize = 14.sp,
lineHeight = 22.sp,
)

val Contents3 = TextStyle(
fontFamily = pretendardFamily,
fontWeight = FontWeight.Normal,
fontSize = 12.sp,
lineHeight = 18.sp,
)
Binary file modified core/designsystem/src/main/res/drawable/ic_bad_example1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified core/designsystem/src/main/res/drawable/ic_good_example1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified core/designsystem/src/main/res/drawable/ic_good_example2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified core/designsystem/src/main/res/drawable/ic_good_example3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit ed60494

Please sign in to comment.