Skip to content

Commit

Permalink
修复 paragraph 样式颜色问题,调整 ItemOuterLargeTitle
Browse files Browse the repository at this point in the history
  • Loading branch information
Moriafly committed Aug 3, 2023
1 parent 2d0b32b commit 8bdedc4
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion ui/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
`maven-publish`
}

val libraryVersionName = "0.1.0-dev16"
val libraryVersionName = "0.1.0-dev17"

android {
namespace = "com.moriafly.salt.ui"
Expand Down
6 changes: 3 additions & 3 deletions ui/src/main/java/com/moriafly/salt/ui/ItemOuter.kt
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,17 @@ fun ItemOuterLargeTitle(
Column(
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = Dimens.outerHorizontalPadding * 2, vertical = Dimens.outerVerticalPadding * 2),
.padding(horizontal = Dimens.outerHorizontalPadding * 2, vertical = Dimens.outerVerticalPadding * 6),
horizontalAlignment = Alignment.CenterHorizontally
) {
Text(
text = text,
fontSize = 22.sp,
fontSize = 24.sp,
fontWeight = FontWeight.Bold,
textAlign = TextAlign.Center,
style = SaltTheme.textStyles.main
)
Spacer(modifier = Modifier.height(Dimens.contentPadding))
Spacer(modifier = Modifier.height(Dimens.contentPadding * 1.5f))
Text(
text = sub,
textAlign = TextAlign.Center,
Expand Down
3 changes: 2 additions & 1 deletion ui/src/main/java/com/moriafly/salt/ui/SaltTheme.kt
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ fun SaltTheme(
// copy text colors
saltTextStyles(
main = textStyles.main.copy(color = colors.text),
sub = textStyles.sub.copy(color = colors.subText)
sub = textStyles.sub.copy(color = colors.subText),
paragraph = textStyles.paragraph.copy(color = colors.text.copy(alpha = 0.85f))
)
}
val rippleIndication = rememberRipple()
Expand Down

0 comments on commit 8bdedc4

Please sign in to comment.