Skip to content

Commit d8112bb

Browse files
LaurentTreguierLaurentTreguier
committed
Require accepting terms and privacy policy
1 parent c32ea80 commit d8112bb

File tree

9 files changed

+96
-30
lines changed

9 files changed

+96
-30
lines changed

‎app/src/main/kotlin/app/fyreplace/fyreplace/fakes/api/FakeUsersEndpointApi.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ class FakeUsersEndpointApi : UsersEndpointApi {
7575
const val PASSWORD_USERNAME = "password-username"
7676
const val GOOD_USERNAME = "good-username"
7777

78-
const val BAD_EMAIL = "bad-email"
79-
const val USED_EMAIL = "used-email"
80-
const val GOOD_EMAIL = "good-email"
78+
const val BAD_EMAIL = "bad@email"
79+
const val USED_EMAIL = "used@email"
80+
const val GOOD_EMAIL = "good@email"
8181

8282
val NOT_IMAGE_FILE = File("text.txt")
8383
val LARGE_IMAGE_FILE = File("large.png")

‎app/src/main/kotlin/app/fyreplace/fyreplace/ui/screens/LoginScreen.kt

+5-4
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ fun SharedTransitionScope.LoginScreen(
7676
modifier = Modifier
7777
.verticalScroll(rememberScrollState())
7878
.fillMaxWidth()
79-
.padding(horizontal = dimensionResource(R.dimen.spacing_medium))
79+
.padding(horizontal = dimensionResource(R.dimen.spacing_large))
8080
.imePadding()
8181
) {
8282
Logo(
@@ -101,11 +101,12 @@ fun SharedTransitionScope.LoginScreen(
101101
)
102102
}
103103

104-
val textFieldModifier = Modifier
104+
val fieldModifier = Modifier
105105
.widthIn(
106106
dimensionResource(R.dimen.form_min_width),
107107
dimensionResource(R.dimen.form_max_width)
108108
)
109+
.fillMaxWidth()
109110
.padding(bottom = dimensionResource(R.dimen.spacing_large))
110111

111112
OutlinedTextField(
@@ -127,7 +128,7 @@ fun SharedTransitionScope.LoginScreen(
127128
}
128129
}),
129130
onValueChange = viewModel::updateIdentifier,
130-
modifier = textFieldModifier
131+
modifier = fieldModifier
131132
.focusRequester(identifierFocus)
132133
.sharedElement(
133134
rememberSharedContentState(key = "first-field"),
@@ -139,7 +140,7 @@ fun SharedTransitionScope.LoginScreen(
139140
RandomCodeInput(
140141
randomCode = randomCode,
141142
onValueChange = viewModel::updateRandomCode,
142-
modifier = textFieldModifier
143+
modifier = fieldModifier
143144
)
144145
}
145146

‎app/src/main/kotlin/app/fyreplace/fyreplace/ui/screens/RegisterScreen.kt

+56-5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import androidx.compose.animation.SharedTransitionScope
88
import androidx.compose.foundation.layout.Arrangement
99
import androidx.compose.foundation.layout.Box
1010
import androidx.compose.foundation.layout.Column
11+
import androidx.compose.foundation.layout.Row
1112
import androidx.compose.foundation.layout.fillMaxWidth
1213
import androidx.compose.foundation.layout.imePadding
1314
import androidx.compose.foundation.layout.padding
@@ -16,8 +17,10 @@ import androidx.compose.foundation.rememberScrollState
1617
import androidx.compose.foundation.text.KeyboardActions
1718
import androidx.compose.foundation.text.KeyboardOptions
1819
import androidx.compose.foundation.verticalScroll
20+
import androidx.compose.material3.Checkbox
1921
import androidx.compose.material3.OutlinedTextField
2022
import androidx.compose.material3.Text
23+
import androidx.compose.material3.TextButton
2124
import androidx.compose.runtime.Composable
2225
import androidx.compose.runtime.LaunchedEffect
2326
import androidx.compose.runtime.getValue
@@ -29,11 +32,15 @@ import androidx.compose.ui.focus.focusProperties
2932
import androidx.compose.ui.focus.focusRequester
3033
import androidx.compose.ui.platform.LocalContext
3134
import androidx.compose.ui.platform.LocalSoftwareKeyboardController
35+
import androidx.compose.ui.platform.LocalUriHandler
3236
import androidx.compose.ui.res.dimensionResource
3337
import androidx.compose.ui.res.stringResource
38+
import androidx.compose.ui.text.LinkAnnotation
39+
import androidx.compose.ui.text.buildAnnotatedString
3440
import androidx.compose.ui.text.input.ImeAction
3541
import androidx.compose.ui.text.input.KeyboardCapitalization
3642
import androidx.compose.ui.text.input.KeyboardType
43+
import androidx.compose.ui.text.withLink
3744
import androidx.compose.ui.tooling.preview.Preview
3845
import androidx.hilt.navigation.compose.hiltViewModel
3946
import androidx.lifecycle.SavedStateHandle
@@ -66,6 +73,7 @@ fun SharedTransitionScope.RegisterScreen(
6673
val environment by environmentViewModel.environment.collectAsStateWithLifecycle()
6774
val username by viewModel.username.collectAsStateWithLifecycle()
6875
val email by viewModel.email.collectAsStateWithLifecycle()
76+
val hasAcceptedTerms by viewModel.hasAcceptedTerms.collectAsStateWithLifecycle()
6977
val randomCode by viewModel.randomCode.collectAsStateWithLifecycle()
7078
val isWaitingForRandomCode by viewModel.isWaitingForRandomCode.collectAsStateWithLifecycle()
7179
val canSubmit by viewModel.canSubmit.collectAsStateWithLifecycle()
@@ -80,7 +88,7 @@ fun SharedTransitionScope.RegisterScreen(
8088
modifier = Modifier
8189
.verticalScroll(rememberScrollState())
8290
.fillMaxWidth()
83-
.padding(horizontal = dimensionResource(R.dimen.spacing_medium))
91+
.padding(horizontal = dimensionResource(R.dimen.spacing_large))
8492
.imePadding()
8593
) {
8694
Logo(
@@ -105,11 +113,12 @@ fun SharedTransitionScope.RegisterScreen(
105113
)
106114
}
107115

108-
val textFieldModifier = Modifier
116+
val fieldModifier = Modifier
109117
.widthIn(
110118
dimensionResource(R.dimen.form_min_width),
111119
dimensionResource(R.dimen.form_max_width)
112120
)
121+
.fillMaxWidth()
113122
.padding(bottom = dimensionResource(R.dimen.spacing_large))
114123

115124
OutlinedTextField(
@@ -124,7 +133,7 @@ fun SharedTransitionScope.RegisterScreen(
124133
imeAction = ImeAction.Next
125134
),
126135
onValueChange = viewModel::updateUsername,
127-
modifier = textFieldModifier
136+
modifier = fieldModifier
128137
.focusRequester(usernameFocus)
129138
.focusProperties { next = emailFocus }
130139
.sharedElement(
@@ -153,17 +162,59 @@ fun SharedTransitionScope.RegisterScreen(
153162
}
154163
}),
155164
onValueChange = viewModel::updateEmail,
156-
modifier = textFieldModifier.focusRequester(emailFocus)
165+
modifier = fieldModifier.focusRequester(emailFocus)
157166
)
158167

159168
AnimatedVisibility(isWaitingForRandomCode) {
160169
RandomCodeInput(
161170
randomCode = randomCode,
162171
onValueChange = viewModel::updateRandomCode,
163-
modifier = textFieldModifier
172+
modifier = fieldModifier
173+
)
174+
}
175+
176+
Row(
177+
verticalAlignment = Alignment.CenterVertically,
178+
modifier = fieldModifier
179+
) {
180+
Checkbox(
181+
checked = hasAcceptedTerms,
182+
enabled = !isWaitingForRandomCode,
183+
onCheckedChange = viewModel::updateHasAcceptedTerms
184+
)
185+
186+
Text(
187+
text = buildAnnotatedString {
188+
withLink(LinkAnnotation.Clickable("terms") {
189+
viewModel.updateHasAcceptedTerms(!hasAcceptedTerms)
190+
}) {
191+
append(stringResource(R.string.register_terms_acceptance))
192+
}
193+
},
194+
modifier = Modifier.focusProperties { canFocus = false }
164195
)
165196
}
166197

198+
Row(
199+
horizontalArrangement = Arrangement.spacedBy(
200+
space = dimensionResource(R.dimen.spacing_small),
201+
alignment = Alignment.CenterHorizontally
202+
),
203+
modifier = fieldModifier
204+
) {
205+
val uriHandler = LocalUriHandler.current
206+
val termsUri = stringResource(R.string.info_url_terms_of_service)
207+
val privacyUri = stringResource(R.string.info_url_privacy_policy)
208+
209+
TextButton(onClick = { uriHandler.openUri(termsUri) }) {
210+
Text(stringResource(R.string.register_terms_of_service))
211+
}
212+
213+
TextButton(onClick = { uriHandler.openUri(privacyUri) }) {
214+
Text(stringResource(R.string.register_privacy_policy))
215+
}
216+
}
217+
167218
SubmitOrCancel(
168219
submitLabel = stringResource(R.string.register_submit),
169220
canSubmit = canSubmit,

‎app/src/main/kotlin/app/fyreplace/fyreplace/ui/views/account/EnvironmentSelector.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ private fun SelectorDialog(
8787
onClick = onClick
8888
)
8989
Text(
90-
buildAnnotatedString {
90+
text = buildAnnotatedString {
9191
withLink(LinkAnnotation.Clickable("name") { onClick() }) {
9292
append(name(env))
9393

‎app/src/main/kotlin/app/fyreplace/fyreplace/viewmodels/screens/LoginViewModel.kt

+3-6
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import dagger.hilt.android.lifecycle.HiltViewModel
1616
import kotlinx.coroutines.flow.StateFlow
1717
import kotlinx.coroutines.flow.first
1818
import kotlinx.coroutines.flow.map
19+
import kotlinx.coroutines.flow.onStart
1920
import kotlinx.coroutines.launch
2021
import javax.inject.Inject
2122
import kotlin.math.min
@@ -32,16 +33,12 @@ class LoginViewModel @Inject constructor(
3233
) : AccountViewModelBase(state, eventBus, storeResolver, resourceResolver, secretsHandler) {
3334
val identifier: StateFlow<String> =
3435
state.getStateFlow(::identifier.name, "")
36+
.onStart { updateIdentifier(storeResolver.accountStore.data.first().identifier) }
37+
.asState("")
3538

3639
override val isFirstStepValid = identifier
3740
.map { it.isNotBlank() && it.length >= resourceResolver.getInteger(R.integer.username_min_length) }
3841

39-
init {
40-
viewModelScope.launch {
41-
updateIdentifier(storeResolver.accountStore.data.map { it.identifier }.first())
42-
}
43-
}
44-
4542
fun updateIdentifier(value: String) {
4643
val maxLength = resourceResolver.getInteger(R.integer.email_max_length)
4744
val newValue = value.substring(0, min(maxLength, value.length))

‎app/src/main/kotlin/app/fyreplace/fyreplace/viewmodels/screens/RegisterViewModel.kt

+16-8
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import kotlinx.coroutines.flow.StateFlow
1717
import kotlinx.coroutines.flow.combine
1818
import kotlinx.coroutines.flow.distinctUntilChanged
1919
import kotlinx.coroutines.flow.first
20+
import kotlinx.coroutines.flow.onStart
2021
import kotlinx.coroutines.launch
2122
import javax.inject.Inject
2223
import kotlin.math.min
@@ -32,16 +33,18 @@ class RegisterViewModel @Inject constructor(
3233
) : AccountViewModelBase(state, eventBus, storeResolver, resourceResolver, secretsHandler) {
3334
val username: StateFlow<String> =
3435
state.getStateFlow(::username.name, "")
36+
.onStart { updateUsername(storeResolver.accountStore.data.first().username) }
37+
.asState("")
3538
val email: StateFlow<String> =
3639
state.getStateFlow(::email.name, "")
37-
38-
init {
39-
viewModelScope.launch {
40-
val account = storeResolver.accountStore.data.first()
41-
updateUsername(account.username)
42-
updateEmail(account.email)
43-
}
44-
}
40+
.onStart { updateEmail(storeResolver.accountStore.data.first().email) }
41+
.asState("")
42+
val hasAcceptedTerms: StateFlow<Boolean> =
43+
state.getStateFlow(::hasAcceptedTerms.name, false)
44+
.combine(isWaitingForRandomCode) { hasAcceptedTerms, isWaitingForRandomCode ->
45+
hasAcceptedTerms || isWaitingForRandomCode
46+
}
47+
.asState(false)
4548

4649
override val isFirstStepValid = username
4750
.combine(email) { username, email ->
@@ -53,6 +56,7 @@ class RegisterViewModel @Inject constructor(
5356
&& email.length >= emailMinLength
5457
&& email.contains('@'))
5558
}
59+
.combine(hasAcceptedTerms) { isDataValid, hasAcceptedTerms -> isDataValid && hasAcceptedTerms }
5660
.distinctUntilChanged()
5761
.asState(false)
5862

@@ -70,6 +74,10 @@ class RegisterViewModel @Inject constructor(
7074
viewModelScope.launch { storeResolver.accountStore.update { setEmail(newValue) } }
7175
}
7276

77+
fun updateHasAcceptedTerms(value: Boolean) {
78+
state[::hasAcceptedTerms.name] = value
79+
}
80+
7381
override fun sendEmail() = callWhileLoading(apiResolver::users) {
7482
val input = UserCreation(email = email.value, username = username.value)
7583
createUser(input).failWith {

‎app/src/main/res/values/strings.xml

+3
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@
4949
<string name="register_username_placeholder">Only letters, numbers and dashes</string>
5050
<string name="register_email">Email</string>
5151
<string name="register_email_placeholder" translatable="false">[email protected]</string>
52+
<string name="register_terms_acceptance">I accept the terms of service and the privacy policy</string>
53+
<string name="register_terms_of_service">Terms of service</string>
54+
<string name="register_privacy_policy">Privacy policy</string>
5255
<string name="register_submit">@string/main_destination_register</string>
5356
<string name="register_error_create_user_400_username_title">Invalid username</string>
5457
<string name="register_error_create_user_400_username_message">This username is not valid.</string>

‎app/src/main/res/values/urls.xml

+3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
<string name="api_url_main" translatable="false">https://rest.api.fyreplace.app</string>
44
<string name="api_url_dev" translatable="false">https://dev.rest.api.fyreplace.app</string>
55
<string name="api_url_local" translatable="false" />
6+
<string name="info_url_website" translatable="false">https://fyreplace.net</string>
7+
<string name="info_url_terms_of_service" translatable="false">https://fyreplace.net/terms-of-service</string>
8+
<string name="info_url_privacy_policy" translatable="false">https://fyreplace.net/privacy-policy</string>
69
<string name="deep_link_host_main" translatable="false">fyreplace.app</string>
710
<string name="deep_link_host_dev" translatable="false">dev.fyreplace.app</string>
811
<string name="deep_link_path_login" translatable="false">/login</string>

‎app/src/test/kotlin/app/fyreplace/fyreplace/test/screens/RegisterViewModelTests.kt

+6-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ class RegisterViewModelTests : TestsBase() {
2929
@Test
3030
fun `Username must have correct length`() = runTest {
3131
val (minLength, maxLength, viewModel) = makeViewModel(FakeEventBus())
32-
viewModel.updateEmail("email@example")
32+
viewModel.updateEmail(FakeUsersEndpointApi.GOOD_EMAIL)
33+
viewModel.updateHasAcceptedTerms(true)
3334
backgroundScope.launch { viewModel.canSubmit.collect() }
3435

3536
for (i in 0..<minLength) {
@@ -53,7 +54,8 @@ class RegisterViewModelTests : TestsBase() {
5354
@Test
5455
fun `Email must have correct length`() = runTest {
5556
val (minLength, maxLength, viewModel) = makeViewModel(FakeEventBus())
56-
viewModel.updateUsername("Example")
57+
viewModel.updateUsername(FakeUsersEndpointApi.GOOD_USERNAME)
58+
viewModel.updateHasAcceptedTerms(true)
5759
backgroundScope.launch { viewModel.canSubmit.collect() }
5860

5961
for (i in 0..<minLength) {
@@ -77,7 +79,8 @@ class RegisterViewModelTests : TestsBase() {
7779
@Test
7880
fun `Email must have @`() = runTest {
7981
val (_, _, viewModel) = makeViewModel(FakeEventBus())
80-
viewModel.updateUsername("Example")
82+
viewModel.updateUsername(FakeUsersEndpointApi.GOOD_USERNAME)
83+
viewModel.updateHasAcceptedTerms(true)
8184
backgroundScope.launch { viewModel.canSubmit.collect() }
8285

8386
viewModel.updateEmail("email")

0 commit comments

Comments
 (0)