Configurable margin bottom for header

google · Feb 7, 2023 · 62368ae · 62368ae
1 parent b5586b5
commit 62368ae
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 12 deletions.
diff --git a/datacapture/src/main/res/layout/questionnaire_item_attachment_view.xml b/datacapture/src/main/res/layout/questionnaire_item_attachment_view.xml
@@ -43,7 +43,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="@dimen/item_margin_horizontal"
-        android:layout_marginTop="@dimen/padding_default"
+        android:layout_marginTop="@dimen/header_margin_bottom"
         android:orientation="horizontal"
     >
 

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
@@ -28,7 +28,7 @@
         android:id="@+id/header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/padding_default"
+        android:layout_marginBottom="@dimen/header_margin_bottom"
     />
 
     <androidx.constraintlayout.widget.ConstraintLayout

diff --git a/datacapture/src/main/res/layout/questionnaire_item_checkbox_group_view.xml b/datacapture/src/main/res/layout/questionnaire_item_checkbox_group_view.xml
@@ -27,7 +27,7 @@
         android:id="@+id/header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/padding_default"
+        android:layout_marginBottom="@dimen/header_margin_bottom"
     />
 
     <androidx.constraintlayout.widget.ConstraintLayout

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
@@ -24,7 +24,7 @@
         android:id="@+id/header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/padding_default"
+        android:layout_marginBottom="@dimen/header_margin_bottom"
     />
 
     <com.google.android.material.textfield.TextInputLayout

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
@@ -28,7 +28,7 @@
         android:id="@+id/header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/padding_default"
+        android:layout_marginBottom="@dimen/header_margin_bottom"
     />
 
     <LinearLayout

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
@@ -24,7 +24,7 @@
         android:id="@+id/header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/padding_default"
+        android:layout_marginBottom="@dimen/header_margin_bottom"
     />
 
     <com.google.android.material.textfield.TextInputLayout

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
@@ -27,7 +27,7 @@
         android:id="@+id/header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/padding_default"
+        android:layout_marginBottom="@dimen/header_margin_bottom"
     />
 
     <androidx.constraintlayout.widget.ConstraintLayout

diff --git a/datacapture/src/main/res/layout/questionnaire_item_edit_text_multi_line_view.xml b/datacapture/src/main/res/layout/questionnaire_item_edit_text_multi_line_view.xml
@@ -27,7 +27,7 @@
         android:id="@+id/header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/padding_default"
+        android:layout_marginBottom="@dimen/header_margin_bottom"
     />
 
     <com.google.android.material.textfield.TextInputLayout

diff --git a/datacapture/src/main/res/layout/questionnaire_item_edit_text_single_line_view.xml b/datacapture/src/main/res/layout/questionnaire_item_edit_text_single_line_view.xml
@@ -27,7 +27,7 @@
         android:id="@+id/header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/padding_default"
+        android:layout_marginBottom="@dimen/header_margin_bottom"
     />
 
     <com.google.android.material.textfield.TextInputLayout

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
@@ -28,7 +28,7 @@
         android:id="@+id/header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/padding_default"
+        android:layout_marginBottom="@dimen/header_margin_bottom"
     />
 
     <com.google.android.material.textfield.TextInputLayout

diff --git a/datacapture/src/main/res/layout/questionnaire_item_radio_group_view.xml b/datacapture/src/main/res/layout/questionnaire_item_radio_group_view.xml
@@ -28,7 +28,7 @@
         android:id="@+id/header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/padding_default"
+        android:layout_marginBottom="@dimen/header_margin_bottom"
     />
 
     <androidx.constraintlayout.widget.ConstraintLayout

diff --git a/datacapture/src/main/res/layout/questionnaire_item_slider.xml b/datacapture/src/main/res/layout/questionnaire_item_slider.xml
@@ -27,7 +27,7 @@
         android:id="@+id/header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/padding_default"
+        android:layout_marginBottom="@dimen/header_margin_bottom"
     />
 
     <com.google.android.material.slider.Slider

diff --git a/datacapture/src/main/res/values/dimens.xml b/datacapture/src/main/res/values/dimens.xml
@@ -18,6 +18,7 @@
     <dimen name="item_margin_horizontal">16dp</dimen>
     <dimen name="item_margin_vertical">8dp</dimen>
     <dimen name="item_margin_top">16dp</dimen>
+    <dimen name="header_margin_bottom">16dp</dimen>
     <dimen name="prefix_padding_end">5dp</dimen>
     <dimen name="answer_option_checkbox_margin_vertical">2dp</dimen>
     <dimen name="padding_drop_down">16dp</dimen>