Incorporated review feedback.

Author: rahulmalhotra

catalog/src/main/java/com/google/android/fhir/catalog/DemoQuestionnaireFragment.kt

@@ -138,19 +138,18 @@ class DemoQuestionnaireFragment : Fragment() {
       if (childFragmentManager.findFragmentByTag(QUESTIONNAIRE_FRAGMENT_TAG) == null) {
         childFragmentManager.commit {
           setReorderingAllowed(true)
-          val questionnaireFragment =
-            QuestionnaireFragment.builder()
-              .apply {
-                setCustomQuestionnaireItemViewHolderFactoryMatchersProvider(
-                  ContribQuestionnaireItemViewHolderFactoryMatchersProviderFactory
-                    .LOCATION_WIDGET_PROVIDER,
-                )
-                setQuestionnaire(args.questionnaireJsonStringKey!!)
-                showReviewPageBeforeSubmit(args.enableReviewMode)
-                showReviewPageFirst(true)
-              }
-              .build()
-          add(R.id.container, questionnaireFragment, QUESTIONNAIRE_FRAGMENT_TAG)
+          val questionnaireFragmentLambda =
+            LayoutConfig.questionnaireLambdaMap[args.questionnaireLambdaKey]
+          val questionnaireFragmentBuilder =
+            QuestionnaireFragment.builder().apply {
+              setCustomQuestionnaireItemViewHolderFactoryMatchersProvider(
+                ContribQuestionnaireItemViewHolderFactoryMatchersProviderFactory
+                  .LOCATION_WIDGET_PROVIDER,
+              )
+              setQuestionnaire(args.questionnaireJsonStringKey!!)
+            }
+          questionnaireFragmentLambda?.invoke(questionnaireFragmentBuilder)
+          add(R.id.container, questionnaireFragmentBuilder.build(), QUESTIONNAIRE_FRAGMENT_TAG)
         }
       }
     }

catalog/src/main/java/com/google/android/fhir/catalog/LayoutConfig.kt

@@ -18,22 +18,40 @@ package com.google.android.fhir.catalog
 
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
+import com.google.android.fhir.datacapture.QuestionnaireFragment
 
 data class LayoutConfig(
   @DrawableRes val iconId: Int,
   @StringRes val textId: Int,
   val questionnaireFileName: String,
-  val enableReviewMode: Boolean,
+  val questionnaireLambdaKey: String,
 ) {
+
+  companion object {
+    val questionnaireLambdaMap: Map<String, QuestionnaireFragment.Builder.() -> Unit> =
+      mapOf(
+        "" to
+          {
+            showReviewPageFirst(false)
+            showReviewPageBeforeSubmit(false)
+          },
+        "showreviewpagefirstandbeforesubmit" to
+          {
+            showReviewPageFirst(true)
+            showReviewPageBeforeSubmit(true)
+          },
+      )
+  }
+
   class Builder {
     @DrawableRes var iconId: Int = 0
 
     @StringRes var textId: Int = 0
     var questionnaireFileName: String = ""
-    var enableReviewMode: Boolean = false
+    var questionnaireLambdaKey: String = ""
 
     fun build(): LayoutConfig {
-      return LayoutConfig(iconId, textId, questionnaireFileName, enableReviewMode)
+      return LayoutConfig(iconId, textId, questionnaireFileName, questionnaireLambdaKey)
     }
   }
 }

catalog/src/main/java/com/google/android/fhir/catalog/LayoutListFragment.kt

@@ -81,7 +81,7 @@ class LayoutListFragment : Fragment(R.layout.layout_list_fragment) {
                 backgroundContext = coroutineContext,
                 fileName = layout.config.questionnaireFileName,
               ),
-            enableReviewMode = layout.config.enableReviewMode,
+            questionnaireLambdaKey = layout.config.questionnaireLambdaKey,
           ),
         )
     }

catalog/src/main/java/com/google/android/fhir/catalog/LayoutListViewModel.kt

@@ -36,31 +36,31 @@ class LayoutListViewModel(application: Application, private val state: SavedStat
         iconId = R.drawable.ic_defaultlayout
         textId = R.string.layout_name_default_text
         questionnaireFileName = "layout_default.json"
-        enableReviewMode = false
+        questionnaireLambdaKey = ""
       },
     ),
     PAGINATED(
       layoutConfig {
         iconId = R.drawable.ic_paginatedlayout
         textId = R.string.layout_name_paginated
         questionnaireFileName = "layout_paginated.json"
-        enableReviewMode = false
+        questionnaireLambdaKey = ""
       },
     ),
     REVIEW(
       layoutConfig {
         iconId = R.drawable.ic_reviewlayout
         textId = R.string.layout_name_review
         questionnaireFileName = "layout_review.json"
-        enableReviewMode = true
+        questionnaireLambdaKey = "showreviewpagefirstandbeforesubmit"
       },
     ),
     READ_ONLY(
       layoutConfig {
         iconId = R.drawable.ic_readonlylayout
         textId = R.string.layout_name_read_only
         questionnaireFileName = ""
-        enableReviewMode = false
+        questionnaireLambdaKey = ""
       },
     ),
   }

catalog/src/main/res/navigation/nav_graph.xml

@@ -90,9 +90,10 @@
             android:defaultValue="@null"
         />
     <argument
-            android:name="enableReviewMode"
-            app:argType="boolean"
-            android:defaultValue="false"
+            android:name="questionnaireLambdaKey"
+            app:argType="string"
+            app:nullable="true"
+            android:defaultValue="@null"
         />
     <action
             android:id="@+id/action_galleryQuestionnaireFragment_to_questionnaireResponseFragment"