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

Improve ordering of archived habits

Browse Source
This commit is contained in:
Alinson S. Xavier
2016-02-15 20:28:53 -05:00
parent 293f922831
commit 0dc377c8a3
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/org/isoron/uhabits/models/Habit.java
View File

@@ -98,6 +98,7 @@ public class Habit extends Model
public static void setIncludeArchived(boolean includeArchived) public static void setIncludeArchived(boolean includeArchived)
{ {
Habit.includeArchived = includeArchived; Habit.includeArchived = includeArchived;
rebuildOrder();
} }
public static boolean isIncludeArchived() public static boolean isIncludeArchived()
@@ -147,6 +148,8 @@ public class Habit extends Model
public static void rebuildOrder() public static void rebuildOrder()
{ {
Log.d("X", "rebuilding order");
List<Habit> habits = select().execute(); List<Habit> habits = select().execute();
int i = 0; int i = 0;
for (Habit h : habits) for (Habit h : habits)
@@ -303,7 +306,10 @@ public class Habit extends Model
public void archive() public void archive()
{ {
archived = 1; archived = 1;
position = 9999;
save(); save();
if(!isIncludeArchived()) Habit.rebuildOrder();
} }
public void unarchive() public void unarchive()
@@ -594,14 +600,12 @@ public class Habit extends Model
public void execute() public void execute()
{ {
archive(); archive();
Habit.rebuildOrder();
} }
@Override @Override
public void undo() public void undo()
{ {
unarchive(); unarchive();
Habit.rebuildOrder();
} }
public Integer getExecuteStringId() public Integer getExecuteStringId()
@@ -621,14 +625,12 @@ public class Habit extends Model
public void execute() public void execute()
{ {
unarchive(); unarchive();
Habit.rebuildOrder();
} }
@Override @Override
public void undo() public void undo()
{ {
archive(); archive();
Habit.rebuildOrder();
} }
public Integer getExecuteStringId() public Integer getExecuteStringId()