Add review page title (#2796)

Author: rahulmalhotra

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.
@@ -21,6 +21,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.TextView
 import androidx.annotation.VisibleForTesting
 import androidx.appcompat.view.ContextThemeWrapper
 import androidx.core.content.res.use
@@ -94,6 +95,7 @@ class QuestionnaireFragment : Fragment() {
       view.findViewById<RecyclerView>(R.id.questionnaire_edit_recycler_view)
     val questionnaireReviewRecyclerView =
       view.findViewById<RecyclerView>(R.id.questionnaire_review_recycler_view)
+    val questionnaireTitle = view.findViewById<TextView>(R.id.questionnaire_title)
 
     // This container frame floats at the bottom of the view to make navigation controls visible at
     // all times when the user scrolls. Use
@@ -170,6 +172,8 @@ class QuestionnaireFragment : Fragment() {
               } else {
                 View.GONE
               }
+            questionnaireTitle.visibility = View.VISIBLE
+            questionnaireTitle.text = getString(R.string.questionnaire_review_mode_title)
 
             // Set bottom navigation
             if (state.bottomNavItem != null) {
@@ -189,6 +193,7 @@ class QuestionnaireFragment : Fragment() {
             questionnaireEditAdapter.submitList(state.items)
             questionnaireEditRecyclerView.visibility = View.VISIBLE
             reviewModeEditButton.visibility = View.GONE
+            questionnaireTitle.visibility = View.GONE
 
             // Set bottom navigation
             if (state.bottomNavItem != null) {

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

@@ -24,17 +24,36 @@
     android:layout_alignParentBottom="true"
 >
 
-    <Button
-        android:id="@+id/review_mode_edit_button"
-        style="?attr/questionnaireEditButtonStyle"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:id="@+id/questionnaire_title_layout"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/action_button_margin_horizontal"
-        android:layout_marginVertical="@dimen/action_button_margin_vertical"
-        app:icon="@drawable/ic_outline_edit_24"
+        android:orientation="horizontal"
+        android:layout_marginHorizontal="@dimen/title_layout_margin_horizontal"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-    />
+    >
+
+        <TextView
+            android:id="@+id/questionnaire_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_marginEnd="@dimen/title_margin_end"
+            style="?attr/questionnaireTitleStyle"
+        />
+
+        <Button
+            android:id="@+id/review_mode_edit_button"
+            style="?attr/questionnaireEditButtonStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            app:icon="@drawable/ic_outline_edit_24"
+        />
+
+    </LinearLayout>
 
     <com.google.android.material.progressindicator.LinearProgressIndicator
         android:id="@+id/questionnaire_progress_indicator"
@@ -44,7 +63,7 @@
         app:layout_constraintBottom_toTopOf="@id/questionnaire_edit_recycler_view"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/review_mode_edit_button"
+        app:layout_constraintTop_toBottomOf="@+id/questionnaire_title_layout"
     />
 
     <androidx.recyclerview.widget.RecyclerView
@@ -62,7 +81,7 @@
         android:layout_height="0dp"
         android:scrollbars="vertical"
         app:layout_constraintBottom_toTopOf="@+id/bottom_nav_container_frame"
-        app:layout_constraintTop_toBottomOf="@+id/review_mode_edit_button"
+        app:layout_constraintTop_toBottomOf="@+id/questionnaire_title_layout"
     />
 
     <FrameLayout

datacapture/src/main/res/values/attrs.xml

@@ -183,6 +183,9 @@
     <!--   Style for attachment preview title. -->
     <attr name="questionnaireAttachmentPreviewTitleStyle" format="reference" />
 
+    <!--  Style for questionnaire title  -->
+    <attr name="questionnaireTitleStyle" format="reference" />
+
     <declare-styleable name="QuestionnaireTheme">
         <!-- The ID of the theme to be applied to the questionnaire. The referenced theme must
              extend Theme.Questionnaire. If unspecified, Theme.Questionnaire will be used. -->

datacapture/src/main/res/values/dimens.xml

@@ -25,6 +25,10 @@
     <dimen name="action_button_margin_horizontal">16dp</dimen>
     <dimen name="action_button_margin_vertical">16dp</dimen>
 
+    <!--  Title  -->
+    <dimen name="title_layout_margin_horizontal">16dp</dimen>
+    <dimen name="title_margin_end">2dp</dimen>
+
     <!--  Header  -->
     <dimen name="error_text_at_header_margin_top">4dp</dimen>
     <dimen name="header_padding_bottom">4dp</dimen>

datacapture/src/main/res/values/strings.xml

@@ -11,6 +11,9 @@
     <string name="button_review">Review</string>
     <string name="submit_questionnaire">Submit</string>
     <string name="cancel_questionnaire">@android:string/cancel</string>
+    <string
+        name="questionnaire_review_mode_title"
+    >Review answers before submitting</string>
 
     <!-- 1.2 Submit Pop-up -->
     <string name="questionnaire_validation_error_headline">Errors found</string>

datacapture/src/main/res/values/styles.xml

@@ -190,6 +190,10 @@
         <item name="questionnaireAttachmentPreviewTitleStyle">
             @style/Questionnaire.AttachmentPreviewTitleStyle
         </item>
+        <item
+            name="questionnaireTitleStyle"
+        >@style/TextAppearance.Material3.TitleLarge
+        </item>
     </style>
 
     <style name="Questionnaire.GroupTypeHeaderStyle" parent="">