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

Rename val for clarity.

Browse source
This commit is contained in:
Benoit Marty 2024-07-17 18:42:15 +02:00
parent 7d14870da6
commit 685f43374d
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/button/SuperButton.kt
View file

@ -53,7 +53,7 @@ import io.element.android.libraries.designsystem.preview.ElementPreview
import io.element.android.libraries.designsystem.preview.PreviewsDayNight import io.element.android.libraries.designsystem.preview.PreviewsDayNight
import io.element.android.libraries.designsystem.theme.components.ButtonSize import io.element.android.libraries.designsystem.theme.components.ButtonSize
import io.element.android.libraries.designsystem.theme.components.HorizontalDivider import io.element.android.libraries.designsystem.theme.components.HorizontalDivider
import io.element.android.libraries.designsystem.theme.components.lowPaddingValue import io.element.android.libraries.designsystem.theme.components.lowHorizontalPaddingValue
@OptIn(CoreColorToken::class) @OptIn(CoreColorToken::class)
@Composable @Composable
@ -68,9 +68,9 @@ fun SuperButton(
val contentPadding = remember(buttonSize) { val contentPadding = remember(buttonSize) {
when (buttonSize) { when (buttonSize) {
ButtonSize.Large -> PaddingValues(horizontal = 24.dp, vertical = 13.dp) ButtonSize.Large -> PaddingValues(horizontal = 24.dp, vertical = 13.dp)
ButtonSize.LargeLowPadding -> PaddingValues(horizontal = lowPaddingValue, vertical = 13.dp) ButtonSize.LargeLowPadding -> PaddingValues(horizontal = lowHorizontalPaddingValue, vertical = 13.dp)
ButtonSize.Medium -> PaddingValues(horizontal = 20.dp, vertical = 9.dp) ButtonSize.Medium -> PaddingValues(horizontal = 20.dp, vertical = 9.dp)
ButtonSize.MediumLowPadding -> PaddingValues(horizontal = lowPaddingValue, vertical = 9.dp) ButtonSize.MediumLowPadding -> PaddingValues(horizontal = lowHorizontalPaddingValue, vertical = 9.dp)
ButtonSize.Small -> PaddingValues(horizontal = 16.dp, vertical = 5.dp) ButtonSize.Small -> PaddingValues(horizontal = 16.dp, vertical = 5.dp)
} }
} }

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

@ -59,7 +59,7 @@ import io.element.android.libraries.designsystem.preview.PreviewGroup
// Designs: https://www.figma.com/file/G1xy0HDZKJf5TCRFmKb5d5/Compound-Android-Components?type=design&mode=design&t=U03tOFZz5FSLVUMa-1 // Designs: https://www.figma.com/file/G1xy0HDZKJf5TCRFmKb5d5/Compound-Android-Components?type=design&mode=design&t=U03tOFZz5FSLVUMa-1
// Horizontal padding for button with low padding // Horizontal padding for button with low padding
internal val lowPaddingValue = 4.dp internal val lowHorizontalPaddingValue = 4.dp
@Composable @Composable
fun Button( fun Button(
@ -171,7 +171,7 @@ private fun ButtonInternal(
PaddingValues(start = 12.dp, top = 10.dp, end = 12.dp, bottom = 10.dp) PaddingValues(start = 12.dp, top = 10.dp, end = 12.dp, bottom = 10.dp)
} }
} }
ButtonSize.MediumLowPadding -> PaddingValues(horizontal = lowPaddingValue, vertical = 10.dp) ButtonSize.MediumLowPadding -> PaddingValues(horizontal = lowHorizontalPaddingValue, vertical = 10.dp)
ButtonSize.Large -> when (style) { ButtonSize.Large -> when (style) {
ButtonStyle.Filled, ButtonStyle.Filled,
ButtonStyle.Outlined -> if (hasStartDrawable) { ButtonStyle.Outlined -> if (hasStartDrawable) {
@ -185,7 +185,7 @@ private fun ButtonInternal(
PaddingValues(start = 16.dp, top = 13.dp, end = 16.dp, bottom = 13.dp) PaddingValues(start = 16.dp, top = 13.dp, end = 16.dp, bottom = 13.dp)
} }
} }
ButtonSize.LargeLowPadding -> PaddingValues(horizontal = lowPaddingValue, vertical = 13.dp) ButtonSize.LargeLowPadding -> PaddingValues(horizontal = lowHorizontalPaddingValue, vertical = 13.dp)
} }
val shape = when (style) { val shape = when (style) {