Skip to content

Commit 98d9abe

Browse files
fix(deps): update dependency io.nlopez.compose.rules:detekt to v0.4.15 (#3595)
* Update dependency io.nlopez.compose.rules:detekt to v0.4.15 * Fix new detekt issues * Fix KtLint --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jorge Martín <[email protected]>
1 parent 2944879 commit 98d9abe

File tree

10 files changed

+19
-6
lines changed

10 files changed

+19
-6
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ allprojects {
4848
config.from(files("$rootDir/tools/detekt/detekt.yml"))
4949
}
5050
dependencies {
51-
detektPlugins("io.nlopez.compose.rules:detekt:0.4.12")
51+
detektPlugins("io.nlopez.compose.rules:detekt:0.4.15")
5252
}
5353

5454
// KtLint

features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/welcome/WelcomeView.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ import kotlinx.collections.immutable.persistentListOf
4242
@Composable
4343
fun WelcomeView(
4444
applicationName: String,
45-
modifier: Modifier = Modifier,
4645
onContinueClick: () -> Unit,
46+
modifier: Modifier = Modifier,
4747
) {
4848
BackHandler(onBack = onContinueClick)
4949
OnBoardingPage(

features/location/api/src/main/kotlin/io/element/android/features/location/api/internal/StaticMapPlaceholder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ internal fun StaticMapPlaceholder(
3838
contentDescription: String?,
3939
width: Dp,
4040
height: Dp,
41-
modifier: Modifier = Modifier,
4241
onLoadMapClick: () -> Unit,
42+
modifier: Modifier = Modifier,
4343
) {
4444
Box(
4545
contentAlignment = Alignment.Center,

features/login/impl/src/main/kotlin/io/element/android/features/login/impl/accountprovider/AccountProviderView.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ import io.element.android.libraries.designsystem.theme.components.Text
3838
@Composable
3939
fun AccountProviderView(
4040
item: AccountProvider,
41-
modifier: Modifier = Modifier,
4241
onClick: () -> Unit,
42+
modifier: Modifier = Modifier,
4343
) {
4444
Column(
4545
modifier = modifier

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/ExpandableBottomSheetScaffold.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ import kotlin.math.roundToInt
5858
@Composable
5959
internal fun ExpandableBottomSheetScaffold(
6060
content: @Composable (padding: PaddingValues) -> Unit,
61+
// False positive, it's not being reused
62+
@Suppress("ContentSlotReused")
6163
sheetContent: @Composable (subcomposing: Boolean) -> Unit,
6264
sheetDragHandle: @Composable () -> Unit,
6365
sheetSwipeEnabled: Boolean,

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,8 +319,8 @@ private fun MessagesViewContent(
319319
onJoinCallClick: () -> Unit,
320320
onViewAllPinnedMessagesClick: () -> Unit,
321321
forceJumpToBottomVisibility: Boolean,
322-
modifier: Modifier = Modifier,
323322
onSwipeToReply: (TimelineItem.Event) -> Unit,
323+
modifier: Modifier = Modifier,
324324
) {
325325
Box(
326326
modifier = modifier

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListView.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,8 @@ private fun PinnedMessagesListLoaded(
239239
private fun TimelineItemEventContentViewWrapper(
240240
event: TimelineItem.Event,
241241
onLinkClick: (String) -> Unit,
242-
modifier: Modifier = Modifier,
243242
onContentLayoutChange: (ContentAvoidingLayoutData) -> Unit,
243+
modifier: Modifier = Modifier,
244244
) {
245245
if (event.content is TimelineItemPollContent) {
246246
PollTitleView(

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import androidx.compose.foundation.layout.wrapContentHeight
2828
import androidx.compose.foundation.shape.RoundedCornerShape
2929
import androidx.compose.runtime.Composable
3030
import androidx.compose.runtime.CompositionLocalProvider
31+
import androidx.compose.runtime.movableContentOf
3132
import androidx.compose.runtime.remember
3233
import androidx.compose.runtime.rememberCoroutineScope
3334
import androidx.compose.ui.Alignment
@@ -455,6 +456,8 @@ private fun MessageEventBubbleContent(
455456
canShrinkContent: Boolean = false,
456457
content: @Composable (onContentLayoutChange: (ContentAvoidingLayoutData) -> Unit) -> Unit,
457458
) {
459+
@Suppress("NAME_SHADOWING")
460+
val content = remember { movableContentOf(content) }
458461
when (timestampPosition) {
459462
TimestampPosition.Overlay ->
460463
Box(modifier, contentAlignment = Alignment.Center) {

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/pages/HeaderFooterPage.kt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ import androidx.compose.foundation.layout.padding
1818
import androidx.compose.foundation.lazy.LazyColumn
1919
import androidx.compose.material3.MaterialTheme
2020
import androidx.compose.runtime.Composable
21+
import androidx.compose.runtime.movableContentOf
22+
import androidx.compose.runtime.remember
2123
import androidx.compose.ui.Alignment
2224
import androidx.compose.ui.Modifier
2325
import androidx.compose.ui.graphics.Color
@@ -39,6 +41,7 @@ import io.element.android.libraries.designsystem.theme.components.Text
3941
* @param footer optional footer.
4042
* @param content main content.
4143
*/
44+
@Suppress("NAME_SHADOWING")
4245
@Composable
4346
fun HeaderFooterPage(
4447
modifier: Modifier = Modifier,
@@ -51,6 +54,10 @@ fun HeaderFooterPage(
5154
footer: @Composable () -> Unit = {},
5255
content: @Composable () -> Unit = {},
5356
) {
57+
val topBar = remember { movableContentOf(topBar) }
58+
val header = remember { movableContentOf(header) }
59+
val footer = remember { movableContentOf(footer) }
60+
val content = remember { movableContentOf(content) }
5461
Scaffold(
5562
modifier = modifier,
5663
topBar = topBar,

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/async/AsyncActionView.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight
2828
* closed, [onErrorDismiss] will be invoked. If [onRetry] is not null, a retry button will be displayed.
2929
* - When loading, display a loading dialog using [progressDialog]. Pass empty lambda to disable.
3030
*/
31+
@Suppress("ContentSlotReused") // False positive, the lambdas don't add composable views
3132
@Composable
3233
fun <T> AsyncActionView(
3334
async: AsyncAction<T>,

0 commit comments

Comments
 (0)