Skip to content

chore: correct caption type definition; remove overline #185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bmc08gt merged 1 commit into from
Feb 15, 2024
Merged

chore: correct caption type definition; remove overline #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions app/src/main/java/com/getcode/theme/Type.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,6 @@ internal val typography = Typography(
textAlign = TextAlign.Center
),
caption = TextStyle(
fontFamily = Avenir,
fontSize = 16.sp,
fontWeight = FontWeight.SemiBold,
lineHeight = 19.sp,
//letterSpacing = 0.4.sp
),
overline = TextStyle(
fontFamily = Avenir,
fontSize = 12.sp,
fontWeight = FontWeight.SemiBold,
Expand Down
6 changes: 2 additions & 4 deletions app/src/main/java/com/getcode/ui/components/TextSection.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,11 @@ fun TextSection(title: String, description: String) {
Column(verticalArrangement = Arrangement.spacedBy(CodeTheme.dimens.grid.x2)) {
Text(
text = title,
style = CodeTheme.typography.h6.copy(
fontWeight = FontWeight.Bold,
)
style = CodeTheme.typography.subtitle1
)
Text(
text = description,
style = CodeTheme.typography.subtitle2
style = CodeTheme.typography.body2
)
}
}
2 changes: 1 addition & 1 deletion app/src/main/java/com/getcode/ui/components/chat/MessageNode.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ private fun MessageText(modifier: Modifier = Modifier, text: String, date: Insta
Text(
modifier = Modifier.align(Alignment.End),
text = date.formatTimeRelatively(),
style = CodeTheme.typography.overline,
style = CodeTheme.typography.caption,
color = BrandLight,
)
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/getcode/view/login/LoginHome.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ fun LoginHome() {

ClickableText(
text = bottomString,
style = CodeTheme.typography.overline.copy(
style = CodeTheme.typography.caption.copy(
textAlign = TextAlign.Center,
color = BrandLight
),
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/getcode/view/main/account/AccountHome.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ fun ListItem(item: AccountMainItem, onClick: () -> Unit) {
text = if (isPhoneLinked) stringResource(id = R.string.title_linked)
else stringResource(id = R.string.title_notLinked),
color = BrandLight,
style = CodeTheme.typography.caption.copy(
style = CodeTheme.typography.body1.copy(
fontSize = 12.sp
),
)
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/getcode/view/main/account/BetaFlagsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ fun BetaFlagsScreen(
modifier = Modifier
.padding(vertical = CodeTheme.dimens.grid.x1),
text = option.subtitleText,
style = CodeTheme.typography.overline,
style = CodeTheme.typography.caption,
color = BrandLight
)
}
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/getcode/view/main/account/ConfirmDeleteAccount.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ fun ConfirmDeleteAccount(
) {
Text(
text = stringResource(id = R.string.subtitle_deleteAccountDescription),
style = CodeTheme.typography.subtitle2
style = CodeTheme.typography.body2
)
TextField(
modifier = Modifier
Expand All @@ -49,14 +49,14 @@ fun ConfirmDeleteAccount(
placeholder = {
Text(
stringResource(id = R.string.subtitle_typeDelete).format(viewModel.requiredPhrase),
style = CodeTheme.typography.caption
style = CodeTheme.typography.body1
)
},
value = viewModel.typedText.collectAsState().value,
onValueChange = {
viewModel.onTextUpdated(it)
},
textStyle = CodeTheme.typography.caption,
textStyle = CodeTheme.typography.body1,
singleLine = true,
colors = inputColors(),
shape = CodeTheme.shapes.extraSmall
Expand Down
4 changes: 1 addition & 3 deletions app/src/main/java/com/getcode/view/main/account/withdraw/AccountWithdrawAddress.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,7 @@ fun AccountWithdrawAddress(
.padding(start = CodeTheme.dimens.grid.x2),
text = text,
color = if (isValid) green else Color.Red,
style = CodeTheme.typography.caption.copy(
fontSize = 12.sp
)
style = CodeTheme.typography.caption
)
}
}
Expand Down
4 changes: 1 addition & 3 deletions app/src/main/java/com/getcode/view/main/currency/CurrencySelectionSheet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,7 @@ fun CurrencySelectionSheet(
) {
Text(
modifier = Modifier.padding(bottom = 10.dp),
style = CodeTheme.typography.caption.copy(
fontSize = 14.sp,
),
style = CodeTheme.typography.body2,
color = BrandLight,
text = listItem.text
)
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/java/com/getcode/view/main/getKin/GetKinSheet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,7 @@ fun GetKinSheet(
Text(
modifier = Modifier.padding(top = CodeTheme.dimens.grid.x1),
text = stringResource(it),
style = CodeTheme.typography.caption,
fontSize = 13.sp,
style = CodeTheme.typography.body2,
color = colorResource(R.color.code_brand_light),
)
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/getcode/view/main/home/DecorView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ internal fun DecorView(
Text(
text = stringResource(id = R.string.title_badge_no_connection),
color = Color.White,
style = CodeTheme.typography.overline
style = CodeTheme.typography.caption
)
}
}
Expand Down