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 bd4c2b0..91d918b 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 @@ -21,6 +21,7 @@ import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import coil.compose.AsyncImage @@ -35,6 +36,10 @@ data class F7BottomBarActions( private val BottomBarButtonSize = 55.dp private val BottomBarIconSize = 34.dp + +// Иконки-разделы (Почта/Карточки/Конференции) — серверные SVG с внутренним +// «воздухом», поэтому рендерим крупнее, чтобы заполняли кружок. +private val BottomBarSectionIconSize = 46.dp private val BottomBarGap = 8.dp private val BottomBarOuterPaddingH = 6.dp private val BottomBarOuterPaddingV = 6.dp @@ -101,18 +106,21 @@ fun F7MobileBottomBar( 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, ) F7BottomBarSlot.Menu -> F7BottomBarIconSlot( @@ -139,6 +147,7 @@ private fun F7BottomBarIconSlot( highlighted: Boolean = false, iconRotation: Float = 0f, showBadge: Boolean = false, + iconSize: Dp = BottomBarIconSize, ) { val bg = if (highlighted) BottomBarHighlightBrush else null Box( @@ -168,7 +177,7 @@ private fun F7BottomBarIconSlot( model = iconUrl, contentDescription = contentDescription, modifier = Modifier - .size(BottomBarIconSize) + .size(iconSize) .graphicsLayer { rotationZ = iconRotation }, contentScale = ContentScale.Fit, )