Skip to content

Commit

Permalink
feat: reduce the Textfields min width to allow them to be side by sid…
Browse files Browse the repository at this point in the history 
…es (#1392)

Co-authored-by: spark-ui-bot <spark-ui-bot@users.noreply.github.com>
  • Loading branch information
@soulcramer @spark-ui-bot
soulcramer and spark-ui-bot authored Dec 4, 2024
1 parent 16065dc commit 6ca9d40
Show file tree
Hide file tree
Showing 29 changed files with 87 additions and 230 deletions.
206 changes: 34 additions & 172 deletions ...hot-testing/src/test/kotlin/com/adevinta/spark/textfields/MultilineTextFieldScreenshot.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,8 @@ import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.interaction.PressInteraction
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ExperimentalLayoutApi
import androidx.compose.foundation.layout.FlowColumn
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.widthIn
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.geometry.Offset
Expand All @@ -49,9 +46,8 @@ import com.adevinta.spark.icons.LikeFill
import com.adevinta.spark.icons.SparkIcon
import com.adevinta.spark.icons.SparkIcons
import com.adevinta.spark.paparazziRule
import com.adevinta.spark.sparkSnapshot
import com.adevinta.spark.sparkSnapshotNightMode
import com.android.ide.common.rendering.api.SessionParams.RenderingMode.SHRINK
import com.android.ide.common.rendering.api.SessionParams.RenderingMode.H_SCROLL
import kotlinx.coroutines.flow.flowOf
import org.junit.Rule
import org.junit.Test
Expand All @@ -65,7 +61,7 @@ internal class MultilineTextFieldScreenshot {
@get:Rule
val paparazzi = paparazziRule(
deviceConfig = DefaultTestDevices.Tablet,
renderingMode = SHRINK,
renderingMode = H_SCROLL,
)

@Test
Expand All @@ -92,10 +88,39 @@ internal class MultilineTextFieldScreenshot {
}
}

@Test
fun showcase_disabled() {
paparazzi.sparkSnapshotNightMode {
Row {
ShowcasedMultilineTextfield(
state = null,
stateMessage = "Helper text",
enabled = false,
)
ShowcasedMultilineTextfield(
state = TextFieldState.Error,
stateMessage = "Error text",
enabled = false,
)
ShowcasedMultilineTextfield(
state = TextFieldState.Alert,
stateMessage = "Alert text",
enabled = false,
)
ShowcasedMultilineTextfield(
state = TextFieldState.Success,
stateMessage = "Success text",
enabled = false,
)
}
}
}

@Composable
private fun ShowcasedMultilineTextfield(
state: TextFieldState?,
stateMessage: String?,
enabled: Boolean = true,
) {
Column(
modifier = Modifier.padding(8.dp),
Expand All @@ -115,7 +140,7 @@ internal class MultilineTextFieldScreenshot {
value = "Input",
onValueChange = {},
onCancelClick = {},
enabled = true,
enabled = enabled,
state = state,
stateMessage = stateMessage,
required = true,
Expand All @@ -133,7 +158,7 @@ internal class MultilineTextFieldScreenshot {
value = "",
onValueChange = {},
onCancelClick = {},
enabled = true,
enabled = enabled,
state = state,
stateMessage = stateMessage,
required = true,
Expand All @@ -153,7 +178,7 @@ internal class MultilineTextFieldScreenshot {
value = "",
onValueChange = {},
onCancelClick = {},
enabled = true,
enabled = enabled,
state = state,
stateMessage = stateMessage,
required = true,
Expand All @@ -166,170 +191,7 @@ internal class MultilineTextFieldScreenshot {
}
}

@OptIn(ExperimentalLayoutApi::class)
@Test
fun bigValue() {
paparazzi.sparkSnapshot {
FlowColumn(
modifier = Modifier.padding(8.dp),
verticalArrangement = Arrangement.spacedBy(8.dp),
horizontalArrangement = Arrangement.spacedBy(8.dp),
) {
icons.forEach { icon ->
TextFields(
modifier = Modifier.widthIn(max = 400.dp),
icon = icon,
value = stubBody,
enabled = true,
)
}
}
}
}

@OptIn(ExperimentalLayoutApi::class)
@Test
fun smallValue() {
paparazzi.sparkSnapshot {
FlowColumn(
modifier = Modifier.padding(8.dp),
verticalArrangement = Arrangement.spacedBy(8.dp),
horizontalArrangement = Arrangement.spacedBy(8.dp),
) {
icons.forEach { icon ->
helpers.forEach { helper ->
TextFields(
icon = icon,
value = stubShortBody,
enabled = true,
helper = helper,
)
}
}
}
}
}

@OptIn(ExperimentalLayoutApi::class)
@Test
fun enabled() {
paparazzi.sparkSnapshot {
FlowColumn(
modifier = Modifier.padding(8.dp),
verticalArrangement = Arrangement.spacedBy(8.dp),
horizontalArrangement = Arrangement.spacedBy(8.dp),
) {
icons.forEach { icon ->
helpers.forEach { helper ->
TextFields(
icon = icon,
enabled = true,
helper = helper,
)
}
}
}
}
}

@OptIn(ExperimentalLayoutApi::class)
@Test
fun disabled() {
paparazzi.sparkSnapshot {
FlowColumn(
modifier = Modifier.padding(8.dp),
verticalArrangement = Arrangement.spacedBy(8.dp),
horizontalArrangement = Arrangement.spacedBy(8.dp),
) {
icons.forEach { icon ->
helpers.forEach { helper ->
TextFields(
icon = icon,
enabled = false,
helper = helper,
)
}
}
}
}
}

@Composable
private fun TextFields(
modifier: Modifier = Modifier,
icon: SparkIcon?,
value: String = "",
enabled: Boolean,
helper: String? = null,
) {
val leadingContent: (@Composable AddonScope.() -> Unit)? = icon?.let {
@Composable {
Icon(icon, contentDescription = null)
}
}
Column(
verticalArrangement = Arrangement.spacedBy(8.dp),
) {
MultilineTextField(
modifier = modifier,
value = value,
onValueChange = {},
onCancelClick = {},
label = "Label",
leadingContent = leadingContent,
required = true,
enabled = enabled,
stateMessage = "short state message for textfield",
helper = helper,
minLines = 2,
)
MultilineTextField(
modifier = modifier,
value = value,
onValueChange = {},
onCancelClick = {},
label = "Label",
leadingContent = leadingContent,
state = TextFieldState.Error,
required = true,
enabled = enabled,
stateMessage = "short state message for textfield",
helper = helper,
minLines = 2,
)
MultilineTextField(
modifier = modifier,
value = value,
onValueChange = {},
onCancelClick = {},
label = "Label",
leadingContent = leadingContent,
state = TextFieldState.Alert,
required = true,
enabled = enabled,
stateMessage = "short state message for textfield",
helper = helper,
minLines = 2,
)
MultilineTextField(
modifier = modifier,
value = value,
onValueChange = {},
onCancelClick = {},
label = "Label",
leadingContent = leadingContent,
state = TextFieldState.Success,
required = true,
enabled = enabled,
stateMessage = "short state message for textfield",
helper = helper,
minLines = 2,
)
}
}

companion object {
private const val stubShortBody = "Lorem ipsum"
private const val stubBody = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi lacus dolor, " +
"pulvinar eu nulla sit amet, iaculis interdum."
}
Expand Down
11 changes: 6 additions & 5 deletions ...creenshot-testing/src/test/kotlin/com/adevinta/spark/textfields/TextFieldDocScreenshot.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ import com.adevinta.spark.icons.LikeFill
import com.adevinta.spark.icons.SparkIcons
import com.adevinta.spark.paparazziRule
import com.adevinta.spark.sparkSnapshotNightMode
import com.android.ide.common.rendering.api.SessionParams.RenderingMode.SHRINK
import com.android.ide.common.rendering.api.SessionParams.RenderingMode.H_SCROLL
import kotlinx.coroutines.flow.flowOf
import org.junit.Rule
import org.junit.Test
Expand All @@ -58,7 +58,7 @@ internal class TextFieldDocScreenshot {
@get:Rule
val paparazzi = paparazziRule(
deviceConfig = DefaultTestDevices.Tablet,
renderingMode = SHRINK,
renderingMode = H_SCROLL,
)

@Test
Expand Down Expand Up @@ -137,6 +137,7 @@ internal class TextFieldDocScreenshot {
private fun Textfields(
state: TextFieldState?,
stateMessage: String?,
enabled: Boolean = true,
) {
Column(
modifier = Modifier.padding(8.dp),
Expand All @@ -155,7 +156,7 @@ internal class TextFieldDocScreenshot {
TextField(
value = "Input",
onValueChange = {},
enabled = true,
enabled = enabled,
state = state,
stateMessage = stateMessage,
required = true,
Expand All @@ -171,7 +172,7 @@ internal class TextFieldDocScreenshot {
TextField(
value = "",
onValueChange = {},
enabled = true,
enabled = enabled,
state = state,
stateMessage = stateMessage,
required = true,
Expand All @@ -191,7 +192,7 @@ internal class TextFieldDocScreenshot {
TextField(
value = "",
onValueChange = {},
enabled = true,
enabled = enabled,
state = state,
stateMessage = stateMessage,
required = true,
Expand Down
4 changes: 2 additions & 2 deletions ...k-screenshot-testing/src/test/kotlin/com/adevinta/spark/textfields/TextFieldScreenshot.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ import com.adevinta.spark.icons.SparkIcon
import com.adevinta.spark.icons.SparkIcons
import com.adevinta.spark.paparazziRule
import com.adevinta.spark.sparkSnapshot
import com.android.ide.common.rendering.api.SessionParams.RenderingMode.SHRINK
import com.android.ide.common.rendering.api.SessionParams.RenderingMode.H_SCROLL
import org.junit.Rule
import org.junit.Test

Expand All @@ -54,7 +54,7 @@ internal class TextFieldScreenshot {
@get:Rule
val paparazzi = paparazziRule(
deviceConfig = DefaultTestDevices.Tablet,
renderingMode = SHRINK,
renderingMode = H_SCROLL,
)

@OptIn(ExperimentalLayoutApi::class)
Expand Down
4 changes: 2 additions & 2 deletions ...m.adevinta.spark.snackbar_SnackbarDocScreenshot_snackbarDocScreenshot__dark.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions ....adevinta.spark.snackbar_SnackbarDocScreenshot_snackbarDocScreenshot__light.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions ...vinta.spark.snackbar_SnackbarScreenshot_snackbarIntentsFilledShowcase__dark.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions ...inta.spark.snackbar_SnackbarScreenshot_snackbarIntentsFilledShowcase__light.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions ...vinta.spark.snackbar_SnackbarScreenshot_snackbarIntentsTintedShowcase__dark.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions ...inta.spark.snackbar_SnackbarScreenshot_snackbarIntentsTintedShowcase__light.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions .../snapshots/images/com.adevinta.spark.textfields_DropdownScreenshot_expanded.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 0 additions & 3 deletions .../images/com.adevinta.spark.textfields_MultilineTextFieldScreenshot_bigValue.png
View file

This file was deleted.

3 changes: 0 additions & 3 deletions .../images/com.adevinta.spark.textfields_MultilineTextFieldScreenshot_disabled.png
View file

This file was deleted.

3 changes: 0 additions & 3 deletions ...s/images/com.adevinta.spark.textfields_MultilineTextFieldScreenshot_enabled.png
View file

This file was deleted.

Loading

0 comments on commit 6ca9d40

Please sign in to comment.