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

Allow unitless numerical habits

Browse Source
This commit is contained in:
Alinson S. Xavier
2021-03-18 21:52:43 -05:00
parent 81cffc7253
commit 381c67d020
4 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
uhabits-android/src/androidTest/assets/views/habits/list/NumberButtonView/render_unitless.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

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

@@ -73,6 +73,13 @@ class NumberButtonViewTest : BaseViewTest() {
assertRenders(view, "$PATH/render_above.png")
}
@Test
fun testRender_emptyUnits() {
view.value = 500.0
view.units = ""
assertRenders(view, "$PATH/render_unitless.png")
}
@Test
fun testRender_belowThreshold() {
view.value = 99.0

4
uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt
View File

@@ -275,10 +275,6 @@ class EditHabitActivity : AppCompatActivity() {
isValid = false
}
if (habitType == Habit.NUMBER_HABIT) {
if (unitInput.text.isEmpty()) {
unitInput.error = getFormattedValidationError(R.string.validation_cannot_be_blank)
isValid = false
}
if (targetInput.text.isEmpty()) {
targetInput.error = getString(R.string.validation_cannot_be_blank)
isValid = false

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

@@ -186,11 +186,16 @@ class NumberButtonView(
pNumber.typeface = typeface
pUnit.color = activeColor
rect.set(0f, 0f, width.toFloat(), height.toFloat())
canvas.drawText(label, rect.centerX(), rect.centerY(), pNumber)
rect.offset(0f, 1.3f * em)
canvas.drawText(units, rect.centerX(), rect.centerY(), pUnit)
if (units.isBlank()) {
rect.set(0f, 0f, width.toFloat(), height.toFloat())
rect.offset(0f, 0.5f * em)
canvas.drawText(label, rect.centerX(), rect.centerY(), pNumber)
} else {
rect.set(0f, 0f, width.toFloat(), height.toFloat())
canvas.drawText(label, rect.centerX(), rect.centerY(), pNumber)
rect.offset(0f, 1.3f * em)
canvas.drawText(units, rect.centerX(), rect.centerY(), pUnit)
}
}
}
}