mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-22 06:15:58 +00:00
feat(session): arrange and hide in-session menu pages, round pinned end-session button (#2989)
* feat(session): arrange and hide the in-session menu pages * fix(session): the end-session button is a true circle pinned to the right of the menu header * fix(session): arrange-pages drag reads the current list; reset reloads the page layout even if the activity was recreated * fix(session): Back leaves Arrange pages first; UI zoo previews don't save page layout * fix(session): Back on a grabbed page row restores its order before anything else
This commit is contained in:
1 parent
e06ca23f66
commit
31dd8f9987
11 files changed
+227
-18
No files matched your search
@@ -46,6 +46,7 @@ class App : Application() {
|
||||
com.droiddeck.launcher.input.ShortcutsRelay.Holder.install(this)
|
||||
com.droiddeck.launcher.agent.AgentHost.refresh(this)
|
||||
com.droiddeck.launcher.ui.NavTabs.load(this)
|
||||
com.droiddeck.launcher.ui.DrawerPages.load(this)
|
||||
com.droiddeck.launcher.ui.DeveloperTools.load(this)
|
||||
com.droiddeck.launcher.ui.AgentPet.install(this)
|
||||
if (com.droiddeck.launcher.agent.AgentTab.visible) com.droiddeck.launcher.lab.LabNotice.openOnInstall = "agent"
|
||||
|
||||
@@ -3343,6 +3343,7 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet
|
||||
Thread({
|
||||
val ok = com.droiddeck.launcher.session.SettingsReset.resetAll(this, gameProfiles, scopes)
|
||||
ui.post {
|
||||
com.droiddeck.launcher.ui.DrawerPages.load(applicationContext)
|
||||
if (isDestroyed) return@post
|
||||
com.droiddeck.launcher.core.AppLanguage.setChosen(this, com.droiddeck.launcher.core.AppLanguage.SYSTEM)
|
||||
if (!ok) android.widget.Toast.makeText(this, R.string.setup_reset_settings_partial, android.widget.Toast.LENGTH_LONG).show()
|
||||
|
||||
@@ -419,6 +419,18 @@ object SessionPrefs {
|
||||
e.remove("gameStoresEnabled").remove("soundtracksEnabled").remove("agentTab").putInt("navTabLayout", version).apply()
|
||||
}
|
||||
|
||||
fun drawerPageOrder(context: Context): List<String> = idList(prefs(context).getString("drawerPageOrder", null))
|
||||
|
||||
fun setDrawerPageOrder(context: Context, order: List<String>) {
|
||||
prefs(context).edit().putString("drawerPageOrder", order.joinToString(",")).apply()
|
||||
}
|
||||
|
||||
fun drawerPageHidden(context: Context): Set<String> = idList(prefs(context).getString("drawerPageHidden", null)).toSet()
|
||||
|
||||
fun setDrawerPageHidden(context: Context, keys: Set<String>) {
|
||||
prefs(context).edit().putString("drawerPageHidden", keys.joinToString(",")).apply()
|
||||
}
|
||||
|
||||
fun setNavTabHidden(context: Context, keys: Set<String>) {
|
||||
prefs(context).edit().putString("navTabHidden", keys.joinToString(",")).apply()
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@ object SettingsReset {
|
||||
"storesInstallLanguage",
|
||||
"hud", "hudDeck", "hudFps", "hudBattery", "hudGraph", "hudColor", "hudOpacity", "__KEEP_droidDeckHud__", "__KEEP_droidDeckHudPos__", "backHold", "backActionsInverted", "backDoubleTapMs", "touch", "pen", "penButton", "osc", "shape", "steamController",
|
||||
"gamepadLeft", "gamepadRight", "pipAutoEnter", "unfoldedControls", "unfoldedControlsWithController",
|
||||
"stretch16x9", "avoidNotch", "picturePosition", "integerScaling", "railLabels", "developerTools", "navTabOrder", "navTabShelved", "navTabHidden", "pcKeyboardSize", "pcKeyboardOpacity", "pcKeyboardHiddenKeys",
|
||||
"stretch16x9", "avoidNotch", "picturePosition", "integerScaling", "railLabels", "developerTools", "navTabOrder", "navTabShelved", "navTabHidden", "drawerPageOrder", "drawerPageHidden", "pcKeyboardSize", "pcKeyboardOpacity", "pcKeyboardHiddenKeys",
|
||||
"gpuDriverMode", "androidDriver", "linuxDriver", "linuxDriver.steam", "linuxDriver.desktop",
|
||||
"tuSysmem", "glThread", "noGlError", "zinkLazy", "mangoapp", "gpuClockPin", "gamescopeRealtime", "paceCores",
|
||||
"directAudio", "mic", "wifiDiscovery", "clientCpusOverride", "clientCpus", "gameCpus",
|
||||
|
||||
@@ -0,0 +1,93 @@
|
||||
package com.droiddeck.launcher.ui
|
||||
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.rememberScrollState
|
||||
import androidx.compose.foundation.verticalScroll
|
||||
import androidx.compose.foundation.interaction.MutableInteractionSource
|
||||
import androidx.compose.material.icons.Icons
|
||||
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.DisposableEffect
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.rememberUpdatedState
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.draw.alpha
|
||||
import androidx.compose.ui.focus.focusProperties
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.platform.testTag
|
||||
import androidx.compose.ui.res.stringResource
|
||||
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.activity.compose.BackHandler
|
||||
import com.droiddeck.launcher.R
|
||||
|
||||
@Composable
|
||||
internal fun ManageDrawerPages(offeredNow: List<SessionDrawerPage>, modifier: Modifier = Modifier, releaseSignal: Int = 0, onDone: () -> Unit) {
|
||||
val ctx = LocalContext.current
|
||||
val current by rememberUpdatedState(offeredNow)
|
||||
val previewing = DevPreview.drawer != null
|
||||
DisposableEffect(Unit) { onDispose { DrawerPages.heldFrom = null } }
|
||||
DisposableEffect(previewing) { onDispose { if (previewing) DrawerPages.load(ctx) } }
|
||||
val colors = MaterialTheme.colorScheme
|
||||
BackHandler { onDone() }
|
||||
Column(modifier.verticalScroll(rememberScrollState()), verticalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||
Row(verticalAlignment = Alignment.CenterVertically) {
|
||||
Text(
|
||||
stringResource(R.string.drawer_manage_pages), fontSize = 15.sp, fontWeight = FontWeight.SemiBold,
|
||||
color = colors.onBackground, modifier = Modifier.weight(1f),
|
||||
)
|
||||
if (!DrawerPages.isDefault()) DrawerOutlineButton(stringResource(R.string.drawer_pages_reset)) { DrawerPages.reset(ctx) }
|
||||
Spacer(Modifier.width(8.dp))
|
||||
DrawerOutlineButton(stringResource(R.string.drawer_pages_done), onClick = onDone)
|
||||
}
|
||||
SortableRows(
|
||||
rows = { current.map { it.name } },
|
||||
commit = { names -> DrawerPages.rearrange(ctx, names.mapNotNull { n -> current.firstOrNull { it.name == n } }) },
|
||||
movable = { true },
|
||||
rowHeight = STORE_ROW, handleWidth = STORE_HANDLE,
|
||||
releaseSignal = releaseSignal,
|
||||
onGrab = { before -> DrawerPages.heldFrom = before?.mapNotNull { n -> current.firstOrNull { it.name == n } } },
|
||||
onActivate = { name ->
|
||||
current.firstOrNull { it.name == name }?.let { DrawerPages.setHidden(ctx, it, it !in DrawerPages.hidden) }
|
||||
},
|
||||
) { name, held, offset, hint, rowModifier, onFocus ->
|
||||
val page = current.first { it.name == name }
|
||||
val shown = page !in DrawerPages.hidden
|
||||
val pal = LocalPalette.current
|
||||
val label = stringResource(page.title)
|
||||
val src = remember { MutableInteractionSource() }
|
||||
val hot = rememberHot(src)
|
||||
SortRowFrame(held, offset, rowModifier.testTag("drawer-page-row-$name"), hot, src, onFocus) {
|
||||
Box(contentAlignment = Alignment.Center, modifier = Modifier.size(width = STORE_HANDLE, height = STORE_ROW)) {
|
||||
Icon(Icons.Filled.DragHandle, null, tint = if (held) pal.signal else colors.onSurfaceVariant, modifier = Modifier.size(20.dp))
|
||||
}
|
||||
Row(
|
||||
verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp),
|
||||
modifier = Modifier.weight(1f).alpha(if (shown) 1f else 0.5f),
|
||||
) {
|
||||
Icon(page.icon, null, tint = colors.onSurfaceVariant, modifier = Modifier.size(20.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, DrawerPages.hideable(page), label,
|
||||
Modifier.testTag("drawer-page-shown-$name").focusProperties { canFocus = false },
|
||||
) { DrawerPages.setHidden(ctx, page, !it) }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -221,8 +221,8 @@ internal fun SideSheet(open: Boolean, onClose: () -> Unit, returnFocus: FocusReq
|
||||
}
|
||||
}
|
||||
|
||||
private val STORE_ROW = 60.dp
|
||||
private val STORE_HANDLE = 44.dp
|
||||
internal val STORE_ROW = 60.dp
|
||||
internal val STORE_HANDLE = 44.dp
|
||||
|
||||
@Composable
|
||||
internal fun ManageStoresSheet() {
|
||||
@@ -302,7 +302,7 @@ private fun StoreSortRow(
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun SortRowFrame(
|
||||
internal fun SortRowFrame(
|
||||
held: Boolean, offset: Float, modifier: Modifier, hot: Boolean, src: MutableInteractionSource, onFocus: (Boolean) -> Unit,
|
||||
content: @Composable androidx.compose.foundation.layout.RowScope.() -> Unit,
|
||||
) {
|
||||
|
||||
@@ -1,5 +1,11 @@
|
||||
package com.droiddeck.launcher.ui
|
||||
|
||||
import android.content.Context
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.setValue
|
||||
import com.droiddeck.launcher.session.SessionPrefs
|
||||
|
||||
internal enum class SessionDrawerPage(val firstControl: String) {
|
||||
CONTROLLER("input-profile"),
|
||||
GLASSES("glasses-game"),
|
||||
@@ -12,14 +18,69 @@ internal enum class SessionDrawerPage(val firstControl: String) {
|
||||
SESSION("suspend"),
|
||||
}
|
||||
|
||||
internal fun sessionDrawerPages(
|
||||
internal object DrawerPages {
|
||||
var order by mutableStateOf(SessionDrawerPage.entries.toList())
|
||||
private set
|
||||
var hidden by mutableStateOf(emptySet<SessionDrawerPage>())
|
||||
private set
|
||||
|
||||
/** The order captured when a page row was grabbed in Arrange pages; Back restores it. */
|
||||
var heldFrom: List<SessionDrawerPage>? = null
|
||||
|
||||
fun hideable(page: SessionDrawerPage) = page != SessionDrawerPage.SESSION
|
||||
|
||||
fun load(context: Context) {
|
||||
order = arrange(SessionPrefs.drawerPageOrder(context))
|
||||
hidden = SessionPrefs.drawerPageHidden(context).mapNotNull { name -> SessionDrawerPage.entries.firstOrNull { it.name == name } }
|
||||
.filter(::hideable).toSet()
|
||||
}
|
||||
|
||||
fun arrange(saved: List<String>): List<SessionDrawerPage> {
|
||||
val all = SessionDrawerPage.entries
|
||||
val out = saved.mapNotNull { name -> all.firstOrNull { it.name == name } }.distinct().toMutableList()
|
||||
for (page in all.filterNot { it in out }) {
|
||||
val before = all.subList(0, all.indexOf(page)).lastOrNull { it in out }
|
||||
out.add(if (before == null) 0 else out.indexOf(before) + 1, page)
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
fun setHidden(context: Context, page: SessionDrawerPage, hide: Boolean) {
|
||||
hidden = if (hide && hideable(page)) hidden + page else hidden - page
|
||||
if (DevPreview.drawer == null) SessionPrefs.setDrawerPageHidden(context, hidden.map { it.name }.toSet())
|
||||
}
|
||||
|
||||
/** [placed] holds the pages on offer in their new order; pages not on offer keep their slots. */
|
||||
fun rearrange(context: Context, placed: List<SessionDrawerPage>) {
|
||||
if (placed.isEmpty() || !order.containsAll(placed)) return
|
||||
val next = placed.iterator()
|
||||
order = order.map { if (it in placed) next.next() else it }
|
||||
if (DevPreview.drawer == null) SessionPrefs.setDrawerPageOrder(context, order.map { it.name })
|
||||
}
|
||||
|
||||
fun reset(context: Context) {
|
||||
order = SessionDrawerPage.entries.toList()
|
||||
hidden = emptySet()
|
||||
if (DevPreview.drawer != null) return
|
||||
SessionPrefs.setDrawerPageOrder(context, order.map { it.name })
|
||||
SessionPrefs.setDrawerPageHidden(context, emptySet())
|
||||
}
|
||||
|
||||
fun isDefault() = order == SessionDrawerPage.entries.toList() && hidden.isEmpty()
|
||||
}
|
||||
|
||||
internal fun offeredDrawerPages(
|
||||
hasGlasses: Boolean = false, hasAgent: Boolean = com.droiddeck.launcher.agent.AgentTab.shown,
|
||||
): List<SessionDrawerPage> =
|
||||
SessionDrawerPage.entries.filter {
|
||||
DrawerPages.order.filter {
|
||||
(hasGlasses || it != SessionDrawerPage.GLASSES) &&
|
||||
(hasAgent || it != SessionDrawerPage.AGENT)
|
||||
}
|
||||
|
||||
internal fun sessionDrawerPages(
|
||||
hasGlasses: Boolean = false, hasAgent: Boolean = com.droiddeck.launcher.agent.AgentTab.shown,
|
||||
): List<SessionDrawerPage> = offeredDrawerPages(hasGlasses, hasAgent).filter { it !in DrawerPages.hidden }
|
||||
|
||||
internal fun List<SessionDrawerPage>.step(current: SessionDrawerPage, direction: Int): SessionDrawerPage {
|
||||
val index = indexOf(current).coerceAtLeast(0)
|
||||
return this[Math.floorMod(index + direction, size)]
|
||||
|
||||
@@ -47,6 +47,7 @@ import androidx.compose.material.icons.outlined.Pause
|
||||
import androidx.compose.material.icons.outlined.PictureInPictureAlt
|
||||
import androidx.compose.material.icons.automirrored.outlined.ExitToApp
|
||||
import androidx.compose.material.icons.outlined.Settings
|
||||
import androidx.compose.material.icons.outlined.Tune
|
||||
import androidx.compose.material.icons.outlined.Speed
|
||||
import androidx.compose.material.icons.outlined.SportsEsports
|
||||
import androidx.compose.material3.Icon
|
||||
@@ -162,7 +163,7 @@ import com.droiddeck.launcher.input.TouchGestureConfig.Companion.MOUSE_BEHAVIOR_
|
||||
import kotlinx.coroutines.flow.collect
|
||||
import java.util.Locale
|
||||
|
||||
private val SessionDrawerPage.title: Int get() = when (this) {
|
||||
internal val SessionDrawerPage.title: Int get() = when (this) {
|
||||
SessionDrawerPage.CONTROLLER -> R.string.drawer_page_controller
|
||||
SessionDrawerPage.GLASSES -> R.string.drawer_page_glasses
|
||||
SessionDrawerPage.DISPLAY -> R.string.drawer_page_display
|
||||
@@ -174,7 +175,7 @@ private val SessionDrawerPage.title: Int get() = when (this) {
|
||||
SessionDrawerPage.SESSION -> R.string.mode_session
|
||||
}
|
||||
|
||||
private val SessionDrawerPage.icon get() = when (this) {
|
||||
internal val SessionDrawerPage.icon get() = when (this) {
|
||||
SessionDrawerPage.CONTROLLER -> Icons.Outlined.SportsEsports
|
||||
SessionDrawerPage.GLASSES -> GlassesIcon
|
||||
SessionDrawerPage.DISPLAY -> Icons.Outlined.DesktopWindows
|
||||
@@ -392,7 +393,10 @@ class DrawerActions(
|
||||
internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, controllerActive: Boolean, onPageChange: (SessionDrawerPage) -> Unit, a: DrawerActions, docked: Boolean = false,
|
||||
backRequest: Int = 0, onLayerChange: (Boolean) -> Unit = {}) {
|
||||
val pages = sessionDrawerPages(a.glassesPresent)
|
||||
val page = requestedPage.takeIf { it in pages } ?: SessionDrawerPage.CONTROLLER
|
||||
val page = requestedPage.takeIf { it in pages } ?: pages.first()
|
||||
var managing by rememberSaveable { mutableStateOf(false) }
|
||||
var releaseSignal by remember { mutableStateOf(0) }
|
||||
val drawerContext = androidx.compose.ui.platform.LocalContext.current
|
||||
LaunchedEffect(requestedPage, pages) { if (page != requestedPage) onPageChange(page) }
|
||||
val colors = MaterialTheme.colorScheme
|
||||
val pal = LocalPalette.current
|
||||
@@ -509,16 +513,24 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont
|
||||
.blockTouches()
|
||||
.focusGroup()
|
||||
.controllerBack {
|
||||
if (host.open != null) host.open = null else a.onClose()
|
||||
when {
|
||||
host.open != null -> host.open = null
|
||||
managing -> DrawerPages.heldFrom?.let { held ->
|
||||
DrawerPages.rearrange(drawerContext, held)
|
||||
releaseSignal++
|
||||
} ?: run { managing = false }
|
||||
else -> a.onClose()
|
||||
}
|
||||
}
|
||||
.padding(12.dp),
|
||||
) {
|
||||
val showPicker = a.secondScreenDisplays.isNotEmpty()
|
||||
val roomyHeader = sheetWidth >= if (showPicker) 560.dp else 408.dp
|
||||
Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp), modifier = Modifier.fillMaxWidth()) {
|
||||
Row(
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.spacedBy(6.dp),
|
||||
modifier = Modifier.fillMaxWidth().heightIn(min = 44.dp)
|
||||
modifier = Modifier.weight(1f).heightIn(min = 44.dp)
|
||||
.then(if (roomyHeader) Modifier else Modifier.horizontalScroll(rememberScrollState())),
|
||||
) {
|
||||
SteamActionPill(
|
||||
@@ -540,7 +552,6 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont
|
||||
if (a.pipSupported) SteamActionPill(
|
||||
stringResource(R.string.pip_title), Icons.Outlined.PictureInPictureAlt, focus.track(page, "pip"),
|
||||
) { host.open = null; a.onPip() }
|
||||
if (docked) StopSessionButton(modifier = focus.track(page, "stop").onGloballyPositioned { stopCoords = it }) { host.open = null; confirmStop = true }
|
||||
val steamActions = a.steam && a.onSteamMenu != null && a.onQam != null
|
||||
val qamInteraction = remember { MutableInteractionSource() }
|
||||
var qamStartedOnPress by remember { mutableStateOf(false) }
|
||||
@@ -570,7 +581,8 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont
|
||||
onQamConfirm = { host.open = null; a.onQam?.invoke() },
|
||||
showShortcuts = !docked,
|
||||
)
|
||||
if (!docked) StopSessionButton(modifier = focus.track(page, "stop").onGloballyPositioned { stopCoords = it }) { host.open = null; confirmStop = true }
|
||||
}
|
||||
StopSessionButton(modifier = focus.track(page, "stop").onGloballyPositioned { stopCoords = it }) { host.open = null; confirmStop = true }
|
||||
}
|
||||
a.onAchievements?.let { show ->
|
||||
DrawerAchievementsRow(a.achievementsProgress, Modifier.padding(top = if (short) 6.dp else 10.dp).then(focus.track(page, "achievements"))) {
|
||||
@@ -589,7 +601,15 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont
|
||||
DrawerBumper("RB", stringResource(R.string.drawer_next_page), modifier = focus.track(page, "next")) {
|
||||
host.open = null; onPageChange(pages.step(page, 1))
|
||||
}
|
||||
SmallIconButton(
|
||||
Icons.Outlined.Tune, stringResource(R.string.drawer_manage_pages), colors.onSurfaceVariant,
|
||||
) { host.open = null; managing = !managing }
|
||||
}
|
||||
if (managing) ManageDrawerPages(
|
||||
offeredDrawerPages(a.glassesPresent),
|
||||
Modifier.weight(1f).fillMaxWidth().padding(top = 8.dp, start = 14.dp, end = 14.dp),
|
||||
releaseSignal,
|
||||
) { managing = false } else {
|
||||
if (page == SessionDrawerPage.GLASSES) SegmentedTabs(
|
||||
glassesPages, glassesTab, modifier = Modifier.fillMaxWidth().padding(top = 8.dp),
|
||||
tabModifier = { key -> focus.track(page, "glasses-tab-$key").testTag("glasses-tab-$key") },
|
||||
@@ -926,6 +946,7 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont
|
||||
}
|
||||
}
|
||||
} }
|
||||
}
|
||||
}
|
||||
StopConfirm(
|
||||
open = confirmStop,
|
||||
@@ -983,7 +1004,7 @@ private fun DrawerActionButton(text: String, icon: androidx.compose.ui.graphics.
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun DrawerOutlineButton(text: String, modifier: Modifier = Modifier, progress: Float? = null, onClick: () -> Unit) {
|
||||
internal fun DrawerOutlineButton(text: String, modifier: Modifier = Modifier, progress: Float? = null, onClick: () -> Unit) {
|
||||
val colors = MaterialTheme.colorScheme
|
||||
val pal = LocalPalette.current
|
||||
val source = remember { MutableInteractionSource() }
|
||||
@@ -1005,15 +1026,14 @@ private fun StopSessionButton(modifier: Modifier = Modifier, onClick: () -> Unit
|
||||
val src = remember { MutableInteractionSource() }
|
||||
val hot = src.collectIsFocusedAsState().value || src.collectIsHoveredAsState().value
|
||||
val fill by animateColorAsState(if (hot) colors.error.copy(alpha = 0.18f) else Color.Transparent, Motion.tw(220), label = "dangerFill")
|
||||
val shape = RoundedCornerShape(20.dp)
|
||||
val shape = androidx.compose.foundation.shape.CircleShape
|
||||
val stopDescription = stringResource(R.string.stop_session)
|
||||
Row(
|
||||
verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.Center,
|
||||
modifier = modifier.heightIn(min = 44.dp).widthIn(min = 44.dp).semantics { contentDescription = stopDescription }.testTag("drawer-stop")
|
||||
modifier = modifier.size(44.dp).semantics { contentDescription = stopDescription }.testTag("drawer-stop")
|
||||
.clip(shape).background(fill).glideBorder(hot, shape, colors.error.copy(alpha = 0.9f), colors.error.copy(alpha = 0.55f))
|
||||
.hoverable(src).clickable(role = androidx.compose.ui.semantics.Role.Button, interactionSource = src, indication = LocalIndication.current, onClick = onClick)
|
||||
.controllerConfirm(onClick = onClick)
|
||||
.padding(horizontal = 12.dp),
|
||||
.controllerConfirm(onClick = onClick),
|
||||
) {
|
||||
Icon(Icons.Outlined.PowerSettingsNew, contentDescription = null, tint = colors.error, modifier = Modifier.size(18.dp))
|
||||
}
|
||||
|
||||
@@ -118,6 +118,8 @@ internal fun SortableRows(
|
||||
rowHeight: androidx.compose.ui.unit.Dp,
|
||||
handleWidth: androidx.compose.ui.unit.Dp,
|
||||
onActivate: (String) -> Unit,
|
||||
onGrab: (before: List<String>?) -> Unit = {},
|
||||
releaseSignal: Int = 0,
|
||||
row: @Composable (key: String, held: Boolean, offset: Float, hint: String?, modifier: Modifier, onFocus: (Boolean) -> Unit) -> Unit,
|
||||
) {
|
||||
val pad = LocalInputModeManager.current.inputMode == InputMode.Keyboard
|
||||
@@ -129,6 +131,9 @@ internal fun SortableRows(
|
||||
val rowPx = with(LocalDensity.current) { rowHeight.toPx() }
|
||||
val handlePx = with(LocalDensity.current) { handleWidth.toPx() }
|
||||
val list = rows()
|
||||
val grab by rememberUpdatedState(onGrab)
|
||||
LaunchedEffect(grabbed) { grab(if (grabbed != null) before else null) }
|
||||
LaunchedEffect(releaseSignal) { if (releaseSignal > 0) grabbed = null }
|
||||
Column(
|
||||
Modifier.fillMaxWidth().pointerInput(Unit) {
|
||||
awaitEachGesture {
|
||||
|
||||
Reference in new issue
Block a user