diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoreGridNavigation.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoreGridNavigation.kt index d019bc0098..3996d30423 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoreGridNavigation.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoreGridNavigation.kt @@ -1,6 +1,19 @@ package com.droiddeck.launcher.ui -internal fun storeGridNeighbor(index: Int, count: Int, columns: Int, direction: Int): Int? { +// `split` is the size of a leading section that starts its own rows; 0 means one continuous grid. +internal fun storeGridNeighbor(index: Int, count: Int, columns: Int, direction: Int, split: Int = 0): Int? { if (index !in 0 until count || columns < 1 || direction !in listOf(-1, 1)) return null - return (index + columns * direction).takeIf { it in 0 until count } + if (split !in 1 until count) return (index + columns * direction).takeIf { it in 0 until count } + val inFirst = index < split + val start = if (inFirst) 0 else split + val end = if (inFirst) split else count + val local = index - start + val within = start + local + columns * direction + if (within in start until end) return within + val column = local % columns + return when { + inFirst && direction > 0 -> split + minOf(column, count - split - 1) + !inFirst && direction < 0 && local < columns -> ((split - 1) / columns) * columns + column.coerceAtMost((split - 1) % columns) + else -> null + } } 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 883709667a..2feda75977 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt @@ -148,9 +148,9 @@ import kotlinx.coroutines.suspendCancellableCoroutine private const val DOWNLOADS = "downloads" -private val TABS = listOf("store", "library", "installed") +private val TABS = listOf("library", "store") -internal fun tabsFor(store: Store?): List = if (store == Store.AMAZON) TABS.drop(1) else TABS +internal fun tabsFor(store: Store?): List = if (store == Store.AMAZON) TABS.take(1) else TABS internal fun tabFor(store: Store?, tab: String): String = if (tab in tabsFor(store)) tab else "library" @@ -214,41 +214,13 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier } } val pal = LocalPalette.current - fun openModes(st: Store, at: Rect?) { - if (chip != st.id) { pickChip(st.id); return } - if (at == null || !StoresState.isSignedIn(st) || StoresState.expired[st] == true) { move("first"); return } - val modes = tabsFor(st) - val current = if (chip == st.id) shownTab else null - var picked = false - StoresMotion.ask(StepAsk( - anchor = at, side = StepSide.Right, accent = storePalette(pal, st).signal, items = modes.size, - onDismiss = { move(if (picked) "first" else "item:storechip:${st.id}") }, - handle = { ChipLabel(st, MaterialTheme.colorScheme.onBackground) }, - ) { - StoreTheme(st) { - val library = StoresState.library[st].orEmpty() - val installedCount = remember(StoresState.installed, library) { com.droiddeck.launcher.stores.installedCards(st, StoresState.installed, library).size } - StepList { - modes.forEachIndexed { i, m -> - val label = when (m) { - "store" -> stringResource(R.string.stores_tab_store) - "installed" -> stringResource(R.string.stores_tab_count, stringResource(R.string.stores_tab_installed), installedCount) - else -> stringResource(R.string.stores_tab_count, stringResource(R.string.stores_tab_library), library.size) - } - val focusHere = if (current != null) m == current else i == 0 - StepChoice( - label, selected = m == current, enabled = open, - modifier = Modifier.fillMaxWidth().stepItem(i).then(if (focusHere) Modifier.focusRequester(first) else Modifier), - ) { - picked = true - if (chip != st.id) { chip = st.id; openGame = null; query = "" } - tab = m - StoresMotion.fold() - } - } - } - } - }) + fun cycleStore(step: Int) { + val ids = Store.entries.map { it.id } + val at = ids.indexOf(chip) + pickChip(ids[if (at < 0) (if (step > 0) 0 else ids.size - 1) else (at + step + ids.size) % ids.size]) + } + fun openModes(st: Store) { + if (chip != st.id) pickChip(st.id) else move("first") } BackHandler(enabled = openGame != null) { closeGame() } val scroll = rememberScrollState() @@ -326,13 +298,13 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier Column( modifier = Modifier.fillMaxSize().padding(horizontal = padH, vertical = if (narrow) 10.dp else 14.dp) .bumpers( - onPrevious = { if (openGame == null && chip != DOWNLOADS) { val t = tabsFor(store); switchTab(t[(t.indexOf(shownTab) + t.size - 1) % t.size]) } }, - onNext = { if (openGame == null && chip != DOWNLOADS) { val t = tabsFor(store); switchTab(t[(t.indexOf(shownTab) + 1) % t.size]) } }, + onPrevious = { if (openGame == null) cycleStore(-1) }, + onNext = { if (openGame == null) cycleStore(1) }, ), ) { Box(Modifier.fillMaxWidth().padding(bottom = 8.dp)) { StoreTheme(Store.byId(focusedChip ?: chip)) { - Rise(0) { StoreChips(chip, focusedChip, s.storeDownloadsActive, onStore = { st, at -> openModes(st, at) }, onDownloads = { if (chip != DOWNLOADS) pickChip(DOWNLOADS) else move("first") }, + Rise(0) { StoreChips(chip, focusedChip, s.storeDownloadsActive, onStore = { st, _ -> openModes(st) }, onDownloads = { if (chip != DOWNLOADS) pickChip(DOWNLOADS) else move("first") }, onFocusChip = { focusedChip = it }, onSettings = { at -> if (at != null) StoresMotion.ask(storesSettingsStep(at, liveState, a, pal.signal)) }) } } } @@ -390,7 +362,7 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier k.chip == DOWNLOADS -> Column(Modifier.fillMaxWidth().verticalScroll(scroll).padding(top = 4.dp, bottom = 16.dp)) { StoresDownloadsPane(s, a) } st == null -> {} !k.signedIn -> Box(Modifier.fillMaxWidth().verticalScroll(scroll).padding(top = 4.dp, bottom = 16.dp)) { SignInCard(st, viewportH - 20.dp) } - else -> Storefront(st, k.tab, query, s, a, grids.getOrPut(k) { LazyGridState() }, onQuery = { query = it }, onOpen = { open(it) }) + else -> Storefront(st, k.tab, query, s, a, grids.getOrPut(k) { LazyGridState() }, onQuery = { query = it }, onOpen = { open(it) }, onTab = { switchTab(it) }) } } } @@ -752,7 +724,7 @@ internal fun StoreLogo(store: Store, size: Dp) { private fun Storefront( store: Store, tab: String, query: String, s: FrontEndState, a: FrontEndActions, grid: LazyGridState, - onQuery: (String) -> Unit, onOpen: (String) -> Unit, + onQuery: (String) -> Unit, onOpen: (String) -> Unit, onTab: (String) -> Unit, ) { val ctx = LocalContext.current val colors = MaterialTheme.colorScheme @@ -768,7 +740,6 @@ private fun Storefront( fun shelf(l: List?) = l?.filter(::shown) val everything = remember(library, shelves, found) { (found + library + (shelves?.all ?: emptyList())).distinctBy { it.id } } LaunchedEffect(store, q) { StoresState.search(ctx, store, q) } - val installedOnly = tab == "installed" val loaded = StoresState.library.containsKey(store) val showGrid = tab != "store" || q.isNotEmpty() val sort = s.storesSort @@ -782,63 +753,45 @@ private fun Storefront( 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 isSizeSort = tab == "library" && (sort == "sizeAsc" || sort == "sizeDesc") + val candidates = remember(library, everything, tab, q, s.storesShowMature) { + if (tab == "library") library.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 resolvedSizes = if (isSizeSort) com.droiddeck.launcher.stores.StoreSizes.known.toMap() else emptyMap() + val sizeFor = remember(resolvedSizes) { val resolved = resolvedSizes - val lookup: (CatalogItem) -> Long = { item -> - resolved[item.key] ?: if (installedOnly) 0L else item.sizeBytes - } + val lookup: (CatalogItem) -> Long = { item -> resolved[item.key] ?: 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) + val sortedVisible = remember(candidates, tab, sort, lastPlayedFor, installedAtFor, sizeFor, installedKeys) { + if (tab == "library") installedFirst(sortCatalogItems(candidates, sort, lastPlayed = lastPlayedFor, installedAt = installedAtFor, size = sizeFor), installedKeys) else candidates } val visible = remember(sizeSortPending, candidates, stableVisible, sortedVisible) { if (sizeSortPending) retainCatalogOrder(candidates, stableVisible) else sortedVisible } + val installedShown = if (tab == "library") visible.count { it.id in installedKeys } else 0 + val split = installedShown.takeIf { it in 1 until visible.size } ?: 0 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 + item to com.droiddeck.launcher.stores.StoreSizes.resolve(ctx, item) } 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 + 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 else -> R.string.stores_nothing_matches }) @@ -849,7 +802,7 @@ private fun Storefront( val scope = rememberCoroutineScope() 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 listMode = s.storesView == "list" && tab == "library" val card: @Composable (CatalogItem) -> Unit = { item -> val first = if (showGrid) item.key == visible.firstOrNull()?.key else !firstPlaced firstPlaced = true @@ -861,14 +814,14 @@ private fun Storefront( else -> 0 } val index = visible.indexOfFirst { it.key == item.key } - val next = storeGridNeighbor(index, visible.size, if (listMode) 1 else columns, direction) + val next = storeGridNeighbor(index, visible.size, if (listMode) 1 else columns, direction, split) when { direction == 0 || index < 0 -> false next == null -> direction > 0 else -> { if (key.action == KeyEvent.ACTION_DOWN) { val target = "card:${visible[next].key}" - val targetIndex = headerItems + next + val targetIndex = headerItems + next + if (split == 0) 0 else if (next < split) 1 else 2 val visibleTarget = grid.layoutInfo.visibleItemsInfo.any { it.index == targetIndex } if (!visibleTarget || (focus.attached[target] ?: 0) == 0 || runCatching { focus.items.getValue(target).requestFocus() }.isFailure) scope.launch { @@ -894,21 +847,19 @@ private fun Storefront( ) { item(key = "header", span = { GridItemSpan(maxLineSpan) }) { Rise(1) { + val tabs = tabsFor(store) + val libraryLabel = if (loaded) stringResource(R.string.stores_tab_count, stringResource(R.string.stores_tab_library), library.size) + else stringResource(R.string.stores_tab_library) ModeHeader( - when { - tab == "store" -> stringResource(R.string.stores_tab_store) - !loaded -> stringResource(if (installedOnly) R.string.stores_tab_installed else R.string.stores_tab_library) - installedOnly -> stringResource(R.string.stores_tab_count, stringResource(R.string.stores_tab_installed), installedItems.size) - else -> stringResource(R.string.stores_tab_count, stringResource(R.string.stores_tab_library), library.size) - }, + libraryLabel, query, onQuery, - placeholder = when { - tab == "store" -> stringResource(R.string.stores_search_catalog, store.label) - installedOnly -> stringResource(R.string.stores_search_installed) - else -> stringResource(R.string.stores_search_library) - }, + placeholder = if (tab == "store") stringResource(R.string.stores_search_catalog, store.label) else stringResource(R.string.stores_search_library), + lead = if (tabs.size < 2) null else { { + val labels = tabs.map { if (it == "store") stringResource(R.string.stores_tab_store) else libraryLabel } + HeaderTabs(labels, tabs.indexOf(tab).coerceAtLeast(0)) { onTab(tabs[it]) } + } }, ) { - if (tab == "library" || tab == "installed") { + if (tab == "library") { SortButton(s, a) ViewButton(s, a) } @@ -934,8 +885,14 @@ private fun Storefront( 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) { - "library", "installed" -> if (!loaded) Unit - else storeGrid(visible, empty, card) + "library" -> if (!loaded) Unit + else if (split == 0) storeGrid(visible, empty, card) + else { + item(key = "installed-label", span = { GridItemSpan(maxLineSpan) }) { SectionLabel(stringResource(R.string.stores_section_installed)) } + storeGrid(visible.take(split), empty, card) + item(key = "not-installed-label", span = { GridItemSpan(maxLineSpan) }) { SectionLabel(stringResource(R.string.stores_section_not_installed)) } + storeGrid(visible.drop(split), empty, card) + } else -> { if (q.isNotEmpty()) storeGrid(visible, empty, card) else { @@ -965,14 +922,48 @@ private suspend fun CompletableFuture.await(): T = } @Composable -internal fun ModeHeader(title: String, query: String, onQuery: (String) -> Unit, placeholder: String, trailing: @Composable () -> Unit) { +private fun SectionLabel(title: String) { + Text( + title.uppercase(), fontSize = 12.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 1.5.sp, + color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.fillMaxWidth().padding(top = 6.dp, start = 2.dp), + ) +} + +@Composable +private fun HeaderTabs(labels: List, selected: Int, onSelect: (Int) -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val shape = RoundedCornerShape(8.dp) + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp)) { + labels.forEachIndexed { i, label -> + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + val pick = { onSelect(i) } + Text( + label, fontSize = 15.sp, fontWeight = FontWeight.Bold, maxLines = 1, + color = if (i == selected || hot) colors.onBackground else colors.onSurfaceVariant.copy(alpha = 0.7f), + modifier = Modifier.clip(shape).glideBorder(hot, shape, pal.signal) + .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Tab, onClick = pick) + .controllerConfirm(onClick = pick) + .padding(horizontal = 4.dp, vertical = 6.dp), + ) + } + } +} + +@Composable +internal fun ModeHeader( + title: String, query: String, onQuery: (String) -> Unit, placeholder: String, + lead: (@Composable () -> Unit)? = null, trailing: @Composable () -> Unit, +) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current var searching by remember { mutableStateOf(query.isNotEmpty()) } val open by animateFloatAsState(if (searching) 1f else 0f, Motion.sp(0.75f, 420f), label = "searchOpen") Column(Modifier.fillMaxWidth()) { Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp), modifier = Modifier.fillMaxWidth().heightIn(min = 52.dp).padding(vertical = 4.dp)) { - Text( + if (lead != null) lead() + else Text( title, fontSize = 15.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1, modifier = Modifier.padding(start = 4.dp, end = 4.dp), ) @@ -994,14 +985,6 @@ internal fun ModeHeader(title: String, query: String, onQuery: (String) -> Unit, } } -@Composable -private fun ChipLabel(store: Store, ink: Color) { - Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { - Box(Modifier.size(12.dp).clip(CircleShape).background(sourceColours(store.id).dot)) - Text(store.shortLabel, fontSize = 13.sp, fontWeight = FontWeight.Bold, color = ink, maxLines = 1) - } -} - internal fun storePalette(base: Palette, store: Store?): Palette { val (accent, deep) = when (store) { Store.GOG -> Color(0xFFC25BC8) to Color(0xFF9A3FA1) @@ -1228,6 +1211,11 @@ private fun Shelf(title: String, items: List?, card: @Composable (C } } +internal fun installedFirst(items: List, installed: Set): List { + val (on, off) = items.partition { it.id in installed } + return on + off +} + private fun LazyGridScope.storeGrid(games: List, empty: String, card: @Composable (CatalogItem) -> Unit) { if (games.isEmpty()) item(key = "empty", span = { GridItemSpan(maxLineSpan) }) { Box(Modifier.padding(vertical = 32.dp).fillMaxWidth(), contentAlignment = Alignment.Center) { diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 90a3fc96e2..36caa8aee7 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -2010,7 +2010,6 @@ الإعدادات (لم يتم تسجيل الدخول) المتجر - المثبَّتة المكتبة الكل التنزيلات @@ -2022,10 +2021,8 @@ البقاء مسجَّل الدخول تسجيل الخروج البحث في كتالوج %1$s… - البحث في الألعاب المثبَّتة… البحث في مكتبتك… البحث - لا شيء مثبَّت جارٍ التحميل لا توجد ألعاب جارٍ تحميل المتجر… @@ -2044,6 +2041,8 @@ عرض على %1$s شراء · %1$s مثبَّتة + مثبَّتة + غير مثبَّت في المكتبة مفتاح API الحصول على مفتاح diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index 31e1da902c..da88522afb 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -1977,7 +1977,6 @@ Ajustes (sin iniciar sesión) Tienda - Instalados Biblioteca Todos Descargas @@ -1989,10 +1988,8 @@ Mantener la sesión Cerrar sesión Buscar en el catálogo de %1$s… - Buscar juegos instalados… Buscar en tu biblioteca… Buscar - Nada instalado Cargando No hay juegos Cargando la tienda… @@ -2011,6 +2008,8 @@ Ver en %1$s Comprar · %1$s Instalado + Instalado + No instalada En la biblioteca Gratis Reanudar diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index bf5096cc11..a76a3cd911 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -1926,7 +1926,6 @@ Настройки (не е вписан) Магазин - Инсталирани Библиотека Всички Изтегляния @@ -1938,10 +1937,8 @@ Остани вписан Изход Търсене в каталога на %1$s… - Търсене в инсталираните игри… Търсене в твоята библиотека… Търсене - Нищо инсталирано Зареждане Няма игри Зареждане на магазина… @@ -1960,6 +1957,8 @@ Виж в %1$s Купи · %1$s Инсталирана + Инсталирана + Не е инсталирано В библиотеката API ключ Вземи ключ diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 086a4dc056..5ab1501103 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -1968,7 +1968,6 @@ Nastavení (nepřihlášen) Obchod - Nainstalované Knihovna Vše Stahování @@ -1980,10 +1979,8 @@ Zůstat přihlášen Odhlásit se Hledat v katalogu %1$s… - Hledat v nainstalovaných hrách… Hledat ve vaší knihovně… Hledat - Nic není nainstalováno Načítání Žádné hry Načítání obchodu… @@ -2002,6 +1999,8 @@ Zobrazit na %1$s Koupit · %1$s Nainstalováno + Nainstalováno + Není nainstalováno V knihovně Klíč API Získat klíč diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index e73f2a7738..77f4eb7a05 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -1926,7 +1926,6 @@ Indstillinger (ikke logget ind) Butik - Installeret Bibliotek Alle Downloads @@ -1938,10 +1937,8 @@ Bliv logget ind Log ud Søg i %1$s-kataloget… - Søg i installerede spil… Søg i dit bibliotek… Søg - Intet installeret Indlæser Ingen spil Indlæser butikken… @@ -1960,6 +1957,8 @@ Se på %1$s Køb · %1$s Installeret + Installeret + Ikke installeret I biblioteket API-nøgle Hent en nøgle diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 5c2f7286cc..9a41a66275 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1915,7 +1915,6 @@ Einstellungen (nicht angemeldet) Store - Installiert Bibliothek Alle Downloads @@ -1927,10 +1926,8 @@ Angemeldet bleiben Abmelden Katalog von %1$s durchsuchen… - Installierte Spiele durchsuchen… Deine Bibliothek durchsuchen… Suchen - Nichts installiert Wird geladen Keine Spiele Store wird geladen… @@ -1949,6 +1946,8 @@ Auf %1$s ansehen Kaufen · %1$s Installiert + Installiert + Nicht installiert In der Bibliothek API-Schlüssel Schlüssel holen diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index aaa0aa8af1..430fb46b07 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -1926,7 +1926,6 @@ Ρυθμίσεις (μη συνδεδεμένος) Κατάστημα - Εγκατεστημένα Βιβλιοθήκη Όλα Λήψεις @@ -1938,10 +1937,8 @@ Παραμονή συνδεδεμένου Αποσύνδεση Αναζήτηση στον κατάλογο %1$s… - Αναζήτηση εγκατεστημένων παιχνιδιών… Αναζήτηση στη βιβλιοθήκη σας… Αναζήτηση - Τίποτα εγκατεστημένο Φόρτωση Δεν υπάρχουν παιχνίδια Φόρτωση του καταστήματος… @@ -1960,6 +1957,8 @@ Προβολή στο %1$s Αγορά · %1$s Εγκατεστημένο + Εγκατεστημένο + Δεν είναι εγκατεστημένο Στη βιβλιοθήκη Κλειδί API Λήψη κλειδιού diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 073d3971f5..4d6ba89f80 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1944,7 +1944,6 @@ Ajustes (sin iniciar sesión) Tienda - Instalados Biblioteca Todos Descargas @@ -1956,10 +1955,8 @@ Mantener la sesión Cerrar sesión Buscar en el catálogo de %1$s… - Buscar juegos instalados… Buscar en tu biblioteca… Buscar - Nada instalado Cargando No hay juegos Cargando la tienda… @@ -1978,6 +1975,8 @@ Ver en %1$s Comprar · %1$s Instalado + Instalado + No instalada En la biblioteca Clave de API Obtener una clave diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 61a3d124af..bd2f9d176c 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -1926,7 +1926,6 @@ Asetukset (ei kirjautunut) Kauppa - Asennetut Kirjasto Kaikki Lataukset @@ -1938,10 +1937,8 @@ Pysy kirjautuneena Kirjaudu ulos Hae %1$s-luettelosta… - Hae asennetuista peleistä… Hae kirjastostasi… Hae - Ei mitään asennettuna Latautuu Ei pelejä Ladataan kauppaa… @@ -1960,6 +1957,8 @@ Näytä %1$s:ssä Osta · %1$s Asennettu + Asennettu + Ei asennettu Kirjastossa API-avain Hae avain diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 952fa65cb3..7d8b89eca1 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1944,7 +1944,6 @@ Paramètres (non connecté) Boutique - Installés Bibliothèque Tous Téléchargements @@ -1956,10 +1955,8 @@ Rester connecté Se déconnecter Rechercher dans le catalogue %1$s… - Rechercher dans les jeux installés… Rechercher dans votre bibliothèque… Rechercher - Aucun jeu installé Chargement Aucun jeu Chargement de la boutique… @@ -1978,6 +1975,8 @@ Voir sur %1$s Acheter · %1$s Installé + Installé + Non installé Dans la bibliothèque Clé d\'API Obtenir une clé diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 691f28d59e..75adfcb7cf 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -1926,7 +1926,6 @@ सेटिंग (साइन इन नहीं है) स्टोर - इंस्टॉल किए लाइब्रेरी सभी डाउनलोड @@ -1938,10 +1937,8 @@ साइन इन रहें साइन आउट करें %1$s के कैटलॉग में सर्च करें… - इंस्टॉल किए गेम में सर्च करें… अपनी लाइब्रेरी में सर्च करें… सर्च - कुछ इंस्टॉल नहीं है लोड हो रहा है कोई गेम नहीं स्टोर लोड हो रहा है… @@ -1960,6 +1957,8 @@ %1$s पर देखें खरीदें · %1$s इंस्टॉल है + इंस्टॉल है + इंस्टॉल नहीं है लाइब्रेरी में API कुंजी कुंजी पाएं diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 16a054ba4b..fa569cd9bf 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -1926,7 +1926,6 @@ Beállítások (nincs bejelentkezve) Áruház - Telepítve Könyvtár Összes Letöltések @@ -1938,10 +1937,8 @@ Bejelentkezve marad Kijelentkezés Keresés a %1$s katalógusban… - Keresés a telepített játékok között… Keresés a könyvtárában… Keresés - Nincs telepítve semmi Betöltés Nincs játék Az áruház betöltése… @@ -1960,6 +1957,8 @@ Megtekintés itt: %1$s Megvétel · %1$s Telepítve + Telepítve + Nincs telepítve A könyvtárban API-kulcs Kulcs beszerzése diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 0126a527ab..a14662f536 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -1905,7 +1905,6 @@ Setelan (belum masuk) Toko - Terinstal Pustaka Semua Unduhan @@ -1917,10 +1916,8 @@ Tetap masuk Keluar Cari katalog %1$s… - Cari gim yang terinstal… Cari pustaka Anda… Cari - Belum ada yang terinstal Memuat Tidak ada gim Memuat toko… @@ -1939,6 +1936,8 @@ Lihat di %1$s Beli · %1$s Terinstal + Terinstal + Belum terinstal Dalam pustaka Kunci API Dapatkan kunci diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index a9d7cb606b..301076df79 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1936,7 +1936,6 @@ Impostazioni (accesso non eseguito) Negozio - Installati Libreria Tutti Download @@ -1948,10 +1947,8 @@ Resta connesso Esci Cerca nel catalogo di %1$s… - Cerca tra i giochi installati… Cerca nella tua libreria… Cerca - Niente di installato Caricamento Nessun gioco Caricamento del negozio… @@ -1970,6 +1967,8 @@ Visualizza su %1$s Acquista · %1$s Installato + Installato + Non installata In libreria Chiave API Ottieni una chiave diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index f7899fea46..af2e8bba67 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -1905,7 +1905,6 @@ 設定 (未ログイン) ストア - インストール済み ライブラリ すべて ダウンロード @@ -1917,10 +1916,8 @@ ログインしたままにする ログアウト %1$sのカタログを検索… - インストール済みのゲームを検索… ライブラリを検索… 検索 - 何もインストールされていません 読み込み中 ゲームがありません ストアを読み込み中… @@ -1939,6 +1936,8 @@ %1$sで見る 購入 · %1$s インストール済み + インストール済み + 未インストール ライブラリにあり APIキー キーを取得 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index db3418dc17..aeb0667988 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -1905,7 +1905,6 @@ 설정 (로그인 안 됨) 스토어 - 설치됨 라이브러리 전체 다운로드 @@ -1917,10 +1916,8 @@ 로그인 유지 로그아웃 %1$s 카탈로그 검색… - 설치된 게임 검색… 내 라이브러리 검색… 검색 - 설치된 항목 없음 불러오는 중 게임 없음 스토어 불러오는 중… @@ -1939,6 +1936,8 @@ %1$s에서 보기 구매 · %1$s 설치됨 + 설치됨 + 설치되지 않음 라이브러리에 있음 API 키 키 받기 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 4cec0534e5..afd271efc8 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -1905,7 +1905,6 @@ Tetapan (belum log masuk) Kedai - Dipasang Pustaka Semua Muat turun @@ -1917,10 +1916,8 @@ Kekal log masuk Log keluar Cari katalog %1$s… - Cari permainan dipasang… Cari pustaka anda… Cari - Tiada apa dipasang Memuatkan Tiada permainan Memuatkan kedai… @@ -1939,6 +1936,8 @@ Lihat pada %1$s Beli · %1$s Dipasang + Dipasang + Belum dipasang Dalam pustaka Kunci API Dapatkan kunci diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 058a20cf87..1649f4e4ab 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -1926,7 +1926,6 @@ Innstillinger (ikke innlogget) Butikk - Installert Bibliotek Alle Nedlastinger @@ -1938,10 +1937,8 @@ Fortsett innlogget Logg ut Søk i %1$s-katalogen… - Søk i installerte spill… Søk i biblioteket ditt… Søk - Ingenting installert Laster Ingen spill Laster butikken… @@ -1960,6 +1957,8 @@ Vis på %1$s Kjøp · %1$s Installert + Installert + Ikke installert I biblioteket API-nøkkel Hent en nøkkel diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index cb5127130a..3ac9d80293 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -1926,7 +1926,6 @@ Instellingen (niet aangemeld) Winkel - Geïnstalleerd Bibliotheek Alle Downloads @@ -1938,10 +1937,8 @@ Aangemeld blijven Afmelden Zoeken in de catalogus van %1$s… - Geïnstalleerde games zoeken… Zoeken in je bibliotheek… Zoeken - Niets geïnstalleerd Laden Geen games Winkel laden… @@ -1960,6 +1957,8 @@ Bekijken op %1$s Kopen · %1$s Geïnstalleerd + Geïnstalleerd + Niet geïnstalleerd In bibliotheek API-sleutel Sleutel ophalen diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index bb7e40dcfe..5828bb5a1e 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -1968,7 +1968,6 @@ Ustawienia (niezalogowano) Sklep - Zainstalowane Biblioteka Wszystkie Pobierania @@ -1980,10 +1979,8 @@ Zostań zalogowany Wyloguj się Szukaj w katalogu %1$s… - Szukaj zainstalowanych gier… Szukaj w Twojej bibliotece… Szukaj - Nic nie zainstalowano Wczytywanie Brak gier Wczytywanie sklepu… @@ -2002,6 +1999,8 @@ Zobacz w %1$s Kup · %1$s Zainstalowano + Zainstalowano + Nie zainstalowano W bibliotece Klucz API Pobierz klucz diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 931f557bdc..eb3dbde1e8 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -1936,7 +1936,6 @@ Definições (sessão não iniciada) Loja - Instalados Biblioteca Todos Transferências @@ -1948,10 +1947,8 @@ Manter sessão iniciada Terminar sessão Pesquisar no catálogo %1$s… - Pesquisar jogos instalados… Pesquisar na sua biblioteca… Pesquisar - Nada instalado A carregar Nenhum jogo A carregar a loja… @@ -1970,6 +1967,8 @@ Ver em %1$s Comprar · %1$s Instalado + Instalado + Não instalado Na biblioteca Chave de API Obter uma chave diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index bfc2b41205..9119ead1bc 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -1936,7 +1936,6 @@ Configurações (sem login) Loja - Instalados Biblioteca Todos Downloads @@ -1948,10 +1947,8 @@ Continuar conectado Sair Pesquisar no catálogo de %1$s… - Pesquisar jogos instalados… Pesquisar na sua biblioteca… Pesquisar - Nada instalado Carregando Nenhum jogo Carregando a loja… @@ -1970,6 +1967,8 @@ Ver em %1$s Comprar · %1$s Instalado + Instalado + Não instalado Na biblioteca Chave de API Obter uma chave diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 01f2f37f65..e16c6174a7 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -1947,7 +1947,6 @@ Setări (neautentificat) Magazin - Instalate Bibliotecă Toate Descărcări @@ -1959,10 +1958,8 @@ Rămâi autentificat Deconectare Caută în catalogul %1$s… - Caută jocurile instalate… Caută în biblioteca ta… Căutare - Nimic instalat Se încarcă Niciun joc Se încarcă magazinul… @@ -1981,6 +1978,8 @@ Vezi pe %1$s Cumpără · %1$s Instalat + Instalat + Neinstalat În bibliotecă Cheie API Obține o cheie diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index bab12fb06f..4c3e71733a 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1965,7 +1965,6 @@ Настройки (вход не выполнен) Магазин - Установлено Библиотека Все Загрузки @@ -1977,10 +1976,8 @@ Не выходить Выйти Поиск в каталоге %1$s… - Поиск установленных игр… Поиск в библиотеке… Поиск - Ничего не установлено Загрузка Нет игр Загрузка магазина… @@ -1999,6 +1996,8 @@ Открыть в %1$s Купить · %1$s Установлено + Установлено + Не установлено В библиотеке Ключ API Получить ключ diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 33a2024b3c..39f63eef1f 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -1926,7 +1926,6 @@ Inställningar (inte inloggad) Butik - Installerade Bibliotek Alla Nedladdningar @@ -1938,10 +1937,8 @@ Fortsätt vara inloggad Logga ut Sök i %1$s-katalogen… - Sök installerade spel… Sök i ditt bibliotek… Sök - Inget installerat Läser in Inga spel Läser in butiken… @@ -1960,6 +1957,8 @@ Visa på %1$s Köp · %1$s Installerat + Installerat + Inte installerad I biblioteket API-nyckel Hämta en nyckel diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 2d03c33e41..ced2fb9619 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -1905,7 +1905,6 @@ การตั้งค่า (ยังไม่ลงชื่อเข้าใช้) สโตร์ - ติดตั้งแล้ว ไลบรารี ทั้งหมด การดาวน์โหลด @@ -1917,10 +1916,8 @@ ลงชื่อเข้าใช้ต่อไป ลงชื่อออก ค้นหาแคตตาล็อกของ %1$s… - ค้นหาเกมที่ติดตั้งไว้… ค้นหาไลบรารีของคุณ… ค้นหา - ไม่มีสิ่งที่ติดตั้งไว้ กำลังโหลด ไม่มีเกม กำลังโหลดสโตร์… @@ -1939,6 +1936,8 @@ ดูบน %1$s ซื้อ · %1$s ติดตั้งแล้ว + ติดตั้งแล้ว + ยังไม่ติดตั้ง อยู่ในไลบรารี คีย์ API รับคีย์ diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 71906dca84..42da82a97e 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -1915,7 +1915,6 @@ Ayarlar (oturum açılmadı) Mağaza - Yüklü Kütüphane Tümü İndirmeler @@ -1927,10 +1926,8 @@ Oturumu açık tut Oturumu kapat %1$s kataloğunda ara… - Yüklü oyunlarda ara… Kütüphanenizde ara… Ara - Yüklü bir şey yok Yükleniyor Oyun yok Mağaza yükleniyor… @@ -1949,6 +1946,8 @@ %1$s\'te görüntüle Satın al · %1$s Yüklü + Yüklü + Yüklü değil Kütüphanede API anahtarı Anahtar al diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 4a72e62c74..03eed1e71e 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -1968,7 +1968,6 @@ Налаштування (вхід не виконано) Магазин - Встановлені Бібліотека Усі Завантаження @@ -1980,10 +1979,8 @@ Не виходити Вийти Пошук у каталозі %1$s… - Пошук встановлених ігор… Пошук у вашій бібліотеці… Пошук - Нічого не встановлено Завантаження Немає ігор Завантаження магазину… @@ -2002,6 +1999,8 @@ Переглянути на %1$s Купити · %1$s Встановлено + Встановлено + Не встановлено У бібліотеці Ключ API Отримати ключ diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index eb7f8f4f20..9a49e869b3 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -1905,7 +1905,6 @@ Thiết lập (chưa đăng nhập) Cửa hàng - Đã cài Thư viện Tất cả Tải xuống @@ -1917,10 +1916,8 @@ Vẫn đăng nhập Đăng xuất Tìm trong danh mục %1$s… - Tìm game đã cài… Tìm trong thư viện của bạn… Tìm kiếm - Chưa cài gì Đang tải Không có game Đang tải store… @@ -1939,6 +1936,8 @@ Xem trên %1$s Mua · %1$s Đã cài + Đã cài + Chưa cài Trong thư viện Khóa API Lấy khóa diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 0c9146a791..65896e07e5 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1981,7 +1981,6 @@ 设置 (未登录) 商店 - 已安装 库 全部 下载 @@ -1993,10 +1992,8 @@ 保持登录 退出登录 搜索 %1$s 目录… - 搜索已安装的游戏… 搜索你的库… 搜索 - 尚未安装任何内容 加载中 没有游戏 正在加载商店… @@ -2015,6 +2012,8 @@ 在 %1$s 上查看 购买 · %1$s 已安装 + 已安装 + 未安装 已在库中 API 密钥 获取密钥 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 422d8ee8bf..1618d85011 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1905,7 +1905,6 @@ 設定 (未登入) 商店 - 已安裝 收藏庫 全部 下載 @@ -1917,10 +1916,8 @@ 保持登入 登出 搜尋 %1$s 目錄… - 搜尋已安裝的遊戲… 搜尋你的收藏庫… 搜尋 - 未安裝任何遊戲 正在載入 沒有遊戲 正在載入商店… @@ -1939,6 +1936,8 @@ 在 %1$s 查看 購買 · %1$s 已安裝 + 已安裝 + 未安裝 已在收藏庫中 API 金鑰 取得金鑰 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 59d65bad81..04dc2a74e2 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1905,7 +1905,6 @@ 設定 (未登入) 商店 - 已安裝 收藏庫 全部 下載 @@ -1917,10 +1916,8 @@ 保持登入 登出 搜尋 %1$s 目錄… - 搜尋已安裝的遊戲… 搜尋你的收藏庫… 搜尋 - 尚未安裝任何內容 正在載入 沒有遊戲 正在載入商店… @@ -1939,6 +1936,8 @@ 在 %1$s 檢視 購買 · %1$s 已安裝 + 已安裝 + 未安裝 已在收藏庫中 API 金鑰 取得金鑰 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c1baba8011..44fb4fc2a0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1969,7 +1969,6 @@ Settings (not signed in) Store - Installed Library All Downloads @@ -1981,10 +1980,8 @@ Stay signed in Sign out Search the %1$s catalog… - Search installed games… Search your library… Search - Nothing installed Loading No games Loading the store… @@ -2003,6 +2000,8 @@ View on %1$s Buy · %1$s Installed + Installed + Not installed In library API key Get a key diff --git a/app/src/test/java/com/droiddeck/launcher/ui/StoreGridNavigationTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/StoreGridNavigationTest.kt index 4f0b9d4217..ad1b13df79 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/StoreGridNavigationTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/StoreGridNavigationTest.kt @@ -26,4 +26,29 @@ class StoreGridNavigationTest { assertEquals(5, storeGridNeighbor(2, 10, 3, 1)) assertEquals(6, storeGridNeighbor(2, 10, 4, 1)) } + + @Test fun downFromTheInstalledSectionLandsInTheSameColumnBelowTheDivider() { + assertEquals(6, storeGridNeighbor(0, 12, 4, 1, split = 6).let { storeGridNeighbor(it!!, 12, 4, 1, split = 6) }) + assertEquals(6, storeGridNeighbor(4, 12, 4, 1, split = 6)) + assertEquals(7, storeGridNeighbor(5, 12, 4, 1, split = 6)) + assertEquals(8, storeGridNeighbor(2, 12, 4, 1, split = 6)) + } + + @Test fun upFromBelowTheDividerClampsToTheShortInstalledRow() { + assertEquals(4, storeGridNeighbor(6, 12, 4, -1, split = 6)) + assertEquals(5, storeGridNeighbor(7, 12, 4, -1, split = 6)) + assertEquals(5, storeGridNeighbor(9, 12, 4, -1, split = 6)) + assertEquals(6, storeGridNeighbor(10, 12, 4, -1, split = 6)) + } + + @Test fun lastSectionStillStopsAtItsIncompleteRow() { + assertNull(storeGridNeighbor(9, 11, 4, 1, split = 6)) + assertEquals(10, storeGridNeighbor(6, 11, 4, 1, split = 6)) + assertNull(storeGridNeighbor(1, 11, 4, -1, split = 6)) + } + + @Test fun installedGamesComeFirstKeepingTheirSortedOrder() { + val items = listOf("a", "b", "c", "d").map { com.droiddeck.launcher.stores.CatalogItem(com.droiddeck.launcher.stores.Store.GOG, it, it, null) } + assertEquals(listOf("b", "d", "a", "c"), installedFirst(items, setOf("d", "b")).map { it.id }) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/StoreTabsTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/StoreTabsTest.kt index 2be67a4b67..a5578a0f75 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/StoreTabsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/StoreTabsTest.kt @@ -5,12 +5,13 @@ import org.junit.Assert.assertEquals import org.junit.Test class StoreTabsTest { - @Test fun storeLibraryInstalledAmazonWithoutStore() { - assertEquals(listOf("store", "library", "installed"), tabsFor(Store.GOG)) - assertEquals(listOf("library", "installed"), tabsFor(Store.AMAZON)) + @Test fun libraryAndStoreAmazonLibraryOnly() { + assertEquals(listOf("library", "store"), tabsFor(Store.GOG)) + assertEquals(listOf("library", "store"), tabsFor(Store.ITCH)) + assertEquals(listOf("library"), tabsFor(Store.AMAZON)) assertEquals("library", tabFor(Store.AMAZON, "store")) assertEquals("library", tabFor(Store.GOG, "all")) - assertEquals("installed", tabFor(Store.EPIC, "installed")) + assertEquals("library", tabFor(Store.EPIC, "installed")) assertEquals("store", tabFor(Store.GOG, "store")) } }