Rendering multiple questions in the same line.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 Google LLC
+ * Copyright 2023-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.
@@ -30,6 +30,7 @@ import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.setFragmentResult
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.fhir.datacapture.validation.Invalid
@@ -38,6 +39,7 @@ import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemView
 import com.google.android.material.progressindicator.LinearProgressIndicator
 import kotlinx.coroutines.launch
 import org.hl7.fhir.r4.model.Questionnaire
+import org.hl7.fhir.r4.model.Questionnaire.QuestionnaireItemType
 import timber.log.Timber
 
 /**
@@ -145,7 +147,7 @@ class QuestionnaireFragment : Fragment() {
       }
 
     questionnaireEditRecyclerView.adapter = questionnaireEditAdapter
-    val linearLayoutManager = LinearLayoutManager(view.context)
+    val linearLayoutManager = getLayoutManager()
     questionnaireEditRecyclerView.layoutManager = linearLayoutManager
     // Animation does work well with views that could gain focus
     questionnaireEditRecyclerView.itemAnimator = null
@@ -186,7 +188,13 @@ class QuestionnaireFragment : Fragment() {
           is DisplayMode.EditMode -> {
             // Set items
             questionnaireReviewRecyclerView.visibility = View.GONE
-            questionnaireEditAdapter.submitList(state.items)
+            val itemsToSubmit =
+              if (viewModel.columnCount != null) {
+                state.filterEmptyTextItems()
+              } else {
+                state.items
+              }
+            questionnaireEditAdapter.submitList(itemsToSubmit)
             questionnaireEditRecyclerView.visibility = View.VISIBLE
             reviewModeEditButton.visibility = View.GONE
 
@@ -584,6 +592,21 @@ class QuestionnaireFragment : Fragment() {
     QuestionnaireItemViewHolderFactoryMatchersProvider() {
     override fun get() = emptyList<QuestionnaireItemViewHolderFactoryMatcher>()
   }
+
+  private fun getLayoutManager(): LinearLayoutManager {
+    return if (viewModel.columnCount != null) {
+      GridLayoutManager(context, viewModel.columnCount!!)
+    } else {
+      LinearLayoutManager(context)
+    }
+  }
+
+  internal fun QuestionnaireState.filterEmptyTextItems() =
+    items.filterNot { item ->
+      item is QuestionnaireAdapterItem.Question &&
+        item.item.questionnaireItem.type == QuestionnaireItemType.GROUP &&
+        item.item.questionText.isNullOrEmpty()
+    }
 }
 
 /**

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

@@ -50,6 +50,7 @@ import com.google.android.fhir.datacapture.extensions.minValue
 import com.google.android.fhir.datacapture.extensions.minValueCqfCalculatedValueExpression
 import com.google.android.fhir.datacapture.extensions.packRepeatedGroups
 import com.google.android.fhir.datacapture.extensions.questionnaireLaunchContexts
+import com.google.android.fhir.datacapture.extensions.rootGroupItemColumnCount
 import com.google.android.fhir.datacapture.extensions.shouldHaveNestedItemsUnderAnswers
 import com.google.android.fhir.datacapture.extensions.unpackRepeatedGroups
 import com.google.android.fhir.datacapture.extensions.validateLaunchContextExtensions
@@ -99,6 +100,8 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
   /** The current questionnaire as questions are being answered. */
   internal val questionnaire: Questionnaire
 
+  internal val columnCount: Int?
+
   init {
     questionnaire =
       when {
@@ -122,6 +125,8 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
             "Neither EXTRA_QUESTIONNAIRE_JSON_URI nor EXTRA_QUESTIONNAIRE_JSON_STRING is supplied.",
           )
       }
+    columnCount = questionnaire.rootGroupItemColumnCount
+    Timber.d("Column count value is $columnCount")
   }
 
   /** The current questionnaire response as questions are being answered. */

datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponents.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 Google LLC
+ * Copyright 2023-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.
@@ -177,6 +177,9 @@ internal const val EXTENSION_VARIABLE_URL = "http://hl7.org/fhir/StructureDefini
 internal const val ITEM_INITIAL_EXPRESSION_URL: String =
   "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression"
 
