sadorowo/szkolnyplus
1
0
Fork 0
forked from github/szkolny
Code Pull Requests Activity

[UI/Grades] Change some fonts.

Browse Source
This commit is contained in:
Kuba Szczodrzyński 2020-03-07 11:54:47 +01:00
parent 054a233ad6
commit 70c307b796
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/grades/GradeView.kt
View File

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

1
app/src/main/res/layout/grades_item_grade.xml
View File

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

2
app/src/main/res/layout/grades_item_subject.xml
View File

@ -29,7 +29,7 @@
android:layout_margin="8dp"
android:layout_weight="1"
android:ellipsize="end"
android:fontFamily="sans-serif-medium"
android:fontFamily="sans-serif"
android:maxLines="2"
android:textColor="?android:textColorPrimary"
android:textSize="20sp"