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 question marks optional

Browse Source 
Fixes #96
This commit is contained in:
Alinson S. Xavier
2020-11-26 15:36:44 -06:00
parent 2228dbf0f4
commit aa288ac406
5 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,7 +114,10 @@ class CheckmarkButtonView(
val id = when (value) {
SKIP -> R.string.fa_skipped
NO -> R.string.fa_times
UNKNOWN -> R.string.fa_question
UNKNOWN -> {
if(preferences.areQuestionMarksEnabled()) R.string.fa_question
else R.string.fa_times
}
else -> R.string.fa_check
}
val label = resources.getString(id)

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

@@ -31,6 +31,7 @@ import org.isoron.uhabits.*;
import org.isoron.uhabits.activities.habits.list.views.*;
import org.isoron.uhabits.core.models.*;
import org.isoron.uhabits.activities.common.views.*;
import org.isoron.uhabits.core.preferences.*;
import org.isoron.uhabits.utils.*;
import static org.isoron.androidbase.utils.InterfaceUtils.getDimension;
@@ -53,6 +54,8 @@ public class CheckmarkWidgetView extends HabitWidgetView {
protected boolean isNumerical;
private Preferences preferences;
public CheckmarkWidgetView(Context context)
{
super(context);
@@ -121,7 +124,12 @@ public class CheckmarkWidgetView extends HabitWidgetView {
case Checkmark.SKIP:
return getResources().getString(R.string.fa_skipped);
case Checkmark.UNKNOWN:
return getResources().getString(R.string.fa_question);
{
if (preferences.areQuestionMarksEnabled())
return getResources().getString(R.string.fa_question);
else
getResources().getString(R.string.fa_times);
}
case Checkmark.NO:
default:
return getResources().getString(R.string.fa_times);
@@ -196,6 +204,10 @@ public class CheckmarkWidgetView extends HabitWidgetView {
private void init()
{
HabitsApplicationComponent appComponent;
appComponent = (HabitsApplicationComponent) getContext().getApplicationContext();
preferences = appComponent.getPreferences();
ring = (RingView) findViewById(R.id.scoreRing);
label = (TextView) findViewById(R.id.label);

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

@@ -203,4 +203,6 @@
<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>
<string name="pref_unknown_title">Show question marks for missing data</string>
<string name="pref_unknown_description">Differentiate days without data from actual lapses. To enter a lapse, toggle twice.</string>
</resources>

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

@@ -38,6 +38,13 @@
android:title="@string/pref_skip_title"
app:iconSpaceReserved="false" />
<CheckBoxPreference
android:defaultValue="false"
android:key="pref_unknown_enabled"
android:summary="@string/pref_unknown_description"
android:title="@string/pref_unknown_title"
app:iconSpaceReserved="false" />
<CheckBoxPreference
android:defaultValue="false"
android:key="pref_checkmark_reverse_order"

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

@@ -367,6 +367,10 @@ public class Preferences
storage.putBoolean("pref_skip_enabled", value);
}
public boolean areQuestionMarksEnabled()
{
return storage.getBoolean("pref_unknown_enabled", false);
}
/**
* @return An integer representing the first day of the week. Sunday