sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-21 13:19:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added isDue field support

Browse source
This commit is contained in:
Keith Holliday 2017-04-07 11:07:40 -06:00
parent d5daaf1bb6
commit e8f04a218e
5 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Habitica/assets/migrations/Habitica/35.sql
View file

@ -1 +1,2 @@
ALTER TABLE Preferences ADD COLUMN dailyDueDefaultView bool;
ALTER TABLE Preferences ADD COLUMN dailyDueDefaultView bool;

1
Habitica/assets/migrations/Habitica/37.sql Normal file
View file

@ -0,0 +1 @@
ALTER TABLE Task ADD COLUMN isDue BOOLEAN;

2
Habitica/src/main/java/com/habitrpg/android/habitica/HabitDatabase.java
View file

@ -7,7 +7,7 @@ public class HabitDatabase {
public static final String NAME = "Habitica";
public static final int VERSION = 36;
public static final int VERSION = 37;
public HabitDatabase() {
super();

2
Habitica/src/main/java/com/habitrpg/android/habitica/NotificationPublisher.java
View file

@ -42,7 +42,7 @@ public class NotificationPublisher extends BroadcastReceiver {
.queryList();
show_notification = false;
for (Task task : dailies) {
if (task.isDue(0)) {
if (task.checkIfDue(0)) {
show_notification = true;
break;
}

10
Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java
View file

@ -107,6 +107,9 @@ public class Task extends BaseModel {
@SerializedName("_id")
String id;
@Column
public Boolean isDue;
/**
* @return the id
*/
@ -568,7 +571,7 @@ public class Task extends BaseModel {
return R.color.best_10;
}
public Boolean isDue(int offset) {
public Boolean checkIfDue(int offset) {
if (this.getCompleted()) {
return true;
}
@ -608,7 +611,10 @@ public class Task extends BaseModel {
}
public Boolean isDisplayedActive(int offset) {
return this.isDue(offset) && !this.completed;
if (this.isDue != null) {
return this.isDue;
}
return this.checkIfDue(offset) && !this.completed;
}
public Boolean isChecklistDisplayActive(int offset) {