feat(setup): arrange tabs in one list with drag handles, a More line and a shown switch (#2627)

This commit is contained in:
Kurt Himebauch authored and GitHub committed 2026-11-14 15:39:15 -05:00
1 parent aa3a599ec6
commit c847659789
37 files changed
+269 -269

No files matched your search

@@ -108,7 +108,7 @@ private fun HudKeyHints(grabbed: String?, resetFill: Float) {
}
@Composable
private fun KeyHint(key: String, label: String, fill: Float = 0f) {
internal fun KeyHint(key: String, label: String, fill: Float = 0f) {
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(HINT_GAP),
@@ -69,23 +69,18 @@ internal object NavTabs {
return if (more(s).isEmpty()) shown else shown + MORE
}
fun move(context: Context, s: FrontEndState, key: String, step: Int) {
val visible = listed(s)
val at = visible.indexOf(key)
val other = visible.getOrNull(at + step) ?: return
val next = order.toMutableList()
val i = next.indexOf(key)
val j = next.indexOf(other)
next[i] = other
next[j] = key
order = next
SessionPrefs.setNavTabOrder(context, next)
}
fun setPlace(context: Context, key: String, place: TabPlace) {
shelved = if (place == TabPlace.MORE) shelved + key else shelved - key
hidden = if (place == TabPlace.HIDDEN && hideable(key) && key !in FEATURES) hidden + key else hidden - key
SessionPrefs.setNavTabShelved(context, shelved)
fun setHidden(context: Context, key: String, hide: Boolean) {
hidden = if (hide && hideable(key) && key !in FEATURES) hidden + key else hidden - key
SessionPrefs.setNavTabHidden(context, hidden)
}
fun rearrange(context: Context, s: FrontEndState, bar: List<String>, more: List<String>) {
val placed = bar + more
if (placed.toSet() != listed(s).toSet()) return
val next = placed.iterator()
order = order.map { if (it in placed) next.next() else it }
shelved = shelved - placed.toSet() + more
SessionPrefs.setNavTabOrder(context, order)
SessionPrefs.setNavTabShelved(context, shelved)
}
}
@@ -1,8 +1,10 @@
package com.droiddeck.launcher.ui
import androidx.compose.foundation.LocalIndication
import android.view.KeyEvent
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.focusable
import androidx.compose.foundation.gestures.awaitEachGesture
import androidx.compose.foundation.gestures.awaitFirstDown
import androidx.compose.foundation.hoverable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Arrangement
@@ -17,34 +19,57 @@ import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.relocation.BringIntoViewRequester
import androidx.compose.foundation.relocation.bringIntoViewRequester
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.KeyboardArrowDown
import androidx.compose.material.icons.outlined.KeyboardArrowUp
import androidx.compose.material.icons.filled.DragHandle
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.key
import androidx.compose.runtime.mutableFloatStateOf
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberUpdatedState
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.alpha
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.focus.focusProperties
import androidx.compose.ui.focus.onFocusChanged
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.input.InputMode
import androidx.compose.ui.input.key.onPreviewKeyEvent
import androidx.compose.ui.input.pointer.PointerEventPass
import androidx.compose.ui.input.pointer.pointerInput
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.platform.LocalInputModeManager
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.Role
import androidx.compose.ui.semantics.contentDescription
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.compose.ui.zIndex
import com.droiddeck.launcher.R
import com.droiddeck.launcher.agent.AgentTab
import kotlin.math.roundToInt
private const val MORE_LINE = "|more|"
private val TAB_ROW = 52.dp
private val TAB_HANDLE = 44.dp
internal fun tabRows(bar: List<String>, more: List<String>) = bar + MORE_LINE + more
internal fun moveTabRow(rows: List<String>, key: String, step: Int): List<String>? {
val from = rows.indexOf(key)
val to = from + step
if (from < 0 || to !in rows.indices) return null
return rows.toMutableList().apply { add(to, removeAt(from)) }
}
@OptIn(androidx.compose.foundation.ExperimentalFoundationApi::class)
@Composable
@@ -57,86 +82,188 @@ internal fun TabsSettingsGroup(host: MenuHost, s: FrontEndState, a: FrontEndActi
androidx.compose.runtime.withFrameNanos { }
reveal.bringIntoView()
}
val shown = stringResource(R.string.tabs_place_bar)
val more = stringResource(R.string.tabs_place_more)
val hidden = stringResource(R.string.tabs_place_hidden)
val keys = NavTabs.listed(s)
fun pick(key: String, place: TabPlace) {
when (key) {
"stores" -> if ((place != TabPlace.HIDDEN) != s.gameStoresEnabled) a.onGameStoresEnabled(place != TabPlace.HIDDEN)
"soundtracks" -> if ((place != TabPlace.HIDDEN) != s.soundtracksEnabled) a.onSoundtracksEnabled(place != TabPlace.HIDDEN)
"agent" -> if ((place != TabPlace.HIDDEN) != AgentTab.shown) AgentTab.set(ctx, place != TabPlace.HIDDEN)
}
NavTabs.setPlace(ctx, key, place)
val pad = LocalInputModeManager.current.inputMode == InputMode.Keyboard
val state by rememberUpdatedState(s)
val rows = {
val keys = NavTabs.listed(state)
tabRows(keys.filter { it !in NavTabs.shelved }, keys.filter { it in NavTabs.shelved })
}
val commit = { next: List<String> ->
val split = next.indexOf(MORE_LINE)
NavTabs.rearrange(ctx, state, next.subList(0, split), next.subList(split + 1, next.size))
}
fun setShown(key: String, show: Boolean) {
when (key) {
"stores" -> if (show != s.gameStoresEnabled) a.onGameStoresEnabled(show)
"soundtracks" -> if (show != s.soundtracksEnabled) a.onSoundtracksEnabled(show)
"agent" -> if (show != AgentTab.shown) AgentTab.set(ctx, show)
}
NavTabs.setHidden(ctx, key, !show)
}
var dragging by remember { mutableStateOf<String?>(null) }
var dragOffset by remember { mutableFloatStateOf(0f) }
var grabbed by remember { mutableStateOf<String?>(null) }
var before by remember { mutableStateOf<List<String>>(emptyList()) }
var focused by remember { mutableStateOf<String?>(null) }
val rowPx = with(LocalDensity.current) { TAB_ROW.toPx() }
val handlePx = with(LocalDensity.current) { TAB_HANDLE.toPx() }
val list = rows()
Box(Modifier.bringIntoViewRequester(reveal)) {
SettingsGroup(stringResource(R.string.setup_group_tabs)) {
keys.forEachIndexed { index, tab ->
key(tab) {
val options = buildList {
add(TabPlace.BAR to shown)
add(TabPlace.MORE to more)
if (NavTabs.hideable(tab)) add(TabPlace.HIDDEN to hidden)
Column(
Modifier.fillMaxWidth().pointerInput(Unit) {
awaitEachGesture {
val down = awaitFirstDown(requireUnconsumed = false)
val start = (down.position.y / rowPx).toInt()
val key = rows().getOrNull(start)
if (key == null || key == MORE_LINE || down.position.x > handlePx || grabbed != null) return@awaitEachGesture
down.consume()
dragging = key
dragOffset = 0f
while (true) {
val change = awaitPointerEvent(PointerEventPass.Initial).changes.firstOrNull { it.id == down.id } ?: break
change.consume()
if (!change.pressed) break
val travel = change.position.y - down.position.y
val current = rows()
val target = (start + (travel / rowPx).roundToInt()).coerceIn(0, current.lastIndex)
var at = current.indexOf(key)
var next = current
while (target != at) {
next = moveTabRow(next, key, if (target > at) 1 else -1) ?: break
at = next.indexOf(key)
}
if (next !== current) commit(next)
dragOffset = travel - (at - start) * rowPx
}
dragging = null
dragOffset = 0f
}
},
) {
list.forEachIndexed { index, tab ->
key(tab) {
if (tab == MORE_LINE) {
MoreLine()
} else {
val shown = NavTabs.place(s, tab) != TabPlace.HIDDEN
val held = tab == dragging || tab == grabbed
val bring = remember { BringIntoViewRequester() }
LaunchedEffect(index, grabbed) { if (grabbed == tab) bring.bringIntoView() }
TabRow(
tab, shown, NavTabs.hideable(tab), held,
offset = if (tab == dragging) dragOffset else 0f,
hint = if (pad && focused == tab) stringResource(if (grabbed == tab) R.string.hud_hint_drop else R.string.hud_hint_grab) else null,
modifier = Modifier.bringIntoViewRequester(bring)
.onPreviewKeyEvent { event ->
val e = event.nativeKeyEvent
val down = e.action == KeyEvent.ACTION_DOWN
val first = down && e.repeatCount == 0
val mine = grabbed == tab
when (e.keyCode) {
KeyEvent.KEYCODE_BUTTON_Y -> {
if (first) {
if (mine) grabbed = null
else if (grabbed == null) { before = rows(); grabbed = tab }
}
true
}
KeyEvent.KEYCODE_DPAD_UP, KeyEvent.KEYCODE_DPAD_DOWN -> {
if (mine && down) moveTabRow(rows(), tab, if (e.keyCode == KeyEvent.KEYCODE_DPAD_UP) -1 else 1)?.let(commit)
mine
}
KeyEvent.KEYCODE_DPAD_LEFT, KeyEvent.KEYCODE_DPAD_RIGHT -> mine
KeyEvent.KEYCODE_BUTTON_B, KeyEvent.KEYCODE_BACK -> {
if (mine && first) { commit(before); grabbed = null }
mine
}
KeyEvent.KEYCODE_BUTTON_A, KeyEvent.KEYCODE_ENTER, KeyEvent.KEYCODE_SPACE -> {
if (first) {
if (mine) grabbed = null
else if (NavTabs.hideable(tab)) setShown(tab, !shown)
}
true
}
else -> false
}
},
onFocus = { if (it) focused = tab else if (focused == tab) { focused = null; if (grabbed == tab) grabbed = null } },
) { host.open = null; setShown(tab, it) }
}
}
TabRow(
host, tab, NavTabs.place(s, tab), options,
canUp = index > 0, canDown = index < keys.lastIndex,
onMove = { step -> NavTabs.move(ctx, s, tab, step) },
onPick = { pick(tab, it) },
)
}
}
}
}
}
@Composable
private fun MoreLine() {
val colors = MaterialTheme.colorScheme
val pal = LocalPalette.current
Column(Modifier.fillMaxWidth().height(TAB_ROW).testTag("tab-more-line")) {
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(10.dp),
modifier = Modifier.fillMaxWidth().weight(1f).background(colors.surfaceVariant.copy(alpha = 0.35f)).padding(horizontal = 14.dp),
) {
Icon(railLabelIcon(NavTabs.MORE).second, null, tint = colors.onSurfaceVariant, modifier = Modifier.size(18.dp))
Text(
stringResource(R.string.rail_more).uppercase(), fontSize = 12.sp, fontWeight = FontWeight.SemiBold,
letterSpacing = 1.5.sp, color = colors.onSurfaceVariant,
)
Box(Modifier.weight(1f).height(1.dp).background(pal.line2))
}
Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line))
}
}
@Composable
private fun TabRow(
host: MenuHost, tab: String, place: TabPlace, options: List<Pair<TabPlace, String>>,
canUp: Boolean, canDown: Boolean, onMove: (Int) -> Unit, onPick: (TabPlace) -> Unit,
tab: String, shown: Boolean, hideable: Boolean, held: Boolean, offset: Float, hint: String?,
modifier: Modifier, onFocus: (Boolean) -> Unit, onShown: (Boolean) -> Unit,
) {
val colors = MaterialTheme.colorScheme
val pal = LocalPalette.current
val (labelRes, icon) = railLabelIcon(tab)
val label = stringResource(labelRes)
val open = host.open == "tab-$tab"
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(6.dp),
modifier = Modifier.fillMaxWidth()
.background(if (open) pal.signal.copy(alpha = 0.10f) else androidx.compose.ui.graphics.Color.Transparent)
.padding(start = 14.dp, end = 10.dp, top = 6.dp, bottom = 6.dp),
val src = remember { MutableInteractionSource() }
val hot = rememberHot(src)
Column(
modifier.fillMaxWidth().height(TAB_ROW).testTag("tab-row-$tab")
.zIndex(if (held) 1f else 0f)
.graphicsLayer { translationY = offset }
.background(if (held) colors.surfaceVariant else colors.surface)
.glideBorder(hot, Shape12, pal.signal)
.onFocusChanged { onFocus(it.isFocused) }
.hoverable(src)
.focusable(interactionSource = src),
) {
Row(
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier.weight(1f).alpha(if (place == TabPlace.HIDDEN) 0.5f else 1f),
horizontalArrangement = Arrangement.spacedBy(6.dp),
modifier = Modifier.fillMaxWidth().weight(1f).padding(end = 10.dp),
) {
Icon(icon, contentDescription = null, tint = colors.onSurfaceVariant, modifier = Modifier.size(20.dp))
Spacer(Modifier.width(12.dp))
Text(label, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis)
Box(contentAlignment = Alignment.Center, modifier = Modifier.size(width = TAB_HANDLE, height = TAB_ROW).testTag("tab-handle-$tab")) {
Icon(Icons.Filled.DragHandle, null, tint = if (held) pal.signal else colors.onSurfaceVariant, modifier = Modifier.size(20.dp))
}
Row(
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier.weight(1f).alpha(if (shown) 1f else 0.5f),
) {
Icon(icon, contentDescription = null, tint = colors.onSurfaceVariant, modifier = Modifier.size(20.dp))
Spacer(Modifier.width(12.dp))
Text(label, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis)
}
if (hint != null) KeyHint("Y", hint)
ToggleSwitch(
shown, hideable, label,
Modifier.testTag("tab-shown-$tab").focusProperties { canFocus = false },
onChange = onShown,
)
}
MoveButton(Icons.Outlined.KeyboardArrowUp, stringResource(R.string.tabs_move_up, label), canUp, "tab-up-$tab") { onMove(-1) }
MoveButton(Icons.Outlined.KeyboardArrowDown, stringResource(R.string.tabs_move_down, label), canDown, "tab-down-$tab") { onMove(1) }
ChoiceChip(host, "tab-$tab", label, options, place, onPick = onPick)
Box(Modifier.fillMaxWidth().height(1.dp).background(if (held) Color.Transparent else pal.line))
}
Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line))
}
@Composable
private fun MoveButton(icon: ImageVector, description: String, enabled: Boolean, tag: String, onClick: () -> Unit) {
val colors = MaterialTheme.colorScheme
val pal = LocalPalette.current
val src = remember { MutableInteractionSource() }
val hot = rememberHot(src)
Box(
contentAlignment = Alignment.Center,
modifier = Modifier.testTag(tag).size(40.dp).clip(CircleShape)
.background(colors.surfaceVariant)
.glideBorder(hot, CircleShape, pal.signal, pal.line2)
.alpha(if (enabled) 1f else 0.35f)
.hoverable(src)
.clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button) { if (enabled) onClick() }
.controllerConfirm { if (enabled) onClick() }
.semantics { contentDescription = description },
) { Icon(icon, contentDescription = null, tint = if (hot) pal.signal else colors.onBackground, modifier = Modifier.size(20.dp)) }
}
-5
View File
@@ -1486,11 +1486,6 @@
<string name="rail_more">المزيد</string>
<string name="more_edit_tabs">تعديل التبويبات</string>
<string name="setup_group_tabs">التبويبات</string>
<string name="tabs_place_bar">معروض</string>
<string name="tabs_place_more">في المزيد</string>
<string name="tabs_place_hidden">مخفي</string>
<string name="tabs_move_up">نقل %1$s إلى الأعلى</string>
<string name="tabs_move_down">نقل %1$s إلى الأسفل</string>
<string name="rail_percent">%1$d%%</string>
<string name="rail_resume_named">استئناف %1$s</string>
<string name="roms_text">يظهر باسم /root/ROMs في كل جلسة. مساحة التخزين الداخلية متاحة في /root/Storage.</string>
@@ -1532,11 +1532,6 @@
<string name="rail_more">Más</string>
<string name="more_edit_tabs">Editar pestañas</string>
<string name="setup_group_tabs">Pestañas</string>
<string name="tabs_place_bar">Mostrada</string>
<string name="tabs_place_more">En Más</string>
<string name="tabs_place_hidden">Oculta</string>
<string name="tabs_move_up">Mover %1$s hacia arriba</string>
<string name="tabs_move_down">Mover %1$s hacia abajo</string>
<string name="rail_percent">%1$d%%</string>
<string name="rail_resume_named">Reanudar %1$s</string>
<string name="roms_text">Aparece como /root/ROMs en cada sesión. El almacenamiento interno está en /root/Storage.</string>
-5
View File
@@ -1454,11 +1454,6 @@
<string name="rail_more">Още</string>
<string name="more_edit_tabs">Редактирай раздели</string>
<string name="setup_group_tabs">Раздели</string>
<string name="tabs_place_bar">Показан</string>
<string name="tabs_place_more">В „Още“</string>
<string name="tabs_place_hidden">Скрит</string>
<string name="tabs_move_up">Премести %1$s нагоре</string>
<string name="tabs_move_down">Премести %1$s надолу</string>
<string name="rail_percent">%1$d%%</string>
<string name="rail_resume_named">Продължаване на %1$s</string>
<string name="roms_text">Показва се като /root/ROMs във всяка сесия. Вътрешната памет е на /root/Storage.</string>
-5
View File
@@ -1470,11 +1470,6 @@
<string name="rail_more">Více</string>
<string name="more_edit_tabs">Upravit karty</string>
<string name="setup_group_tabs">Karty</string>
<string name="tabs_place_bar">Zobrazeno</string>
<string name="tabs_place_more">V nabídce Více</string>
<string name="tabs_place_hidden">Skryto</string>
<string name="tabs_move_up">Posunout %1$s nahoru</string>
<string name="tabs_move_down">Posunout %1$s dolů</string>
<string name="rail_percent">%1$d%%</string>
<string name="rail_resume_named">Obnovit %1$s</string>
<string name="roms_text">V každé relaci se zobrazí jako /root/ROMs. Vnitřní úložiště je v /root/Storage.</string>
-5
View File
@@ -1454,11 +1454,6 @@
<string name="rail_more">Mere</string>
<string name="more_edit_tabs">Rediger faner</string>
<string name="setup_group_tabs">Faner</string>
<string name="tabs_place_bar">Vist</string>
<string name="tabs_place_more">I Mere</string>
<string name="tabs_place_hidden">Skjult</string>
<string name="tabs_move_up">Flyt %1$s op</string>
<string name="tabs_move_down">Flyt %1$s ned</string>
<string name="rail_percent">%1$d%%</string>
<string name="rail_resume_named">Genoptag %1$s</string>
<string name="roms_text">Vises som /root/ROMs i hver session. Intern lagerplads er på /root/Storage.</string>
-5
View File
@@ -1446,11 +1446,6 @@
<string name="rail_more">Mehr</string>
<string name="more_edit_tabs">Tabs bearbeiten</string>
<string name="setup_group_tabs">Tabs</string>
<string name="tabs_place_bar">Angezeigt</string>
<string name="tabs_place_more">In „Mehr“</string>
<string name="tabs_place_hidden">Ausgeblendet</string>
<string name="tabs_move_up">%1$s nach oben verschieben</string>
<string name="tabs_move_down">%1$s nach unten verschieben</string>
<string name="rail_percent">%1$d %%</string>
<string name="rail_resume_named">%1$s fortsetzen</string>
<string name="roms_text">Erscheint in jeder Sitzung als /root/ROMs. Der interne Speicher liegt unter /root/Storage.</string>
-5
View File
@@ -1454,11 +1454,6 @@
<string name="rail_more">Περισσότερα</string>
<string name="more_edit_tabs">Επεξεργασία καρτελών</string>
<string name="setup_group_tabs">Καρτέλες</string>
<string name="tabs_place_bar">Εμφανής</string>
<string name="tabs_place_more">Στα Περισσότερα</string>
<string name="tabs_place_hidden">Κρυφή</string>
<string name="tabs_move_up">Μετακινήστε %1$s προς τα πάνω</string>
<string name="tabs_move_down">Μετακινήστε %1$s προς τα κάτω</string>
<string name="rail_percent">%1$d%%</string>
<string name="rail_resume_named">Συνέχιση %1$s</string>
<string name="roms_text">Εμφανίζεται ως /root/ROMs σε κάθε συνεδρία. Ο εσωτερικός χώρος αποθήκευσης βρίσκεται στο /root/Storage.</string>
-5
View File
@@ -1462,11 +1462,6 @@
<string name="rail_more">Más</string>
<string name="more_edit_tabs">Editar pestañas</string>
<string name="setup_group_tabs">Pestañas</string>
<string name="tabs_place_bar">Visible</string>
<string name="tabs_place_more">En Más</string>
<string name="tabs_place_hidden">Oculta</string>
<string name="tabs_move_up">Mover %1$s hacia arriba</string>
<string name="tabs_move_down">Mover %1$s hacia abajo</string>
<string name="rail_percent">%1$d%%</string>
<string name="rail_resume_named">Reanudar %1$s</string>
<string name="roms_text">Aparece como /root/ROMs en cada sesión. El almacenamiento interno está en /root/Storage.</string>
-5
View File
@@ -1454,11 +1454,6 @@
<string name="rail_more">Lisää</string>
<string name="more_edit_tabs">Muokkaa välilehtiä</string>
<string name="setup_group_tabs">Välilehdet</string>
<string name="tabs_place_bar">Näkyvissä</string>
<string name="tabs_place_more">Lisää-valikossa</string>
<string name="tabs_place_hidden">Piilotettu</string>
<string name="tabs_move_up">Siirrä %1$s ylös</string>
<string name="tabs_move_down">Siirrä %1$s alas</string>
<string name="rail_percent">%1$d %%</string>
<string name="rail_resume_named">Jatka: %1$s</string>
<string name="roms_text">Näkyy sessiossa polussa /root/ROMs. Sisäinen tallennustila on /root/Storage.</string>
-5
View File
@@ -1461,11 +1461,6 @@
<string name="rail_more">Plus</string>
<string name="more_edit_tabs">Modifier les onglets</string>
<string name="setup_group_tabs">Onglets</string>
<string name="tabs_place_bar">Affiché</string>
<string name="tabs_place_more">Dans Plus</string>
<string name="tabs_place_hidden">Masqué</string>
<string name="tabs_move_up">Déplacer %1$s vers le haut</string>
<string name="tabs_move_down">Déplacer %1$s vers le bas</string>
<string name="rail_percent">%1$d%%</string>
<string name="rail_resume_named">Reprendre %1$s</string>
<string name="roms_text">Affiché comme /root/ROMs dans chaque session. Le stockage interne se trouve dans /root/Storage.</string>
-5
View File
@@ -1454,11 +1454,6 @@
<string name="rail_more">अधिक</string>
<string name="more_edit_tabs">टैब्स संपादित करें</string>
<string name="setup_group_tabs">टैब्स</string>
<string name="tabs_place_bar">दिखाया जाए</string>
<string name="tabs_place_more">अधिक में</string>
<string name="tabs_place_hidden">छिपाया जाए</string>
<string name="tabs_move_up">%1$s को ऊपर ले जाएँ</string>
<string name="tabs_move_down">%1$s को नीचे ले जाएँ</string>
<string name="rail_percent">%1$d%%</string>
<string name="rail_resume_named">%1$s फिर से शुरू करें</string>
<string name="roms_text">हर सेशन में /root/ROMs के रूप में दिखता है। इंटरनल स्टोरेज /root/Storage पर है।</string>
-5
View File
@@ -1454,11 +1454,6 @@
<string name="rail_more">Továbbiak</string>
<string name="more_edit_tabs">Fülek szerkesztése</string>
<string name="setup_group_tabs">Fülek</string>
<string name="tabs_place_bar">Látható</string>
<string name="tabs_place_more">A Továbbiakban</string>
<string name="tabs_place_hidden">Rejtett</string>
<string name="tabs_move_up">%1$s mozgatása felfelé</string>
<string name="tabs_move_down">%1$s mozgatása lefelé</string>
<string name="rail_percent">%1$d%%</string>
<string name="rail_resume_named">%1$s folytatása</string>
<string name="roms_text">Minden munkamenetben /root/ROMs néven jelenik meg. A belső tárhely itt található: /root/Storage.</string>
-5
View File
@@ -1447,11 +1447,6 @@
<string name="rail_more">Lainnya</string>
<string name="more_edit_tabs">Edit tab</string>
<string name="setup_group_tabs">Tab</string>
<string name="tabs_place_bar">Ditampilkan</string>
<string name="tabs_place_more">Di Lainnya</string>
<string name="tabs_place_hidden">Disembunyikan</string>
<string name="tabs_move_up">Pindahkan %1$s ke atas</string>
<string name="tabs_move_down">Pindahkan %1$s ke bawah</string>
<string name="rail_percent">%1$d%%</string>
<string name="rail_resume_named">Lanjutkan %1$s</string>
<string name="roms_text">Muncul sebagai /root/ROMs di setiap sesi. Penyimpanan internal berada di /root/Storage.</string>
-5
View File
@@ -1453,11 +1453,6 @@
<string name="rail_more">Altro</string>
<string name="more_edit_tabs">Modifica schede</string>
<string name="setup_group_tabs">Schede</string>
<string name="tabs_place_bar">Visibile</string>
<string name="tabs_place_more">Nella sezione Altro</string>
<string name="tabs_place_hidden">Nascosta</string>
<string name="tabs_move_up">Sposta %1$s in alto</string>
<string name="tabs_move_down">Sposta %1$s in basso</string>
<string name="rail_percent">%1$d%%</string>
<string name="rail_resume_named">Riprendi %1$s</string>
<string name="roms_text">Appare come /root/ROMs in ogni sessione. La memoria interna si trova in /root/Storage.</string>
-5
View File
@@ -1447,11 +1447,6 @@
<string name="rail_more">その他</string>
<string name="more_edit_tabs">タブを編集</string>
<string name="setup_group_tabs">タブ</string>
<string name="tabs_place_bar">表示</string>
<string name="tabs_place_more">「その他」に表示</string>
<string name="tabs_place_hidden">非表示</string>
<string name="tabs_move_up">%1$s を上に移動</string>
<string name="tabs_move_down">%1$s を下に移動</string>
<string name="rail_percent">%1$d%%</string>
<string name="rail_resume_named">%1$sを再開</string>
<string name="roms_text">各セッションで /root/ROMs として表示されます。内部ストレージは /root/Storage にあります。</string>
-5
View File
@@ -1447,11 +1447,6 @@
<string name="rail_more">더보기</string>
<string name="more_edit_tabs">탭 편집</string>
<string name="setup_group_tabs">탭</string>
<string name="tabs_place_bar">표시</string>
<string name="tabs_place_more">더보기 안</string>
<string name="tabs_place_hidden">숨김</string>
<string name="tabs_move_up">%1$s 위로 이동</string>
<string name="tabs_move_down">%1$s 아래로 이동</string>
<string name="rail_percent">%1$d%%</string>
<string name="rail_resume_named">%1$s 재개</string>
<string name="roms_text">각 세션에서 /root/ROMs로 표시됩니다. 내부 저장 공간은 /root/Storage에 있습니다.</string>
-5
View File
@@ -1447,11 +1447,6 @@
<string name="rail_more">Lagi</string>
<string name="more_edit_tabs">Sunting tab</string>
<string name="setup_group_tabs">Tab</string>
<string name="tabs_place_bar">Dipaparkan</string>
<string name="tabs_place_more">Dalam Lagi</string>
<string name="tabs_place_hidden">Disembunyikan</string>
<string name="tabs_move_up">Alih %1$s ke atas</string>
<string name="tabs_move_down">Alih %1$s ke bawah</string>
<string name="rail_percent">%1$d%%</string>
<string name="rail_resume_named">Sambung %1$s</string>
<string name="roms_text">Muncul sebagai /root/ROMs dalam setiap sesi. Storan dalaman berada di /root/Storage.</string>
-5
View File
@@ -1454,11 +1454,6 @@
<string name="rail_more">Mer</string>
<string name="more_edit_tabs">Rediger faner</string>
<string name="setup_group_tabs">Faner</string>
<string name="tabs_place_bar">Synlig</string>
<string name="tabs_place_more">I Mer</string>
<string name="tabs_place_hidden">Skjult</string>
<string name="tabs_move_up">Flytt %1$s opp</string>
<string name="tabs_move_down">Flytt %1$s ned</string>
<string name="rail_percent">%1$d%%</string>
<string name="rail_resume_named">Gjenoppta %1$s</string>
<string name="roms_text">Vises som /root/ROMs i hver sesjon. Intern lagring er på /root/Storage.</string>
-5
View File
@@ -1454,11 +1454,6 @@
<string name="rail_more">Meer</string>
<string name="more_edit_tabs">Tabbladen bewerken</string>
<string name="setup_group_tabs">Tabbladen</string>
<string name="tabs_place_bar">Weergegeven</string>
<string name="tabs_place_more">In Meer</string>
<string name="tabs_place_hidden">Verborgen</string>
<string name="tabs_move_up">%1$s naar boven verplaatsen</string>
<string name="tabs_move_down">%1$s naar beneden verplaatsen</string>
<string name="rail_percent">%1$d%%</string>
<string name="rail_resume_named">%1$s hervatten</string>
<string name="roms_text">Verschijnt in elke sessie als /root/ROMs. Interne opslag staat op /root/Storage.</string>
-5
View File
@@ -1470,11 +1470,6 @@
<string name="rail_more">Więcej</string>
<string name="more_edit_tabs">Edytuj karty</string>
<string name="setup_group_tabs">Karty</string>
<string name="tabs_place_bar">Widoczne</string>
<string name="tabs_place_more">W menu Więcej</string>
<string name="tabs_place_hidden">Ukryte</string>
<string name="tabs_move_up">Przesuń %1$s w górę</string>
<string name="tabs_move_down">Przesuń %1$s w dół</string>
<string name="rail_percent">%1$d%%</string>
<string name="rail_resume_named">Wznów %1$s</string>
<string name="roms_text">W każdej sesji widoczny jako /root/ROMs. Pamięć wewnętrzna jest w /root/Storage.</string>
@@ -1453,11 +1453,6 @@
<string name="rail_more">Mais</string>
<string name="more_edit_tabs">Editar separadores</string>
<string name="setup_group_tabs">Separadores</string>
<string name="tabs_place_bar">Visível</string>
<string name="tabs_place_more">Em Mais</string>
<string name="tabs_place_hidden">Oculto</string>
<string name="tabs_move_up">Mover %1$s para cima</string>
<string name="tabs_move_down">Mover %1$s para baixo</string>
<string name="rail_percent">%1$d%%</string>
<string name="rail_resume_named">Retomar %1$s</string>
<string name="roms_text">Aparece como /root/ROMs em cada sessão. O armazenamento interno está em /root/Storage.</string>
-5
View File
@@ -1454,11 +1454,6 @@
<string name="rail_more">Mais</string>
<string name="more_edit_tabs">Editar abas</string>
<string name="setup_group_tabs">Abas</string>
<string name="tabs_place_bar">Visível</string>
<string name="tabs_place_more">Em Mais</string>
<string name="tabs_place_hidden">Oculto</string>
<string name="tabs_move_up">Mover %1$s para cima</string>
<string name="tabs_move_down">Mover %1$s para baixo</string>
<string name="rail_percent">%1$d%%</string>
<string name="rail_resume_named">Retomar %1$s</string>
<string name="roms_text">Aparece como /root/ROMs em cada sessão. O armazenamento interno fica em /root/Storage.</string>
-5
View File
@@ -1462,11 +1462,6 @@
<string name="rail_more">Mai multe</string>
<string name="more_edit_tabs">Editează taburile</string>
<string name="setup_group_tabs">Taburi</string>
<string name="tabs_place_bar">Afișat</string>
<string name="tabs_place_more">În meniul Mai multe</string>
<string name="tabs_place_hidden">Ascuns</string>
<string name="tabs_move_up">Mută %1$s în sus</string>
<string name="tabs_move_down">Mută %1$s în jos</string>
<string name="rail_percent">%1$d%%</string>
<string name="rail_resume_named">Reluare %1$s</string>
<string name="roms_text">Apare ca /root/ROMs în fiecare sesiune. Stocarea internă este la /root/Storage.</string>
-5
View File
@@ -1470,11 +1470,6 @@
<string name="rail_more">Ещё</string>
<string name="more_edit_tabs">Настроить вкладки</string>
<string name="setup_group_tabs">Вкладки</string>
<string name="tabs_place_bar">Отображается</string>
<string name="tabs_place_more">В «Ещё»</string>
<string name="tabs_place_hidden">Скрыто</string>
<string name="tabs_move_up">Переместить %1$s вверх</string>
<string name="tabs_move_down">Переместить %1$s вниз</string>
<string name="rail_percent">%1$d%%</string>
<string name="rail_resume_named">Продолжить %1$s</string>
<string name="roms_text">Отображается как /root/ROMs в каждой сессии. Внутреннее хранилище находится в /root/Storage.</string>
-5
View File
@@ -1454,11 +1454,6 @@
<string name="rail_more">Mer</string>
<string name="more_edit_tabs">Redigera flikar</string>
<string name="setup_group_tabs">Flikar</string>
<string name="tabs_place_bar">Visas</string>
<string name="tabs_place_more">I Mer</string>
<string name="tabs_place_hidden">Dold</string>
<string name="tabs_move_up">Flytta upp %1$s</string>
<string name="tabs_move_down">Flytta ner %1$s</string>
<string name="rail_percent">%1$d %%</string>
<string name="rail_resume_named">Återuppta %1$s</string>
<string name="roms_text">Visas som /root/ROMs i varje session. Det interna lagringsutrymmet finns på /root/Storage.</string>
-5
View File
@@ -1447,11 +1447,6 @@
<string name="rail_more">เพิ่มเติม</string>
<string name="more_edit_tabs">แก้ไขแท็บ</string>
<string name="setup_group_tabs">แท็บ</string>
<string name="tabs_place_bar">แสดง</string>
<string name="tabs_place_more">ในเพิ่มเติม</string>
<string name="tabs_place_hidden">ซ่อน</string>
<string name="tabs_move_up">ย้าย %1$s ขึ้น</string>
<string name="tabs_move_down">ย้าย %1$s ลง</string>
<string name="rail_percent">%1$d%%</string>
<string name="rail_resume_named">ดำเนินการต่อ %1$s</string>
<string name="roms_text">แสดงเป็น /root/ROMs ในแต่ละเซสชัน พื้นที่จัดเก็บภายในอยู่ที่ /root/Storage</string>
-5
View File
@@ -1446,11 +1446,6 @@
<string name="rail_more">Diğer</string>
<string name="more_edit_tabs">Sekmeleri düzenle</string>
<string name="setup_group_tabs">Sekmeler</string>
<string name="tabs_place_bar">Görünür</string>
<string name="tabs_place_more">Diğer\'de</string>
<string name="tabs_place_hidden">Gizli</string>
<string name="tabs_move_up">%1$s sekmesini yukarı taşı</string>
<string name="tabs_move_down">%1$s sekmesini aşağı taşı</string>
<string name="rail_percent">%%%1$d</string>
<string name="rail_resume_named">Devam et: %1$s</string>
<string name="roms_text">Her oturumda /root/ROMs olarak görünür. Dahili depolama /root/Storage konumundadır.</string>
-5
View File
@@ -1470,11 +1470,6 @@
<string name="rail_more">Ще</string>
<string name="more_edit_tabs">Редагувати вкладки</string>
<string name="setup_group_tabs">Вкладки</string>
<string name="tabs_place_bar">Показано</string>
<string name="tabs_place_more">У «Ще»</string>
<string name="tabs_place_hidden">Приховано</string>
<string name="tabs_move_up">Перемістити %1$s вгору</string>
<string name="tabs_move_down">Перемістити %1$s вниз</string>
<string name="rail_percent">%1$d%%</string>
<string name="rail_resume_named">Продовжити %1$s</string>
<string name="roms_text">У кожному сеансі з’являється як /root/ROMs. Внутрішня пам’ять доступна в /root/Storage.</string>
-5
View File
@@ -1447,11 +1447,6 @@
<string name="rail_more">Khác</string>
<string name="more_edit_tabs">Chỉnh sửa thẻ</string>
<string name="setup_group_tabs">Thẻ</string>
<string name="tabs_place_bar">Hiển thị</string>
<string name="tabs_place_more">Trong mục Khác</string>
<string name="tabs_place_hidden">Ẩn</string>
<string name="tabs_move_up">Chuyển %1$s lên</string>
<string name="tabs_move_down">Chuyển %1$s xuống</string>
<string name="rail_percent">%1$d%%</string>
<string name="rail_resume_named">Tiếp tục %1$s</string>
<string name="roms_text">Hiển thị như /root/ROMs trong mỗi phiên. Bộ nhớ trong ở /root/Storage.</string>
@@ -1530,11 +1530,6 @@
<string name="rail_more">更多</string>
<string name="more_edit_tabs">编辑标签页</string>
<string name="setup_group_tabs">标签页</string>
<string name="tabs_place_bar">显示</string>
<string name="tabs_place_more">在“更多”中</string>
<string name="tabs_place_hidden">隐藏</string>
<string name="tabs_move_up">将 %1$s 上移</string>
<string name="tabs_move_down">将 %1$s 下移</string>
<string name="rail_percent">%1$d%%</string>
<string name="rail_resume_named">恢复 %1$s</string>
<string name="roms_text">在每个会话中显示为 /root/ROMs。内部存储位于 /root/Storage。</string>
@@ -1446,11 +1446,6 @@
<string name="rail_more">更多</string>
<string name="more_edit_tabs">編輯分頁</string>
<string name="setup_group_tabs">分頁</string>
<string name="tabs_place_bar">顯示</string>
<string name="tabs_place_more">「更多」內</string>
<string name="tabs_place_hidden">隱藏</string>
<string name="tabs_move_up">將 %1$s 上移</string>
<string name="tabs_move_down">將 %1$s 下移</string>
<string name="rail_percent">%1$d%%</string>
<string name="rail_resume_named">繼續 %1$s</string>
<string name="roms_text">在每個會話中顯示為 /root/ROMs。內部儲存空間位於 /root/Storage。</string>
@@ -1446,11 +1446,6 @@
<string name="rail_more">更多</string>
<string name="more_edit_tabs">編輯頁籤</string>
<string name="setup_group_tabs">頁籤</string>
<string name="tabs_place_bar">顯示</string>
<string name="tabs_place_more">放在「更多」</string>
<string name="tabs_place_hidden">隱藏</string>
<string name="tabs_move_up">將 %1$s 上移</string>
<string name="tabs_move_down">將 %1$s 下移</string>
<string name="rail_percent">%1$d%%</string>
<string name="rail_resume_named">繼續 %1$s</string>
<string name="roms_text">每個工作階段中顯示為 /root/ROMs。內部儲存空間位於 /root/Storage。</string>
-5
View File
@@ -1577,11 +1577,6 @@
<string name="rail_more">More</string>
<string name="more_edit_tabs">Edit tabs</string>
<string name="setup_group_tabs">Tabs</string>
<string name="tabs_place_bar">Shown</string>
<string name="tabs_place_more">In More</string>
<string name="tabs_place_hidden">Hidden</string>
<string name="tabs_move_up">Move %1$s up</string>
<string name="tabs_move_down">Move %1$s down</string>
<string name="rail_percent">%1$d%%</string>
<string name="rail_resume_named">Resume %1$s</string>
<string name="roms_text">Shows up as /root/ROMs in each session. Internal storage is at /root/Storage.</string>
@@ -11,6 +11,10 @@ import androidx.compose.ui.test.hasTestTag
import androidx.compose.ui.test.hasText
import androidx.compose.ui.test.onNodeWithTag
import androidx.compose.ui.test.performClick
import androidx.compose.ui.test.performKeyPress
import androidx.compose.ui.test.requestFocus
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.ui.unit.dp
import androidx.test.core.app.ApplicationProvider
import org.junit.After
@@ -44,23 +48,23 @@ class NavTabsTest {
}
@Test fun showingMusicOnceKeepsItShownAfterReload() {
NavTabs.setPlace(ctx, "soundtracks", TabPlace.BAR)
place("soundtracks", TabPlace.BAR)
NavTabs.load(ctx)
assertEquals(listOf("steam", "games", "soundtracks", "stores", "desktop", "components", "setup", "updates"), navigationKeys(state()))
}
@Test fun shelvedTabsLeaveTheBarAndAddMoreAtTheEnd() {
NavTabs.setPlace(ctx, "stores", TabPlace.MORE)
NavTabs.setPlace(ctx, "components", TabPlace.MORE)
place("stores", TabPlace.MORE)
place("components", TabPlace.MORE)
val s = state()
assertEquals(listOf("soundtracks", "stores", "components"), NavTabs.more(s))
assertEquals(listOf("components", "soundtracks", "stores"), NavTabs.more(s))
assertEquals(NavTabs.MORE, navigationKeys(s).last())
assertFalse("stores" in navigationKeys(s))
}
@Test fun hiddenTabsAreNowhereAndSetupCannotBeHidden() {
NavTabs.setPlace(ctx, "updates", TabPlace.HIDDEN)
NavTabs.setPlace(ctx, "setup", TabPlace.HIDDEN)
place("updates", TabPlace.HIDDEN)
place("setup", TabPlace.HIDDEN)
val s = state()
assertFalse("updates" in navigationKeys(s))
assertFalse("updates" in NavTabs.more(s))
@@ -72,8 +76,8 @@ class NavTabsTest {
}
@Test fun movingSwapsWithTheNextVisibleTabAndPersists() {
NavTabs.setPlace(ctx, "soundtracks", TabPlace.BAR)
NavTabs.move(ctx, state(), "stores", -1)
place("soundtracks", TabPlace.BAR)
moveTab("stores", -1)
assertEquals(listOf("steam", "games", "stores", "soundtracks"), navigationKeys(state()).take(4))
NavTabs.load(ctx)
assertEquals(listOf("steam", "games", "stores", "soundtracks"), navigationKeys(state()).take(4))
@@ -87,18 +91,18 @@ class NavTabsTest {
}
@Test fun moreCarriesTheDownloadCountAndBadgesOfShelvedTabs() {
NavTabs.setPlace(ctx, "stores", TabPlace.MORE)
NavTabs.setPlace(ctx, "setup", TabPlace.MORE)
place("stores", TabPlace.MORE)
place("setup", TabPlace.MORE)
val s = state(downloads = 3, setupReady = false)
assertEquals(3, railCount(s, NavTabs.MORE))
assertTrue(railBadge(s, NavTabs.MORE))
NavTabs.setPlace(ctx, "stores", TabPlace.BAR)
place("stores", TabPlace.BAR)
assertEquals(0, railCount(s, NavTabs.MORE))
assertEquals(3, railCount(s, "stores"))
}
@Test fun sideRailShowsTheDownloadCountOnMoreWhenStoresIsShelved() {
NavTabs.setPlace(ctx, "stores", TabPlace.MORE)
place("stores", TabPlace.MORE)
val s = state(downloads = 2)
compose.setContent {
DroidDeckTheme {
@@ -113,8 +117,8 @@ class NavTabsTest {
}
@Test fun morePageListsShelvedTabsWithTheirCount() {
NavTabs.setPlace(ctx, "stores", TabPlace.MORE)
NavTabs.setPlace(ctx, "components", TabPlace.MORE)
place("stores", TabPlace.MORE)
place("components", TabPlace.MORE)
val s = state(downloads = 4)
compose.setContent {
DroidDeckTheme {
@@ -129,7 +133,7 @@ class NavTabsTest {
}
@Test fun backFromAShelvedTabReturnsToMore() {
NavTabs.setPlace(ctx, "desktop", TabPlace.MORE)
place("desktop", TabPlace.MORE)
var back: androidx.activity.OnBackPressedDispatcher? = null
compose.mainClock.autoAdvance = false
compose.setContent {
@@ -148,8 +152,8 @@ class NavTabsTest {
}
@Test fun startupWithSteamHiddenNeverLandsOnABareComponentsSelection() {
NavTabs.setPlace(ctx, "steam", TabPlace.HIDDEN)
repeat(NavTabs.ALL.size) { NavTabs.move(ctx, state(), "components", -1) }
place("steam", TabPlace.HIDDEN)
repeat(NavTabs.ALL.size) { moveTab("components", -1) }
assertEquals("components", navigationKeys(state()).first())
compose.mainClock.autoAdvance = false
compose.setContent { DroidDeckTheme { FrontEndScreen(state(), actions(), page = null) } }
@@ -158,6 +162,45 @@ class NavTabsTest {
compose.onNode(hasTestTag("rail-games") and androidx.compose.ui.test.isSelected()).assertExists()
}
@Test fun setupListMovesATabAcrossTheMoreLineWithTheControllerAndHidesWithItsSwitch() {
compose.setContent {
DroidDeckTheme {
CompositionLocalProvider(LocalFrontFocus provides FrontFocus()) {
androidx.compose.foundation.layout.Column(Modifier.height(752.dp).verticalScroll(rememberScrollState())) {
TabsSettingsGroup(MenuHost(), state(), actions())
}
}
}
}
val last = navigationKeys(state()).last { it != NavTabs.MORE }
compose.onNodeWithTag("tab-row-$last").requestFocus()
compose.onNodeWithTag("tab-row-$last").performKeyPress(pad(android.view.KeyEvent.KEYCODE_BUTTON_Y))
compose.onNodeWithTag("tab-row-$last").performKeyPress(pad(android.view.KeyEvent.KEYCODE_DPAD_DOWN))
compose.onNodeWithTag("tab-row-$last").performKeyPress(pad(android.view.KeyEvent.KEYCODE_BUTTON_Y))
compose.runOnIdle { assertEquals(last, NavTabs.more(state()).first()) }
compose.onNodeWithTag("tab-shown-desktop").performClick()
compose.runOnIdle { assertFalse("desktop" in navigationKeys(state())) }
compose.onNodeWithTag("tab-shown-setup").performClick()
compose.runOnIdle { assertTrue("setup" in navigationKeys(state())) }
}
private fun pad(code: Int) = androidx.compose.ui.input.key.KeyEvent(android.view.KeyEvent(android.view.KeyEvent.ACTION_DOWN, code))
private fun place(key: String, where: TabPlace, s: FrontEndState = state()) {
NavTabs.setHidden(ctx, key, where == TabPlace.HIDDEN)
if (where == TabPlace.HIDDEN) return
val keys = NavTabs.listed(s)
val more = keys.filter { if (it == key) where == TabPlace.MORE else it in NavTabs.shelved }
NavTabs.rearrange(ctx, s, keys - more.toSet(), more)
}
private fun moveTab(key: String, step: Int, s: FrontEndState = state()) {
val keys = NavTabs.listed(s)
val rows = moveTabRow(tabRows(keys.filter { it !in NavTabs.shelved }, keys.filter { it in NavTabs.shelved }), key, step) ?: return
val split = rows.indexOf(rows.first { it !in keys })
NavTabs.rearrange(ctx, s, rows.subList(0, split), rows.subList(split + 1, rows.size))
}
private fun hasParentTag(tag: String) = androidx.compose.ui.test.hasAnyAncestor(hasTestTag(tag))
private fun state(storesOn: Boolean = true, downloads: Int = 0, setupReady: Boolean = true) = FrontEndState(