From ea1667b59cb4c4868d1067ac8d98406d1bec6a6f Mon Sep 17 00:00:00 2001
From: Gonk <chris@zink.tv>
Date: Sun, 5 Jan 2020 22:22:43 +0100
Subject: [PATCH 1/2] first untested draft of sorting quests by name

---
 .../src/com/gpl/rpg/AndorsTrail/model/quest/Quest.java     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/Quest.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/Quest.java
index 5c651deec..bbc9a4571 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/Quest.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/Quest.java
@@ -47,6 +47,11 @@ public final class Quest implements Comparable<Quest> {
 
 	@Override
 	public int compareTo(Quest q) {
-		return sortOrder - q.sortOrder;
+
+		int comp = name.compareTo(q.name);
+		if (comp == 0) {
+			comp = sortOrder - q.sortOrder;
+		}
+		return comp;
 	}
 }

From 708deec0d1a386c28e84f0a4b65b10297cb152ec Mon Sep 17 00:00:00 2001
From: Gonk <chris@zink.tv>
Date: Sun, 5 Jan 2020 23:13:09 +0100
Subject: [PATCH 2/2] Renamed quest filtering options

---
 AndorsTrail/res/values/strings.xml                          | 6 +++---
 .../activity/fragment/HeroinfoActivity_Quests.java          | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/AndorsTrail/res/values/strings.xml b/AndorsTrail/res/values/strings.xml
index 6ca71af9d..e8fa9a20e 100644
--- a/AndorsTrail/res/values/strings.xml
+++ b/AndorsTrail/res/values/strings.xml
@@ -292,9 +292,9 @@
 	</string>
 
 	<string name="questlog_includecompleted_prompt">Select quests to show</string>
-	<string name="questlog_includecompleted_hidecompleted">Hide completed quests</string>
-	<string name="questlog_includecompleted_includecompleted">Include completed quests</string>
-	<string name="questlog_includecompleted_onlycompleted">Only completed quests</string>
+	<string name="questlog_includecompleted_hidecompleted">Active quests</string>
+	<string name="questlog_includecompleted_includecompleted">All quests</string>
+	<string name="questlog_includecompleted_onlycompleted">Completed quests</string>
 	<string name="questlog_queststatus">Status: %1$s</string>
 	<string name="questlog_queststatus_inprogress">In progress</string>
 	<string name="questlog_queststatus_completed">Completed</string>
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Quests.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Quests.java
index ece9d03f7..ab5f40ea4 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Quests.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Quests.java
@@ -122,11 +122,11 @@ public final class HeroinfoActivity_Quests extends Fragment {
 				boolean isCompleted = q.isCompleted(player);
 
 				int v = world.model.uiSelections.selectedQuestFilter;
-				if (v == 0) { // Hide completed quests
+				if (v == 0) { // Active quests
 					if (isCompleted) continue;
-				} else if (v == 1) { // Include completed quests
+				} else if (v == 1) { // All quests
 					// Always show.
-				} else if (v == 2) { // Only completed quests
+				} else if (v == 2) { // Completed quests
 					if (!isCompleted) continue;
 				}