mirror of
https://github.com/Myzel394/NumberHub.git
synced 2025-06-19 08:45:27 +02:00
SemiBold button text style
Also Type.kt clean up
This commit is contained in:
parent
c72f2960cf
commit
0d1d08a951
@ -26,14 +26,18 @@ import androidx.compose.ui.text.font.FontWeight
|
|||||||
import androidx.compose.ui.unit.sp
|
import androidx.compose.ui.unit.sp
|
||||||
import com.sadellie.unitto.R
|
import com.sadellie.unitto.R
|
||||||
|
|
||||||
val OPEN_SANS_FONT = FontFamily(
|
private val OPEN_SANS_FONT = FontFamily(
|
||||||
Font(R.font.opensans_regular, weight = FontWeight.W400),
|
Font(R.font.opensans_regular, weight = FontWeight.W400),
|
||||||
Font(R.font.opensans_medium, weight = FontWeight.Medium)
|
Font(R.font.opensans_medium, weight = FontWeight.Medium)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
private val LATO_FONT = FontFamily(
|
||||||
|
Font(R.font.lato_regular)
|
||||||
|
)
|
||||||
|
|
||||||
// This text style is used for text field
|
// This text style is used for text field
|
||||||
val NumbersTextStyleDisplayLarge = TextStyle(
|
val NumbersTextStyleDisplayLarge = TextStyle(
|
||||||
fontFamily = FontFamily(Font(R.font.lato_regular, weight = FontWeight.W400)),
|
fontFamily = LATO_FONT,
|
||||||
fontWeight = FontWeight.W400,
|
fontWeight = FontWeight.W400,
|
||||||
fontSize = 57.sp,
|
fontSize = 57.sp,
|
||||||
lineHeight = 64.sp,
|
lineHeight = 64.sp,
|
||||||
@ -42,8 +46,8 @@ val NumbersTextStyleDisplayLarge = TextStyle(
|
|||||||
|
|
||||||
// This text style is used for keyboard button
|
// This text style is used for keyboard button
|
||||||
val NumbersTextStyleTitleLarge = TextStyle(
|
val NumbersTextStyleTitleLarge = TextStyle(
|
||||||
fontFamily = FontFamily(Font(R.font.lato_regular, weight = FontWeight.W700)),
|
fontFamily = LATO_FONT,
|
||||||
fontWeight = FontWeight.W400,
|
fontWeight = FontWeight.W600,
|
||||||
fontSize = 26.sp,
|
fontSize = 26.sp,
|
||||||
lineHeight = 32.sp,
|
lineHeight = 32.sp,
|
||||||
letterSpacing = 0.sp,
|
letterSpacing = 0.sp,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user