refactor: define standardText typography style

Author: thunderbiscuit

app/src/main/java/org/bitcoindevkit/devkitwallet/presentation/theme/Type.kt

@@ -23,3 +23,10 @@ internal val devkitTypography =
 
 // These are the default text styles used by Material3 components:
 // Buttons: labelLarge
+
+internal val standardText = TextStyle(
+    color = DevkitWalletColors.white,
+    fontFamily = quattroRegular,
+    fontSize = 14.sp,
+    fontWeight = FontWeight.Normal,
+)

app/src/main/java/org/bitcoindevkit/devkitwallet/presentation/ui/screens/WalletRoot.kt

@@ -52,6 +52,7 @@ import org.bitcoindevkit.devkitwallet.presentation.navigation.RecoveryPhraseScre
 import org.bitcoindevkit.devkitwallet.presentation.navigation.WalletNavigation
 import org.bitcoindevkit.devkitwallet.presentation.theme.DevkitWalletColors
 import org.bitcoindevkit.devkitwallet.presentation.theme.quattroRegular
+import org.bitcoindevkit.devkitwallet.presentation.theme.standardText
 import org.bitcoindevkit.devkitwallet.presentation.viewmodels.WalletViewModel
 
 @OptIn(androidx.compose.animation.ExperimentalAnimationApi::class)
