Skip to content

Commit 069ee3a

Browse files
thunderbiscuitthunderbiscuit
committed
ui: replace all uses of iA Writer font for Inter + Google Sans Code
1 parent 451a65f commit 069ee3a

20 files changed

Lines changed: 59 additions & 62 deletions

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

Lines changed: 20 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -11,38 +11,29 @@ import androidx.compose.ui.text.font.FontStyle
1111
import androidx.compose.ui.text.font.FontWeight
1212
import org.bitcoindevkit.devkitwallet.R
1313

14-
val quattroRegular =
15-
FontFamily(
16-
Font(
17-
resId = R.font.ia_writer_quattro_regular,
18-
weight = FontWeight.Normal,
19-
style = FontStyle.Normal,
20-
),
21-
)
14+
// val monoRegular =
15+
// FontFamily(
16+
// Font(
17+
// resId = R.font.ia_writer_mono_regular,
18+
// weight = FontWeight.Normal,
19+
// style = FontStyle.Normal,
20+
// ),
21+
// )
22+
//
23+
// val monoBold =
24+
// FontFamily(
25+
// Font(
26+
// resId = R.font.ia_writer_mono_bold,
27+
// weight = FontWeight.Bold,
28+
// style = FontStyle.Normal,
29+
// ),
30+
// )
2231

