From 03541703fa7bc2c349ea7ec80ada7441574e9081 Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Tue, 2 May 2023 00:14:58 -0400 Subject: [PATCH] android: Sort games alphabetically by default --- .../main/java/org/yuzu/yuzu_emu/ui/GamesFragment.kt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/GamesFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/GamesFragment.kt index cc17b8626..0b4ae8744 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/GamesFragment.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/GamesFragment.kt @@ -20,8 +20,10 @@ import org.yuzu.yuzu_emu.R import org.yuzu.yuzu_emu.adapters.GameAdapter import org.yuzu.yuzu_emu.databinding.FragmentGamesBinding import org.yuzu.yuzu_emu.layout.AutofitGridLayoutManager +import org.yuzu.yuzu_emu.model.Game import org.yuzu.yuzu_emu.model.GamesViewModel import org.yuzu.yuzu_emu.model.HomeViewModel +import java.util.Locale class GamesFragment : Fragment() { private var _binding: FragmentGamesBinding? = null @@ -73,7 +75,7 @@ class GamesFragment : Fragment() { binding.swipeRefresh.isRefreshing = isReloading } gamesViewModel.games.observe(viewLifecycleOwner) { - (binding.gridGames.adapter as GameAdapter).submitList(it) + submitGamesList(it) if (it.isEmpty()) { binding.noticeText.visibility = View.VISIBLE } else { @@ -83,7 +85,7 @@ class GamesFragment : Fragment() { gamesViewModel.shouldSwapData.observe(viewLifecycleOwner) { shouldSwapData -> if (shouldSwapData) { - (binding.gridGames.adapter as GameAdapter).submitList(gamesViewModel.games.value) + submitGamesList(gamesViewModel.games.value!!) gamesViewModel.setShouldSwapData(false) } } @@ -107,6 +109,11 @@ class GamesFragment : Fragment() { } } + private fun submitGamesList(gameList: List) { + val sortedList = gameList.sortedBy { it.title.lowercase(Locale.getDefault()) } + (binding.gridGames.adapter as GameAdapter).submitList(sortedList) + } + override fun onDestroyView() { super.onDestroyView() _binding = null