Merge branch 'master' into ak/http-logger

google · Oct 3, 2022 · a8a2f42 · a8a2f42
2 parents bacb64c + a939137
commit a8a2f42
Show file tree

Hide file tree

Showing 15 changed files with 521 additions and 541 deletions.
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -9,7 +9,7 @@ repositories {
 }
 
 dependencies {
- implementation("com.diffplug.spotless:spotless-plugin-gradle:5.12.5")
+ implementation("com.diffplug.spotless:spotless-plugin-gradle:6.6.0")
 
  implementation("com.android.tools.build:gradle:7.1.1")
 

diff --git a/...atacapture/contrib/views/QuestionnaireItemPhoneNumberViewHolderFactoryInstrumentedTest.kt b/...atacapture/contrib/views/QuestionnaireItemPhoneNumberViewHolderFactoryInstrumentedTest.kt
@@ -102,11 +102,9 @@ class QuestionnaireItemPhoneNumberViewHolderFactoryInstrumentedTest {
  )
 
  assertThat(
- viewHolder
- .itemView
+ viewHolder.itemView
  .findViewById<TextInputEditText>(R.id.text_input_edit_text)
- .text
- .toString()
+ .text.toString()
  )
  .isEqualTo("+12345678910")
  }
@@ -137,11 +135,9 @@ class QuestionnaireItemPhoneNumberViewHolderFactoryInstrumentedTest {
  )
 
  assertThat(
- viewHolder
- .itemView
+ viewHolder.itemView
  .findViewById<TextInputEditText>(R.id.text_input_edit_text)
- .text
- .toString()
+ .text.toString()
  )
  .isEqualTo("")
  }
@@ -158,8 +154,7 @@ class QuestionnaireItemPhoneNumberViewHolderFactoryInstrumentedTest {
  answersChangedCallback = { _, _, _ -> },
  )
  viewHolder.bind(questionnaireItemViewItem)
- viewHolder
- .itemView
+ viewHolder.itemView
  .findViewById<TextInputEditText>(R.id.text_input_edit_text)
  .setText("+12345678910")
  assertThat(questionnaireItemViewItem.answers.single().valueStringType.value)

diff --git a/...ture/src/main/java/com/google/android/fhir/datacapture/MoreQuestionnaireItemComponents.kt b/...ture/src/main/java/com/google/android/fhir/datacapture/MoreQuestionnaireItemComponents.kt
@@ -98,10 +98,10 @@ internal val Questionnaire.QuestionnaireItemComponent.itemControl: ItemControlTy
  .firstOrNull {
  it.url == EXTENSION_ITEM_CONTROL_URL || it.url == EXTENSION_ITEM_CONTROL_URL_ANDROID_FHIR
  }
- ?.value as
- CodeableConcept?
+ ?.value as CodeableConcept?
  val code =
