Skip to content

Commit d92aa2d

Browse files
authored
Merge pull request #126 from harrydbarnes/refactor-onboarding-validation-5103387645092597876
Refactor onboarding validation 5103387645092597876
2 parents ed0e88e + c7e93ac commit d92aa2d

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

app/src/main/java/com/example/theloop/OnboardingViewModel.kt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,14 @@ class OnboardingViewModel @Inject constructor(
2222
_name.value = newName
2323
}
2424

25-
fun saveName() {
26-
viewModelScope.launch {
27-
userPreferencesRepository.saveUserName(name.value)
25+
fun saveName(): Boolean {
26+
val isNameValid = name.value.isNotBlank()
27+
if (isNameValid) {
28+
viewModelScope.launch {
29+
userPreferencesRepository.saveUserName(name.value)
30+
}
2831
}
32+
return isNameValid
2933
}
3034

3135
fun completeOnboarding() {

app/src/main/java/com/example/theloop/ui/screens/OnboardingScreen.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,9 @@ fun OnboardingScreen(
9898
Button(onClick = {
9999
if (currentStep == 0) {
100100
// Save Name
101-
if (name.isNotEmpty()) {
102-
viewModel.saveName()
101+
if (!viewModel.saveName()) {
102+
Toast.makeText(context, "Name cannot be blank", Toast.LENGTH_SHORT).show()
103+
return@Button
103104
}
104105
}
105106

0 commit comments

Comments
 (0)