Merge pull request #7054 from element-hq/feature/bma/divider

Let Divider use our theme color.
This commit is contained in:
Benoit Marty
2026-06-18 16:40:35 +02:00
committed by GitHub
590 changed files with 1179 additions and 1177 deletions
@@ -10,7 +10,6 @@ package io.element.android.libraries.designsystem.theme.components
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.material3.DividerDefaults
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
@@ -18,6 +17,7 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import io.element.android.compound.theme.ElementTheme
import io.element.android.libraries.designsystem.preview.ElementThemedPreview import io.element.android.libraries.designsystem.preview.ElementThemedPreview
import io.element.android.libraries.designsystem.preview.PreviewGroup import io.element.android.libraries.designsystem.preview.PreviewGroup
@@ -25,7 +25,7 @@ import io.element.android.libraries.designsystem.preview.PreviewGroup
fun HorizontalDivider( fun HorizontalDivider(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
thickness: Dp = ElementDividerDefaults.thickness, thickness: Dp = ElementDividerDefaults.thickness,
color: Color = DividerDefaults.color, color: Color = ElementDividerDefaults.color,
) { ) {
androidx.compose.material3.HorizontalDivider( androidx.compose.material3.HorizontalDivider(
modifier = modifier, modifier = modifier,
@@ -35,7 +35,9 @@ fun HorizontalDivider(
} }
object ElementDividerDefaults { object ElementDividerDefaults {
val thickness = 0.5.dp val thickness = 1.dp
val color
@Composable get() = ElementTheme.colors.separatorSecondary
} }
@Preview(group = PreviewGroup.Dividers) @Preview(group = PreviewGroup.Dividers)
@@ -23,7 +23,6 @@ import androidx.compose.foundation.layout.systemBarsPadding
import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.items
import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.HorizontalDivider
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
@@ -44,6 +43,7 @@ import io.element.android.libraries.designsystem.preview.ElementPreview
import io.element.android.libraries.designsystem.preview.PreviewsDayNight import io.element.android.libraries.designsystem.preview.PreviewsDayNight
import io.element.android.libraries.designsystem.theme.components.DropdownMenu import io.element.android.libraries.designsystem.theme.components.DropdownMenu
import io.element.android.libraries.designsystem.theme.components.DropdownMenuItem import io.element.android.libraries.designsystem.theme.components.DropdownMenuItem
import io.element.android.libraries.designsystem.theme.components.HorizontalDivider
import io.element.android.libraries.designsystem.theme.components.Icon import io.element.android.libraries.designsystem.theme.components.Icon
import io.element.android.libraries.designsystem.theme.components.IconButton import io.element.android.libraries.designsystem.theme.components.IconButton
import io.element.android.libraries.designsystem.theme.components.ListItem import io.element.android.libraries.designsystem.theme.components.ListItem

Some files were not shown because too many files have changed in this diff Show More