yovinchen/bookkeeping
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

1.2.4稳定版 #3

Merged
yovinchen merged 40 commits from develop into master 2024-12-05 16:52:26 +08:00
Conversation 0 Commits 40 Files Changed 65 +63 -16
2 changed files with 63 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 37b91ded7f - Show all commits

77
app/src/main/java/com/yovinchen/bookkeeping/ui/screen/CategoryDetailScreen.kt
View File

@ -62,27 +62,74 @@ fun CategoryDetailScreen(
.padding(padding),
horizontalAlignment = Alignment.CenterHorizontally
) {
// 第一部分：总支出
item {
Card(
modifier = Modifier
.fillMaxWidth()
.padding(16.dp),
elevation = CardDefaults.cardElevation(defaultElevation = 4.dp)
) {
Column(
modifier = Modifier
.padding(16.dp),
horizontalAlignment = Alignment.CenterHorizontally
) {
Text(
text = "总支出",
style = MaterialTheme.typography.titleMedium
)
Spacer(modifier = Modifier.height(8.dp))
Text(
text = NumberFormat.getCurrencyInstance(Locale.CHINA).format(total),
style = MaterialTheme.typography.headlineMedium,
fontWeight = FontWeight.Bold
)
}
}
}
// 第二部分：扇形图
item {
Card(
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp, vertical = 8.dp),
elevation = CardDefaults.cardElevation(defaultElevation = 4.dp)
) {
Column(
modifier = Modifier
.padding(16.dp),
horizontalAlignment = Alignment.CenterHorizontally
) {
Text(
text = "成员分布",
style = MaterialTheme.typography.titleMedium,
modifier = Modifier.padding(bottom = 16.dp)
)
CategoryPieChart(
categoryData = memberStats.map { Pair(it.category, it.percentage.toFloat()) },
memberData = emptyList(),
currentViewMode = false,
modifier = Modifier
.fillMaxWidth()
.height(200.dp),
onCategoryClick = { memberName -> onNavigateToMemberDetail(memberName) }
)
}
}
}
// 第三部分：详细信息
item {
Text(
text = NumberFormat.getCurrencyInstance(Locale.CHINA).format(total),
style = MaterialTheme.typography.headlineMedium,
text = "详细记录",
style = MaterialTheme.typography.titleMedium,
modifier = Modifier.padding(16.dp)
)
}
item {
CategoryPieChart(
categoryData = memberStats.map { Pair(it.category, it.percentage.toFloat()) },
memberData = emptyList(),
currentViewMode = false,
modifier = Modifier
.fillMaxWidth()
.padding(16.dp),
onCategoryClick = { memberName -> onNavigateToMemberDetail(memberName) }
)
}
// 按日期分组记录
// 按日期分组的记录列表
val groupedRecords = records.groupBy { record ->
SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(record.date)
}.toSortedMap(compareByDescending { it })

2
app/src/main/java/com/yovinchen/bookkeeping/ui/screen/MemberDetailScreen.kt
View File

@ -75,7 +75,7 @@ fun MemberDetailScreen(
horizontalAlignment = Alignment.CenterHorizontally
) {
Text(
text = "当前分类总支出",
text = "总支出",
style = MaterialTheme.typography.titleMedium
)
Spacer(modifier = Modifier.height(8.dp))