android: fix missing '}' issue (#487)

also run linter

Updates #cleanup

Signed-off-by: kari-ts <kari@tailscale.com>
pull/485/head
kari-ts 1 year ago committed by GitHub
parent 77eaadb360
commit 18e4b176c6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -87,48 +87,46 @@ fun TailnetLockSetupView(
subtitle = stringResource(R.string.tailnet_lock_key_explainer)) subtitle = stringResource(R.string.tailnet_lock_key_explainer))
} }
} }
}
} }
@Composable @Composable
private fun ExplainerView() { private fun ExplainerView() {
val handler = LocalUriHandler.current val handler = LocalUriHandler.current
Lists.MultilineDescription { Lists.MultilineDescription {
ClickableText( ClickableText(
explainerText(), explainerText(),
onClick = { handler.openUri(Links.TAILNET_LOCK_KB_URL) }, onClick = { handler.openUri(Links.TAILNET_LOCK_KB_URL) },
style = MaterialTheme.typography.bodyMedium style = MaterialTheme.typography.bodyMedium)
) }
}
} }
@Composable @Composable
fun explainerText(): AnnotatedString { fun explainerText(): AnnotatedString {
val annotatedString = buildAnnotatedString { return buildAnnotatedString {
withStyle(SpanStyle(color = MaterialTheme.colorScheme.defaultTextColor)) { withStyle(SpanStyle(color = MaterialTheme.colorScheme.defaultTextColor)) {
append(stringResource(id = R.string.tailnet_lock_explainer)) append(stringResource(id = R.string.tailnet_lock_explainer))
} }
pushStringAnnotation(tag = "tailnetLockSupportURL", annotation = Links.TAILNET_LOCK_KB_URL) pushStringAnnotation(tag = "tailnetLockSupportURL", annotation = Links.TAILNET_LOCK_KB_URL)
withStyle( withStyle(
style = SpanStyle( style =
SpanStyle(
color = MaterialTheme.colorScheme.link, color = MaterialTheme.colorScheme.link,
textDecoration = TextDecoration.Underline textDecoration = TextDecoration.Underline)) {
) append(stringResource(id = R.string.learn_more))
) {
append(stringResource(id = R.string.learn_more))
} }
pop() pop()
} }
return annotatedString
} }
@Composable @Composable
@Preview @Preview
fun TailnetLockSetupViewPreview() { fun TailnetLockSetupViewPreview() {
val vm = TailnetLockSetupViewModel() val vm = TailnetLockSetupViewModel()
vm.nodeKey.set("8BADF00D-EA7-1337-DEAD-BEEF") vm.nodeKey.set("8BADF00D-EA7-1337-DEAD-BEEF")
vm.tailnetLockKey.set("C0FFEE-CAFE-50DA") vm.tailnetLockKey.set("C0FFEE-CAFE-50DA")
TailnetLockSetupView(backToSettings = {}, vm) TailnetLockSetupView(backToSettings = {}, vm)
} }

Loading…
Cancel
Save