From cc4ad53541cf62ee5c45efcedfd9f6b128e49693 Mon Sep 17 00:00:00 2001 From: Scrimbly <38977720+scrimbly@users.noreply.github.com> Date: Wed, 19 Feb 2020 22:17:58 -0600 Subject: [PATCH] Replace mindSdk-24 comparator.reversed() call with explicit reverse comparator --- .../uhabits/core/models/memory/MemoryHabitList.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryHabitList.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryHabitList.java index 91bda94b2..c126536e6 100644 --- a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryHabitList.java +++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryHabitList.java @@ -139,6 +139,14 @@ public class MemoryHabitList extends HabitList else return s2.compareTo(s1); }; + Comparator ascendingScoreComparator = (h2, h1) -> + { + Double s1 = h1.getScores().getTodayValue(); + Double s2 = h2.getScores().getTodayValue(); + if (s1.equals(s2)) return nameComparator.compare(h1, h2); + else return s2.compareTo(s1); + }; + Comparator positionComparator = (h1, h2) -> { Integer p1 = h1.getPosition(); @@ -151,7 +159,7 @@ public class MemoryHabitList extends HabitList if (order == BY_NAME) return nameComparator; if (order == BY_COLOR) return colorComparator; if (order == BY_SCORE) return scoreComparator; - if (order == BY_SCORE_ASC) return scoreComparator.reversed(); + if (order == BY_SCORE_ASC) return ascendingScoreComparator; throw new IllegalStateException(); }