From 70c307b79651ff751aa462e766b3f5fd148a68c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= Date: Sat, 7 Mar 2020 11:54:47 +0100 Subject: [PATCH] [UI/Grades] Change some fonts. --- .../szczodrzynski/edziennik/ui/modules/grades/GradeView.kt | 5 ++--- app/src/main/res/layout/grades_item_grade.xml | 1 + app/src/main/res/layout/grades_item_subject.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradeView.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradeView.kt index 682bedd1..7b3fe20f 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradeView.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradeView.kt @@ -6,7 +6,6 @@ package pl.szczodrzynski.edziennik.ui.modules.grades import android.annotation.SuppressLint import android.content.Context -import android.graphics.Typeface import android.text.TextUtils import android.util.AttributeSet import android.util.TypedValue.COMPLEX_UNIT_SP @@ -83,7 +82,7 @@ class GradeView : AppCompatTextView { 0x99ffffff.toInt() }) - typeface = Typeface.create("serif-monospace", Typeface.BOLD) + //typeface = Typeface.create("sans-serif-light", Typeface.NORMAL) setBackgroundResource(when (grade.type) { TYPE_SEMESTER1_PROPOSED, TYPE_SEMESTER2_PROPOSED, @@ -104,7 +103,7 @@ class GradeView : AppCompatTextView { setPadding(2.dp, 2.dp, 2.dp, 2.dp) } else { - setTextSize(COMPLEX_UNIT_SP, 16f) + setTextSize(COMPLEX_UNIT_SP, 14f) setPadding(5.dp, 0, 5.dp, 0) layoutParams = LinearLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT).apply { setMargins(0, 0, 5.dp, 0) diff --git a/app/src/main/res/layout/grades_item_grade.xml b/app/src/main/res/layout/grades_item_grade.xml index 417d295f..fa05de4d 100644 --- a/app/src/main/res/layout/grades_item_grade.xml +++ b/app/src/main/res/layout/grades_item_grade.xml @@ -81,6 +81,7 @@ android:ellipsize="end" android:maxWidth="200dp" android:maxLines="1" + android:textAppearance="@style/TextAppearance.AppCompat.Small" tools:text="Kartkówki - K1 123456789 12345678" />