Refactor OptionSelectDialogFragment out of multi-select

google · Sep 28, 2021 · 4063d8f · 4063d8f
1 parent 22dc506
commit 4063d8f
Show file tree

Hide file tree

Showing 16 changed files with 681 additions and 282 deletions.
diff --git a/...droid/fhir/datacapture/views/QuestionnaireItemMultiSelectHolderFactoryInstrumentedTest.kt b/...droid/fhir/datacapture/views/QuestionnaireItemMultiSelectHolderFactoryInstrumentedTest.kt
@@ -91,7 +91,7 @@ class QuestionnaireItemMultiSelectHolderFactoryInstrumentedTest {
     crossinline block: TestActivity.(QuestionnaireItemViewHolder) -> Unit
   ) {
     rule.scenario.onActivity {
-      block(it, QuestionnaireItemMultiSelectViewHolderFactory.create(FrameLayout(it)))
+      block(it, QuestionnaireItemDialogSelectViewHolderFactory.create(FrameLayout(it)))
     }
   }
 }

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
@@ -30,7 +30,7 @@ internal enum class ItemControlTypes(
   AUTO_COMPLETE("autocomplete", QuestionnaireItemViewHolderType.AUTO_COMPLETE),
   CHECK_BOX("check-box", QuestionnaireItemViewHolderType.CHECK_BOX_GROUP),
   DROP_DOWN("drop-down", QuestionnaireItemViewHolderType.DROP_DOWN),
-  MULTI_SELECT("multi-select", QuestionnaireItemViewHolderType.MULTI_SELECT),
+  OPEN_CHOICE("open-choice", QuestionnaireItemViewHolderType.DIALOG_SELECT),
   RADIO_BUTTON("radio-button", QuestionnaireItemViewHolderType.RADIO_GROUP),
 }
 

diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireItemAdapter.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireItemAdapter.kt
@@ -24,6 +24,7 @@ import com.google.android.fhir.datacapture.views.QuestionnaireItemCheckBoxGroupV
 import com.google.android.fhir.datacapture.views.QuestionnaireItemCheckBoxViewHolderFactory
 import com.google.android.fhir.datacapture.views.QuestionnaireItemDatePickerViewHolderFactory
 import com.google.android.fhir.datacapture.views.QuestionnaireItemDateTimePickerViewHolderFactory
+import com.google.android.fhir.datacapture.views.QuestionnaireItemDialogSelectViewHolderFactory
 import com.google.android.fhir.datacapture.views.QuestionnaireItemDisplayViewHolderFactory
 import com.google.android.fhir.datacapture.views.QuestionnaireItemDropDownViewHolderFactory
 import com.google.android.fhir.datacapture.views.QuestionnaireItemEditTextDecimalViewHolderFactory
@@ -32,7 +33,6 @@ import com.google.android.fhir.datacapture.views.QuestionnaireItemEditTextMultiL
 import com.google.android.fhir.datacapture.views.QuestionnaireItemEditTextQuantityViewHolderFactory
 import com.google.android.fhir.datacapture.views.QuestionnaireItemEditTextSingleLineViewHolderFactory
 import com.google.android.fhir.datacapture.views.QuestionnaireItemGroupViewHolderFactory
-import com.google.android.fhir.datacapture.views.QuestionnaireItemMultiSelectViewHolderFactory
 import com.google.android.fhir.datacapture.views.QuestionnaireItemRadioGroupViewHolderFactory
 import com.google.android.fhir.datacapture.views.QuestionnaireItemViewHolder
 import com.google.android.fhir.datacapture.views.QuestionnaireItemViewItem
@@ -84,8 +84,8 @@ internal class QuestionnaireItemAdapter(
           QuestionnaireItemCheckBoxGroupViewHolderFactory
         QuestionnaireItemViewHolderType.AUTO_COMPLETE ->
           QuestionnaireItemAutoCompleteViewHolderFactory
-        QuestionnaireItemViewHolderType.MULTI_SELECT ->
-          QuestionnaireItemMultiSelectViewHolderFactory
+        QuestionnaireItemViewHolderType.DIALOG_SELECT ->
+          QuestionnaireItemDialogSelectViewHolderFactory
       }
     return viewHolderFactory.create(parent)
   }
