Skip to content

Commit 7225cfb

Browse files
TalbotGoodayTalbotGooday
committed
Wrapped crash with downloadable fonts
1 parent f3045a5 commit 7225cfb

File tree

6 files changed

+64
-14
lines changed

6 files changed

+64
-14
lines changed

‎app/src/main/AndroidManifest.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@
2323
</activity>
2424

2525
<activity android:name=".list_screen.ListActivity" />
26+
27+
<meta-data
28+
android:name="preloaded_fonts"
29+
android:resource="@array/preloaded_fonts" />
2630
</application>
2731

2832
</manifest>

‎app/src/main/res/font/aclonica.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<font-family xmlns:app="http://schemas.android.com/apk/res-auto"
3+
app:fontProviderAuthority="com.google.android.gms.fonts"
4+
app:fontProviderPackage="com.google.android.gms"
5+
app:fontProviderQuery="Aclonica"
6+
app:fontProviderCerts="@array/com_google_android_gms_fonts_certs">
7+
</font-family>

‎app/src/main/res/layout/activity_main.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,19 @@
140140
app:avBorderWidth="5dp"
141141
app:iconDrawableScale="1"
142142
app:placeholderText="OMG" />
143+
144+
<com.goodayapps.widget.AvatarView
145+
android:id="@+id/downloadable_avatar"
146+
style="@style/AvatarStyleHelper"
147+
android:layout_width="@dimen/avatar_size"
148+
android:layout_height="@dimen/avatar_size"
149+
android:fontFamily="@font/aclonica"
150+
android:scaleType="centerCrop"
151+
app:avBorderColor="#FF0000"
152+
app:avBorderColorSecondary="#FF9D00"
153+
app:avBorderWidth="5dp"
154+
app:iconDrawableScale="1"
155+
app:placeholderText="OMG" />
143156
</GridLayout>
144157

145158
<LinearLayout

