From 47e4f25346ae5102e56d797161319c8dd8c8a7f9 Mon Sep 17 00:00:00 2001 From: kingokksa <47888451+kingokksa@users.noreply.github.com> Date: Thu, 15 Oct 2026 21:20:49 +0800 Subject: [PATCH] feat: sort the store library and installed tabs, and switch between card and list views (#798) --- .../com/droiddeck/launcher/MainActivity.kt | 8 + .../launcher/session/SessionPrefs.kt | 17 ++ .../droiddeck/launcher/stores/StoreCatalog.kt | 29 +++ .../droiddeck/launcher/stores/StoreSizes.kt | 66 +++-- .../droiddeck/launcher/ui/FrontEndScreen.kt | 4 + .../com/droiddeck/launcher/ui/StoresPage.kt | 225 +++++++++++++++++- app/src/main/res/values-ar/strings.xml | 10 + app/src/main/res/values-bg/strings.xml | 10 + app/src/main/res/values-cs/strings.xml | 10 + app/src/main/res/values-da/strings.xml | 10 + app/src/main/res/values-de/strings.xml | 10 + app/src/main/res/values-el/strings.xml | 10 + app/src/main/res/values-es/strings.xml | 10 + app/src/main/res/values-fi/strings.xml | 10 + app/src/main/res/values-fr/strings.xml | 10 + app/src/main/res/values-hi/strings.xml | 10 + app/src/main/res/values-hu/strings.xml | 10 + app/src/main/res/values-in/strings.xml | 10 + app/src/main/res/values-it/strings.xml | 10 + app/src/main/res/values-ja/strings.xml | 10 + app/src/main/res/values-ko/strings.xml | 10 + app/src/main/res/values-ms/strings.xml | 10 + app/src/main/res/values-nb/strings.xml | 10 + app/src/main/res/values-nl/strings.xml | 10 + app/src/main/res/values-pl/strings.xml | 10 + app/src/main/res/values-pt-rPT/strings.xml | 10 + app/src/main/res/values-pt/strings.xml | 10 + app/src/main/res/values-ro/strings.xml | 10 + app/src/main/res/values-ru/strings.xml | 10 + app/src/main/res/values-sv/strings.xml | 10 + app/src/main/res/values-th/strings.xml | 10 + app/src/main/res/values-tr/strings.xml | 10 + app/src/main/res/values-uk/strings.xml | 10 + app/src/main/res/values-vi/strings.xml | 10 + app/src/main/res/values-zh-rCN/strings.xml | 10 + app/src/main/res/values-zh-rHK/strings.xml | 10 + app/src/main/res/values-zh-rTW/strings.xml | 10 + app/src/main/res/values/strings.xml | 10 + .../launcher/stores/SortCatalogItemsTest.kt | 67 ++++++ 39 files changed, 710 insertions(+), 26 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/stores/SortCatalogItemsTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt index cf563015b0..ddf8d6e82a 100644 --- a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt @@ -160,6 +160,8 @@ class MainActivity : ComponentActivity() { private var storesOpenTab by mutableStateOf(SessionPrefs.STORES_OPEN_LIBRARY) private var navRequest by mutableStateOf(null) private var storesShowMature by mutableStateOf(false) + private var storesSort by mutableStateOf(SessionPrefs.STORES_SORTS.first()) + private var storesView by mutableStateOf(SessionPrefs.STORES_VIEWS.first()) private var mic by mutableStateOf(false) private var wifiDiscovery by mutableStateOf(false) private var wifiDiscoveryPermission by mutableStateOf(false) @@ -517,6 +519,8 @@ class MainActivity : ComponentActivity() { gameStoresSpeedTier = SessionPrefs.gameStoresSpeedTier(this) storesOpenTab = SessionPrefs.storesOpenTab(this) storesShowMature = SessionPrefs.storesShowMature(this) + storesSort = SessionPrefs.storesSort(this) + storesView = SessionPrefs.storesView(this) applyLauncherFullscreen() updates.start() setContent { @@ -574,6 +578,8 @@ class MainActivity : ComponentActivity() { addedGamesArt = addedGamesArt, sgdbUserKey = sgdbUserKey, storesShowMature = storesShowMature, + storesSort = storesSort, + storesView = storesView, storeDownloadsActive = com.droiddeck.launcher.stores.StoresState.activeDownloads, ), FrontEndActions( @@ -729,6 +735,8 @@ class MainActivity : ComponentActivity() { onStoresOpenTab = { tab -> SessionPrefs.setStoresOpenTab(this, tab); storesOpenTab = tab }, onNavigated = { navRequest = null }, onStoresShowMature = { show -> SessionPrefs.setStoresShowMature(this, show); storesShowMature = show }, + onStoresSort = { sort -> SessionPrefs.setStoresSort(this, sort); storesSort = sort }, + onStoresView = { view -> SessionPrefs.setStoresView(this, view); storesView = view }, onLibraryChanged = { refreshAddedGames(); refresh() }, onAnimationsEnabled = { on -> SessionPrefs.setAnimationsEnabled(this, on) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index be3cc25685..22f93c9ad1 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -104,6 +104,23 @@ object SessionPrefs { prefs(context).edit().putBoolean("storesShowMature", show).apply() } + fun storesSort(context: Context): String = + prefs(context).getString("storesSort", null)?.takeIf { it in STORES_SORTS } ?: STORES_SORTS.first() + + fun setStoresSort(context: Context, sort: String) { + prefs(context).edit().putString("storesSort", if (sort in STORES_SORTS) sort else STORES_SORTS.first()).apply() + } + + fun storesView(context: Context): String = + prefs(context).getString("storesView", null)?.takeIf { it in STORES_VIEWS } ?: STORES_VIEWS.first() + + fun setStoresView(context: Context, view: String) { + prefs(context).edit().putString("storesView", if (view in STORES_VIEWS) view else STORES_VIEWS.first()).apply() + } + + val STORES_SORTS = listOf("lastPlayed", "recentlyInstalled", "titleAsc", "titleDesc", "sizeDesc", "sizeAsc", "releaseDateDesc") + val STORES_VIEWS = listOf("cards", "list") + const val STORES_OPEN_LIBRARY = "library" const val STORES_OPEN_STORE = "store" diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreCatalog.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreCatalog.kt index 81f967f83c..049e2b926b 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreCatalog.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreCatalog.kt @@ -53,6 +53,35 @@ fun installedCards(store: Store, installed: List, library: L }.distinctBy { it.id }.sortedBy { it.title.lowercase() } } +private fun releaseDateValue(item: CatalogItem): Long = + item.releaseDate.take(10).takeIf { it.length == 10 }?.let { raw -> + runCatching { java.time.LocalDate.parse(raw).toEpochDay() }.getOrDefault(0L) + } ?: 0L + +fun sortCatalogItems( + items: List, + sort: String, + lastPlayed: (CatalogItem) -> Long = { 0L }, + installedAt: (CatalogItem) -> Long = { 0L }, + size: (CatalogItem) -> Long = { it.sizeBytes }, +): List = when (sort) { + "lastPlayed" -> items.sortedWith(compareByDescending(lastPlayed).thenBy { it.title.lowercase() }) + "recentlyInstalled" -> items.sortedWith(compareByDescending(installedAt).thenBy { it.title.lowercase() }) + "titleAsc" -> items.sortedBy { it.title.lowercase() } + "titleDesc" -> items.sortedByDescending { it.title.lowercase() } + "sizeDesc" -> items.sortedWith(compareByDescending(size).thenBy { it.title.lowercase() }) + "sizeAsc" -> items.sortedWith(compareBy { size(it).takeIf { b -> b > 0 } ?: Long.MAX_VALUE }.thenBy { it.title.lowercase() }) + "releaseDateDesc" -> items.sortedWith(compareByDescending(::releaseDateValue).thenBy { it.title.lowercase() }) + else -> items +} + +internal fun retainCatalogOrder(items: List, previous: List): List { + if (items.size != previous.size) return items + val byKey = items.associateBy { it.key } + if (previous.any { it.key !in byKey }) return items + return previous.map { byKey.getValue(it.key) } +} + fun mergeItems(old: List?, new: List): List { if (old.isNullOrEmpty()) return new val before = old.associateBy { it.key } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt index d8253de875..9e37226f85 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt @@ -12,6 +12,7 @@ import com.droiddeck.launcher.stores.epic.EpicCredentialStore import com.droiddeck.launcher.stores.epic.EpicDownloadManager import com.droiddeck.launcher.stores.epic.EpicInstallTags import com.droiddeck.launcher.stores.epic.EpicPrefs +import java.util.concurrent.CompletableFuture import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.Executors @@ -20,7 +21,8 @@ object StoreSizes { val known = mutableStateMapOf() - private val asked = ConcurrentHashMap.newKeySet() + private val sizeRequests = ConcurrentHashMap>() + private val diskRequests = ConcurrentHashMap>() private val pool = Executors.newFixedThreadPool(3, com.droiddeck.launcher.stores.download.DownloadQueue.workerFactory("sizes")) fun size(item: CatalogItem): Long = known[item.key] ?: item.sizeBytes @@ -29,22 +31,35 @@ object StoreSizes { private fun cache(context: Context, store: Store) = caches.getOrPut(store) { SizeCache.forStore(context.applicationContext.filesDir, store) } fun request(context: Context, item: CatalogItem) { - if (!item.owned || item.sizeBytes > 0 || item.store == Store.GOG) return - if (known.containsKey(item.key) || !asked.add(item.key)) return + if (!item.owned || item.sizeBytes > 0 || item.store == Store.GOG || known.containsKey(item.key)) return + resolve(context, item).thenAccept { bytes -> + if (bytes != null) StoresState.post { known[item.key] = bytes } + } + } + + fun resolve(context: Context, item: CatalogItem): CompletableFuture { + val available = known[item.key] ?: item.sizeBytes.takeIf { it > 0 } + if (!item.owned || item.store == Store.GOG || item.sizeBytes > 0) return CompletableFuture.completedFuture(available) + if (available != null) return CompletableFuture.completedFuture(available) val app = context.applicationContext val version = item.extra["version"].orEmpty() - pool.execute { - val cached = cache(app, item.store).get(item.id, version) - if (cached != null) { StoresState.post { known[item.key] = cached }; return@execute } - val bytes = runCatching { fetch(app, item) }.onFailure { Log.w(TAG, "${item.key}: ${it.javaClass.simpleName}") }.getOrNull() ?: 0L - if (bytes > 0) { - cache(app, item.store).put(item.id, version, bytes) - when (item.store) { - Store.EPIC -> EpicPrefs.get(app).edit().putLong("size_${item.id}", bytes).apply() - Store.AMAZON -> AmazonPrefs.get(app).edit().putLong("size_${item.id}", bytes).apply() - Store.GOG -> {} + return sizeRequests.computeIfAbsent(item.key) { + CompletableFuture.supplyAsync({ + val cached = cache(app, item.store).get(item.id, version) + val bytes = cached ?: runCatching { fetch(app, item) } + .onFailure { Log.w(TAG, "${item.key}: ${it.javaClass.simpleName}") } + .getOrNull() + bytes?.takeIf { it > 0 }?.also { + cache(app, item.store).put(item.id, version, it) + when (item.store) { + Store.EPIC -> EpicPrefs.get(app).edit().putLong("size_${item.id}", it).apply() + Store.AMAZON -> AmazonPrefs.get(app).edit().putLong("size_${item.id}", it).apply() + Store.GOG -> {} + } } - StoresState.post { known[item.key] = bytes } + }, pool).exceptionally { error -> + Log.w(TAG, "${item.key}: size resolution failed", error) + null } } } @@ -52,14 +67,25 @@ object StoreSizes { val onDisk = mutableStateMapOf() fun requestDisk(context: Context, key: String, game: InstalledStoreGame) { - if (onDisk.containsKey(key) || !asked.add("disk:$key")) return + resolveDisk(context, key, game).thenAccept { bytes -> + if (bytes != null) StoresState.post { onDisk[key] = bytes } + } + } + + fun resolveDisk(context: Context, key: String, game: InstalledStoreGame): CompletableFuture { + onDisk[key]?.let { return CompletableFuture.completedFuture(it) } val app = context.applicationContext val version = "disk:${game.sidecar.installedAt}:${game.sidecar.installVersion}" - pool.execute { - val c = cache(app, game.sidecar.store) - val bytes = c.get("disk:${game.sidecar.id}", version) - ?: game.folder.walkTopDown().filter { it.isFile && !it.name.startsWith(".droiddeck") }.sumOf { it.length() }.also { c.put("disk:${game.sidecar.id}", version, it) } - if (bytes > 0) StoresState.post { onDisk[key] = bytes } + return diskRequests.computeIfAbsent(key) { + CompletableFuture.supplyAsync({ + val c = cache(app, game.sidecar.store) + c.get("disk:${game.sidecar.id}", version) + ?: game.folder.walkTopDown().filter { it.isFile && !it.name.startsWith(".droiddeck") } + .sumOf { it.length() }.also { c.put("disk:${game.sidecar.id}", version, it) } + }, pool).thenApply { it.takeIf { bytes -> bytes > 0 } }.exceptionally { error -> + Log.w(TAG, "$key: disk size resolution failed", error) + null + } } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt index 73212d3f8f..6e24c7d376 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -139,6 +139,8 @@ class FrontEndState( val addedGamesArt: Boolean = true, val sgdbUserKey: Boolean = false, val storesShowMature: Boolean = false, + val storesSort: String = SessionPrefs.STORES_SORTS.first(), + val storesView: String = SessionPrefs.STORES_VIEWS.first(), val storeDownloadsActive: Int = 0, val updates: UpdatesState = UpdatesState(), ) @@ -199,6 +201,8 @@ class FrontEndActions( val onStoresOpenTab: (String) -> Unit = {}, val onNavigated: () -> Unit = {}, val onStoresShowMature: (Boolean) -> Unit = {}, + val onStoresSort: (String) -> Unit = {}, + val onStoresView: (String) -> Unit = {}, val onLibraryChanged: () -> Unit = {}, val onHomeApp: () -> Unit = {}, val onHomeScreen: (Boolean) -> Unit = {}, diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt index 0438a59fab..028ada0080 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt @@ -85,6 +85,11 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Check import androidx.compose.material.icons.filled.Search import androidx.compose.material.icons.automirrored.filled.Login +import androidx.compose.material.icons.filled.GridView +import androidx.compose.material.icons.filled.Sort +import androidx.compose.material.icons.filled.ViewList +import com.droiddeck.launcher.stores.sortCatalogItems +import com.droiddeck.launcher.stores.retainCatalogOrder import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.basicMarquee import androidx.compose.material.icons.filled.PlayArrow @@ -95,6 +100,7 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.SideEffect import androidx.compose.runtime.State import androidx.compose.runtime.getValue import androidx.compose.runtime.key @@ -132,6 +138,10 @@ import com.droiddeck.launcher.stores.StoresState import com.droiddeck.launcher.stores.download.DownloadStage import com.droiddeck.launcher.stores.download.DownloadState import com.droiddeck.launcher.stores.formatBytes +import java.util.concurrent.CompletableFuture +import kotlin.coroutines.resume +import kotlin.coroutines.resumeWithException +import kotlinx.coroutines.suspendCancellableCoroutine private const val DOWNLOADS = "downloads" @@ -738,13 +748,72 @@ private fun Storefront( val installedOnly = tab == "installed" val loaded = StoresState.library.containsKey(store) val showGrid = tab != "store" || q.isNotEmpty() - val visible = remember(library, installedItems, everything, tab, q, s.storesShowMature) { + val sort = s.storesSort + val lastPlayedFor = remember(s.steamGames) { + val byKey = s.steamGames.associate { "${it.source}:${it.storeId}" to it.lastPlayed } + val lookup: (CatalogItem) -> Long = { i -> byKey[i.key] ?: 0L } + lookup + } + val installedAtFor = remember(StoresState.installed) { + val byKey = StoresState.installed.associate { "${it.sidecar.store.id}:${it.sidecar.id}" to it.sidecar.installedAt } + val lookup: (CatalogItem) -> Long = { i -> byKey[i.key] ?: 0L } + lookup + } + val isSizeSort = (tab == "library" || tab == "installed") && (sort == "sizeAsc" || sort == "sizeDesc") + val candidates = remember(library, installedItems, everything, tab, q, s.storesShowMature) { when (tab) { "library" -> library.filter(::matches) "installed" -> installedItems.filter(::matches) else -> everything.filter { matches(it) && shown(it) } } } + val candidateKeys = remember(candidates) { candidates.map { it.key } } + var resolvedSizeSortKey by remember(store, tab) { mutableStateOf?>(null) } + val sizeSortPending = isSizeSort && resolvedSizeSortKey != candidateKeys + var stableVisible by remember(store, tab) { mutableStateOf(emptyList()) } + val resolvedSizes = when { + !isSizeSort -> emptyMap() + installedOnly -> com.droiddeck.launcher.stores.StoreSizes.onDisk.toMap() + else -> com.droiddeck.launcher.stores.StoreSizes.known.toMap() + } + val sizeFor = remember(resolvedSizes, installedOnly) { + val resolved = resolvedSizes + val lookup: (CatalogItem) -> Long = { item -> + resolved[item.key] ?: if (installedOnly) 0L else item.sizeBytes + } + lookup + } + val sortedVisible = remember(candidates, tab, sort, lastPlayedFor, installedAtFor, sizeFor) { + if (tab == "library" || tab == "installed") + sortCatalogItems(candidates, sort, lastPlayed = lastPlayedFor, installedAt = installedAtFor, size = sizeFor) + else candidates + } + val visible = remember(sizeSortPending, candidates, stableVisible, sortedVisible) { + if (sizeSortPending) retainCatalogOrder(candidates, stableVisible) else sortedVisible + } + SideEffect { + if (!sizeSortPending && stableVisible != sortedVisible) stableVisible = sortedVisible + } + LaunchedEffect(store, tab, sort, candidates, candidateKeys) { + if (!isSizeSort || resolvedSizeSortKey == candidateKeys) return@LaunchedEffect + val requests = candidates.map { item -> + val future: CompletableFuture = if (tab == "installed") { + StoresState.installedGame(store, item.id)?.let { + com.droiddeck.launcher.stores.StoreSizes.resolveDisk(ctx, item.key, it) + } ?: CompletableFuture.completedFuture(null) + } else { + com.droiddeck.launcher.stores.StoreSizes.resolve(ctx, item) + } + item to future + } + CompletableFuture.allOf(*requests.map { it.second }.toTypedArray()).await() + requests.forEach { (item, future) -> + val bytes = future.getNow(null) ?: return@forEach + if (tab == "installed") com.droiddeck.launcher.stores.StoreSizes.onDisk[item.key] = bytes + else if (item.owned && item.sizeBytes <= 0) com.droiddeck.launcher.stores.StoreSizes.known[item.key] = bytes + } + resolvedSizeSortKey = candidateKeys + } val empty = stringResource(when { installedOnly -> R.string.stores_installed_empty tab == "library" && library.isEmpty() && StoresState.status[store] != null -> R.string.stores_library_loading @@ -755,7 +824,9 @@ private fun Storefront( val density = androidx.compose.ui.platform.LocalDensity.current val focus = LocalFrontFocus.current val scope = rememberCoroutineScope() - val headerItems = 1 + (if (StoresState.status[store] != null) 1 else 0) + (if (StoresState.problems[store] != null) 1 else 0) + val headerItems = 1 + (if (sizeSortPending) 1 else 0) + + (if (StoresState.status[store] != null) 1 else 0) + (if (StoresState.problems[store] != null) 1 else 0) + val listMode = s.storesView == "list" && (tab == "library" || tab == "installed") val card: @Composable (CatalogItem) -> Unit = { item -> val first = if (showGrid) item.key == visible.firstOrNull()?.key else !firstPlaced firstPlaced = true @@ -767,7 +838,7 @@ private fun Storefront( else -> 0 } val index = visible.indexOfFirst { it.key == item.key } - val next = storeGridNeighbor(index, visible.size, columns, direction) + val next = storeGridNeighbor(index, visible.size, if (listMode) 1 else columns, direction) when { direction == 0 || index < 0 -> false next == null -> direction > 0 @@ -786,12 +857,13 @@ private fun Storefront( } } } - GameCard(item, store, s, a, installedKeys, onOpen, first, navigation) + if (listMode) GameListRow(item, store, installedKeys, onOpen, first, navigation) + else GameCard(item, store, s, a, installedKeys, onOpen, first, navigation) } LazyVerticalGrid( - columns = GridCells.Adaptive(CardWidth), state = grid, modifier = Modifier.fillMaxSize().focusGroup().onSizeChanged { + columns = if (listMode) GridCells.Fixed(1) else GridCells.Adaptive(CardWidth), state = grid, modifier = Modifier.fillMaxSize().focusGroup().onSizeChanged { val gap = with(density) { 10.dp.roundToPx() } - val minimum = with(density) { CardWidth.roundToPx() } + val minimum = with(density) { (if (listMode) CardWidth * 2 else CardWidth).roundToPx() } columns = ((it.width + gap) / (minimum + gap)).toInt().coerceAtLeast(1) }, horizontalArrangement = Arrangement.spacedBy(10.dp), verticalArrangement = Arrangement.spacedBy(10.dp), @@ -813,12 +885,25 @@ private fun Storefront( else -> stringResource(R.string.stores_search_library) }, ) { + if (tab == "library" || tab == "installed") { + SortButton(s, a) + ViewButton(s, a) + } SmallTextButton(stringResource(R.string.stores_refresh)) { StoresState.open(ctx, store, force = true) } val name = StoresState.accounts[store] ?: "" SignOutButton(store, name) } } } + if (sizeSortPending) item(key = "size-sort-progress", span = { GridItemSpan(maxLineSpan) }) { + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), + modifier = Modifier.fillMaxWidth().padding(bottom = 8.dp), + ) { + androidx.compose.material3.LinearProgressIndicator(Modifier.weight(1f).height(3.dp)) + Text(stringResource(R.string.store_section_loading), fontSize = 11.sp, color = MaterialTheme.colorScheme.onSurfaceVariant) + } + } StoresState.status[store]?.let { line -> item(key = "sync", span = { GridItemSpan(maxLineSpan) }) { Rise(3) { SyncBar(line) } } } StoresState.problems[store]?.let { line -> item(key = "problem", span = { GridItemSpan(maxLineSpan) }) { Rise(3) { Box(Modifier.padding(bottom = 8.dp)) { Note(line) } } } } when (tab) { @@ -844,6 +929,14 @@ private fun Storefront( } } +private suspend fun CompletableFuture.await(): T = + suspendCancellableCoroutine { continuation -> + whenComplete { value, error -> + if (error == null) continuation.resume(value) + else continuation.resumeWithException(error) + } + } + @Composable internal fun ModeHeader(title: String, query: String, onQuery: (String) -> Unit, placeholder: String, trailing: @Composable () -> Unit) { val colors = MaterialTheme.colorScheme @@ -933,6 +1026,126 @@ private fun SmallTextButton(text: String, key: String = text, onClick: () -> Uni ) } +@Composable +private fun HeaderIconButton(description: String, icon: androidx.compose.ui.graphics.vector.ImageVector, key: String, onClick: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + Box( + contentAlignment = Alignment.Center, + modifier = Modifier.paneItem("btn:$key").size(32.dp).clip(CircleShape).background(if (hot) pal.signal.copy(alpha = 0.14f) else Color.Transparent) + .glideBorder(hot, CircleShape, pal.signal) + .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button, onClick = onClick) + .controllerConfirm(onClick = onClick), + ) { Icon(icon, description, tint = if (hot) pal.signal else colors.onSurfaceVariant, modifier = Modifier.size(18.dp)) } +} + +@Composable +private fun SortButton(s: FrontEndState, a: FrontEndActions) { + val pal = LocalPalette.current + val title = stringResource(R.string.stores_sort) + var at by remember { mutableStateOf(null) } + Box(Modifier.onGloballyPositioned { at = it.boundsInRoot() }) { + HeaderIconButton(title, Icons.Filled.Sort, "sort") { + val from = at ?: return@HeaderIconButton + StoresMotion.ask(StepAsk( + anchor = from, side = StepSide.Left, accent = pal.signal, pillCorner = 8.dp, items = SessionPrefs.STORES_SORTS.size, + onDismiss = {}, + handle = { Text(title, fontSize = 12.sp, fontWeight = FontWeight.SemiBold, color = pal.signal, maxLines = 1, overflow = TextOverflow.Ellipsis) }, + ) { + StepTitle(title) + StepList { + SessionPrefs.STORES_SORTS.forEachIndexed { i, sort -> + val label = when (sort) { + "lastPlayed" -> stringResource(R.string.stores_sort_last_played) + "recentlyInstalled" -> stringResource(R.string.stores_sort_recently_installed) + "titleAsc" -> stringResource(R.string.stores_sort_title_asc) + "titleDesc" -> stringResource(R.string.stores_sort_title_desc) + "sizeDesc" -> stringResource(R.string.stores_sort_size_desc) + "sizeAsc" -> stringResource(R.string.stores_sort_size_asc) + else -> stringResource(R.string.stores_sort_release_date) + } + StepChoice( + label, selected = sort == s.storesSort, enabled = open, + modifier = Modifier.fillMaxWidth().stepItem(i) + .then(if (sort == s.storesSort) Modifier.focusRequester(first) else Modifier), + ) { + a.onStoresSort(sort) + StoresMotion.fold() + } + } + } + }) + } + } +} + +@Composable +private fun ViewButton(s: FrontEndState, a: FrontEndActions) { + val list = s.storesView == "list" + HeaderIconButton( + if (list) stringResource(R.string.stores_view_cards) else stringResource(R.string.stores_view_list), + if (list) Icons.Filled.GridView else Icons.Filled.ViewList, + "view", + ) { a.onStoresView(if (list) "cards" else "list") } +} + +@Composable +private fun GameListRow( + item: CatalogItem, store: Store, installedKeys: Set, onOpen: (String) -> Unit, + first: Boolean = false, navigation: Modifier = Modifier, +) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + val installed = item.id in installedKeys + val download = StoresState.download("${store.id}:${item.id}")?.takeIf { it.isActive } + if (installed) { + val ctx = LocalContext.current + val game = StoresState.installedGame(store, item.id) + if (game != null) androidx.compose.runtime.LaunchedEffect(item.key) { com.droiddeck.launcher.stores.StoreSizes.requestDisk(ctx, item.key, game) } + } + val placed = remember { arrayOfNulls(1) } + val corner = with(androidx.compose.ui.platform.LocalDensity.current) { 10.dp.toPx() } + val open = { + placed[0]?.takeIf { it.isAttached }?.let { StoresMotion.markCard(CardMark(item.key, it.boundsInRoot(), corner, item.imageUrl ?: item.tallImageUrl)) } + onOpen(item.key) + } + val meta = listOfNotNull( + item.developer.takeIf { it.isNotBlank() }, + item.releaseDate.take(4).takeIf { it.length == 4 }, + when { + installed -> { + val bytes = com.droiddeck.launcher.stores.StoreSizes.onDisk[item.key] + ?: com.droiddeck.launcher.stores.StoreSizes.size(item).takeIf { it > 0 } ?: 0L + formatBytes(bytes).takeIf { it.isNotEmpty() } + } + item.isFree -> stringResource(R.string.stores_free) + item.isDiscounted -> "-${item.discountPercent}%" + item.hasPrice -> item.finalPrice.takeIf { it.isNotBlank() } + else -> null + }, + ) + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp), + modifier = Modifier.fillMaxWidth().heightIn(min = 64.dp).then(navigation).paneItem("card:${item.key}") + .then(if (first) Modifier.firstTile() else Modifier) + .clip(RoundedCornerShape(10.dp)).glideBorder(hot, RoundedCornerShape(10.dp), pal.signal, pal.line) + .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, onClick = open).controllerConfirm(onClick = open) + .padding(horizontal = 10.dp, vertical = 8.dp), + ) { + CardArt(item, Modifier.width(96.dp).height(54.dp).clip(RoundedCornerShape(8.dp))) + Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(2.dp)) { + Text(item.title, fontSize = 14.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) + Text(meta.joinToString(" · "), fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) + } + if (installed) Icon(Icons.Filled.Check, stringResource(R.string.stores_installed_chip), tint = pal.good, modifier = Modifier.size(16.dp)) + else if (download != null) Text("${download.percent}%", fontSize = 11.sp, fontWeight = FontWeight.Bold, color = pal.signal, maxLines = 1) + } +} + @Composable private fun SignOutButton(store: Store, name: String) { val ctx = LocalContext.current diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 73bebba751..3e5f799e9d 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -2003,6 +2003,16 @@ مجاني استئناف تحديث + ترتيب + لُعب مؤخرًا + ثُبت مؤخرًا + العنوان أ–ي + العنوان ي–أ + الحجم: الأكبر + الحجم: الأصغر + تاريخ الإصدار + عرض القائمة + عرض البطاقات إظهار المحتوى للبالغين Epic EOS diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 4ab24ab5d6..54fee68ac4 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -1919,6 +1919,16 @@ Безплатна Продължи Обнови + Сортиране + Играни наскоро + Инсталирани наскоро + Заглавие А–Я + Заглавие Я–А + Размер: най-голям + Размер: най-малък + Дата на издаване + Изглед на списък + Изглед с карти Показвай съдържание за възрастни Epic EOS diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 876734617c..e244efd4fa 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -1961,6 +1961,16 @@ Zdarma Pokračovat Obnovit + Řazení + Nedávno hrané + Nedávno nainstalované + Název A–Z + Název Z–A + Velikost: největší + Velikost: nejmenší + Datum vydání + Zobrazení seznamu + Zobrazení karet Zobrazovat obsah pro dospělé Epic EOS diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 042e74b7a8..76e803b222 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -1919,6 +1919,16 @@ Gratis Genoptag Opdater + Sortér + Senest spillet + Senest installeret + Titel A–Å + Titel Å–A + Størrelse: størst + Størrelse: mindst + Udgivelsesdato + Listevisning + Kortvisning Vis indhold for voksne Epic EOS diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index b0bac0a226..4450b9231d 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1919,6 +1919,16 @@ Kostenlos Fortsetzen Aktualisieren + Sortieren + Zuletzt gespielt + Zuletzt installiert + Titel A–Z + Titel Z–A + Größe: größte + Größe: kleinste + Erscheinungsdatum + Listenansicht + Kartenansicht Inhalte für Erwachsene anzeigen Epic EOS diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index a26ba9b43c..8a672984fb 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -1919,6 +1919,16 @@ Δωρεάν Συνέχιση Ανανέωση + Ταξινόμηση + Παίχτηκαν πρόσφατα + Εγκαταστήθηκαν πρόσφατα + Τίτλος Α–Ω + Τίτλος Ω–Α + Μέγεθος: μεγαλύτερο + Μέγεθος: μικρότερο + Ημερομηνία κυκλοφορίας + Προβολή λίστας + Προβολή καρτών Εμφάνιση περιεχομένου για ενήλικες Epic EOS diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index a86e80f401..4add97643a 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1948,6 +1948,16 @@ Gratis Reanudar Actualizar + Ordenar + Jugados recientemente + Instalados recientemente + Título A–Z + Título Z–A + Tamaño: mayor + Tamaño: menor + Fecha de lanzamiento + Vista de lista + Vista de tarjetas Mostrar contenido para adultos Epic EOS diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 7873acc50d..0b9ec93723 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -1919,6 +1919,16 @@ Ilmainen Jatka Päivitä + Järjestä + Viimeksi pelatut + Viimeksi asennetut + Nimi A–Ö + Nimi Ö–A + Koko: suurin + Koko: pienin + Julkaisupäivä + Luettelonäkymä + Korttinäkymä Näytä aikuisille tarkoitettu sisältö Epic EOS diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index d5d06f4fd4..60a4d7f3f7 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1948,6 +1948,16 @@ Gratuit Reprendre Actualiser + Trier + Joués récemment + Installés récemment + Titre A–Z + Titre Z–A + Taille : plus grand + Taille : plus petit + Date de sortie + Vue liste + Vue cartes Afficher le contenu pour adultes Epic EOS diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 1faf3a523c..5e72662fd6 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -1919,6 +1919,16 @@ फ़्री फिर से शुरू करें रीफ़्रेश करें + क्रमबद्ध करें + हाल में खेले गए + हाल में इंस्टॉल किए गए + शीर्षक A–Z + शीर्षक Z–A + आकार: सबसे बड़ा + आकार: सबसे छोटा + रिलीज़ तिथि + सूची दृश्य + कार्ड दृश्य वयस्क कंटेंट दिखाएं Epic EOS diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 81343a9141..def29b73ee 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -1919,6 +1919,16 @@ Ingyenes Folytatás Frissítés + Rendezés + Nemrég játszott + Nemrég telepített + Cím A–Z + Cím Z–A + Méret: legnagyobb + Méret: legkisebb + Megjelenés dátuma + Listanézet + Kártyanézet Felnőtt tartalom megjelenítése Epic EOS diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 87b41419c6..a588141c9a 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -1898,6 +1898,16 @@ Gratis Lanjutkan Segarkan + Urutkan + Baru dimainkan + Baru dipasang + Judul A–Z + Judul Z–A + Ukuran: terbesar + Ukuran: terkecil + Tanggal rilis + Tampilan daftar + Tampilan kartu Tampilkan konten dewasa Epic EOS diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 821e7d3e72..3e1eb7a683 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1940,6 +1940,16 @@ Gratis Riprendi Aggiorna + Ordina + Giocate di recente + Installate di recente + Titolo A–Z + Titolo Z–A + Dimensione: maggiore + Dimensione: minore + Data di uscita + Visualizzazione elenco + Visualizzazione schede Mostra contenuti per adulti Epic EOS diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index d52ef0ba9f..724ca25c5c 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -1906,6 +1906,16 @@ 無料 再開 更新 + 並べ替え + 最近プレイ + 最近インストール + タイトル A–Z + タイトル Z–A + サイズ: 大きい順 + サイズ: 小さい順 + リリース日 + リスト表示 + カード表示 成人向けコンテンツを表示 Epic EOS diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index ba60bc9285..2fd695d80e 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -1906,6 +1906,16 @@ 무료 재개 새로 고침 + 정렬 + 최근 플레이 + 최근 설치 + 제목 A–Z + 제목 Z–A + 크기: 큰순 + 크기: 작은순 + 출시일 + 목록 보기 + 카드 보기 성인용 콘텐츠 표시 Epic EOS diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 6d337aeeda..189a7f4c01 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -1898,6 +1898,16 @@ Percuma Sambung Segar semula + Isih + Baru dimainkan + Baru dipasang + Tajuk A–Z + Tajuk Z–A + Saiz: terbesar + Saiz: terkecil + Tarikh keluaran + Paparan senarai + Paparan kad Papar kandungan matang Epic EOS diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index f47ab97c1d..31ad10a5c0 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -1919,6 +1919,16 @@ Gratis Gjenoppta Oppdater + Sorter + Nylig spilt + Nylig installert + Tittel A–Å + Tittel Å–A + Størrelse: størst + Størrelse: minst + Utgivelsesdato + Listevisning + Kortvisning Vis innhold for voksne Epic EOS diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 5dd11c2b0f..a57fc638b0 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -1919,6 +1919,16 @@ Gratis Hervatten Vernieuwen + Sorteren + Onlangs gespeeld + Onlangs geïnstalleerd + Titel A–Z + Titel Z–A + Grootte: grootste + Grootte: kleinste + Releasedatum + Lijstweergave + Kaartweergave Inhoud voor volwassenen tonen Epic EOS diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index c6bb34f0fa..2e58f49782 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -1961,6 +1961,16 @@ Bezpłatna Wznów Odśwież + Sortuj + Ostatnio grane + Ostatnio zainstalowane + Tytuł A–Z + Tytuł Z–A + Rozmiar: największy + Rozmiar: najmniejszy + Data wydania + Widok listy + Widok kart Pokaż treści dla dorosłych Epic EOS diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 53bacce0f7..a8d9041e8e 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -1940,6 +1940,16 @@ Grátis Retomar Atualizar + Ordenar + Jogados recentemente + Instalados recentemente + Título A–Z + Título Z–A + Tamanho: maior + Tamanho: menor + Data de lançamento + Vista de lista + Vista de cartões Mostrar conteúdo para adultos Epic EOS diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 6837178e90..a55e6edcb0 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -1940,6 +1940,16 @@ Grátis Retomar Atualizar + Ordenar + Jogados recentemente + Instalados recentemente + Título A–Z + Título Z–A + Tamanho: maior + Tamanho: menor + Data de lançamento + Vista de lista + Vista de cartões Mostrar conteúdo adulto Epic EOS diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 51c5f76a7f..514d2d18df 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -1940,6 +1940,16 @@ Gratuit Reluare Reîmprospătează + Sortează + Jucate recent + Instalate recent + Titlu A–Z + Titlu Z–A + Dimensiune: cea mai mare + Dimensiune: cea mai mică + Data lansării + Vizualizare listă + Vizualizare carduri Arată conținutul pentru adulți Epic EOS diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 6b8f2d9814..d508008296 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1969,6 +1969,16 @@ Бесплатно Продолжить Обновить + Сортировка + Недавно запущенные + Недавно установленные + Название А–Я + Название Я–А + Размер: по убыванию + Размер: по возрастанию + Дата выхода + Вид списком + Вид карточками Показывать контент для взрослых Epic EOS diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index d99cca31f0..e433226f7b 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -1919,6 +1919,16 @@ Gratis Återuppta Uppdatera + Sortera + Senast spelade + Senast installerade + Titel A–Ö + Titel Ö–A + Storlek: störst + Storlek: minst + Utgivningsdatum + Listvy + Kortvy Visa innehåll för vuxna Epic EOS diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 2fa36ec31c..b5b57c72fb 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -1898,6 +1898,16 @@ ฟรี ดำเนินการต่อ รีเฟรช + จัดเรียง + เล่นล่าสุด + เพิ่งติดตั้ง + ชื่อ A–Z + ชื่อ Z–A + ขนาด: ใหญ่สุด + ขนาด: เล็กสุด + วันวางจำหน่าย + มุมมองรายการ + มุมมองการ์ด แสดงเนื้อหาสำหรับผู้ใหญ่ Epic EOS diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index e36dfa442e..25a1724b6e 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -1919,6 +1919,16 @@ Ücretsiz Sürdür Yenile + Sırala + Son oynanan + Son yüklenen + Başlık A–Z + Başlık Z–A + Boyut: en büyük + Boyut: en küçük + Çıkış tarihi + Liste görünümü + Kart görünümü Yetişkin içeriği göster Epic EOS diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index a03172ed4a..56513bffb3 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -1961,6 +1961,16 @@ Безкоштовно Продовжити Оновити + Сортувати + Нещодавно запущені + Нещодавно встановлені + Назва А–Я + Назва Я–А + Розмір: найбільший + Розмір: найменший + Дата виходу + Вигляд списком + Вигляд картками Показувати контент для дорослих Epic EOS diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 91f4a19710..d0c030b43c 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -1898,6 +1898,16 @@ Miễn phí Tiếp tục Làm mới + Sắp xếp + Chơi gần đây + Cài gần đây + Tên A–Z + Tên Z–A + Kích thước: lớn nhất + Kích thước: nhỏ nhất + Ngày phát hành + Chế độ danh sách + Chế độ thẻ Hiện nội dung người lớn Epic EOS diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index ab860a284d..d565cd3160 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1906,6 +1906,16 @@ 免费 继续 刷新 + 排序 + 最近游玩 + 最近安装 + 标题 A–Z + 标题 Z–A + 大小: 从大到小 + 大小: 从小到大 + 发行日期 + 列表视图 + 卡片视图 显示成人内容 Epic EOS diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 824c20e182..a30070d9c1 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1906,6 +1906,16 @@ 免費 繼續 重新整理 + 排序 + 最近遊玩 + 最近安裝 + 標題 A–Z + 標題 Z–A + 大小: 由大到小 + 大小: 由小到大 + 發行日期 + 列表檢視 + 卡片檢視 顯示成人內容 Epic EOS diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index cb3ded0de0..c850ce8aaa 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1906,6 +1906,16 @@ 免費 繼續 重新整理 + 排序 + 最近遊玩 + 最近安裝 + 標題 A–Z + 標題 Z–A + 大小: 由大到小 + 大小: 由小到大 + 發行日期 + 列表檢視 + 卡片檢視 顯示成人內容 Epic EOS diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7289bbce6c..8e831a3971 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1977,6 +1977,16 @@ Free Resume Refresh + Sort + Recently played + Recently installed + Title A–Z + Title Z–A + Size: largest + Size: smallest + Release date + List view + Card view Show mature content Epic EOS diff --git a/app/src/test/java/com/droiddeck/launcher/stores/SortCatalogItemsTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/SortCatalogItemsTest.kt new file mode 100644 index 0000000000..d0e7ef94f6 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/SortCatalogItemsTest.kt @@ -0,0 +1,67 @@ +package com.droiddeck.launcher.stores + +import org.junit.Assert.assertEquals +import org.junit.Test + +class SortCatalogItemsTest { + private fun item(id: String, title: String, size: Long = 0, releaseDate: String = "") = + CatalogItem(Store.GOG, id, title, imageUrl = null, sizeBytes = size, releaseDate = releaseDate, owned = true) + + @Test fun titleOrderIsCaseInsensitiveAndDescendingIsItsMirror() { + val items = listOf(item("1", "Zelda"), item("2", "alpha"), item("3", "Beta")) + assertEquals(listOf("alpha", "Beta", "Zelda"), sortCatalogItems(items, "titleAsc").map { it.title }) + assertEquals(listOf("Zelda", "Beta", "alpha"), sortCatalogItems(items, "titleDesc").map { it.title }) + } + + @Test fun playedAndInstalledComeFirstWithTitlesBreakingTies() { + val items = listOf(item("1", "Zelda"), item("2", "alpha"), item("3", "Beta")) + val played = mapOf("gog:3" to 900L, "gog:1" to 900L) + assertEquals(listOf("Beta", "Zelda", "alpha"), sortCatalogItems(items, "lastPlayed", lastPlayed = { played[it.key] ?: 0L }).map { it.title }) + val installed = mapOf("gog:2" to 500L) + assertEquals(listOf("alpha", "Beta", "Zelda"), sortCatalogItems(items, "recentlyInstalled", installedAt = { installed[it.key] ?: 0L }).map { it.title }) + } + + @Test fun sizeAscendingPutsUnknownSizesLast() { + val items = listOf(item("1", "Zelda"), item("2", "alpha", size = 500), item("3", "Beta", size = 900)) + assertEquals(listOf("alpha", "Beta", "Zelda"), sortCatalogItems(items, "sizeAsc").map { it.title }) + assertEquals(listOf("Beta", "alpha", "Zelda"), sortCatalogItems(items, "sizeDesc").map { it.title }) + } + + @Test fun releaseDatesSortNewestFirstAndUnparsableOnesLast() { + val items = listOf(item("1", "Zelda", releaseDate = "1986-02-21"), item("2", "alpha", releaseDate = "2023-05-12"), item("3", "Beta", releaseDate = "TBA")) + assertEquals(listOf("alpha", "Zelda", "Beta"), sortCatalogItems(items, "releaseDateDesc").map { it.title }) + } + + @Test fun unknownSortKeepsTheCatalogsOwnOrder() { + val items = listOf(item("1", "Zelda"), item("2", "alpha")) + assertEquals(listOf("Zelda", "alpha"), sortCatalogItems(items, "whatever").map { it.title }) + } + + @Test fun pendingSizeSortRetainsThePreviousSortOrder() { + val items = listOf(item("1", "Zelda"), item("2", "alpha"), item("3", "Beta")) + val previousOrders = listOf( + sortCatalogItems(items, "titleDesc"), + sortCatalogItems(items, "lastPlayed", lastPlayed = { if (it.id == "3") 900L else 0L }), + ) + previousOrders.forEach { previous -> + assertEquals(previous, retainCatalogOrder(items, previous)) + } + } + + @Test fun retainedOrderUsesCurrentItemMetadata() { + val old = listOf(item("1", "Zelda"), item("2", "alpha")) + val current = listOf(old[0].copy(sizeBytes = 500), old[1].copy(title = "Alpha updated")) + assertEquals(listOf(current[1], current[0]), retainCatalogOrder(current, old.reversed())) + } + + @Test fun changedMembershipFallsBackToCurrentCandidates() { + val previous = listOf(item("1", "Zelda"), item("2", "alpha")) + val added = previous + item("3", "Beta") + val removed = previous.take(1) + val replaced = listOf(previous[0], item("3", "Beta")) + listOf(added, removed, replaced, emptyList()).forEach { current -> + assertEquals(current, retainCatalogOrder(current, previous)) + } + assertEquals(previous, retainCatalogOrder(previous, emptyList())) + } +}