From a6398e89268557c4d3b46a61ff6885588161bf14 Mon Sep 17 00:00:00 2001 From: Terry Yiu Date: Thu, 10 Sep 2026 16:13:14 +0300 Subject: [PATCH] Move Compose's status line under the Price Source card, matching iOS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Claude-Session: https://claude.ai/code/session_01FXcrACM5sok3M1KQJ8kByy --- .../xyz/tyiu/satsprice/ui/PriceScreen.kt | 34 +++++++++++-------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/shared/src/commonMain/kotlin/xyz/tyiu/satsprice/ui/PriceScreen.kt b/shared/src/commonMain/kotlin/xyz/tyiu/satsprice/ui/PriceScreen.kt index 1ecf2b3..1fcb778 100644 --- a/shared/src/commonMain/kotlin/xyz/tyiu/satsprice/ui/PriceScreen.kt +++ b/shared/src/commonMain/kotlin/xyz/tyiu/satsprice/ui/PriceScreen.kt @@ -139,21 +139,11 @@ fun PriceScreen( .padding(horizontal = screenHorizontalPadding, vertical = 16.dp), verticalArrangement = Arrangement.spacedBy(16.dp), ) { - Column(modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp)) { - Text("SatsPrice", style = MaterialTheme.typography.headlineMedium) - 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, - ) - } - } + Text( + "SatsPrice", + style = MaterialTheme.typography.headlineMedium, + modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp), + ) Card(modifier = Modifier.fillMaxWidth(), colors = SectionColors) { Column( @@ -239,6 +229,20 @@ fun PriceScreen( 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, + ) + } } }