Added configurable style for Media Image (#2074)

google · Jul 22, 2023 · 32b0d97 · 32b0d97
1 parent 4b0fce8
commit 32b0d97
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 5 deletions.
diff --git a/datacapture/src/main/res/layout/media_view.xml b/datacapture/src/main/res/layout/media_view.xml
@@ -7,15 +7,11 @@
 >
 
     <ImageView
+        style="?attr/questionnaireMediaImageStyle"
         android:id="@+id/image_attachment"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginHorizontal="@dimen/item_media_image_margin_horizontal"
-        android:layout_marginVertical="@dimen/item_media_image_margin_vertical"
         android:adjustViewBounds="true"
-        android:maxWidth="@dimen/item_media_image_max_width"
-        android:maxHeight="@dimen/item_media_image_max_height"
         android:visibility="gone"
     />
 

diff --git a/datacapture/src/main/res/values/attrs.xml b/datacapture/src/main/res/values/attrs.xml
@@ -41,6 +41,9 @@
     <!--   Style for help button -->
     <attr name="questionnaireHelpButtonStyle" format="reference" />
 
+    <!--   Style for media image -->
+    <attr name="questionnaireMediaImageStyle" format="reference" />
+
     <!--   Style for question text in review mode -->
     <attr name="questionnaireReviewModeQuestionTextStyle" format="reference" />
 

diff --git a/datacapture/src/main/res/values/styles.xml b/datacapture/src/main/res/values/styles.xml
@@ -65,6 +65,9 @@
         <item name="questionnaireHelpButtonStyle">
             @style/Widget.MaterialComponents.Button.TextButton.Icon
         </item>
+        <item name="questionnaireMediaImageStyle">
+            @style/Questionnaire.MediaImageStyle
+        </item>
       <item
             name="questionnaireBottomNavContainerStyle"
         >@style/Questionnaire.BottomNavContainerStyle</item>
@@ -199,6 +202,25 @@
         <item name="android:textColor">?attr/colorOnSurfaceVariant</item>
     </style>
 
+    <style name="Questionnaire.MediaImageStyle" parent="">
+        <item name="android:maxWidth">@dimen/item_media_image_max_width</item>
+        <item name="android:maxHeight">@dimen/item_media_image_max_width</item>
+        <item name="android:layout_gravity">center</item>
+        <item
+            name="android:layout_marginTop"
+        >@dimen/item_media_image_margin_vertical</item>
+        <item
+            name="android:layout_marginBottom"
+        >@dimen/item_media_image_margin_vertical</item>
+        <item
+            name="android:layout_marginStart"
+        >@dimen/item_media_image_margin_horizontal</item>
+        <item
+            name="android:layout_marginEnd"
+        >@dimen/item_media_image_margin_horizontal</item>
+
+    </style>
+
     <style name="Questionnaire.BottomNavContainerStyle" parent="">
       <item name="android:background">?attr/colorSurface</item>
       <item