Add the next button navigation view to a default long scroll

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

@@ -33,6 +33,7 @@ import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.fhir.datacapture.validation.Invalid
+import com.google.android.fhir.datacapture.views.NavigationViewHolder
 import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemViewHolderFactory
 import com.google.android.material.progressindicator.LinearProgressIndicator
 import kotlinx.coroutines.launch
@@ -93,8 +94,11 @@ class QuestionnaireFragment : Fragment() {
       view.findViewById<RecyclerView>(R.id.questionnaire_edit_recycler_view)
     val questionnaireReviewRecyclerView =
       view.findViewById<RecyclerView>(R.id.questionnaire_review_recycler_view)
-    val bottomNavigationRecyclerView =
-      view.findViewById<RecyclerView>(R.id.questionnaire_bottom_navigation_recycler_view)
+
+    // This container frame floats at the bottom of the view to make navigation controls visible at
+    // all times when the user scrolls. Use
+    // [QuestionnaireFragment.Builder.setShowNavigationInDefaultLongScroll] to disable this.
+    val bottomNavContainerFrame = view.findViewById<View>(R.id.bottom_nav_container_frame)
 
     viewModel.setOnCancelButtonClickListener {
       QuestionnaireCancelDialogFragment()
@@ -137,10 +141,6 @@ class QuestionnaireFragment : Fragment() {
     questionnaireReviewRecyclerView.adapter = questionnaireReviewAdapter
     questionnaireReviewRecyclerView.layoutManager = LinearLayoutManager(view.context)
 
-    val bottomNavigationAdapter = QuestionnaireNavigationAdapter()
-    bottomNavigationRecyclerView.adapter = bottomNavigationAdapter
-    bottomNavigationRecyclerView.layoutManager = LinearLayoutManager(view.context)
-
     // Listen to updates from the view model.
     viewLifecycleOwner.lifecycleScope.launchWhenCreated {
       viewModel.questionnaireStateFlow.collect { state ->
@@ -151,27 +151,34 @@ class QuestionnaireFragment : Fragment() {
             questionnaireReviewAdapter.submitList(
               state.items,
             )
-            bottomNavigationAdapter.submitList(state.bottomNavItems)
             questionnaireReviewRecyclerView.visibility = View.VISIBLE
-
             reviewModeEditButton.visibility =
               if (displayMode.showEditButton) {
                 View.VISIBLE
               } else {
                 View.GONE
               }
 
+            // Set bottom navigation
+            bottomNavContainerFrame.visibility = View.VISIBLE
+            NavigationViewHolder(bottomNavContainerFrame)
+              .bind(state.bottomNavItems.single().questionnaireNavigationUIState)
+
             // Hide progress indicator
             questionnaireProgressIndicator.visibility = View.GONE
           }
           is DisplayMode.EditMode -> {
             // Set items
             questionnaireReviewRecyclerView.visibility = View.GONE
             questionnaireEditAdapter.submitList(state.items)
-            bottomNavigationAdapter.submitList(state.bottomNavItems)
             questionnaireEditRecyclerView.visibility = View.VISIBLE
             reviewModeEditButton.visibility = View.GONE
 
+            // Set bottom navigation
+            bottomNavContainerFrame.visibility = View.VISIBLE
+            NavigationViewHolder(bottomNavContainerFrame)
+              .bind(state.bottomNavItems.single().questionnaireNavigationUIState)
+
             // Set progress indicator
             questionnaireProgressIndicator.visibility = View.VISIBLE
             if (displayMode.pagination.isPaginated) {
@@ -206,7 +213,7 @@ class QuestionnaireFragment : Fragment() {
             questionnaireEditRecyclerView.visibility = View.GONE
             questionnaireProgressIndicator.visibility = View.GONE
             reviewModeEditButton.visibility = View.GONE
-            bottomNavigationRecyclerView.visibility = View.GONE
+            bottomNavContainerFrame.visibility = View.GONE
           }
         }
       }

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

@@ -76,14 +76,9 @@ class QuestionnaireItemViewHolder(
 internal class RepeatedGroupHeaderItemViewHolder(
   itemView: View,
 ) : RecyclerView.ViewHolder(itemView) {
-
-  private val header: TextView
-  private val delete: View
-
-  init {
-    header = itemView.findViewById(R.id.repeated_group_instance_header_title)
-    delete = itemView.findViewById(R.id.repeated_group_instance_header_delete_button)
-  }
+  private val header: TextView = itemView.findViewById(R.id.repeated_group_instance_header_title)
+  private val delete: View =
+    itemView.findViewById(R.id.repeated_group_instance_header_delete_button)
 
   fun bind(repeatedGroupHeader: QuestionnaireAdapterItem.RepeatedGroupHeader) {
     header.text =

datacapture/src/main/res/layout/questionnaire_fragment.xml

@@ -52,7 +52,7 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:scrollbars="vertical"
-        app:layout_constraintBottom_toTopOf="@+id/questionnaire_bottom_navigation_recycler_view"
+        app:layout_constraintBottom_toTopOf="@+id/bottom_nav_container_frame"
         app:layout_constraintTop_toBottomOf="@+id/questionnaire_progress_indicator"
     />
 
@@ -61,19 +61,19 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:scrollbars="vertical"
-        app:layout_constraintBottom_toTopOf="@+id/questionnaire_bottom_navigation_recycler_view"
+        app:layout_constraintBottom_toTopOf="@+id/bottom_nav_container_frame"
         app:layout_constraintTop_toBottomOf="@+id/review_mode_edit_button"
     />
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/questionnaire_bottom_navigation_recycler_view"
-        android:layout_width="0dp"
+    <FrameLayout
+        android:id="@+id/bottom_nav_container_frame"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        tools:listitem="@layout/pagination_navigation_view"
-        tools:itemCount="1"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-    />
+    >
+        <include layout="@layout/pagination_navigation_view" />
+    </FrameLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewModelTest.kt

@@ -4324,6 +4324,7 @@ class QuestionnaireViewModelTest {
             when (it) {
               is QuestionnaireAdapterItem.Question -> it.item.questionnaireItem.linkId
               is QuestionnaireAdapterItem.RepeatedGroupHeader -> "RepeatedGroupHeader:${it.index}"
+              is QuestionnaireAdapterItem.Navigation -> TODO()
             }
           },
         )