isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 09:08:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

ButtonView: Adjust size of question marks

Browse Source
This commit is contained in:
Alinson S. Xavier
2021-03-13 18:45:18 -06:00
parent ee462715de
commit 7b68938e14
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt
View File

@@ -124,7 +124,6 @@ class CheckmarkButtonView(
typeface = getFontAwesome()
isAntiAlias = true
textAlign = Paint.Align.CENTER
textSize = dim(R.dimen.smallTextSize)
}
fun draw(canvas: Canvas) {
@@ -147,6 +146,12 @@ class CheckmarkButtonView(
}
else -> R.string.fa_check
}
paint.textSize = when (value) {
UNKNOWN -> dim(R.dimen.smallerTextSize)
else -> dim(R.dimen.smallTextSize)
}
val label = resources.getString(id)
val em = paint.measureText("m")

26
uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonView.kt
View File

@@ -33,6 +33,7 @@ import org.isoron.uhabits.core.preferences.Preferences
import org.isoron.uhabits.inject.ActivityContext
import org.isoron.uhabits.utils.InterfaceUtils.getDimension
import org.isoron.uhabits.utils.StyledResources
import org.isoron.uhabits.utils.dim
import org.isoron.uhabits.utils.getFontAwesome
import org.isoron.uhabits.utils.showMessage
import java.text.DecimalFormat
@@ -131,22 +132,22 @@ class NumberButtonView(
private val lowContrast: Int
private val mediumContrast: Int
private val pRegular: TextPaint = TextPaint().apply {
private val pUnit: TextPaint = TextPaint().apply {
textSize = getDimension(context, R.dimen.smallerTextSize)
typeface = NORMAL_TYPEFACE
isAntiAlias = true
textAlign = Paint.Align.CENTER
}
private val pBold: TextPaint = TextPaint().apply {
textSize = getDimension(context, R.dimen.smallTextSize)
private val pNumber: TextPaint = TextPaint().apply {
textSize = dim(R.dimen.smallTextSize)
typeface = BOLD_TYPEFACE
isAntiAlias = true
textAlign = Paint.Align.CENTER
}
init {
em = pBold.measureText("m")
em = pNumber.measureText("m")
lowContrast = sr.getColor(R.attr.contrast40)
mediumContrast = sr.getColor(R.attr.contrast60)
}
@@ -160,31 +161,36 @@ class NumberButtonView(
val label: String
val typeface: Typeface
val textSize: Float
when {
value >= 0 -> {
label = value.toShortString()
typeface = BOLD_TYPEFACE
textSize = dim(R.dimen.smallTextSize)
}
preferences.areQuestionMarksEnabled() -> {
label = resources.getString(R.string.fa_question)
typeface = getFontAwesome()
textSize = dim(R.dimen.smallerTextSize)
}
else -> {
label = "0"
typeface = BOLD_TYPEFACE
textSize = dim(R.dimen.smallTextSize)
}
}
pBold.color = activeColor
pBold.typeface = typeface
pRegular.color = activeColor
pNumber.textSize = textSize
pNumber.color = activeColor
pNumber.typeface = typeface
pUnit.color = activeColor
rect.set(0f, 0f, width.toFloat(), height.toFloat())
canvas.drawText(label, rect.centerX(), rect.centerY(), pBold)
canvas.drawText(label, rect.centerX(), rect.centerY(), pNumber)
rect.offset(0f, 1.2f * em)
canvas.drawText(units, rect.centerX(), rect.centerY(), pRegular)
rect.offset(0f, 1.3f * em)
canvas.drawText(units, rect.centerX(), rect.centerY(), pUnit)
}
}
}