Skip to content

Localize text for QuestionnaireValidationErrorMessageDialog items #2888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Oct 14, 2025
Merged

Localize text for QuestionnaireValidationErrorMessageDialog items #2888

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
393ed25
Localize text forQuestionnaireValidationErrorMessageDialog
LZRS Sep 30, 2025
7f6795a
Add prefix as text that can be used to associate failing item
LZRS Oct 8, 2025
e6ddf12
Replace \n with <br> for html spannable text
LZRS Oct 8, 2025
31e919b
Use takeIfNotBlank as a private function in QuestionnaireValidationEr…
LZRS Oct 9, 2025
3678ec3
Replace \n with <br? locally within QuestionnaireValidationErrorMessa…
LZRS Oct 9, 2025
e62e0f5
Merge remote-tracking branch 'upstream/master' into fix_validation_di…
LZRS Oct 14, 2025
8709fcc
Revert changes in MoreQuestionnaireItemComponents
LZRS Oct 14, 2025
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
17 changes: 14 additions & 3 deletions .../com/google/android/fhir/datacapture/QuestionnaireValidationErrorMessageDialogFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package com.google.android.fhir.datacapture

import android.app.Dialog
import android.os.Bundle
import android.text.Spanned
import android.view.LayoutInflater
import android.view.View
import android.widget.TextView
Expand All @@ -32,6 +33,8 @@ import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
import com.google.android.fhir.datacapture.extensions.flattened
import com.google.android.fhir.datacapture.extensions.localizedFlyoverSpanned
import com.google.android.fhir.datacapture.extensions.localizedPrefixSpanned
import com.google.android.fhir.datacapture.extensions.localizedTextSpanned
import com.google.android.fhir.datacapture.extensions.toSpanned
import com.google.android.fhir.datacapture.validation.Invalid
import com.google.android.fhir.datacapture.validation.ValidationResult
Expand Down Expand Up @@ -93,7 +96,7 @@ internal class QuestionnaireValidationErrorMessageDialogFragment(
text =
viewModel
.getItemsTextWithValidationErrors()
.joinToString(separator = "\n") {
.joinToString(separator = "<br>") {
context.getString(R.string.questionnaire_validation_error_item_text_with_bullet, it)
}
.toSpanned()
Expand Down Expand Up @@ -129,14 +132,22 @@ internal class QuestionnaireValidationErrorViewModel : ViewModel() {
}

/** @return Texts associated with the failing [Questionnaire.QuestionnaireItemComponent]s. */
fun getItemsTextWithValidationErrors(): List<String> {
fun getItemsTextWithValidationErrors(): List<Spanned> {
val invalidFields =
validation?.filterValues { it.filterIsInstance<Invalid>().isNotEmpty() } ?: emptyMap()
return questionnaire
?.item
?.flattened()
?.filter { invalidFields.contains(it.linkId) }
?.map { if (it.text.isNullOrEmpty()) it.localizedFlyoverSpanned.toString() else it.text }
?.mapNotNull {
// Use the question text if available, otherwise fall back to the fly-over and then the
// prefix.
it.localizedTextSpanned?.takeIfNotBlank()
?: it.localizedFlyoverSpanned?.takeIfNotBlank()
?: it.localizedPrefixSpanned?.takeIfNotBlank()
}
?: emptyList()
}

private fun Spanned.takeIfNotBlank(): Spanned? = takeIf { it.isNotBlank() }
}
Loading