Add google sans for dev
This commit is contained in:
parent
7db515bb16
commit
547b76bbde
5 changed files with 77 additions and 11 deletions
|
@ -266,5 +266,8 @@
|
||||||
<meta-data
|
<meta-data
|
||||||
android:name="com.android.vending.splits.required"
|
android:name="com.android.vending.splits.required"
|
||||||
android:value="true" />
|
android:value="true" />
|
||||||
|
<meta-data
|
||||||
|
android:name="preloaded_fonts"
|
||||||
|
android:resource="@array/preloaded_fonts" />
|
||||||
</application>
|
</application>
|
||||||
</manifest>
|
</manifest>
|
||||||
|
|
7
app/src/main/res/font/google_san.xml
Normal file
7
app/src/main/res/font/google_san.xml
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<font-family xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
app:fontProviderAuthority="com.google.android.gms.fonts"
|
||||||
|
app:fontProviderPackage="com.google.android.gms"
|
||||||
|
app:fontProviderQuery="Google Sans"
|
||||||
|
app:fontProviderCerts="@array/com_google_android_gms_fonts_certs">
|
||||||
|
</font-family>
|
17
app/src/main/res/values/font_certs.xml
Normal file
17
app/src/main/res/values/font_certs.xml
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
<array name="com_google_android_gms_fonts_certs">
|
||||||
|
<item>@array/com_google_android_gms_fonts_certs_dev</item>
|
||||||
|
<item>@array/com_google_android_gms_fonts_certs_prod</item>
|
||||||
|
</array>
|
||||||
|
<string-array name="com_google_android_gms_fonts_certs_dev">
|
||||||
|
<item>
|
||||||
|
MIIEqDCCA5CgAwIBAgIJANWFuGx90071MA0GCSqGSIb3DQEBBAUAMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAeFw0wODA0MTUyMzM2NTZaFw0zNTA5MDEyMzM2NTZaMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBANbOLggKv+IxTdGNs8/TGFy0PTP6DHThvbbR24kT9ixcOd9W+EaBPWW+wPPKQmsHxajtWjmQwWfna8mZuSeJS48LIgAZlKkpFeVyxW0qMBujb8X8ETrWy550NaFtI6t9+u7hZeTfHwqNvacKhp1RbE6dBRGWynwMVX8XW8N1+UjFaq6GCJukT4qmpN2afb8sCjUigq0GuMwYXrFVee74bQgLHWGJwPmvmLHC69EH6kWr22ijx4OKXlSIx2xT1AsSHee70w5iDBiK4aph27yH3TxkXy9V89TDdexAcKk/cVHYNnDBapcavl7y0RiQ4biu8ymM8Ga/nmzhRKya6G0cGw8CAQOjgfwwgfkwHQYDVR0OBBYEFI0cxb6VTEM8YYY6FbBMvAPyT+CyMIHJBgNVHSMEgcEwgb6AFI0cxb6VTEM8YYY6FbBMvAPyT+CyoYGapIGXMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbYIJANWFuGx90071MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBABnTDPEF+3iSP0wNfdIjIz1AlnrPzgAIHVvXxunW7SBrDhEglQZBbKJEk5kT0mtKoOD1JMrSu1xuTKEBahWRbqHsXclaXjoBADb0kkjVEJu/Lh5hgYZnOjvlba8Ld7HCKePCVePoTJBdI4fvugnL8TsgK05aIskyY0hKI9L8KfqfGTl1lzOv2KoWD0KWwtAWPoGChZxmQ+nBli+gwYMzM1vAkP+aayLe0a1EQimlOalO762r0GXO0ks+UeXde2Z4e+8S/pf7pITEI/tP+MxJTALw9QUWEv9lKTk+jkbqxbsh8nfBUapfKqYn0eidpwq2AzVp3juYl7//fKnaPhJD9gs=
|
||||||
|
</item>
|
||||||
|
</string-array>
|
||||||
|
<string-array name="com_google_android_gms_fonts_certs_prod">
|
||||||
|
<item>
|
||||||
|
MIIEQzCCAyugAwIBAgIJAMLgh0ZkSjCNMA0GCSqGSIb3DQEBBAUAMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDAeFw0wODA4MjEyMzEzMzRaFw0zNjAxMDcyMzEzMzRaMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBAKtWLgDYO6IIrgqWbxJOKdoR8qtW0I9Y4sypEwPpt1TTcvZApxsdyxMJZ2JORland2qSGT2y5b+3JKkedxiLDmpHpDsz2WCbdxgxRczfey5YZnTJ4VZbH0xqWVW/8lGmPav5xVwnIiJS6HXk+BVKZF+JcWjAsb/GEuq/eFdpuzSqeYTcfi6idkyugwfYwXFU1+5fZKUaRKYCwkkFQVfcAs1fXA5V+++FGfvjJ/CxURaSxaBvGdGDhfXE28LWuT9ozCl5xw4Yq5OGazvV24mZVSoOO0yZ31j7kYvtwYK6NeADwbSxDdJEqO4k//0zOHKrUiGYXtqw/A0LFFtqoZKFjnkCAQOjgdkwgdYwHQYDVR0OBBYEFMd9jMIhF1Ylmn/Tgt9r45jk14alMIGmBgNVHSMEgZ4wgZuAFMd9jMIhF1Ylmn/Tgt9r45jk14aloXikdjB0MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLR29vZ2xlIEluYy4xEDAOBgNVBAsTB0FuZHJvaWQxEDAOBgNVBAMTB0FuZHJvaWSCCQDC4IdGZEowjTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4IBAQBt0lLO74UwLDYKqs6Tm8/yzKkEu116FmH4rkaymUIE0P9KaMftGlMexFlaYjzmB2OxZyl6euNXEsQH8gjwyxCUKRJNexBiGcCEyj6z+a1fuHHvkiaai+KL8W1EyNmgjmyy8AW7P+LLlkR+ho5zEHatRbM/YAnqGcFh5iZBqpknHf1SKMXFh4dd239FJ1jWYfbMDMy3NS5CTMQ2XFI1MvcyUTdZPErjQfTbQe3aDQsQcafEQPD+nqActifKZ0Np0IS9L9kR/wbNvyz6ENwPiTrjV2KRkEjH78ZMcUQXg0L3BYHJ3lc69Vs5Ddf9uUGGMYldX3WfMBEmh/9iFBDAaTCK
|
||||||
|
</item>
|
||||||
|
</string-array>
|
||||||
|
</resources>
|
6
app/src/main/res/values/preloaded_fonts.xml
Normal file
6
app/src/main/res/values/preloaded_fonts.xml
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
<array name="preloaded_fonts" translatable="false">
|
||||||
|
<item>@font/google_san</item>
|
||||||
|
</array>
|
||||||
|
</resources>
|
|
@ -5,16 +5,22 @@
|
||||||
<style name="Theme.RetroMusic.Light" parent="Theme.RetroMusic.Base.Light">
|
<style name="Theme.RetroMusic.Light" parent="Theme.RetroMusic.Base.Light">
|
||||||
<item name="android:windowBackground">@color/window_color_light</item>
|
<item name="android:windowBackground">@color/window_color_light</item>
|
||||||
<item name="android:scrollbars">none</item>
|
<item name="android:scrollbars">none</item>
|
||||||
|
<item name="fontFamily">@font/google_san</item>
|
||||||
|
<item name="android:fontFamily">@font/google_san</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="Theme.RetroMusic.Black" parent="Theme.RetroMusic.Base.Black">
|
<style name="Theme.RetroMusic.Black" parent="Theme.RetroMusic.Base.Black">
|
||||||
<item name="android:windowBackground">@color/window_color_dark</item>
|
<item name="android:windowBackground">@color/window_color_dark</item>
|
||||||
<item name="android:scrollbars">none</item>
|
<item name="android:scrollbars">none</item>
|
||||||
|
<item name="fontFamily">@font/google_san</item>
|
||||||
|
<item name="android:fontFamily">@font/google_san</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="Theme.RetroMusic.FollowSystem" parent="Theme.RetroMusic.Base.Adaptive">
|
<style name="Theme.RetroMusic.FollowSystem" parent="Theme.RetroMusic.Base.Adaptive">
|
||||||
<item name="android:windowBackground">@color/window_color</item>
|
<item name="android:windowBackground">@color/window_color</item>
|
||||||
<item name="android:scrollbars">none</item>
|
<item name="android:scrollbars">none</item>
|
||||||
|
<item name="fontFamily">@font/google_san</item>
|
||||||
|
<item name="android:fontFamily">@font/google_san</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="Theme.RetroMusic.Notification" parent="@android:style/TextAppearance.StatusBar.EventContent" />
|
<style name="Theme.RetroMusic.Notification" parent="@android:style/TextAppearance.StatusBar.EventContent" />
|
||||||
|
@ -44,12 +50,13 @@
|
||||||
<item name="contentInsetStartWithNavigation">0dp</item>
|
<item name="contentInsetStartWithNavigation">0dp</item>
|
||||||
<item name="contentInsetStart">0dp</item>
|
<item name="contentInsetStart">0dp</item>
|
||||||
<item name="titleMarginStart">16dp</item>
|
<item name="titleMarginStart">16dp</item>
|
||||||
|
<item name="android:fontFamily">@font/google_san</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|
||||||
<style name="ToolbarTextAppearanceSearch" parent="ThemeOverlay.MaterialComponents.Toolbar.Surface">
|
<style name="ToolbarTextAppearanceSearch" parent="ThemeOverlay.MaterialComponents.Toolbar.Surface">
|
||||||
<item name="android:textSize">16sp</item>
|
<item name="android:textSize">16sp</item>
|
||||||
|
<item name="android:fontFamily">@font/google_san</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="ToolbarTextAppearanceNormal">
|
<style name="ToolbarTextAppearanceNormal">
|
||||||
|
@ -58,13 +65,16 @@
|
||||||
<item name="android:textSize">20sp</item>
|
<item name="android:textSize">20sp</item>
|
||||||
<item name="android:letterSpacing">0.0125</item>
|
<item name="android:letterSpacing">0.0125</item>
|
||||||
<item name="android:textColor">?android:attr/textColorPrimary</item>
|
<item name="android:textColor">?android:attr/textColorPrimary</item>
|
||||||
|
<item name="android:fontFamily">@font/google_san</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="ToolbarTextAppearanceNormal.Library" parent="ToolbarTextAppearanceNormal">
|
<style name="ToolbarTextAppearanceNormal.Library" parent="ToolbarTextAppearanceNormal">
|
||||||
<item name="android:textAppearance">@style/TextViewHeadline6</item>
|
<item name="android:textAppearance">@style/TextViewHeadline6</item>
|
||||||
|
<item name="android:fontFamily">@font/google_san</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="BigTitleTextAppearanceToolbar">
|
<style name="BigTitleTextAppearanceToolbar">
|
||||||
|
<item name="android:fontFamily">@font/google_san</item>
|
||||||
<item name="android:textAppearance">@style/TextViewHeadline6</item>
|
<item name="android:textAppearance">@style/TextViewHeadline6</item>
|
||||||
<item name="android:layout_width">wrap_content</item>
|
<item name="android:layout_width">wrap_content</item>
|
||||||
<item name="android:layout_height">wrap_content</item>
|
<item name="android:layout_height">wrap_content</item>
|
||||||
|
@ -73,6 +83,7 @@
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="SubTitleTextAppearance">
|
<style name="SubTitleTextAppearance">
|
||||||
|
<item name="android:fontFamily">@font/google_san</item>
|
||||||
<item name="android:textAppearance">@style/TextViewOverline</item>
|
<item name="android:textAppearance">@style/TextViewOverline</item>
|
||||||
<item name="android:layout_gravity">start|center_vertical</item>
|
<item name="android:layout_gravity">start|center_vertical</item>
|
||||||
<item name="android:padding">12dp</item>
|
<item name="android:padding">12dp</item>
|
||||||
|
@ -82,6 +93,7 @@
|
||||||
|
|
||||||
<style name="BottomSheetItemTextAppearance" parent="Widget.MaterialComponents.BottomNavigationView.Colored">
|
<style name="BottomSheetItemTextAppearance" parent="Widget.MaterialComponents.BottomNavigationView.Colored">
|
||||||
<item name="android:textSize">13sp</item>
|
<item name="android:textSize">13sp</item>
|
||||||
|
<item name="android:fontFamily">@font/google_san</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="Fab" parent="FabParent" />
|
<style name="Fab" parent="FabParent" />
|
||||||
|
@ -90,6 +102,7 @@
|
||||||
<item name="android:textAllCaps">false</item>
|
<item name="android:textAllCaps">false</item>
|
||||||
<item name="textAllCaps">false</item>
|
<item name="textAllCaps">false</item>
|
||||||
<item name="android:textStyle">bold</item>
|
<item name="android:textStyle">bold</item>
|
||||||
|
<item name="android:fontFamily">@font/google_san</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="TabLayoutStyle" parent="Base.Widget.Design.TabLayout">
|
<style name="TabLayoutStyle" parent="Base.Widget.Design.TabLayout">
|
||||||
|
@ -104,38 +117,58 @@
|
||||||
<item name="android:layout_height">wrap_content</item>
|
<item name="android:layout_height">wrap_content</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="ErrorHandlingTheme" parent="Theme.MaterialComponents.Light.NoActionBar" />
|
<style name="ErrorHandlingTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
|
||||||
|
<item name="android:fontFamily">@font/google_san</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
<style name="TextViewNormal">
|
<style name="TextViewNormal">
|
||||||
<item name="android:textSize">14sp</item>
|
<item name="android:textSize">14sp</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="TextViewHeadline4" parent="TextAppearance.MaterialComponents.Headline4" />
|
<style name="TextViewHeadline4" parent="TextAppearance.MaterialComponents.Headline4">
|
||||||
|
<item name="android:fontFamily">@font/google_san</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
<style name="TextViewHeadline5" parent="TextAppearance.MaterialComponents.Headline5" />
|
<style name="TextViewHeadline5" parent="TextAppearance.MaterialComponents.Headline5">
|
||||||
|
<item name="android:fontFamily">@font/google_san</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
<style name="TextViewCaption" parent="TextAppearance.MaterialComponents.Caption" />
|
<style name="TextViewCaption" parent="TextAppearance.MaterialComponents.Caption">
|
||||||
|
<item name="android:fontFamily">@font/google_san</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
<style name="TextViewHeadline6" parent="TextAppearance.MaterialComponents.Headline6" />
|
<style name="TextViewHeadline6" parent="TextAppearance.MaterialComponents.Headline6">
|
||||||
|
<item name="android:fontFamily">@font/google_san</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
<style name="TextViewHeadline3" parent="TextAppearance.MaterialComponents.Headline3" />
|
<style name="TextViewHeadline3" parent="TextAppearance.MaterialComponents.Headline3">
|
||||||
|
<item name="android:fontFamily">@font/google_san</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
<style name="TextViewHeadline2" parent="TextAppearance.MaterialComponents.Headline2" />
|
<style name="TextViewHeadline2" parent="TextAppearance.MaterialComponents.Headline2">
|
||||||
|
<item name="android:fontFamily">@font/google_san</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
<style name="TextViewSubtitle1" parent="TextAppearance.MaterialComponents.Subtitle1" />
|
<style name="TextViewSubtitle1" parent="TextAppearance.MaterialComponents.Subtitle1">
|
||||||
|
<item name="android:fontFamily">@font/google_san</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
<style name="TextViewSubtitle2" parent="TextAppearance.MaterialComponents.Subtitle2" />
|
<style name="TextViewSubtitle2" parent="TextAppearance.MaterialComponents.Subtitle2">
|
||||||
|
<item name="android:fontFamily">@font/google_san</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
<style name="TextViewBody1" parent="TextAppearance.MaterialComponents.Body1">
|
<style name="TextViewBody1" parent="TextAppearance.MaterialComponents.Body1">
|
||||||
<item name="lineHeightHint">24sp</item>
|
<item name="lineHeightHint">24sp</item>
|
||||||
|
<item name="android:fontFamily">@font/google_san</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="TextViewBody2" parent="TextAppearance.MaterialComponents.Body2">
|
<style name="TextViewBody2" parent="TextAppearance.MaterialComponents.Body2">
|
||||||
<item name="lineHeightHint">24sp</item>
|
<item name="lineHeightHint">24sp</item>
|
||||||
|
<item name="android:fontFamily">@font/google_san</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="TextViewOverline" parent="TextAppearance.MaterialComponents.Overline">
|
<style name="TextViewOverline" parent="TextAppearance.MaterialComponents.Overline">
|
||||||
|
<item name="android:fontFamily">@font/google_san</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="TopCornerCardView">
|
<style name="TopCornerCardView">
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue