From 7ebeb1808912d83336b485939d6429ebe4107f57 Mon Sep 17 00:00:00 2001 From: tom5079 Date: Sat, 8 Jun 2019 14:59:08 +0900 Subject: [PATCH] Shows favorited tags first on suggestion list --- app/src/main/java/xyz/quaver/pupil/MainActivity.kt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/xyz/quaver/pupil/MainActivity.kt b/app/src/main/java/xyz/quaver/pupil/MainActivity.kt index 7b89fb97..feaa0bab 100644 --- a/app/src/main/java/xyz/quaver/pupil/MainActivity.kt +++ b/app/src/main/java/xyz/quaver/pupil/MainActivity.kt @@ -809,7 +809,15 @@ class MainActivity : AppCompatActivity() { suggestionJob?.cancel() suggestionJob = CoroutineScope(Dispatchers.IO).launch { - val suggestions = getSuggestionsForQuery(currentQuery).map { TagSuggestion(it) } + val suggestions = ArrayList(getSuggestionsForQuery(currentQuery).map { TagSuggestion(it) }) + + suggestions.filter { + val tag = "${it.n}:${it.s.replace(Regex("\\s"), "_")}" + Tags(json.parse(serializer, favoritesFile.readText())).contains(tag) + }.reversed().forEach { + suggestions.remove(it) + suggestions.add(0, it) + } withContext(Dispatchers.Main) { swapSuggestions(suggestions)