Incorporated review feedback.

Author: rahulmalhotra

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

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2025 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://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.catalog
+
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+
+data class LayoutConfig(
+  @DrawableRes val iconId: Int,
+  @StringRes val textId: Int,
+  val questionnaireFileName: String,
+  val enableReviewMode: Boolean,
+) {
+  class Builder {
+    @DrawableRes var iconId: Int = 0
+
+    @StringRes var textId: Int = 0
+    var questionnaireFileName: String = ""
+    var enableReviewMode: Boolean = false
+
+    fun build(): LayoutConfig {
+      return LayoutConfig(iconId, textId, questionnaireFileName, enableReviewMode)
+    }
+  }
+}
+
+fun layoutConfig(block: LayoutConfig.Builder.() -> Unit): LayoutConfig {
+  val builder = LayoutConfig.Builder()
+  builder.block()
+  return builder.build()
+}

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

@@ -63,7 +63,7 @@ class LayoutListFragment : Fragment(R.layout.layout_list_fragment) {
   private fun onItemClick(layout: LayoutListViewModel.Layout) {
     // TODO Remove check when all layout questionnaire json are updated.
     // https://github.com/google/android-fhir/issues/1079
-    if (layout.questionnaireFileName.isEmpty()) {
+    if (layout.config.questionnaireFileName.isEmpty()) {
       return
     }
     launchQuestionnaireFragment(layout)
@@ -74,14 +74,14 @@ class LayoutListFragment : Fragment(R.layout.layout_list_fragment) {
       findNavController()
         .navigate(
           MainNavGraphDirections.actionGlobalGalleryQuestionnaireFragment(
-            questionnaireTitleKey = context?.getString(layout.textId) ?: "",
+            questionnaireTitleKey = context?.getString(layout.config.textId) ?: "",
             questionnaireJsonStringKey =
               getQuestionnaireJsonStringFromAssets(
                 context = requireContext(),
                 backgroundContext = coroutineContext,
-                fileName = layout.questionnaireFileName,
+                fileName = layout.config.questionnaireFileName,
               ),
-            enableReviewMode = layout.enableReviewMode,
+            enableReviewMode = layout.config.enableReviewMode,
           ),
         )
     }

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

@@ -18,8 +18,6 @@ package com.google.android.fhir.catalog
 
 import android.app.Application
 import android.content.Context
-import androidx.annotation.DrawableRes
-import androidx.annotation.StringRes
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.SavedStateHandle
 
@@ -31,30 +29,45 @@ class LayoutListViewModel(application: Application, private val state: SavedStat
   }
 
   enum class Layout(
-    @DrawableRes val iconId: Int,
-    @StringRes val textId: Int,
-    val questionnaireFileName: String,
-    val enableReviewMode: Boolean,
+    val config: LayoutConfig,
   ) {
     DEFAULT(
-      R.drawable.ic_defaultlayout,
-      R.string.layout_name_default_text,
-      "layout_default.json",
-      false,
+      layoutConfig {
+        iconId = R.drawable.ic_defaultlayout
+        textId = R.string.layout_name_default_text
+        questionnaireFileName = "layout_default.json"
+        enableReviewMode = false
+      },
     ),
     PAGINATED(
-      R.drawable.ic_paginatedlayout,
-      R.string.layout_name_paginated,
-      "layout_paginated.json",
-      false,
+      layoutConfig {
+        iconId = R.drawable.ic_paginatedlayout
+        textId = R.string.layout_name_paginated
+        questionnaireFileName = "layout_paginated.json"
+        enableReviewMode = false
+      },
+    ),
+    REVIEW(
+      layoutConfig {
+        iconId = R.drawable.ic_reviewlayout
+        textId = R.string.layout_name_review
+        questionnaireFileName = "layout_review.json"
+        enableReviewMode = true
+      },
+    ),
+    READ_ONLY(
+      layoutConfig {
+        iconId = R.drawable.ic_readonlylayout
+        textId = R.string.layout_name_read_only
+        questionnaireFileName = ""
+        enableReviewMode = false
+      },
     ),
-    REVIEW(R.drawable.ic_reviewlayout, R.string.layout_name_review, "layout_review.json", true),
-    READ_ONLY(R.drawable.ic_readonlylayout, R.string.layout_name_read_only, "", false),
   }
 
   fun isDefaultLayout(context: Context, title: String) =
-    context.getString(Layout.DEFAULT.textId) == title
+    context.getString(Layout.DEFAULT.config.textId) == title
 
   fun isPaginatedLayout(context: Context, title: String) =
-    context.getString(Layout.PAGINATED.textId) == title
+    context.getString(Layout.PAGINATED.config.textId) == title
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 Google LLC
+ * Copyright 2021-2025 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,9 +42,9 @@ class LayoutViewHolder(
   private val onItemClick: (LayoutListViewModel.Layout) -> Unit,
 ) : RecyclerView.ViewHolder(binding.root) {
   fun bind(layout: LayoutListViewModel.Layout) {
-    binding.componentLayoutIconImageview.setImageResource(layout.iconId)
+    binding.componentLayoutIconImageview.setImageResource(layout.config.iconId)
     binding.componentLayoutTextView.text =
-      binding.componentLayoutTextView.context.getString(layout.textId)
+      binding.componentLayoutTextView.context.getString(layout.config.textId)
     binding.root.setOnClickListener { onItemClick(layout) }
   }
 }