Bugfix: Font Family resolving in Release Builds (#57)

* use Dancing Script as font family for H3 * makes the release buildtype buildable * fixes font family path check for release builds * adds a rubik font family to MdcThemeTest * adjusts comment according to the changes * adds copyright header to the font family XMLs
material-components · Mar 19, 2021 · 6928cc6 · 6928cc6
1 parent 6ae4ad7
commit 6928cc6
Show file tree

Hide file tree

Showing 12 changed files with 85 additions and 5 deletions.
diff --git a/lib/src/androidTest/java/com/google/android/material/composethemeadapter/MdcThemeTest.kt b/lib/src/androidTest/java/com/google/android/material/composethemeadapter/MdcThemeTest.kt
@@ -131,9 +131,14 @@ class MdcThemeTest<T : AppCompatActivity>(activityClass: Class<T>) {
             val typography = MaterialTheme.typography
             val density = LocalDensity.current
 
+            val rubik = FontFamily(
+                Font(resId = R.font.rubik_300, weight = FontWeight.W300),
+                Font(resId = R.font.rubik_400, weight = FontWeight.W400),
+                Font(resId = R.font.rubik_500, weight = FontWeight.W500),
+                Font(resId = R.font.rubik_700, weight = FontWeight.W700)
+            )
             val rubik300 = Font(R.font.rubik_300).toFontFamily()
             val rubik400 = Font(R.font.rubik_400).toFontFamily()
-            val rubik500 = Font(R.font.rubik_500).toFontFamily()
             val sansSerif = FontFamilyWithWeight(FontFamily.SansSerif)
             val sansSerifLight = FontFamilyWithWeight(FontFamily.SansSerif, FontWeight.Light)
             val sansSerifBlack = FontFamilyWithWeight(FontFamily.SansSerif, FontWeight.Black)
@@ -198,7 +203,7 @@ class MdcThemeTest<T : AppCompatActivity>(activityClass: Class<T>) {
             }
 
             typography.button.run {
-                assertEquals(rubik500, fontFamily)
+                assertEquals(rubik, fontFamily)
             }
 
             typography.caption.run {

diff --git a/lib/src/androidTest/res/font/rubik.xml b/lib/src/androidTest/res/font/rubik.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2020 The Android Open Source Project
+  ~
+  ~ 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
+  ~
+  ~      https://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.
+  -->
+
+<font-family xmlns:app="http://schemas.android.com/apk/res-auto">
+    <font
+        app:font="@font/rubik_300"
+        app:fontWeight="300" />
+    <font
+        app:font="@font/rubik_400"
+        app:fontWeight="400" />
+    <font
+        app:font="@font/rubik_500"
+        app:fontWeight="500" />
+    <font
+        app:font="@font/rubik_700"
+        app:fontWeight="700" />
+</font-family>
diff --git a/lib/src/androidTest/res/values/type.xml b/lib/src/androidTest/res/values/type.xml
@@ -66,7 +66,7 @@
     </style>
 
     <style name="TextAppearance.MdcThemeTest.Button" parent="TextAppearance.MaterialComponents.Button">
-        <item name="fontFamily">@font/rubik_500</item>
+        <item name="fontFamily">@font/rubik</item>
     </style>
 
     <style name="TextAppearance.MdcThemeTest.Caption" parent="TextAppearance.MaterialComponents.Caption">

diff --git a/lib/src/main/java/com/google/android/material/composethemeadapter/TypedArrayUtils.kt b/lib/src/main/java/com/google/android/material/composethemeadapter/TypedArrayUtils.kt
@@ -213,9 +213,9 @@ internal fun TypedArray.getFontFamilyOrNull(index: Int): FontFamilyWithWeight? {
             "monospace" -> FontFamilyWithWeight(FontFamily.Monospace)
             // TODO: Compose does not expose a FontFamily for all strings yet
             else -> {
-                // If there's a resource ID and the string starts with res/font,
+                // If there's a resource ID and the string starts with res/,
                 // it's probably a @font resource
-                if (tv.resourceId != 0 && tv.string.startsWith("res/font")) {
+                if (tv.resourceId != 0 && tv.string.startsWith("res/")) {
                     // If we're running on API 23+ and the resource is an XML, we can parse
                     // the fonts into a full FontFamily.
                     if (Build.VERSION.SDK_INT >= 23 && tv.string.endsWith(".xml")) {

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -44,6 +44,12 @@ android {
     composeOptions {
         kotlinCompilerExtensionVersion Libs.AndroidX.Compose.version
     }
+
+    buildTypes {
+        release {
+            signingConfig signingConfigs.debug
+        }
+    }
 }
 
 dependencies {

diff --git a/sample/src/main/res/font/dancingscript.xml b/sample/src/main/res/font/dancingscript.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2020 The Android Open Source Project
+  ~
+  ~ 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
+  ~
+  ~      https://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.
+  -->
+
+<font-family xmlns:app="http://schemas.android.com/apk/res-auto">
+    <font
+        app:font="@font/dancingscript_regular"
+        app:fontWeight="400" />
+    <font
+        app:font="@font/dancingscript_medium"
+        app:fontWeight="500" />
+    <font
+        app:font="@font/dancingscript_semibold"
+        app:fontWeight="600" />
+    <font
+        app:font="@font/dancingscript_bold"
+        app:fontWeight="700" />
+</font-family>
diff --git a/sample/src/main/res/font/dancingscript_bold.ttf b/sample/src/main/res/font/dancingscript_bold.ttf
diff --git a/sample/src/main/res/font/dancingscript_medium.ttf b/sample/src/main/res/font/dancingscript_medium.ttf
diff --git a/sample/src/main/res/font/dancingscript_regular.ttf b/sample/src/main/res/font/dancingscript_regular.ttf
diff --git a/sample/src/main/res/font/dancingscript_semibold.ttf b/sample/src/main/res/font/dancingscript_semibold.ttf
diff --git a/sample/src/main/res/values/themes.xml b/sample/src/main/res/values/themes.xml
@@ -23,6 +23,7 @@
         <item name="colorSecondary">@color/pink_a200</item>
         <item name="colorSecondaryVariant">@color/pink_dark</item>
 
+        <item name="textAppearanceHeadline3">@style/TextAppearance.Sample.Headline3</item>
         <item name="textAppearanceSubtitle1">@style/TextAppearance.Sample.Subtitle1</item>
         <item name="textAppearanceCaption">@style/TextAppearance.Sample.Caption</item>
 

diff --git a/sample/src/main/res/values/type.xml b/sample/src/main/res/values/type.xml
@@ -15,6 +15,12 @@
   -->
 
 <resources>
+
+    <style name="TextAppearance.Sample.Headline3"
+        parent="TextAppearance.MaterialComponents.Headline3">
+        <item name="fontFamily">@font/dancingscript</item>
+    </style>
+
     <!-- Use TextAppearance.AppCompat.Subhead as parent to avoid inheriting letterSpacing -->
     <style name="TextAppearance.Sample.Subtitle1"
         parent="TextAppearance.AppCompat.Subhead">