This commit is contained in:
callebtc
2025-07-15 19:26:25 +02:00
parent 258e5e2ade
commit 1d8eaa3926
6 changed files with 20 additions and 15 deletions
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -95,7 +95,7 @@ fun TextRow(elements: List<MessageElement>) {
} }
/** /**
* Chip component for displaying Cashu payments inline * Chip component for displaying Cashu payments inline pill
*/ */
@Composable @Composable
fun CashuPaymentChip( fun CashuPaymentChip(
@@ -132,7 +132,7 @@ fun CashuPaymentChip(
// Top row: Bitcoin icon and "bitcoin" text // Top row: Bitcoin icon and "bitcoin" text
Row( Row(
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(2.dp) horizontalArrangement = Arrangement.spacedBy(3.dp)
) { ) {
// Orange Bitcoin circle with symbol inside // Orange Bitcoin circle with symbol inside
Box( Box(
@@ -146,9 +146,16 @@ fun CashuPaymentChip(
) { ) {
Text( Text(
text = "", text = "",
fontSize = 8.sp, fontSize = 10.sp,
color = Color(0xFF140C01), color = Color(0xFF140C01),
fontFamily = FontFamily.Monospace fontFamily = FontFamily.Monospace,
textAlign = TextAlign.Center,
style = androidx.compose.ui.text.TextStyle(
lineHeight = 10.sp,
platformStyle = androidx.compose.ui.text.PlatformTextStyle(
includeFontPadding = false
)
)
) )
} }
@@ -115,7 +115,8 @@ fun WalletScreen(
2 -> MintsScreen(viewModel = walletViewModel, modifier = Modifier.weight(1f)) 2 -> MintsScreen(viewModel = walletViewModel, modifier = Modifier.weight(1f))
3 -> WalletSettings( 3 -> WalletSettings(
viewModel = walletViewModel, viewModel = walletViewModel,
onBackClick = { /* No back action needed in tab navigation */ } onBackClick = { /* No back action needed in tab navigation */ },
modifier = Modifier.weight(1f)
) )
} }
@@ -22,19 +22,17 @@ import com.bitchat.android.wallet.viewmodel.WalletViewModel
@Composable @Composable
fun WalletSettings( fun WalletSettings(
viewModel: WalletViewModel = viewModel(), viewModel: WalletViewModel = viewModel(),
onBackClick: () -> Unit = {} onBackClick: () -> Unit = {},
modifier: Modifier = Modifier
) { ) {
val colorScheme = MaterialTheme.colorScheme val colorScheme = MaterialTheme.colorScheme
var showClearDataDialog by remember { mutableStateOf(false) } var showClearDataDialog by remember { mutableStateOf(false) }
var showExportDialog by remember { mutableStateOf(false) } var showExportDialog by remember { mutableStateOf(false) }
Column(
modifier = Modifier
.fillMaxSize()
.background(Color.Black)
) {
LazyColumn( LazyColumn(
modifier = Modifier.fillMaxSize(), modifier = modifier
.fillMaxSize()
.background(Color.Black),
contentPadding = PaddingValues(16.dp), contentPadding = PaddingValues(16.dp),
verticalArrangement = Arrangement.spacedBy(16.dp) verticalArrangement = Arrangement.spacedBy(16.dp)
) { ) {
@@ -165,7 +163,6 @@ fun WalletSettings(
} }
} }
} }
}
// Clear Data Confirmation Dialog // Clear Data Confirmation Dialog
if (showClearDataDialog) { if (showClearDataDialog) {