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

Rename checkmark values to NO, YES_AUTO, YES_MANUAL and SKIP

Browse Source 
This makes the source code consistent with the user interface.
This commit is contained in:
Alinson S. Xavier
2020-09-05 18:04:04 -05:00
parent d59ab89426
commit b72cad5316
26 changed files with 154 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java
View File

@@ -149,7 +149,7 @@ public class HistoryChart extends ScrollableChart
if (timestamp == null) return false;
Timestamp today = DateUtils.getToday();
int newValue = CHECKED_EXPLICITLY;
int newValue = YES_MANUAL;
int offset = timestamp.daysUntil(today);
if (offset < checkmarks.length)
{
@@ -385,7 +385,7 @@ public class HistoryChart extends ScrollableChart
pSquareBg.setColor(colors[0]);
pSquareFg.setColor(textColors[1]);
}
else if ((isNumerical && checkmark < target) || checkmark != CHECKED_EXPLICITLY)
else if ((isNumerical && checkmark < target) || checkmark != YES_MANUAL)
{
pSquareBg.setColor(colors[1]);
pSquareFg.setColor(textColors[2]);
@@ -400,7 +400,7 @@ public class HistoryChart extends ScrollableChart
float round = dpToPixels(getContext(), 2);
canvas.drawRoundRect(location, round, round, pSquareBg);
if (!isNumerical && checkmark == SKIPPED)
if (!isNumerical && checkmark == SKIP)
{
pSquareBg.setColor(backgroundColor);
pSquareBg.setStrokeWidth(columnWidth * 0.025f);

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

@@ -103,14 +103,14 @@ class CheckmarkButtonView(
fun draw(canvas: Canvas) {
paint.color = when (value) {
CHECKED_EXPLICITLY -> color
SKIPPED -> color
YES_MANUAL -> color
SKIP -> color
else -> lowContrastColor
}
val id = when (value) {
SKIPPED -> R.string.fa_skipped
CHECKED_IMPLICITLY -> R.string.fa_skipped
UNCHECKED -> R.string.fa_times
SKIP -> R.string.fa_skipped
YES_AUTO -> R.string.fa_skipped
NO -> R.string.fa_times
else -> R.string.fa_check
}
val label = resources.getString(id)

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

@@ -62,7 +62,7 @@ class CheckmarkPanelView(
val timestamp = today.minus(index + dataOffset)
button.value = when {
index + dataOffset < values.size -> values[index + dataOffset]
else -> UNCHECKED
else -> NO
}
button.color = color
button.onToggle = { value -> onToggle(timestamp, value) }

4
android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidget.kt
View File

@@ -67,9 +67,9 @@ open class CheckmarkWidget(
private fun getNumericalCheckmarkState(): Int {
return if (habit.isCompletedToday) {
Checkmark.CHECKED_EXPLICITLY
Checkmark.YES_MANUAL
} else {
Checkmark.UNCHECKED
Checkmark.NO
}
}

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

@@ -75,8 +75,8 @@ public class CheckmarkWidgetView extends HabitWidgetView {
int fgColor;
switch (checkmarkState) {
case Checkmark.CHECKED_EXPLICITLY:
case Checkmark.SKIPPED:
case Checkmark.YES_MANUAL:
case Checkmark.SKIP:
bgColor = activeColor;
fgColor = res.getColor(R.attr.highContrastReverseTextColor);
setShadowAlpha(0x4f);
@@ -84,8 +84,8 @@ public class CheckmarkWidgetView extends HabitWidgetView {
frame.setBackgroundDrawable(background);
break;
case Checkmark.CHECKED_IMPLICITLY:
case Checkmark.UNCHECKED:
case Checkmark.YES_AUTO:
case Checkmark.NO:
default:
getResources().getString(R.string.fa_times);
bgColor = res.getColor(R.attr.cardBgColor);
@@ -115,12 +115,12 @@ public class CheckmarkWidgetView extends HabitWidgetView {
{
if (isNumerical) return NumberButtonViewKt.toShortString(checkmarkValue / 1000.0);
switch (checkmarkState) {
case Checkmark.CHECKED_EXPLICITLY:
case Checkmark.YES_MANUAL:
return getResources().getString(R.string.fa_check);
case Checkmark.CHECKED_IMPLICITLY:
case Checkmark.SKIPPED:
case Checkmark.YES_AUTO:
case Checkmark.SKIP:
return getResources().getString(R.string.fa_skipped);
case Checkmark.UNCHECKED:
case Checkmark.NO:
default:
return getResources().getString(R.string.fa_times);
}
@@ -204,7 +204,7 @@ public class CheckmarkWidgetView extends HabitWidgetView {
percentage = 0.75f;
name = "Wake up early";
activeColor = PaletteUtils.getAndroidTestColor(6);
checkmarkValue = Checkmark.CHECKED_EXPLICITLY;
checkmarkValue = Checkmark.YES_MANUAL;
refresh();
}
}