Move line heights to theme text styles.

Change-Id: I6259471405b064ada7fcfcae3b6ac6f485113928

Author: nickbutcher

app/src/main/res/layout/course_item.xml

@@ -81,8 +81,7 @@
         android:lines="2"
         android:ellipsize="end"
         android:text="@{course.name}"
-        android:textAppearance="?attr/textAppearanceSubtitle1"
-        app:lineHeight="22sp"/>
+        android:textAppearance="?attr/textAppearanceSubtitle1"/>
 
     <ImageView
         android:id="@+id/course_icon"

app/src/main/res/layout/featured_item.xml

@@ -98,8 +98,7 @@
         android:paddingHorizontal="@dimen/grid_2"
         android:gravity="center"
         android:text="@{course.name}"
-        android:textAppearance="?attr/textAppearanceSubtitle1"
-        app:lineHeight="22sp"/>
+        android:textAppearance="?attr/textAppearanceSubtitle1"/>
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline"

app/src/main/res/layout/fragment_learn.xml

@@ -118,8 +118,7 @@
             android:paddingHorizontal="@dimen/grid_2"
             android:gravity="center"
             android:text="@{course.name}"
-            android:textAppearance="?attr/textAppearanceHeadline4"
-            app:lineHeight="40sp"/>
+            android:textAppearance="?attr/textAppearanceHeadline4"/>
 
         <TextView
             android:id="@+id/description"
@@ -132,7 +131,6 @@
             android:padding="@dimen/grid_2"
             android:gravity="center"
             android:textAppearance="?attr/textAppearanceBody1"
-            app:lineHeight="28sp"
             android:text="@string/course_desc"/>
 
         <View
@@ -154,7 +152,6 @@
             android:padding="@dimen/grid_2"
             android:gravity="center"
             android:textAppearance="?attr/textAppearanceHeadline6"
-            app:lineHeight="28sp"
             android:text="@string/what_you_ll_need"/>
 
         <TextView
@@ -167,7 +164,6 @@
             android:padding="@dimen/grid_2"
             android:gravity="center"
             android:textAppearance="?attr/textAppearanceBody1"
-            app:lineHeight="28sp"
             android:text="@string/needs"/>
 
         <View
@@ -193,7 +189,6 @@
             android:gravity="center"
             android:textAppearance="?attr/textAppearanceHeadline6"
             android:textColor="?attr/colorOnPrimarySurface"
-            app:lineHeight="28sp"
             android:text="@string/you_ll_also_like"
             android:theme="@style/ThemeOverlay.Owl.Blue"/>
 

app/src/main/res/layout/related_course_item.xml

@@ -61,8 +61,7 @@
         android:maxLines="2"
         android:ellipsize="end"
         android:text="@{course.name}"
-        android:textAppearance="?attr/textAppearanceBody2"
-        app:lineHeight="16sp"/>
+        android:textAppearance="?attr/textAppearanceBody2"/>
 
     <ImageView
         android:id="@+id/course_icon"

app/src/main/res/layout/step_item.xml

@@ -47,7 +47,6 @@
         android:layout_marginTop="@dimen/grid_2"
         android:gravity="center"
         android:textAppearance="?attr/textAppearanceBody1"
-        app:lineHeight="28sp"
         android:text="@{step.body}"/>
 
   </LinearLayout>

app/src/main/res/values/type.xml

@@ -33,6 +33,7 @@
     <item name="fontFamily">@font/rubik_bold</item>
     <item name="android:textStyle">bold</item>
     <item name="android:textColor">?android:attr/textColorPrimary</item>
+    <item name="lineHeight">40sp</item>
   </style>
 
   <style name="TextAppearance.Owl.Headline5" parent="TextAppearance.MaterialComponents.Headline5">
@@ -42,10 +43,12 @@
 
   <style name="TextAppearance.Owl.Headline6" parent="TextAppearance.MaterialComponents.Headline6">
     <item name="fontFamily">@font/rubik_medium</item>
+    <item name="lineHeight">28sp</item>
   </style>
 
   <style name="TextAppearance.Owl.Subtitle1" parent="TextAppearance.MaterialComponents.Subtitle1">
     <item name="fontFamily">@font/rubik_medium</item>
+    <item name="lineHeight">22sp</item>
   </style>
 
   <style name="TextAppearance.Owl.Subtitle2" parent="TextAppearance.MaterialComponents.Subtitle2">
@@ -54,10 +57,12 @@
 
   <style name="TextAppearance.Owl.Body1" parent="TextAppearance.MaterialComponents.Body1">
     <item name="fontFamily">@font/rubik</item>
+    <item name="lineHeight">28sp</item>
   </style>
 
   <style name="TextAppearance.Owl.Body2" parent="TextAppearance.MaterialComponents.Body2">
     <item name="fontFamily">@font/rubik</item>
+    <item name="lineHeight">16sp</item>
   </style>
 
   <style name="TextAppearance.Owl.Button" parent="TextAppearance.MaterialComponents.Button">