From 636c18b48ae5d1f5489fda23e0ae5ab7e0b39ff4 Mon Sep 17 00:00:00 2001 From: KristianTashkov Date: Tue, 21 Jul 2020 15:25:26 +0300 Subject: [PATCH] fix test --- .../java/org/isoron/uhabits/widgets/CheckmarkWidgetTest.java | 5 +++++ .../isoron/uhabits/activities/common/views/HistoryChart.java | 3 +-- .../main/java/org/isoron/uhabits/core/models/ScoreList.java | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/CheckmarkWidgetTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/CheckmarkWidgetTest.java index 0aeb4762f..306cbb385 100644 --- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/CheckmarkWidgetTest.java +++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/CheckmarkWidgetTest.java @@ -71,6 +71,11 @@ public class CheckmarkWidgetTest extends BaseViewTest button.performClick(); sleep(1000); + assertThat(checkmarks.getTodayValue(), equalTo(SKIPPED_EXPLICITLY)); + + button.performClick(); + sleep(1000); + assertThat(checkmarks.getTodayValue(), equalTo(UNCHECKED)); } diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java index 63fa8b3d6..4ee91ae10 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java @@ -380,10 +380,9 @@ public class HistoryChart extends ScrollableChart } pSquareFg.setColor(reverseTextColor); - float round = dpToPixels(getContext(), 2); 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)); canvas.drawText(text, location.centerX(), location.centerY() + squareTextOffset, pSquareFg); } diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/ScoreList.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/ScoreList.java index 85d726f14..7d2a254d4 100644 --- a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/ScoreList.java +++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/ScoreList.java @@ -283,7 +283,7 @@ public abstract class ScoreList implements Iterable value = Math.min(1, value); } - if (!habit.isNumerical() & value > 0) { + if (!habit.isNumerical() && value > 0) { value = value != Checkmark.SKIPPED_EXPLICITLY ? 1 : -1; }