feat: 为饼图添加点击事件

1. 为CategoryPieChart添加点击事件处理
2. 点击饼图可跳转到对应类别详情页面

app/src/main/java/com/yovinchen/bookkeeping/data/BookkeepingDao.kt

@@ -27,6 +27,17 @@ interface BookkeepingDao {
     @Query("SELECT SUM(amount) FROM bookkeeping_records WHERE type = :type AND (memberId = :memberId OR memberId IS NULL)")
     fun getTotalAmountByType(type: TransactionType, memberId: Int? = null): Flow<Double?>
 
+    @Query("""
+        SELECT * FROM bookkeeping_records 
+        WHERE category = :category 
+        AND strftime('%Y-%m', datetime(date/1000, 'unixepoch')) = :yearMonth
+        ORDER BY date DESC
+    """)
+    fun getRecordsByCategoryAndMonth(
+        category: String,
+        yearMonth: String
+    ): Flow<List<BookkeepingRecord>>
+
     @Insert
     suspend fun insertRecord(record: BookkeepingRecord): Long
 

app/src/main/java/com/yovinchen/bookkeeping/data/BookkeepingDatabase.kt

@@ -32,9 +32,9 @@ abstract class BookkeepingDatabase : RoomDatabase() {
         private const val TAG = "BookkeepingDatabase"
 
         private val MIGRATION_1_2 = object : Migration(1, 2) {
-            override fun migrate(database: SupportSQLiteDatabase) {
+            override fun migrate(db: SupportSQLiteDatabase) {
                 // 创建成员表
-                database.execSQL("""
+                db.execSQL("""
                     CREATE TABLE IF NOT EXISTS members (
                         id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
                         name TEXT NOT NULL,
@@ -43,20 +43,20 @@ abstract class BookkeepingDatabase : RoomDatabase() {
                 """)
                 
                 // 插入默认成员
-                database.execSQL("""
+                db.execSQL("""
                     INSERT INTO members (name, description)
                     VALUES ('自己', '默认成员')
                 """)
 
                 // 修改记账记录表，添加成员ID字段
-                database.execSQL("""
+                db.execSQL("""
                     ALTER TABLE bookkeeping_records
                     ADD COLUMN memberId INTEGER DEFAULT NULL
                     REFERENCES members(id) ON DELETE SET NULL
                 """)
 
                 // 更新现有记录，将其关联到默认成员
-                database.execSQL("""
+                db.execSQL("""
                     UPDATE bookkeeping_records
                     SET memberId = (SELECT id FROM members WHERE name = '我自己')
                 """)
@@ -64,9 +64,9 @@ abstract class BookkeepingDatabase : RoomDatabase() {
         }
 
         private val MIGRATION_2_3 = object : Migration(2, 3) {
-            override fun migrate(database: SupportSQLiteDatabase) {
+            override fun migrate(db: SupportSQLiteDatabase) {
                 // 重新创建记账记录表
-                database.execSQL("""
+                db.execSQL("""
                     CREATE TABLE IF NOT EXISTS bookkeeping_records_new (
                         id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
                         amount REAL NOT NULL,
@@ -80,19 +80,19 @@ abstract class BookkeepingDatabase : RoomDatabase() {
                 """)
 
                 // 复制数据
-                database.execSQL("""
+                db.execSQL("""
                     INSERT INTO bookkeeping_records_new (id, amount, type, category, description, date, memberId)
                     SELECT id, amount, type, category, description, date, memberId FROM bookkeeping_records
                 """)
 
                 // 删除旧表
-                database.execSQL("DROP TABLE bookkeeping_records")
+                db.execSQL("DROP TABLE bookkeeping_records")
 
                 // 重命名新表
-                database.execSQL("ALTER TABLE bookkeeping_records_new RENAME TO bookkeeping_records")
+                db.execSQL("ALTER TABLE bookkeeping_records_new RENAME TO bookkeeping_records")
 
                 // 重新创建分类表
-                database.execSQL("""
+                db.execSQL("""
                     CREATE TABLE IF NOT EXISTS categories_new (
                         id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
                         name TEXT NOT NULL,
@@ -101,16 +101,16 @@ abstract class BookkeepingDatabase : RoomDatabase() {
                 """)
 
                 // 复制分类数据
-                database.execSQL("""
+                db.execSQL("""
                     INSERT INTO categories_new (id, name, type)
                     SELECT id, name, type FROM categories
                 """)
 
                 // 删除旧表
-                database.execSQL("DROP TABLE categories")
+                db.execSQL("DROP TABLE categories")
 
                 // 重命名新表
-                database.execSQL("ALTER TABLE categories_new RENAME TO categories")
+                db.execSQL("ALTER TABLE categories_new RENAME TO categories")
             }
         }
 

app/src/main/java/com/yovinchen/bookkeeping/model/AnalysisType.kt

@@ -0,0 +1,7 @@
+package com.yovinchen.bookkeeping.model
+
+enum class AnalysisType {
+    EXPENSE,
+    INCOME,
+    TREND
+}

app/src/main/java/com/yovinchen/bookkeeping/model/CategoryStat.kt

@@ -0,0 +1,8 @@
+package com.yovinchen.bookkeeping.model
+
+data class CategoryStat(
+    val category: String,
+    val amount: Double,
+    val count: Int = 0,
+    val percentage: Double = 0.0
+)

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

@@ -12,16 +12,20 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
 import com.github.mikephil.charting.charts.PieChart
 import com.github.mikephil.charting.components.Legend
+import com.github.mikephil.charting.data.Entry
 import com.github.mikephil.charting.data.PieData
 import com.github.mikephil.charting.data.PieDataSet
 import com.github.mikephil.charting.data.PieEntry
 import com.github.mikephil.charting.formatter.PercentFormatter
+import com.github.mikephil.charting.highlight.Highlight
+import com.github.mikephil.charting.listener.OnChartValueSelectedListener
 import com.github.mikephil.charting.utils.ColorTemplate
 
 @Composable
 fun CategoryPieChart(
     categoryData: List<Pair<String, Float>>,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
+    onCategoryClick: (String) -> Unit = {}
 ) {
     val isDarkTheme = isSystemInDarkTheme()
     val textColor = MaterialTheme.colorScheme.onSurface.toArgb()
@@ -44,12 +48,27 @@ fun CategoryPieChart(
                 setHoleColor(AndroidColor.TRANSPARENT)
                 setTransparentCircleRadius(45f)
 
-                // 设置标签文字颜色为白色（因为标签在彩色扇形上）
-                setEntryLabelColor(AndroidColor.WHITE)
+                // 设置标签文字颜色
+                setEntryLabelColor(textColor)
                 setEntryLabelTextSize(12f)
 
                 // 设置中心文字颜色跟随主题
                 setCenterTextColor(textColor)
+
+                // 添加点击事件监听器
+                setOnChartValueSelectedListener(object : OnChartValueSelectedListener {
+                    override fun onValueSelected(e: Entry?, h: Highlight?) {
+                        e?.let {
+                            if (it is PieEntry) {
+                                onCategoryClick(it.label ?: return)
+                            }
+                        }
+                    }
+
+                    override fun onNothingSelected() {
+                        // 不需要处理
+                    }
+                })
             }
         },
         update = { chart ->
@@ -61,7 +80,7 @@ fun CategoryPieChart(
                 colors = ColorTemplate.MATERIAL_COLORS.toList()
                 valueTextSize = 14f
                 valueFormatter = PercentFormatter(chart)
-                valueTextColor = AndroidColor.WHITE  // 扇形上的数值文字保持白色
+                valueTextColor = textColor
                 setDrawValues(true)
             }
 

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

@@ -0,0 +1,71 @@
+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.*
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.LinearProgressIndicator
+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.unit.dp
+import com.yovinchen.bookkeeping.model.CategoryStat
+
+@SuppressLint("DefaultLocale")
+@Composable
+fun CategoryStatItem(
+    stat: CategoryStat,
+    onClick: () -> Unit
+) {
+    Column(
+        modifier = Modifier
+            .fillMaxWidth()
+            .clickable(onClick = onClick)
+            .padding(vertical = 8.dp)
+    ) {
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Text(
+                text = stat.category,
+                style = MaterialTheme.typography.bodyLarge
+            )
+            Text(
+                text = String.format("%.2f", stat.amount),
+                style = MaterialTheme.typography.bodyLarge
+            )
+        }
+        
+        Spacer(modifier = Modifier.height(4.dp))
+        
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            LinearProgressIndicator(
+                progress = { stat.percentage.toFloat() / 100f },
+                modifier = Modifier
+                    .weight(1f)
+                    .height(8.dp)
+                    .background(
+                        MaterialTheme.colorScheme.surfaceVariant,
+                        RoundedCornerShape(4.dp)
+                    ),
+            )
+            
+            Spacer(modifier = Modifier.width(8.dp))
+            
+            Text(
+                text = String.format("%.1f%%", stat.percentage),
+                style = MaterialTheme.typography.bodyMedium,
+                color = MaterialTheme.colorScheme.onSurfaceVariant
+            )
+        }
+    }
+}

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

@@ -22,6 +22,7 @@ fun RecordItem(
     members: List<Member> = emptyList()
 ) {
     var showDeleteDialog by remember { mutableStateOf(false) }
+//    val dateFormat = remember { SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()) }
     val timeFormat = remember { SimpleDateFormat("HH:mm", Locale.getDefault()) }
     val member = members.find { it.id == record.memberId }
 
@@ -48,14 +49,18 @@ fun RecordItem(
                     style = MaterialTheme.typography.bodyLarge
                 )
                 
-                // 第二行：时间 | 成员 | 详情
+                // 第二行：日期和时间 | 成员 | 详情
                 Text(
                     text = buildString {
+//                        append(dateFormat.format(record.date))
+//                        append(" ")
                         append(timeFormat.format(record.date))
-                        if (member != null && member.name != "自己") {
+//                        if (member != null && member.name != "自己") {
                             append(" | ")
+                        if (member != null) {
                             append(member.name)
                         }
+//                        }
                         if (record.description.isNotEmpty()) {
                             append(" | ")
                             append(record.description)

app/src/main/java/com/yovinchen/bookkeeping/ui/navigation/MainNavigation.kt

@@ -3,6 +3,7 @@ package com.yovinchen.bookkeeping.ui.navigation
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Home
+import androidx.compose.material.icons.filled.List
 import androidx.compose.material.icons.filled.Settings
 import androidx.compose.material.icons.outlined.Analytics
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -16,14 +17,19 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.navigation.NavGraph.Companion.findStartDestination
+import androidx.navigation.NavType
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
+import androidx.navigation.navArgument
 import com.yovinchen.bookkeeping.model.ThemeMode
 import com.yovinchen.bookkeeping.ui.screen.AnalysisScreen
+import com.yovinchen.bookkeeping.ui.screen.CategoryDetailScreen
 import com.yovinchen.bookkeeping.ui.screen.HomeScreen
 import com.yovinchen.bookkeeping.ui.screen.SettingsScreen
+import java.time.YearMonth
+import java.time.format.DateTimeFormatter
 
 sealed class Screen(
     val route: String,
@@ -33,6 +39,14 @@ sealed class Screen(
     data object Home : Screen("home", Icons.Default.Home, "主页")
     data object Analysis : Screen("analysis", Icons.Outlined.Analytics, "分析")
     data object Settings : Screen("settings", Icons.Default.Settings, "设置")
+    data object CategoryDetail : Screen(
+        "category_detail/{category}/{yearMonth}",
+        Icons.Default.List,
+        "分类详情"
+    ) {
+        fun createRoute(category: String, yearMonth: String) =
+            "category_detail/$category/$yearMonth"
+    }
 }
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -78,13 +92,38 @@ fun MainNavigation(
             modifier = Modifier.padding(innerPadding)
         ) {
             composable(Screen.Home.route) { HomeScreen() }
-            composable(Screen.Analysis.route) { AnalysisScreen() }
+            composable(Screen.Analysis.route) {
+                AnalysisScreen(
+                    onNavigateToCategoryDetail = { category, month ->
+                        val monthStr = month.format(DateTimeFormatter.ofPattern("yyyy-MM"))
+                        navController.navigate(Screen.CategoryDetail.createRoute(category, monthStr))
+                    }
+                )
+            }
             composable(Screen.Settings.route) {
                 SettingsScreen(
                     currentTheme = currentTheme,
                     onThemeChange = onThemeChange
                 )
             }
+
+            composable(
+                route = Screen.CategoryDetail.route,
+                arguments = listOf(
+                    navArgument("category") { type = NavType.StringType },
+                    navArgument("yearMonth") { type = NavType.StringType }
+                )
+            ) { backStackEntry ->
+                val category = backStackEntry.arguments?.getString("category") ?: return@composable
+                val yearMonth = YearMonth.parse(
+                    backStackEntry.arguments?.getString("yearMonth") ?: return@composable
+                )
+                CategoryDetailScreen(
+                    category = category,
+                    month = yearMonth,
+                    onBack = { navController.popBackStack() }
+                )
+            }
         }
     }
 }

app/src/main/java/com/yovinchen/bookkeeping/ui/screen/AnalysisScreen.kt

@@ -1,214 +1,116 @@
 package com.yovinchen.bookkeeping.ui.screen
 
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.KeyboardArrowLeft
-import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
+import com.yovinchen.bookkeeping.model.AnalysisType
 import com.yovinchen.bookkeeping.ui.components.CategoryPieChart
+import com.yovinchen.bookkeeping.ui.components.CategoryStatItem
 import com.yovinchen.bookkeeping.ui.components.MonthYearPicker
-import com.yovinchen.bookkeeping.viewmodel.AnalysisType
 import com.yovinchen.bookkeeping.viewmodel.AnalysisViewModel
-import com.yovinchen.bookkeeping.viewmodel.CategoryStat
 import java.time.YearMonth
+import java.time.format.DateTimeFormatter
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun AnalysisScreen(
-    modifier: Modifier = Modifier,
-    viewModel: AnalysisViewModel = viewModel()
+    onNavigateToCategoryDetail: (String, YearMonth) -> Unit
 ) {
+    val viewModel: AnalysisViewModel = viewModel()
     val selectedMonth by viewModel.selectedMonth.collectAsState()
-    val selectedType by viewModel.selectedAnalysisType.collectAsState()
+    val selectedAnalysisType by viewModel.selectedAnalysisType.collectAsState()
     val categoryStats by viewModel.categoryStats.collectAsState()
+
     var showMonthPicker by remember { mutableStateOf(false) }
 
+    Scaffold { padding ->
         Column(
-        modifier = modifier
+            modifier = Modifier
                 .fillMaxSize()
-            .padding(16.dp)
+                .padding(padding)
         ) {
-        // 月份选择器
+            // 月份选择器和类型切换
             Row(
-            modifier = Modifier.fillMaxWidth(),
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(16.dp),
                 horizontalArrangement = Arrangement.SpaceBetween,
                 verticalAlignment = Alignment.CenterVertically
             ) {
-            IconButton(onClick = {
-                viewModel.setSelectedMonth(selectedMonth.minusMonths(1))
-            }) {
-                Icon(Icons.AutoMirrored.Filled.KeyboardArrowLeft, "上个月")
+                // 月份选择按钮
+                Button(onClick = { showMonthPicker = true }) {
+                    Text(selectedMonth.format(DateTimeFormatter.ofPattern("yyyy年MM月")))
                 }
 
-            Text(
-                text = "${selectedMonth.year}年${selectedMonth.monthValue}月",
-                style = MaterialTheme.typography.titleLarge,
-                modifier = Modifier.clickable { showMonthPicker = true }
-            )
-
-            IconButton(onClick = {
-                viewModel.setSelectedMonth(selectedMonth.plusMonths(1))
-            }) {
-                Icon(Icons.AutoMirrored.Filled.KeyboardArrowRight, "下个月")
-            }
-        }
-
-        Spacer(modifier = Modifier.height(16.dp))
-
-        // 分析类型选择
-        Row(
-            modifier = Modifier.fillMaxWidth(),
-            horizontalArrangement = Arrangement.SpaceEvenly
-        ) {
+                // 类型切换
+                Row {
                     AnalysisType.values().forEach { type ->
                         FilterChip(
-                    selected = selectedType == type,
+                            selected = selectedAnalysisType == type,
                             onClick = { viewModel.setAnalysisType(type) },
                             label = {
                                 Text(
                                     when (type) {
-                                AnalysisType.EXPENSE -> "支出分析"
-                                AnalysisType.INCOME -> "收入分析"
-                                AnalysisType.TREND -> "收支趋势"
+                                        AnalysisType.EXPENSE -> "支出"
+                                        AnalysisType.INCOME -> "收入"
+                                        AnalysisType.TREND -> "趋势"
                                     }
                                 )
-                    }
+                            },
+                            modifier = Modifier.padding(horizontal = 4.dp)
                         )
                     }
                 }
+            }
 
-        Spacer(modifier = Modifier.height(16.dp))
-
-        // 统计内容
-        when (selectedType) {
-            AnalysisType.EXPENSE, AnalysisType.INCOME -> {
-                Text(
-                    text = if (selectedType == AnalysisType.EXPENSE) "支出分析" else "收入分析",
-                    style = MaterialTheme.typography.titleMedium,
-                    modifier = Modifier.padding(vertical = 8.dp)
-                )
-
-                if (categoryStats.isEmpty()) {
-                    Box(
+            // 使用LazyColumn包含饼图和列表
+            LazyColumn(
+                modifier = Modifier.fillMaxSize(),
+                contentPadding = PaddingValues(16.dp)
+            ) {
+                // 添加饼图作为第一个项目
+                if (selectedAnalysisType != AnalysisType.TREND) {
+                    item {
+                        CategoryPieChart(
+                            categoryData = categoryStats.map { Pair(it.category, it.percentage.toFloat()) },
                             modifier = Modifier
                                 .fillMaxWidth()
-                            .height(300.dp),
-                        contentAlignment = Alignment.Center
-                    ) {
-                        Text(
-                            text = "暂无数据",
-                            style = MaterialTheme.typography.bodyLarge,
-                            color = MaterialTheme.colorScheme.onSurfaceVariant
-                        )
-                    }
-                } else {
-                    // 添加饼图
-                    CategoryPieChart(
-                        categoryData = categoryStats.map { 
-                            it.category to it.amount.toFloat()
+                                .height(200.dp)
+                                .padding(bottom = 16.dp),
+                            onCategoryClick = { category ->
+                                onNavigateToCategoryDetail(category, selectedMonth)
                             }
                         )
                     }
+                }
 
-                Spacer(modifier = Modifier.height(16.dp))
-
-                // 分类列表
-                LazyColumn {
+                // 添加分类统计列表项目
                 items(categoryStats) { stat ->
-                        CategoryStatItem(stat)
-                    }
-                }
-            }
-            AnalysisType.TREND -> {
-                // TODO: 实现收支趋势图表
-                Text(
-                    text = "收支趋势",
-                    style = MaterialTheme.typography.titleMedium,
-                    modifier = Modifier.padding(vertical = 8.dp)
+                    CategoryStatItem(
+                        stat = stat,
+                        onClick = { onNavigateToCategoryDetail(stat.category, selectedMonth) }
                     )
                 }
             }
         }
 
+        // 月份选择器对话框
         if (showMonthPicker) {
             MonthYearPicker(
                 selectedMonth = selectedMonth,
-            onMonthSelected = { yearMonth ->
-                viewModel.setSelectedMonth(yearMonth)
+                onMonthSelected = {
+                    viewModel.setSelectedMonth(it)
                     showMonthPicker = false
                 },
                 onDismiss = { showMonthPicker = false }
             )
         }
     }
-
-@Composable
-fun CategoryStatItem(stat: CategoryStat) {
-    Card(
-        modifier = Modifier
-            .fillMaxWidth()
-            .padding(vertical = 4.dp),
-        elevation = CardDefaults.cardElevation(defaultElevation = 2.dp)
-    ) {
-        Column(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(16.dp)
-        ) {
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.SpaceBetween,
-                verticalAlignment = Alignment.CenterVertically
-            ) {
-                Text(
-                    text = stat.category,
-                    style = MaterialTheme.typography.titleMedium
-                )
-                Text(
-                    text = String.format("%.1f%%", stat.percentage),
-                    style = MaterialTheme.typography.bodyMedium,
-                    color = MaterialTheme.colorScheme.primary
-                )
-            }
-
-            Spacer(modifier = Modifier.height(8.dp))
-
-            // 进度条
-            LinearProgressIndicator(
-                progress = { (stat.percentage / 100).toFloat() },
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .height(8.dp),
-            )
-
-            Spacer(modifier = Modifier.height(8.dp))
-
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.SpaceBetween
-            ) {
-                Text(
-                    text = "¥${String.format("%.2f", stat.amount)}",
-                    style = MaterialTheme.typography.bodyMedium
-                )
-                Text(
-                    text = "${stat.count}笔",
-                    style = MaterialTheme.typography.bodyMedium,
-                    color = MaterialTheme.colorScheme.outline
-                )
-            }
-        }
-    }
 }

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

@@ -0,0 +1,147 @@
+package com.yovinchen.bookkeeping.ui.screen
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.viewmodel.compose.viewModel
+import com.yovinchen.bookkeeping.data.BookkeepingDatabase
+import com.yovinchen.bookkeeping.model.BookkeepingRecord
+import com.yovinchen.bookkeeping.ui.components.RecordItem
+import com.yovinchen.bookkeeping.viewmodel.CategoryDetailViewModel
+import com.yovinchen.bookkeeping.viewmodel.CategoryDetailViewModelFactory
+import java.text.SimpleDateFormat
+import java.time.YearMonth
+import java.time.format.DateTimeFormatter
+import java.util.Locale
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun CategoryDetailScreen(
+    category: String,
+    month: YearMonth,
+    onBack: () -> Unit
+) {
+    val context = LocalContext.current
+    val database = remember { BookkeepingDatabase.getDatabase(context) }
+    val viewModel: CategoryDetailViewModel = viewModel(
+        factory = CategoryDetailViewModelFactory(database, category, month)
+    )
+
+    val records by viewModel.records.collectAsState()
+    val total by viewModel.total.collectAsState()
+    val members by viewModel.members.collectAsState()
+    val groupedRecords = remember(records) {
+        records.groupBy { record ->
+            SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(record.date)
+        }
+    }
+
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                title = { Text("$category - ${month.format(DateTimeFormatter.ofPattern("yyyy年MM月"))}") },
+                navigationIcon = {
+                    IconButton(onClick = onBack) {
+                        Icon(Icons.Default.ArrowBack, contentDescription = "返回")
+                    }
+                }
+            )
+        }
+    ) { padding ->
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(padding)
+        ) {
+            // 总金额显示
+            Card(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 16.dp, vertical = 8.dp)
+            ) {
+                Row(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(horizontal = 16.dp, vertical = 12.dp),
+                    horizontalArrangement = Arrangement.SpaceBetween,
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    Text(
+                        text = "总金额",
+                        style = MaterialTheme.typography.titleMedium
+                    )
+                    Text(
+                        text = String.format("%.2f", total),
+                        style = MaterialTheme.typography.titleLarge
+                    )
+                }
+            }
+
+            // 记录列表
+            LazyColumn(
+                modifier = Modifier.fillMaxSize(),
+                contentPadding = PaddingValues(16.dp),
+                verticalArrangement = Arrangement.spacedBy(8.dp)
+            ) {
+                groupedRecords.forEach { (date, dayRecords) ->
+                    item {
+                        Card(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .padding(vertical = 4.dp),
+                            elevation = CardDefaults.cardElevation(defaultElevation = 2.dp)
+                        ) {
+                            Column(
+                                modifier = Modifier
+                                    .fillMaxWidth()
+                                    .padding(16.dp)
+                            ) {
+                                // 日期标签
+                                Text(
+                                    text = SimpleDateFormat(
+                                        "yyyy年MM月dd日 E",
+                                        Locale.CHINESE
+                                    ).format(dayRecords.first().date),
+                                    style = MaterialTheme.typography.titleMedium,
+                                    color = MaterialTheme.colorScheme.onSurfaceVariant
+                                )
+
+                                Spacer(modifier = Modifier.height(8.dp))
+
+                                // 当天的记录
+                                Column(
+                                    modifier = Modifier.fillMaxWidth(),
+                                    verticalArrangement = Arrangement.spacedBy(4.dp)
+                                ) {
+                                    dayRecords.forEachIndexed { index, record ->
+                                        RecordItem(
+                                            record = record,
+                                            onClick = {},
+                                            members = members
+                                        )
+
+                                        if (index < dayRecords.size - 1) {
+                                            HorizontalDivider(
+                                                modifier = Modifier.padding(vertical = 4.dp),
+                                                color = MaterialTheme.colorScheme.surfaceVariant,
+                                                thickness = 0.5.dp
+                                            )
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

app/src/main/java/com/yovinchen/bookkeeping/viewmodel/AnalysisViewModel.kt

@@ -4,6 +4,8 @@ import android.app.Application
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.viewModelScope
 import com.yovinchen.bookkeeping.data.BookkeepingDatabase
+import com.yovinchen.bookkeeping.model.AnalysisType
+import com.yovinchen.bookkeeping.model.CategoryStat
 import com.yovinchen.bookkeeping.model.TransactionType
 import kotlinx.coroutines.flow.*
 import java.time.LocalDateTime
@@ -59,14 +61,3 @@ class AnalysisViewModel(application: Application) : AndroidViewModel(application
         _selectedAnalysisType.value = type
     }
 }
-
-enum class AnalysisType {
-    EXPENSE, INCOME, TREND
-}
-
-data class CategoryStat(
-    val category: String,
-    val amount: Double,
-    val count: Int,
-    val percentage: Double = 0.0
-)

app/src/main/java/com/yovinchen/bookkeeping/viewmodel/CategoryDetailViewModel.kt

@@ -0,0 +1,52 @@
+package com.yovinchen.bookkeeping.viewmodel
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.yovinchen.bookkeeping.data.BookkeepingDatabase
+import com.yovinchen.bookkeeping.model.BookkeepingRecord
+import com.yovinchen.bookkeeping.model.Member
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.launch
+import java.time.YearMonth
+import java.time.format.DateTimeFormatter
+
+class CategoryDetailViewModel(
+    private val database: BookkeepingDatabase,
+    private val category: String,
+    private val month: YearMonth
+) : ViewModel() {
+    private val _records = MutableStateFlow<List<BookkeepingRecord>>(emptyList())
+    val records: StateFlow<List<BookkeepingRecord>> = _records
+
+    private val _total = MutableStateFlow(0.0)
+    val total: StateFlow<Double> = _total
+
+    private val _members = MutableStateFlow<List<Member>>(emptyList())
+    val members: StateFlow<List<Member>> = _members
+
+    init {
+        loadRecords()
+        loadMembers()
+    }
+
+    private fun loadRecords() {
+        viewModelScope.launch {
+            val monthStr = month.format(DateTimeFormatter.ofPattern("yyyy-MM"))
+            database.bookkeepingDao().getRecordsByCategoryAndMonth(category, monthStr)
+                .collect { records ->
+                    _records.value = records
+                    _total.value = records.sumOf { it.amount }
+                }
+        }
+    }
+
+    private fun loadMembers() {
+        viewModelScope.launch {
+            database.memberDao().getAllMembers().collect { members ->
+                _members.value = members
+            }
+        }
+    }
+}

app/src/main/java/com/yovinchen/bookkeeping/viewmodel/CategoryDetailViewModelFactory.kt

@@ -0,0 +1,20 @@
+package com.yovinchen.bookkeeping.viewmodel
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import com.yovinchen.bookkeeping.data.BookkeepingDatabase
+import java.time.YearMonth
+
+class CategoryDetailViewModelFactory(
+    private val database: BookkeepingDatabase,
+    private val category: String,
+    private val month: YearMonth
+) : ViewModelProvider.Factory {
+    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+        if (modelClass.isAssignableFrom(CategoryDetailViewModel::class.java)) {
+            @Suppress("UNCHECKED_CAST")
+            return CategoryDetailViewModel(database, category, month) as T
+        }
+        throw IllegalArgumentException("Unknown ViewModel class")
+    }
+}

gradle.properties

@@ -21,3 +21,5 @@ kotlin.code.style=official
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
+# Kotlin
+org.gradle.java.home=/Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home