Increased font units by 1 for the smallest text

This commit is contained in:
Abdelilah El Aissaoui 2022-07-10 19:50:03 +02:00
parent 1221085374
commit 7164bd3e71
5 changed files with 13 additions and 10 deletions

View File

@ -43,17 +43,22 @@ fun typography() = Typography(
letterSpacing = LETTER_SPACING.sp, letterSpacing = LETTER_SPACING.sp,
), ),
h4 = TextStyle( h4 = TextStyle(
fontSize = 16.sp, fontSize = 17.sp,
color = MaterialTheme.colors.primaryTextColor, color = MaterialTheme.colors.primaryTextColor,
letterSpacing = LETTER_SPACING.sp, letterSpacing = LETTER_SPACING.sp,
), ),
body1 = TextStyle( body1 = TextStyle(
fontSize = 14.sp, fontSize = 15.sp,
color = MaterialTheme.colors.primaryTextColor, color = MaterialTheme.colors.primaryTextColor,
letterSpacing = LETTER_SPACING.sp, letterSpacing = LETTER_SPACING.sp,
), ),
body2 = TextStyle( body2 = TextStyle(
fontSize = 12.sp, fontSize = 13.sp,
color = MaterialTheme.colors.primaryTextColor,
letterSpacing = LETTER_SPACING.sp,
),
caption = TextStyle(
fontSize = 11.sp,
color = MaterialTheme.colors.primaryTextColor, color = MaterialTheme.colors.primaryTextColor,
letterSpacing = LETTER_SPACING.sp, letterSpacing = LETTER_SPACING.sp,
) )

View File

@ -109,10 +109,9 @@ fun Blame(
) )
Text( Text(
text = commit?.shortMessage ?: "Uncommited change", text = commit?.shortMessage ?: "Uncommited change",
color = MaterialTheme.colors.primaryTextColor, style = MaterialTheme.typography.caption,
maxLines = 1, maxLines = 1,
modifier = Modifier.padding(start = 16.dp), modifier = Modifier.padding(start = 16.dp),
fontSize = 10.sp,
) )
} }
} }
@ -167,9 +166,8 @@ fun MinimizedBlame(
) { ) {
Text( Text(
text = "Minimized file blame", text = "Minimized file blame",
color = MaterialTheme.colors.primaryTextColor, style = MaterialTheme.typography.caption,
maxLines = 1, maxLines = 1,
fontSize = 10.sp,
) )
Text( Text(
text = filePath, text = filePath,

View File

@ -114,7 +114,7 @@ fun CommitChangesView(
textAlign = TextAlign.Left, textAlign = TextAlign.Left,
color = MaterialTheme.colors.headerText, color = MaterialTheme.colors.headerText,
maxLines = 1, maxLines = 1,
style = MaterialTheme.typography.body1, style = MaterialTheme.typography.body2,
) )

View File

@ -461,7 +461,7 @@ private fun EntriesList(
fontWeight = FontWeight.Normal, fontWeight = FontWeight.Normal,
textAlign = TextAlign.Left, textAlign = TextAlign.Left,
color = MaterialTheme.colors.headerText, color = MaterialTheme.colors.headerText,
style = MaterialTheme.typography.body1, style = MaterialTheme.typography.body2,
maxLines = 1, maxLines = 1,
) )

View File

@ -858,7 +858,7 @@ fun CommitMessage(
Text( Text(
text = commit.authorIdent.`when`.toSmartSystemString(), text = commit.authorIdent.`when`.toSmartSystemString(),
modifier = Modifier.padding(horizontal = 16.dp), modifier = Modifier.padding(horizontal = 16.dp),
fontSize = 10.sp, style = MaterialTheme.typography.caption,
color = MaterialTheme.colors.secondaryTextColor, color = MaterialTheme.colors.secondaryTextColor,
maxLines = 1, maxLines = 1,
overflow = TextOverflow.Ellipsis, overflow = TextOverflow.Ellipsis,