From 8c8204cf1944443de2ae1972d85ed8d610aeba8e Mon Sep 17 00:00:00 2001 From: Quentin Hibon Date: Wed, 18 Nov 2020 11:43:50 +0100 Subject: [PATCH] rename: priority -> status --- .../uhabits/activities/habits/list/ListHabitsMenu.kt | 4 ++-- android/uhabits-android/src/main/res/menu/list_habits.xml | 4 ++-- android/uhabits-android/src/main/res/values/strings.xml | 2 +- .../java/org/isoron/uhabits/core/models/Checkmark.java | 2 +- .../java/org/isoron/uhabits/core/models/HabitList.java | 4 ++-- .../uhabits/core/models/memory/MemoryHabitList.java | 8 ++++---- .../ui/screens/habits/list/ListHabitsMenuBehavior.java | 8 ++++---- .../screens/habits/list/ListHabitsMenuBehaviorTest.java | 6 +++--- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.kt index 793a5354e..c9d40f1c0 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.kt @@ -104,8 +104,8 @@ class ListHabitsMenu @Inject constructor( return true } - R.id.actionSortPriority -> { - behavior.onSortByPriority() + R.id.actionSortStatus -> { + behavior.onSortByStatus() return true } diff --git a/android/uhabits-android/src/main/res/menu/list_habits.xml b/android/uhabits-android/src/main/res/menu/list_habits.xml index 27abd2f45..9514c7a28 100644 --- a/android/uhabits-android/src/main/res/menu/list_habits.xml +++ b/android/uhabits-android/src/main/res/menu/list_habits.xml @@ -67,8 +67,8 @@ android:title="@string/by_score"/> + android:id="@+id/actionSortStatus" + android:title="@string/by_status"/> diff --git a/android/uhabits-android/src/main/res/values/strings.xml b/android/uhabits-android/src/main/res/values/strings.xml index 1cd2b7912..89d06674b 100644 --- a/android/uhabits-android/src/main/res/values/strings.xml +++ b/android/uhabits-android/src/main/res/values/strings.xml @@ -159,7 +159,7 @@ By name By color By score - By priority + By status Export Press-and-hold to change the value Change value diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Checkmark.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Checkmark.java index c41e8838b..88bc0ae05 100644 --- a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Checkmark.java +++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/Checkmark.java @@ -33,7 +33,7 @@ import static org.isoron.uhabits.core.utils.StringUtils.defaultToStringStyle; * expected at that day or not. *

*

- * Note that the priority comparator in + * Note that the status comparator in * {@link org.isoron.uhabits.core.models.memory.MemoryHabitList} * relies on SKIP > YES_MANUAL > YES_AUTO > NO. *

diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitList.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitList.java index baccbb877..92228ede6 100644 --- a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitList.java +++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/HabitList.java @@ -250,8 +250,8 @@ public abstract class HabitList implements Iterable BY_COLOR_DESC, BY_SCORE_ASC, BY_SCORE_DESC, - BY_PRIORITY_ASC, - BY_PRIORITY_DESC, + BY_STATUS_ASC, + BY_STATUS_DESC, BY_POSITION } } 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 3bcc611b1..c4fc41cf2 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 @@ -173,7 +173,7 @@ public class MemoryHabitList extends HabitList else return p1.compareTo(p2); }; - Comparator priorityComparatorDesc = (h1, h2) -> + Comparator statusComparatorDesc = (h1, h2) -> { if (h1.isCompletedToday() != h2.isCompletedToday()) { return h1.isCompletedToday() ? -1 : 1; @@ -189,7 +189,7 @@ public class MemoryHabitList extends HabitList return v2.compareTo(v1); }; - Comparator priorityComparatorAsc = (h1, h2) -> priorityComparatorDesc.compare(h2, h1); + Comparator statusComparatorAsc = (h1, h2) -> statusComparatorDesc.compare(h2, h1); if (order == BY_POSITION) return positionComparator; if (order == BY_NAME_ASC) return nameComparatorAsc; @@ -198,8 +198,8 @@ public class MemoryHabitList extends HabitList if (order == BY_COLOR_DESC) return colorComparatorDesc; if (order == BY_SCORE_DESC) return scoreComparatorDesc; if (order == BY_SCORE_ASC) return scoreComparatorAsc; - if (order == BY_PRIORITY_DESC) return priorityComparatorDesc; - if (order == BY_PRIORITY_ASC) return priorityComparatorAsc; + if (order == BY_STATUS_DESC) return statusComparatorDesc; + if (order == BY_STATUS_ASC) return statusComparatorAsc; throw new IllegalStateException(); } diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehavior.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehavior.java index 03c281982..192923995 100644 --- a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehavior.java +++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehavior.java @@ -127,11 +127,11 @@ public class ListHabitsMenuBehavior } } - public void onSortByPriority() { - if (adapter.getOrder() != HabitList.Order.BY_PRIORITY_ASC) { - adapter.setOrder(HabitList.Order.BY_PRIORITY_ASC); + public void onSortByStatus() { + if (adapter.getOrder() != HabitList.Order.BY_STATUS_ASC) { + adapter.setOrder(HabitList.Order.BY_STATUS_ASC); } else { - adapter.setOrder(HabitList.Order.BY_PRIORITY_DESC); + adapter.setOrder(HabitList.Order.BY_STATUS_DESC); } } diff --git a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehaviorTest.java b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehaviorTest.java index 202d8b7ab..277b90bf4 100644 --- a/android/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehaviorTest.java +++ b/android/uhabits-core/src/test/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsMenuBehaviorTest.java @@ -132,11 +132,11 @@ public class ListHabitsMenuBehaviorTest extends BaseUnitTest } @Test - public void testOnSortPriority() + public void testOnSortStatus() { - behavior.onSortByPriority(); + behavior.onSortByStatus(); verify(adapter).setOrder(orderCaptor.capture()); - assertThat(orderCaptor.getValue(), equalTo(BY_PRIORITY_ASC)); + assertThat(orderCaptor.getValue(), equalTo(BY_STATUS_ASC)); } @Test