Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import androidx.compose.foundation.text.BasicText
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.semantics.contentDescription
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.unit.dp
Expand All @@ -34,11 +35,12 @@ import dev.thunderid.compose.LocalThunderID
@Composable
fun SignInButton(
modifier: Modifier = Modifier,
testTag: String? = null,
onTap: (() -> Unit)? = null,
) {
val state = LocalThunderID.current
val label = state.i18n.resolve("signIn.button")
BaseSignInButton(label = label, isLoading = state.isLoading, modifier = modifier) {
BaseSignInButton(label = label, isLoading = state.isLoading, modifier = modifier, testTag = testTag) {
onTap?.invoke()
}
}
Expand All @@ -49,13 +51,15 @@ fun BaseSignInButton(
label: String,
isLoading: Boolean = false,
modifier: Modifier = Modifier,
testTag: String? = null,
onClick: () -> Unit,
) {
Box(
contentAlignment = Alignment.Center,
modifier =
modifier
.defaultMinSize(minWidth = 44.dp, minHeight = 44.dp)
.then(if (testTag != null) Modifier.testTag(testTag) else Modifier)
.semantics { contentDescription = label }
.then(if (!isLoading) Modifier.clickable(onClick = onClick) else Modifier),
) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.semantics.contentDescription
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.text.input.KeyboardType
Expand Down Expand Up @@ -110,7 +111,11 @@ fun SignIn(
OutlinedTextField(
value = signInState.fieldValue(input.name),
onValueChange = { signInState.setField(input.name, it) },
modifier = Modifier.fillMaxWidth().semantics { contentDescription = input.name },
modifier =
Modifier
.fillMaxWidth()
.testTag("thunderid-field-${input.name}")
.semantics { contentDescription = input.name },
placeholder = { Text(input.name) },
visualTransformation =
if (isPassword) PasswordVisualTransformation() else VisualTransformation.None,
Expand All @@ -123,7 +128,7 @@ fun SignIn(
Button(
onClick = { signInState.submit(action.id ?: action.ref ?: "") },
enabled = !signInState.isLoading,
modifier = Modifier.fillMaxWidth(),
modifier = Modifier.fillMaxWidth().testTag("thunderid-action-${action.id ?: action.ref}"),
) {
Text(action.label ?: i18n.resolve("signIn.submit"))
}
Expand Down
Loading