fix font sizing

This commit is contained in:
Phillip Thelen 2017-01-16 18:14:28 +01:00
parent 44552f6861
commit e70ab07cba
6 changed files with 11 additions and 5 deletions

View file

@ -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" >

View file

@ -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"

View file

@ -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"

View file

@ -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"/>

View file

@ -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"

View file

@ -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