Add ReviewAdapterItem for review items

Author: LZRS

datacapture/src/androidTest/java/com/google/android/fhir/datacapture/test/QuestionnaireUiEspressoTest.kt

@@ -624,7 +624,8 @@ class QuestionnaireUiEspressoTest {
     onView(withId(R.id.questionnaire_edit_recycler_view))
       .perform(
         RecyclerViewActions.actionOnItemAtPosition<ViewHolder>(
-          1,  // 'Add item' is in the second row of the recyclerview with group header as the first item
+          1, // 'Add item' is in the second row of the recyclerview with group header as the first
+             // item
           clickChildViewWithId(R.id.add_item_to_repeated_group),
         ),
       )

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

@@ -22,7 +22,8 @@ import org.hl7.fhir.r4.model.QuestionnaireResponse
 /** Various types of rows that can be used in a Questionnaire RecyclerView. */
 internal sealed interface QuestionnaireAdapterItem {
   /** A row for a question in a Questionnaire RecyclerView. */
-  data class Question(val item: QuestionnaireViewItem) : QuestionnaireAdapterItem
+  data class Question(val item: QuestionnaireViewItem) :
+    QuestionnaireAdapterItem, ReviewAdapterItem
 
   /** A row for a repeated group response instance's header. */
   data class RepeatedGroupHeader(
@@ -40,5 +41,7 @@ internal sealed interface QuestionnaireAdapterItem {
   ) : QuestionnaireAdapterItem
 
   data class Navigation(val questionnaireNavigationUIState: QuestionnaireNavigationUIState) :
-    QuestionnaireAdapterItem
+    QuestionnaireAdapterItem, ReviewAdapterItem
 }
+
+internal sealed interface ReviewAdapterItem

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

@@ -418,4 +418,25 @@ internal object DiffCallbacks {
           oldItem.item.hasTheSameValidationResult(newItem.item)
       }
     }
+
+  val REVIEW_ITEMS =
+    object : DiffUtil.ItemCallback<ReviewAdapterItem>() {
+      override fun areItemsTheSame(
+        oldItem: ReviewAdapterItem,
+        newItem: ReviewAdapterItem,
+      ): Boolean =
+        ITEMS.areItemsTheSame(
+          oldItem as QuestionnaireAdapterItem,
+          newItem as QuestionnaireAdapterItem
+        )
+
+      override fun areContentsTheSame(
+        oldItem: ReviewAdapterItem,
+        newItem: ReviewAdapterItem,
+      ): Boolean =
+        ITEMS.areContentsTheSame(
+          oldItem as QuestionnaireAdapterItem,
+          newItem as QuestionnaireAdapterItem
+        )
+    }
 }

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

@@ -163,7 +163,7 @@ class QuestionnaireFragment : Fragment() {
             // Set items
             questionnaireEditRecyclerView.visibility = View.GONE
             questionnaireReviewAdapter.submitList(
-              state.items,
+              state.items.filterIsInstance<ReviewAdapterItem>(),
             )
             questionnaireReviewRecyclerView.visibility = View.VISIBLE
             reviewModeEditButton.visibility =

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

@@ -26,20 +26,18 @@ import com.google.android.fhir.datacapture.views.factories.ReviewViewHolderFacto
 
 /** List Adapter used to bind answers to [QuestionnaireItemViewHolder] in review mode. */
 internal class QuestionnaireReviewAdapter :
-  ListAdapter<QuestionnaireAdapterItem, RecyclerView.ViewHolder>(
-    DiffCallbacks.ITEMS,
+  ListAdapter<ReviewAdapterItem, RecyclerView.ViewHolder>(
+    DiffCallbacks.REVIEW_ITEMS,
   ) {
   override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-    val typedViewType = QuestionnaireEditAdapter.ViewType.parse(viewType)
-    return when (typedViewType.type) {
-      QuestionnaireEditAdapter.ViewType.Type.QUESTION -> ReviewViewHolderFactory.create(parent)
-      QuestionnaireEditAdapter.ViewType.Type.NAVIGATION ->
+    return when (viewType) {
+      VIEW_TYPE_QUESTION -> ReviewViewHolderFactory.create(parent)
+      VIEW_TYPE_NAVIGATION ->
         NavigationViewHolder(
           LayoutInflater.from(parent.context)
             .inflate(R.layout.pagination_navigation_view, parent, false),
         )
-      QuestionnaireEditAdapter.ViewType.Type.REPEATED_GROUP_HEADER -> TODO()
-      QuestionnaireEditAdapter.ViewType.Type.REPEATED_GROUP_ADD_BUTTON -> TODO()
+      else -> throw IllegalStateException("Invalid view type: $viewType")
     }
   }
 
@@ -53,31 +51,18 @@ internal class QuestionnaireReviewAdapter :
         holder as NavigationViewHolder
         holder.bind(item.questionnaireNavigationUIState)
       }
-      is QuestionnaireAdapterItem.RepeatedGroupHeader -> TODO()
-      is QuestionnaireAdapterItem.RepeatedGroupAddButton -> TODO()
     }
   }
 
