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

Make skip days an opt-in feature

Browse Source
This commit is contained in:
Alinson S. Xavier
2020-11-18 22:13:03 -06:00
parent bef85bf93a
commit d594d3b085
11 changed files with 73 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.java
View File

@@ -82,6 +82,7 @@ public class HistoryEditorDialog extends AppCompatDialogFragment
historyChart = new HistoryChart(context);
historyChart.setController(controller);
historyChart.setFirstWeekday(prefs.getFirstWeekday());
historyChart.setSkipEnabled(prefs.isSkipEnabled());
if (savedInstanceState != null)
{

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

@@ -102,6 +102,8 @@ public class HistoryChart extends ScrollableChart
@NonNull
private Controller controller;
private boolean skipsEnabled;
public HistoryChart(Context context)
{
super(context);
@@ -153,7 +155,10 @@ public class HistoryChart extends ScrollableChart
int offset = timestamp.daysUntil(today);
if (offset < checkmarks.length)
{
newValue = Repetition.nextToggleValue(checkmarks[offset]);
if(skipsEnabled)
newValue = Repetition.nextToggleValueWithSkip(checkmarks[offset]);
else
newValue = Repetition.nextToggleValueWithoutSkip(checkmarks[offset]);
checkmarks[offset] = newValue;
}
@@ -211,6 +216,11 @@ public class HistoryChart extends ScrollableChart
initColors();
}
public void setSkipEnabled(boolean value)
{
this.skipsEnabled = value;
}
public void setIsEditable(boolean isEditable)
{
this.isEditable = isEditable;

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

@@ -62,7 +62,11 @@ class CheckmarkButtonView(
}
fun performToggle() {
value = Repetition.nextToggleValue(value)
value = if(preferences.isSkipEnabled) {
Repetition.nextToggleValueWithSkip(value)
} else {
Repetition.nextToggleValueWithoutSkip(value)
}
onToggle(value)
performHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
invalidate()

6
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCard.java
View File

@@ -120,7 +120,11 @@ public class HistoryCard extends HabitCard
{
if (isCanceled()) return;
int[] checkmarks = habit.getCheckmarks().getAllValues();
if(prefs != null) chart.setFirstWeekday(prefs.getFirstWeekday());
if(prefs != null)
{
chart.setFirstWeekday(prefs.getFirstWeekday());
chart.setSkipEnabled(prefs.isSkipEnabled());
}
chart.setCheckmarks(checkmarks);
}

1
android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/HistoryWidget.kt
View File

@@ -44,6 +44,7 @@ class HistoryWidget(
if (preferedBackgroundAlpha >= 255) widgetView.setShadowAlpha(0x4f)
(widgetView.dataView as HistoryChart).apply {
setFirstWeekday(firstWeekday)
setSkipEnabled(prefs.isSkipEnabled)
setColor(PaletteUtils.getColor(context, habit.color))
setCheckmarks(habit.checkmarks.allValues)
setNumerical(habit.isNumerical)

3
android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/NumericalCheckmarkWidgetActivity.kt
View File

@@ -49,7 +49,8 @@ class NumericalCheckmarkWidgetActivity : Activity(), ListHabitsBehavior.NumberPi
data = parser.parseCheckmarkIntent(intent)
behavior = WidgetBehavior(component.habitList,
component.commandRunner,
component.notificationTray)
component.notificationTray,
component.preferences)
widgetUpdater = component.widgetUpdater
showNumberSelector(this)

2
android/uhabits-android/src/main/res/values/strings.xml
View File

@@ -200,4 +200,6 @@
<string name="no_boolean_habits">No yes-or-no habits found</string>
<string name="increment">Increment</string>
<string name="decrement">Decrement</string>
<string name="pref_skip_title">Enable skip days</string>
<string name="pref_skip_description">Toggle twice to add a skip instead of a checkmark. Skips keep your score unchanged and don\'t break your streak.</string>
</resources>

7
android/uhabits-android/src/main/res/xml/preferences.xml
View File

@@ -31,6 +31,13 @@
android:title="@string/pref_toggle_title"
app:iconSpaceReserved="false" />
<CheckBoxPreference
android:defaultValue="false"
android:key="pref_skip_enabled"
android:summary="@string/pref_skip_description"
android:title="@string/pref_skip_title"
app:iconSpaceReserved="false" />
<CheckBoxPreference
android:defaultValue="false"
android:key="pref_checkmark_reverse_order"

13
android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Repetition.java
View File

@@ -56,7 +56,7 @@ public final class Repetition
this.value = value;
}
public static int nextToggleValue(int value)
public static int nextToggleValueWithSkip(int value)
{
switch(value) {
case NO:
@@ -70,6 +70,17 @@ public final class Repetition
}
}
public static int nextToggleValueWithoutSkip(int value)
{
switch(value) {
case NO:
case YES_AUTO:
return YES_MANUAL;
default:
return NO;
}
}
@Override
public boolean equals(Object o)

5
android/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/Preferences.java
View File

@@ -338,6 +338,11 @@ public class Preferences
storage.putString("pref_widget_opacity", Integer.toString(value));
}
public boolean isSkipEnabled()
{
return storage.getBoolean("pref_skip_enabled", false);
}
/**
* @return An integer representing the first day of the week. Sunday

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

@@ -23,6 +23,7 @@ import androidx.annotation.*;
import org.isoron.uhabits.core.commands.*;
import org.isoron.uhabits.core.models.*;
import org.isoron.uhabits.core.preferences.*;
import org.isoron.uhabits.core.ui.*;
import org.jetbrains.annotations.*;
@@ -35,16 +36,22 @@ public class WidgetBehavior
@NonNull
private final CommandRunner commandRunner;
private NotificationTray notificationTray;
@NonNull
private final NotificationTray notificationTray;
@NonNull
private final Preferences preferences;
@Inject
public WidgetBehavior(@NonNull HabitList habitList,
@NonNull CommandRunner commandRunner,
@NonNull NotificationTray notificationTray)
@NonNull NotificationTray notificationTray,
@NonNull Preferences preferences)
{
this.habitList = habitList;
this.commandRunner = commandRunner;
this.notificationTray = notificationTray;
this.preferences = preferences;
}
public void onAddRepetition(@NonNull Habit habit, Timestamp timestamp)
@@ -66,8 +73,19 @@ public class WidgetBehavior
public void onToggleRepetition(@NonNull Habit habit, Timestamp timestamp)
{
Repetition previous = habit.getRepetitions().getByTimestamp(timestamp);
if(previous == null) performToggle(habit, timestamp, Checkmark.YES_MANUAL);
else performToggle(habit, timestamp, Repetition.nextToggleValue(previous.getValue()));
if(previous == null)
{
performToggle(habit, timestamp, Checkmark.YES_MANUAL);
}
else
{
int value;
if(preferences.isSkipEnabled())
value = Repetition.nextToggleValueWithSkip(previous.getValue());
else
value = Repetition.nextToggleValueWithoutSkip(previous.getValue());
performToggle(habit, timestamp, value);
}
}
private void performToggle(@NonNull Habit habit, Timestamp timestamp, int value)