From 19c38f7e7ff92b86b7f7fb903f869fbd26ac96d2 Mon Sep 17 00:00:00 2001 From: ganfra Date: Wed, 22 Jul 2026 16:40:26 +0200 Subject: [PATCH] Fix lint, detekt and konsist checks --- .../io/element/android/features/messages/impl/MessagesView.kt | 2 +- .../android/libraries/emoji/impl/DefaultEmojibaseProvider.kt | 2 -- .../libraries/emoji/impl/picker/DefaultEmojiPickerRenderer.kt | 2 -- .../io/element/android/libraries/emoji/impl/picker/EmojiItem.kt | 2 +- .../android/libraries/emoji/test/FakeEmojiPickerPresenter.kt | 2 +- .../android/libraries/emoji/test/FakeEmojiPickerState.kt | 2 +- 6 files changed, 4 insertions(+), 8 deletions(-) diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt index 74d6c71aab..5e206d5588 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt @@ -145,9 +145,9 @@ fun MessagesView( onJoinCallClick: (isAudioCall: Boolean) -> Unit, onViewAllPinnedMessagesClick: () -> Unit, onThreadsListClick: () -> Unit, + knockRequestsBannerView: @Composable () -> Unit, modifier: Modifier = Modifier, forceJumpToBottomVisibility: Boolean = false, - knockRequestsBannerView: @Composable () -> Unit, customReactionBottomSheet: @Composable () -> Unit, ) { val eventContentValidationState = LocalEventContentValidationState.current diff --git a/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/DefaultEmojibaseProvider.kt b/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/DefaultEmojibaseProvider.kt index 9f64879a80..0e3187e196 100644 --- a/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/DefaultEmojibaseProvider.kt +++ b/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/DefaultEmojibaseProvider.kt @@ -11,7 +11,6 @@ package io.element.android.libraries.emoji.impl import android.content.Context import dev.zacsweers.metro.AppScope import dev.zacsweers.metro.ContributesBinding -import dev.zacsweers.metro.Inject import dev.zacsweers.metro.SingleIn import io.element.android.emojibasebindings.EmojibaseDatasource import io.element.android.emojibasebindings.EmojibaseStore @@ -22,7 +21,6 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineStart import kotlinx.coroutines.async -@Inject @SingleIn(AppScope::class) @ContributesBinding(AppScope::class) class DefaultEmojibaseProvider( diff --git a/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/picker/DefaultEmojiPickerRenderer.kt b/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/picker/DefaultEmojiPickerRenderer.kt index 4b6fcd8554..f77f7a0d76 100644 --- a/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/picker/DefaultEmojiPickerRenderer.kt +++ b/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/picker/DefaultEmojiPickerRenderer.kt @@ -10,14 +10,12 @@ package io.element.android.libraries.emoji.impl.picker import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import dev.zacsweers.metro.ContributesBinding -import dev.zacsweers.metro.Inject import io.element.android.emojibasebindings.Emoji import io.element.android.libraries.di.SessionScope import io.element.android.libraries.emoji.api.picker.EmojiPickerRenderer import io.element.android.libraries.emoji.api.picker.EmojiPickerState import kotlinx.collections.immutable.ImmutableSet -@Inject @ContributesBinding(SessionScope::class) class DefaultEmojiPickerRenderer : EmojiPickerRenderer { @Composable diff --git a/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/picker/EmojiItem.kt b/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/picker/EmojiItem.kt index 27c80af961..02ed46c0ae 100644 --- a/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/picker/EmojiItem.kt +++ b/libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/picker/EmojiItem.kt @@ -69,9 +69,9 @@ internal fun EmojiItem( skinPickerEmoji: Emoji?, selectedSkinUnicodes: ImmutableSet, hasSelectedSkin: Boolean, - contentDescription: @Composable (emoji: Emoji, isSelected: Boolean) -> String = { emoji, _ -> emoji.unicode }, modifier: Modifier = Modifier, emojiSize: TextUnit = 20.sp, + contentDescription: @Composable (emoji: Emoji, isSelected: Boolean) -> String = { emoji, _ -> emoji.unicode }, ) { val backgroundColor = when { isSelected -> ElementTheme.colors.bgActionPrimaryRest diff --git a/libraries/emoji/test/src/main/kotlin/io/element/android/libraries/emoji/test/FakeEmojiPickerPresenter.kt b/libraries/emoji/test/src/main/kotlin/io/element/android/libraries/emoji/test/FakeEmojiPickerPresenter.kt index 76a239ac49..158cde0e0e 100644 --- a/libraries/emoji/test/src/main/kotlin/io/element/android/libraries/emoji/test/FakeEmojiPickerPresenter.kt +++ b/libraries/emoji/test/src/main/kotlin/io/element/android/libraries/emoji/test/FakeEmojiPickerPresenter.kt @@ -11,7 +11,7 @@ import io.element.android.libraries.emoji.api.picker.EmojiPickerPresenter import io.element.android.libraries.emoji.api.picker.EmojiPickerState fun fakeEmojiPickerPresenter( - state: EmojiPickerState = FakeEmojiPickerState(), + state: EmojiPickerState = FakeEmojiPickerState(isReady = true), ): EmojiPickerPresenter = EmojiPickerPresenter { state } fun fakeEmojiPickerPresenterFactory( diff --git a/libraries/emoji/test/src/main/kotlin/io/element/android/libraries/emoji/test/FakeEmojiPickerState.kt b/libraries/emoji/test/src/main/kotlin/io/element/android/libraries/emoji/test/FakeEmojiPickerState.kt index 234fe2e9b2..02ca1ae159 100644 --- a/libraries/emoji/test/src/main/kotlin/io/element/android/libraries/emoji/test/FakeEmojiPickerState.kt +++ b/libraries/emoji/test/src/main/kotlin/io/element/android/libraries/emoji/test/FakeEmojiPickerState.kt @@ -14,5 +14,5 @@ import io.element.android.libraries.emoji.api.picker.EmojiPickerState * tests). */ data class FakeEmojiPickerState( - override val isReady: Boolean = true, + override val isReady: Boolean, ) : EmojiPickerState