diff --git a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/chatlist/ChatListNavLinkView.android.kt b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/chatlist/ChatListNavLinkView.android.kt index 9a3d9e5e4f..4de6261872 100644 --- a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/chatlist/ChatListNavLinkView.android.kt +++ b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/chatlist/ChatListNavLinkView.android.kt @@ -1,5 +1,6 @@ package chat.simplex.common.views.chatlist +import SectionDivider import androidx.compose.foundation.* import androidx.compose.foundation.layout.* import androidx.compose.material.Divider @@ -8,6 +9,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import chat.simplex.common.platform.onRightClick +import chat.simplex.common.views.helpers.LocalInSectionCard import chat.simplex.common.views.helpers.* @Composable @@ -38,5 +40,9 @@ actual fun ChatListNavLinkLayout( DefaultDropdownMenu(showMenu, dropdownMenuItems = dropdownMenuItems) } } - Divider(Modifier.padding(horizontal = 8.dp)) + if (LocalInSectionCard.current) { + SectionDivider() + } else { + Divider(Modifier.padding(horizontal = 8.dp)) + } } diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Theme.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Theme.kt index ab02ee5401..13969a923d 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Theme.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Theme.kt @@ -607,7 +607,7 @@ fun canvasColorForCurrentTheme(): Color { val theme = CurrentColors.value val c = theme.colors return when (theme.base) { - DefaultTheme.LIGHT -> c.background.mixWith(c.onBackground, 0.97f) + DefaultTheme.LIGHT -> c.background.mixWith(c.onBackground, 0.94f) DefaultTheme.SIMPLEX -> c.background.darker(0.4f) else -> c.background } diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/Section.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/Section.kt index 448e3f2457..072e6d84d0 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/Section.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/Section.kt @@ -31,7 +31,7 @@ val CARD_ITEM_PADDING = CARD_PADDING - 1.dp // Set to true by SectionView around its inner Column. SectionItemView reads it // to decide whether to draw the 2dp bottom divider. False default keeps // standalone usage (alerts, pickers, custom contexts) unaffected. -private val LocalInSectionCard = staticCompositionLocalOf { false } +internal val LocalInSectionCard = staticCompositionLocalOf { false } @Composable