From 7ef264509fd37a698e71bf7b4a1bdbe3328c95fc Mon Sep 17 00:00:00 2001
From: Super12138 <70494801+Super12138@users.noreply.github.com>
Date: Sun, 12 Jan 2025 13:36:36 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=89=A9=E4=BD=99=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../todo/ui/pages/main/ProgressFragment.kt | 12 +++++++++++-
app/src/main/res/values-zh-rCN/strings.xml | 1 +
app/src/main/res/values/strings.xml | 1 +
3 files changed, 13 insertions(+), 1 deletion(-)
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 2eb0c8d..c1f20c3 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
@@ -1,5 +1,6 @@
package cn.super12138.todo.ui.pages.main
+import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
@@ -13,8 +14,10 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
+import cn.super12138.todo.R
@Composable
fun ProgressFragment(
@@ -22,6 +25,7 @@ fun ProgressFragment(
completedTasks: Int,
modifier: Modifier = Modifier
) {
+ val remainTasks = totalTasks - completedTasks
val progress = if (totalTasks != 0) {
completedTasks / totalTasks.toFloat()
} else {
@@ -43,7 +47,7 @@ fun ProgressFragment(
gapSize = 10.dp,
modifier = Modifier.size(170.dp)
)
- Column {
+ Column(horizontalAlignment = Alignment.CenterHorizontally) {
Row(verticalAlignment = Alignment.CenterVertically) {
Text(
text = completedTasks.toString(),
@@ -64,6 +68,12 @@ fun ProgressFragment(
)
)
}
+ AnimatedVisibility(remainTasks != 0) {
+ Text(
+ text = stringResource(R.string.tip_remain_tasks, remainTasks),
+ style = MaterialTheme.typography.labelMedium
+ )
+ }
}
}
}
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 060e30f..95461cf 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -21,4 +21,5 @@
历史
其它
修改待办
+ 剩余 %s 项任务
\ 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 f74ec94..9dbf90f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -20,4 +20,5 @@
History
Others
Edit Task
+ %s tasks remaining
\ No newline at end of file