23-
val quattroBold =
32+
val googleSansCode =
2433
FontFamily(
2534
Font(
26-
resId = R.font.ia_writer_quattro_bold,
27-
weight = FontWeight.Bold,
28-
style = FontStyle.Normal,
29-
),
30-
)
31-
32-
val monoRegular =
33-
FontFamily(
34-
Font(
35-
resId = R.font.ia_writer_mono_regular,
36-
weight = FontWeight.Normal,
37-
style = FontStyle.Normal,
38-
),
39-
)
40-
41-
val monoBold =
42-
FontFamily(
43-
Font(
44-
resId = R.font.ia_writer_mono_bold,
45-
weight = FontWeight.Bold,
35+
resId = R.font.google_sans_code_light,
36+
weight = FontWeight.Light,
4637
style = FontStyle.Normal,
4738
),
4839
)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ internal val devkitTypography =
1414
Typography(
1515
labelLarge =
1616
TextStyle(
17-
fontFamily = quattroRegular,
17+
fontFamily = inter,
1818
fontWeight = FontWeight.Normal,
1919
color = DevkitWalletColors.white,
2020
fontSize = 16.sp,
@@ -24,7 +24,7 @@ internal val devkitTypography =
2424

2525
val introText =
2626
TextStyle(
27-
fontFamily = quattroRegular,
27+
fontFamily = inter,
2828
fontWeight = FontWeight.Normal,
2929
fontSize = 18.sp,
3030
lineHeight = 28.sp,
@@ -36,7 +36,7 @@ val introText =
3636
internal val standardText =
3737
TextStyle(
3838
color = DevkitWalletColors.white,
39-
fontFamily = quattroRegular,
39+
fontFamily = inter,
4040
fontSize = 14.sp,
4141
fontWeight = FontWeight.Normal,
4242
)

‎app/src/main/java/org/bitcoindevkit/devkitwallet/presentation/ui/components/CustomSnackbar.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import androidx.compose.ui.unit.sp
1818
import com.composables.icons.lucide.Lucide
1919
import com.composables.icons.lucide.X
2020
import org.bitcoindevkit.devkitwallet.presentation.theme.DevkitWalletColors
21-
import org.bitcoindevkit.devkitwallet.presentation.theme.quattroRegular
21+
import org.bitcoindevkit.devkitwallet.presentation.theme.inter
2222

2323
@Composable
2424
fun CustomSnackbar(data: SnackbarData) {
@@ -39,7 +39,7 @@ fun CustomSnackbar(data: SnackbarData) {
3939
) {
4040
Text(
4141
text = data.visuals.message,
42-
fontFamily = quattroRegular,
42+
fontFamily = inter,
4343
fontSize = 14.sp,
4444
)
4545
}

‎app/src/main/java/org/bitcoindevkit/devkitwallet/presentation/ui/components/RadioButtonWithLabel.kt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ import androidx.compose.ui.Modifier
2020
import androidx.compose.ui.unit.dp
2121
import androidx.compose.ui.unit.sp
2222
import org.bitcoindevkit.devkitwallet.presentation.theme.DevkitWalletColors
23-
import org.bitcoindevkit.devkitwallet.presentation.theme.monoRegular
23+
import org.bitcoindevkit.devkitwallet.presentation.theme.inter
24+
25+
// import org.bitcoindevkit.devkitwallet.presentation.theme.monoRegular
2426

2527
@Composable
2628
fun RadioButtonWithLabel(label: String, isSelected: Boolean, onSelect: () -> Unit) {
@@ -51,7 +53,7 @@ fun RadioButtonWithLabel(label: String, isSelected: Boolean, onSelect: () -> Uni
5153
Text(
5254
text = label,
5355
color = DevkitWalletColors.white,
54-
fontFamily = monoRegular,
56+
fontFamily = inter,
5557
fontSize = 12.sp,
5658
modifier =
5759
Modifier

‎app/src/main/java/org/bitcoindevkit/devkitwallet/presentation/ui/components/TransactionCards.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import androidx.navigation.NavController
2929
import org.bitcoindevkit.devkitwallet.data.TxDetails
3030
import org.bitcoindevkit.devkitwallet.domain.utils.timestampToString
3131
import org.bitcoindevkit.devkitwallet.presentation.theme.DevkitWalletColors
32-
import org.bitcoindevkit.devkitwallet.presentation.theme.monoRegular
32+
import org.bitcoindevkit.devkitwallet.presentation.theme.inter
3333
import org.bitcoindevkit.devkitwallet.presentation.ui.screens.wallet.viewTransaction
3434

3535
private const val TAG = "TransactionCards"
@@ -49,7 +49,7 @@ fun ConfirmedTransactionCard(details: TxDetails, navController: NavController) {
4949
) {
5050
Text(
5151
confirmedTransactionsItem(details),
52-
fontFamily = monoRegular,
52+
fontFamily = inter,
5353
fontSize = 12.sp,
5454
lineHeight = 20.sp,
5555
color = DevkitWalletColors.white,
@@ -91,7 +91,7 @@ fun PendingTransactionCard(details: TxDetails, navController: NavController) {
9191
) {
9292
Text(
9393
pendingTransactionsItem(details),
94-
fontFamily = monoRegular,
94+
fontFamily = inter,
9595
fontSize = 12.sp,
9696
color = DevkitWalletColors.white,
9797
modifier = Modifier.padding(16.dp),

‎app/src/main/java/org/bitcoindevkit/devkitwallet/presentation/ui/components/WalletOptionsCard.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import org.bitcoindevkit.Network
2424
import org.bitcoindevkit.devkitwallet.data.ActiveWalletScriptType
2525
import org.bitcoindevkit.devkitwallet.domain.supportedNetworks
2626
import org.bitcoindevkit.devkitwallet.presentation.theme.DevkitWalletColors
27-
import org.bitcoindevkit.devkitwallet.presentation.theme.monoRegular
27+
import org.bitcoindevkit.devkitwallet.presentation.theme.inter
2828
import org.bitcoindevkit.devkitwallet.presentation.ui.screens.intro.displayString
2929

3030
@Composable
@@ -45,7 +45,7 @@ fun WalletOptionsCard(
4545
) {
4646
Text(
4747
text = "Network",
48-
fontFamily = monoRegular,
48+
fontFamily = inter,
4949
fontSize = 14.sp,
5050
color = DevkitWalletColors.white,
5151
modifier =
@@ -71,7 +71,7 @@ fun WalletOptionsCard(
7171

7272
Text(
7373
text = "Script Type",
74-
fontFamily = monoRegular,
74+
fontFamily = inter,
7575
fontSize = 14.sp,
7676
color = DevkitWalletColors.white,
7777
modifier =
@@ -111,7 +111,7 @@ fun NetworkOptionsCard(selectedNetwork: MutableState<Network>) {
111111
) {
112112
Text(
113113
text = "Network",
114-
fontFamily = monoRegular,
114+
fontFamily = inter,
115115
fontSize = 14.sp,
116116
color = DevkitWalletColors.white,
117117
modifier =

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import androidx.compose.ui.unit.dp
2828
import androidx.compose.ui.unit.sp
2929
import androidx.navigation.NavController
3030
import org.bitcoindevkit.devkitwallet.presentation.theme.DevkitWalletColors
31-
import org.bitcoindevkit.devkitwallet.presentation.theme.monoRegular
31+
import org.bitcoindevkit.devkitwallet.presentation.theme.inter
3232
import org.bitcoindevkit.devkitwallet.presentation.ui.components.NeutralButton
3333
import org.bitcoindevkit.devkitwallet.presentation.ui.components.SecondaryScreensAppBar
3434
import org.bitcoindevkit.devkitwallet.presentation.viewmodels.mvi.KyotoNodeStatus
@@ -69,7 +69,7 @@ internal fun BlockchainClientScreen(
6969
text = "CBF Node Status: $status",
7070
color = DevkitWalletColors.white,
7171
fontSize = 14.sp,
72-
fontFamily = monoRegular,
72+
fontFamily = inter,
7373
textAlign = TextAlign.Start,
7474
)
7575
Box(
@@ -99,14 +99,14 @@ internal fun BlockchainClientScreen(
9999
text = "Latest known block:",
100100
color = DevkitWalletColors.white,
101101
fontSize = 14.sp,
102-
fontFamily = monoRegular,
102+
fontFamily = inter,
103103
textAlign = TextAlign.Start,
104104
)
105105
Text(
106106
text = "${state.latestBlock}",
107107
color = DevkitWalletColors.white,
108108
fontSize = 14.sp,
109-
fontFamily = monoRegular,
109+
fontFamily = inter,
110110
textAlign = TextAlign.Start,
111111
)
112112
}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ import com.composables.icons.lucide.ClipboardCopy
3737
import com.composables.icons.lucide.Lucide
3838
import org.bitcoindevkit.devkitwallet.domain.WalletSecrets
3939
import org.bitcoindevkit.devkitwallet.presentation.theme.DevkitWalletColors
40-
import org.bitcoindevkit.devkitwallet.presentation.theme.monoRegular
41-
import org.bitcoindevkit.devkitwallet.presentation.theme.quattroRegular
40+
import org.bitcoindevkit.devkitwallet.presentation.theme.googleSansCode
41+
import org.bitcoindevkit.devkitwallet.presentation.theme.inter
4242
import org.bitcoindevkit.devkitwallet.presentation.ui.components.NeutralButton
4343
import org.bitcoindevkit.devkitwallet.presentation.ui.components.SecondaryScreensAppBar
4444

@@ -91,7 +91,7 @@ fun WarningText(setCurrentIndex: (Int) -> Unit) {
9191
Text(
9292
text = MESSAGE,
9393
color = DevkitWalletColors.white,
94-
fontFamily = quattroRegular,
94+
fontFamily = inter,
9595
)
9696
Spacer(modifier = Modifier.padding(16.dp))
9797
NeutralButton(
@@ -113,7 +113,7 @@ fun RecoveryPhrase(walletSecrets: WalletSecrets) {
113113
Text(
114114
text = "Write down your recovery phrase and keep it in a safe place.",
115115
color = DevkitWalletColors.white,
116-
fontFamily = quattroRegular,
116+
fontFamily = inter,
117117
)
118118
Spacer(modifier = Modifier.padding(8.dp))
119119
Box {
@@ -131,7 +131,7 @@ fun RecoveryPhrase(walletSecrets: WalletSecrets) {
131131
shape = RoundedCornerShape(16.dp),
132132
).padding(12.dp),
133133
text = walletSecrets.recoveryPhrase,
134-
fontFamily = monoRegular,
134+
fontFamily = googleSansCode,
135135
color = DevkitWalletColors.white,
136136
)
137137
}
@@ -150,7 +150,7 @@ fun RecoveryPhrase(walletSecrets: WalletSecrets) {
150150
Text(
151151
text = "These are your descriptors.",
152152
color = DevkitWalletColors.white,
153-
fontFamily = quattroRegular,
153+
fontFamily = inter,
154154
)
155155
Spacer(modifier = Modifier.padding(8.dp))
156156
Box {
@@ -168,7 +168,7 @@ fun RecoveryPhrase(walletSecrets: WalletSecrets) {
168168
shape = RoundedCornerShape(16.dp),
169169
).padding(12.dp),
170170
text = walletSecrets.descriptor.toStringWithSecret(),
171-
fontFamily = monoRegular,
171+
fontFamily = googleSansCode,
172172
color = DevkitWalletColors.white,
173173
)
174174
}
@@ -199,7 +199,7 @@ fun RecoveryPhrase(walletSecrets: WalletSecrets) {
199199
shape = RoundedCornerShape(16.dp),
200200
).padding(12.dp),
201201
text = walletSecrets.changeDescriptor.toStringWithSecret(),
202-
fontFamily = monoRegular,
202+
fontFamily = googleSansCode,
203203
color = DevkitWalletColors.white,
204204
)
205205
}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ import androidx.compose.ui.draw.clip
4141
import androidx.compose.ui.graphics.ImageBitmap
4242
import androidx.compose.ui.graphics.asImageBitmap
4343
import androidx.compose.ui.platform.LocalContext
44+
import androidx.compose.ui.text.font.FontWeight
4445
import androidx.compose.ui.unit.dp
4546
import androidx.compose.ui.unit.sp
4647
import androidx.core.graphics.createBitmap
@@ -54,8 +55,8 @@ import kotlinx.coroutines.CoroutineScope
5455
import kotlinx.coroutines.delay
5556
import kotlinx.coroutines.launch
5657
import org.bitcoindevkit.devkitwallet.presentation.navigation.HomeScreen
58+
import org.bitcoindevkit.devkitwallet.presentation.theme.googleSansCode
5759
import org.bitcoindevkit.devkitwallet.presentation.theme.inter
58-
import org.bitcoindevkit.devkitwallet.presentation.theme.monoRegular
5960
import org.bitcoindevkit.devkitwallet.presentation.ui.components.SecondaryScreensAppBar
6061
import org.bitcoindevkit.devkitwallet.presentation.viewmodels.mvi.ReceiveScreenAction
6162
import org.bitcoindevkit.devkitwallet.presentation.viewmodels.mvi.ReceiveScreenState
@@ -135,8 +136,9 @@ internal fun ReceiveScreen(
135136
) {
136137
Text(
137138
text = state.address.chunked(4).joinToString(" "),
138-
fontFamily = monoRegular,
139+
fontFamily = googleSansCode,
139140
fontSize = 13.sp,
141+
fontWeight = FontWeight.Light,
140142
color = colorScheme.onSurface,
141143
modifier = Modifier
142144
.align(Alignment.CenterStart)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import androidx.constraintlayout.compose.Dimension
3030
import androidx.navigation.NavController
3131
import org.bitcoindevkit.devkitwallet.presentation.navigation.RbfScreen
3232
import org.bitcoindevkit.devkitwallet.presentation.theme.DevkitWalletColors
33-
import org.bitcoindevkit.devkitwallet.presentation.theme.monoRegular
33+
import org.bitcoindevkit.devkitwallet.presentation.theme.inter
3434
import org.bitcoindevkit.devkitwallet.presentation.ui.components.SecondaryScreensAppBar
3535

3636
@Composable
@@ -72,7 +72,7 @@ internal fun TransactionScreen(txid: String?, navController: NavController) {
7272
text = "Transaction",
7373
color = DevkitWalletColors.white,
7474
fontSize = 28.sp,
75-
fontFamily = monoRegular,
75+
fontFamily = inter,
7676
textAlign = TextAlign.Center,
7777
modifier = Modifier.fillMaxWidth(),
7878
)
@@ -164,7 +164,7 @@ fun TransactionDetailButton(content: String, navController: NavController, txid:
164164
Text(
165165
text = content,
166166
fontSize = 14.sp,
167-
fontFamily = monoRegular,
167+
fontFamily = inter,
168168
textAlign = TextAlign.Center,
169169
lineHeight = 28.sp,
170170
)

0 commit comments

Comments
 (0)