Sort by score

app/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.java

@@ -124,6 +124,10 @@ public class ListHabitsMenu extends BaseMenu
                 adapter.setOrder(HabitList.Order.BY_NAME);
                 return true;
 
+            case R.id.actionSortScore:
+                adapter.setOrder(HabitList.Order.BY_SCORE);
+                return true;
+
             default:
                 return false;
         }

app/src/main/java/org/isoron/uhabits/models/HabitList.java

@@ -240,6 +240,7 @@ public abstract class HabitList implements Iterable<Habit>
     {
         BY_NAME,
         BY_COLOR,
+        BY_SCORE,
         BY_POSITION
     }
 }

app/src/main/java/org/isoron/uhabits/models/memory/MemoryHabitList.java

@@ -161,9 +161,16 @@ public class MemoryHabitList extends HabitList
             else return c1.compareTo(c2);
         };
 
+        Comparator<Habit> scoreComparator = (h1, h2) -> {
+            int s1 = h1.getScores().getTodayValue();
+            int s2 = h2.getScores().getTodayValue();
+            return Integer.compare(s2, s1);
+        };
+
         if (order == BY_POSITION) return null;
         if (order == BY_NAME) return nameComparator;
         if (order == BY_COLOR) return colorComparator;
+        if (order == BY_SCORE) return scoreComparator;
         throw new IllegalStateException();
     }
 

app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteHabitList.java

@@ -277,6 +277,15 @@ public class SQLiteHabitList extends HabitList
             habits.add(habit);
         }
 
+        if(order == Order.BY_SCORE)
+        {
+            Collections.sort(habits, (lhs, rhs) -> {
+                int s1 = lhs.getScores().getTodayValue();
+                int s2 = rhs.getScores().getTodayValue();
+                return Integer.compare(s2, s1);
+            });
+        }
+
         return habits;
     }
 
@@ -289,6 +298,7 @@ public class SQLiteHabitList extends HabitList
                 break;
 
             case BY_NAME:
+            case BY_SCORE:
                 query.append("order by name ");
                 break;
 

app/src/main/res/menu/list_habits.xml

@@ -59,6 +59,10 @@
                     <item
                         android:id="@+id/actionSortColor"
                         android:title="@string/by_color"/>
+
+                    <item
+                        android:id="@+id/actionSortScore"
+                        android:title="@string/by_score"/>
                 </menu>
             </item>
         </menu>

app/src/main/res/values/strings.xml

@@ -201,4 +201,5 @@
     <string name="manually">Manually</string>
     <string name="by_name">By name</string>
     <string name="by_color">By color</string>
+    <string name="by_score">By score</string>
 </resources>