+internal const val EXTENSION_COLUMN_COUNT_URL: String =
+  "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-columnCount"
+
 // ********************************************************************************************** //
 //                                                                                                //
 // Rendering extensions: item control, choice orientation, etc.                                   //
@@ -346,6 +349,19 @@ internal val QuestionnaireItemComponent.maxValue
 internal val QuestionnaireItemComponent.maxValueCqfCalculatedValueExpression
   get() = getExtensionByUrl(MAX_VALUE_EXTENSION_URL)?.value?.cqfCalculatedValueExpression
 
+val Questionnaire.rootGroupItemColumnCount: Int?
+  get() {
+    val rootGroupItem =
+      this.item.firstOrNull { it.type == Questionnaire.QuestionnaireItemType.GROUP }
+
+    // Ensure the item exists and contains the relevant extension
+    val columnCountExtension =
+      rootGroupItem?.extension?.firstOrNull { it.url == EXTENSION_COLUMN_COUNT_URL }
+
+    // Extract and return the column count value if available
+    return (columnCountExtension?.value as? IntegerType)?.value
+  }
+
 // ********************************************************************************************** //
 //                                                                                                //
 // Additional display utilities: display item control, localized text spanned,                    //

datacapture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireItemComponentsTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 Google LLC
+ * Copyright 2023-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.
@@ -2595,6 +2595,77 @@ class MoreQuestionnaireItemComponentsTest {
     assertThat(question.isRepeatedGroup).isFalse()
   }
 
+  @Test
+  fun `rootGroupItemColumnCount returns correct column count`() {
+    val questionnaire =
+      Questionnaire().apply {
+        item =
+          mutableListOf(
+            Questionnaire.QuestionnaireItemComponent().apply {
+              type = Questionnaire.QuestionnaireItemType.GROUP
+              extension =
+                mutableListOf(
+                  Extension().apply {
+                    url = EXTENSION_COLUMN_COUNT_URL
+                    setValue(IntegerType(3))
+                  },
+                )
+            },
+          )
+      }
+    assertThat(questionnaire.rootGroupItemColumnCount).isEqualTo(3)
+  }
+
+  @Test
+  fun `rootGroupItemColumnCount returns null when column count extension value is not an IntegerType`() {
+    val questionnaire =
+      Questionnaire().apply {
+        item =
+          mutableListOf(
+            Questionnaire.QuestionnaireItemComponent().apply {
+              type = Questionnaire.QuestionnaireItemType.GROUP
+              extension =
+                mutableListOf(
+                  Extension().apply {
+                    url = EXTENSION_COLUMN_COUNT_URL
+                    setValue(StringType("invalid"))
+                  },
+                )
+            },
+          )
+      }
+    assertThat(questionnaire.rootGroupItemColumnCount).isNull()
+  }
+
+  @Test
+  fun `rootGroupItemColumnCount returns null when GROUP item has no relevant extension`() {
+    val questionnaire =
+      Questionnaire().apply {
+        item =
+          mutableListOf(
+            Questionnaire.QuestionnaireItemComponent().apply {
+              type = Questionnaire.QuestionnaireItemType.GROUP
+              extension = mutableListOf()
+            },
+          )
+      }
+    assertThat(questionnaire.rootGroupItemColumnCount).isNull()
+  }
+
+  @Test
+  fun `rootGroupItemColumnCount returns null when no GROUP type item exists`() {
+    val questionnaire =
+      Questionnaire().apply {
+        item =
+          mutableListOf(
+            Questionnaire.QuestionnaireItemComponent().apply {
+              type = Questionnaire.QuestionnaireItemType.BOOLEAN
+            },
+          )
+      }
+    assertThat(questionnaire.rootGroupItemColumnCount).isNull()
+  }
+
   private val displayCategoryExtensionWithInstructionsCode =
     Extension().apply {
       url = EXTENSION_DISPLAY_CATEGORY_URL