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 @@ -231,13 +231,17 @@ fun FlowComponentView(
) {
val resolver = signInState.templateResolver
when {
component.type == "DIVIDER" -> DividerRow(component = component, resolver = resolver, modifier = modifier)
component.type == "DIVIDER" -> {
DividerRow(component = component, resolver = resolver, modifier = modifier)
}

component.type == "RICH_TEXT" -> {
val html = resolver?.resolve(component.label) ?: component.label ?: ""
if (html.isNotBlank()) {
RichTextView(html = html, modifier = modifier)
}
}

component.type == "TEXT" -> {
val text = resolver?.resolve(component.label) ?: component.label ?: ""
if (text.isNotBlank()) {
Expand All @@ -254,6 +258,7 @@ fun FlowComponentView(
)
}
}

component.type == "BLOCK" -> {
Column(modifier = modifier, verticalArrangement = Arrangement.spacedBy(12.dp)) {
component.components?.forEach { child ->
Expand All @@ -266,13 +271,18 @@ fun FlowComponentView(
}
}
}

component.type == "ACTION" -> {
ActionComponentView(component = component, signInState = signInState, i18n = i18n, modifier = modifier)
}

component.type?.endsWith("_INPUT") == true -> {
FieldComponentView(component = component, signInState = signInState, modifier = modifier)
}
else -> Unit

else -> {
Unit
}
}
}

Expand Down Expand Up @@ -329,27 +339,32 @@ private fun ActionComponentView(

if (isTrigger) {
when {
identity.contains("google") ->
identity.contains("google") -> {
GoogleButton(
label = label,
isLoading = signInState.isLoading,
onClick = { signInState.submit(actionId) },
modifier = taggedModifier,
)
identity.contains("github") ->
}

identity.contains("github") -> {
GitHubButton(
label = label,
isLoading = signInState.isLoading,
onClick = { signInState.submit(actionId) },
modifier = taggedModifier,
)
else ->
}

else -> {
OutlinedTriggerButton(
label = label,
isLoading = signInState.isLoading,
onClick = { signInState.submit(actionId) },
modifier = taggedModifier,
)
}
}
} else {
Button(
Expand Down Expand Up @@ -491,7 +506,7 @@ fun BaseSignIn(
val metaMap = thunderState.client.getFlowMeta(applicationId)
signInState.templateResolver = FlowTemplateResolver(metaMap)
} catch (e: Exception) {
android.util.Log.w("SignInFlow", "Flow meta fetch failed", e)
android.util.Log.w("SignInFlow", "Flow meta fetch failed (${diagnosticLabel(e)})")
}
} catch (e: Exception) {
android.util.Log.e("SignInFlow", "Sign-in initiation failed (${diagnosticLabel(e)})")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ package dev.thunderid.compose.i18n
*
* Any unrecognized expression is left unchanged.
*/
class FlowTemplateResolver(private val meta: Map<String, Any?>) {
class FlowTemplateResolver(
private val meta: Map<String, Any?>,
) {
companion object {
private val TEMPLATE_REGEX = Regex("\\{\\{\\s*(.*?)\\s*\\}\\}")
}
Expand Down
Loading