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

Small adjustments to numeric checkmark widget

Browse Source
This commit is contained in:
Alinson S. Xavier
2021-05-09 16:24:59 -05:00
parent 63883032c4
commit dd1999681f
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.kt
View File

@@ -37,6 +37,7 @@ import org.isoron.uhabits.inject.HabitsApplicationComponent
import org.isoron.uhabits.utils.InterfaceUtils.getDimension import org.isoron.uhabits.utils.InterfaceUtils.getDimension
import org.isoron.uhabits.utils.PaletteUtils.getAndroidTestColor import org.isoron.uhabits.utils.PaletteUtils.getAndroidTestColor
import org.isoron.uhabits.utils.StyledResources import org.isoron.uhabits.utils.StyledResources
import kotlin.math.max
import kotlin.math.min import kotlin.math.min
class CheckmarkWidgetView : HabitWidgetView { class CheckmarkWidgetView : HabitWidgetView {
@@ -95,7 +96,7 @@ class CheckmarkWidgetView : HabitWidgetView {
private val text: String private val text: String
get() = if (isNumerical) { get() = if (isNumerical) {
(entryValue / 1000.0).toShortString() (max(0, entryValue) / 1000.0).toShortString()
} else when (entryState) { } else when (entryState) {
YES_MANUAL, YES_AUTO -> resources.getString(R.string.fa_check) YES_MANUAL, YES_AUTO -> resources.getString(R.string.fa_check)
SKIP -> resources.getString(R.string.fa_skipped) SKIP -> resources.getString(R.string.fa_skipped)
@@ -130,7 +131,11 @@ class CheckmarkWidgetView : HabitWidgetView {
val maxTextSize = getDimension(context, R.dimen.smallerTextSize) val maxTextSize = getDimension(context, R.dimen.smallerTextSize)
textSize = min(textSize, maxTextSize) textSize = min(textSize, maxTextSize)
label.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize) label.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize)
if (isNumerical) {
ring.setTextSize(textSize * 0.75f)
} else {
ring.setTextSize(textSize) ring.setTextSize(textSize)
}
ring.setThickness(0.15f * textSize) ring.setThickness(0.15f * textSize)
super.onMeasure(newWidthMeasureSpec, newHeightMeasureSpec) super.onMeasure(newWidthMeasureSpec, newHeightMeasureSpec)
} }