From b7dea7e16c7044b7c2d1daaf12506510cbb889bf Mon Sep 17 00:00:00 2001 From: "hasinarak3@gmail.com" Date: Fri, 23 Jan 2026 15:19:13 +0300 Subject: [PATCH] fix! solve syllabe(lyrics) collision with adaptive padding --- .../mg/dot/feufaro/solfa/TimeUnitObject.kt | 46 +++++++++++++------ 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/TimeUnitObject.kt b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/TimeUnitObject.kt index 7f65db8..80c0436 100644 --- a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/TimeUnitObject.kt +++ b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/TimeUnitObject.kt @@ -1,34 +1,52 @@ package mg.dot.feufaro.solfa -import SharedScreenModel -import androidx.compose.foundation.Canvas import androidx.compose.foundation.background -import androidx.compose.foundation.combinedClickable +import androidx.compose.runtime.Composable import androidx.compose.foundation.layout.* -import androidx.compose.material3.LocalTextStyle -import androidx.compose.material3.Text -import androidx.compose.runtime.* -import androidx.compose.ui.Alignment +import androidx.compose.foundation.lazy.grid.GridCells +import androidx.compose.foundation.lazy.grid.LazyGridState +import androidx.compose.foundation.lazy.grid.LazyVerticalGrid import androidx.compose.ui.Modifier +import androidx.compose.material3.Text +import androidx.compose.material3.LocalTextStyle +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue import androidx.compose.ui.draw.drawBehind import androidx.compose.ui.draw.drawWithContent import androidx.compose.ui.geometry.Offset -import androidx.compose.ui.geometry.Size +import androidx.compose.foundation.Canvas +import androidx.compose.foundation.border +import androidx.compose.foundation.combinedClickable import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.drawscope.Stroke import androidx.compose.ui.layout.onSizeChanged import androidx.compose.ui.platform.LocalDensity -import androidx.compose.ui.text.* +import androidx.compose.ui.text.TextLayoutResult +import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.text.style.BaselineShift +import androidx.compose.ui.text.rememberTextMeasurer import androidx.compose.ui.text.style.TextOverflow -import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.TextUnit -import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import mg.dot.feufaro.data.GridTUOData import kotlin.math.min +import androidx.compose.ui.geometry.Size +import androidx.compose.ui.graphics.RectangleShape +import androidx.compose.ui.graphics.drawscope.Stroke +import androidx.compose.ui.text.SpanStyle +import androidx.compose.ui.text.buildAnnotatedString +import androidx.compose.ui.text.style.BaselineShift +import androidx.compose.ui.text.withStyle +import SharedScreenModel +import androidx.compose.runtime.collectAsState +import androidx.compose.ui.Alignment +import androidx.compose.ui.text.TextMeasurer +import kotlinx.coroutines.delay val FEUFAROO_TRIOLET_COLOR = Color.DarkGray val FEUFAROO_KEY_CHANGE_COLOR = Color.Blue @@ -638,7 +656,7 @@ fun LazyVerticalGridTUO( overflow = TextOverflow.Visible, style = TextStyle( color = when { - (isTooLong) -> Color(0XFFBFAC00) + (isTooLong) -> Color(0XFF121212) (index == 0) -> Color.Black else -> Color(0XFF3B3A39) },