From 9bf188c9f4e03fa64cf88dd3d1937d2c2b05f3c0 Mon Sep 17 00:00:00 2001 From: James Rich <2199651+jamesarich@users.noreply.github.com> Date: Wed, 3 Jun 2026 11:44:27 -0500 Subject: [PATCH] fix(map): keep compass icon visible while following bearing (#5728) Co-authored-by: Claude Opus 4.8 (1M context) --- .../meshtastic/feature/map/component/MapControlsOverlay.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/feature/map/src/commonMain/kotlin/org/meshtastic/feature/map/component/MapControlsOverlay.kt b/feature/map/src/commonMain/kotlin/org/meshtastic/feature/map/component/MapControlsOverlay.kt index 1445424b3f..454bc72b22 100644 --- a/feature/map/src/commonMain/kotlin/org/meshtastic/feature/map/component/MapControlsOverlay.kt +++ b/feature/map/src/commonMain/kotlin/org/meshtastic/feature/map/component/MapControlsOverlay.kt @@ -42,6 +42,7 @@ import org.meshtastic.core.ui.icon.MeshtasticIcons import org.meshtastic.core.ui.icon.MyLocation import org.meshtastic.core.ui.icon.Refresh import org.meshtastic.core.ui.icon.Tune +import org.meshtastic.core.ui.theme.StatusColors.StatusBlue import org.meshtastic.core.ui.theme.StatusColors.StatusRed /** @@ -127,9 +128,11 @@ fun MapControlsOverlay( @Composable private fun CompassButton(onClick: () -> Unit, bearing: Float, isFollowing: Boolean) { + // Tint, not `primary` — tinting the icon `primary` painted it the same color as its own primary-colored + // button background, making the compass disappear while following. val iconTint = when { - isFollowing -> MaterialTheme.colorScheme.primary + isFollowing -> MaterialTheme.colorScheme.StatusBlue bearing == 0f -> MaterialTheme.colorScheme.StatusRed else -> null }