isoron
/
loop
mirror of https://github.com/iSoron/uhabits.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

adding code to mark habit done for today

Browse Source
pull/644/head
Rechee 5 years ago
parent a4ef657897
commit 02d0a1c837
4 changed files with 83 additions and 17 deletions
Show Stats Download Patch File Download Diff File

11
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HabitCard.java
Unescape View File

@ -43,6 +43,9 @@ public abstract class HabitCard extends LinearLayout
@Nullable
private Task currentRefreshTask;
protected HabitsApplication app;
protected HabitsApplicationComponent component;
public HabitCard(Context context)
{
super(context);
@ -118,10 +121,8 @@ public abstract class HabitCard extends LinearLayout
{
if(!isInEditMode()) habit = new MemoryModelFactory().buildHabit();
Context appContext = getContext().getApplicationContext();
if(appContext instanceof HabitsApplication)
{
HabitsApplication app = (HabitsApplication) appContext;
taskRunner = app.getComponent().getTaskRunner();
}
app = (HabitsApplication) appContext;
component = app.getComponent();
taskRunner = component.getTaskRunner();
}
}

72
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/OverviewCard.java
Unescape View File

@ -19,21 +19,31 @@
package org.isoron.uhabits.activities.habits.show.views;
import android.content.*;
import android.util.*;
import android.widget.*;
import android.content.Context;
import android.util.AttributeSet;
import android.widget.Button;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.StringRes;
import org.isoron.androidbase.utils.*;
import org.isoron.androidbase.utils.StyledResources;
import org.isoron.uhabits.R;
import org.isoron.uhabits.activities.common.views.*;
import org.isoron.uhabits.core.models.*;
import org.isoron.uhabits.core.tasks.*;
import org.isoron.uhabits.core.utils.*;
import org.isoron.uhabits.utils.*;
import butterknife.*;
import org.isoron.uhabits.activities.common.views.RingView;
import org.isoron.uhabits.core.commands.CommandRunner;
import org.isoron.uhabits.core.commands.CreateRepetitionCommand;
import org.isoron.uhabits.core.models.Habit;
import org.isoron.uhabits.core.models.HabitList;
import org.isoron.uhabits.core.models.ScoreList;
import org.isoron.uhabits.core.models.Timestamp;
import org.isoron.uhabits.core.tasks.CancelableTask;
import org.isoron.uhabits.core.tasks.Task;
import org.isoron.uhabits.core.utils.DateUtils;
import org.isoron.uhabits.utils.PaletteUtils;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
public class OverviewCard extends HabitCard
{
@ -58,7 +68,14 @@ public class OverviewCard extends HabitCard
@BindView(R.id.title)
TextView title;
@BindView(R.id.checkHabitTodayButton)
Button checkHabitTodayButton;
private int color;
private CommandRunner commandRunner;
private HabitList habitList;
private volatile boolean habitIsCheckedForToday;
public OverviewCard(Context context)
{
@ -72,6 +89,17 @@ public class OverviewCard extends HabitCard
init();
}
@OnClick(R.id.checkHabitTodayButton)
public void onClickFeedback()
{
int newValue = this.habitIsCheckedForToday ? 0 : 1;
final Habit habit = getHabit();
commandRunner.execute(
new CreateRepetitionCommand(habitList, habit, DateUtils.getToday(), newValue),
habit.getId()
);
}
private String formatPercentageDiff(float percentageDiff)
{
return String.format("%s%.0f%%", (percentageDiff >= 0 ? "+" : "\u2212"),
@ -84,6 +112,13 @@ public class OverviewCard extends HabitCard
ButterKnife.bind(this);
cache = new Cache();
if (isInEditMode()) initEditMode();
commandRunner = component.getCommandRunner();
commandRunner.addListener((command, refreshKey) -> {
if(command instanceof CreateRepetitionCommand) {
refreshData();
}
});
habitList = component.getHabitList();
}
private void initEditMode()
@ -126,6 +161,17 @@ public class OverviewCard extends HabitCard
postInvalidate();
}
private void refreshHabitChecked()
{
this.habitIsCheckedForToday = cache.habitIsCheckedForToday;
@StringRes int checkHabitButtonTextRes =
this.habitIsCheckedForToday ? R.string.mark_undone_for_today :
R.string.mark_done_for_today;
checkHabitTodayButton.setText(checkHabitButtonTextRes);
}
private class Cache
{
float todayScore;
@ -135,6 +181,8 @@ public class OverviewCard extends HabitCard
float lastYearScore;
long totalCount;
boolean habitIsCheckedForToday;
}
@Override
@ -161,6 +209,7 @@ public class OverviewCard extends HabitCard
cache.lastMonthScore = (float) scores.getValue(lastMonth);
cache.lastYearScore = (float) scores.getValue(lastYear);
cache.totalCount = habit.getRepetitions().getTotalCount();
cache.habitIsCheckedForToday = habit.getCheckmarks().getTodayValue() == 1;
}
@Override
@ -168,6 +217,7 @@ public class OverviewCard extends HabitCard
{
if (isCanceled()) return;
refreshScore();
refreshHabitChecked();
}
@Override

15
android/uhabits-android/src/main/res/layout/show_habit_overview.xml
Unescape View File

@ -19,7 +19,10 @@
-->
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:habit="http://isoron.org/android">
xmlns:habit="http://isoron.org/android"
xmlns:tools="http://schemas.android.com/tools"
tools:parentTag="android.widget.LinearLayout"
tools:orientation="vertical">
<TextView
android:id="@+id/title"
@ -125,4 +128,14 @@
</LinearLayout>
</LinearLayout>
<Button
android:id="@+id/checkHabitTodayButton"
android:layout_gravity="center_horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/Widget.MaterialComponents.Button"
android:text="@string/mark_done_for_today">
</Button>
</merge>

2
android/uhabits-android/src/main/res/values/strings.xml
Unescape 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="mark_done_for_today">mark done for today</string>
<string name="mark_undone_for_today">mark not done for today</string>
</resources>
Write Preview
Loading…
Cancel
Save