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

Update checkmark widget for numerical support

Browse Source 
Co-authored-by: Alinson S. Xavier <git@axavier.org>
This commit is contained in:
Thomas S
2020-07-12 09:06:42 -05:00
committed by Alinson S. Xavier
parent a8e77b8df8
commit 96d23bdf22
13 changed files with 217 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Habit.java
View File

@@ -327,9 +327,9 @@ public class Habit
if (isNumerical())
{
if(getTargetType() == AT_LEAST)
return todayCheckmark >= data.targetValue;
return todayCheckmark / 1000.0 >= data.targetValue;
else
return todayCheckmark <= data.targetValue;
return todayCheckmark / 1000.0 <= data.targetValue;
}
else return (todayCheckmark != UNCHECKED);
}

2
android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehavior.java
View File

@@ -177,6 +177,8 @@ public class ListHabitsBehavior
public interface NumberPickerCallback
{
void onNumberPicked(double newValue);
default void onNumberPickerDismissed() {}
}
public interface Screen

7
android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/widgets/WidgetBehavior.java
View File

@@ -73,4 +73,11 @@ public class WidgetBehavior
new ToggleRepetitionCommand(habitList, habit, timestamp),
habit.getId());
}
public void setNumericValue(@NonNull Habit habit, Timestamp timestamp, int newValue) {
commandRunner.execute(
new CreateRepetitionCommand(habit, timestamp, newValue),
habit.getId());
}
}

12
android/uhabits-core/src/test/java/org/isoron/uhabits/core/models/HabitTest.java
View File

@@ -102,19 +102,19 @@ public class HabitTest extends BaseUnitTest
h.setTargetValue(100.0);
assertFalse(h.isCompletedToday());
h.getRepetitions().toggle(getToday(), 200);
h.getRepetitions().toggle(getToday(), 200_000);
assertTrue(h.isCompletedToday());
h.getRepetitions().toggle(getToday(), 100);
h.getRepetitions().toggle(getToday(), 100_000);
assertTrue(h.isCompletedToday());
h.getRepetitions().toggle(getToday(), 50);
h.getRepetitions().toggle(getToday(), 50_000);
assertFalse(h.isCompletedToday());
h.setTargetType(Habit.AT_MOST);
h.getRepetitions().toggle(getToday(), 200);
h.getRepetitions().toggle(getToday(), 200_000);
assertFalse(h.isCompletedToday());
h.getRepetitions().toggle(getToday(), 100);
h.getRepetitions().toggle(getToday(), 100_000);
assertTrue(h.isCompletedToday());
h.getRepetitions().toggle(getToday(), 50);
h.getRepetitions().toggle(getToday(), 50_000);
assertTrue(h.isCompletedToday());
}