Hide previous and next button (google#2397)

* Hide previous button on first page * Hide next button on last page * Add tests
williamito · Jan 23, 2024 · 99c5b9c · 99c5b9c
1 parent 9d41e1b
commit 99c5b9c
Show file tree

Hide file tree

Showing 2 changed files with 150 additions and 3 deletions.
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireFragment.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireFragment.kt
@@ -190,8 +190,8 @@ class QuestionnaireFragment : Fragment() {
  reviewModeEditButton.visibility = View.GONE
 
  if (displayMode.pagination.isPaginated) {
- paginationPreviousButton.visibility = View.VISIBLE
- paginationPreviousButton.isEnabled = displayMode.pagination.hasPreviousPage
+ paginationPreviousButton.visibility =
+  if (displayMode.pagination.hasPreviousPage) View.VISIBLE else View.GONE
  paginationNextButton.visibility =
  if (displayMode.pagination.hasNextPage) View.VISIBLE else View.GONE
  } else {

diff --git a/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireFragmentTest.kt b/datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireFragmentTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 Google LLC
+ * Copyright 2022-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -139,6 +139,153 @@ class QuestionnaireFragmentTest {
  .isEqualTo(View.VISIBLE)
  }
 
+ @Test
+ fun `should hide next button on last page`() {
+ val questionnaireJson =
+ """{
+ "resourceType": "Questionnaire",
+ "item": [
+ {
+ "linkId": "1",
+ "type": "group",
+ "extension": [
+ {
+ "url": "http:https://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
+ "valueCodeableConcept": {
+ "coding": [
+ {
+ "system": "http:https://hl7.org/fhir/questionnaire-item-control",
+ "code": "page",
+ "display": "Page"
+ }
+ ],
+ "text": "Page"
+ }
+ }
+ ],
+ "item": [
+ {
+ "linkId": "1.1",
+ "type": "display",
+ "text": "Item 1"
+ }
+ ]
+ },
+ {
+ "linkId": "2",
+ "type": "group",
+ "extension": [
+ {
+ "url": "http:https://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
+ "valueCodeableConcept": {
+ "coding": [
+ {
+ "system": "http:https://hl7.org/fhir/questionnaire-item-control",
+ "code": "page",
+ "display": "Page"
+ }
+ ],
+ "text": "Page"
+ }
+ }
+ ],
+ "item": [
+ {
+ "linkId": "2.1",
+ "type": "display",
+ "text": "Item 2"
+ }
+ ]
+ }
+ ]
+}
+"""
+ val scenario =
+ launchFragmentInContainer<QuestionnaireFragment>(
+ bundleOf(
+ EXTRA_QUESTIONNAIRE_JSON_STRING to questionnaireJson,
+ ),
+ )
+ scenario.moveToState(Lifecycle.State.RESUMED)
+ val view = scenario.withFragment { requireView() }
+ view.findViewById<Button>(R.id.pagination_next_button).performClick()
+ assertThat(view.findViewById<Button>(R.id.pagination_next_button).visibility)
+ .isEqualTo(View.GONE)
+ }
+
+ @Test
+ fun `should hide previous button on first page`() {
+ val questionnaireJson =
+ """{
+ "resourceType": "Questionnaire",
+ "item": [
+ {
+ "linkId": "1",
+ "type": "group",
+ "extension": [
+ {
+ "url": "http:https://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
+ "valueCodeableConcept": {
+ "coding": [
+ {
+ "system": "http:https://hl7.org/fhir/questionnaire-item-control",
+ "code": "page",
+ "display": "Page"
+ }
+ ],
+ "text": "Page"
+ }
+ }
+ ],
+ "item": [
+ {
+ "linkId": "1.1",
+ "type": "display",
+ "text": "Item 1"
+ }
+ ]
+ },
+ {
+ "linkId": "2",
+ "type": "group",
+ "extension": [
+ {
+ "url": "http:https://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
+ "valueCodeableConcept": {
+ "coding": [
+ {
+ "system": "http:https://hl7.org/fhir/questionnaire-item-control",
+ "code": "page",
+ "display": "Page"
+ }
+ ],
+ "text": "Page"
+ }
+ }
+ ],
+ "item": [
+ {
+ "linkId": "2.1",
+ "type": "display",
+ "text": "Item 2"
+ }
+ ]
+ }
+ ]
+}
+"""
+ val scenario =
+ launchFragmentInContainer<QuestionnaireFragment>(
+ bundleOf(
+ EXTRA_QUESTIONNAIRE_JSON_STRING to questionnaireJson,
+ ),
+ )
+ scenario.moveToState(Lifecycle.State.RESUMED)
+ val view = scenario.withFragment { requireView() }
+ assertThat(view.findViewById<Button>(R.id.pagination_previous_button).visibility)
+ .isEqualTo(View.GONE)
+ }
+
  @Test
  fun `questionnaireItemViewHolderFactoryMatchersProvider should have custom QuestionnaireItemViewHolderFactoryMatchers `() {
  ApplicationProvider.getApplicationContext<DataCaptureTestApplication>()