From 7745856646280b087d8c8cc989bc0e638086d34c Mon Sep 17 00:00:00 2001 From: Niels van Velzen Date: Sat, 29 Nov 2025 14:38:32 +0100 Subject: [PATCH] Fix tinting in account switcher button fallback icon (cherry picked from commit 07e38092278894cba4910d7d34b0d240382036b0) --- .../ui/shared/toolbar/MainToolbar.kt | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/shared/toolbar/MainToolbar.kt b/app/src/main/java/org/jellyfin/androidtv/ui/shared/toolbar/MainToolbar.kt index 5b8d35c7b..81d33cbda 100644 --- a/app/src/main/java/org/jellyfin/androidtv/ui/shared/toolbar/MainToolbar.kt +++ b/app/src/main/java/org/jellyfin/androidtv/ui/shared/toolbar/MainToolbar.kt @@ -15,7 +15,6 @@ import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.focus.focusRestorer import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.graphics.vector.rememberVectorPainter import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.vectorResource @@ -109,14 +108,21 @@ private fun MainToolbar( colors = if (activeButton == MainToolbarActiveButton.User) activeButtonColors else ButtonDefaults.colors(), contentPadding = if (userImageVisible) PaddingValues(3.dp) else IconButtonDefaults.ContentPadding, ) { - Image( - painter = if (userImageVisible) userImagePainter else rememberVectorPainter(ImageVector.vectorResource(R.drawable.ic_user)), - contentDescription = stringResource(R.string.lbl_switch_user), - contentScale = ContentScale.Crop, - modifier = Modifier - .aspectRatio(1f) - .clip(IconButtonDefaults.Shape) - ) + if (!userImageVisible) { + Icon( + imageVector = ImageVector.vectorResource(R.drawable.ic_user), + contentDescription = stringResource(R.string.lbl_switch_user), + ) + } else { + Image( + painter = userImagePainter, + contentDescription = stringResource(R.string.lbl_switch_user), + contentScale = ContentScale.Crop, + modifier = Modifier + .aspectRatio(1f) + .clip(IconButtonDefaults.Shape) + ) + } } NowPlayingComposable(