@@ -108,9 +109,7 @@ internal fun WalletRoot(navController: NavController, activeWallet: Wallet, wall
                     Spacer(modifier = Modifier.padding(16.dp))
                     Text(
                         text = BuildConfig.VARIANT_NAME,
-                        color = DevkitWalletColors.white,
-                        fontFamily = quattroRegular,
-                        fontSize = 14.sp,
+                        style = standardText
                     )
                 }
                 Column(

app/src/main/java/org/bitcoindevkit/devkitwallet/presentation/ui/screens/drawer/BlockchainClientScreen.kt

@@ -22,7 +22,7 @@ import androidx.navigation.NavController
 import org.bitcoindevkit.devkitwallet.presentation.navigation.WalletScreen
 import org.bitcoindevkit.devkitwallet.presentation.theme.DevkitWalletColors
 import org.bitcoindevkit.devkitwallet.presentation.theme.quattroBold
-import org.bitcoindevkit.devkitwallet.presentation.theme.quattroRegular
+import org.bitcoindevkit.devkitwallet.presentation.theme.standardText
 import org.bitcoindevkit.devkitwallet.presentation.ui.components.SecondaryScreensAppBar
 import org.bitcoindevkit.devkitwallet.presentation.viewmodels.mvi.WalletScreenState
 
@@ -60,9 +60,7 @@ internal fun BlockchainClientScreen(state: WalletScreenState, navController: Nav
             )
             Text(
                 text = state.esploraEndpoint,
-                color = DevkitWalletColors.white,
-                fontSize = 14.sp,
-                fontFamily = quattroRegular,
+                style = standardText,
             )
             // Row(verticalAlignment = Alignment.CenterVertically) {
             //     Text(

app/src/main/java/org/bitcoindevkit/devkitwallet/presentation/ui/screens/drawer/LogsScreen.kt

@@ -19,12 +19,11 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import androidx.navigation.NavController
 import org.bitcoindevkit.devkitwallet.domain.DwLogger
 import org.bitcoindevkit.devkitwallet.presentation.navigation.WalletScreen
 import org.bitcoindevkit.devkitwallet.presentation.theme.DevkitWalletColors
-import org.bitcoindevkit.devkitwallet.presentation.theme.quattroRegular
+import org.bitcoindevkit.devkitwallet.presentation.theme.standardText
 import org.bitcoindevkit.devkitwallet.presentation.ui.components.SecondaryScreensAppBar
 
 @Composable
@@ -49,9 +48,7 @@ fun LogsScreen(navController: NavController) {
             items(logs) { logLine ->
                 Text(
                     text = logLine,
-                    fontSize = 14.sp,
-                    fontFamily = quattroRegular,
-                    color = DevkitWalletColors.white,
+                    style = standardText,
                     maxLines = 1,
                     overflow = TextOverflow.Visible,
                     modifier = Modifier

app/src/main/java/org/bitcoindevkit/devkitwallet/presentation/ui/screens/intro/ActiveWalletsScreen.kt

@@ -28,6 +28,7 @@ import org.bitcoindevkit.devkitwallet.data.SingleWallet
 import org.bitcoindevkit.devkitwallet.presentation.WalletCreateType
 import org.bitcoindevkit.devkitwallet.presentation.theme.DevkitWalletColors
 import org.bitcoindevkit.devkitwallet.presentation.theme.quattroRegular
+import org.bitcoindevkit.devkitwallet.presentation.theme.standardText
 import org.bitcoindevkit.devkitwallet.presentation.ui.components.SecondaryScreensAppBar
 
 private const val TAG = "ActiveWalletsScreen"
@@ -101,17 +102,13 @@ fun DataField(name: String, value: String) {
     ) {
         Text(
             text = name,
-            fontFamily = quattroRegular,
-            fontSize = 14.sp,
+            style = standardText,
             lineHeight = 18.sp,
-            color = DevkitWalletColors.white,
         )
         Text(
             text = value,
-            fontFamily = quattroRegular,
-            fontSize = 14.sp,
+            style = standardText,
             lineHeight = 18.sp,
-            color = DevkitWalletColors.white,
         )
     }
 }

app/src/main/java/org/bitcoindevkit/devkitwallet/presentation/ui/screens/intro/CreateNewWallet.kt

@@ -26,7 +26,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import androidx.constraintlayout.compose.ConstraintLayout
 import androidx.navigation.NavController
 import org.bitcoindevkit.Network
@@ -35,6 +34,7 @@ import org.bitcoindevkit.devkitwallet.data.NewWalletConfig
 import org.bitcoindevkit.devkitwallet.presentation.WalletCreateType
 import org.bitcoindevkit.devkitwallet.presentation.theme.DevkitWalletColors
 import org.bitcoindevkit.devkitwallet.presentation.theme.monoRegular
+import org.bitcoindevkit.devkitwallet.presentation.theme.standardText
 import org.bitcoindevkit.devkitwallet.presentation.ui.components.NeutralButton
 import org.bitcoindevkit.devkitwallet.presentation.ui.components.SecondaryScreensAppBar
 import org.bitcoindevkit.devkitwallet.presentation.ui.components.WalletOptionsCard
@@ -61,7 +61,6 @@ internal fun CreateNewWalletScreen(
 
             val walletName: MutableState<String> = remember { mutableStateOf("") }
             val selectedNetwork: MutableState<Network> = remember { mutableStateOf(Network.SIGNET) }
-            val networks = listOf(Network.SIGNET, Network.TESTNET, Network.REGTEST)
             val selectedScriptType: MutableState<ActiveWalletScriptType> =
                 remember { mutableStateOf(ActiveWalletScriptType.P2TR) }
             val scriptTypes = listOf(ActiveWalletScriptType.P2TR, ActiveWalletScriptType.P2WPKH)
@@ -86,7 +85,7 @@ internal fun CreateNewWalletScreen(
                     label = {
                         Text(
                             text = "Give your wallet a name",
-                            fontSize = 14.sp,
+                            style = standardText,
                             color = DevkitWalletColors.white,
                         )
                     },

app/src/main/java/org/bitcoindevkit/devkitwallet/presentation/ui/screens/intro/RecoverWalletScreen.kt

@@ -55,6 +55,7 @@ import org.bitcoindevkit.devkitwallet.presentation.WalletCreateType
 import org.bitcoindevkit.devkitwallet.presentation.theme.DevkitWalletColors
 import org.bitcoindevkit.devkitwallet.presentation.theme.monoRegular
 import org.bitcoindevkit.devkitwallet.presentation.theme.quattroRegular
+import org.bitcoindevkit.devkitwallet.presentation.theme.standardText
 import org.bitcoindevkit.devkitwallet.presentation.ui.components.CustomSnackbar
 import org.bitcoindevkit.devkitwallet.presentation.ui.components.NetworkOptionsCard
 import org.bitcoindevkit.devkitwallet.presentation.ui.components.NeutralButton
@@ -149,8 +150,7 @@ internal fun RecoverWalletScreen(onAction: (WalletCreateType) -> Unit, navContro
                         label = {
                             Text(
                                 text = "Give your wallet a name",
-                                fontSize = 14.sp,
-                                color = DevkitWalletColors.white,
+                                style = standardText,
                             )
                         },
                         singleLine = true,
@@ -278,8 +278,7 @@ fun DescriptorInput(
             label = {
                 Text(
                     text = "Give your wallet a name",
-                    fontSize = 14.sp,
-                    color = DevkitWalletColors.white,
+                    style = standardText
                 )
             },
             singleLine = true,
@@ -297,8 +296,7 @@ fun DescriptorInput(
             label = {
                 Text(
                     text = "Input your descriptor here",
-                    fontSize = 14.sp,
-                    color = DevkitWalletColors.white,
+                    style = standardText
                 )
             },
             singleLine = false,
@@ -317,8 +315,7 @@ fun DescriptorInput(
             label = {
                 Text(
                     text = "Input your change descriptor here",
-                    fontSize = 14.sp,
-                    color = DevkitWalletColors.white,
+                    style = standardText,
                 )
             },
             singleLine = false,
@@ -343,8 +340,7 @@ fun RecoveryPhraseInput(recoveryPhrase: String, onValueChange: (String) -> Unit)
             label = {
                 Text(
                     text = "Input 12-word recovery phrase here",
-                    fontSize = 14.sp,
-                    color = DevkitWalletColors.white,
+                    style = standardText,
                 )
             },
             singleLine = false,

app/src/main/java/org/bitcoindevkit/devkitwallet/presentation/ui/screens/wallet/ReceiveScreen.kt

@@ -59,6 +59,7 @@ import kotlinx.coroutines.launch
 import org.bitcoindevkit.devkitwallet.presentation.navigation.HomeScreen
 import org.bitcoindevkit.devkitwallet.presentation.theme.DevkitWalletColors
 import org.bitcoindevkit.devkitwallet.presentation.theme.monoRegular
+import org.bitcoindevkit.devkitwallet.presentation.theme.standardText
 import org.bitcoindevkit.devkitwallet.presentation.ui.components.SecondaryScreensAppBar
 import org.bitcoindevkit.devkitwallet.presentation.viewmodels.mvi.ReceiveScreenAction
 import org.bitcoindevkit.devkitwallet.presentation.viewmodels.mvi.ReceiveScreenState
@@ -173,8 +174,7 @@ internal fun ReceiveScreen(
                 ) {
                     Text(
                         text = "Generate address",
-                        fontSize = 14.sp,
-                        fontFamily = monoRegular,
+                        style = standardText,
                         textAlign = TextAlign.Center,
                         lineHeight = 28.sp,
                     )

app/src/main/java/org/bitcoindevkit/devkitwallet/presentation/ui/screens/wallet/SendScreen.kt

@@ -57,7 +57,8 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import org.bitcoindevkit.devkitwallet.presentation.navigation.HomeScreen
 import org.bitcoindevkit.devkitwallet.presentation.theme.DevkitWalletColors
-import org.bitcoindevkit.devkitwallet.presentation.theme.monoRegular
+import org.bitcoindevkit.devkitwallet.presentation.theme.quattroRegular
+import org.bitcoindevkit.devkitwallet.presentation.theme.standardText
 import org.bitcoindevkit.devkitwallet.presentation.ui.components.SecondaryScreensAppBar
 import org.bitcoindevkit.devkitwallet.presentation.viewmodels.SendViewModel
 import org.bitcoindevkit.devkitwallet.presentation.viewmodels.mvi.Recipient
@@ -156,7 +157,7 @@ internal fun SendScreen(navController: NavController, sendViewModel: SendViewMod
                     Text(
                         text = "broadcast transaction",
                         fontSize = 14.sp,
-                        fontFamily = monoRegular,
+                        fontFamily = quattroRegular,
                         textAlign = TextAlign.Center,
                         lineHeight = 28.sp,
                     )
@@ -197,8 +198,7 @@ internal fun AdvancedOptions(
         ) {
             Text(
                 text = "Send All",
-                color = DevkitWalletColors.white,
-                fontSize = 14.sp,
+                style = standardText,
                 textAlign = TextAlign.Center,
                 lineHeight = 28.sp,
             )
@@ -254,8 +254,7 @@ internal fun AdvancedOptions(
         ) {
             Text(
                 text = "Number of Recipients",
-                color = DevkitWalletColors.white,
-                fontSize = 14.sp,
+                style = standardText
             )
         }
 
@@ -466,7 +465,7 @@ fun MoreOptions(coroutineScope: CoroutineScope, bottomSheetScaffoldState: Bottom
         ) {
             Text(
                 text = "advanced options",
-                fontSize = 14.sp,
+                style = standardText,
                 textAlign = TextAlign.Center,
                 lineHeight = 28.sp,
             )