Per question custom style

catalog/src/main/assets/component_per_question_custom_style.json

@@ -0,0 +1,157 @@
+{
+  "resourceType": "Questionnaire",
+  "item": [
+    {
+      "linkId": "1",
+      "text": "Question text",
+      "type": "display",
+      "extension": [
+        {
+          "url": "https://github.com/google/android-fhir/tree/master/datacapture/android-style",
+          "extension": [
+            {
+              "url": "question_text_view",
+              "valueString": "CustomStyle_1"
+            },
+            {
+              "url": "subtitle_text_view",
+              "valueString": "CustomStyle_2"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "linkId": "3",
+      "text": "Question text",
+      "type": "display",
+      "extension": [
+        {
+          "url": "https://github.com/google/android-fhir/tree/master/datacapture/android-style",
+          "extension": [
+            {
+              "url": "question_text_view",
+              "valueString": "CustomStyle_3"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "linkId": "4",
+      "text": "Question text",
+      "type": "display",
+      "extension": [
+        {
+          "url": "https://github.com/google/android-fhir/tree/master/datacapture/android-style",
+          "extension": [
+            {
+              "url": "question_text_view",
+              "valueString": "CustomStyle_4"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "linkId": "5",
+      "text": "Question text",
+      "type": "display",
+      "extension": [
+        {
+          "url": "https://github.com/google/android-fhir/tree/master/datacapture/android-style",
+          "extension": [
+            {
+              "url": "question_text_view",
+              "valueString": "CustomStyle_5"
+            }
+          ]
+        }
+      ]
+    },
+
+    {
+      "linkId": "6",
+      "text": "Question text",
+      "type": "display",
+      "extension": [
+        {
+          "url": "https://github.com/google/android-fhir/tree/master/datacapture/android-style",
+          "extension": [
+            {
+              "url": "question_text_view",
+              "valueString": "CustomStyle_6"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "linkId": "7",
+      "text": "Question text",
+      "type": "display",
+      "extension": [
+        {
+          "url": "https://github.com/google/android-fhir/tree/master/datacapture/android-style",
+          "extension": [
+            {
+              "url": "question_text_view",
+              "valueString": "CustomStyle_7"
+            }
+          ]
+        }
+      ]
+    },
+
+    {
+      "linkId": "8",
+      "text": "Question text",
+      "type": "display",
+      "extension": [
+        {
+          "url": "https://github.com/google/android-fhir/tree/master/datacapture/android-style",
+          "extension": [
+            {
+              "url": "question_text_view",
+              "valueString": "CustomStyle_8"
+            }
+          ]
+        }
+      ]
+    },
+
+    {
+      "linkId": "9",
+      "text": "Question text",
+      "type": "display",
+      "extension": [
+        {
+          "url": "https://github.com/google/android-fhir/tree/master/datacapture/android-style",
+          "extension": [
+            {
+              "url": "question_text_view",
+              "valueString": "CustomStyle_9"
+            }
+          ]
+        }
+      ]
+    },
+
+    {
+      "linkId": "10",
+      "text": "Question text",
+      "type": "display",
+      "extension": [
+        {
+          "url": "https://github.com/google/android-fhir/tree/master/datacapture/android-style",
+          "extension": [
+            {
+              "url": "question_text_view",
+              "valueString": "CustomStyle_10"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}

catalog/src/main/java/com/google/android/fhir/catalog/ComponentListViewModel.kt

@@ -152,6 +152,11 @@ class ComponentListViewModel(application: Application, private val state: SavedS
       R.string.component_name_location_widget,
       "component_location_widget.json",
     ),
+    QUESTION_ITEM_CUSTOM_STYLE(
+      R.drawable.text_format_48dp,
+      R.string.component_name_per_question_custom_style,
+      "component_per_question_custom_style.json",
+    ),
   }
 
   val viewItemList =
@@ -177,6 +182,7 @@ class ComponentListViewModel(application: Application, private val state: SavedS
       ViewItem.ComponentItem(Component.ITEM_ANSWER_MEDIA),
       ViewItem.ComponentItem(Component.INITIAL_VALUE),
       ViewItem.ComponentItem(Component.LOCATION_WIDGET),
+      ViewItem.ComponentItem(Component.QUESTION_ITEM_CUSTOM_STYLE),
     )
 
   fun isComponent(context: Context, title: String) =

catalog/src/main/res/drawable/ic_location_on.xml

@@ -1,7 +1,7 @@
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="128dp"
-    android:height="128dp"
+    android:width="64dp"
+    android:height="64dp"
     android:tint="#1A73E8"
     android:viewportWidth="24"
     android:viewportHeight="24"

catalog/src/main/res/drawable/text_format_48dp.xml

@@ -0,0 +1,15 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:autoMirrored="true"
+    android:height="64dp"
+    android:viewportHeight="960"
+    android:viewportWidth="960"
+    android:width="64dp"
+>
+
+    <path
+        android:fillColor="#1A73E8"
+        android:pathData="M200,760v-60h560v60L200,760ZM276,600 L451,160h58l175,440h-55l-45,-119L376,481l-45,119h-55ZM393,436h174l-85,-222h-4l-85,222Z"
+    />
+
+</vector>

catalog/src/main/res/values-night/colors.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ Copyright 2020 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources>
+    <color name="custom_style_primary_100">#000000</color>
+    <color name="custom_style_primary_200">#0C0A20</color>
+    <color name="custom_style_primary_300">#201441</color>
+    <color name="custom_style_primary_400">#341F63</color>
+    <color name="custom_style_primary_500">#482A85</color>
+    <color name="custom_style_primary_600">#5C35A6</color>
+    <color name="custom_style_primary_700">#7F5FBA</color>
+    <color name="custom_style_primary_800">#A289CF</color>
+    <color name="custom_style_primary_900">#C5B3E3</color>
+    <color name="custom_style_on_primary_100">#FFFFFF</color>
+    <color name="custom_style_on_primary_200">#FFFFFF</color>
+    <color name="custom_style_on_primary_300">#FFFFFF</color>
+    <color name="custom_style_on_primary_400">#FFFFFF</color>
+    <color name="custom_style_on_primary_500">#FFFFFF</color>
+    <color name="custom_style_on_primary_600">#FFFFFF</color>
+    <color name="custom_style_on_primary_700">#FFFFFF</color>
+    <color name="custom_style_on_primary_800">#000000</color>
+    <color name="custom_style_on_primary_900">#000000</color>
+</resources>

catalog/src/main/res/values/colors.xml

@@ -102,4 +102,26 @@
     <color name="onSurfaceVariant_neutral_variant_80">#C4C7C5</color>
 
     <color name="outline_neutral_variant_60">#8E918F</color>
+
+    <!--  colors for custom style example  -->
+    <color name="custom_style_primary_900">#7A9FFF</color>
+    <color name="custom_style_primary_800">#668FFF</color>
+    <color name="custom_style_primary_700">#5581FF</color>
+    <color name="custom_style_primary_600">#476FFF</color>
+    <color name="custom_style_primary_500">#3B5CFF</color>
+    <color name="custom_style_primary_400">#3249FF</color>
+    <color name="custom_style_primary_300">#2936FF</color>
+    <color name="custom_style_primary_200">#2024FF</color>
+    <color name="custom_style_primary_100">#1816FF</color>
+    <color name="custom_style_on_primary">#FFFFFF</color>
+    <color name="custom_style_on_primary_900">#FFFFFF</color>
+    <color name="custom_style_on_primary_800">#FFFFFF</color>
+    <color name="custom_style_on_primary_700">#FFFFFF</color>
+    <color name="custom_style_on_primary_600">#FFFFFF</color>
+    <color name="custom_style_on_primary_500">#FFFFFF</color>
+    <color name="custom_style_on_primary_400">#FFFFFF</color>
+    <color name="custom_style_on_primary_300">#FFFFFF</color>
+    <color name="custom_style_on_primary_200">#FFFFFF</color>
+    <color name="custom_style_on_primary_100">#FFFFFF</color>
+
 </resources>

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

@@ -37,6 +37,9 @@
     <string name="component_name_repeated_group">Repeated Group</string>
     <string name="component_name_attachment">Attachment</string>
     <string name="component_name_location_widget">Location Widget</string>
+    <string
+        name="component_name_per_question_custom_style"
+    >Per question custom style</string>
     <string name="layout_name_default_text">Default</string>
     <string name="layout_name_paginated">Paginated</string>
     <string name="layout_name_review">Review</string>