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

Fix detekt issues in develop (#1004)

Browse source 
Co-authored-by: Marco Romano <marcor@element.io>
This commit is contained in:
Jorge Martin Espinosa 2023-07-31 14:01:08 +02:00 • committed by GitHub
parent 7ecbbb0a81
commit 75137c1469
3 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/text/DpScale.kt
View file

@ -52,7 +52,7 @@ fun Dp.applyScaleUp(): Dp = with(LocalDensity.current) {
@Preview @Preview
@Composable @Composable
fun DpScalePreview_0_75f() = WithFontScale(0.75f) { internal fun DpScalePreview_0_75f() = WithFontScale(0.75f) {
ElementPreviewLight { ElementPreviewLight {
val fontSizeInDp = 16.dp val fontSizeInDp = 16.dp
Column( Column(
@ -77,7 +77,7 @@ fun DpScalePreview_0_75f() = WithFontScale(0.75f) {
@Preview @Preview
@Composable @Composable
fun DpScalePreview_1_0f() = WithFontScale(1f) { internal fun DpScalePreview_1_0f() = WithFontScale(1f) {
ElementPreviewLight { ElementPreviewLight {
val fontSizeInDp = 16.dp val fontSizeInDp = 16.dp
Column( Column(
@ -102,7 +102,7 @@ fun DpScalePreview_1_0f() = WithFontScale(1f) {
@Preview @Preview
@Composable @Composable
fun DpScalePreview_1_5f() = WithFontScale(1.5f) { internal fun DpScalePreview_1_5f() = WithFontScale(1.5f) {
ElementPreviewLight { ElementPreviewLight {
val fontSizeInDp = 16.dp val fontSizeInDp = 16.dp
Column( Column(

4
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Checkbox.kt
View file

@ -51,13 +51,11 @@ fun Checkbox(
var indeterminateState by remember { mutableStateOf(indeterminate) } var indeterminateState by remember { mutableStateOf(indeterminate) }
androidx.compose.material3.TriStateCheckbox( androidx.compose.material3.TriStateCheckbox(
state = if (!checked && indeterminateState) ToggleableState.Indeterminate else ToggleableState(checked), state = if (!checked && indeterminateState) ToggleableState.Indeterminate else ToggleableState(checked),
onClick = if (onCheckedChange != null) { onClick = onCheckedChange?.let {
{ {
indeterminateState = false indeterminateState = false
onCheckedChange(!checked) onCheckedChange(!checked)
} }
} else {
null
}, },
modifier = modifier, modifier = modifier,
enabled = enabled, enabled = enabled,

7
tests/testutils/src/main/kotlin/io/element/android/tests/testutils/ReceiveTurbine.kt
View file

@ -43,15 +43,16 @@ suspend fun <T : Any> ReceiveTurbine<T>.consumeItemsUntilPredicate(
): List<T> { ): List<T> {
val items = ArrayList<T>() val items = ArrayList<T>()
tryOrNull { tryOrNull {
while (true) { var foundItemOrFinished = false
while (!foundItemOrFinished) {
when (val event = withTurbineTimeout(timeout) { awaitEvent() }) { when (val event = withTurbineTimeout(timeout) { awaitEvent() }) {
is Event.Item<T> -> { is Event.Item<T> -> {
items.add(event.value) items.add(event.value)
if (predicate(event.value)) { if (predicate(event.value)) {
break foundItemOrFinished = true
} }
} }
else -> break Event.Complete, is Event.Error -> foundItemOrFinished = true
} }
} }
} }