@@ -125,7 +125,7 @@ internal class QuestionnaireItemAdapter(
       QuestionnaireItemType.TEXT -> QuestionnaireItemViewHolderType.EDIT_TEXT_MULTI_LINE
       QuestionnaireItemType.INTEGER -> QuestionnaireItemViewHolderType.EDIT_TEXT_INTEGER
       QuestionnaireItemType.DECIMAL -> QuestionnaireItemViewHolderType.EDIT_TEXT_DECIMAL
-      QuestionnaireItemType.CHOICE -> getChoiceViewHolderType(questionnaireItem).viewHolderType
+      QuestionnaireItemType.CHOICE -> getChoiceViewHolderType(questionnaireItem)
       QuestionnaireItemType.DISPLAY -> QuestionnaireItemViewHolderType.DISPLAY
       QuestionnaireItemType.QUANTITY -> QuestionnaireItemViewHolderType.QUANTITY
       else -> throw NotImplementedError("Question type $type not supported.")
@@ -134,17 +134,34 @@ internal class QuestionnaireItemAdapter(
 
   private fun getChoiceViewHolderType(
     questionnaireItem: Questionnaire.QuestionnaireItemComponent
-  ): ItemControlTypes {
-    return questionnaireItem.itemControl
-      ?: when {
-        questionnaireItem.repeats -> ItemControlTypes.CHECK_BOX
-        questionnaireItem.answerOption.size >= MINIMUM_NUMBER_OF_ANSWER_OPTIONS_FOR_DROP_DOWN ->
-          ItemControlTypes.DROP_DOWN
-        else -> ItemControlTypes.RADIO_BUTTON
+  ): QuestionnaireItemViewHolderType {
+    // Use the view type that the client wants if they specified an itemControl
+    return questionnaireItem.itemControl?.viewHolderType
+    // Otherwise, choose a sensible UI element automatically
+    ?: run {
+        val numOptions = questionnaireItem.answerOption.size
+        when {
+          // Always use a dialog for questions with a large number of options
+          numOptions >= MINIMUM_NUMBER_OF_ANSWER_OPTIONS_FOR_DIALOG ->
+            QuestionnaireItemViewHolderType.DIALOG_SELECT
+
+          // Use a check box group if repeated answers are permitted
+          questionnaireItem.repeats -> QuestionnaireItemViewHolderType.CHECK_BOX_GROUP
+
+          // Use a dropdown if there are a medium number of options
+          numOptions >= MINIMUM_NUMBER_OF_ANSWER_OPTIONS_FOR_DROP_DOWN ->
+            QuestionnaireItemViewHolderType.DROP_DOWN
+
+          // Use a radio group only if there are a small number of options
+          else -> QuestionnaireItemViewHolderType.RADIO_GROUP
+        }
       }
   }
 
   internal companion object {
+    // Choice questions are rendered as dialogs if they have at least this many options
+    const val MINIMUM_NUMBER_OF_ANSWER_OPTIONS_FOR_DIALOG = 10
+
     // Choice questions are rendered as radio group if number of options less than this constant
     const val MINIMUM_NUMBER_OF_ANSWER_OPTIONS_FOR_DROP_DOWN = 4
   }

diff --git a/...ture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireItemViewHolderType.kt b/...ture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireItemViewHolderType.kt
@@ -41,7 +41,7 @@ internal enum class QuestionnaireItemViewHolderType(val value: Int) {
   QUANTITY(11),
   CHECK_BOX_GROUP(12),
   AUTO_COMPLETE(13),
-  MULTI_SELECT(14),
+  DIALOG_SELECT(14),
   ;
 
   companion object {

diff --git a/...ture/src/main/java/com/google/android/fhir/datacapture/views/MultiSelectDialogFragment.kt b/...ture/src/main/java/com/google/android/fhir/datacapture/views/MultiSelectDialogFragment.kt