Merge branch 'develop' into feature/member

修改

app/src/main/java/com/yovinchen/bookkeeping/ui/components/MonthlyStatistics.kt

@@ -1,5 +1,6 @@
 package com.yovinchen.bookkeeping.ui.components
 
+import android.annotation.SuppressLint
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
@@ -22,9 +23,7 @@ import java.time.YearMonth
 
 @Composable
 fun MonthYearPickerDialog(
-    selectedMonth: YearMonth,
+    selectedMonth: YearMonth, onMonthSelected: (YearMonth) -> Unit, onDismiss: () -> Unit
-    onMonthSelected: (YearMonth) -> Unit,
-    onDismiss: () -> Unit
 ) {
     var currentYearMonth by remember { mutableStateOf(selectedMonth) }
 
@@ -71,8 +70,7 @@ fun MonthYearPickerDialog(
 
                 // 月份网格
                 LazyVerticalGrid(
-                    columns = GridCells.Fixed(3),
+                    columns = GridCells.Fixed(3), modifier = Modifier.height(200.dp)
-                    modifier = Modifier.height(200.dp)
                 ) {
                     items(12) { index ->
                         val month = index + 1
@@ -126,6 +124,7 @@ fun MonthYearPickerDialog(
     }
 }
 
+@SuppressLint("DefaultLocale")
 @Composable
 fun MonthlyStatistics(
     totalIncome: Double,
@@ -163,11 +162,9 @@ fun MonthlyStatistics(
                     Icon(Icons.AutoMirrored.Filled.KeyboardArrowLeft, "上个月")
                 }
 
-                Text(
+                Text(text = "${selectedMonth.year}年${selectedMonth.monthValue}月",
-                    text = "${selectedMonth.year}年${selectedMonth.monthValue}月",
                     style = MaterialTheme.typography.titleLarge,
-                    modifier = Modifier.clickable { showMonthPicker = true }
+                    modifier = Modifier.clickable { showMonthPicker = true })
-                )
 
                 IconButton(onClick = onNextMonth) {
                     Icon(Icons.AutoMirrored.Filled.KeyboardArrowRight, "下个月")
@@ -177,24 +174,38 @@ fun MonthlyStatistics(
             Spacer(modifier = Modifier.height(16.dp))
 
             Row(
-                modifier = Modifier.fillMaxWidth(),
+                modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween
-                horizontalArrangement = Arrangement.SpaceBetween
             ) {
-                // 收入统计
+                // 支出统计
-                Column(
+                Column(modifier = Modifier
-                    modifier = Modifier
+                    .weight(1f)
-                        .weight(1f)
+                    .clickable { onExpenseClick() }
-                        .clickable { onIncomeClick() }
+                    .background(
-                        .background(
+                        if (selectedType == TransactionType.EXPENSE) MaterialTheme.colorScheme.primaryContainer
-                            if (selectedType == TransactionType.INCOME) MaterialTheme.colorScheme.primaryContainer
+                        else Color.Transparent, RoundedCornerShape(8.dp)
-                            else Color.Transparent,
+                    )
-                            RoundedCornerShape(8.dp)
+                    .padding(8.dp)) {
-                        )
-                        .padding(8.dp)
-                ) {
                     Text(
-                        text = "收入",
+                        text = "支出", style = MaterialTheme.typography.titleMedium
-                        style = MaterialTheme.typography.titleMedium
+                    )
+                    Text(
+                        text = "¥${String.format("%.2f", totalExpense)}",
+                        style = MaterialTheme.typography.bodyLarge,
+                        color = MaterialTheme.colorScheme.error
+                    )
+                }
+                Spacer(modifier = Modifier.width(16.dp))
+                // 收入统计
+                Column(modifier = Modifier
+                    .weight(1f)
+                    .clickable { onIncomeClick() }
+                    .background(
+                        if (selectedType == TransactionType.INCOME) MaterialTheme.colorScheme.primaryContainer
+                        else Color.Transparent, RoundedCornerShape(8.dp)
+                    )
+                    .padding(8.dp)) {
+                    Text(
+                        text = "收入", style = MaterialTheme.typography.titleMedium
                     )
                     Text(
                         text = "¥${String.format("%.2f", totalIncome)}",
@@ -204,35 +215,30 @@ fun MonthlyStatistics(
                 }
 
                 Spacer(modifier = Modifier.width(16.dp))
-
+                // 结余统计
-                // 支出统计
+                Column(modifier = Modifier
-                Column(
+                    .weight(1f)
-                    modifier = Modifier
+                    .clickable { onClearFilter() }
-                        .weight(1f)
+                    .background(
-                        .clickable { onExpenseClick() }
+                        if (selectedType == TransactionType.INCOME) MaterialTheme.colorScheme.primaryContainer
-                        .background(
+                        else Color.Transparent, RoundedCornerShape(8.dp)
-                            if (selectedType == TransactionType.EXPENSE) MaterialTheme.colorScheme.primaryContainer
+                    )
-                            else Color.Transparent,
+                    .padding(8.dp)) {
-                            RoundedCornerShape(8.dp)
-                        )
-                        .padding(8.dp)
-                ) {
                     Text(
-                        text = "支出",
+                        text = "结余", style = MaterialTheme.typography.titleMedium
-                        style = MaterialTheme.typography.titleMedium
                     )
                     Text(
-                        text = "¥${String.format("%.2f", totalExpense)}",
+                        text = "¥${String.format("%.2f", totalIncome - totalExpense)}",
                         style = MaterialTheme.typography.bodyLarge,
-                        color = MaterialTheme.colorScheme.error
+                        color = if (totalIncome >= totalExpense) MaterialTheme.colorScheme.tertiary
+                        else MaterialTheme.colorScheme.error
                     )
                 }
             }
 
             if (selectedType != null) {
                 TextButton(
-                    onClick = onClearFilter,
+                    onClick = onClearFilter, modifier = Modifier.align(Alignment.End)
-                    modifier = Modifier.align(Alignment.End)
                 ) {
                     Text("清除筛选")
                 }
@@ -241,10 +247,8 @@ fun MonthlyStatistics(
     }
 
     if (showMonthPicker) {
-        MonthYearPickerDialog(
+        MonthYearPickerDialog(selectedMonth = selectedMonth,
-            selectedMonth = selectedMonth,
             onMonthSelected = onMonthSelected,
-            onDismiss = { showMonthPicker = false }
+            onDismiss = { showMonthPicker = false })
-        )
     }
 }