From ddc1771da17d8684606ded327c9b7ececb0a0f06 Mon Sep 17 00:00:00 2001
From: Super12138 <70494801+Super12138@users.noreply.github.com>
Date: Sun, 11 May 2025 13:37:20 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E5=BE=85=E5=8A=9E?=
 =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E7=9A=84=E6=97=A0=E9=9A=9C=E7=A2=8D=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle.kts                          |  2 +-
 .../todo/ui/pages/main/ProgressFragment.kt    | 27 ++++++++++++++++---
 app/src/main/res/values-zh-rCN/strings.xml    |  2 ++
 app/src/main/res/values/strings.xml           |  2 ++
 4 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 1531e38..d4dd776 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -34,7 +34,7 @@ android {
         applicationId = "cn.super12138.todo"
         minSdk = 24
         targetSdk = 36
-        versionCode = 675
+        versionCode = 676
         versionName = "2.1.2"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
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 80bd87c..6593b58 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
@@ -11,6 +11,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.clearAndSetSemantics
+import androidx.compose.ui.semantics.stateDescription
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import cn.super12138.todo.R
@@ -30,6 +32,17 @@ 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
@@ -38,11 +51,18 @@ fun ProgressFragment(
             progress = progress,
             strokeWidth = 10.dp,
             gapSize = 10.dp,
-            modifier = Modifier.size(175.dp)
+            modifier = Modifier
+                .size(175.dp)
+                .clearAndSetSemantics {}
         )
 
         Column(horizontalAlignment = Alignment.CenterHorizontally) {
-            Row(verticalAlignment = Alignment.CenterVertically) {
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                modifier = Modifier.clearAndSetSemantics {
+                    stateDescription = progressDescription
+                }
+            ) {
                 Text(
                     text = completedTasks.toString(),
                     style = MaterialTheme.typography.displaySmall.copy(
@@ -65,7 +85,8 @@ fun ProgressFragment(
             AnimatedVisibility(remainTasks != 0) {
                 Text(
                     text = stringResource(R.string.tip_remain_tasks, remainTasks),
-                    style = MaterialTheme.typography.labelMedium
+                    style = MaterialTheme.typography.labelMedium,
+                    modifier = Modifier.clearAndSetSemantics {}
                 )
             }
         }
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 87b18e4..7a4a3d8 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -110,4 +110,6 @@
     <string name="happy_birthday">待办1岁生日快乐</string>
     <string name="subject_customization">自定义</string>
     <string name="label_enter_subject_name">输入学科名称</string>
+    <string name="accessibility_progress_tasks">当前共有 %1$d 项任务，其中 %2$d 项已完成，%3$d 项未完成</string>
+    <string name="accessibility_progress_no_tasks">当前没有任务</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9e2854f..c2fefa2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -111,4 +111,6 @@
     <string name="happy_birthday">Happy 1st birthday to ToDo</string>
     <string name="subject_customization">Customization</string>
     <string name="label_enter_subject_name">Enter subject name</string>
+    <string name="accessibility_progress_tasks">Currently, there are %1$d tasks in total, with %2$d completed and %3$d unfinished.</string>
+    <string name="accessibility_progress_no_tasks">There are no tasks at the moment.</string>
 </resources>
\ No newline at end of file