From c4a7930cfda1973adde73ecdf92aec653942e54e Mon Sep 17 00:00:00 2001 From: Super12138 <70494801+Super12138@users.noreply.github.com> Date: Sun, 11 May 2025 13:49:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=97=A0=E9=9A=9C=E7=A2=8D=E6=8F=8F?= =?UTF-8?q?=E8=BF=B0=E7=B1=BB=E5=9E=8B=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../todo/ui/pages/main/ProgressFragment.kt | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/ProgressFragment.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/ProgressFragment.kt index 6593b58..ee059a9 100644 --- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/ProgressFragment.kt +++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/ProgressFragment.kt @@ -10,9 +10,10 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.clearAndSetSemantics -import androidx.compose.ui.semantics.stateDescription +import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import cn.super12138.todo.R @@ -24,6 +25,8 @@ fun ProgressFragment( completedTasks: Int, modifier: Modifier = Modifier ) { + val context = LocalContext.current + val remainTasks = totalTasks - completedTasks val progress = if (totalTasks != 0) { completedTasks / totalTasks.toFloat() @@ -32,17 +35,6 @@ fun ProgressFragment( 0f } - val progressDescription = if (totalTasks != 0) { - stringResource( - R.string.accessibility_progress_tasks, - totalTasks, - completedTasks, - remainTasks - ) - } else { - stringResource(R.string.accessibility_progress_no_tasks) - } - Box( modifier = modifier, contentAlignment = Alignment.Center @@ -60,7 +52,16 @@ fun ProgressFragment( Row( verticalAlignment = Alignment.CenterVertically, modifier = Modifier.clearAndSetSemantics { - stateDescription = progressDescription + contentDescription = if (totalTasks != 0) { + context.getString( + R.string.accessibility_progress_tasks, + totalTasks, + completedTasks, + remainTasks + ) + } else { + context.getString(R.string.accessibility_progress_no_tasks) + } } ) { Text(