mirror of https://github.com/tasks/tasks
New WelcomeScreen with consent disclosure
Alex Baker
3 days ago
parent
6361145925
commit
660e831725
@ -0,0 +1,75 @@
|
||||
package org.tasks.compose
|
||||
|
||||
import androidx.compose.material3.AlertDialog
|
||||
import androidx.compose.material3.Button
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.material3.TextButton
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.text.style.TextAlign
|
||||
import androidx.compose.ui.tooling.preview.PreviewLightDark
|
||||
import androidx.compose.ui.window.DialogProperties
|
||||
import org.tasks.R
|
||||
import org.tasks.themes.TasksTheme
|
||||
|
||||
@Composable
|
||||
fun TosUpdateDialog(
|
||||
isUpdate: Boolean,
|
||||
onAccept: () -> Unit,
|
||||
onExit: () -> Unit,
|
||||
openUrl: (String) -> Unit,
|
||||
) {
|
||||
AlertDialog(
|
||||
onDismissRequest = onExit,
|
||||
properties = DialogProperties(
|
||||
dismissOnBackPress = true,
|
||||
dismissOnClickOutside = false,
|
||||
),
|
||||
title = {
|
||||
Text(
|
||||
text = stringResource(
|
||||
if (isUpdate) R.string.tos_updated_title else R.string.terms_of_service_proper
|
||||
)
|
||||
)
|
||||
},
|
||||
text = {
|
||||
LegalDisclosure(openLegalUrl = openUrl, textAlign = TextAlign.Start)
|
||||
},
|
||||
dismissButton = {
|
||||
TextButton(onClick = onExit) {
|
||||
Text(text = stringResource(R.string.exit))
|
||||
}
|
||||
},
|
||||
confirmButton = {
|
||||
Button(onClick = onAccept) {
|
||||
Text(text = stringResource(R.string.accept))
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
@PreviewLightDark
|
||||
@Composable
|
||||
fun TosUpdateDialogPreview() {
|
||||
TasksTheme {
|
||||
TosUpdateDialog(
|
||||
isUpdate = true,
|
||||
onAccept = {},
|
||||
onExit = {},
|
||||
openUrl = {},
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@PreviewLightDark
|
||||
@Composable
|
||||
fun TosDialogPreview() {
|
||||
TasksTheme {
|
||||
TosUpdateDialog(
|
||||
isUpdate = false,
|
||||
onAccept = {},
|
||||
onExit = {},
|
||||
openUrl = {},
|
||||
)
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,237 @@
|
||||
package org.tasks.compose
|
||||
|
||||
import androidx.activity.compose.BackHandler
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.BoxWithConstraints
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.layout.widthIn
|
||||
import androidx.compose.foundation.rememberScrollState
|
||||
import androidx.compose.foundation.text.ClickableText
|
||||
import androidx.compose.foundation.verticalScroll
|
||||
import androidx.compose.material3.Button
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.OutlinedButton
|
||||
import androidx.compose.material3.Scaffold
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.material3.TextButton
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.res.painterResource
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.text.SpanStyle
|
||||
import androidx.compose.ui.text.buildAnnotatedString
|
||||
import androidx.compose.ui.text.style.TextAlign
|
||||
import androidx.compose.ui.text.style.TextDecoration
|
||||
import androidx.compose.ui.tooling.preview.PreviewFontScale
|
||||
import androidx.compose.ui.tooling.preview.PreviewLightDark
|
||||
import androidx.compose.ui.tooling.preview.PreviewScreenSizes
|
||||
import androidx.compose.ui.unit.dp
|
||||
import org.tasks.R
|
||||
import org.tasks.themes.TasksTheme
|
||||
|
||||
@Composable
|
||||
fun WelcomeScreen(
|
||||
onBack: () -> Unit,
|
||||
onSignIn: () -> Unit,
|
||||
onContinueWithoutSync: () -> Unit,
|
||||
onImportBackup: () -> Unit,
|
||||
openLegalUrl: (String) -> Unit,
|
||||
) {
|
||||
BackHandler(onBack = onBack)
|
||||
Scaffold { paddingValues ->
|
||||
BoxWithConstraints(
|
||||
modifier = Modifier
|
||||
.padding(paddingValues)
|
||||
.fillMaxSize()
|
||||
) {
|
||||
val isCompact = maxHeight < 500.dp
|
||||
if (isCompact) {
|
||||
Row(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.padding(24.dp),
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.spacedBy(24.dp),
|
||||
) {
|
||||
Box(
|
||||
modifier = Modifier.weight(1f),
|
||||
contentAlignment = Alignment.Center,
|
||||
) {
|
||||
Icon(
|
||||
painter = painterResource(id = R.drawable.ic_round_icon),
|
||||
contentDescription = stringResource(R.string.tasks_org),
|
||||
tint = Color.Unspecified,
|
||||
modifier = Modifier.size(120.dp)
|
||||
)
|
||||
}
|
||||
WelcomeContent(
|
||||
onSignIn = onSignIn,
|
||||
onContinueWithoutSync = onContinueWithoutSync,
|
||||
onImportBackup = onImportBackup,
|
||||
openLegalUrl = openLegalUrl,
|
||||
modifier = Modifier
|
||||
.weight(1f)
|
||||
.verticalScroll(rememberScrollState()),
|
||||
)
|
||||
}
|
||||
} else {
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.padding(32.dp),
|
||||
horizontalAlignment = Alignment.CenterHorizontally,
|
||||
verticalArrangement = Arrangement.Center,
|
||||
) {
|
||||
Spacer(modifier = Modifier.weight(1f))
|
||||
Icon(
|
||||
painter = painterResource(id = R.drawable.ic_round_icon),
|
||||
contentDescription = stringResource(R.string.tasks_org),
|
||||
tint = Color.Unspecified,
|
||||
modifier = Modifier.size(152.dp)
|
||||
)
|
||||
Spacer(modifier = Modifier.weight(1f))
|
||||
WelcomeContent(
|
||||
onSignIn = onSignIn,
|
||||
onContinueWithoutSync = onContinueWithoutSync,
|
||||
onImportBackup = onImportBackup,
|
||||
openLegalUrl = openLegalUrl,
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun WelcomeContent(
|
||||
onSignIn: () -> Unit,
|
||||
onContinueWithoutSync: () -> Unit,
|
||||
onImportBackup: () -> Unit,
|
||||
openLegalUrl: (String) -> Unit,
|
||||
modifier: Modifier = Modifier,
|
||||
) {
|
||||
val buttonModifier = Modifier
|
||||
.widthIn(max = 400.dp)
|
||||
.fillMaxWidth()
|
||||
|
||||
Column(
|
||||
modifier = modifier,
|
||||
horizontalAlignment = Alignment.CenterHorizontally,
|
||||
) {
|
||||
LegalDisclosure(
|
||||
openLegalUrl = openLegalUrl,
|
||||
modifier = Modifier.widthIn(max = 400.dp),
|
||||
)
|
||||
|
||||
Spacer(modifier = Modifier.height(16.dp))
|
||||
|
||||
Button(
|
||||
onClick = onSignIn,
|
||||
modifier = buttonModifier
|
||||
) {
|
||||
Text(text = stringResource(R.string.add_account))
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.height(8.dp))
|
||||
|
||||
OutlinedButton(
|
||||
onClick = onContinueWithoutSync,
|
||||
modifier = buttonModifier
|
||||
) {
|
||||
Text(text = stringResource(R.string.continue_without_sync))
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.height(24.dp))
|
||||
|
||||
Text(
|
||||
text = stringResource(R.string.returning_user),
|
||||
style = MaterialTheme.typography.bodyMedium,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||
)
|
||||
|
||||
TextButton(onClick = onImportBackup) {
|
||||
Text(text = stringResource(R.string.backup_BAc_import))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
internal fun LegalDisclosure(
|
||||
openLegalUrl: (String) -> Unit,
|
||||
modifier: Modifier = Modifier,
|
||||
textAlign: TextAlign = TextAlign.Center,
|
||||
) {
|
||||
val bodyStyle = MaterialTheme.typography.bodySmall.copy(
|
||||
textAlign = textAlign,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||
)
|
||||
val linkStyle = SpanStyle(
|
||||
color = MaterialTheme.colorScheme.primary,
|
||||
textDecoration = TextDecoration.Underline,
|
||||
)
|
||||
val tosText = stringResource(R.string.terms_of_service_proper)
|
||||
val privacyText = stringResource(R.string.privacy_policy_proper)
|
||||
val licenseText = stringResource(R.string.gplv3_license)
|
||||
val template = stringResource(R.string.legal_disclosure)
|
||||
val formatted = String.format(template, tosText, privacyText, licenseText)
|
||||
|
||||
val tosStart = formatted.indexOf(tosText)
|
||||
val tosEnd = tosStart + tosText.length
|
||||
val privacyStart = formatted.indexOf(privacyText)
|
||||
val privacyEnd = privacyStart + privacyText.length
|
||||
val licenseStart = formatted.indexOf(licenseText)
|
||||
val licenseEnd = licenseStart + licenseText.length
|
||||
|
||||
val tosUrl = stringResource(R.string.url_tos)
|
||||
val privacyUrl = stringResource(R.string.url_privacy_policy)
|
||||
val licenseUrl = stringResource(R.string.url_license)
|
||||
|
||||
val annotatedText = buildAnnotatedString {
|
||||
append(formatted)
|
||||
addStyle(linkStyle, tosStart, tosEnd)
|
||||
addStringAnnotation(tag = "url", annotation = tosUrl, start = tosStart, end = tosEnd)
|
||||
addStyle(linkStyle, privacyStart, privacyEnd)
|
||||
addStringAnnotation(tag = "url", annotation = privacyUrl, start = privacyStart, end = privacyEnd)
|
||||
addStyle(linkStyle, licenseStart, licenseEnd)
|
||||
addStringAnnotation(tag = "url", annotation = licenseUrl, start = licenseStart, end = licenseEnd)
|
||||
}
|
||||
|
||||
ClickableText(
|
||||
text = annotatedText,
|
||||
style = bodyStyle,
|
||||
modifier = modifier,
|
||||
onClick = { offset ->
|
||||
annotatedText.getStringAnnotations(tag = "url", start = offset, end = offset)
|
||||
.firstOrNull()
|
||||
?.let { openLegalUrl(it.item) }
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
@PreviewLightDark
|
||||
@PreviewScreenSizes
|
||||
@PreviewFontScale
|
||||
@Composable
|
||||
fun WelcomeScreenPreview() {
|
||||
TasksTheme {
|
||||
WelcomeScreen(
|
||||
onBack = {},
|
||||
onSignIn = {},
|
||||
onContinueWithoutSync = {},
|
||||
onImportBackup = {},
|
||||
openLegalUrl = {},
|
||||
)
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue