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

Simplify code (code review).

Browse source
This commit is contained in:
Benoit Marty 2023-08-22 18:10:49 +02:00
parent b363080370
commit 8c9643f8b8
1 changed files with 17 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

39
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Button.kt
View file

@ -23,6 +23,7 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.IntrinsicSize import androidx.compose.foundation.layout.IntrinsicSize
import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
@ -133,39 +134,33 @@ internal fun ButtonInternal(
ButtonSize.Large -> 48.dp ButtonSize.Large -> 48.dp
} }
val hasNoStartDrawable = !showProgress && leadingIcon == null val hasStartDrawable = showProgress || leadingIcon != null
val (paddingStart, paddingCenter, paddingEnd) = when (size) { val contentPadding = when (size) {
ButtonSize.Medium -> when (style) { ButtonSize.Medium -> when (style) {
ButtonStyle.Filled, ButtonStyle.Filled,
ButtonStyle.Outlined -> if (hasNoStartDrawable) ButtonStyle.Outlined -> if (hasStartDrawable)
Triple(24.dp, 0.dp, 24.dp) PaddingValues(start = 16.dp, top = 10.dp, end = 24.dp, bottom = 10.dp)
else else
Triple(16.dp, 8.dp, 24.dp) PaddingValues(start = 24.dp, top = 10.dp, end = 24.dp, bottom = 10.dp)
ButtonStyle.Text -> if (hasNoStartDrawable) ButtonStyle.Text -> if (hasStartDrawable)
Triple(12.dp, 0.dp, 12.dp) PaddingValues(start = 12.dp, top = 10.dp, end = 16.dp, bottom = 10.dp)
else else
Triple(12.dp, 8.dp, 16.dp) PaddingValues(start = 12.dp, top = 10.dp, end = 12.dp, bottom = 10.dp)
} }
ButtonSize.Large -> when (style) { ButtonSize.Large -> when (style) {
ButtonStyle.Filled, ButtonStyle.Filled,
ButtonStyle.Outlined -> if (hasNoStartDrawable) ButtonStyle.Outlined -> if (hasStartDrawable)
Triple(32.dp, 0.dp, 32.dp) PaddingValues(start = 24.dp, top = 13.dp, end = 32.dp, bottom = 13.dp)
else else
Triple(24.dp, 8.dp, 32.dp) PaddingValues(start = 32.dp, top = 13.dp, end = 32.dp, bottom = 13.dp)
ButtonStyle.Text -> if (hasNoStartDrawable) ButtonStyle.Text -> if (hasStartDrawable)
Triple(16.dp, 0.dp, 16.dp) PaddingValues(start = 12.dp, top = 13.dp, end = 16.dp, bottom = 13.dp)
else else
Triple(12.dp, 8.dp, 16.dp) PaddingValues(start = 16.dp, top = 13.dp, end = 16.dp, bottom = 13.dp)
} }
} }
val contentPadding = when (size) {
ButtonSize.Medium -> PaddingValues(start = paddingStart, end = paddingEnd, top = 10.dp, bottom = 10.dp)
ButtonSize.Large -> PaddingValues(start = paddingStart, end = paddingEnd, top = 13.dp, bottom = 13.dp)
}
val internalPadding = PaddingValues(start = paddingCenter)
val shape = when (style) { val shape = when (style) {
ButtonStyle.Filled, ButtonStyle.Filled,
ButtonStyle.Outlined -> RoundedCornerShape(percent = 50) ButtonStyle.Outlined -> RoundedCornerShape(percent = 50)
@ -210,6 +205,7 @@ internal fun ButtonInternal(
color = LocalContentColor.current, color = LocalContentColor.current,
strokeWidth = 2.dp, strokeWidth = 2.dp,
) )
Spacer(modifier = Modifier.width(8.dp))
} }
leadingIcon != null -> { leadingIcon != null -> {
androidx.compose.material.Icon( androidx.compose.material.Icon(
@ -218,15 +214,14 @@ internal fun ButtonInternal(
tint = LocalContentColor.current, tint = LocalContentColor.current,
modifier = Modifier.size(20.dp), modifier = Modifier.size(20.dp),
) )
Spacer(modifier = Modifier.width(8.dp))
} }
else -> Unit
} }
Text( Text(
text = text, text = text,
style = textStyle, style = textStyle,
maxLines = 1, maxLines = 1,
overflow = TextOverflow.Ellipsis, overflow = TextOverflow.Ellipsis,
modifier = Modifier.padding(internalPadding),
) )
} }
} }