Merge branch 'master' into dokka

google · Jul 22, 2022 · 70d1c79 · 70d1c79
2 parents 7a37af0 + 8c82ee2
commit 70d1c79
Show file tree

Hide file tree

Showing 23 changed files with 122 additions and 107 deletions.
diff --git a/catalog/src/main/res/values-night/themes.xml b/catalog/src/main/res/values-night/themes.xml
@@ -143,25 +143,25 @@
 
   <style name="DarkTheme.MyQuestionnaire.DefaultLayout">
     <item
-            name="submitButtonStyleQuestionnaire"
+            name="questionnaireSubmitButtonStyle"
         >@style/App.Layout.SubmitButtonStyle
     </item>
   </style>
 
   <style name="DarkTheme.MyQuestionnaire.PaginatedLayout">
     <item
-            name="headerTextAppearanceQuestionnaire"
+            name="questionnaireQuestionTextStyle"
         >@style/TextAppearance.Material3.HeadlineMedium
     </item>
     <item
-            name="submitButtonStyleQuestionnaire"
+            name="questionnaireSubmitButtonStyle"
         >@style/App.Layout.SubmitButtonStyle
     </item>
   </style>
 
   <style name="DarkTheme.MyQuestionnaire.PaginatedLayout.Component">
     <item
-            name="submitButtonStyleQuestionnaire"
+            name="questionnaireSubmitButtonStyle"
         >@style/App.Component.SubmitButtonStyle
     </item>
   </style>

diff --git a/catalog/src/main/res/values/styles.xml b/catalog/src/main/res/values/styles.xml
@@ -72,24 +72,24 @@
 
     <style name="Theme.MyQuestionnaire.DefaultLayout">
         <item
-            name="submitButtonStyleQuestionnaire"
+            name="questionnaireSubmitButtonStyle"
         >@style/App.Layout.SubmitButtonStyle
         </item>
     </style>
 
     <style name="Theme.MyQuestionnaire.PaginatedLayout">
-        <item name="headerTextAppearanceQuestionnaire">
+        <item name="questionnaireQuestionTextStyle">
             @style/TextAppearance.Material3.HeadlineMedium
         </item>
         <item
-            name="submitButtonStyleQuestionnaire"
+            name="questionnaireSubmitButtonStyle"
         >@style/App.Layout.SubmitButtonStyle
         </item>
     </style>
 
     <style name="Theme.MyQuestionnaire.PaginatedLayout.Component">
         <item
-            name="submitButtonStyleQuestionnaire"
+            name="questionnaireSubmitButtonStyle"
         >@style/App.Component.SubmitButtonStyle
         </item>
     </style>

