mirror of
https://github.com/iSoron/uhabits.git
synced 2025-12-06 09:08:52 -06:00
@@ -114,7 +114,10 @@ class CheckmarkButtonView(
|
|||||||
val id = when (value) {
|
val id = when (value) {
|
||||||
SKIP -> R.string.fa_skipped
|
SKIP -> R.string.fa_skipped
|
||||||
NO -> R.string.fa_times
|
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
|
else -> R.string.fa_check
|
||||||
}
|
}
|
||||||
val label = resources.getString(id)
|
val label = resources.getString(id)
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ import org.isoron.uhabits.*;
|
|||||||
import org.isoron.uhabits.activities.habits.list.views.*;
|
import org.isoron.uhabits.activities.habits.list.views.*;
|
||||||
import org.isoron.uhabits.core.models.*;
|
import org.isoron.uhabits.core.models.*;
|
||||||
import org.isoron.uhabits.activities.common.views.*;
|
import org.isoron.uhabits.activities.common.views.*;
|
||||||
|
import org.isoron.uhabits.core.preferences.*;
|
||||||
import org.isoron.uhabits.utils.*;
|
import org.isoron.uhabits.utils.*;
|
||||||
|
|
||||||
import static org.isoron.androidbase.utils.InterfaceUtils.getDimension;
|
import static org.isoron.androidbase.utils.InterfaceUtils.getDimension;
|
||||||
@@ -53,6 +54,8 @@ public class CheckmarkWidgetView extends HabitWidgetView {
|
|||||||
|
|
||||||
protected boolean isNumerical;
|
protected boolean isNumerical;
|
||||||
|
|
||||||
|
private Preferences preferences;
|
||||||
|
|
||||||
public CheckmarkWidgetView(Context context)
|
public CheckmarkWidgetView(Context context)
|
||||||
{
|
{
|
||||||
super(context);
|
super(context);
|
||||||
@@ -121,7 +124,12 @@ public class CheckmarkWidgetView extends HabitWidgetView {
|
|||||||
case Checkmark.SKIP:
|
case Checkmark.SKIP:
|
||||||
return getResources().getString(R.string.fa_skipped);
|
return getResources().getString(R.string.fa_skipped);
|
||||||
case Checkmark.UNKNOWN:
|
case Checkmark.UNKNOWN:
|
||||||
|
{
|
||||||
|
if (preferences.areQuestionMarksEnabled())
|
||||||
return getResources().getString(R.string.fa_question);
|
return getResources().getString(R.string.fa_question);
|
||||||
|
else
|
||||||
|
getResources().getString(R.string.fa_times);
|
||||||
|
}
|
||||||
case Checkmark.NO:
|
case Checkmark.NO:
|
||||||
default:
|
default:
|
||||||
return getResources().getString(R.string.fa_times);
|
return getResources().getString(R.string.fa_times);
|
||||||
@@ -196,6 +204,10 @@ public class CheckmarkWidgetView extends HabitWidgetView {
|
|||||||
|
|
||||||
private void init()
|
private void init()
|
||||||
{
|
{
|
||||||
|
HabitsApplicationComponent appComponent;
|
||||||
|
appComponent = (HabitsApplicationComponent) getContext().getApplicationContext();
|
||||||
|
preferences = appComponent.getPreferences();
|
||||||
|
|
||||||
ring = (RingView) findViewById(R.id.scoreRing);
|
ring = (RingView) findViewById(R.id.scoreRing);
|
||||||
label = (TextView) findViewById(R.id.label);
|
label = (TextView) findViewById(R.id.label);
|
||||||
|
|
||||||
|
|||||||
@@ -203,4 +203,6 @@
|
|||||||
<string name="decrement">Decrement</string>
|
<string name="decrement">Decrement</string>
|
||||||
<string name="pref_skip_title">Enable skip days</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_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>
|
</resources>
|
||||||
@@ -38,6 +38,13 @@
|
|||||||
android:title="@string/pref_skip_title"
|
android:title="@string/pref_skip_title"
|
||||||
app:iconSpaceReserved="false" />
|
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
|
<CheckBoxPreference
|
||||||
android:defaultValue="false"
|
android:defaultValue="false"
|
||||||
android:key="pref_checkmark_reverse_order"
|
android:key="pref_checkmark_reverse_order"
|
||||||
|
|||||||
@@ -367,6 +367,10 @@ public class Preferences
|
|||||||
storage.putBoolean("pref_skip_enabled", value);
|
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
|
* @return An integer representing the first day of the week. Sunday
|
||||||
|
|||||||
Reference in New Issue
Block a user