From 0054652044610236c9140bf69d4362e53655143f Mon Sep 17 00:00:00 2001 From: Super12138 <70494801+Super12138@users.noreply.github.com> Date: Sat, 11 Jan 2025 19:59:31 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E7=A9=BA=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../super12138/todo/ui/pages/main/MainPage.kt | 2 +- .../todo/ui/pages/main/ManagerFragment.kt | 51 ++++++++++++++----- app/src/main/res/values-zh-rCN/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 4 files changed, 40 insertions(+), 15 deletions(-) diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/MainPage.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/MainPage.kt index b05a072..4e6b3de 100644 --- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/MainPage.kt +++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/MainPage.kt @@ -98,7 +98,7 @@ fun MainPage(viewModel: MainViewModel, modifier: Modifier = Modifier) { ManagerFragment( state = listState, - list = toDoList.value, + list = toDoList.value.filter { item -> !item.isCompleted }, onItemClick = {}, onItemChecked = { item -> item.apply { diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/ManagerFragment.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/ManagerFragment.kt index 9008a37..807ab8d 100644 --- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/ManagerFragment.kt +++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/ManagerFragment.kt @@ -1,22 +1,30 @@ package cn.super12138.todo.ui.pages.main +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyListState import androidx.compose.foundation.lazy.items +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text 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.unit.dp +import cn.super12138.todo.R import cn.super12138.todo.logic.database.TodoEntity import cn.super12138.todo.ui.pages.main.components.TodoCard @Composable fun ManagerFragment( state: LazyListState, + list: List, onItemClick: (TodoEntity) -> Unit = {}, onItemChecked: (TodoEntity) -> Unit = {}, - list: List, modifier: Modifier = Modifier ) { LazyColumn( @@ -27,19 +35,34 @@ fun ManagerFragment( end = 10.dp, ) ) { - items( - items = list, - key = { it.id } - ) { item -> - TodoCard( - content = item.content, - subject = item.subject, - onCardClick = { onItemClick(item) }, - onChecked = { onItemChecked(item) }, - modifier = Modifier - .padding(vertical = 5.dp) - .animateItem() - ) + if (list.isEmpty()) { + item { + Column( + verticalArrangement = Arrangement.Center, + horizontalAlignment = Alignment.CenterHorizontally, + modifier = Modifier.fillMaxSize() + ) { + Text( + text = stringResource(R.string.tips_no_task), + style = MaterialTheme.typography.titleMedium + ) + } + } + } else { + items( + items = list, + key = { it.id } + ) { item -> + TodoCard( + content = item.content, + subject = item.subject, + onCardClick = { onItemClick(item) }, + onChecked = { onItemChecked(item) }, + modifier = Modifier + .padding(vertical = 5.dp) + .animateItem() + ) + } } } } \ 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 36468eb..ff5f76c 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -3,4 +3,5 @@ 待办 设置 添加待办 + 目前没有任务要完成的,好好休息一些下吧~ \ 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 473e5e5..a212ff1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2,4 +2,5 @@ To Do Settings Add todo + There are no tasks to complete at the moment, take a good rest! \ No newline at end of file