‎app/src/main/res/values/font_certs.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<array name="com_google_android_gms_fonts_certs">
4+
<item>@array/com_google_android_gms_fonts_certs_dev</item>
5+
<item>@array/com_google_android_gms_fonts_certs_prod</item>
6+
</array>
7+
<string-array name="com_google_android_gms_fonts_certs_dev">
8+
<item>
9+
MIIEqDCCA5CgAwIBAgIJANWFuGx90071MA0GCSqGSIb3DQEBBAUAMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAeFw0wODA0MTUyMzM2NTZaFw0zNTA5MDEyMzM2NTZaMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBANbOLggKv+IxTdGNs8/TGFy0PTP6DHThvbbR24kT9ixcOd9W+EaBPWW+wPPKQmsHxajtWjmQwWfna8mZuSeJS48LIgAZlKkpFeVyxW0qMBujb8X8ETrWy550NaFtI6t9+u7hZeTfHwqNvacKhp1RbE6dBRGWynwMVX8XW8N1+UjFaq6GCJukT4qmpN2afb8sCjUigq0GuMwYXrFVee74bQgLHWGJwPmvmLHC69EH6kWr22ijx4OKXlSIx2xT1AsSHee70w5iDBiK4aph27yH3TxkXy9V89TDdexAcKk/cVHYNnDBapcavl7y0RiQ4biu8ymM8Ga/nmzhRKya6G0cGw8CAQOjgfwwgfkwHQYDVR0OBBYEFI0cxb6VTEM8YYY6FbBMvAPyT+CyMIHJBgNVHSMEgcEwgb6AFI0cxb6VTEM8YYY6FbBMvAPyT+CyoYGapIGXMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbYIJANWFuGx90071MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBABnTDPEF+3iSP0wNfdIjIz1AlnrPzgAIHVvXxunW7SBrDhEglQZBbKJEk5kT0mtKoOD1JMrSu1xuTKEBahWRbqHsXclaXjoBADb0kkjVEJu/Lh5hgYZnOjvlba8Ld7HCKePCVePoTJBdI4fvugnL8TsgK05aIskyY0hKI9L8KfqfGTl1lzOv2KoWD0KWwtAWPoGChZxmQ+nBli+gwYMzM1vAkP+aayLe0a1EQimlOalO762r0GXO0ks+UeXde2Z4e+8S/pf7pITEI/tP+MxJTALw9QUWEv9lKTk+jkbqxbsh8nfBUapfKqYn0eidpwq2AzVp3juYl7//fKnaPhJD9gs=
10+
</item>
11+
</string-array>
12+
<string-array name="com_google_android_gms_fonts_certs_prod">
13+
<item>
14+
MIIEQzCCAyugAwIBAgIJAMLgh0ZkSjCNMA0GCSqGSIb3DQEBBAUAMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDAeFw0wODA4MjEyMzEzMzRaFw0zNjAxMDcyMzEzMzRaMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBAKtWLgDYO6IIrgqWbxJOKdoR8qtW0I9Y4sypEwPpt1TTcvZApxsdyxMJZ2JORland2qSGT2y5b+3JKkedxiLDmpHpDsz2WCbdxgxRczfey5YZnTJ4VZbH0xqWVW/8lGmPav5xVwnIiJS6HXk+BVKZF+JcWjAsb/GEuq/eFdpuzSqeYTcfi6idkyugwfYwXFU1+5fZKUaRKYCwkkFQVfcAs1fXA5V+++FGfvjJ/CxURaSxaBvGdGDhfXE28LWuT9ozCl5xw4Yq5OGazvV24mZVSoOO0yZ31j7kYvtwYK6NeADwbSxDdJEqO4k//0zOHKrUiGYXtqw/A0LFFtqoZKFjnkCAQOjgdkwgdYwHQYDVR0OBBYEFMd9jMIhF1Ylmn/Tgt9r45jk14alMIGmBgNVHSMEgZ4wgZuAFMd9jMIhF1Ylmn/Tgt9r45jk14aloXikdjB0MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLR29vZ2xlIEluYy4xEDAOBgNVBAsTB0FuZHJvaWQxEDAOBgNVBAMTB0FuZHJvaWSCCQDC4IdGZEowjTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4IBAQBt0lLO74UwLDYKqs6Tm8/yzKkEu116FmH4rkaymUIE0P9KaMftGlMexFlaYjzmB2OxZyl6euNXEsQH8gjwyxCUKRJNexBiGcCEyj6z+a1fuHHvkiaai+KL8W1EyNmgjmyy8AW7P+LLlkR+ho5zEHatRbM/YAnqGcFh5iZBqpknHf1SKMXFh4dd239FJ1jWYfbMDMy3NS5CTMQ2XFI1MvcyUTdZPErjQfTbQe3aDQsQcafEQPD+nqActifKZ0Np0IS9L9kR/wbNvyz6ENwPiTrjV2KRkEjH78ZMcUQXg0L3BYHJ3lc69Vs5Ddf9uUGGMYldX3WfMBEmh/9iFBDAaTCK
15+
</item>
16+
</string-array>
17+
</resources>

‎app/src/main/res/values/preloaded_fonts.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<array name="preloaded_fonts" translatable="false">
4+
<item>@font/aclonica</item>
5+
</array>
6+
</resources>

‎avatar-view/src/main/java/com/goodayapps/widget/utils/TypedArray.kt‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,24 @@ import androidx.core.content.res.ResourcesCompat
99

1010
@ColorInt
1111
fun TypedArray.getColorOrNull(@StyleableRes index: Int): Int? {
12-
val color = getColor(index, Integer.MAX_VALUE)
12+
val color = getColor(index, Integer.MAX_VALUE)
1313

14-
return if (color == Integer.MAX_VALUE) {
15-
null
16-
} else {
17-
color
18-
}
14+
return if (color == Integer.MAX_VALUE) {
15+
null
16+
} else {
17+
color
18+
}
1919
}
2020

2121
fun TypedArray.getTypefaceOrNull(context: Context, @StyleableRes index: Int): Typeface? {
22-
val resId = getResourceId(index, 0)
23-
24-
return if (resId != 0) {
25-
ResourcesCompat.getFont(context, resId)
26-
}else{
27-
null
28-
}
29-
}
22+
return try {
23+
val resId = getResourceId(index, 0)
24+
if (resId != 0) {
25+
ResourcesCompat.getFont(context, resId)
26+
} else {
27+
null
28+
}
29+
} catch (e: Exception) {
30+
null
31+
}
32+
}

0 commit comments

Comments
 (0)