From 772311ba0e2538ef852c37b742b39348e15e83c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?=
 =?UTF-8?q?=D0=97=D0=B0=D1=86=D0=B5=D0=BF=D0=B8=D0=BD?= <az@mapswithme.com>
Date: Thu, 13 Feb 2020 15:16:54 +0300
Subject: [PATCH] [android] Added headlines fonts size and styles to fit our
 google guidelines in figma

---
 android/res/values/font_sizes.xml   |  7 +++++++
 android/res/values/styles-text.xml  | 19 +++++++++++++++++++
 android/res/values/themes-attrs.xml |  9 +++++++++
 android/res/values/themes-base.xml  | 12 ++++++++++++
 4 files changed, 47 insertions(+)

diff --git a/android/res/values/font_sizes.xml b/android/res/values/font_sizes.xml
index 1d81b5036c..841fb0dc23 100644
--- a/android/res/values/font_sizes.xml
+++ b/android/res/values/font_sizes.xml
@@ -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 -->
 
   <!-- -->
diff --git a/android/res/values/styles-text.xml b/android/res/values/styles-text.xml
index 18cc9c7dde..54f77e52d0 100644
--- a/android/res/values/styles-text.xml
+++ b/android/res/values/styles-text.xml
@@ -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>
diff --git a/android/res/values/themes-attrs.xml b/android/res/values/themes-attrs.xml
index 448f60d2b6..7ef5fbe399 100644
--- a/android/res/values/themes-attrs.xml
+++ b/android/res/values/themes-attrs.xml
@@ -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>
diff --git a/android/res/values/themes-base.xml b/android/res/values/themes-base.xml
index 1f83545896..1d5f885d84 100644
--- a/android/res/values/themes-base.xml
+++ b/android/res/values/themes-base.xml
@@ -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>