From fd82e6c24b967733875c35bf9a2b59d0216aae21 Mon Sep 17 00:00:00 2001
From: Alinson Xavier <axavier@uwaterloo.ca>
Date: Thu, 24 Nov 2016 06:00:02 -0500
Subject: [PATCH] Remember last used order

---
 .../list/model/HabitCardListAdapter.java      | 10 ++++++++-
 .../uhabits/preferences/Preferences.java      | 21 +++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/isoron/uhabits/activities/habits/list/model/HabitCardListAdapter.java b/app/src/main/java/org/isoron/uhabits/activities/habits/list/model/HabitCardListAdapter.java
index c7a501d0c..7b91c3df8 100644
--- a/app/src/main/java/org/isoron/uhabits/activities/habits/list/model/HabitCardListAdapter.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/list/model/HabitCardListAdapter.java
@@ -27,6 +27,7 @@ import org.isoron.uhabits.activities.*;
 import org.isoron.uhabits.activities.habits.list.*;
 import org.isoron.uhabits.activities.habits.list.views.*;
 import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.preferences.*;
 
 import java.util.*;
 
@@ -55,15 +56,21 @@ public class HabitCardListAdapter
     @NonNull
     private final HabitCardListCache cache;
 
+    @NonNull
+    private Preferences preferences;
+
     @Inject
-    public HabitCardListAdapter(@NonNull HabitCardListCache cache)
+    public HabitCardListAdapter(@NonNull HabitCardListCache cache,
+                                @NonNull Preferences preferences)
     {
+        this.preferences = preferences;
         this.selected = new LinkedList<>();
         this.observable = new ModelObservable();
         this.cache = cache;
 
         cache.setListener(this);
         cache.setCheckmarkCount(ListHabitsRootView.MAX_CHECKMARK_COUNT);
+        cache.setOrder(preferences.getDefaultOrder());
 
         setHasStableIds(true);
     }
@@ -268,6 +275,7 @@ public class HabitCardListAdapter
     public void setOrder(HabitList.Order order)
     {
         cache.setOrder(order);
+        preferences.setDefaultOrder(order);
     }
 
     /**
diff --git a/app/src/main/java/org/isoron/uhabits/preferences/Preferences.java b/app/src/main/java/org/isoron/uhabits/preferences/Preferences.java
index 86e5e5278..e8626aa5f 100644
--- a/app/src/main/java/org/isoron/uhabits/preferences/Preferences.java
+++ b/app/src/main/java/org/isoron/uhabits/preferences/Preferences.java
@@ -24,6 +24,7 @@ import android.preference.*;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.*;
+import org.isoron.uhabits.models.*;
 
 import java.util.*;
 
@@ -61,6 +62,21 @@ public class Preferences
         return prefs.getInt("pref_default_habit_palette_color", fallbackColor);
     }
 
+    public HabitList.Order getDefaultOrder()
+    {
+        String name = prefs.getString("pref_default_order", "BY_POSITION");
+
+        try
+        {
+            return HabitList.Order.valueOf(name);
+        }
+        catch (IllegalArgumentException e)
+        {
+            setDefaultOrder(HabitList.Order.BY_POSITION);
+            return HabitList.Order.BY_POSITION;
+        }
+    }
+
     public int getDefaultScoreSpinnerPosition()
     {
         int defaultScoreInterval = prefs.getInt("pref_score_view_interval", 1);
@@ -69,6 +85,11 @@ public class Preferences
         return defaultScoreInterval;
     }
 
+    public void setDefaultOrder(HabitList.Order order)
+    {
+        prefs.edit().putString("pref_default_order", order.name()).apply();
+    }
+
     public void setDefaultScoreSpinnerPosition(int position)
     {
         prefs.edit().putInt("pref_score_view_interval", position).apply();