Merge pull request #5453 from k9mail/default_font_size

Tweak default font sizes
This commit is contained in:
cketti 2021-07-29 18:24:34 +02:00 committed by GitHub
commit b1e0a1d496
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 38 additions and 16 deletions

View file

@ -33,7 +33,7 @@
android:singleLine="true"
android:ellipsize="end"
android:textColor="?android:attr/textColorPrimary"
android:textAppearance="?android:attr/textAppearanceMedium"/>
android:textAppearance="@style/TextAppearance.K9.Medium"/>
<TextView
android:id="@+id/email"
@ -42,7 +42,7 @@
android:singleLine="true"
android:ellipsize="end"
android:textColor="?android:attr/textColorSecondary"
android:textAppearance="?android:attr/textAppearanceSmall"/>
android:textAppearance="@style/TextAppearance.K9.Small"/>
</LinearLayout>

View file

@ -58,7 +58,7 @@
android:bufferType="spannable"
android:layout_below="@+id/subject_wrapper"
android:singleLine="false"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textAppearance="@style/TextAppearance.K9.Small"
android:textColor="?android:attr/textColorPrimary"
android:longClickable="false"
android:layout_alignWithParentIfMissing="false"
@ -97,12 +97,13 @@
android:layout_marginLeft="1dip"
android:ellipsize="marquee"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textAppearance="@style/TextAppearance.K9.MediumSmall"
android:textColor="?android:attr/textColorPrimary"
/>
<TextView
android:id="@+id/thread_count"
android:textAppearance="@style/TextAppearance.K9.MediumSmall"
android:textColor="?attr/messageListThreadCountForegroundColor"
android:background="?attr/messageListThreadCountBackground"
android:layout_width="wrap_content"
@ -137,7 +138,7 @@
android:paddingLeft="3dip"
android:paddingRight="8dip"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textAppearance="@style/TextAppearance.K9.Small"
android:textColor="?android:attr/textColorSecondary"/>
<CheckBox

View file

@ -41,7 +41,7 @@
android:ellipsize="end"
android:maxLines="3"
android:textColor="?android:attr/textColorPrimary"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textAppearance="@style/TextAppearance.K9.MediumSmall"
tools:text="(no subject)"
/>
@ -136,7 +136,7 @@
android:singleLine="true"
android:ellipsize="end"
android:textColor="?android:attr/textColorPrimary"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textAppearance="@style/TextAppearance.K9.MediumSmall"
android:textStyle="bold"
android:text="@string/general_no_sender"
android:gravity="center_vertical"
@ -153,7 +153,7 @@
android:layout_below="@+id/from"
android:ellipsize="end"
android:textColor="?android:attr/textColorPrimary"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textAppearance="@style/TextAppearance.K9.Small"
android:textStyle="bold"
android:visibility="gone"
android:gravity="center_vertical"
@ -170,7 +170,7 @@
android:paddingRight="4dp"
android:text="@string/message_to_label"
android:textColor="?android:attr/textColorPrimary"
android:textAppearance="@android:style/TextAppearance.Medium"
android:textAppearance="@style/TextAppearance.K9.MediumSmall"
android:textStyle="bold" />
<TextView
@ -183,7 +183,7 @@
android:ellipsize="end"
android:paddingTop="2dp"
android:textColor="?android:attr/textColorSecondary"
android:textAppearance="@android:style/TextAppearance.Medium" />
android:textAppearance="@style/TextAppearance.K9.MediumSmall" />
<!-- CC -->
<TextView
@ -198,7 +198,7 @@
android:text="@string/message_view_cc_label"
android:textColor="?android:attr/textColorPrimary"
android:textStyle="bold"
android:textAppearance="@android:style/TextAppearance.Medium" />
android:textAppearance="@style/TextAppearance.K9.MediumSmall" />
<TextView
android:id="@+id/cc"
@ -210,7 +210,7 @@
android:ellipsize="end"
android:paddingTop="2dp"
android:textColor="?android:attr/textColorSecondary"
android:textAppearance="@android:style/TextAppearance.Medium" />
android:textAppearance="@style/TextAppearance.K9.MediumSmall" />
<!-- BCC -->
<TextView
@ -225,7 +225,7 @@
android:text="@string/message_view_bcc_label"
android:textColor="?android:attr/textColorPrimary"
android:textStyle="bold"
android:textAppearance="@android:style/TextAppearance.Medium" />
android:textAppearance="@style/TextAppearance.K9.MediumSmall" />
<TextView
android:id="@+id/bcc"
@ -237,7 +237,7 @@
android:ellipsize="end"
android:paddingTop="2dp"
android:textColor="?android:attr/textColorSecondary"
android:textAppearance="@android:style/TextAppearance.Medium" />
android:textAppearance="@style/TextAppearance.K9.MediumSmall" />
<!-- Date -->
<TextView
@ -249,7 +249,7 @@
android:paddingTop="8dp"
android:singleLine="true"
android:ellipsize="none"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textAppearance="@style/TextAppearance.K9.Small"
android:textColor="?android:attr/textColorSecondary" />
<LinearLayout

View file

@ -78,5 +78,26 @@
<item name="materialDrawerHeaderSelectionText">?android:textColorPrimary</item>
<item name="materialDrawerHeaderSelectionSubtext">?android:textColorSecondary</item>
</style>
<style name="TextAppearance.K9.Small" parent="TextAppearance.AppCompat.Small">
<item name="android:textSize">14sp</item>
</style>
<style name="TextAppearance.K9.MediumSmall" parent="TextAppearance.AppCompat.Medium">
<item name="android:textSize">16sp</item>
</style>
<style name="TextAppearance.K9.Medium" parent="TextAppearance.AppCompat.Medium">
<item name="android:textSize">18sp</item>
</style>
<style name="TextAppearance.K9.MediumLarge" parent="TextAppearance.AppCompat.Medium">
<item name="android:textSize">20sp</item>
</style>
<style name="TextAppearance.K9.Large" parent="TextAppearance.AppCompat.Large">
<item name="android:textSize">22sp</item>
</style>
</resources>

View file

@ -35,7 +35,7 @@ import org.mockito.kotlin.mock
import org.robolectric.Robolectric
private const val SOME_ACCOUNT_UUID = "6b84207b-25de-4dab-97c3-953bbf03fec6"
private const val FIRST_LINE_DEFAULT_FONT_SIZE = 18f
private const val FIRST_LINE_DEFAULT_FONT_SIZE = 16f
private const val SECOND_LINE_DEFAULT_FONT_SIZE = 14f
private const val DATE_DEFAULT_FONT_SIZE = 14f