Skip to content

Commit 2640e90

Browse files
Add Inter font for new UI
1 parent c84fef9 commit 2640e90

7 files changed

Lines changed: 29 additions & 6 deletions

File tree

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,27 @@ val monoBold =
4646
style = FontStyle.Normal,
4747
),
4848
)
49+
50+
val inter =
51+
FontFamily(
52+
Font(
53+
resId = R.font.inter_thin,
54+
weight = FontWeight.Thin,
55+
style = FontStyle.Normal,
56+
),
57+
Font(
58+
resId = R.font.inter_regular,
59+
weight = FontWeight.Normal,
60+
style = FontStyle.Normal,
61+
),
62+
Font(
63+
resId = R.font.inter_medium,
64+
weight = FontWeight.Medium,
65+
style = FontStyle.Normal,
66+
),
67+
Font(
68+
resId = R.font.inter_bold,
69+
weight = FontWeight.Bold,
70+
style = FontStyle.Normal,
71+
),
72+
)

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,7 @@ import org.bitcoindevkit.devkitwallet.presentation.navigation.SendScreen
6969
import org.bitcoindevkit.devkitwallet.presentation.navigation.SettingsScreen
7070
import org.bitcoindevkit.devkitwallet.presentation.navigation.TransactionHistoryScreen
7171
import org.bitcoindevkit.devkitwallet.presentation.theme.DevkitWalletColors
72-
import org.bitcoindevkit.devkitwallet.presentation.theme.monoRegular
73-
import org.bitcoindevkit.devkitwallet.presentation.theme.quattroBold
72+
import org.bitcoindevkit.devkitwallet.presentation.theme.inter
7473
import org.bitcoindevkit.devkitwallet.presentation.ui.components.CustomSnackbar
7574
import org.bitcoindevkit.devkitwallet.presentation.viewmodels.mvi.WalletScreenAction
7675
import org.bitcoindevkit.devkitwallet.presentation.viewmodels.mvi.WalletScreenState
@@ -132,7 +131,7 @@ internal fun WalletHomeScreen(
132131
CurrencyUnit.Bitcoin -> {
133132
Text(
134133
text = state.balance.formatInBtc(),
135-
fontFamily = monoRegular,
134+
fontFamily = inter,
136135
fontSize = 48.sp,
137136
fontWeight = FontWeight.Thin,
138137
color = colorScheme.onSurface,
@@ -141,7 +140,7 @@ internal fun WalletHomeScreen(
141140
CurrencyUnit.Satoshi -> {
142141
Text(
143142
text = "${state.balance} sat",
144-
fontFamily = monoRegular,
143+
fontFamily = inter,
145144
fontSize = 48.sp,
146145
fontWeight = FontWeight.Thin,
147146
color = colorScheme.onSurface,
@@ -314,7 +313,7 @@ internal fun WalletHomeScreen(
314313
) {
315314
Text(
316315
text = "Network unavailable",
317-
fontFamily = monoRegular,
316+
fontFamily = inter,
318317
fontSize = 14.sp,
319318
color = colorScheme.onSurface,
320319
)
@@ -371,7 +370,7 @@ internal fun WalletAppBar(onSettingsClick: () -> Unit) {
371370
Text(
372371
text = "",
373372
color = MaterialTheme.colorScheme.onSurface,
374-
fontFamily = quattroBold,
373+
fontFamily = inter,
375374
fontSize = 20.sp,
376375
)
377376
},
336 KB
Binary file not shown.
335 KB
Binary file not shown.
335 KB
Binary file not shown.
335 KB
Binary file not shown.

gradlew

100644100755
File mode changed.

0 commit comments

Comments
 (0)