Move Compose's status line under the Price Source card, matching iOS
Was above the card, right under the "SatsPrice" title; now it's the last item inside the card's content, below "USD to Sats" — matching where iOS's Section footer renders it. Muted with onSurfaceVariant to read as a footer-style caption rather than primary content. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01FXcrACM5sok3M1KQJ8kByy
This commit is contained in:
@@ -139,21 +139,11 @@ fun PriceScreen(
|
|||||||
.padding(horizontal = screenHorizontalPadding, vertical = 16.dp),
|
.padding(horizontal = screenHorizontalPadding, vertical = 16.dp),
|
||||||
verticalArrangement = Arrangement.spacedBy(16.dp),
|
verticalArrangement = Arrangement.spacedBy(16.dp),
|
||||||
) {
|
) {
|
||||||
Column(modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp)) {
|
Text(
|
||||||
Text("SatsPrice", style = MaterialTheme.typography.headlineMedium)
|
"SatsPrice",
|
||||||
val statusLine = if (state.isManualSource) {
|
style = MaterialTheme.typography.headlineMedium,
|
||||||
null
|
modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp),
|
||||||
} else {
|
)
|
||||||
state.lastUpdatedDateTime()?.let { stringResource(MR.strings.updated_status, it) }
|
|
||||||
?: stringResource(MR.strings.loading_rates_status)
|
|
||||||
}
|
|
||||||
if (statusLine != null) {
|
|
||||||
Text(
|
|
||||||
text = statusLine,
|
|
||||||
style = MaterialTheme.typography.bodySmall,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Card(modifier = Modifier.fillMaxWidth(), colors = SectionColors) {
|
Card(modifier = Modifier.fillMaxWidth(), colors = SectionColors) {
|
||||||
Column(
|
Column(
|
||||||
@@ -239,6 +229,20 @@ fun PriceScreen(
|
|||||||
modifier = Modifier.fillMaxWidth(),
|
modifier = Modifier.fillMaxWidth(),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
val statusLine = if (state.isManualSource) {
|
||||||
|
null
|
||||||
|
} else {
|
||||||
|
state.lastUpdatedDateTime()?.let { stringResource(MR.strings.updated_status, it) }
|
||||||
|
?: stringResource(MR.strings.loading_rates_status)
|
||||||
|
}
|
||||||
|
if (statusLine != null) {
|
||||||
|
Text(
|
||||||
|
text = statusLine,
|
||||||
|
style = MaterialTheme.typography.bodySmall,
|
||||||
|
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user