diff --git a/...m/google/android/fhir/datacapture/views/QuestionnaireItemAutoCompleteViewHolderFactory.kt b/...m/google/android/fhir/datacapture/views/QuestionnaireItemAutoCompleteViewHolderFactory.kt
@@ -132,7 +132,7 @@ internal object QuestionnaireItemAutoCompleteViewHolderFactory :
       ): Boolean {
         if (chipIsAlreadyPresent(answer)) return false
 
-        val chip = Chip(chipContainer.context, null, R.attr.chipStyleQuestionnaire)
+        val chip = Chip(chipContainer.context, null, R.attr.questionnaireChipStyle)
         chip.id = View.generateViewId()
         chip.text = answer.valueCoding.display
         chip.isCloseIconVisible = true

diff --git a/datacapture/src/main/res/layout/input_error_text_view.xml b/datacapture/src/main/res/layout/input_error_text_view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <TextView
-    style="?attr/inputErrorTextAppearanceQuestionnaire"
+    style="?attr/questionnaireErrorTextStyle"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"

diff --git a/datacapture/src/main/res/layout/questionnaire_fragment.xml b/datacapture/src/main/res/layout/questionnaire_fragment.xml
@@ -32,7 +32,7 @@
     />
 
     <Button
-        style="?attr/buttonStyleQuestionnaire"
+        style="?attr/questionnaireButtonStyle"
         android:id="@+id/pagination_previous_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -45,7 +45,7 @@
     />
 
     <Button
-        style="?attr/buttonStyleQuestionnaire"
+        style="?attr/questionnaireButtonStyle"
         android:id="@+id/pagination_next_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -58,7 +58,7 @@
     />
 
     <Button
-        style="?attr/submitButtonStyleQuestionnaire"
+        style="?attr/questionnaireSubmitButtonStyle"
         android:id="@+id/submit_questionnaire"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

diff --git a/datacapture/src/main/res/layout/questionnaire_item_boolean_type_picker_view.xml b/datacapture/src/main/res/layout/questionnaire_item_boolean_type_picker_view.xml
@@ -38,14 +38,14 @@
     >
 
         <RadioButton
-            style="?attr/radioButtonStyleQuestionnaire"
+            style="?attr/questionnaireRadioButtonStyle"
             android:id="@+id/yes_radio_button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/yes"
         />
         <RadioButton
-            style="?attr/radioButtonStyleQuestionnaire"
+            style="?attr/questionnaireRadioButtonStyle"
             android:id="@+id/no_radio_button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

diff --git a/datacapture/src/main/res/layout/questionnaire_item_check_box_view.xml b/datacapture/src/main/res/layout/questionnaire_item_check_box_view.xml
@@ -15,7 +15,7 @@
  limitations under the License.
 -->
 <CheckBox
-    style="?attr/checkBoxStyleQuestionnaire"
+    style="?attr/questionnaireCheckBoxStyle"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/check_box"
     android:layout_width="match_parent"

diff --git a/datacapture/src/main/res/layout/questionnaire_item_date_picker_view.xml b/datacapture/src/main/res/layout/questionnaire_item_date_picker_view.xml
@@ -44,7 +44,7 @@
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/text_input_edit_text"
-            style="?attr/editTextInputTextAppearanceQuestionnaire"
+            style="?attr/questionnaireTextInputEditTextStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="@string/date"

diff --git a/datacapture/src/main/res/layout/questionnaire_item_date_time_picker_view.xml b/datacapture/src/main/res/layout/questionnaire_item_date_time_picker_view.xml
@@ -51,7 +51,7 @@
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/date_input_edit_text"
-                style="?attr/editTextInputTextAppearanceQuestionnaire"
+                style="?attr/questionnaireTextInputEditTextStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/date"
@@ -80,7 +80,7 @@
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/time_input_edit_text"
-                style="?attr/editTextInputTextAppearanceQuestionnaire"
+                style="?attr/questionnaireTextInputEditTextStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:enabled="false"

diff --git a/datacapture/src/main/res/layout/questionnaire_item_drop_down_list.xml b/datacapture/src/main/res/layout/questionnaire_item_drop_down_list.xml
@@ -18,5 +18,5 @@
     android:ellipsize="end"
     android:maxLines="1"
     android:padding="@dimen/padding_drop_down"
-    android:textAppearance="?attr/dropDownTextAppearanceQuestionnaire"
+    android:textAppearance="?attr/questionnaireDropDownTextStyle"
 />
diff --git a/datacapture/src/main/res/layout/questionnaire_item_drop_down_view.xml b/datacapture/src/main/res/layout/questionnaire_item_drop_down_view.xml
@@ -28,14 +28,14 @@
     />
 
     <com.google.android.material.textfield.TextInputLayout
-        style="?attr/questionnaireExposedMenuLayoutStyle"
+        style="?attr/questionnaireDropdownLayoutStyle"
         android:id="@+id/text_input_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
     >
 
         <AutoCompleteTextView
-            style="?attr/dropDownSelectedTextAppearanceQuestionnaire"
+            style="?attr/questionnaireDropDownSelectedTextStyle"
             android:id="@+id/auto_complete"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

diff --git a/datacapture/src/main/res/layout/questionnaire_item_edit_text_auto_complete_view.xml b/datacapture/src/main/res/layout/questionnaire_item_edit_text_auto_complete_view.xml
@@ -49,7 +49,7 @@
 
             <com.google.android.material.textfield.MaterialAutoCompleteTextView
                 android:id="@+id/autoCompleteTextView"
-                style="@style/Questionnaire.Widget.MaterialComponents.AutoCompleteTextView.OutlinedBox"
+                style="@style/Questionnaire.AutoCompleteTextViewOutlinedBoxStyle"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:gravity="bottom"

diff --git a/datacapture/src/main/res/layout/questionnaire_item_edit_text_view.xml b/datacapture/src/main/res/layout/questionnaire_item_edit_text_view.xml
@@ -38,7 +38,7 @@
     >
 
         <com.google.android.material.textfield.TextInputEditText
-            style="?attr/editTextInputTextAppearanceQuestionnaire"
+            style="?attr/questionnaireTextInputEditTextStyle"
             android:id="@+id/text_input_edit_text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

diff --git a/datacapture/src/main/res/layout/questionnaire_item_header.xml b/datacapture/src/main/res/layout/questionnaire_item_header.xml
@@ -8,7 +8,7 @@
 
     <TextView
         android:id="@+id/prefix"
-        style="?attr/headerTextAppearanceQuestionnaire"
+        style="?attr/questionnaireQuestionTextStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingEnd="@dimen/prefix_padding_end"
@@ -19,7 +19,7 @@
 
     <TextView
         android:id="@+id/question"
-        style="?attr/headerTextAppearanceQuestionnaire"
+        style="?attr/questionnaireQuestionTextStyle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"
@@ -29,7 +29,7 @@
 
     <TextView
         android:id="@+id/hint"
-        style="?attr/subtitleTextAppearanceQuestionnaire"
+        style="?attr/questionnaireSubtitleTextStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"

diff --git a/datacapture/src/main/res/layout/questionnaire_item_multi_select_dialog.xml b/datacapture/src/main/res/layout/questionnaire_item_multi_select_dialog.xml
@@ -22,7 +22,7 @@
 
     <TextView
         android:id="@+id/dialog_title"
-        style="?attr/dialogHeaderTextAppearanceQuestionnaire"
+        style="?attr/questionnaireDialogTitleStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/padding_quarter_size"
@@ -31,7 +31,7 @@
 
     <TextView
         android:id="@+id/dialog_subtitle"
-        style="?attr/subtitleTextAppearanceQuestionnaire"
+        style="?attr/questionnaireSubtitleTextStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/multi_select_dialog_subtitle"
@@ -56,7 +56,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/negative_button"
-            style="?attr/dialogTextButtonAppearanceQuestionnaire"
+            style="?attr/questionnaireDialogButtonStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:padding="@dimen/padding_half_size"
@@ -71,7 +71,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/positive_button"
-            style="?attr/dialogTextButtonAppearanceQuestionnaire"
+            style="?attr/questionnaireDialogButtonStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:padding="@dimen/padding_half_size"

diff --git a/datacapture/src/main/res/layout/questionnaire_item_option_item_multi.xml b/datacapture/src/main/res/layout/questionnaire_item_option_item_multi.xml
@@ -15,7 +15,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/checkbox"
-    style="?attr/checkBoxStyleQuestionnaire"
+    style="?attr/questionnaireCheckBoxStyle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     tools:text="Option"

diff --git a/datacapture/src/main/res/layout/questionnaire_item_option_item_other_add_another.xml b/datacapture/src/main/res/layout/questionnaire_item_option_item_other_add_another.xml
@@ -12,7 +12,7 @@
  limitations under the License.
 -->
 <Button
-    style="?attr/buttonStyleQuestionnaire"
+    style="?attr/questionnaireAddAnotherAnswerButtonStyle"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/add_another"
     android:layout_width="wrap_content"

diff --git a/datacapture/src/main/res/layout/questionnaire_item_option_item_other_text.xml b/datacapture/src/main/res/layout/questionnaire_item_option_item_other_text.xml
@@ -27,7 +27,7 @@
     >
     <com.google.android.material.textfield.TextInputEditText
             android:hint="@string/open_choice_other_hint"
-            style="?attr/editTextInputTextAppearanceQuestionnaire"
+            style="?attr/questionnaireTextInputEditTextStyle"
             android:id="@+id/edit_text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

diff --git a/datacapture/src/main/res/layout/questionnaire_item_option_item_single.xml b/datacapture/src/main/res/layout/questionnaire_item_option_item_single.xml
@@ -12,7 +12,7 @@
  limitations under the License.
 -->
 <RadioButton
-    style="?attr/radioButtonStyleQuestionnaire"
+    style="?attr/questionnaireRadioButtonStyle"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/radio_button"
     android:layout_width="match_parent"

diff --git a/datacapture/src/main/res/layout/questionnaire_item_option_select_view.xml b/datacapture/src/main/res/layout/questionnaire_item_option_select_view.xml
@@ -32,7 +32,7 @@
     />
 
     <com.google.android.material.textfield.TextInputLayout
-        style="?attr/questionnaireExposedMenuLayoutStyle"
+        style="?attr/questionnaireDropdownLayoutStyle"
         android:id="@+id/multi_select_summary_holder"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

diff --git a/datacapture/src/main/res/layout/questionnaire_item_radio_button.xml b/datacapture/src/main/res/layout/questionnaire_item_radio_button.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <RadioButton
-    style="?attr/radioButtonStyleQuestionnaire"
+    style="?attr/questionnaireRadioButtonStyle"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/radio_button"
     android:layout_width="match_parent"

diff --git a/datacapture/src/main/res/values/attrs.xml b/datacapture/src/main/res/values/attrs.xml
@@ -15,27 +15,51 @@
  limitations under the License.
 -->
 <resources>
-    <attr name="groupHeaderTextAppearanceQuestionnaire" format="reference" />
-    <attr name="headerTextAppearanceQuestionnaire" format="reference" />
-    <attr name="subtitleTextAppearanceQuestionnaire" format="reference" />
-    <attr name="dialogHeaderTextAppearanceQuestionnaire" format="reference" />
-    <attr name="checkBoxStyleQuestionnaire" format="reference" />
-    <attr name="radioButtonStyleQuestionnaire" format="reference" />
-    <attr name="dropDownTextAppearanceQuestionnaire" format="reference" />
-    <attr
-        name="dropDownSelectedTextAppearanceQuestionnaire"
-        format="reference"
-    />
-    <attr name="dropDownStyleQuestionnaire" format="reference" />
-    <attr name="editTextInputTextAppearanceQuestionnaire" format="reference" />
-    <attr name="editTextLayoutStyleQuestionnaire" format="reference" />
-    <attr name="chipStyleQuestionnaire" format="reference" />
-    <attr name="buttonStyleQuestionnaire" format="reference" />
-    <attr name="inputErrorTextAppearanceQuestionnaire" format="reference" />
+    <!-- Styles for widgets.   -->
+
+    <!--   Style for question text. -->
+    <attr name="questionnaireQuestionTextStyle" format="reference" />
+    <!--   Style for subtitle text. -->
+    <attr name="questionnaireSubtitleTextStyle" 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" />
+
+    <!--   Style for outline box in textInput layout. -->
     <attr name="questionnaireTextInputLayoutStyle" format="reference" />
-    <attr name="questionnaireExposedMenuLayoutStyle" format="reference" />
-    <attr name="submitButtonStyleQuestionnaire" format="reference" />
-    <attr name="dialogTextButtonAppearanceQuestionnaire" format="reference" />
+
+    <!--   Style for textInputEditText view. -->
+    <attr name="questionnaireTextInputEditTextStyle" format="reference" />
+
+    <!--   Style for chip view. -->
+    <attr name="questionnaireChipStyle" format="reference" />
+
+    <!--   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" />
+
+    <!--   Style for error text. -->
+    <attr name="questionnaireErrorTextStyle" format="reference" />
+
+    <!--   Styles for navigation.  -->
+
+    <!--   Style for previous and next buttons in paginated layout. -->
+    <attr name="questionnaireButtonStyle" format="reference" />
+    <!--   Style for submit button. -->
+    <attr name="questionnaireSubmitButtonStyle" 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. -->