diff --git a/app/src/main/java/com/droiddeck/launcher/ui/HudReadingsDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/HudReadingsDialog.kt index 29faced7a6..4d3cc47af5 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/HudReadingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/HudReadingsDialog.kt @@ -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), diff --git a/app/src/main/java/com/droiddeck/launcher/ui/NavTabs.kt b/app/src/main/java/com/droiddeck/launcher/ui/NavTabs.kt index af16570d97..17f1478201 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/NavTabs.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/NavTabs.kt @@ -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, more: List) { + 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) + } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/TabsSettings.kt b/app/src/main/java/com/droiddeck/launcher/ui/TabsSettings.kt index 3b964d8983..475c400b16 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/TabsSettings.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/TabsSettings.kt @@ -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, more: List) = bar + MORE_LINE + more + +internal fun moveTabRow(rows: List, key: String, step: Int): List? { + 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 -> + 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(null) } + var dragOffset by remember { mutableFloatStateOf(0f) } + var grabbed by remember { mutableStateOf(null) } + var before by remember { mutableStateOf>(emptyList()) } + var focused by remember { mutableStateOf(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>, - 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)) } } diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index b16f0b1821..7e7535eabb 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -1486,11 +1486,6 @@ المزيد تعديل التبويبات التبويبات - معروض - في المزيد - مخفي - نقل %1$s إلى الأعلى - نقل %1$s إلى الأسفل %1$d%% استئناف %1$s يظهر باسم /root/ROMs في كل جلسة. مساحة التخزين الداخلية متاحة في /root/Storage. 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 ae1cc67b96..02a7a970e0 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -1532,11 +1532,6 @@ Más Editar pestañas Pestañas - Mostrada - En Más - Oculta - Mover %1$s hacia arriba - Mover %1$s hacia abajo %1$d%% Reanudar %1$s Aparece como /root/ROMs en cada sesión. El almacenamiento interno está en /root/Storage. diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 68b60481bc..c3b6277b4e 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -1454,11 +1454,6 @@ Още Редактирай раздели Раздели - Показан - В „Още“ - Скрит - Премести %1$s нагоре - Премести %1$s надолу %1$d%% Продължаване на %1$s Показва се като /root/ROMs във всяка сесия. Вътрешната памет е на /root/Storage. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index e12cf6ab72..0e14f29976 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -1470,11 +1470,6 @@ Více Upravit karty Karty - Zobrazeno - V nabídce Více - Skryto - Posunout %1$s nahoru - Posunout %1$s dolů %1$d%% Obnovit %1$s V každé relaci se zobrazí jako /root/ROMs. Vnitřní úložiště je v /root/Storage. diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index f380f5c2e6..77e5d84cbe 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -1454,11 +1454,6 @@ Mere Rediger faner Faner - Vist - I Mere - Skjult - Flyt %1$s op - Flyt %1$s ned %1$d%% Genoptag %1$s Vises som /root/ROMs i hver session. Intern lagerplads er på /root/Storage. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index caac47913b..29bfc02e8e 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1446,11 +1446,6 @@ Mehr Tabs bearbeiten Tabs - Angezeigt - In „Mehr“ - Ausgeblendet - %1$s nach oben verschieben - %1$s nach unten verschieben %1$d %% %1$s fortsetzen Erscheint in jeder Sitzung als /root/ROMs. Der interne Speicher liegt unter /root/Storage. diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index affba8acb3..56c2132676 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -1454,11 +1454,6 @@ Περισσότερα Επεξεργασία καρτελών Καρτέλες - Εμφανής - Στα Περισσότερα - Κρυφή - Μετακινήστε %1$s προς τα πάνω - Μετακινήστε %1$s προς τα κάτω %1$d%% Συνέχιση %1$s Εμφανίζεται ως /root/ROMs σε κάθε συνεδρία. Ο εσωτερικός χώρος αποθήκευσης βρίσκεται στο /root/Storage. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 415c11ec37..275cc3c2d1 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1462,11 +1462,6 @@ Más Editar pestañas Pestañas - Visible - En Más - Oculta - Mover %1$s hacia arriba - Mover %1$s hacia abajo %1$d%% Reanudar %1$s Aparece como /root/ROMs en cada sesión. El almacenamiento interno está en /root/Storage. diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 1bdd0d6c7a..df6a488e98 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -1454,11 +1454,6 @@ Lisää Muokkaa välilehtiä Välilehdet - Näkyvissä - Lisää-valikossa - Piilotettu - Siirrä %1$s ylös - Siirrä %1$s alas %1$d %% Jatka: %1$s Näkyy sessiossa polussa /root/ROMs. Sisäinen tallennustila on /root/Storage. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 9b28c3ffe4..8e422b5590 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1461,11 +1461,6 @@ Plus Modifier les onglets Onglets - Affiché - Dans Plus - Masqué - Déplacer %1$s vers le haut - Déplacer %1$s vers le bas %1$d%% Reprendre %1$s Affiché comme /root/ROMs dans chaque session. Le stockage interne se trouve dans /root/Storage. diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 6cfb2f4fa9..1c294fdbeb 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -1454,11 +1454,6 @@ अधिक टैब्स संपादित करें टैब्स - दिखाया जाए - अधिक में - छिपाया जाए - %1$s को ऊपर ले जाएँ - %1$s को नीचे ले जाएँ %1$d%% %1$s फिर से शुरू करें हर सेशन में /root/ROMs के रूप में दिखता है। इंटरनल स्टोरेज /root/Storage पर है। diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 4c91fda1c0..f8f16f0eea 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -1454,11 +1454,6 @@ Továbbiak Fülek szerkesztése Fülek - Látható - A Továbbiakban - Rejtett - %1$s mozgatása felfelé - %1$s mozgatása lefelé %1$d%% %1$s folytatása Minden munkamenetben /root/ROMs néven jelenik meg. A belső tárhely itt található: /root/Storage. diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 1850ac323a..5b5f5ee99d 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -1447,11 +1447,6 @@ Lainnya Edit tab Tab - Ditampilkan - Di Lainnya - Disembunyikan - Pindahkan %1$s ke atas - Pindahkan %1$s ke bawah %1$d%% Lanjutkan %1$s Muncul sebagai /root/ROMs di setiap sesi. Penyimpanan internal berada di /root/Storage. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 13fef9c32a..a677a289b0 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1453,11 +1453,6 @@ Altro Modifica schede Schede - Visibile - Nella sezione Altro - Nascosta - Sposta %1$s in alto - Sposta %1$s in basso %1$d%% Riprendi %1$s Appare come /root/ROMs in ogni sessione. La memoria interna si trova in /root/Storage. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index eb20cfd0f0..0ebe258634 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -1447,11 +1447,6 @@ その他 タブを編集 タブ - 表示 - 「その他」に表示 - 非表示 - %1$s を上に移動 - %1$s を下に移動 %1$d%% %1$sを再開 各セッションで /root/ROMs として表示されます。内部ストレージは /root/Storage にあります。 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 7460521d62..e0482bcee0 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -1447,11 +1447,6 @@ 더보기 탭 편집 탭 - 표시 - 더보기 안 - 숨김 - %1$s 위로 이동 - %1$s 아래로 이동 %1$d%% %1$s 재개 각 세션에서 /root/ROMs로 표시됩니다. 내부 저장 공간은 /root/Storage에 있습니다. diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 76ea30bf09..978ab19ffc 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -1447,11 +1447,6 @@ Lagi Sunting tab Tab - Dipaparkan - Dalam Lagi - Disembunyikan - Alih %1$s ke atas - Alih %1$s ke bawah %1$d%% Sambung %1$s Muncul sebagai /root/ROMs dalam setiap sesi. Storan dalaman berada di /root/Storage. diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 452f343a26..4c9931ca33 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -1454,11 +1454,6 @@ Mer Rediger faner Faner - Synlig - I Mer - Skjult - Flytt %1$s opp - Flytt %1$s ned %1$d%% Gjenoppta %1$s Vises som /root/ROMs i hver sesjon. Intern lagring er på /root/Storage. diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index ce006058d7..68e7983d02 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -1454,11 +1454,6 @@ Meer Tabbladen bewerken Tabbladen - Weergegeven - In Meer - Verborgen - %1$s naar boven verplaatsen - %1$s naar beneden verplaatsen %1$d%% %1$s hervatten Verschijnt in elke sessie als /root/ROMs. Interne opslag staat op /root/Storage. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index e0089c2f7b..1a7f2e4f87 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -1470,11 +1470,6 @@ Więcej Edytuj karty Karty - Widoczne - W menu Więcej - Ukryte - Przesuń %1$s w górę - Przesuń %1$s w dół %1$d%% Wznów %1$s W każdej sesji widoczny jako /root/ROMs. Pamięć wewnętrzna jest w /root/Storage. diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 19f5b4feee..8ed6c78568 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -1453,11 +1453,6 @@ Mais Editar separadores Separadores - Visível - Em Mais - Oculto - Mover %1$s para cima - Mover %1$s para baixo %1$d%% Retomar %1$s Aparece como /root/ROMs em cada sessão. O armazenamento interno está em /root/Storage. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 44bd83f4fb..d6623028fb 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -1454,11 +1454,6 @@ Mais Editar abas Abas - Visível - Em Mais - Oculto - Mover %1$s para cima - Mover %1$s para baixo %1$d%% Retomar %1$s Aparece como /root/ROMs em cada sessão. O armazenamento interno fica em /root/Storage. diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 24f25ba356..4788d92384 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -1462,11 +1462,6 @@ Mai multe Editează taburile Taburi - Afișat - În meniul Mai multe - Ascuns - Mută %1$s în sus - Mută %1$s în jos %1$d%% Reluare %1$s Apare ca /root/ROMs în fiecare sesiune. Stocarea internă este la /root/Storage. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index d11a3f5a71..007c897ef5 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1470,11 +1470,6 @@ Ещё Настроить вкладки Вкладки - Отображается - В «Ещё» - Скрыто - Переместить %1$s вверх - Переместить %1$s вниз %1$d%% Продолжить %1$s Отображается как /root/ROMs в каждой сессии. Внутреннее хранилище находится в /root/Storage. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index ee0b3ee885..4b9d2ad460 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -1454,11 +1454,6 @@ Mer Redigera flikar Flikar - Visas - I Mer - Dold - Flytta upp %1$s - Flytta ner %1$s %1$d %% Återuppta %1$s Visas som /root/ROMs i varje session. Det interna lagringsutrymmet finns på /root/Storage. diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index d0e63d7f7e..5e8be9a4d8 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -1447,11 +1447,6 @@ เพิ่มเติม แก้ไขแท็บ แท็บ - แสดง - ในเพิ่มเติม - ซ่อน - ย้าย %1$s ขึ้น - ย้าย %1$s ลง %1$d%% ดำเนินการต่อ %1$s แสดงเป็น /root/ROMs ในแต่ละเซสชัน พื้นที่จัดเก็บภายในอยู่ที่ /root/Storage diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 6c21b94ccf..93bbe73c58 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -1446,11 +1446,6 @@ Diğer Sekmeleri düzenle Sekmeler - Görünür - Diğer\'de - Gizli - %1$s sekmesini yukarı taşı - %1$s sekmesini aşağı taşı %%%1$d Devam et: %1$s Her oturumda /root/ROMs olarak görünür. Dahili depolama /root/Storage konumundadır. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 0f555ebca8..60cef3ca95 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -1470,11 +1470,6 @@ Ще Редагувати вкладки Вкладки - Показано - У «Ще» - Приховано - Перемістити %1$s вгору - Перемістити %1$s вниз %1$d%% Продовжити %1$s У кожному сеансі з’являється як /root/ROMs. Внутрішня пам’ять доступна в /root/Storage. diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index a8c2808cc1..90588d0191 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -1447,11 +1447,6 @@ Khác Chỉnh sửa thẻ Thẻ - Hiển thị - Trong mục Khác - Ẩn - Chuyển %1$s lên - Chuyển %1$s xuống %1$d%% Tiếp tục %1$s Hiển thị như /root/ROMs trong mỗi phiên. Bộ nhớ trong ở /root/Storage. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index bd57054084..45c3669b17 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1530,11 +1530,6 @@ 更多 编辑标签页 标签页 - 显示 - 在“更多”中 - 隐藏 - 将 %1$s 上移 - 将 %1$s 下移 %1$d%% 恢复 %1$s 在每个会话中显示为 /root/ROMs。内部存储位于 /root/Storage。 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 68ed43f73f..fdcb636916 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1446,11 +1446,6 @@ 更多 編輯分頁 分頁 - 顯示 - 「更多」內 - 隱藏 - 將 %1$s 上移 - 將 %1$s 下移 %1$d%% 繼續 %1$s 在每個會話中顯示為 /root/ROMs。內部儲存空間位於 /root/Storage。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 037afc6039..eca4bcbe72 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1446,11 +1446,6 @@ 更多 編輯頁籤 頁籤 - 顯示 - 放在「更多」 - 隱藏 - 將 %1$s 上移 - 將 %1$s 下移 %1$d%% 繼續 %1$s 每個工作階段中顯示為 /root/ROMs。內部儲存空間位於 /root/Storage。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ba42f01bf9..3b9c7c9c4c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1577,11 +1577,6 @@ More Edit tabs Tabs - Shown - In More - Hidden - Move %1$s up - Move %1$s down %1$d%% Resume %1$s Shows up as /root/ROMs in each session. Internal storage is at /root/Storage. diff --git a/app/src/test/java/com/droiddeck/launcher/ui/NavTabsTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/NavTabsTest.kt index 41f8333147..c7ff2b12b4 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/NavTabsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/NavTabsTest.kt @@ -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(