Implement the entryMode extension

datacapture/src/main/java/com/google/android/fhir/datacapture/DataCaptureConfig.kt

@@ -45,7 +45,14 @@ data class DataCaptureConfig(
  * should try to include the smallest [NpmPackage] possible that contains only the resources
  * needed by [StructureMap]s used by the client app.
  */
- var npmPackage: NpmPackage? = null
+ var npmPackage: NpmPackage? = null,
+
+ /**
+ * Holds the current strategy that will be followed during page change events. This can be
+ * customized on runtime by setting the customized strategy
+ */
+ var questionnairePageEventContext: QuestionnairePageChangeEventContext =
+ QuestionnairePageChangeEventContext()
 ) {
 
  internal val simpleWorkerContext: SimpleWorkerContext by lazy {

datacapture/src/main/java/com/google/android/fhir/datacapture/DefaultPageChangeStrategy.kt

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http:https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.fhir.datacapture
+
+import com.google.android.fhir.datacapture.views.QuestionnaireItemViewItem
+
+/*
+ * This Page strategy restricts user on every page when required fields are missing
+ */
+class DefaultPageChangeStrategy : PageChangeStrategy {
+
+ override fun shouldGoToPreviousPage(list: List<QuestionnaireItemViewItem>): Boolean {
+ return !list.any { it.isErrorTriggered }
+ }
+
+ override fun shouldGoToNextPage(list: List<QuestionnaireItemViewItem>): Boolean {
+ return !list.any { it.isErrorTriggered }
+ }
+}

datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireFragment.kt

@@ -70,7 +70,7 @@ open class QuestionnaireFragment : Fragment() {
  viewLifecycleOwner.lifecycleScope.launchWhenCreated {
  viewModel.questionnaireStateFlow.collect { state ->
  adapter.submitList(state.items)
-
+ viewModel.holdCurrentItemState(state.items)
  if (state.pagination != null) {
  paginationPreviousButton.visibility = View.VISIBLE
  paginationPreviousButton.isEnabled = state.pagination.hasPreviousPage

datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnairePageChangeEventContext.kt

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http:https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.fhir.datacapture
+
+import com.google.android.fhir.datacapture.views.QuestionnaireItemViewItem
+
+class QuestionnairePageChangeEventContext {
+ private var pageChangeStrategy: PageChangeStrategy = DefaultPageChangeStrategy()
+
+ fun setStrategy(pageChangeStrategy: PageChangeStrategy) {
+ this.pageChangeStrategy = pageChangeStrategy
+ }
+
+ // This function will be called in the QuestionnaireViewModel goToNextPage and if returns true
+ // then pageFlow.value will be changed.
+ fun pageNextEvent(list: List<QuestionnaireItemViewItem>): Boolean {
+ return pageChangeStrategy.shouldGoToNextPage(list)
+ }
+
+ // This function will be called in the QuestionnaireViewModel goToPreviousPage and if returns true
+ // then pageFlow.value will be changed.
+ fun pagePreviousEvent(list: List<QuestionnaireItemViewItem>): Boolean {
+ return pageChangeStrategy.shouldGoToPreviousPage(list)
+ }
+}
+
+interface PageChangeStrategy {
+ fun shouldGoToPreviousPage(list: List<QuestionnaireItemViewItem>): Boolean
+
+ fun shouldGoToNextPage(list: List<QuestionnaireItemViewItem>): Boolean
+}

datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt

@@ -43,6 +43,11 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
  AndroidViewModel(application) {
  /** The current questionnaire as questions are being answered. */
  internal val questionnaire: Questionnaire
+ lateinit var currentPageItems: List<QuestionnaireItemViewItem>
+
+ private val questionnairePageEventContext by lazy {
+ DataCapture.getConfiguration(getApplication()).questionnairePageEventContext
+ }
 
  init {
  questionnaire =
@@ -145,11 +150,17 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
  }
 
  internal fun goToPreviousPage() {
- pageFlow.value = pageFlow.value!!.previousPage()
+ if (questionnairePageEventContext.pagePreviousEvent(currentPageItems)) {
+ pageFlow.value = pageFlow.value!!.previousPage()
+ }
  }
 
+ private fun getString(resId: Int) = getApplication<Application>().resources.getString(resId)
+
  internal fun goToNextPage() {
- pageFlow.value = pageFlow.value!!.nextPage()
+ if (questionnairePageEventContext.pageNextEvent(currentPageItems)) {
+ pageFlow.value = pageFlow.value!!.nextPage()
+ }
  }
 
  /** [QuestionnaireState] to be displayed in the UI. */
@@ -371,6 +382,11 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
  null
  }
  }
+
+ internal fun holdCurrentItemState(items: List<QuestionnaireItemViewItem>) {
+ // hold it on the variable that can be used when tapping next/previous page
+ currentPageItems = items
+ }
 }
 
 /** Questionnaire state for the Fragment to consume. */

datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemViewHolderFactory.kt

@@ -62,7 +62,9 @@ open class QuestionnaireItemViewHolder(
  delegate.questionnaireItemViewItem = questionnaireItemViewItem
  delegate.bind(questionnaireItemViewItem)
  delegate.setReadOnly(questionnaireItemViewItem.questionnaireItem.readOnly)
- delegate.displayValidationResult(delegate.getValidationResult(itemView.context))
+ val validationResult = delegate.getValidationResult(itemView.context)
+ delegate.displayValidationResult(validationResult)
+ questionnaireItemViewItem.isErrorTriggered = !validationResult.isValid
  }
 }
 
@@ -101,7 +103,9 @@ interface QuestionnaireItemViewHolderDelegate {
  */
  fun onAnswerChanged(context: Context) {
  questionnaireItemViewItem.questionnaireResponseItemChangedCallback()
- displayValidationResult(getValidationResult(context))
+ val validationResult = getValidationResult(context)
+ displayValidationResult(validationResult)
+ questionnaireItemViewItem.isErrorTriggered = !validationResult.isValid
  }
 
  /** Run the [QuestionnaireResponseItemValidator.validate] function. */

datacapture/src/main/java/com/google/android/fhir/datacapture/views/QuestionnaireItemViewItem.kt

@@ -44,6 +44,7 @@ data class QuestionnaireItemViewItem(
  {
  emptyList()
  },
+ var isErrorTriggered: Boolean = false,
  val questionnaireResponseItemChangedCallback: () -> Unit
 ) {
  /**

datacapture/src/main/res/values/strings.xml

@@ -97,4 +97,7 @@
  <string name="time">Time</string>
  <string name="select_date">Select date</string>
  <string name="hyphen">-</string>
+ <string
+ name="message_fill_required_fields"
+ >Please fill the required fields first</string>
 </resources>