diff --git a/common/src/main/kotlin/dev/msfjarvis/claw/common/comments/CommentEntry.kt b/common/src/main/kotlin/dev/msfjarvis/claw/common/comments/CommentEntry.kt index feb943fb..ddad691d 100644 --- a/common/src/main/kotlin/dev/msfjarvis/claw/common/comments/CommentEntry.kt +++ b/common/src/main/kotlin/dev/msfjarvis/claw/common/comments/CommentEntry.kt @@ -49,11 +49,12 @@ import java.time.temporal.TemporalAccessor fun CommentsHeader( postDetails: ExtendedPostDetails, postActions: PostActions, + modifier: Modifier = Modifier, ) { val htmlConverter = LocalHTMLConverter.current val uriHandler = LocalUriHandler.current - Surface(color = MaterialTheme.colorScheme.background) { + Surface(color = MaterialTheme.colorScheme.background, modifier = modifier) { Column( modifier = Modifier.padding(16.dp).fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(8.dp), @@ -132,13 +133,15 @@ fun PostLink( @Composable fun CommentEntry( comment: Comment, + modifier: Modifier = Modifier, ) { var expanded by remember(comment) { mutableStateOf(true) } val htmlConverter = LocalHTMLConverter.current val uriHandler = LocalUriHandler.current Box( modifier = - Modifier.fillMaxWidth() + modifier + .fillMaxWidth() .clickable { expanded = !expanded } .background(MaterialTheme.colorScheme.background) .padding(start = (comment.indentLevel * 16).dp, end = 16.dp, top = 16.dp, bottom = 16.dp), diff --git a/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/decorations/MonthHeader.kt b/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/decorations/MonthHeader.kt index 8b603ac6..fb8feee5 100644 --- a/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/decorations/MonthHeader.kt +++ b/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/decorations/MonthHeader.kt @@ -19,9 +19,13 @@ import dev.msfjarvis.claw.common.ui.surfaceColorAtNavigationBarElevation import java.time.Month @Composable -fun MonthHeader(month: Month) { +fun MonthHeader( + month: Month, + modifier: Modifier = Modifier, +) { Box( - Modifier.fillMaxWidth() + modifier + .fillMaxWidth() .wrapContentHeight() .background(MaterialTheme.colorScheme.surfaceColorAtNavigationBarElevation()) ) { diff --git a/detekt-baselines/common.xml b/detekt-baselines/common.xml index 961f9981..c3159ed4 100644 --- a/detekt-baselines/common.xml +++ b/detekt-baselines/common.xml @@ -9,9 +9,6 @@ MagicNumber:LobstersCard.kt$8 MagicNumber:Theme.kt$31 ModifierMissing:ClawAppBar.kt$ClawAppBarPreview - ModifierMissing:CommentEntry.kt$CommentEntry - ModifierMissing:CommentEntry.kt$CommentsHeader - ModifierMissing:MonthHeader.kt$MonthHeader ModifierReused:LobstersCard.kt$Row( modifier = modifier, verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), ) { NetworkImage( url = avatarUrl, placeholder = ClawIcons.Account, contentDescription = contentDescription, modifier = modifier.requiredSize(24.dp).clip(CircleShape), ) Text(text = text, modifier = modifier, style = MaterialTheme.typography.bodyMedium) } ModifierReused:LobstersCard.kt$Text(text = text, modifier = modifier, style = MaterialTheme.typography.bodyMedium) SpreadOperator:Theme.kt$(*providedValues)