- codeableConcept?.coding
+ codeableConcept
+ ?.coding
  ?.firstOrNull {
  it.system == EXTENSION_ITEM_CONTROL_SYSTEM ||
  it.system == EXTENSION_ITEM_CONTROL_SYSTEM_ANDROID_FHIR
@@ -122,8 +122,8 @@ internal const val EXTENSION_CHOICE_ORIENTATION_URL =
 internal val Questionnaire.QuestionnaireItemComponent.choiceOrientation: ChoiceOrientationTypes?
  get() {
  val code =
- (this.extension.firstOrNull { it.url == EXTENSION_CHOICE_ORIENTATION_URL }?.value as
- CodeType?)
+ (this.extension.firstOrNull { it.url == EXTENSION_CHOICE_ORIENTATION_URL }?.value
+ as CodeType?)
  ?.valueAsString
  return ChoiceOrientationTypes.values().firstOrNull { it.extensionCode == code }
  }
@@ -260,10 +260,11 @@ internal val Questionnaire.QuestionnaireItemComponent.isInstructionsCode: Boolea
  return when (type) {
  Questionnaire.QuestionnaireItemType.DISPLAY -> {
  val codeableConcept =
- this.extension.firstOrNull { it.url == EXTENSION_DISPLAY_CATEGORY_URL }?.value as
- CodeableConcept?
+ this.extension.firstOrNull { it.url == EXTENSION_DISPLAY_CATEGORY_URL }?.value
+ as CodeableConcept?
  val code =
- codeableConcept?.coding
+ codeableConcept
+ ?.coding
  ?.firstOrNull { it.system == EXTENSION_DISPLAY_CATEGORY_SYSTEM }
  ?.code
  code == INSTRUCTIONS
@@ -317,9 +318,9 @@ fun Questionnaire.QuestionnaireItemComponent.createQuestionnaireResponseItem():
 // Return expression if QuestionnaireItemComponent has ENABLE WHEN EXPRESSION URL
 val Questionnaire.QuestionnaireItemComponent.enableWhenExpression: Expression?
  get() {
- return this.extension.firstOrNull { it.url == EXTENSION_ENABLE_WHEN_EXPRESSION_URL }?.let {
- it.value as Expression
- }
+ return this.extension
+ .firstOrNull { it.url == EXTENSION_ENABLE_WHEN_EXPRESSION_URL }
+  ?.let { it.value as Expression }
  }
 
 /**

diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
@@ -100,8 +100,8 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
  }
  val uri: Uri = state[QuestionnaireFragment.EXTRA_QUESTIONNAIRE_RESPONSE_JSON_URI]!!
  questionnaireResponse =
- parser.parseResource(application.contentResolver.openInputStream(uri)) as
- QuestionnaireResponse
+ parser.parseResource(application.contentResolver.openInputStream(uri))
+ as QuestionnaireResponse
  checkQuestionnaireResponse(questionnaire, questionnaireResponse)
  }
  state.contains(QuestionnaireFragment.EXTRA_QUESTIONNAIRE_RESPONSE_JSON_STRING) -> {
@@ -171,19 +171,19 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
  }
  }
 
- questionnaireItemParentMap =
- buildMap {
- for (item in questionnaire.item) {
- buildParentList(item, this)
- }
+ questionnaireItemParentMap = buildMap {
+ for (item in questionnaire.item) {
+ buildParentList(item, this)
  }
+ }
  }
 
  /** The map from each item in the [QuestionnaireResponse] to its parent. */
  private val questionnaireResponseItemParentMap =
  mutableMapOf<
  QuestionnaireResponse.QuestionnaireResponseItemComponent,
- QuestionnaireResponse.QuestionnaireResponseItemComponent>()
+ QuestionnaireResponse.QuestionnaireResponseItemComponent
+ >()
 
  init {
  /** Adds each child-parent pair in the [QuestionnaireResponse] to the parent map. */
@@ -261,17 +261,18 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
  (
  Questionnaire.QuestionnaireItemComponent,
  QuestionnaireResponse.QuestionnaireResponseItemComponent,
- List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>) -> Unit =
- { questionnaireItem, questionnaireResponseItem, answers ->
- // TODO(jingtang10): update the questionnaire response item pre-order list and the parent map
- questionnaireResponseItem.answer = answers.toList()
- if (questionnaireItem.hasNestedItemsWithinAnswers) {
- questionnaireResponseItem.addNestedItemsToAnswer(questionnaireItem)
- }
+ List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>
+ ) -> Unit =
+ { questionnaireItem, questionnaireResponseItem, answers ->
+ // TODO(jingtang10): update the questionnaire response item pre-order list and the parent map
+ questionnaireResponseItem.answer = answers.toList()
+ if (questionnaireItem.hasNestedItemsWithinAnswers) {
+ questionnaireResponseItem.addNestedItemsToAnswer(questionnaireItem)
+ }
 
- modifiedQuestionnaireResponseItemSet.add(questionnaireResponseItem)
- modificationCount.update { it + 1 }
- }
+  modifiedQuestionnaireResponseItemSet.add(questionnaireResponseItem)
+  modificationCount.update { it + 1 }
+  }
 
  private val answerValueSetMap =
  mutableMapOf<String, List<Questionnaire.QuestionnaireItemAnswerOptionComponent>>()
@@ -288,7 +289,8 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
 
  internal fun goToPreviousPage() {
  when (entryMode) {
- EntryMode.PRIOR_EDIT, EntryMode.RANDOM -> {
+ EntryMode.PRIOR_EDIT,
+ EntryMode.RANDOM -> {
  val previousPageIndex =
  pages!!.indexOfLast { it.index < currentPageIndexFlow.value!! && it.enabled }
  check(previousPageIndex != -1) {
@@ -304,7 +306,8 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
 
  internal fun goToNextPage() {
  when (entryMode) {
- EntryMode.PRIOR_EDIT, EntryMode.SEQUENTIAL -> {
+ EntryMode.PRIOR_EDIT,
+ EntryMode.SEQUENTIAL -> {
  if (!isPaginationButtonPressed) {
  // Force update validation results for all questions on the current page. This is needed
  // when the user has not answered any questions so no validation has been done.
@@ -387,11 +390,13 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
  }
  ?.let { resource ->
  val valueSet = resource as ValueSet
- valueSet.expansion.contains.filterNot { it.abstract || it.inactive }.map { component ->
- Questionnaire.QuestionnaireItemAnswerOptionComponent(
- Coding(component.system, component.code, component.display)
- )
- }
+ valueSet.expansion.contains
+ .filterNot { it.abstract || it.inactive }
+ .map { component ->
+ Questionnaire.QuestionnaireItemAnswerOptionComponent(
+ Coding(component.system, component.code, component.display)
+ )
+ }
  }
  } else {
  // Ask the client to provide the answers from an external expanded Valueset.