Merge pull request #185 from code-payments/chore/align-textstyles

bmc08gt · web-flow · commit 0001e4a1f12f · 2024-02-15T12:22:59.000-05:00
chore: correct caption type definition; remove overline
diff --git a/app/src/main/java/com/getcode/theme/Type.kt b/app/src/main/java/com/getcode/theme/Type.kt
@@ -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,
diff --git a/app/src/main/java/com/getcode/ui/components/TextSection.kt b/app/src/main/java/com/getcode/ui/components/TextSection.kt
@@ -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
         )
     }
 }
diff --git a/app/src/main/java/com/getcode/ui/components/chat/MessageNode.kt b/app/src/main/java/com/getcode/ui/components/chat/MessageNode.kt
@@ -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,
         )
     }
diff --git a/app/src/main/java/com/getcode/view/login/LoginHome.kt b/app/src/main/java/com/getcode/view/login/LoginHome.kt
@@ -138,7 +138,7 @@ fun LoginHome() {
 
             ClickableText(
                 text = bottomString,
-                style = CodeTheme.typography.overline.copy(
+                style = CodeTheme.typography.caption.copy(
                     textAlign = TextAlign.Center,
                     color = BrandLight
                 ),
diff --git a/app/src/main/java/com/getcode/view/main/account/AccountHome.kt b/app/src/main/java/com/getcode/view/main/account/AccountHome.kt
@@ -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
                     ),
                 )
diff --git a/app/src/main/java/com/getcode/view/main/account/BetaFlagsScreen.kt b/app/src/main/java/com/getcode/view/main/account/BetaFlagsScreen.kt
@@ -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
                         )
                     }
diff --git a/app/src/main/java/com/getcode/view/main/account/ConfirmDeleteAccount.kt b/app/src/main/java/com/getcode/view/main/account/ConfirmDeleteAccount.kt
@@ -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
@@ -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
diff --git a/app/src/main/java/com/getcode/view/main/account/withdraw/AccountWithdrawAddress.kt b/app/src/main/java/com/getcode/view/main/account/withdraw/AccountWithdrawAddress.kt
@@ -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
                 )
             }
         }
diff --git a/app/src/main/java/com/getcode/view/main/currency/CurrencySelectionSheet.kt b/app/src/main/java/com/getcode/view/main/currency/CurrencySelectionSheet.kt
@@ -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
                                 )
diff --git a/app/src/main/java/com/getcode/view/main/getKin/GetKinSheet.kt b/app/src/main/java/com/getcode/view/main/getKin/GetKinSheet.kt
@@ -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),
                                 )
                             }
diff --git a/app/src/main/java/com/getcode/view/main/home/DecorView.kt b/app/src/main/java/com/getcode/view/main/home/DecorView.kt
@@ -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
                     )
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -14,13 +14,11 @@ fun TextSection(title: String, description: String) {`
`14`	`14`	`Column(verticalArrangement = Arrangement.spacedBy(CodeTheme.dimens.grid.x2)) {`
`15`	`15`	`Text(`
`16`	`16`	`text = title,`
`17`		`- style = CodeTheme.typography.h6.copy(`
`18`		`- fontWeight = FontWeight.Bold,`
`19`		`- )`
	`17`	`+ style = CodeTheme.typography.subtitle1`
`20`	`18`	`)`
`21`	`19`	`Text(`
`22`	`20`	`text = description,`
`23`		`- style = CodeTheme.typography.subtitle2`
	`21`	`+ style = CodeTheme.typography.body2`
`24`	`22`	`)`
`25`	`23`	`}`
`26`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ private fun MessageText(modifier: Modifier = Modifier, text: String, date: Insta`
`172`	`172`	`Text(`
`173`	`173`	`modifier = Modifier.align(Alignment.End),`
`174`	`174`	`text = date.formatTimeRelatively(),`
`175`		`- style = CodeTheme.typography.overline,`
	`175`	`+ style = CodeTheme.typography.caption,`
`176`	`176`	`color = BrandLight,`
`177`	`177`	`)`
`178`	`178`	`}`
Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ fun ListItem(item: AccountMainItem, onClick: () -> Unit) {`
`171`	`171`	`text = if (isPhoneLinked) stringResource(id = R.string.title_linked)`
`172`	`172`	`else stringResource(id = R.string.title_notLinked),`
`173`	`173`	`color = BrandLight,`
`174`		`- style = CodeTheme.typography.caption.copy(`
	`174`	`+ style = CodeTheme.typography.body1.copy(`
`175`	`175`	`fontSize = 12.sp`
`176`	`176`	`),`
`177`	`177`	`)`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ fun BetaFlagsScreen(`
`96`	`96`	`modifier = Modifier`
`97`	`97`	`.padding(vertical = CodeTheme.dimens.grid.x1),`
`98`	`98`	`text = option.subtitleText,`
`99`		`- style = CodeTheme.typography.overline,`
	`99`	`+ style = CodeTheme.typography.caption,`
`100`	`100`	`color = BrandLight`
`101`	`101`	`)`
`102`	`102`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,9 +95,7 @@ fun AccountWithdrawAddress(`
`95`	`95`	`.padding(start = CodeTheme.dimens.grid.x2),`
`96`	`96`	`text = text,`
`97`	`97`	`color = if (isValid) green else Color.Red,`
`98`		`- style = CodeTheme.typography.caption.copy(`
`99`		`- fontSize = 12.sp`
`100`		`- )`
	`98`	`+ style = CodeTheme.typography.caption`
`101`	`99`	`)`
`102`	`100`	`}`
`103`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -219,8 +219,7 @@ fun GetKinSheet(`
`219`	`219`	`Text(`
`220`	`220`	`modifier = Modifier.padding(top = CodeTheme.dimens.grid.x1),`
`221`	`221`	`text = stringResource(it),`
`222`		`- style = CodeTheme.typography.caption,`
`223`		`- fontSize = 13.sp,`
	`222`	`+ style = CodeTheme.typography.body2,`
`224`	`223`	`color = colorResource(R.color.code_brand_light),`
`225`	`224`	`)`
`226`	`225`	`}`