Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Rework Modifier.applyIf.

Browse source 
It was using `Modifier.composed` which is not good for performance and detekt is warning about this.
This commit is contained in:
Benoit Marty 2024-04-03 11:34:49 +02:00 • committed by Benoit Marty
parent cea03085c3
commit 7b70cac7c5
2 changed files with 21 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

7
features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchView.kt
View file

@ -87,10 +87,13 @@ internal fun RoomListSearchView(
) { ) {
Column( Column(
modifier = modifier modifier = modifier
.applyIf(state.isSearchActive, ifTrue = { .applyIf(
condition = state.isSearchActive,
ifTrue = {
// Disable input interaction to underlying views // Disable input interaction to underlying views
pointerInput(Unit) {} pointerInput(Unit) {}
}) }
)
) { ) {
if (state.isSearchActive) { if (state.isSearchActive) {
RoomListSearchContent( RoomListSearchContent(

20
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/ApplyIf.kt
View file

@ -16,30 +16,26 @@
package io.element.android.libraries.designsystem.modifiers package io.element.android.libraries.designsystem.modifiers
import android.annotation.SuppressLint
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.composed
import androidx.compose.ui.platform.debugInspectorInfo import androidx.compose.ui.platform.debugInspectorInfo
import androidx.compose.ui.platform.inspectable
/** /**
* Applies the [ifTrue] modifier when the [condition] is true, [ifFalse] otherwise. * Applies the [ifTrue] modifier when the [condition] is true, [ifFalse] otherwise.
*/ */
@SuppressLint("UnnecessaryComposedModifier") // It's actually necessary due to the `@Composable` lambdas
fun Modifier.applyIf( fun Modifier.applyIf(
condition: Boolean, condition: Boolean,
ifTrue: @Composable Modifier.() -> Modifier, ifTrue: Modifier.() -> Modifier,
ifFalse: @Composable (Modifier.() -> Modifier)? = null ifFalse: (Modifier.() -> Modifier)? = null
): Modifier = ): Modifier = this then inspectable(
composed(
inspectorInfo = debugInspectorInfo { inspectorInfo = debugInspectorInfo {
name = "applyIf" name = "applyIf"
value = condition value = condition
} }
) { ) {
when { this then when {
condition -> then(ifTrue(Modifier)) condition -> ifTrue(Modifier)
ifFalse != null -> then(ifFalse(Modifier)) ifFalse != null -> ifFalse(Modifier)
else -> this else -> Modifier
} }
} }