pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Added headlines fonts size and styles to fit our google guidelines in figma

Browse source
This commit is contained in:
Александр Зацепин 2020-02-13 15:16:54 +03:00 • committed by yoksnod
parent 0fb029ad72
commit 772311ba0e
4 changed files with 47 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
android/res/values/font_sizes.xml
View file

@ -25,6 +25,13 @@
<dimen name="line_spacing_extra_1">4sp</dimen>
<dimen name="line_spacing_extra_2">6sp</dimen>
<dimen name="text_size_h6_headline">20sp</dimen>
<dimen name="text_size_h5_headline">24sp</dimen>
<dimen name="text_size_h4_headline">34sp</dimen>
<dimen name="text_size_h3_headline">48sp</dimen>
<dimen name="text_size_h2_headline">60sp</dimen>
<dimen name="test_size_h1_headline">96sp</dimen>
<!-- BASE TEXT SIZES -->
<!-- -->

19
android/res/values/styles-text.xml
View file

@ -234,4 +234,23 @@
<item name="android:textColor">?attr/filterPropertyTextColor</item>
<item name="android:background">?filterPropertyBackground</item>
</style>
<style name="Headline.H6" parent="TextAppearance.AppCompat.Title">
<item name="android:textSize">@dimen/text_size_h6_headline</item>
</style>
<style name="Headline.H5" parent="TextAppearance.AppCompat.Headline">
<item name="android:textSize">@dimen/text_size_h5_headline</item>
</style>
<style name="Headline.H4" parent="TextAppearance.AppCompat.Display1">
<item name="android:textSize">@dimen/text_size_h4_headline</item>
</style>
<style name="Headline.H3" parent="TextAppearance.AppCompat.Display2">
<item name="android:textSize">@dimen/text_size_h3_headline</item>
</style>
<style name="Headline.H2" parent="TextAppearance.AppCompat.Display3">
<item name="android:textSize">@dimen/text_size_h2_headline</item>
</style>
<style name="Headline.H1" parent="TextAppearance.AppCompat.Display4">
<item name="android:textSize">@dimen/test_size_h1_headline</item>
</style>
</resources>

9
android/res/values/themes-attrs.xml
View file

@ -138,4 +138,13 @@
<attr name="subscriptionTitleColor" format="color"/>
<attr name="subscriptionSubtitleColor" format="color"/>
</declare-styleable>
<declare-styleable name="ThemeAttrs.Fonts">
<attr name="fontHeadline1" format="reference"/>
<attr name="fontHeadline2" format="reference"/>
<attr name="fontHeadline3" format="reference"/>
<attr name="fontHeadline4" format="reference"/>
<attr name="fontHeadline5" format="reference"/>
<attr name="fontHeadline6" format="reference"/>
</declare-styleable>
</resources>

12
android/res/values/themes-base.xml
View file

@ -152,6 +152,12 @@
<item name="android:textAppearanceSmallInverse">@style/TextAppearance.Small.Inverse</item>
<item name="android:textAppearanceMediumInverse">@style/TextAppearance.Medium.Inverse</item>
<item name="android:textAppearanceLargeInverse">@style/TextAppearance.Large.Inverse</item>
<item name="fontHeadline1">@style/Headline.H1</item>
<item name="fontHeadline2">@style/Headline.H2</item>
<item name="fontHeadline3">@style/Headline.H3</item>
<item name="fontHeadline4">@style/Headline.H4</item>
<item name="fontHeadline5">@style/Headline.H5</item>
<item name="fontHeadline6">@style/Headline.H6</item>
<item name="drivingOptionsViewBg">@color/light_green</item>
<item name="bookmarkSubscriptionScreenBg">@drawable/bookmark_subscription_screen_bg</item>
<item name="bookmarkSubscriptionCardEdge">@drawable/subscription_card_edge</item>
@ -313,6 +319,12 @@
<item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
<item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
<item name="android:textAppearanceLarge">@style/TextAppearance.Large</item>
<item name="fontHeadline1">@style/Headline.H1</item>
<item name="fontHeadline2">@style/Headline.H2</item>
<item name="fontHeadline3">@style/Headline.H3</item>
<item name="fontHeadline4">@style/Headline.H4</item>
<item name="fontHeadline5">@style/Headline.H5</item>
<item name="fontHeadline6">@style/Headline.H6</item>
<item name="drivingOptionsViewBg">@color/driving_options_bg_black</item>
<item name="bookmarkSubscriptionScreenBg">@drawable/bookmark_subscription_screen_bg_night</item>
<item name="bookmarkSubscriptionCardEdge">@drawable/subscription_card_edge</item>