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

Show YES_AUTO as grey checkmark

Browse Source 
This reverts a change introduced recently where YES_AUTO (previously CHECKED_IMPLICITLY)
was shown as a grey dash.
This commit is contained in:
Alinson S. Xavier
2020-09-05 18:32:30 -05:00
parent b72cad5316
commit 5fa3f412c0
7 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/uhabits-android/src/androidTest/assets/views-v26/habits/list/CheckmarkButtonView/render_implicit_check.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 217 B

After

Width:  |  Height:  |  Size: 545 B

BIN
android/uhabits-android/src/androidTest/assets/views-v26/habits/list/CheckmarkPanelView/render.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
android/uhabits-android/src/androidTest/assets/views-v26/habits/list/HabitCardView/render.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

BIN
android/uhabits-android/src/androidTest/assets/views-v26/habits/list/HabitCardView/render_changed.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

BIN
android/uhabits-android/src/androidTest/assets/views-v26/habits/list/HabitCardView/render_selected.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

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

@@ -109,7 +109,6 @@ class CheckmarkButtonView(
} }
val id = when (value) { val id = when (value) {
SKIP -> R.string.fa_skipped SKIP -> R.string.fa_skipped
YES_AUTO -> R.string.fa_skipped
NO -> R.string.fa_times NO -> R.string.fa_times
else -> R.string.fa_check else -> R.string.fa_check
} }

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

@@ -116,8 +116,8 @@ public class CheckmarkWidgetView extends HabitWidgetView {
if (isNumerical) return NumberButtonViewKt.toShortString(checkmarkValue / 1000.0); if (isNumerical) return NumberButtonViewKt.toShortString(checkmarkValue / 1000.0);
switch (checkmarkState) { switch (checkmarkState) {
case Checkmark.YES_MANUAL: case Checkmark.YES_MANUAL:
return getResources().getString(R.string.fa_check);
case Checkmark.YES_AUTO: case Checkmark.YES_AUTO:
return getResources().getString(R.string.fa_check);
case Checkmark.SKIP: case Checkmark.SKIP:
return getResources().getString(R.string.fa_skipped); return getResources().getString(R.string.fa_skipped);
case Checkmark.NO: case Checkmark.NO: