From e70ab07cba2c1dc95f36f78b6e330e4a4e2018e1 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Mon, 16 Jan 2017 18:14:28 +0100
Subject: [PATCH] fix font sizing

---
 Habitica/AndroidManifest.xml             | 2 +-
 Habitica/res/layout/daily_item_card.xml  | 2 +-
 Habitica/res/layout/habit_item_card.xml  | 2 +-
 Habitica/res/layout/reward_item_card.xml | 2 +-
 Habitica/res/layout/todo_item_card.xml   | 2 +-
 Habitica/res/values/styles.habitica.xml  | 6 ++++++
 6 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index 4506e35de..8a956dd39 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.habitrpg.android.habitica"
-    android:versionCode="144"
+    android:versionCode="146"
     android:versionName="0.0.36"
     android:screenOrientation="portrait"
     android:installLocation="auto" >
diff --git a/Habitica/res/layout/daily_item_card.xml b/Habitica/res/layout/daily_item_card.xml
index 64da0d818..f756829fb 100644
--- a/Habitica/res/layout/daily_item_card.xml
+++ b/Habitica/res/layout/daily_item_card.xml
@@ -61,7 +61,7 @@
 
                 <net.pherth.android.emoji_library.EmojiTextView
                     android:id="@+id/notesTextView"
-                    style="@style/Caption2"
+                    style="@style/Caption2.Regular"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:maxLines="3"
diff --git a/Habitica/res/layout/habit_item_card.xml b/Habitica/res/layout/habit_item_card.xml
index e7923dd28..a798f1de4 100644
--- a/Habitica/res/layout/habit_item_card.xml
+++ b/Habitica/res/layout/habit_item_card.xml
@@ -63,7 +63,7 @@
 
             <net.pherth.android.emoji_library.EmojiTextView
                 android:id="@+id/notesTextView"
-                style="@style/Caption2"
+                style="@style/Caption2.Regular"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:maxLines="3"
diff --git a/Habitica/res/layout/reward_item_card.xml b/Habitica/res/layout/reward_item_card.xml
index f15cae350..aed9555e7 100644
--- a/Habitica/res/layout/reward_item_card.xml
+++ b/Habitica/res/layout/reward_item_card.xml
@@ -42,7 +42,7 @@
 
             <net.pherth.android.emoji_library.EmojiTextView
                 android:id="@+id/notesTextView"
-                style="@style/Caption2"
+                style="@style/Caption2.Regular"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 tools:text="Notes"/>
diff --git a/Habitica/res/layout/todo_item_card.xml b/Habitica/res/layout/todo_item_card.xml
index 604fa7367..683a12c75 100644
--- a/Habitica/res/layout/todo_item_card.xml
+++ b/Habitica/res/layout/todo_item_card.xml
@@ -61,7 +61,7 @@
 
                 <net.pherth.android.emoji_library.EmojiTextView
                     android:id="@+id/notesTextView"
-                    style="@style/Caption2"
+                    style="@style/Caption2.Regular"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:maxLines="3"
diff --git a/Habitica/res/values/styles.habitica.xml b/Habitica/res/values/styles.habitica.xml
index 1c467c2ac..dd4e804fd 100644
--- a/Habitica/res/values/styles.habitica.xml
+++ b/Habitica/res/values/styles.habitica.xml
@@ -121,6 +121,12 @@
         <item name="android:letterSpacing" tools:targetApi="lollipop">0.03</item>
     </style>
 
+    <style name="Caption2.Regular">
+        <item name="android:fontFamily" tools:targetApi="jelly_bean">
+            @string/font_family_regular
+        </item>
+    </style>
+
     <style name="Caption3">
         <item name="android:fontFamily" tools:targetApi="jelly_bean">
             @string/font_family_regular