-  override fun getItemViewType(position: Int): Int {
-    // Because we have multiple Item subtypes, we will pack two ints into the item view type.
-
-    // The first 8 bits will be represented by this type, which is unique for each Item subclass.
-    val type: QuestionnaireEditAdapter.ViewType.Type
-    // The last 24 bits will be represented by this subtype, which will further divide each Item
-    // subclass into more view types.
-    val subtype: Int
+  override fun getItemViewType(position: Int): Int =
     when (getItem(position)) {
-      is QuestionnaireAdapterItem.Question -> {
-        type = QuestionnaireEditAdapter.ViewType.Type.QUESTION
-        subtype = 0xFFFFFF
-      }
-      is QuestionnaireAdapterItem.Navigation -> {
-        type = QuestionnaireEditAdapter.ViewType.Type.NAVIGATION
-        subtype = 0xFFFFFF
-      }
-      is QuestionnaireAdapterItem.RepeatedGroupHeader -> TODO()
-      is QuestionnaireAdapterItem.RepeatedGroupAddButton -> TODO()
+      is QuestionnaireAdapterItem.Question -> VIEW_TYPE_QUESTION
+      is QuestionnaireAdapterItem.Navigation -> VIEW_TYPE_NAVIGATION
+      else -> super.getItemViewType(position)
     }
-    return QuestionnaireEditAdapter.ViewType.from(type = type, subtype = subtype).viewType
+
+  companion object {
+    const val VIEW_TYPE_QUESTION = 10
+    const val VIEW_TYPE_NAVIGATION = 110
   }
 }

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

@@ -1023,9 +1023,9 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
               questionnaireResponseItemList = nestedResponseItemList,
             ),
           )
-            if (questionnaireItem.isRepeatedGroup) {
-                add(QuestionnaireAdapterItem.RepeatedGroupAddButton(question.item))
-            }
+          if (questionnaireItem.isRepeatedGroup) {
+            add(QuestionnaireAdapterItem.RepeatedGroupAddButton(question.item))
+          }
         }
     }
     currentPageItems = items

datacapture/src/test/java/com/google/android/fhir/datacapture/views/RepeatedGroupAddItemViewHolderTest.kt

@@ -57,7 +57,10 @@ class RepeatedGroupAddItemViewHolderTest {
         answersChangedCallback = { _, _, _, _ -> },
       ),
     )
-    assertThat((viewHolder.itemView.findViewById<Button>(R.id.add_item_to_repeated_group).isEnabled)).isFalse()
+    assertThat(
+        (viewHolder.itemView.findViewById<Button>(R.id.add_item_to_repeated_group).isEnabled)
+      )
+      .isFalse()
   }
 
   @Test
@@ -90,6 +93,9 @@ class RepeatedGroupAddItemViewHolderTest {
         answersChangedCallback = { _, _, _, _ -> },
       ),
     )
-    assertThat((viewHolder.itemView.findViewById<Button>(R.id.add_item_to_repeated_group).isEnabled)).isTrue()
+    assertThat(
+        (viewHolder.itemView.findViewById<Button>(R.id.add_item_to_repeated_group).isEnabled)
+      )
+      .isTrue()
   }
 }