pull/610/head
KristianTashkov 5 years ago
parent 3cff51ea42
commit 636c18b48a

@ -71,6 +71,11 @@ public class CheckmarkWidgetTest extends BaseViewTest
button.performClick(); button.performClick();
sleep(1000); sleep(1000);
assertThat(checkmarks.getTodayValue(), equalTo(SKIPPED_EXPLICITLY));
button.performClick();
sleep(1000);
assertThat(checkmarks.getTodayValue(), equalTo(UNCHECKED)); assertThat(checkmarks.getTodayValue(), equalTo(UNCHECKED));
} }

@ -380,7 +380,6 @@ public class HistoryChart extends ScrollableChart
} }
pSquareFg.setColor(reverseTextColor); pSquareFg.setColor(reverseTextColor);
float round = dpToPixels(getContext(), 2); float round = dpToPixels(getContext(), 2);
canvas.drawRoundRect(location, round, round, pSquareBg); canvas.drawRoundRect(location, round, round, pSquareBg);
String text = Integer.toString(date.get(Calendar.DAY_OF_MONTH)); String text = Integer.toString(date.get(Calendar.DAY_OF_MONTH));

@ -283,7 +283,7 @@ public abstract class ScoreList implements Iterable<Score>
value = Math.min(1, value); value = Math.min(1, value);
} }
if (!habit.isNumerical() & value > 0) { if (!habit.isNumerical() && value > 0) {
value = value != Checkmark.SKIPPED_EXPLICITLY ? 1 : -1; value = value != Checkmark.SKIPPED_EXPLICITLY ? 1 : -1;
} }

Loading…
Cancel
Save