From 571a3e21244035c5a1b45d4623a62bf02d80217a Mon Sep 17 00:00:00 2001 From: xXJsonDeruloXx Date: Sat, 26 Sep 2026 15:09:34 -0400 Subject: [PATCH] refactor(ui): move build label into setup about --- .../droiddeck/launcher/ui/FrontEndScreen.kt | 54 ++----------------- 1 file changed, 5 insertions(+), 49 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt index 791ec0aa97..00286f7e5d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -479,7 +479,7 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com } Box(modifier = Modifier.fillMaxSize()) { Column(modifier = Modifier.fillMaxSize()) { - LauncherTopBar(frontFocus.menuToggle, s.buildLabel, a.onCheckLatestBuild) { navOpen = true } + LauncherTopBar(frontFocus.menuToggle) { navOpen = true } content(Modifier.weight(1f).fillMaxWidth()) } AnimatedVisibility( @@ -572,8 +572,6 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com @Composable private fun LauncherTopBar( menuRequester: FocusRequester, - buildLabel: String, - onCheckLatestBuild: () -> Unit, onMenu: () -> Unit, ) { val colors = MaterialTheme.colorScheme @@ -595,11 +593,6 @@ private fun LauncherTopBar( Spacer(Modifier.width(8.dp)) Text("DroidDeck", fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground) Spacer(Modifier.weight(1f)) - BuildStatus( - label = buildLabel, - onCheckLatest = onCheckLatestBuild, - modifier = Modifier.widthIn(max = 220.dp).padding(start = 12.dp, end = 8.dp), - ) } } @@ -814,47 +807,6 @@ private fun Pane( } } -@Composable -private fun BuildStatus(label: String, onCheckLatest: () -> Unit, modifier: Modifier = Modifier) { - val colors = MaterialTheme.colorScheme - val pal = LocalPalette.current - val interaction = remember { MutableInteractionSource() } - val hot = rememberHot(interaction) - val contextDivider = label.indexOf(" ยท ") - val context = if (contextDivider >= 0) label.substring(0, contextDivider) else "" - val identity = if (contextDivider >= 0) label.substring(contextDivider + 3) else label - val identityDivider = identity.lastIndexOf(" at ") - val branch = (if (identityDivider >= 0) identity.substring(0, identityDivider) else identity).substringAfterLast('/') - val commit = if (identityDivider >= 0) identity.substring(identityDivider + 4) else "" - Column( - verticalArrangement = Arrangement.spacedBy(1.dp), - modifier = modifier - .fillMaxWidth() - .clip(RoundedCornerShape(6.dp)) - .semantics { contentDescription = "Build $label. Check for newest build." } - .hoverable(interaction) - .clickable( - interactionSource = interaction, - indication = LocalIndication.current, - role = Role.Button, - onClick = onCheckLatest, - ) - .heightIn(min = 44.dp) - .padding(horizontal = 4.dp, vertical = 3.dp), - ) { - Row( - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(5.dp), - modifier = Modifier.fillMaxWidth(), - ) { - Text(branch, modifier = Modifier.weight(1f), fontSize = 10.sp, fontFamily = FontFamily.Monospace, fontWeight = FontWeight.Medium, color = if (hot) colors.onSurfaceVariant else colors.onSurfaceVariant.copy(alpha = 0.82f), maxLines = 1, overflow = TextOverflow.Ellipsis) - if (commit.isNotEmpty()) Text("@$commit", fontSize = 9.sp, fontFamily = FontFamily.Monospace, fontWeight = FontWeight.Medium, color = colors.onSurfaceVariant.copy(alpha = 0.82f), maxLines = 1) - Icon(Icons.Filled.Refresh, contentDescription = null, tint = if (hot) pal.signal else colors.onSurfaceVariant.copy(alpha = 0.82f), modifier = Modifier.size(12.dp)) - } - if (context.isNotEmpty()) Text(context, fontSize = 9.sp, fontFamily = FontFamily.Monospace, fontWeight = FontWeight.Medium, color = colors.onSurfaceVariant.copy(alpha = 0.82f), maxLines = 1, overflow = TextOverflow.Ellipsis) - } -} - @Composable private fun Backdrop(wash: Pair) { val colors = MaterialTheme.colorScheme @@ -1209,6 +1161,10 @@ private fun SetupPanel( ActionRow("Default Home app", s.defaultHomeLabel ?: "Choose a Home app", "Choose", a.onHomeApp) } } + SettingsGroup("About") { + ActionRow("Build", s.buildLabel, "Check for newer", a.onCheckLatestBuild) + ActionRow("Credits", "The people and projects DroidDeck builds on", "View", a.onCredits) + } } } }