From a18676467ae2fc2dd51ccc0cb99c1398e5c1dc5d Mon Sep 17 00:00:00 2001 From: rushiiMachine <33725716+rushiiMachine@users.noreply.github.com> Date: Sat, 5 Jul 2025 17:37:21 -0700 Subject: [PATCH] fix: text displays when large system font --- .../aliucord/manager/ui/components/ProjectHeader.kt | 4 +++- .../ui/screens/patching/components/StepGroupCard.kt | 12 +++++++----- .../manager/ui/util/ArrangementLastAtBottom.kt | 2 -- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/components/ProjectHeader.kt b/app/src/main/kotlin/com/aliucord/manager/ui/components/ProjectHeader.kt index ba6a397..15cb0fa 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/components/ProjectHeader.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/components/ProjectHeader.kt @@ -9,6 +9,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.aliucord.manager.BuildConfig @@ -40,7 +41,8 @@ fun ProjectHeader(modifier: Modifier = Modifier) { text = stringResource(R.string.app_description), style = MaterialTheme.typography.titleSmall.copy( color = MaterialTheme.colorScheme.onSurface.copy(alpha = .6f) - ) + ), + textAlign = TextAlign.Center, ) Row( diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/components/StepGroupCard.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/components/StepGroupCard.kt index 00f33f1..2851575 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/components/StepGroupCard.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/components/StepGroupCard.kt @@ -1,8 +1,7 @@ package com.aliucord.manager.ui.screens.patching.components import androidx.compose.animation.AnimatedVisibility -import androidx.compose.foundation.background -import androidx.compose.foundation.clickable +import androidx.compose.foundation.* import androidx.compose.foundation.layout.* import androidx.compose.material3.* import androidx.compose.runtime.* @@ -73,9 +72,12 @@ fun StepGroupCard( size = 24.dp, ) - Text(text = name) - - Spacer(modifier = Modifier.weight(1f)) + Text( + text = name, + modifier = Modifier + .basicMarquee() + .weight(0.05f), + ) TimeElapsed( enabled = groupState.isFinished, diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/util/ArrangementLastAtBottom.kt b/app/src/main/kotlin/com/aliucord/manager/ui/util/ArrangementLastAtBottom.kt index fed41a3..8d7ebc3 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/util/ArrangementLastAtBottom.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/util/ArrangementLastAtBottom.kt @@ -37,8 +37,6 @@ class ArrangementLastAtBottom( lastSpace = min(spacingPx, totalSize - outPositions[index] - size) occupied = outPositions[index] + size + lastSpace } - - occupied -= lastSpace } }