Introduce textAppearanceLabelExtraLarge attribute

getodk · May 4, 2023 · 5f4026e · 5f4026e
1 parent 35315b3
commit 5f4026e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/collect_app/src/main/res/layout/main_menu_button.xml b/collect_app/src/main/res/layout/main_menu_button.xml
@@ -28,8 +28,7 @@
         android:layout_marginHorizontal="@dimen/margin_standard"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textAppearance="?textAppearanceLabelLarge"
-        android:textSize="18sp"
+        android:textAppearance="?textAppearanceLabelExtraLarge"
         app:layout_constraintBottom_toBottomOf="@id/icon"
         app:layout_constraintEnd_toStartOf="@+id/number"
         app:layout_constraintStart_toEndOf="@id/icon"
@@ -41,8 +40,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/margin_extra_large"
-        android:textAppearance="?textAppearanceLabelLarge"
-        android:textSize="18sp"
+        android:textAppearance="?textAppearanceLabelExtraLarge"
         app:layout_constraintBottom_toBottomOf="@id/name"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/name"

diff --git a/collect_app/src/main/res/layout/start_new_from_button.xml b/collect_app/src/main/res/layout/start_new_from_button.xml
@@ -27,8 +27,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/margin_standard"
         android:ellipsize="end"
-        android:textAppearance="?textAppearanceLabelLarge"
-        android:textSize="18sp"
+        android:textAppearance="?textAppearanceLabelExtraLarge"
         android:maxLines="1"
         android:textColor="?colorOnPrimary"
         android:text="@string/enter_data"

diff --git a/collect_app/src/main/res/values/attrs.xml b/collect_app/src/main/res/values/attrs.xml
@@ -18,4 +18,8 @@
     <declare-styleable name="Material3PolyFill">
         <attr name="colorSurfaceContainerLow" format="color" />
     </declare-styleable>
+
+    <declare-styleable name="Material3">
+        <attr name="textAppearanceLabelExtraLarge" format="reference" />
+    </declare-styleable>
 </resources>
diff --git a/collect_app/src/main/res/values/styles.xml b/collect_app/src/main/res/values/styles.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <style name="TextAppearanceLabelExtraLarge" parent="TextAppearance.Material3.LabelLarge">
+        <item name="android:textSize">18sp</item>
+    </style>
 
     <style name="Widget.Collect.TextView.Empty" parent="Widget.AppCompat.TextView">
         <item name="android:layout_width">match_parent</item>

diff --git a/collect_app/src/main/res/values/theme.xml b/collect_app/src/main/res/values/theme.xml
@@ -58,6 +58,7 @@
 
         <item name="textAppearanceBodyLarge">?textAppearanceBody1</item>
         <item name="textAppearanceLabelLarge">@style/TextAppearance.Material3.LabelLarge</item>
+        <item name="textAppearanceLabelExtraLarge">@style/TextAppearanceLabelExtraLarge</item>
         <item name="textAppearanceTitleLarge">@style/TextAppearance.Material3.TitleLarge</item>
 
         <item name="shapeAppearanceCornerMedium">@style/ShapeAppearance.Material3.Corner.Medium</item>