From 45dd86e7f82434f23f6056f8e6bb57a6dc4fd716 Mon Sep 17 00:00:00 2001
From: fikrimilano <fikrimilano1@gmail.com>
Date: Mon, 13 Feb 2023 19:13:55 +0700
Subject: [PATCH 01/11] Add onScrollListener that can be overridden

---
 .../fhir/datacapture/QuestionnaireFragment.kt | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireFragment.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireFragment.kt
index 70a9c48a17..a8b5815c1b 100644
--- a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireFragment.kt
+++ b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireFragment.kt
@@ -22,6 +22,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import androidx.appcompat.view.ContextThemeWrapper
+import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.res.use
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
@@ -30,8 +31,10 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView.OnScrollListener
 import com.google.android.fhir.datacapture.validation.Invalid
 import com.google.android.fhir.datacapture.views.QuestionnaireItemViewHolderFactory
+import com.google.android.material.divider.MaterialDivider
 import com.google.android.material.progressindicator.LinearProgressIndicator
 import org.hl7.fhir.r4.model.Questionnaire
 import timber.log.Timber
@@ -69,6 +72,8 @@ open class QuestionnaireFragment : Fragment() {
 
   /** @suppress */
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    val bottomContainer = view.findViewById<ConstraintLayout>(R.id.bottom_container)
+    val bottomContainerDivider = view.findViewById<MaterialDivider>(R.id.container_divider)
     val questionnaireEditRecyclerView =
       view.findViewById<RecyclerView>(R.id.questionnaire_edit_recycler_view)
     val questionnaireReviewRecyclerView =
@@ -113,11 +118,17 @@ open class QuestionnaireFragment : Fragment() {
     questionnaireEditRecyclerView.adapter = questionnaireItemEditAdapter
     val linearLayoutManager = LinearLayoutManager(view.context)
     questionnaireEditRecyclerView.layoutManager = linearLayoutManager
+    questionnaireEditRecyclerView.addOnScrollListener(
+      onScrollListener(bottomContainer, bottomContainerDivider)
+    )
     // Animation does work well with views that could gain focus
     questionnaireEditRecyclerView.itemAnimator = null
 
     questionnaireReviewRecyclerView.adapter = questionnaireItemReviewAdapter
     questionnaireReviewRecyclerView.layoutManager = LinearLayoutManager(view.context)
+    questionnaireReviewRecyclerView.addOnScrollListener(
+      onScrollListener(bottomContainer, bottomContainerDivider)
+    )
 
     // Listen to updates from the view model.
     viewLifecycleOwner.lifecycleScope.launchWhenCreated {
@@ -248,6 +259,14 @@ open class QuestionnaireFragment : Fragment() {
    */
   fun getQuestionnaireResponse() = viewModel.getQuestionnaireResponse()
 
+  /** Override this method to add a custom behavior to Bottom Container on scrolling. */
+  open fun onScrollListener(
+    bottomContainer: ConstraintLayout,
+    bottomContainerDivider: MaterialDivider
+  ): OnScrollListener {
+    return object : OnScrollListener() {}
+  }
+
   /**
    * Extras that can be passed to [QuestionnaireFragment] to define its behavior. When you create a
    * QuestionnaireFragment, one of [EXTRA_QUESTIONNAIRE_JSON_URI] or

From 0534d59b9541fa639b3d0a87d08f9295859de8d9 Mon Sep 17 00:00:00 2001
From: fikrimilano <fikrimilano1@gmail.com>
Date: Mon, 13 Feb 2023 19:15:45 +0700
Subject: [PATCH 02/11] Add divider above bottom container

Gone by default.
---
 .../main/res/layout/questionnaire_fragment.xml    | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/datacapture/src/main/res/layout/questionnaire_fragment.xml b/datacapture/src/main/res/layout/questionnaire_fragment.xml
index 9d1ea76228..1d285cd342 100644
--- a/datacapture/src/main/res/layout/questionnaire_fragment.xml
+++ b/datacapture/src/main/res/layout/questionnaire_fragment.xml
@@ -51,7 +51,7 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:scrollbars="vertical"
-        app:layout_constraintBottom_toTopOf="@+id/bottom_buttons"
+        app:layout_constraintBottom_toTopOf="@+id/container_divider"
         app:layout_constraintTop_toBottomOf="@+id/questionnaire_progress_indicator"
     />
 
@@ -60,12 +60,21 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:scrollbars="vertical"
-        app:layout_constraintBottom_toTopOf="@+id/bottom_buttons"
+        app:layout_constraintBottom_toTopOf="@+id/container_divider"
         app:layout_constraintTop_toBottomOf="@+id/review_mode_edit_button"
     />
 
+    <com.google.android.material.divider.MaterialDivider
+        style="?attr/questionnaireBottomContainerDividerStyle"
+        android:id="@+id/container_divider"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toTopOf="@id/bottom_container"
+    />
+
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/bottom_buttons"
+        style="?attr/questionnaireBottomContainerStyle"
+        android:id="@+id/bottom_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"

From a755ee05e7aed9d3148fd3278c0212d236a66cce Mon Sep 17 00:00:00 2001
From: fikrimilano <fikrimilano1@gmail.com>
Date: Mon, 13 Feb 2023 19:16:23 +0700
Subject: [PATCH 03/11] Add styling to bottom container and the divider above
 it

---
 datacapture/src/main/res/values/attrs.xml  |  4 ++++
 datacapture/src/main/res/values/styles.xml | 21 +++++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/datacapture/src/main/res/values/attrs.xml b/datacapture/src/main/res/values/attrs.xml
index 38a5d1ca20..a8dc7f5c97 100644
--- a/datacapture/src/main/res/values/attrs.xml
+++ b/datacapture/src/main/res/values/attrs.xml
@@ -32,6 +32,10 @@
     <attr name="questionnaireHelpButtonStyle" format="reference" />
     <!--   Style for answer text. -->
     <attr name="questionnaireAnswerTextStyle" format="reference" />
+    <!--   Style for bottom container. -->
+    <attr name="questionnaireBottomContainerStyle" format="reference" />
+    <!--   Style for bottom container divider. -->
+    <attr name="questionnaireBottomContainerDividerStyle" format="reference" />
 
     <!--   Style for radio buttons. -->
     <attr name="questionnaireRadioButtonStyle" format="reference" />
diff --git a/datacapture/src/main/res/values/styles.xml b/datacapture/src/main/res/values/styles.xml
index 827a682476..e19be5d96b 100644
--- a/datacapture/src/main/res/values/styles.xml
+++ b/datacapture/src/main/res/values/styles.xml
@@ -55,6 +55,12 @@
       <item
             name="questionnaireHelpButtonStyle"
         >@style/Widget.MaterialComponents.Button.TextButton.Icon</item>
+      <item
+            name="questionnaireBottomContainerStyle"
+        >@style/Questionnaire.BottomContainerStyle</item>
+      <item
+            name="questionnaireBottomContainerDividerStyle"
+        >@style/Questionnaire.BottomContainerDividerStyle</item>
         <item
             name="questionnaireAnswerTextStyle"
         >@style/Questionnaire.AnswerStyle</item>
@@ -158,6 +164,21 @@
       <item name="android:textColor">?attr/colorOnSurfaceVariant</item>
     </style>
 
+    <style
+        name="Questionnaire.BottomContainerStyle"
+        parent="Widget.Material3.MaterialDivider"
+    >
+      <item name="android:background">?attr/colorSurface</item>
+    </style>
+
+    <style
+        name="Questionnaire.BottomContainerDividerStyle"
+        parent="Widget.Material3.MaterialDivider"
+    >
+      <item name="android:visibility">gone</item>
+      <item name="dividerColor">@color/item_border_color</item>
+    </style>
+
     <style
         name="Questionnaire.AnswerStyle"
         parent="TextAppearance.Material3.BodyMedium"

From 7cc730e4707da0a36c66993df6c85b5bafb587f4 Mon Sep 17 00:00:00 2001
From: fikrimilano <fikrimilano1@gmail.com>
Date: Thu, 16 Feb 2023 14:15:21 +0700
Subject: [PATCH 04/11] Add padding top and bottom for bottom container

- paddingVertical requires API level 26 (current min is 24).
- Added 4dp instead 8dp padding. 4dp results much similar to the design.
---
 datacapture/src/main/res/layout/questionnaire_fragment.xml | 4 ----
 datacapture/src/main/res/values/styles.xml                 | 2 ++
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/datacapture/src/main/res/layout/questionnaire_fragment.xml b/datacapture/src/main/res/layout/questionnaire_fragment.xml
index 1d285cd342..ac91c25f19 100644
--- a/datacapture/src/main/res/layout/questionnaire_fragment.xml
+++ b/datacapture/src/main/res/layout/questionnaire_fragment.xml
@@ -88,7 +88,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="@dimen/item_margin_horizontal"
-            android:layout_marginVertical="@dimen/item_margin_vertical"
             android:text="@string/button_pagination_previous"
             android:textAllCaps="false"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -102,7 +101,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="@dimen/item_margin_horizontal"
-            android:layout_marginVertical="@dimen/item_margin_vertical"
             android:text="@string/button_pagination_next"
             android:textAllCaps="false"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -116,7 +114,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="@dimen/item_margin_horizontal"
-            android:layout_marginVertical="@dimen/item_margin_vertical"
             android:text="@string/button_review"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -130,7 +127,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="@dimen/item_margin_horizontal"
-            android:layout_marginVertical="@dimen/item_margin_vertical"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
         />
diff --git a/datacapture/src/main/res/values/styles.xml b/datacapture/src/main/res/values/styles.xml
index 02baf4104b..14cd86c721 100644
--- a/datacapture/src/main/res/values/styles.xml
+++ b/datacapture/src/main/res/values/styles.xml
@@ -178,6 +178,8 @@
         parent="Widget.Material3.MaterialDivider"
     >
       <item name="android:background">?attr/colorSurface</item>
+      <item name="android:paddingTop">@dimen/padding_quarter_size</item>
+      <item name="android:paddingBottom">@dimen/padding_quarter_size</item>
     </style>
 
     <style

From e7a4c4cc18265b0878d2e92e39deed0e8a9831ca Mon Sep 17 00:00:00 2001
From: fikrimilano <fikrimilano1@gmail.com>
Date: Mon, 20 Feb 2023 19:30:33 +0700
Subject: [PATCH 05/11] Show bottom container divider by default

---
 datacapture/src/main/res/values/styles.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/datacapture/src/main/res/values/styles.xml b/datacapture/src/main/res/values/styles.xml
index 14cd86c721..b5eeb7be35 100644
--- a/datacapture/src/main/res/values/styles.xml
+++ b/datacapture/src/main/res/values/styles.xml
@@ -186,7 +186,7 @@
         name="Questionnaire.BottomContainerDividerStyle"
         parent="Widget.Material3.MaterialDivider"
     >
-      <item name="android:visibility">gone</item>
+      <item name="android:visibility">visible</item>
       <item name="dividerColor">@color/item_border_color</item>
     </style>
 

From 569ddc4e60e1bca4be210f93aa64dbd02dfa5bba Mon Sep 17 00:00:00 2001
From: fikrimilano <fikrimilano1@gmail.com>
Date: Mon, 20 Feb 2023 19:34:16 +0700
Subject: [PATCH 06/11] Remove bottom container parent style

---
 datacapture/src/main/res/values/styles.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/datacapture/src/main/res/values/styles.xml b/datacapture/src/main/res/values/styles.xml
index b5eeb7be35..048e75c185 100644
--- a/datacapture/src/main/res/values/styles.xml
+++ b/datacapture/src/main/res/values/styles.xml
@@ -175,7 +175,7 @@
 
     <style
         name="Questionnaire.BottomContainerStyle"
-        parent="Widget.Material3.MaterialDivider"
+        parent=""
     >
       <item name="android:background">?attr/colorSurface</item>
       <item name="android:paddingTop">@dimen/padding_quarter_size</item>

From 6553faf969917605bc0997cfa60f96e50f3095ab Mon Sep 17 00:00:00 2001
From: fikrimilano <fikrimilano1@gmail.com>
Date: Mon, 20 Feb 2023 20:29:32 +0700
Subject: [PATCH 07/11] spotlessApply

---
 datacapture/src/main/res/values/styles.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/datacapture/src/main/res/values/styles.xml b/datacapture/src/main/res/values/styles.xml
index 048e75c185..6a3c9ed15c 100644
--- a/datacapture/src/main/res/values/styles.xml
+++ b/datacapture/src/main/res/values/styles.xml
@@ -173,10 +173,7 @@
         <item name="android:textColor">?attr/colorOnSurfaceVariant</item>
     </style>
 
-    <style
-        name="Questionnaire.BottomContainerStyle"
-        parent=""
-    >
+    <style name="Questionnaire.BottomContainerStyle" parent="">
       <item name="android:background">?attr/colorSurface</item>
       <item name="android:paddingTop">@dimen/padding_quarter_size</item>
       <item name="android:paddingBottom">@dimen/padding_quarter_size</item>

From 7f9843414298f17f1dc3225bb564edd35d8267f0 Mon Sep 17 00:00:00 2001
From: fikrimilano <fikrimilano1@gmail.com>
Date: Wed, 22 Feb 2023 20:40:36 +0700
Subject: [PATCH 08/11] Rename bottom container padding

---
 datacapture/src/main/res/values/dimens.xml | 1 +
 datacapture/src/main/res/values/styles.xml | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/datacapture/src/main/res/values/dimens.xml b/datacapture/src/main/res/values/dimens.xml
index b9696c5473..3ebf88a983 100644
--- a/datacapture/src/main/res/values/dimens.xml
+++ b/datacapture/src/main/res/values/dimens.xml
@@ -50,6 +50,7 @@
     <dimen name="attachment_icon_button_size">24dp</dimen>
     <dimen name="attachment_uploaded_label_margin_bottom">4dp</dimen>
     <dimen name="attachment_divider_height">1dp</dimen>
+    <dimen name="bottom_container_padding_vertical">8dp</dimen>
     <!--  dimens for padding between text and icon in the radio button  -->
     <dimen name="padding_between_text_and_icon">16dp</dimen>
     <dimen name="padding_after_text">24dp</dimen>
diff --git a/datacapture/src/main/res/values/styles.xml b/datacapture/src/main/res/values/styles.xml
index 6a3c9ed15c..bec1365618 100644
--- a/datacapture/src/main/res/values/styles.xml
+++ b/datacapture/src/main/res/values/styles.xml
@@ -175,8 +175,8 @@
 
     <style name="Questionnaire.BottomContainerStyle" parent="">
       <item name="android:background">?attr/colorSurface</item>
-      <item name="android:paddingTop">@dimen/padding_quarter_size</item>
-      <item name="android:paddingBottom">@dimen/padding_quarter_size</item>
+      <item name="android:paddingTop">@dimen/bottom_container_padding_vertical</item>
+      <item name="android:paddingBottom">@dimen/bottom_container_padding_vertical</item>
     </style>
 
     <style

From b700a8cd2e88099e4861502c8401b9f35f084522 Mon Sep 17 00:00:00 2001
From: fikrimilano <fikrimilano1@gmail.com>
Date: Wed, 22 Feb 2023 20:51:34 +0700
Subject: [PATCH 09/11] spotlessApply

---
 datacapture/src/main/res/values/styles.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/datacapture/src/main/res/values/styles.xml b/datacapture/src/main/res/values/styles.xml
index bec1365618..bacb47c7cc 100644
--- a/datacapture/src/main/res/values/styles.xml
+++ b/datacapture/src/main/res/values/styles.xml
@@ -175,8 +175,12 @@
 
     <style name="Questionnaire.BottomContainerStyle" parent="">
       <item name="android:background">?attr/colorSurface</item>
-      <item name="android:paddingTop">@dimen/bottom_container_padding_vertical</item>
-      <item name="android:paddingBottom">@dimen/bottom_container_padding_vertical</item>
+      <item
+            name="android:paddingTop"
+        >@dimen/bottom_container_padding_vertical</item>
+      <item
+            name="android:paddingBottom"
+        >@dimen/bottom_container_padding_vertical</item>
     </style>
 
     <style

From ce2034b856acedacd17e9f6868fe843032e9dd01 Mon Sep 17 00:00:00 2001
From: fikrimilano <fikrimilano1@gmail.com>
Date: Mon, 13 Mar 2023 18:29:54 +0700
Subject: [PATCH 10/11] Address review

---
 .../res/layout/questionnaire_fragment.xml     | 14 ++++----
 datacapture/src/main/res/values/attrs.xml     | 36 ++++++++++++++++---
 datacapture/src/main/res/values/styles.xml    | 12 +++----
 3 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/datacapture/src/main/res/layout/questionnaire_fragment.xml b/datacapture/src/main/res/layout/questionnaire_fragment.xml
index ac91c25f19..752b26370a 100644
--- a/datacapture/src/main/res/layout/questionnaire_fragment.xml
+++ b/datacapture/src/main/res/layout/questionnaire_fragment.xml
@@ -51,7 +51,7 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:scrollbars="vertical"
-        app:layout_constraintBottom_toTopOf="@+id/container_divider"
+        app:layout_constraintBottom_toTopOf="@+id/bottom_nav_container_divider"
         app:layout_constraintTop_toBottomOf="@+id/questionnaire_progress_indicator"
     />
 
@@ -60,21 +60,21 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:scrollbars="vertical"
-        app:layout_constraintBottom_toTopOf="@+id/container_divider"
+        app:layout_constraintBottom_toTopOf="@+id/bottom_nav_container_divider"
         app:layout_constraintTop_toBottomOf="@+id/review_mode_edit_button"
     />
 
     <com.google.android.material.divider.MaterialDivider
-        style="?attr/questionnaireBottomContainerDividerStyle"
-        android:id="@+id/container_divider"
+        style="?attr/questionnaireBottomNavContainerDividerStyle"
+        android:id="@+id/bottom_nav_container_divider"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toTopOf="@id/bottom_container"
+        app:layout_constraintBottom_toTopOf="@id/bottom_nav_container"
     />
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        style="?attr/questionnaireBottomContainerStyle"
-        android:id="@+id/bottom_container"
+        style="?attr/questionnaireBottomNavContainerStyle"
+        android:id="@+id/bottom_nav_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
diff --git a/datacapture/src/main/res/values/attrs.xml b/datacapture/src/main/res/values/attrs.xml
index 26aa5bf5b5..b0f7ffc316 100644
--- a/datacapture/src/main/res/values/attrs.xml
+++ b/datacapture/src/main/res/values/attrs.xml
@@ -22,42 +22,55 @@
 
     <!--   Style for question text. -->
     <attr name="questionnaireQuestionTextStyle" format="reference" />
+
     <!--   Style for subtitle text. -->
     <attr name="questionnaireSubtitleTextStyle" format="reference" />
+
     <!--   Style for help header. -->
     <attr name="questionnaireHelpHeaderStyle" format="reference" />
+
     <!--   Style for help text. -->
     <attr name="questionnaireHelpTextStyle" format="reference" />
+
     <!--   Style for help button -->
     <attr name="questionnaireHelpButtonStyle" format="reference" />
+
     <!--   Style for question text in review mode -->
     <attr name="questionnaireReviewModeQuestionTextStyle" format="reference" />
 
     <!--   Style for answer text in review mode -->
     <attr name="questionnaireReviewModeAnswerTextStyle" format="reference" />
+
     <!--   Style for not answered text in review mode -->
     <attr
         name="questionnaireReviewModeNotAnsweredTextStyle"
         format="reference"
     />
+
     <!--   Style for item divider in review mode -->
     <attr name="questionnaireReviewModeItemDividerStyle" format="reference" />
+
     <!--   Style for answer text. -->
     <attr name="questionnaireAnswerTextStyle" format="reference" />
-    <!--   Style for bottom container. -->
-    <attr name="questionnaireBottomContainerStyle" format="reference" />
-    <!--   Style for bottom container divider. -->
-    <attr name="questionnaireBottomContainerDividerStyle" format="reference" />
+
+    <!--   Style for bottom navigation container. -->
+    <attr name="questionnaireBottomNavContainerStyle" format="reference" />
+
+    <!--   Style for bottom navigation container divider. -->
+    <attr name="questionnaireBottomNavContainerDividerStyle" format="reference" />
 
     <!--   Style for radio buttons. -->
     <attr name="questionnaireRadioButtonStyle" format="reference" />
+
     <!--   Style for checkbox buttons. -->
     <attr name="questionnaireCheckBoxStyle" format="reference" />
 
     <!--   Style for item text appears in dropDown view list. -->
     <attr name="questionnaireDropDownTextStyle" format="reference" />
+
     <!--   Style for text appears in dropDown autocomplete textView. -->
     <attr name="questionnaireDropDownSelectedTextStyle" format="reference" />
+
     <!--   Style for dropDown view layout. -->
     <attr name="questionnaireDropdownLayoutStyle" format="reference" />
 
@@ -72,8 +85,10 @@
 
     <!--   Style for dialog title text in modal view. -->
     <attr name="questionnaireDialogTitleStyle" format="reference" />
+
     <!--   Style for positive and negative dialog buttons in modal view. -->
     <attr name="questionnaireDialogButtonStyle" format="reference" />
+
     <!--   Style for add another answer button in modal view. -->
     <attr name="questionnaireAddAnotherAnswerButtonStyle" format="reference" />
 
@@ -84,14 +99,19 @@
 
     <!--   Style for previous and next buttons in paginated layout. -->
     <attr name="questionnaireButtonStyle" format="reference" />
+
     <!--   Style for submit button. -->
     <attr name="questionnaireSubmitButtonStyle" format="reference" />
+
     <!--   Style for edit button. -->
     <attr name="questionnaireEditButtonStyle" format="reference" />
+
     <!--   Style for validation error dialog title text in modal view. -->
     <attr name="questionnaireValidationDialogTitleStyle" format="reference" />
+
     <!--   Style for validation error dialog body text in modal view. -->
     <attr name="questionnaireValidationDialogBodyStyle" format="reference" />
+
     <!--   Style for validation error positive and negative dialog buttons in modal view. -->
     <attr name="questionnaireValidationDialogButtonStyle" format="reference" />
 
@@ -103,26 +123,34 @@
         name="questionnaireAttachmentTakePhotoButtonStyle"
         format="reference"
     />
+
     <!--   Style for attachment divider. -->
     <attr name="questionnaireAttachmentDividerStyle" format="reference" />
+
     <!--   Style for attachment uploaded label. -->
     <attr name="questionnaireAttachmentUploadedLabelStyle" format="reference" />
+
     <!--   Style for attachment upload button. -->
     <attr name="questionnaireAttachmentUploadButtonStyle" format="reference" />
+
     <!--   Style for attachment delete button. -->
     <attr name="questionnaireAttachmentDeleteButtonStyle" format="reference" />
+
     <!--   Style for attachment preview photo shape appearance. -->
     <attr
         name="questionnaireShapeAppearanceAttachmentPreviewPhotoStyle"
         format="reference"
     />
+
     <!--   Style for attachment preview icon. -->
     <attr name="questionnaireAttachmentPreviewIconStyle" format="reference" />
+
     <!--   Style for attachment preview icon background. -->
     <attr
         name="questionnaireAttachmentPreviewIconBackgroundStyle"
         format="reference"
     />
+
     <!--   Style for attachment preview title. -->
     <attr name="questionnaireAttachmentPreviewTitleStyle" format="reference" />
 
diff --git a/datacapture/src/main/res/values/styles.xml b/datacapture/src/main/res/values/styles.xml
index aa77e4e2a5..1b0855d4bb 100644
--- a/datacapture/src/main/res/values/styles.xml
+++ b/datacapture/src/main/res/values/styles.xml
@@ -61,11 +61,11 @@
             @style/Widget.MaterialComponents.Button.TextButton.Icon
         </item>
       <item
-            name="questionnaireBottomContainerStyle"
-        >@style/Questionnaire.BottomContainerStyle</item>
+            name="questionnaireBottomNavContainerStyle"
+        >@style/Questionnaire.BottomNavContainerStyle</item>
       <item
-            name="questionnaireBottomContainerDividerStyle"
-        >@style/Questionnaire.BottomContainerDividerStyle</item>
+            name="questionnaireBottomNavContainerDividerStyle"
+        >@style/Questionnaire.BottomNavContainerDividerStyle</item>
         <item
             name="questionnaireReviewModeAnswerTextStyle"
         >@style/Questionnaire.ReviewModeAnswerStyle</item>
@@ -182,7 +182,7 @@
         <item name="android:textColor">?attr/colorOnSurfaceVariant</item>
     </style>
 
-    <style name="Questionnaire.BottomContainerStyle" parent="">
+    <style name="Questionnaire.BottomNavContainerStyle" parent="">
       <item name="android:background">?attr/colorSurface</item>
       <item
             name="android:paddingTop"
@@ -193,7 +193,7 @@
     </style>
 
     <style
-        name="Questionnaire.BottomContainerDividerStyle"
+        name="Questionnaire.BottomNavContainerDividerStyle"
         parent="Widget.Material3.MaterialDivider"
     >
       <item name="android:visibility">visible</item>

From 55e5c262d08221d2a2f4ecf3e0be5aee93c2a715 Mon Sep 17 00:00:00 2001
From: fikrimilano <fikrimilano1@gmail.com>
Date: Mon, 13 Mar 2023 20:24:15 +0700
Subject: [PATCH 11/11] spotlessApply

---
 datacapture/src/main/res/values/attrs.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/datacapture/src/main/res/values/attrs.xml b/datacapture/src/main/res/values/attrs.xml
index b0f7ffc316..95e184353b 100644
--- a/datacapture/src/main/res/values/attrs.xml
+++ b/datacapture/src/main/res/values/attrs.xml
@@ -57,7 +57,10 @@
     <attr name="questionnaireBottomNavContainerStyle" format="reference" />
 
     <!--   Style for bottom navigation container divider. -->
-    <attr name="questionnaireBottomNavContainerDividerStyle" format="reference" />
+    <attr
+        name="questionnaireBottomNavContainerDividerStyle"
+        format="reference"
+    />
 
     <!--   Style for radio buttons. -->
     <attr name="questionnaireRadioButtonStyle" format="reference" />