From e93f245fcfd4929ac49e64fd90bfb0b27708a29b Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 29 Jun 2023 12:16:37 +0200 Subject: [PATCH] Fix detekt issue. --- .../android/libraries/designsystem/ruler/WithRulers.kt | 3 +++ .../designsystem/theme/components/DropdownMenuItem.kt | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/ruler/WithRulers.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/ruler/WithRulers.kt index 6db2491f7d..a5fc895e5d 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/ruler/WithRulers.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/ruler/WithRulers.kt @@ -17,6 +17,7 @@ package io.element.android.libraries.designsystem.ruler import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier import androidx.compose.ui.layout.Layout import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Dp @@ -31,11 +32,13 @@ import io.element.android.libraries.designsystem.theme.components.Text */ @Composable fun WithRulers( + modifier: Modifier = Modifier, xRulersOffset: Dp = 0.dp, yRulersOffset: Dp = 0.dp, content: @Composable () -> Unit ) { Layout( + modifier = modifier, content = { content() VerticalRuler() diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/DropdownMenuItem.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/DropdownMenuItem.kt index 4a00333929..b8c18f99c6 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/DropdownMenuItem.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/DropdownMenuItem.kt @@ -57,11 +57,15 @@ fun DropdownMenuItem( } @Composable -fun DropdownMenuItemText(text: String) { +fun DropdownMenuItemText( + text: String, + modifier: Modifier = Modifier, +) { Text( text = text, color = ElementTheme.materialColors.primary, - style = ElementTheme.typography.fontBodyLgRegular + style = ElementTheme.typography.fontBodyLgRegular, + modifier = modifier, ) }