Stowage/buckwheat
2
0
Fork 0
mirror of https://github.com/danilkinkin/buckwheat.git synced 2025-12-31 04:13:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix: fixed font size

Browse source
This commit is contained in:
danilkinkin 2024-03-05 23:44:20 +05:00
parent cb5256360e
commit 9c850d5705
4 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/com/danilkinkin/buckwheat/finishPeriod/RestAndSpentBudgetCard.kt
View file

@ -194,7 +194,8 @@ fun RestAndSpentBudgetCard(
R.string.rest_budget_percent,
percentFormatted
),
style = if (bigVariant) MaterialTheme.typography.bodySmall else MaterialTheme.typography.bodyMedium,
style = MaterialTheme.typography.bodyMedium,
fontSize = if (bigVariant) MaterialTheme.typography.labelMedium.fontSize else MaterialTheme.typography.labelSmall.fontSize,
)
}
}

6
app/src/main/java/com/danilkinkin/buckwheat/finishPeriod/WholeBudgetCard.kt
View file

@ -69,7 +69,8 @@ fun WholeBudgetCard(
),
softWrap = false,
overflow = TextOverflow.Ellipsis,
style = if (bigVariant) MaterialTheme.typography.bodyMedium else MaterialTheme.typography.bodySmall,
style = MaterialTheme.typography.bodyMedium,
fontSize = if (bigVariant) MaterialTheme.typography.bodySmall.fontSize else MaterialTheme.typography.labelSmall.fontSize,
)
}
@ -122,7 +123,8 @@ fun WholeBudgetCard(
},
softWrap = false,
overflow = TextOverflow.Ellipsis,
style = if (bigVariant) MaterialTheme.typography.bodyMedium else MaterialTheme.typography.bodySmall,
style = MaterialTheme.typography.bodyMedium,
fontSize = if (bigVariant) MaterialTheme.typography.bodySmall.fontSize else MaterialTheme.typography.labelSmall.fontSize,
)
}
},

2
app/src/main/java/com/danilkinkin/buckwheat/history/SpentItem.kt
View file

@ -38,7 +38,7 @@ fun SpentItem(
Text(
text = numberFormat(context = context, transaction.value, currency = currency),
style = MaterialTheme.typography.headlineMedium,
fontSize = MaterialTheme.typography.headlineLarge.fontSize,
fontSize = MaterialTheme.typography.headlineMedium.fontSize,
color = colorOnEditor,
softWrap = false,
overflow = TextOverflow.Ellipsis,

4
app/src/main/java/com/danilkinkin/buckwheat/ui/Typography.kt
View file

@ -27,7 +27,7 @@ fun typography(context: Context): Typography {
return Typography(
displayLarge = TextStyle(
fontFamily = getFont(700),
fontFamily = getFont(650),
fontSize = 57.sp
),
displayMedium = TextStyle(
@ -35,7 +35,7 @@ fun typography(context: Context): Typography {
fontSize = 45.sp
),
displaySmall = TextStyle(
fontFamily = getFont(650),
fontFamily = getFont(600),
fontSize = 22.sp
),
headlineLarge = TextStyle(