From 2e43d4d0d90f82781f936e1969fe20a5755e73b3 Mon Sep 17 00:00:00 2001 From: kalarina Date: Wed, 18 Nov 2026 17:59:14 +0200 Subject: [PATCH] Show the logo only once on the About tab --- .../fogwave/ui/components/AboutPanel.kt | 4 ++-- .../fogwave/ui/components/TopBrandBar.kt | 16 +++++++++++----- .../skysparkle/fogwave/ui/screens/HomeScreen.kt | 2 ++ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/cc/skysparkle/fogwave/ui/components/AboutPanel.kt b/app/src/main/java/cc/skysparkle/fogwave/ui/components/AboutPanel.kt index 651405e..3edac91 100644 --- a/app/src/main/java/cc/skysparkle/fogwave/ui/components/AboutPanel.kt +++ b/app/src/main/java/cc/skysparkle/fogwave/ui/components/AboutPanel.kt @@ -180,7 +180,7 @@ private fun AppHeader() { } } -/** Asks for a donation: the app icon, a short note and one button. */ +/** Asks for a donation: a heart, a short note and one button. */ @Composable private fun SupportCard(onDonate: () -> Unit) { val colors = LocalGeoColors.current @@ -196,7 +196,7 @@ private fun SupportCard(onDonate: () -> Unit) { .background(colors.primaryContainer), contentAlignment = Alignment.Center ) { - AppIcon(resId = R.drawable.ic_fogwave_logo, size = 32.dp) + AppIcon(resId = R.drawable.ic_heart_fill, tint = colors.primary, size = 22.dp) } Column(modifier = Modifier.weight(1f)) { RowTitle(stringResource(R.string.support_title)) diff --git a/app/src/main/java/cc/skysparkle/fogwave/ui/components/TopBrandBar.kt b/app/src/main/java/cc/skysparkle/fogwave/ui/components/TopBrandBar.kt index 390c3a3..7f094e3 100644 --- a/app/src/main/java/cc/skysparkle/fogwave/ui/components/TopBrandBar.kt +++ b/app/src/main/java/cc/skysparkle/fogwave/ui/components/TopBrandBar.kt @@ -50,6 +50,7 @@ import cc.skysparkle.fogwave.ui.theme.LocalGeoColors @Composable fun TopBrandBar( modifier: Modifier = Modifier, + showLogo: Boolean = true, showSearch: Boolean = false, isSearchOpen: Boolean = false, query: String = "", @@ -69,11 +70,16 @@ fun TopBrandBar( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp) ) { - AppIcon( - resId = R.drawable.ic_fogwave_logo, - contentDescription = stringResource(R.string.fogwave_logo_content_desc), - size = 30.dp - ) + if (showLogo) { + AppIcon( + resId = R.drawable.ic_fogwave_logo, + contentDescription = stringResource(R.string.fogwave_logo_content_desc), + size = 30.dp + ) + } else { + // Keeps the title centered where it is on the other tabs + Box(modifier = Modifier.size(30.dp)) + } Box(modifier = Modifier.weight(1f), contentAlignment = Alignment.Center) { AnimatedContent( diff --git a/app/src/main/java/cc/skysparkle/fogwave/ui/screens/HomeScreen.kt b/app/src/main/java/cc/skysparkle/fogwave/ui/screens/HomeScreen.kt index 0c1e84e..9ae3449 100644 --- a/app/src/main/java/cc/skysparkle/fogwave/ui/screens/HomeScreen.kt +++ b/app/src/main/java/cc/skysparkle/fogwave/ui/screens/HomeScreen.kt @@ -151,6 +151,8 @@ fun HomeScreen( Column(modifier = Modifier.fillMaxSize()) { TopBrandBar( + // The About tab already shows the logo in its header card + showLogo = uiState.selectedTab != AppTab.ABOUT, showSearch = uiState.selectedTab == AppTab.RADIO, isSearchOpen = isSearchOpen, query = query,