From 32bc9dea6f2475c7d3fb68d294e48ff5641b4c5c Mon Sep 17 00:00:00 2001 From: fikrimilano Date: Mon, 24 Feb 2025 19:06:26 +0700 Subject: [PATCH 1/4] Use toSpanned in validation error dialog text --- .../QuestionnaireValidationErrorMessageDialogFragment.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireValidationErrorMessageDialogFragment.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireValidationErrorMessageDialogFragment.kt index f57b6949b7..9a1e16e0b1 100644 --- a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireValidationErrorMessageDialogFragment.kt +++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireValidationErrorMessageDialogFragment.kt @@ -32,6 +32,7 @@ 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.toSpanned import com.google.android.fhir.datacapture.validation.Invalid import com.google.android.fhir.datacapture.validation.ValidationResult import com.google.android.material.dialog.MaterialAlertDialogBuilder @@ -92,7 +93,7 @@ internal class QuestionnaireValidationErrorMessageDialogFragment( text = viewModel.getItemsTextWithValidationErrors().joinToString(separator = "\n") { context.getString(R.string.questionnaire_validation_error_item_text_with_bullet, it) - } + }.toSpanned() } } } From dd7d5d27db3cc0841a0d7c2dbcf99a0a8259cee5 Mon Sep 17 00:00:00 2001 From: fikrimilano Date: Mon, 3 Mar 2025 17:46:00 +0700 Subject: [PATCH 2/4] spotless --- ...estionnaireValidationErrorMessageDialogFragment.kt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireValidationErrorMessageDialogFragment.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireValidationErrorMessageDialogFragment.kt index 9a1e16e0b1..685da30678 100644 --- a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireValidationErrorMessageDialogFragment.kt +++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireValidationErrorMessageDialogFragment.kt @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 Google LLC + * Copyright 2023-2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -91,9 +91,12 @@ internal class QuestionnaireValidationErrorMessageDialogFragment( val viewModel: QuestionnaireValidationErrorViewModel by activityViewModels(factoryProducer = factoryProducer) text = - viewModel.getItemsTextWithValidationErrors().joinToString(separator = "\n") { - context.getString(R.string.questionnaire_validation_error_item_text_with_bullet, it) - }.toSpanned() + viewModel + .getItemsTextWithValidationErrors() + .joinToString(separator = "\n") { + context.getString(R.string.questionnaire_validation_error_item_text_with_bullet, it) + } + .toSpanned() } } } From 6ef719dc130507414d485b37addb0af0c2e5ca83 Mon Sep 17 00:00:00 2001 From: fikrimilano Date: Tue, 4 Mar 2025 14:31:02 +0700 Subject: [PATCH 3/4] Do CI From 5192a7603a7f76baf31c5414ed8ff3760f56f1e7 Mon Sep 17 00:00:00 2001 From: fikrimilano Date: Tue, 4 Mar 2025 14:34:52 +0700 Subject: [PATCH 4/4] Fix test --- .../QuestionnaireValidationErrorMessageDialogFragmentTest.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireValidationErrorMessageDialogFragmentTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireValidationErrorMessageDialogFragmentTest.kt index b8b4e98451..280e91fea6 100644 --- a/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireValidationErrorMessageDialogFragmentTest.kt +++ b/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireValidationErrorMessageDialogFragmentTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2022-2024 Google LLC + * Copyright 2022-2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -76,7 +76,7 @@ class QuestionnaireValidationErrorMessageDialogFragmentTest { assertThat(result.findViewById(R.id.dialog_title).text).isEqualTo("Errors found") assertThat(result.findViewById(R.id.dialog_subtitle).text) .isEqualTo("Fix the following questions:") - assertThat(result.findViewById(R.id.body).text).isEqualTo("• First Name") + assertThat(result.findViewById(R.id.body).text.toString()).isEqualTo("• First Name") } }