Show slider component on landing page. (#1774)

Co-authored-by: Santosh Pingle <[email protected]> Co-authored-by: Jing Tang <[email protected]>
google · Dec 22, 2022 · edd4730 · edd4730
1 parent 4e18ef2
commit edd4730
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 32 deletions.
diff --git a/catalog/src/main/assets/component_slider.json b/catalog/src/main/assets/component_slider.json
@@ -2,6 +2,9 @@
  "resourceType": "Questionnaire",
  "item": [
  {
+ "linkId": "1",
+ "text": "How many children does the client have?",
+ "type": "integer",
  "extension": [
  {
  "url": "http:https://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
@@ -17,30 +20,7 @@
  },
  {
  "url": "http:https://hl7.org/fhir/StructureDefinition/maxValue",
- "valueInteger": 13
- }
- ],
- "linkId": "1",
- "text": "How many times have you been pregnant?",
- "type": "integer",
- "item": [
- {
- "extension": [
- {
- "url": "http:https://hl7.org/fhir/StructureDefinition/questionnaire-displayCategory",
- "valueCodeableConcept": {
- "coding": [
- {
- "system": "http:https://hl7.org/fhir/questionnaire-display-category",
- "code": "instructions"
- }
- ]
- }
- }
- ],
- "linkId": "1-select-one",
- "text": "Including this pregnancy",
- "type": "display"
+ "valueInteger": 15
  }
  ]
  }

diff --git a/catalog/src/main/java/com/google/android/fhir/catalog/ComponentListViewModel.kt b/catalog/src/main/java/com/google/android/fhir/catalog/ComponentListViewModel.kt
@@ -101,14 +101,12 @@ class ComponentListViewModel(application: Application, private val state: SavedS
  "component_date_time_picker.json",
  "component_date_time_picker_with_validation.json"
  ),
-
- // TODO https://github.com/google/android-fhir/issues/1260
- // SLIDER(
- // R.drawable.ic_slider,
- // R.string.component_name_slider,
- // "component_slider.json",
- // "component_slider_with_validation.json"
- // ),
+ SLIDER(
+ R.drawable.ic_slider,
+ R.string.component_name_slider,
+ "component_slider.json",
+ "component_slider_with_validation.json"
+ ),
  IMAGE(R.drawable.ic_image, R.string.component_name_image, "", ""),
  AUTO_COMPLETE(
  R.drawable.ic_autocomplete,
@@ -136,6 +134,7 @@ class ComponentListViewModel(application: Application, private val state: SavedS
  ViewItem.ComponentItem(Component.TEXT_FIELD),
  ViewItem.ComponentItem(Component.DATE_PICKER),
  ViewItem.ComponentItem(Component.DATE_TIME_PICKER),
+ ViewItem.ComponentItem(Component.SLIDER),
  ViewItem.ComponentItem(Component.IMAGE),
  ViewItem.ComponentItem(Component.AUTO_COMPLETE),
  ViewItem.ComponentItem(Component.REPEATED_GROUP),