From aaa2e40defb1a777811ee20e9d5b068200983cc2 Mon Sep 17 00:00:00 2001 From: The412Banner <205237651+The412Banner@users.noreply.github.com> Date: Thu, 22 Oct 2026 04:23:46 -0400 Subject: [PATCH] feat: DroidDeck's linux-nightly components, with a Stable/Nightly switch (#1284) The component catalog also reads the linux-nightly release of Droid-Deck/DroidDeck-Components (hourly builds of DXVK, VKD3D-Proton and FEX for glibc Protons). That release holds all three components, so each file goes to its list by name: DD-dxvk-, DD-vkd3d-proton-, DD-FEXCore-. A nightly that matches a stable build (same flavor and version, e.g. DD-dxvk-3.1.1+153-nightly and dxvk-3.1.1-linux) has no row of its own; if two nightlies match, the newer one is used. On the components page the stable row gets a Stable | Nightly switch before Get, styled like the Get button, one focus stop that flips with A or a tap and reports its state as a switch. In the in-session drawer's download menus the row gets Stable and Nightly tabs beside it (the existing TabStrip, now with optional bumpers/compact), each its own focus stop. Get or A on the row downloads whichever channel is selected. A nightly without a stable counterpart keeps its own row, listed below the stable ones. Downloads are allowed from that repository's releases too. A failed nightly download says the file may have been replaced and asks for a refresh. Strings in all locales. --- .../launcher/session/ComponentsManager.kt | 41 +++++++++-- .../droiddeck/launcher/ui/ComponentsPage.kt | 62 ++++++++++++++-- .../droiddeck/launcher/ui/SessionOverlay.kt | 47 ++++++++---- .../droiddeck/launcher/ui/SettingsWidgets.kt | 11 +-- app/src/main/res/values-ar/strings.xml | 7 +- app/src/main/res/values-b+es+419/strings.xml | 7 +- app/src/main/res/values-bg/strings.xml | 7 +- app/src/main/res/values-cs/strings.xml | 7 +- app/src/main/res/values-da/strings.xml | 7 +- app/src/main/res/values-de/strings.xml | 7 +- app/src/main/res/values-el/strings.xml | 7 +- app/src/main/res/values-es/strings.xml | 7 +- app/src/main/res/values-fi/strings.xml | 7 +- app/src/main/res/values-fr/strings.xml | 7 +- app/src/main/res/values-hi/strings.xml | 7 +- app/src/main/res/values-hu/strings.xml | 7 +- app/src/main/res/values-in/strings.xml | 7 +- app/src/main/res/values-it/strings.xml | 7 +- app/src/main/res/values-ja/strings.xml | 7 +- app/src/main/res/values-ko/strings.xml | 7 +- app/src/main/res/values-ms/strings.xml | 7 +- app/src/main/res/values-nb/strings.xml | 7 +- app/src/main/res/values-nl/strings.xml | 7 +- app/src/main/res/values-pl/strings.xml | 7 +- app/src/main/res/values-pt-rPT/strings.xml | 7 +- app/src/main/res/values-pt/strings.xml | 7 +- app/src/main/res/values-ro/strings.xml | 7 +- app/src/main/res/values-ru/strings.xml | 7 +- app/src/main/res/values-sv/strings.xml | 7 +- app/src/main/res/values-th/strings.xml | 7 +- app/src/main/res/values-tr/strings.xml | 7 +- app/src/main/res/values-uk/strings.xml | 7 +- app/src/main/res/values-vi/strings.xml | 7 +- app/src/main/res/values-zh-rCN/strings.xml | 7 +- app/src/main/res/values-zh-rHK/strings.xml | 7 +- app/src/main/res/values-zh-rTW/strings.xml | 7 +- app/src/main/res/values/strings.xml | 7 +- .../session/ComponentsNightlyCatalogTest.kt | 73 +++++++++++++++++++ .../ui/ComponentDownloadsDrawerTest.kt | 46 ++++++++++++ 39 files changed, 415 insertions(+), 96 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/session/ComponentsNightlyCatalogTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt index 01e6a2fe13..d1aae9d720 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt @@ -25,6 +25,8 @@ import java.io.FileOutputStream object ComponentsManager { private const val TAG = "Components" private const val NIGHTLIES = "The412Banner/Nightlies" + private const val DD_COMPONENTS = "Droid-Deck/DroidDeck-Components" + internal const val DD_NIGHTLY = "linux-nightly" private val RELEASES = linkedMapOf( "FexCore-Linux" to "fex", "Dxvk-Linux" to "dxvk", @@ -32,6 +34,10 @@ object ComponentsManager { "Dxvk-gplasync-Linux" to "dxvk", "Vkd3d-proton-Linux" to "vkd3d", ) + // DD_NIGHTLY holds every component in one release; the file name says which. + private val NIGHTLY_PREFIXES = linkedMapOf("DD-dxvk-" to "dxvk", "DD-vkd3d-proton-" to "vkd3d", "DD-FEXCore-" to "fex") + private val SOURCES = RELEASES.keys.map { NIGHTLIES to it } + (DD_COMPONENTS to DD_NIGHTLY) + private val DOWNLOAD_REPOS = listOf(NIGHTLIES, DD_COMPONENTS) private val TYPES = mapOf("FEXCore-Linux" to "fex", "DXVK-Linux" to "dxvk", "VKD3D-Linux" to "vkd3d") private val TYPE_OF = mapOf("fex" to "FEXCore-Linux", "dxvk" to "DXVK-Linux", "vkd3d" to "VKD3D-Linux") val COMPONENTS = listOf("fex", "dxvk", "vkd3d") @@ -815,14 +821,15 @@ object ComponentsManager { if (!force && cache.isFile) runCatching { return parseCatalog(JSONObject(cache.readText())) } if (!force) return Catalog(emptyList(), 0) val items = JSONArray() - for ((tag, comp) in RELEASES) { - val body = Downloader.downloadString("https://api.github.com/repos/$NIGHTLIES/releases/tags/$tag") ?: continue + for ((repo, tag) in SOURCES) { + val body = Downloader.downloadString("https://api.github.com/repos/$repo/releases/tags/$tag") ?: continue val assets = runCatching { JSONObject(body).optJSONArray("assets") }.getOrNull() ?: continue for (i in 0 until assets.length()) { val a = assets.getJSONObject(i) val name = a.optString("name") if (!name.endsWith(".wcp")) continue if (!Hashes.isGithubSha256(a.optString("digest"))) continue + val comp = assetComp(tag, name) ?: continue items.put(JSONObject().put("file", name).put("comp", comp).put("release", tag) .put("url", a.optString("browser_download_url")).put("size", a.optLong("size")).put("digest", a.optString("digest"))) } @@ -837,10 +844,32 @@ object ComponentsManager { val arr = o.optJSONArray("items") ?: JSONArray() val items = (0 until arr.length()).map { arr.getJSONObject(it) }.map { CatalogItem(it.optString("file"), it.optString("comp"), it.optString("release"), it.optString("url"), it.optLong("size"), it.optString("digest")) - }.sortedWith(compareBy { it.comp }.then(newestFirst { it.file })) + }.sortedWith(CATALOG_ORDER) return Catalog(items, o.optLong("fetchedAt")) } + internal fun assetComp(release: String, name: String): String? = + RELEASES[release] ?: if (release == DD_NIGHTLY) NIGHTLY_PREFIXES.entries.firstOrNull { name.startsWith(it.key) }?.value else null + + // Per component: the stable packages newest first, then the nightlies. + internal val CATALOG_ORDER: Comparator = + compareBy { it.comp }.thenBy { it.release == DD_NIGHTLY }.then(newestFirst { it.file }) + + // A nightly DD--[+N]-nightly.wcp pairs with the newest stable -[-]-linux.wcp + // in the same list, so the stable row can offer it behind a Stable/Nightly switch. Unpaired nightlies keep their own row. + internal fun nightlyPairs(items: List): Map { + val stable = items.filter { it.release != DD_NIGHTLY } + return items.filter { it.release == DD_NIGHTLY }.mapNotNull { n -> + val base = n.file.removePrefix("DD-").removeSuffix("-nightly.wcp").substringBefore('+') + val rev = Regex(Regex.escape(base) + "(-\\d+)?-linux\\.wcp") + stable.filter { it.comp == n.comp && rev.matches(it.file) } + .maxWithOrNull { a, b -> ProtonExtras.compareVersions(a.file, b.file) }?.let { it to n } + }.groupBy({ it.first }, { it.second }) + .mapValues { (_, ns) -> ns.maxWith { a, b -> ProtonExtras.compareVersions(a.file, b.file) } } + } + + internal fun allowedDownload(url: String) = DOWNLOAD_REPOS.any { url.startsWith("https://github.com/$it/releases/download/") } + private fun newestFirst(of: (T) -> String): Comparator = Comparator { a, b -> ProtonExtras.compareVersions(of(b), of(a)) } @@ -925,11 +954,13 @@ object ComponentsManager { ): CatalogItem? = catalogMatch(cached(), file, release) ?: catalogMatch(refresh(), file, release) fun download(context: Context, item: CatalogItem, progress: (Int) -> Unit): Package { - require(item.url.startsWith("https://github.com/$NIGHTLIES/releases/download/")) { context.getString(R.string.cmgr_nightlies_only) } + require(allowedDownload(item.url)) { context.getString(R.string.cmgr_nightlies_only) } require(Hashes.isGithubSha256(item.digest)) { context.getString(R.string.cmgr_list_predates_checksums) } val dest = File(packagesDir(context), safeName(item.file)) val part = File(dest.parentFile, dest.name + ".part") - check(Downloader.downloadFile(item.url, part, true, item.digest.substringAfter(':')) { f -> progress(if (f < 0) -1 else (f * 100).toInt().coerceIn(0, 100)) }) { context.getString(R.string.user_apps_download_failed) } + check(Downloader.downloadFile(item.url, part, true, item.digest.substringAfter(':')) { f -> progress(if (f < 0) -1 else (f * 100).toInt().coerceIn(0, 100)) }) { + context.getString(if (item.release == DD_NIGHTLY) R.string.cmgr_nightly_replaced else R.string.user_apps_download_failed) + } if (!Hashes.sha256(part).equals(item.digest.substringAfter(':'), true)) { part.delete(); error(context.getString(R.string.cmgr_checksum_mismatch)) } val info = runCatching { packageInfo(context, part) }.getOrElse { part.delete(); throw it } synchronized(lock) { part.renameTo(dest) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt index d44f599406..e3de1f325e 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt @@ -30,6 +30,7 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.selection.toggleable import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.verticalScroll @@ -73,6 +74,8 @@ import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.platform.LocalInputModeManager import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.Role +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.semantics.stateDescription import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp @@ -381,6 +384,7 @@ fun ComponentsPage( var stackAt by remember { mutableStateOf(Offset.Zero) } var pageAt by remember { mutableStateOf(Offset.Zero) } val landed = remember { mutableStateMapOf() } + val nightlyPicked = remember { mutableStateMapOf() } val rings = remember { mutableStateMapOf() } fun land(l: String) { landed[l] = (landed[l] ?: 0) + 1; rings[l] = (rings[l] ?: 0) + 1 } val arrivedSeen = remember { intArrayOf(Hops.arrived) } @@ -504,7 +508,7 @@ fun ComponentsPage( val availableTitle: @Composable (String) -> String = { l -> when (l) { PROTON_TAB -> stringResource(R.string.comp_available_count, protons.rows.count { it.installed == null || it.update != null }) - else -> stringResource(R.string.comp_nightlies_count, availableFor(l, catalog, snapshot).size) + else -> stringResource(R.string.comp_nightlies_count, availableRows(l, catalog, snapshot).size) } } val installedRows: @Composable ColumnScope.(String, Boolean) -> Unit = { l, right -> @@ -581,12 +585,16 @@ fun ComponentsPage( ) { protonActions.onInstall(row.id) } } else -> { - val available = availableFor(l, catalog, snapshot) + val available = availableRows(l, catalog, snapshot) if (available.isEmpty()) EmptyLine(if (catalogAt == 0L) stringResource(R.string.comp_refresh_to_list) else stringResource(R.string.comp_nothing_new)) - for (d in available) GetLine( - d.file.removeSuffix(".wcp"), "${d.release} · " + stringResource(R.string.common_size_mb, d.size / 1048576.0), - progress = downloads[d.file], enabled = busy == null, - ) { onDownload(d) } + for ((stable, nightly) in available) { + val d = if (nightly != null && nightlyPicked[stable.file] == true) nightly else stable + GetLine( + d.file.removeSuffix(".wcp"), "${d.release} · " + stringResource(R.string.common_size_mb, d.size / 1048576.0), + progress = downloads[d.file], enabled = busy == null, + channel = if (nightly != null) ({ ChannelToggle(d === nightly, enabled = busy == null) { nightlyPicked[stable.file] = d !== nightly } }) else null, + ) { onDownload(d) } + } } } } @@ -922,6 +930,14 @@ private fun availableFor(l: String, catalog: List, snapshot: Snapsh return catalog.filter { it.comp == l && ComponentsManager.safeName(it.file) !in stored } } +// The rows to show: each stable row carries its paired nightly (if any), and a paired nightly has no row of its own. +private fun availableRows(l: String, catalog: List, snapshot: Snapshot?): List> { + val available = availableFor(l, catalog, snapshot) + val pairs = ComponentsManager.nightlyPairs(available) + val paired = pairs.values.toSet() + return available.filter { it !in paired }.map { it to pairs[it] } +} + @Composable private fun LayerTitle(l: String): String = when (l) { GPU_TAB -> stringResource(R.string.comp_gpu_drivers) @@ -1417,7 +1433,8 @@ private fun ChoiceLine( @Composable private fun GetLine( name: String, detail: String, progress: Int?, enabled: Boolean, - badge: String? = null, stage: String? = null, onCancel: (() -> Unit)? = null, action: String? = null, onGet: () -> Unit, + badge: String? = null, stage: String? = null, onCancel: (() -> Unit)? = null, action: String? = null, + channel: (@Composable () -> Unit)? = null, onGet: () -> Unit, ) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current @@ -1432,12 +1449,43 @@ private fun GetLine( if (progress != null) ProgressBit(progress) else { if (onCancel != null) FocusText(stringResource(R.string.proton_cancel_queued), pal.signal, onClick = onCancel) + channel?.invoke() SmallButton(action ?: stringResource(R.string.comp_get), enabled = enabled, accent = true, onClick = onGet) } } Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line)) } +// Stable | Nightly in the same box as SmallButton: one focus stop, A (or a tap) flips it. +@Composable +private fun ChannelToggle(nightly: Boolean, enabled: Boolean, onFlip: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) && enabled + val state = stringResource(if (nightly) R.string.comp_channel_nightly else R.string.comp_channel_stable) + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(2.dp), + modifier = Modifier.heightIn(min = 44.dp).clip(RoundedCornerShape(10.dp)) + .background(colors.surfaceVariant) + .glideBorder(hot, RoundedCornerShape(10.dp), colors.onBackground, pal.line2, restWidth = 2.dp) + .hoverable(src).toggleable(value = nightly, interactionSource = src, indication = null, enabled = enabled, role = Role.Switch, onValueChange = { onFlip() }) + .controllerConfirm(enabled = enabled, onClick = onFlip) + .semantics { stateDescription = state } + .padding(4.dp), + ) { + for ((label, on) in listOf(R.string.comp_channel_stable to !nightly, R.string.comp_channel_nightly to nightly)) { + Text( + stringResource(label), fontSize = 13.sp, fontWeight = FontWeight.SemiBold, maxLines = 1, + color = if (!enabled) colors.onSurfaceVariant else if (on) (if (hot) pal.onSignal else pal.signal) else colors.onSurfaceVariant, + modifier = Modifier.clip(RoundedCornerShape(7.dp)) + .background(if (on && enabled) (if (hot) pal.signal else pal.signal.copy(alpha = 0.16f)) else Color.Transparent) + .padding(horizontal = 10.dp, vertical = 6.dp), + ) + } + } +} + @Composable private fun DetailLine(detail: String, badge: String?) { val colors = MaterialTheme.colorScheme diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt index 5af4381e86..d32e1e3ea4 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -110,6 +110,7 @@ import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.mutableStateMapOf import androidx.compose.runtime.remember import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue @@ -1415,6 +1416,7 @@ internal fun ComponentDownloadsDrawerGroup( ) { val colors = MaterialTheme.colorScheme val installed = packages.map { it.file }.toSet() + val nightlyPicked = remember { mutableStateMapOf() } SettingsGroup(stringResource(R.string.drawer_component_downloads)) { Text(stringResource(R.string.drawer_component_downloads_hint), fontSize = 12.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(horizontal = 14.dp, vertical = 8.dp)) @@ -1438,21 +1440,40 @@ internal fun ComponentDownloadsDrawerGroup( } AnchoredMenu(open, onDismiss = { if (host.open == key) host.open = null }, title = ComponentsManager.LABEL.getValue(comp)) { firstItemFocus -> - val firstAvailable = items.firstOrNull { ComponentsManager.safeName(it.file) !in installed && it.file !in downloads } - items.forEach { item -> + // A nightly paired with a stable build rides on that row; Stable/Nightly tabs beside the row pick which one. + val pairs = ComponentsManager.nightlyPairs(items) + val rows = items.filter { it !in pairs.values } + fun shown(row: ComponentsManager.CatalogItem) = pairs[row]?.takeIf { nightlyPicked[row.file] == true } ?: row + val firstAvailable = rows.firstOrNull { shown(it).let { s -> ComponentsManager.safeName(s.file) !in installed && s.file !in downloads } } + rows.forEach { row -> + val item = shown(row) + val nightly = pairs[row] val stored = ComponentsManager.safeName(item.file) in installed val progress = downloads[item.file] - MenuItem(item.file.removeSuffix(".wcp"), checked = stored, - enabled = !stored && progress == null, - detail = when { - stored -> stringResource(R.string.wincomp_downloaded) - progress != null -> if (progress < 0) stringResource(R.string.wincomp_downloading, item.file.removeSuffix(".wcp")) else "$progress%" - else -> item.release + " · " + stringResource(R.string.common_size_mb, item.size / 1048576.0) - }, - focusRequester = if (item == firstAvailable) firstItemFocus else null, - ) { - onDownload(item) - host.open = null + val choose = @Composable { rowModifier: Modifier -> + MenuItem(item.file.removeSuffix(".wcp"), checked = stored, + enabled = !stored && progress == null, + detail = when { + stored -> stringResource(R.string.wincomp_downloaded) + progress != null -> if (progress < 0) stringResource(R.string.wincomp_downloading, item.file.removeSuffix(".wcp")) else "$progress%" + else -> item.release + " · " + stringResource(R.string.common_size_mb, item.size / 1048576.0) + }, + focusRequester = if (row == firstAvailable) firstItemFocus else null, + modifier = rowModifier, + ) { + onDownload(item) + host.open = null + } + } + if (nightly == null) choose(Modifier) + else Row(verticalAlignment = Alignment.CenterVertically) { + choose(Modifier.weight(1f)) + TabStrip( + listOf(stringResource(R.string.comp_channel_stable), stringResource(R.string.comp_channel_nightly)), + selected = if (item === nightly) 1 else 0, + onSelect = { nightlyPicked[row.file] = it == 1 }, + bumpers = false, compact = true, modifier = Modifier.padding(start = 6.dp, end = 4.dp), + ) } } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt b/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt index fb92473338..87fa58ace4 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt @@ -157,6 +157,7 @@ internal fun Modifier.bumpers(onPrevious: () -> Unit, onNext: () -> Unit): Modif internal fun TabStrip( tabs: List, selected: Int, onSelect: (Int) -> Unit, modifier: Modifier = Modifier, focusRequesters: List? = null, + bumpers: Boolean = true, compact: Boolean = false, ) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current @@ -164,9 +165,9 @@ internal fun TabStrip( val scroll = rememberScrollState() var tight by remember(tabs) { mutableStateOf(false) } LaunchedEffect(scroll.maxValue) { if (scroll.maxValue in 1 until Int.MAX_VALUE) tight = true } - val tabPadding = if (tight) 10.dp else 16.dp + val tabPadding = if (compact) 10.dp else if (tight) 10.dp else 16.dp Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp), modifier = modifier) { - BumperKey("LB", stringResource(R.string.widgets_prev_tab)) { onSelect((selected + tabs.size - 1) % tabs.size) } + if (bumpers) BumperKey("LB", stringResource(R.string.widgets_prev_tab)) { onSelect((selected + tabs.size - 1) % tabs.size) } Row( modifier = Modifier.weight(1f, fill = false).clip(shape).background(colors.surfaceVariant).border(1.dp, pal.line2, shape) .horizontalScroll(scroll).padding(3.dp), @@ -180,7 +181,7 @@ internal fun TabStrip( val reveal = remember { androidx.compose.foundation.relocation.BringIntoViewRequester() } if (on) LaunchedEffect(Unit) { reveal.bringIntoView() } Text( - label, fontSize = 14.sp, fontWeight = if (on) FontWeight.Bold else FontWeight.SemiBold, maxLines = 1, + label, fontSize = if (compact) 12.sp else 14.sp, fontWeight = if (on) FontWeight.Bold else FontWeight.SemiBold, maxLines = 1, color = if (on) pal.onSignal else if (hot) colors.onBackground else colors.onSurfaceVariant, modifier = Modifier .bringIntoViewRequester(reveal) @@ -191,11 +192,11 @@ internal fun TabStrip( .glideBorder(hot, tabShape, if (on) colors.onBackground else pal.signal) .hoverable(src).clickable(interactionSource = src, indication = null, role = Role.Tab, onClick = pick) .controllerConfirm(onClick = pick) - .padding(horizontal = tabPadding, vertical = 12.dp), + .padding(horizontal = tabPadding, vertical = if (compact) 6.dp else 12.dp), ) } } - BumperKey("RB", stringResource(R.string.widgets_next_tab)) { onSelect((selected + 1) % tabs.size) } + if (bumpers) BumperKey("RB", stringResource(R.string.widgets_next_tab)) { onSelect((selected + 1) % tabs.size) } } } diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 439c5c7e8a..8002743d4f 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -512,7 +512,9 @@ هل تريد حذف هذه النسخة الأصلية؟ هذه النسخة الأصلية من %1$s تعود إلى إصدار سابق من %2$s. يتم دائمًا الاحتفاظ بالنسخة الأصلية للإصدار الحالي. في الإصدارات الليلية · %1$d - حدّث لعرض الحزم في الإصدارات الليلية. + مستقر + ليلي + حدّث لعرض الحزم في إصدارات Nightlies وDroidDeck. لا جديد منذ آخر فحص. استيراد ملف ‎.wcp استعادة النسخة الأصلية لـ Proton هذا @@ -1864,7 +1866,8 @@ تم الاحتفاظ بأصل النسخة المثبَّتة: فهو طريق العودة. غير مخزَّن تم حذف أصل %2$s من %1$s. - التنزيلات تأتي فقط من إصدارات Nightlies + التنزيلات تأتي فقط من إصدارات Nightlies وDroidDeck + فشل التنزيل: ربما استُبدل هذا الإصدار الليلي بإصدار أحدث. حدّث القائمة وحاول مرة أخرى. قائمة الحزم هذه أقدم من إضافة المجاميع الاختبارية - حدِّثها وحاوِل مرة أخرى عدم تطابق المجموع الاختباري 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 343fc12fa6..fb9b4c3c93 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -499,7 +499,9 @@ ¿Eliminar este original? Este original de %1$s es de una versión anterior de %2$s. El original de la versión actual siempre se conserva. En las Nightlies · %1$d - Actualiza para listar los paquetes de las Nightlies. + Estable + Nocturna + Actualiza para listar los paquetes de Nightlies y DroidDeck. Nada nuevo desde la última comprobación. Importar .wcp Restaurar el original de este Proton @@ -1840,7 +1842,8 @@ El original de la versión instalada se conserva: es el camino de vuelta. No guardado Se eliminó el original de %1$s de %2$s. - Las descargas solo proceden de las versiones Nightlies + Las descargas solo proceden de las versiones de Nightlies y DroidDeck + Falló la descarga: es posible que esta compilación nocturna se haya reemplazado por una más nueva. Actualiza la lista e inténtalo de nuevo. Esta lista de paquetes es anterior a las sumas de verificación - actualízala e inténtalo de nuevo La suma de verificación no coincide Lineal diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 3ee1279f58..52c09a0152 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -504,7 +504,9 @@ Изтриване на този оригинал? Този оригинал на %1$s е от по-стара версия на %2$s. Оригиналът на текущата версия винаги се запазва. В Nightlies · %1$d - Обновете, за да видите пакетите в Nightlies. + Стабилна + Нощна + Обновете, за да видите пакетите в Nightlies и DroidDeck. Нищо ново от последната проверка. Импортиране на .wcp Възстановяване на оригинала на този Proton @@ -1780,7 +1782,8 @@ Оригиналът на инсталираната версия е запазен: той е пътят назад. Не е запазен Изтрит е оригиналът %1$s на %2$s. - Изтеглянията идват само от версиите Nightlies + Изтеглянията идват само от версиите на Nightlies и DroidDeck + Изтеглянето не бе успешно: тази нощна версия може да е заменена с по-нова. Обновете списъка и опитайте отново. Този списък с пакети е отпреди въвеждането на контролни суми - обнови го и опитай отново Несъответствие в контролната сума diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 299ace9eb8..9df47991c7 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -508,7 +508,9 @@ Smazat tento originál? Tento originál %1$s je z dřívějšího sestavení %2$s. Originál aktuálního sestavení je vždy zachován. Na Nightlies · %1$d - Obnovte pro zobrazení balíčků na Nightlies. + Stabilní + Noční + Obnovte pro zobrazení balíčků na Nightlies a DroidDeck. Od poslední kontroly nic nového. Importovat .wcp Obnovit originál tohoto Protonu @@ -1822,7 +1824,8 @@ Původní verze nainstalovaného sestavení je zachována: je to cesta zpět. Není uloženo Odstraněna původní verze %2$s z %1$s. - Stahování pochází jen z vydání Nightlies + Stahování pochází jen z vydání Nightlies a DroidDeck + Stažení selhalo: tento noční build mohl být nahrazen novějším. Obnovte seznam a zkuste to znovu. Tento seznam balíčků předchází kontrolním součtům - obnovte ho a zkuste to znovu Neshoda kontrolního součtu diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 2a0f5c69cf..6b200711de 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -504,7 +504,9 @@ Slet denne original? Denne original af %1$s er fra en tidligere build af %2$s. Den aktuelle builds original bevares altid. På Nightlies · %1$d - Opdater for at se pakker på Nightlies. + Stabil + Nightly + Opdater for at se pakker på Nightlies og DroidDeck. Intet nyt siden sidste kontrol. Importer .wcp Gendan denne Protons original @@ -1780,7 +1782,8 @@ Originalen af den installerede version beholdes: den er vejen tilbage. Ikke gemt Slettede %1$s-originalen af %2$s. - Downloads kommer kun fra Nightlies-udgivelserne + Downloads kommer kun fra Nightlies- og DroidDeck-udgivelserne + Download mislykkedes: denne nightly kan være erstattet af en nyere build. Opdater listen, og prøv igen. Denne pakkeliste er ældre end tjeksummer - opdater den, og forsøg igen Tjeksum stemmer ikke diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 5080c14fb5..d284aa1275 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -501,7 +501,9 @@ Dieses Original löschen? Dieses %1$s-Original stammt aus einem früheren Build von %2$s. Das Original des aktuellen Builds wird immer behalten. In den Nightlies · %1$d - Aktualisiere, um die Pakete in den Nightlies aufzulisten. + Stabil + Nightly + Aktualisiere, um die Pakete in den Nightlies und bei DroidDeck aufzulisten. Nichts Neues seit der letzten Prüfung. .wcp importieren Original dieses Protons wiederherstellen @@ -1769,7 +1771,8 @@ Das Original des installierten Builds bleibt erhalten: Es ist der Weg zurück. Nicht gespeichert Das %1$s-Original von %2$s wurde gelöscht. - Downloads kommen nur aus den Nightlies-Releases + Downloads kommen nur aus den Nightlies- und DroidDeck-Releases + Download fehlgeschlagen: Dieser Nightly-Build wurde vielleicht durch einen neueren ersetzt. Aktualisiere die Liste und versuche es erneut. Diese Paketliste stammt aus der Zeit vor Prüfsummen - aktualisiere sie und versuche es erneut Prüfsumme stimmt nicht überein diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 95c6e4d18e..409cda9ecf 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -504,7 +504,9 @@ Διαγραφή αυτού του πρωτοτύπου; Αυτό το πρωτότυπο %1$s είναι από προηγούμενο build του %2$s. Το πρωτότυπο του τρέχοντος build διατηρείται πάντα. Στα Nightlies · %1$d - Ανανεώστε για να εμφανιστούν τα πακέτα στα Nightlies. + Σταθερή + Νυχτερινή + Ανανεώστε για να εμφανιστούν τα πακέτα στα Nightlies και στο DroidDeck. Τίποτα νέο από τον τελευταίο έλεγχο. Εισαγωγή .wcp Επαναφορά του πρωτοτύπου αυτού του Proton @@ -1780,7 +1782,8 @@ Το αρχικό της εγκατεστημένης έκδοσης διατηρείται: είναι ο δρόμος της επιστροφής. Δεν είναι αποθηκευμένο Διαγράφηκε το αρχικό %1$s του %2$s. - Οι λήψεις προέρχονται μόνο από τις κυκλοφορίες Nightlies + Οι λήψεις προέρχονται μόνο από τις κυκλοφορίες Nightlies και DroidDeck + Η λήψη απέτυχε: αυτή η νυχτερινή έκδοση ίσως αντικαταστάθηκε από νεότερη. Ανανεώστε τη λίστα και δοκιμάστε ξανά. Αυτή η λίστα πακέτων προηγείται των αθροισμάτων ελέγχου - ανανεώστε την και δοκιμάστε ξανά Αναντιστοιχία αθροίσματος ελέγχου diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 38ef6d78e7..85e1bf0a4b 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -505,7 +505,9 @@ ¿Eliminar este original? Este original de %1$s es de una versión anterior de %2$s. El original de la versión actual siempre se conserva. En las Nightlies · %1$d - Actualiza para listar los paquetes de las Nightlies. + Estable + Nocturna + Actualiza para listar los paquetes de Nightlies y DroidDeck. Nada nuevo desde la última comprobación. Importar .wcp Restaurar el original de este Proton @@ -1800,7 +1802,8 @@ El original de la versión instalada se conserva: es el camino de vuelta. No guardado Se eliminó el original de %1$s de %2$s. - Las descargas solo proceden de las versiones Nightlies + Las descargas solo proceden de las versiones de Nightlies y DroidDeck + Error en la descarga: puede que esta compilación nocturna se haya sustituido por una más reciente. Actualiza la lista y vuelve a intentarlo. Esta lista de paquetes es anterior a las sumas de verificación - actualízala e inténtalo de nuevo La suma de verificación no coincide diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 6b08f3383c..b6757f5e74 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -504,7 +504,9 @@ Poistetaanko tämä alkuperäinen? Tämä %1$s:n alkuperäinen on aiemmasta %2$s-versiosta. Nykyisen version alkuperäinen säilytetään aina. Nightliesissä · %1$d - Päivitä nähdäksesi Nightliesin paketit. + Vakaa + Yöversio + Päivitä nähdäksesi Nightliesin ja DroidDeckin paketit. Ei mitään uutta viimeisimmän tarkistuksen jälkeen. Tuo .wcp Palauta tämän Protonin alkuperäinen @@ -1780,7 +1782,8 @@ Asennetun version alkuperäinen säilytetään: se on tie takaisin. Ei tallennettu Poistettu %2$s:n %1$s-alkuperäinen. - Lataukset tulevat vain Nightlies-julkaisuista + Lataukset tulevat vain Nightlies- ja DroidDeck-julkaisuista + Lataus epäonnistui: tämä yöversio on ehkä korvattu uudemmalla. Päivitä luettelo ja yritä uudelleen. Tämä pakettiluettelo on tarkistussummia vanhempi - päivitä se ja yritä uudelleen Tarkistussumma ei täsmää diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 211537ce2f..af743337c4 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -505,7 +505,9 @@ Supprimer cette version originale ? Cette version originale de %1$s provient d\'une version antérieure de %2$s. La version originale de la version actuelle sera toujours conservée. Dans Nightlies · %1$d - Actualiser pour lister les paquets dans Nightlies. + Stable + Nightly + Actualiser pour lister les paquets dans Nightlies et DroidDeck. Aucun nouvel élément depuis la dernière vérification. Importer .wcp Restaurer les fichiers originaux de ce Proton @@ -1800,7 +1802,8 @@ L\'original de la version installée est conservé : c\'est le moyen d\'y revenir. Non enregistré Original %1$s de %2$s supprimé. - Les téléchargements proviennent uniquement des versions Nightlies + Les téléchargements proviennent uniquement des versions Nightlies et DroidDeck + Échec du téléchargement : cette version nightly a peut-être été remplacée par une plus récente. Actualisez la liste et réessayez. Cette liste de paquets est antérieure aux sommes de contrôle - actualisez-la et réessayez Somme de contrôle incorrecte diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 0b9dfa1fa9..38eac11933 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -504,7 +504,9 @@ यह ओरिजिनल हटाएं? यह %1$s ओरिजिनल %2$s के पहले वाले बिल्ड से है। मौजूदा बिल्ड का ओरिजिनल हमेशा रखा जाता है। Nightlies पर · %1$d - Nightlies के पैकेज सूचीबद्ध करने के लिए रीफ़्रेश करें। + स्थिर + नाइटली + Nightlies और DroidDeck के पैकेज सूचीबद्ध करने के लिए रीफ़्रेश करें। पिछली जांच के बाद कुछ नया नहीं है। .wcp इंपोर्ट करें इस Proton का ओरिजिनल वापस लाएं @@ -1780,7 +1782,8 @@ इंस्टॉल किए बिल्ड का ओरिजिनल रखा गया है: यह वापस जाने का रास्ता है। सेव नहीं है %2$s का %1$s ओरिजिनल हटाया गया। - डाउनलोड सिर्फ़ Nightlies रिलीज़ से आते हैं + डाउनलोड सिर्फ़ Nightlies और DroidDeck रिलीज़ से आते हैं + डाउनलोड विफल: हो सकता है यह नाइटली बिल्ड किसी नए बिल्ड से बदल दिया गया हो। सूची रीफ़्रेश करें और फिर से कोशिश करें। यह पैकेज लिस्ट चेकसम से पुरानी है - इसे रीफ़्रेश करें और फिर कोशिश करें चेकसम मेल नहीं खाया diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 304ca0fe5a..a307b5aedd 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -504,7 +504,9 @@ Törli ezt az eredetit? Ez a %1$s eredeti a %2$s egy korábbi buildjéből származik. Az aktuális build eredetije mindig megmarad. A Nightliesen · %1$d - Frissítsen a Nightliesen lévő csomagok listázásához. + Stabil + Nightly + Frissítsen a Nightlies és a DroidDeck csomagjainak listázásához. Nincs semmi új az utolsó ellenőrzés óta. .wcp importálása Ennek a Protonnak az eredetijének visszaállítása @@ -1780,7 +1782,8 @@ A telepített build eredetije megmarad: ez a visszaút. Nincs tárolva A %2$s %1$s eredetije törölve. - A letöltések csak a Nightlies kiadásokból érkeznek + A letöltések csak a Nightlies és a DroidDeck kiadásokból érkeznek + A letöltés sikertelen: lehet, hogy ezt a nightly buildet egy újabb váltotta. Frissítse a listát, és próbálja újra. Ez a csomaglista régebbi, mint az ellenőrzőösszegek – frissítse, és próbálja újra Az ellenőrzőösszeg nem egyezik diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 3bdeed1996..f1cbe95432 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -502,7 +502,9 @@ Hapus yang asli ini? %1$s asli ini berasal dari build %2$s yang lebih lama. Asli build saat ini selalu dipertahankan. Di Nightlies · %1$d - Segarkan untuk melihat daftar paket di Nightlies. + Stabil + Nightly + Segarkan untuk melihat daftar paket di Nightlies dan DroidDeck. Tidak ada yang baru sejak pemeriksaan terakhir. Impor .wcp Pulihkan yang asli dari Proton ini @@ -1759,7 +1761,8 @@ Yang asli dari build terinstal disimpan: itulah cara untuk kembali. Tidak tersimpan Menghapus yang asli %1$s dari %2$s. - Unduhan hanya berasal dari rilis Nightlies + Unduhan hanya berasal dari rilis Nightlies dan DroidDeck + Unduhan gagal: build nightly ini mungkin sudah diganti dengan yang lebih baru. Segarkan daftar lalu coba lagi. Daftar paket ini dibuat sebelum adanya checksum - segarkan dan coba lagi Checksum tidak cocok diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 23b604740c..9493ae1b15 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -503,7 +503,9 @@ Eliminare questo originale? Questo originale di %1$s proviene da una build precedente di %2$s. L\'originale della build attuale viene sempre conservato. Nelle Nightlies · %1$d - Aggiorna per elencare i pacchetti nelle Nightlies. + Stabile + Nightly + Aggiorna per elencare i pacchetti nelle Nightlies e in DroidDeck. Niente di nuovo dall\'ultimo controllo. Importa .wcp Ripristina l\'originale di questo Proton @@ -1790,7 +1792,8 @@ L\'originale della build installata viene conservato: serve per tornare indietro. Non salvato Originale %1$s di %2$s eliminato. - I download provengono solo dalle release Nightly + I download provengono solo dalle release Nightly e DroidDeck + Download non riuscito: questa build nightly potrebbe essere stata sostituita da una più recente. Aggiorna l’elenco e riprova. Questo elenco di pacchetti è anteriore ai checksum - aggiornalo e riprova Checksum non corrispondente diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index afd7f1f827..143351f826 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -504,7 +504,9 @@ この元のバージョンを削除しますか? この%1$sの元のバージョンは、%2$sの以前のビルドのものです。現在のビルドの元のバージョンは常に保持されます。 Nightlies内 · %1$d - 更新してNightliesのパッケージを一覧表示します。 + 安定版 + ナイトリー + 更新してNightliesとDroidDeckのパッケージを一覧表示します。 前回の確認以降、新しいものはありません。 .wcpをインポート このProtonの元のファイルを復元 @@ -1761,7 +1763,8 @@ インストール済みビルドの元のファイルは、元に戻すために保持されます。 保存されていません %2$sの%1$s版の元のファイルを削除しました。 - ダウンロードはNightliesのリリースからのみ行われます + ダウンロードはNightliesとDroidDeckのリリースからのみ行われます + ダウンロードに失敗しました:このナイトリービルドは新しいビルドに置き換えられた可能性があります。一覧を更新してもう一度お試しください。 このパッケージ一覧はチェックサム導入前のものです。更新してからもう一度お試しください チェックサムが一致しません diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 3c85525dc1..901a84e7da 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -504,7 +504,9 @@ 이 원본 버전을 삭제하시겠습니까? 이 %1$s 원본 버전은 %2$s의 이전 빌드에서 가져온 것입니다. 현재 빌드의 원본 버전은 항상 유지됩니다. Nightlies 내 · %1$d - 새로 고쳐 Nightlies의 패키지를 나열합니다. + 안정판 + 나이틀리 + 새로 고쳐 Nightlies 및 DroidDeck의 패키지를 나열합니다. 마지막 확인 이후 새로운 내용이 없습니다. .wcp 가져오기 이 Proton의 원본 파일 복원 @@ -1761,7 +1763,8 @@ 설치된 빌드의 원본은 되돌리기 위해 유지됩니다. 저장되지 않음 %2$s의 %1$s 원본을 삭제했습니다. - Nightlies 릴리스에서만 다운로드할 수 있습니다 + Nightlies 및 DroidDeck 릴리스에서만 다운로드할 수 있습니다 + 다운로드 실패: 이 나이틀리 빌드가 더 새로운 빌드로 교체되었을 수 있습니다. 목록을 새로 고친 후 다시 시도하세요. 이 패키지 목록은 체크섬 도입 이전의 것입니다. 새로 고친 후 다시 시도하세요 체크섬 불일치 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 4688122723..6c5acab203 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -502,7 +502,9 @@ Padam yang asal ini? %1$s asal ini daripada binaan terdahulu %2$s. Yang asal bagi binaan semasa sentiasa dikekalkan. Pada Nightlies · %1$d - Segarkan semula untuk menyenaraikan pakej pada Nightlies. + Stabil + Nightly + Segarkan semula untuk menyenaraikan pakej pada Nightlies dan DroidDeck. Tiada apa-apa yang baharu sejak semakan terakhir. Import .wcp Pulihkan yang asal bagi Proton ini @@ -1759,7 +1761,8 @@ Asal binaan yang dipasang dikekalkan: itulah jalan kembali. Tidak disimpan Asal %1$s bagi %2$s telah dipadam. - Muat turun hanya datang daripada keluaran Nightlies + Muat turun hanya datang daripada keluaran Nightlies dan DroidDeck + Muat turun gagal: binaan nightly ini mungkin telah diganti dengan yang lebih baharu. Segarkan semula senarai dan cuba lagi. Senarai pakej ini mendahului checksum - segarkan dan cuba lagi Checksum tidak sepadan diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index c62d7970a5..6bbab58190 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -504,7 +504,9 @@ Slette denne originalen? Denne %1$s-originalen er fra en tidligere build av %2$s. Den gjeldende buildens original beholdes alltid. På Nightlies · %1$d - Oppdater for å liste pakker på Nightlies. + Stabil + Nightly + Oppdater for å liste pakker på Nightlies og DroidDeck. Ingenting nytt siden siste sjekk. Importer .wcp Gjenopprett denne Protonens original @@ -1780,7 +1782,8 @@ Originalen til den installerte builden beholdes: det er veien tilbake. Ikke lagret Slettet %1$s-originalen av %2$s. - Nedlastinger kommer bare fra Nightlies-utgivelsene + Nedlastinger kommer bare fra Nightlies- og DroidDeck-utgivelsene + Nedlastingen mislyktes: denne nightly-versjonen kan være erstattet av en nyere. Oppdater listen og prøv igjen. Denne pakkelisten er eldre enn sjekksummene – oppdater den og prøv igjen Sjekksummen stemmer ikke diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index c84dfc0168..12400b3e86 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -504,7 +504,9 @@ Dit origineel verwijderen? Dit origineel van %1$s komt uit een eerdere build van %2$s. Het origineel van de huidige build wordt altijd bewaard. In de Nightlies · %1$d - Vernieuw om de pakketten in de Nightlies te tonen. + Stabiel + Nightly + Vernieuw om de pakketten in de Nightlies en bij DroidDeck te tonen. Niets nieuws sinds de laatste controle. .wcp importeren Origineel van deze Proton herstellen @@ -1780,7 +1782,8 @@ Het origineel van de geïnstalleerde build wordt bewaard: dat is de weg terug. Niet opgeslagen Het %1$s-origineel van %2$s is verwijderd. - Downloads komen alleen van de Nightlies-releases + Downloads komen alleen van de Nightlies- en DroidDeck-releases + Download mislukt: deze nightly is mogelijk vervangen door een nieuwere build. Vernieuw de lijst en probeer het opnieuw. Deze pakketlijst is ouder dan de checksums - vernieuw de lijst en probeer het opnieuw Checksum komt niet overeen diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 9be1c1d18b..d80cd8cec9 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -508,7 +508,9 @@ Usunąć ten oryginał? Ten oryginał %1$s pochodzi z wcześniejszej wersji %2$s. Oryginał bieżącej wersji jest zawsze zachowywany. W wersjach nightly · %1$d - Odśwież, aby wyświetlić pakiety w wersjach nightly. + Stabilna + Nightly + Odśwież, aby wyświetlić pakiety w Nightlies i DroidDeck. Nic nowego od ostatniego sprawdzenia. Importuj .wcp Przywróć oryginał tego Proton @@ -1822,7 +1824,8 @@ Oryginał zainstalowanej wersji zostaje zachowany: to droga powrotu. Nie przechowywano Usunięto oryginał %2$s z %1$s. - Pobieranie odbywa się tylko z wydań Nightlies + Pobieranie odbywa się tylko z wydań Nightlies i DroidDeck + Pobieranie nie powiodło się: ta wersja nightly mogła zostać zastąpiona nowszą. Odśwież listę i spróbuj ponownie. Ta lista pakietów jest starsza niż sumy kontrolne – odśwież ją i spróbuj ponownie Niezgodna suma kontrolna diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 0aad541cfe..fed2cf78ec 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -503,7 +503,9 @@ Eliminar este original? Este original de %1$s é de uma versão anterior de %2$s. O original da versão atual é sempre mantido. Nas Nightlies · %1$d - Atualize para listar os pacotes nas Nightlies. + Estável + Nightly + Atualize para listar os pacotes nas Nightlies e no DroidDeck. Nada de novo desde a última verificação. Importar .wcp Restaurar o original deste Proton @@ -1790,7 +1792,8 @@ O original da versão instalada é mantido: é o caminho de volta. Não guardado Original de %1$s de %2$s eliminado. - As transferências vêm apenas das versões Nightlies + As transferências vêm apenas das versões Nightlies e DroidDeck + A transferência falhou: esta versão nightly pode ter sido substituída por uma mais recente. Atualize a lista e tente novamente. Esta lista de pacotes é anterior às somas de verificação - atualize-a e tente novamente A soma de verificação não corresponde diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 4c78fb90c5..37559d301f 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -503,7 +503,9 @@ Excluir este original? Este %1$s original é de uma versão anterior de %2$s. O original da versão atual é sempre mantido. Nas Nightlies · %1$d - Atualize para listar os pacotes nas Nightlies. + Estável + Nightly + Atualize para listar os pacotes nas Nightlies e no DroidDeck. Nada novo desde a última verificação. Importar .wcp Restaurar o original deste Proton @@ -1790,7 +1792,8 @@ O original da versão instalada é mantido: é o caminho de volta. Não armazenado Original do %1$s de %2$s excluído. - Os downloads vêm só das versões Nightlies + Os downloads vêm só das versões Nightlies e DroidDeck + Falha no download: esta versão nightly pode ter sido substituída por uma mais nova. Atualize a lista e tente de novo. Esta lista de pacotes é anterior às somas de verificação - atualize-a e tente de novo A soma de verificação não confere diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 0dc1ba4094..5ddf3f0a59 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -506,7 +506,9 @@ Ștergi acest original? Acest original %1$s este dintr-o versiune anterioară a %2$s. Originalul versiunii curente este păstrat mereu. Pe versiunile nightly · %1$d - Reîmprospătează pentru a lista pachetele de pe versiunile nightly. + Stabilă + Nightly + Reîmprospătează pentru a lista pachetele din Nightlies și DroidDeck. Nimic nou de la ultima verificare. Importă .wcp Restaurează originalul acestui Proton @@ -1801,7 +1803,8 @@ Originalul versiunii instalate este păstrat: este calea de revenire. Nesalvat S-a șters originalul %1$s al %2$s. - Descărcările vin doar din versiunile Nightlies + Descărcările vin doar din versiunile Nightlies și DroidDeck + Descărcarea a eșuat: această versiune nightly poate fi fost înlocuită cu una mai nouă. Reîmprospătează lista și încearcă din nou. Această listă de pachete e anterioară sumelor de control - reîmprospătează-o și încearcă din nou Sumă de control incorectă diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index cd89b50274..83295afb97 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -507,7 +507,9 @@ Удалить оригинальную версию? Эта оригинальная версия %1$s из более ранней сборки %2$s. Оригинальная версия текущей сборки всегда сохраняется. В Nightlies · %1$d - Обновите, чтобы увидеть пакеты в Nightlies. + Стабильная + Ночная + Обновите, чтобы увидеть пакеты в Nightlies и DroidDeck. С момента последней проверки нового нет. Импорт .wcp Восстановить оригинальные файлы этого Proton @@ -1821,7 +1823,8 @@ Оригинал установленной сборки сохраняется: через него можно вернуться. Не сохранено Удален оригинал %2$s из сборки %1$s. - Загрузки доступны только из выпусков Nightlies + Загрузки доступны только из выпусков Nightlies и DroidDeck + Не удалось загрузить: возможно, эта ночная сборка заменена более новой. Обновите список и повторите попытку. Этот список пакетов создан до появления контрольных сумм — обновите его и повторите попытку Контрольная сумма не совпадает diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index e947e68049..3bab33523f 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -504,7 +504,9 @@ Ta bort det här originalet? Det här originalet av %1$s är från ett tidigare bygge av %2$s. Originalet från det aktuella bygget behålls alltid. I nattbyggena · %1$d - Uppdatera för att lista paket i nattbyggena. + Stabil + Nattbygge + Uppdatera för att lista paket i Nightlies och DroidDeck. Inget nytt sedan senaste kontrollen. Importera .wcp Återställ den här Protonens original @@ -1780,7 +1782,8 @@ Den installerade versionens original behålls: det är vägen tillbaka. Inte sparad Tog bort %1$s-originalet av %2$s. - Nedladdningar kommer bara från Nightlies-utgåvorna + Nedladdningar kommer bara från Nightlies- och DroidDeck-utgåvorna + Nedladdningen misslyckades: det här nattbygget kan ha ersatts av ett nyare. Uppdatera listan och försök igen. Den här paketlistan är från innan kontrollsummor fanns - uppdatera den och försök igen Kontrollsumman stämmer inte diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index e20aab526b..6210877843 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -502,7 +502,9 @@ ลบต้นฉบับนี้? ต้นฉบับ %1$s นี้มาจากบิลด์ก่อนหน้าของ %2$s ต้นฉบับของบิลด์ปัจจุบันจะถูกเก็บไว้เสมอ ใน Nightlies · %1$d - รีเฟรชเพื่อแสดงรายการแพ็กเกจใน Nightlies + เสถียร + Nightly + รีเฟรชเพื่อแสดงรายการแพ็กเกจใน Nightlies และ DroidDeck ไม่มีอะไรใหม่ตั้งแต่การตรวจสอบครั้งล่าสุด นำเข้า .wcp คืนค่าต้นฉบับของ Proton นี้ @@ -1759,7 +1761,8 @@ ต้นฉบับของบิลด์ที่ติดตั้งไว้ถูกเก็บไว้: นี่คือทางกลับ ไม่ได้บันทึกไว้ ลบต้นฉบับ %1$s ของ %2$s แล้ว - การดาวน์โหลดมาจากรุ่นที่เผยแพร่ใน Nightlies เท่านั้น + การดาวน์โหลดมาจากรุ่นที่เผยแพร่ใน Nightlies และ DroidDeck เท่านั้น + ดาวน์โหลดไม่สำเร็จ: บิลด์ nightly นี้อาจถูกแทนที่ด้วยบิลด์ที่ใหม่กว่า รีเฟรชรายการแล้วลองอีกครั้ง รายการแพ็กเกจนี้เก่ากว่าระบบค่าตรวจสอบ - รีเฟรชแล้วลองใหม่ ค่าตรวจสอบไม่ตรงกัน diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index c7d42b41d8..a0e60d8c6e 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -501,7 +501,9 @@ Bu orijinal silinsin mi? Bu %1$s orijinali, %2$s sürümünün önceki bir derlemesine ait. Geçerli derlemenin orijinali her zaman saklanır. Nightlies içinde · %1$d - Nightlies paketlerini listelemek için yenileyin. + Kararlı + Nightly + Nightlies ve DroidDeck paketlerini listelemek için yenileyin. Son kontrolden beri yeni bir şey yok. .wcp içe aktar Bu Proton\'un orijinalini geri yükle @@ -1769,7 +1771,8 @@ Yüklü derlemenin orijinali saklanır: geri dönüş yolu budur. Saklanmıyor %2$s\'nin %1$s orijinali silindi. - İndirmeler yalnızca Nightlies yayınlarından gelir + İndirmeler yalnızca Nightlies ve DroidDeck yayınlarından gelir + İndirme başarısız: bu nightly derleme daha yenisiyle değiştirilmiş olabilir. Listeyi yenileyip tekrar deneyin. Bu paket listesi sağlama toplamlarından önceki bir tarihe ait - yenileyip yeniden deneyin Sağlama toplamı uyuşmuyor diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 718d3d2a03..5bc3cd8f11 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -508,7 +508,9 @@ Видалити цей оригінал? Цей оригінал %1$s походить із попередньої збірки %2$s. Оригінал поточної збірки зберігається завжди. У нічних збірках · %1$d - Оновіть, щоб побачити пакети з нічних збірок. + Стабільна + Нічна + Оновіть, щоб побачити пакети з Nightlies і DroidDeck. Нічого нового з часу останньої перевірки. Імпортувати .wcp Відновити оригінал цього Proton @@ -1822,7 +1824,8 @@ Оригінал встановленої збірки збережено: це шлях назад. Не збережено Видалено оригінал %2$s зі збірки %1$s. - Завантаження надходять лише з випусків Nightlies + Завантаження надходять лише з випусків Nightlies і DroidDeck + Не вдалося завантажити: можливо, цю нічну збірку замінено новішою. Оновіть список і спробуйте ще раз. Цей список пакетів створено до появи контрольних сум - оновіть його і спробуйте ще раз Контрольна сума не збіглася diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 9c149b54f9..874e91cd7b 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -502,7 +502,9 @@ Xóa bản gốc này? Bản gốc %1$s này là từ một build trước của %2$s. Bản gốc của build hiện tại luôn được giữ lại. Trên Nightlies · %1$d - Làm mới để liệt kê các gói trên Nightlies. + Ổn định + Nightly + Làm mới để liệt kê các gói trên Nightlies và DroidDeck. Không có gì mới từ lần kiểm tra trước. Nhập tệp .wcp Khôi phục bản gốc của Proton này @@ -1759,7 +1761,8 @@ Bản gốc của build đã cài được giữ lại: đó là đường quay về. Chưa được lưu Đã xóa bản gốc %1$s của %2$s. - Lượt tải chỉ đến từ các bản phát hành Nightlies + Lượt tải chỉ đến từ các bản phát hành Nightlies và DroidDeck + Tải xuống thất bại: bản nightly này có thể đã được thay bằng bản mới hơn. Hãy làm mới danh sách và thử lại. Danh sách gói này có trước checksum - hãy làm mới và thử lại Checksum không khớp diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 499c2a09aa..960fdd825b 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -504,7 +504,9 @@ 删除此原件? 此 %1$s 原件来自 %2$s 的较早构建。当前构建的原件始终保留。 在 Nightlies 上 · %1$d - 刷新以列出 Nightlies 上的软件包。 + 稳定版 + 每夜版 + 刷新以列出 Nightlies 和 DroidDeck 上的软件包。 自上次检查以来没有新内容。 导入 .wcp 还原此 Proton 的原件 @@ -1837,7 +1839,8 @@ 已安装构建的原件会保留:它是还原的途径。 未存储 已删除 %2$s 的 %1$s 原件。 - 只能从 Nightlies 发布版本下载 + 只能从 Nightlies 和 DroidDeck 发布版本下载 + 下载失败:此每夜版本可能已被更新的版本替换。请刷新列表后重试。 此软件包列表早于校验和功能 — 请刷新后重试 校验和不匹配 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 85871b20d5..00c99dd55d 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -504,7 +504,9 @@ 刪除此原始版本? 此 %1$s 原始版本來自 %2$s 的較早版本。目前版本的原始版本一定會保留。 Nightlies · %1$d - 重新整理以列出 Nightlies 中的軟件包。 + 穩定版 + 每夜版 + 重新整理以列出 Nightlies 及 DroidDeck 中的軟件包。 自上次檢查以來沒有新內容。 匯入 .wcp 還原此 Proton 的原始版本 @@ -1761,7 +1763,8 @@ 已安裝版本的原始版本會保留,以便還原。 未儲存 已刪除 %2$s 的 %1$s 原始版本。 - 只會從 Nightlies 發佈版本下載 + 只會從 Nightlies 及 DroidDeck 發佈版本下載 + 下載失敗:此每夜版本可能已被較新的版本取代。請重新整理清單後再試。 此軟件包清單早於校驗和推出 - 請重新整理後再試一次 校驗和不符 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index f34d4884a4..941437a04d 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -504,7 +504,9 @@ 刪除這個原始版本? 這個 %1$s 原始版本來自 %2$s 的較早組建。目前組建的原始版本一律會保留。 Nightlies 中 · %1$d - 重新整理以列出 Nightlies 中的套件。 + 穩定版 + 每夜版 + 重新整理以列出 Nightlies 和 DroidDeck 中的套件。 自上次檢查以來沒有新內容。 匯入 .wcp 還原此 Proton 的原始檔案 @@ -1761,7 +1763,8 @@ 已安裝組建的原始版本會保留,以便還原。 未儲存 已刪除 %2$s 來自 %1$s 的原始版本。 - 只會從 Nightlies 發行版本下載 + 只會從 Nightlies 和 DroidDeck 發行版本下載 + 下載失敗:此每夜版本可能已被較新的版本取代。請重新整理清單後再試一次。 此套件清單早於校驗碼機制 - 請重新整理後再試一次 校驗碼不符 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 40813361f0..f9bce69777 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -517,7 +517,9 @@ Delete this original? This %1$s original is from an earlier build of %2$s. The current build\'s original is always kept. On the Nightlies · %1$d - Refresh to list packages on the Nightlies. + Stable + Nightly + Refresh to list packages on the Nightlies and DroidDeck releases. Nothing new since the last check. Import .wcp Restore this Proton\'s original @@ -1846,7 +1848,8 @@ The installed build\'s original is kept: it is the way back. Not stored Deleted the %1$s original of %2$s. - Downloads come only from the Nightlies releases + Downloads come only from the Nightlies and DroidDeck releases + Download failed: this nightly may have been replaced by a newer build. Refresh the list and try again. This package list predates checksums - refresh it and try again Checksum mismatch diff --git a/app/src/test/java/com/droiddeck/launcher/session/ComponentsNightlyCatalogTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ComponentsNightlyCatalogTest.kt new file mode 100644 index 0000000000..8fbb0bacd5 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/ComponentsNightlyCatalogTest.kt @@ -0,0 +1,73 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test + +class ComponentsNightlyCatalogTest { + @Test + fun nightlyFilesGoToTheirComponentList() { + val n = ComponentsManager.DD_NIGHTLY + assertEquals("dxvk", ComponentsManager.assetComp(n, "DD-dxvk-3.1.1+153-nightly.wcp")) + assertEquals("dxvk", ComponentsManager.assetComp(n, "DD-dxvk-arm64ec-3.1.1+153-nightly.wcp")) + assertEquals("dxvk", ComponentsManager.assetComp(n, "DD-dxvk-gplasync-3.1.1+153-nightly.wcp")) + assertEquals("vkd3d", ComponentsManager.assetComp(n, "DD-vkd3d-proton-arm64ec-3.0.1+455-nightly.wcp")) + assertEquals("fex", ComponentsManager.assetComp(n, "DD-FEXCore-2610+58-nightly.wcp")) + assertNull(ComponentsManager.assetComp(n, "state.json")) + assertNull(ComponentsManager.assetComp(n, "something-else.wcp")) + assertEquals("dxvk", ComponentsManager.assetComp("Dxvk-gplasync-Linux", "dxvk-gplasync-3.1.1-1-linux.wcp")) + assertNull(ComponentsManager.assetComp("Unknown-Release", "dxvk-3.1.1-linux.wcp")) + } + + @Test + fun nightliesListBelowTheStablePackages() { + fun item(file: String, release: String) = ComponentsManager.CatalogItem(file, "dxvk", release, "", 0, "") + val sorted = listOf( + item("DD-dxvk-3.1.1+153-nightly.wcp", ComponentsManager.DD_NIGHTLY), + item("dxvk-2.7.1-linux.wcp", "Dxvk-Linux"), + item("dxvk-3.1.1-linux.wcp", "Dxvk-Linux"), + ).sortedWith(ComponentsManager.CATALOG_ORDER).map { it.file } + assertEquals(listOf("dxvk-3.1.1-linux.wcp", "dxvk-2.7.1-linux.wcp", "DD-dxvk-3.1.1+153-nightly.wcp"), sorted) + } + + @Test + fun nightliesPairWithTheStableOfTheSameFlavorAndVersion() { + val n = ComponentsManager.DD_NIGHTLY + fun item(file: String, comp: String, release: String) = ComponentsManager.CatalogItem(file, comp, release, "", 0, "") + val dxvk = item("dxvk-3.1.1-linux.wcp", "dxvk", "Dxvk-Linux") + val ec = item("dxvk-arm64ec-3.1.1-linux.wcp", "dxvk", "Dxvk-arm64ec-Linux") + val gpl = item("dxvk-gplasync-3.1.1-1-linux.wcp", "dxvk", "Dxvk-gplasync-Linux") + val fex = item("FEXCore-2610-linux.wcp", "fex", "FexCore-Linux") + val vk = item("vkd3d-proton-3.0.1-linux.wcp", "vkd3d", "Vkd3d-proton-Linux") + val others = listOf( + item("dxvk-low-latency-3.1.1-2-linux.wcp", "dxvk", "Dxvk-Linux"), + item("dxvk-3.1-linux.wcp", "dxvk", "Dxvk-Linux"), + item("dxvk-gplasync-3.1-1-linux.wcp", "dxvk", "Dxvk-gplasync-Linux"), + item("FEXCore-2610-d2rfix28-linux.wcp", "fex", "FexCore-Linux"), + ) + val nDxvk = item("DD-dxvk-3.1.1+153-nightly.wcp", "dxvk", n) + val nEc = item("DD-dxvk-arm64ec-3.1.1+153-nightly.wcp", "dxvk", n) + val nGpl = item("DD-dxvk-gplasync-3.1.1+153-nightly.wcp", "dxvk", n) + val nFex = item("DD-FEXCore-2610+58-nightly.wcp", "fex", n) + val nVk = item("DD-vkd3d-proton-3.0.1+455-nightly.wcp", "vkd3d", n) + val nVkEc = item("DD-vkd3d-proton-arm64ec-3.0.1+455-nightly.wcp", "vkd3d", n) + val pairs = ComponentsManager.nightlyPairs(listOf(dxvk, ec, gpl, fex, vk) + others + listOf(nDxvk, nEc, nGpl, nFex, nVk, nVkEc)) + assertEquals(mapOf(dxvk to nDxvk, ec to nEc, gpl to nGpl, fex to nFex, vk to nVk), pairs) + // Two nightlies for one stable build: the newer one wins. + val nDxvkNewer = item("DD-dxvk-3.1.1+154-nightly.wcp", "dxvk", n) + assertEquals(mapOf(dxvk to nDxvkNewer), ComponentsManager.nightlyPairs(listOf(dxvk, nDxvkNewer, nDxvk))) + assertEquals(mapOf(dxvk to nDxvkNewer), ComponentsManager.nightlyPairs(listOf(dxvk, nDxvk, nDxvkNewer))) + // A nightly of a version with no stable build pairs with nothing. + assertEquals(emptyMap(), ComponentsManager.nightlyPairs(listOf(item("dxvk-3.1-linux.wcp", "dxvk", "Dxvk-Linux"), nDxvk))) + } + + @Test + fun downloadsOnlyFromTheTwoRepositories() { + assertTrue(ComponentsManager.allowedDownload("https://github.com/The412Banner/Nightlies/releases/download/Dxvk-Linux/dxvk-3.1.1-linux.wcp")) + assertTrue(ComponentsManager.allowedDownload("https://github.com/Droid-Deck/DroidDeck-Components/releases/download/linux-nightly/DD-FEXCore-2610+58-nightly.wcp")) + assertFalse(ComponentsManager.allowedDownload("https://github.com/someone/else/releases/download/x/y.wcp")) + assertFalse(ComponentsManager.allowedDownload("https://github.com/Droid-Deck/DroidDeck-Components-evil/releases/download/x/y.wcp")) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/ComponentDownloadsDrawerTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/ComponentDownloadsDrawerTest.kt index 8da1e7fa3b..4d3f1852a5 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/ComponentDownloadsDrawerTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/ComponentDownloadsDrawerTest.kt @@ -4,11 +4,20 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.ui.Modifier +import androidx.compose.ui.input.InputMode +import androidx.compose.ui.input.InputModeManager +import androidx.compose.ui.input.key.Key +import androidx.compose.ui.platform.LocalInputModeManager import androidx.compose.ui.platform.testTag +import androidx.compose.ui.test.assertIsFocused +import androidx.compose.ui.test.ExperimentalTestApi import androidx.compose.ui.test.assertIsNotEnabled import androidx.compose.ui.test.onNodeWithTag import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick +import androidx.compose.ui.test.performKeyInput +import androidx.compose.ui.test.pressKey +import androidx.compose.ui.test.requestFocus import com.droiddeck.launcher.R import com.droiddeck.launcher.session.ComponentsManager import org.junit.Assert.assertEquals @@ -19,10 +28,12 @@ import org.robolectric.RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config +@OptIn(ExperimentalTestApi::class, androidx.compose.ui.ExperimentalComposeUiApi::class) @RunWith(RobolectricTestRunner::class) @Config(sdk = [28]) class ComponentDownloadsDrawerTest { @get:Rule val compose = createRobolectricComposeRule() + private lateinit var inputMode: InputModeManager private val dxvk = item("dxvk-2.4.1-linux.wcp", "dxvk") private val stored = item("dxvk-2.3-linux.wcp", "dxvk") @@ -42,6 +53,40 @@ class ComponentDownloadsDrawerTest { compose.onNodeWithText("45%").assertExists() } + @Test fun pairedNightlyRidesOnTheStableRowBehindTheSwitch() { + val stable = ComponentsManager.CatalogItem("dxvk-3.1.1-linux.wcp", "dxvk", "Dxvk-Linux", "https://github.com/example/s", 100, "sha256:test") + val nightly = ComponentsManager.CatalogItem("DD-dxvk-3.1.1+153-nightly.wcp", "dxvk", ComponentsManager.DD_NIGHTLY, "https://github.com/example/n", 100, "sha256:test") + val requested = mutableListOf() + show(catalog = listOf(stable, nightly), onDownload = requested::add) + compose.onNodeWithTag("cmp-download-dxvk").performClick() + compose.onNodeWithText("dxvk-3.1.1-linux").assertExists() + compose.onNodeWithText("DD-dxvk-3.1.1+153-nightly").assertDoesNotExist() + compose.onNodeWithText(RuntimeEnvironment.getApplication().getString(R.string.comp_channel_nightly)).performClick() + compose.onNodeWithText("dxvk-3.1.1-linux").assertDoesNotExist() + compose.onNodeWithText("DD-dxvk-3.1.1+153-nightly").performClick() + assertEquals(listOf(nightly), requested) + } + + @Test fun controllerPicksNightlyOnItsTabThenDownloadsItFromTheRow() { + val stable = ComponentsManager.CatalogItem("dxvk-3.1.1-linux.wcp", "dxvk", "Dxvk-Linux", "https://github.com/example/s", 100, "sha256:test") + val nightly = ComponentsManager.CatalogItem("DD-dxvk-3.1.1+153-nightly.wcp", "dxvk", ComponentsManager.DD_NIGHTLY, "https://github.com/example/n", 100, "sha256:test") + val requested = mutableListOf() + show(catalog = listOf(stable, nightly), onDownload = requested::add) + compose.onNodeWithTag("cmp-download-dxvk").performClick() + compose.runOnIdle { inputMode.requestInputMode(InputMode.Keyboard) } + compose.onNodeWithText("dxvk-3.1.1-linux").requestFocus().assertIsFocused() + compose.onNodeWithText("dxvk-3.1.1-linux").performKeyInput { pressKey(Key.DirectionRight) } + val nightlyTab = RuntimeEnvironment.getApplication().getString(R.string.comp_channel_nightly) + compose.onNodeWithText(RuntimeEnvironment.getApplication().getString(R.string.comp_channel_stable)).assertIsFocused() + .performKeyInput { pressKey(Key.DirectionRight) } + compose.onNodeWithText(nightlyTab).assertIsFocused().performKeyInput { pressKey(Key.ButtonA) } + compose.onNodeWithText("DD-dxvk-3.1.1+153-nightly").assertExists() + assertEquals(emptyList(), requested) + compose.onNodeWithText(nightlyTab).performKeyInput { pressKey(Key.DirectionLeft); pressKey(Key.DirectionLeft) } + compose.onNodeWithText("DD-dxvk-3.1.1+153-nightly").assertIsFocused().performKeyInput { pressKey(Key.ButtonA) } + assertEquals(listOf(nightly), requested) + } + @Test fun emptyCatalogOffersRefreshAndDisablesVersionChoicesWhileChecking() { var refreshes = 0 show(catalog = emptyList(), checking = false, onRefresh = { refreshes++ }) @@ -64,6 +109,7 @@ class ComponentDownloadsDrawerTest { onDownload: (ComponentsManager.CatalogItem) -> Unit = {}, ) { compose.setContent { + inputMode = LocalInputModeManager.current DroidDeckTheme { Column(Modifier.verticalScroll(rememberScrollState())) { ComponentDownloadsDrawerGroup(