Skip to content

fix(navbar): keep unselected tab glyphs and labels white #1786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bmc08gt merged 2 commits into from
Oct 15, 2026
Merged

fix(navbar): keep unselected tab glyphs and labels white #1786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6bd69e
fix(navbar): keep unselected tab glyphs and labels white
bmc08gt Oct 15, 2026
736d9ab
fix(messenger): stub newestPageLoads in ChatTypingGateTest
bmc08gt Oct 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions apps/flipcash/core-ui/src/main/kotlin/com/flipcash/app/core/ui/NavigationBar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,9 @@ fun NavigationBar(
Row(modifier = Modifier.fillMaxWidth()) {
order.fastForEach { button ->
val selected = button == state.selectedTab
// Only the photo slot dims when unselected. Glyphs and labels stay white in both
// states, as the iOS 27 tab bar paints them: the outline-vs-filled glyph and the
// indicator pill carry the selection.
val iconAlpha by animateFloatAsState(
targetValue = if (selected) 1f else 0.5f,
label = "navBarIconAlpha",
Expand Down Expand Up @@ -221,9 +224,7 @@ fun NavigationBar(
}
} else {
Image(
modifier = Modifier
.size(iconSize)
.graphicsLayer { alpha = iconAlpha },
modifier = Modifier.size(iconSize),
painter = button.icon(selected),
colorFilter = ColorFilter.tint(Color.White),
contentDescription = null,
Expand Down Expand Up @@ -253,7 +254,6 @@ fun NavigationBar(
color = Color.White,
textAlign = TextAlign.Center,
maxLines = 1,
modifier = Modifier.graphicsLayer { alpha = iconAlpha },
)
}
}
Expand Down Expand Up @@ -285,9 +285,8 @@ private val NavBarButton.label: Int

/**
* The glyph for [this] tab at the weight its selection calls for (node 10000:111297). Every tab is
* drawn as an outline until it is selected, where it fills in; the dimming on top of that is the
* caller's alpha. The unsuffixed drawable is the outline, so `ic_nav_tipcard` is also the outline
* the tutorial card reuses.
* drawn as an outline until it is selected, where it fills in, white in both states. The unsuffixed
* drawable is the outline, so `ic_nav_tipcard` is also the outline the tutorial card reuses.
*
* The scanner tab carries the tip card glyph because scanning one is what that tab is for. The You
* tab draws the user's own photo when there is one (see the avatar branch above) and falls back to
Expand Down
3 changes: 3 additions & 0 deletions ...tures/messenger/src/test/kotlin/com/flipcash/app/messenger/internal/ChatTypingGateTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import io.mockk.coEvery
import io.mockk.every
import io.mockk.mockk
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.flowOf
import kotlin.test.assertFalse
Expand Down Expand Up @@ -57,6 +58,8 @@ class ChatTypingGateTest {

private val chatCoordinator = mockk<ChatCoordinator>(relaxed = true) {
every { observeMediaSendProgress() } returns kotlinx.coroutines.flow.emptyFlow()
// No load ever lands; a relaxed Flow completes empty and fails the open's first { }.
every { newestPageLoads() } returns MutableSharedFlow()
}
private val tipPaymentDelegate = mockk<TipPaymentDelegate>(relaxed = true)
private val transactionController = mockk<TransactionController>(relaxed = true)
Expand Down
Loading