diff --git a/core/designsystem/src/main/java/ru/forbion/f7cloud/core/designsystem/F7MobileBottomBar.kt b/core/designsystem/src/main/java/ru/forbion/f7cloud/core/designsystem/F7MobileBottomBar.kt index 91d918b..d20f507 100644 --- a/core/designsystem/src/main/java/ru/forbion/f7cloud/core/designsystem/F7MobileBottomBar.kt +++ b/core/designsystem/src/main/java/ru/forbion/f7cloud/core/designsystem/F7MobileBottomBar.kt @@ -47,9 +47,6 @@ private val BottomBarButtonShape = RoundedCornerShape(100.dp) private val BottomBarBorderBrush = Brush.linearGradient( listOf(Color(0x33C0FF7B), Color(0x3370B62B)), ) -private val BottomBarHighlightBrush = Brush.linearGradient( - listOf(Color(0x33C0FF7B), Color(0x3370B62B)), -) @Composable fun F7MobileBottomBar( @@ -92,34 +89,29 @@ fun F7MobileBottomBar( "$base/themes/forbion/images/header/chat-icon-gray.svg" }, contentDescription = "Чаты", - highlighted = chatsHighlighted, onClick = actions.onChatsClick, ) F7BottomBarSlot.NavBack -> F7BottomBarIconSlot( iconUrl = "$base/themes/forbion/images/header/sidebar-chevron-left.svg", contentDescription = "Папки", - highlighted = navBackHighlighted, iconRotation = if (navBackHighlighted) 180f else 0f, onClick = actions.onNavBackClick, ) F7BottomBarSlot.SectionMail -> F7BottomBarIconSlot( iconUrl = "$base/themes/forbion/images/header/mail-header-icon.svg", contentDescription = "Почта", - highlighted = activeTabKey == "Mail", iconSize = BottomBarSectionIconSize, onClick = actions.onMailClick, ) F7BottomBarSlot.SectionCards -> F7BottomBarIconSlot( iconUrl = "$base/themes/forbion/images/header/deck-header-icon.svg", contentDescription = "Карточки", - highlighted = activeTabKey == "Deck", iconSize = BottomBarSectionIconSize, onClick = actions.onCardsClick, ) F7BottomBarSlot.SectionConferences -> F7BottomBarIconSlot( iconUrl = "$base/themes/forbion/images/header/spreed-header-icon.svg", contentDescription = "Конференции", - highlighted = activeTabKey == "Talk", iconSize = BottomBarSectionIconSize, onClick = actions.onConferencesClick, ) @@ -130,7 +122,6 @@ fun F7MobileBottomBar( "$base/themes/forbion/images/header/menu-burger-gray.svg" }, contentDescription = "Меню", - highlighted = menuOpen, showBadge = showNotificationBadge, onClick = actions.onMenuClick, ) @@ -144,23 +135,16 @@ private fun F7BottomBarIconSlot( iconUrl: String, contentDescription: String, onClick: () -> Unit, - highlighted: Boolean = false, iconRotation: Float = 0f, showBadge: Boolean = false, iconSize: Dp = BottomBarIconSize, ) { - val bg = if (highlighted) BottomBarHighlightBrush else null + // Зелёной подложки под активной кнопкой быть не должно — фон всегда нейтральный. Box( modifier = Modifier .size(BottomBarButtonSize) .clip(BottomBarButtonShape) - .then( - if (bg != null) { - Modifier.background(bg, BottomBarButtonShape) - } else { - Modifier.background(Color(0x99FFFFFF), BottomBarButtonShape) - }, - ) + .background(Color(0x99FFFFFF), BottomBarButtonShape) .border( width = 1.dp, brush = BottomBarBorderBrush,