update: 新增默认数据

docs: 更新项目开源协议为 Apache License 2.0
fix: 修改构建版本号
2024-12-10 14:08:07 +08:00 · 2024-12-06 16:34:19 +08:00 · 2024-12-05 17:06:04 +08:00 · 2024-12-05 16:57:35 +08:00 · 2024-12-05 16:55:32 +08:00 · 2024-12-05 16:52:25 +08:00
66 changed files with 2041 additions and 204 deletions
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="EntryPointsManager">
+    <list size="1">
+      <item index="0" class="java.lang.String" itemvalue="androidx.compose.runtime.Composable" />
+    </list>
+  </component>
  <component name="ExternalStorageConfigurationManager" enabled="true" />
  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/build/classes" />
--- a/167
+++ b/167
@@ -1,158 +1,73 @@
-Creative Commons Attribution-NonCommercial 4.0 International
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/

- Creative Commons Corporation (“Creative Commons”) is not a law firm and does not provide legal services or legal advice. Distribution of Creative Commons public licenses does not create a lawyer-client or other relationship. Creative Commons makes its licenses and related information available on an “as-is” basis. Creative Commons gives no warranties regarding its licenses, any material licensed under their terms and conditions, or any related information. Creative Commons disclaims all liability for damages resulting from their use to the fullest extent possible.
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-Using Creative Commons Public Licenses
+1. Definitions.

-Creative Commons public licenses provide a standard set of terms and conditions that creators and other rights holders may use to share original works of authorship and other material subject to copyright and certain other rights specified in the public license below. The following considerations are for informational purposes only, are not exhaustive, and do not form part of our licenses.
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.

-Considerations for licensors: Our public licenses are intended for use by those authorized to give the public permission to use material in ways otherwise restricted by copyright and certain other rights. Our licenses are irrevocable. Licensors should read and understand the terms and conditions of the license they choose before applying it. Licensors should also secure all rights necessary before applying our licenses so that the public can reuse the material as expected. Licensors should clearly mark any material not subject to the license. This includes other CC-licensed material, or material used under an exception or limitation to copyright. More considerations for licensors.
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.

-Considerations for the public: By using one of our public licenses, a licensor grants the public permission to use the licensed material under specified terms and conditions. If the licensor’s permission is not necessary for any reason–for example, because of any applicable exception or limitation to copyright–then that use is not regulated by the license. Our licenses grant only permissions under copyright and certain other rights that a licensor has authority to grant. Use of the licensed material may still be restricted for other reasons, including because others have copyright or other rights in the material. A licensor may make special requests, such as asking that all changes be marked or described. Although not required by our licenses, you are encouraged to respect those requests where reasonable. More considerations for the public.
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.

-Creative Commons Attribution-NonCommercial 4.0 International Public License
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.

-By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-NonCommercial 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.

-Section 1 – Definitions.
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.

-     a.	Adapted Material means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).

-     b.	Adapter's License means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.

-     c.	Copyright and Similar Rights means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."

-     d.	Effective Technological Measures means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements.
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.

-     e.	Exceptions and Limitations means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.
+2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.

-     f.	Licensed Material means the artistic or literary work, database, or other material to which the Licensor applied this Public License.
+3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.

-     g.	Licensed Rights means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.
+4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:

-     h.	Licensor means the individual(s) or entity(ies) granting rights under this Public License.
+     (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and

-     i.	NonCommercial means not primarily intended for or directed towards commercial advantage or monetary compensation. For purposes of this Public License, the exchange of the Licensed Material for other material subject to Copyright and Similar Rights by digital file-sharing or similar means is NonCommercial provided there is no payment of monetary compensation in connection with the exchange.
+     (b) You must cause any modified files to carry prominent notices stating that You changed the files; and

-     j.	Share means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.
+     (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and

-     k.	Sui Generis Database Rights means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.
+     (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.

-     l.	You means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning.
+     You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.

-Section 2 – Scope.
+5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.

-     a.	License grant.
+6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.

-          1. Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:
+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.

-               A. reproduce and Share the Licensed Material, in whole or in part, for NonCommercial purposes only; and
+8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.

-               B. produce, reproduce, and Share Adapted Material for NonCommercial purposes only.
+9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.

-          2. Exceptions and Limitations. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.
+END OF TERMS AND CONDITIONS

-          3. Term. The term of this Public License is specified in Section 6(a).
+APPENDIX: How to apply the Apache License to your work.

-          4. Media and formats; technical modifications allowed. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material.
+To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!)  The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives.

-          5. Downstream recipients.
+Copyright 2024 yovinchen

-               A. Offer from the Licensor – Licensed Material. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at

-               B. No downstream restrictions. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.
+http://www.apache.org/licenses/LICENSE-2.0

-          6. No endorsement. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i).
-
-     b.	Other rights.
-
-          1. Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.
-
-          2. Patent and trademark rights are not licensed under this Public License.
-
-          3. To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties, including when the Licensed Material is used other than for NonCommercial purposes.
-
-Section 3 – License Conditions.
-
-Your exercise of the Licensed Rights is expressly made subject to the following conditions.
-
-     a.	Attribution.
-
-          1. If You Share the Licensed Material (including in modified form), You must:
-
-               A. retain the following if it is supplied by the Licensor with the Licensed Material:
-
-                    i.	identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);
-
-                    ii.	a copyright notice;
-
-                    iii. a notice that refers to this Public License;
-
-                    iv.	a notice that refers to the disclaimer of warranties;
-
-                    v.	a URI or hyperlink to the Licensed Material to the extent reasonably practicable;
-
-               B. indicate if You modified the Licensed Material and retain an indication of any previous modifications; and
-
-               C. indicate the Licensed Material is licensed under this Public License, and include the text of, or the URI or hyperlink to, this Public License.
-
-          2. You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.
-
-          3. If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable.
-
-          4. If You Share Adapted Material You produce, the Adapter's License You apply must not prevent recipients of the Adapted Material from complying with this Public License.
-
-Section 4 – Sui Generis Database Rights.
-
-Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:
-
-     a.	for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database for NonCommercial purposes only;
-
-     b.	if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and
-
-     c.	You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database.
-For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.
-
-Section 5 – Disclaimer of Warranties and Limitation of Liability.
-
-     a.	Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.
-
-     b.	To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.
-
-     c.	The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.
-
-Section 6 – Term and Termination.
-
-     a.	This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.
-
-     b.	Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates:
-
-          1. automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or
-
-          2. upon express reinstatement by the Licensor.
-
-     For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.
-
-     c.	For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.
-
-     d.	Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
-
-Section 7 – Other Terms and Conditions.
-
-     a.	The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.
-
-     b.	Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.
-
-Section 8 – Interpretation.
-
-     a.	For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.
-
-     b.	To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.
-
-     c.	No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.
-
-     d.	Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.
-
-Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances will be considered the “Licensor.” Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as otherwise permitted by the Creative Commons policies published at creativecommons.org/policies, Creative Commons does not authorize the use of the trademark “Creative Commons” or any other trademark or logo of Creative Commons without its prior written consent including, without limitation, in connection with any unauthorized modifications to any of its public licenses or any other arrangements, understandings, or agreements concerning use of licensed material. For the avoidance of doubt, this paragraph does not form part of the public licenses.
-
-Creative Commons may be contacted at creativecommons.org.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@

 ## 🗺 开发路线图

-### 1. 基础记账 (已完成 ✨)
+### 0. 基础记账 (已完成 ✨)
 - [x] 收入/支出记录管理
 - [x] 分类管理系统
 - [x] 自定义日期选择器
@@ -33,41 +33,40 @@
 - [x] 深色/浅色主题切换
 - [x] 主题色自定义

-### 2. 成员系统 (已完成 🎉)
+### 1. 成员系统 (已完成 🎉)
 - [x] 成员添加/编辑/删除
 - [x] 记账时选择相关成员
 - [x] 主页账单修改相关成员
 - [x] 成员消费统计

-### 3. 数据分析 (进行中 🚀)
- [ ] 支出/收入趋势图表
- [ ] 分类占比饼图
+### 2. 图表分析 (已完成 🎉)
+- [x] 支出/收入趋势图表
+- [x] 分类占比饼图
 - [ ] 月度/年度报表
- [ ] 成员消费分析
- [ ] 自定义统计周期
+- [x] 成员消费分析
+- [x] 自定义统计周期

-### 4. 数据管理 (计划中 📝)
+### 3. 数据管理 (进行中 🚀)
 - [ ] 导出 CSV/Excel 功能
- [ ] 云端备份支持
 - [ ] 数据迁移工具
 - [ ] 定期自动备份
 - [ ] 备份加密功能

-### 5. 预算管理 (计划中 💡)
+### 4. 预算管理 (计划中 💡)
 - [ ] 月度预算设置
 - [ ] 预算超支提醒
 - [ ] 分类预算管理
 - [ ] 成员预算管理
 - [ ] 预算分析报告

-### 6. 体验优化 (持续进行 🔄)
+### 5. 体验优化 (持续进行 🔄)
 - [x] 深色模式支持
 - [ ] 手势操作优化
 - [ ] 快速记账小组件
 - [ ] 多语言支持
 - [ ] 自定义主题

-### 7. 性能提升 (持续进行 ⚡️)
+### 6. 性能提升 (持续进行 ⚡️)
 - [ ] 大数据量处理优化
 - [ ] 启动速度优化
 - [ ] 内存使用优化
@@ -82,9 +81,47 @@
 - `release/*`: 版本发布分支
 - `hotfix/*`: 紧急修复分支

+## 🔄 提交规范
+
+提交信息应遵循以下格式：`<type>: <description>`
+
+### 提交类型（Type）
+
+- `feat`: 新功能（feature）
+- `fix`: 修复bug
+- `docs`: 文档更新（documentation）
+- `style`: 代码格式（不影响代码运行的变动）
+- `refactor`: 代码重构（既不是新增功能，也不是修复bug）
+- `perf`: 性能优化
+- `test`: 测试相关
+- `build`: 构建相关
+- `ci`: 持续集成
+- `chore`: 构建过程或辅助工具的变动
+- `revert`: 回退提交
+- `improvement`: 改进
+
 ## 📝 版本历史

-### v1.1.0 (2024-01-10)
+### v1.2.0 - v1.2.4
+- 分类数据可视化
+  - 支出/收入分类饼图展示
+  - 分类占比详细统计
+  - 分类数据交互和筛选
+- 成员数据可视化
+  - 成员消费饼图展示
+  - 成员支出占比统计
+  - 成员数据交互和筛选
+- 趋势分析
+  - 日收支趋势折线图
+  - 收入支出双线对比
+  - 支持深色/浅色主题
+  - 图表交互和缩放
+- 数据筛选
+  - 支持按日期范围筛选
+  - 支持按收入/支出类型筛选
+  - 支持按成员/分类筛选
+
+### v1.1.0
 - 成员管理功能
  - 成员添加/编辑/删除
  - 记账时选择相关成员
@@ -98,7 +135,7 @@
  - 数据库性能优化
  - 状态管理重构

-### v1.0.0 (2024-01-05)
+### v1.0.0
 - 基础记账功能
  - 收入/支出记录
  - 金额、日期、分类、备注管理
@@ -124,7 +161,7 @@

 ## 📄 许可证

-本项目采用 MIT 许可证 - 查看 [LICENSE](LICENSE) 文件了解详细信息
+本项目采用 Apache License 2.0 许可证 - 查看 [LICENSE](LICENSE) 文件了解详细信息

 ## 📮 联系方式

--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -16,8 +16,8 @@ android {
        applicationId = "com.yovinchen.bookkeeping"
        minSdk = 26
        targetSdk = 34
-        versionCode = 1
-        versionName = "1.0.0"
+        versionCode = 5
+        versionName = "1.2.4"

        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
        vectorDrawables {
@@ -89,6 +89,7 @@ dependencies {
    implementation(libs.androidx.room.common)
    implementation(libs.androidx.navigation.common.ktx)
    implementation(libs.androidx.navigation.compose)
+    implementation(libs.vision.internal.vkp)

    // Room
    val roomVersion = "2.6.1"
@@ -96,6 +97,9 @@ dependencies {
    implementation("androidx.room:room-ktx:$roomVersion")
    ksp("androidx.room:room-compiler:$roomVersion")
    
+    // 图表库
+    implementation("com.github.PhilJay:MPAndroidChart:v3.1.0")
+    implementation("androidx.compose.material:material-icons-extended:1.4.3")
    testImplementation("junit:junit:4.13.2")
    androidTestImplementation("androidx.test.ext:junit:1.1.5")
    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
--- a/app/src/main/java/com/yovinchen/bookkeeping/data/BookkeepingDao.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/data/BookkeepingDao.kt
@@ -3,6 +3,7 @@ package com.yovinchen.bookkeeping.data
 import androidx.room.*
 import com.yovinchen.bookkeeping.model.BookkeepingRecord
 import com.yovinchen.bookkeeping.model.Category
+import com.yovinchen.bookkeeping.model.MemberStat
 import com.yovinchen.bookkeeping.model.TransactionType
 import kotlinx.coroutines.flow.Flow
 import java.util.Date
@@ -27,6 +28,116 @@ 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>>
+
+    @Query("""
+        SELECT * FROM bookkeeping_records 
+        WHERE memberId IN (SELECT id FROM members WHERE name = :memberName)
+        AND strftime('%Y-%m', datetime(date/1000, 'unixepoch')) = :yearMonth
+        ORDER BY date DESC
+    """)
+    fun getRecordsByMemberAndMonth(
+        memberName: String,
+        yearMonth: String
+    ): Flow<List<BookkeepingRecord>>
+
+    @Query("""
+        SELECT 
+            m.name as member,
+            SUM(r.amount) as amount,
+            COUNT(*) as count,
+            (SUM(r.amount) * 100.0 / (SELECT SUM(amount) FROM bookkeeping_records WHERE category = :category AND strftime('%Y-%m', datetime(date/1000, 'unixepoch')) = :yearMonth)) as percentage
+        FROM bookkeeping_records r
+        JOIN members m ON r.memberId = m.id
+        WHERE r.category = :category
+        AND strftime('%Y-%m', datetime(r.date/1000, 'unixepoch')) = :yearMonth
+        GROUP BY m.name
+        ORDER BY amount DESC
+    """)
+    fun getMemberStatsByCategory(
+        category: String,
+        yearMonth: String
+    ): Flow<List<MemberStat>>
+
+    @Query("""
+        SELECT * FROM bookkeeping_records 
+        WHERE category = :category
+        ORDER BY date DESC
+    """)
+    fun getRecordsByCategory(
+        category: String
+    ): Flow<List<BookkeepingRecord>>
+
+    @Query("""
+        SELECT * FROM bookkeeping_records 
+        WHERE category = :category 
+        AND date BETWEEN :startDate AND :endDate
+        ORDER BY date DESC
+    """)
+    fun getRecordsByCategoryAndDateRange(
+        category: String,
+        startDate: Date,
+        endDate: Date
+    ): Flow<List<BookkeepingRecord>>
+
+    @Query("""
+        SELECT * FROM bookkeeping_records 
+        WHERE memberId IN (SELECT id FROM members WHERE name = :memberName)
+        AND date BETWEEN :startDate AND :endDate
+        AND (:transactionType IS NULL OR type = :transactionType)
+        ORDER BY date DESC
+    """)
+    fun getRecordsByMemberAndDateRange(
+        memberName: String,
+        startDate: Date,
+        endDate: Date,
+        transactionType: TransactionType?
+    ): Flow<List<BookkeepingRecord>>
+
+    @Query("""
+        SELECT * FROM bookkeeping_records 
+        WHERE memberId IN (SELECT id FROM members WHERE name = :memberName)
+        AND category = :category
+        AND date BETWEEN :startDate AND :endDate
+        AND (:transactionType IS NULL OR type = :transactionType)
+        ORDER BY date DESC
+    """)
+    fun getRecordsByMemberCategoryAndDateRange(
+        memberName: String,
+        category: String,
+        startDate: Date,
+        endDate: Date,
+        transactionType: TransactionType?
+    ): Flow<List<BookkeepingRecord>>
+
+    @Query("""
+        SELECT 
+            m.name as member,
+            SUM(r.amount) as amount,
+            COUNT(*) as count,
+            (SUM(r.amount) * 100.0 / (SELECT SUM(amount) FROM bookkeeping_records WHERE category = :category AND date BETWEEN :startDate AND :endDate)) as percentage
+        FROM bookkeeping_records r
+        JOIN members m ON r.memberId = m.id
+        WHERE r.category = :category
+        AND r.date BETWEEN :startDate AND :endDate
+        GROUP BY m.name
+        ORDER BY amount DESC
+    """)
+    fun getMemberStatsByCategoryAndDateRange(
+        category: String,
+        startDate: Date,
+        endDate: Date
+    ): Flow<List<MemberStat>>
+
    @Insert
    suspend fun insertRecord(record: BookkeepingRecord): Long

@@ -53,4 +164,50 @@ interface BookkeepingDao {

    @Query("UPDATE bookkeeping_records SET category = :newName WHERE category = :oldName")
    suspend fun updateRecordCategories(oldName: String, newName: String)
+
+    @Query("""
+        SELECT * FROM bookkeeping_records 
+        WHERE memberId IN (SELECT id FROM members WHERE name = :memberName) 
+        AND date BETWEEN :startDate AND :endDate
+        AND (
+            :transactionType IS NULL 
+            OR type = (
+                CASE :transactionType
+                    WHEN 'INCOME' THEN 'INCOME'
+                    WHEN 'EXPENSE' THEN 'EXPENSE'
+                END
+            )
+        )
+        ORDER BY date DESC
+    """)
+    suspend fun getRecordsByMember(
+        memberName: String, 
+        startDate: Date, 
+        endDate: Date,
+        transactionType: TransactionType?
+    ): List<BookkeepingRecord>
+
+    @Query("""
+        SELECT * FROM bookkeeping_records 
+        WHERE memberId IN (SELECT id FROM members WHERE name = :memberName)
+        AND category = :category 
+        AND date BETWEEN :startDate AND :endDate
+        AND (
+            :transactionType IS NULL 
+            OR type = (
+                CASE :transactionType
+                    WHEN 'INCOME' THEN 'INCOME'
+                    WHEN 'EXPENSE' THEN 'EXPENSE'
+                END
+            )
+        )
+        ORDER BY date DESC
+    """)
+    suspend fun getRecordsByMemberAndCategory(
+        memberName: String,
+        category: String,
+        startDate: Date,
+        endDate: Date,
+        transactionType: TransactionType?
+    ): List<BookkeepingRecord>
 }
--- a/app/src/main/java/com/yovinchen/bookkeeping/data/BookkeepingDatabase.kt
+++ b/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")
            }
        }

@@ -137,6 +137,18 @@ abstract class BookkeepingDatabase : RoomDatabase() {
                                    database.memberDao().apply {
                                        if (getMemberCount() == 0) {
                                            insertMember(Member(name = "自己", description = "默认成员"))
+                                            insertMember(Member(name = "老婆", description = "默认成员"))
+                                            insertMember(Member(name = "老公", description = "默认成员"))
+                                            insertMember(Member(name = "家庭", description = "默认成员"))
+                                            insertMember(Member(name = "儿子", description = "默认成员"))
+                                            insertMember(Member(name = "女儿", description = "默认成员"))
+                                            insertMember(Member(name = "爸爸", description = "默认成员"))
+                                            insertMember(Member(name = "妈妈", description = "默认成员"))
+                                            insertMember(Member(name = "爷爷", description = "默认成员"))
+                                            insertMember(Member(name = "奶奶", description = "默认成员"))
+                                            insertMember(Member(name = "外公", description = "默认成员"))
+                                            insertMember(Member(name = "外婆", description = "默认成员"))
+                                            insertMember(Member(name = "其他人", description = "默认成员"))
                                        }
                                    }

--- a/app/src/main/java/com/yovinchen/bookkeeping/data/Converters.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/data/Converters.kt
@@ -3,6 +3,7 @@ package com.yovinchen.bookkeeping.data
 import androidx.room.TypeConverter
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
+import java.util.*

 class Converters {
    private val formatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME
@@ -18,4 +19,14 @@ class Converters {
    fun dateToTimestamp(date: LocalDateTime?): String? {
        return date?.format(formatter)
    }
+
+    @TypeConverter
+    fun fromDate(value: Date?): String? {
+        return value?.time?.toString()
+    }
+
+    @TypeConverter
+    fun toDate(timestamp: String?): Date? {
+        return timestamp?.let { Date(it.toLong()) }
+    }
 }
--- a/app/src/main/java/com/yovinchen/bookkeeping/data/Record.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/data/Record.kt
@@ -12,5 +12,6 @@ data class Record(
    val category: String,
    val description: String,
    val dateTime: LocalDateTime = LocalDateTime.now(),
-    val isExpense: Boolean = true
+    val isExpense: Boolean = true,
+    val member: String = "Default"
 )
--- a/app/src/main/java/com/yovinchen/bookkeeping/model/AnalysisType.kt
+++ b/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
+}
--- a/app/src/main/java/com/yovinchen/bookkeeping/model/BookkeepingRecord.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/model/BookkeepingRecord.kt
@@ -2,6 +2,7 @@ package com.yovinchen.bookkeeping.model

 import androidx.room.Entity
 import androidx.room.ForeignKey
+import androidx.room.Index
 import androidx.room.PrimaryKey
 import androidx.room.TypeConverter
 import androidx.room.TypeConverters
@@ -43,6 +44,9 @@ class Converters {
            childColumns = ["memberId"],
            onDelete = ForeignKey.SET_NULL
        )
+    ],
+    indices = [
+        Index(value = ["memberId"])
    ]
 )
@TypeConverters(Converters::class)
--- a/app/src/main/java/com/yovinchen/bookkeeping/model/CategoryStat.kt
+++ b/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
+)
--- a/app/src/main/java/com/yovinchen/bookkeeping/model/MemberStat.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/model/MemberStat.kt
@@ -0,0 +1,17 @@
+package com.yovinchen.bookkeeping.model
+
+import androidx.room.ColumnInfo
+
+data class MemberStat(
+    @ColumnInfo(name = "member")
+    val member: String,
+    
+    @ColumnInfo(name = "amount")
+    val amount: Double,
+    
+    @ColumnInfo(name = "count")
+    val count: Int,
+    
+    @ColumnInfo(name = "percentage")
+    val percentage: Double = 0.0
+)
--- a/app/src/main/java/com/yovinchen/bookkeeping/ui/components/CategoryPieChart.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/ui/components/CategoryPieChart.kt
@@ -0,0 +1,82 @@
+package com.yovinchen.bookkeeping.ui.components
+
+import android.graphics.Color as AndroidColor
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.foundation.layout.*
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.*
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.toArgb
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.viewinterop.AndroidView
+import com.github.mikephil.charting.charts.PieChart
+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>>,
+    memberData: List<Pair<String, Float>>,
+    currentViewMode: Boolean = false, // false 为分类视图，true 为成员视图
+    modifier: Modifier = Modifier,
+    onCategoryClick: (String) -> Unit = {}
+) {
+    val textColor = MaterialTheme.colorScheme.onSurface.toArgb()
+    val data = if (currentViewMode) memberData else categoryData
+
+    AndroidView(
+        modifier = modifier
+            .fillMaxWidth()
+            .height(300.dp),
+        factory = { context ->
+            PieChart(context).apply {
+                description.isEnabled = false
+                setUsePercentValues(true)
+                setDrawEntryLabels(true)
+                legend.isEnabled = false
+                isDrawHoleEnabled = true
+                holeRadius = 40f
+                setHoleColor(AndroidColor.TRANSPARENT)
+                setTransparentCircleRadius(45f)
+                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 ->
+            val entries = data.map { (label, amount) ->
+                PieEntry(amount, label)
+            }
+
+            val dataSet = PieDataSet(entries, "").apply {
+                colors = ColorTemplate.MATERIAL_COLORS.toList()
+                valueTextSize = 14f
+                valueFormatter = PercentFormatter(chart)
+                valueTextColor = textColor
+                setDrawValues(true)
+            }
+
+            val pieData = PieData(dataSet)
+            chart.data = pieData
+            chart.invalidate()
+        }
+    )
+}
--- a/app/src/main/java/com/yovinchen/bookkeeping/ui/components/CategoryStatItem.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/ui/components/CategoryStatItem.kt
@@ -0,0 +1,76 @@
+package com.yovinchen.bookkeeping.ui.components
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.*
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import com.yovinchen.bookkeeping.model.CategoryStat
+import com.yovinchen.bookkeeping.model.MemberStat
+import java.text.NumberFormat
+import java.util.*
+
+@Composable
+fun CategoryStatItem(
+    stat: Any,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier
+) {
+    val name = when (stat) {
+        is CategoryStat -> stat.category
+        is MemberStat -> stat.member
+        else -> return
+    }
+    
+    val amount = when (stat) {
+        is CategoryStat -> stat.amount
+        is MemberStat -> stat.amount
+        else -> return
+    }
+    
+    val count = when (stat) {
+        is CategoryStat -> stat.count
+        is MemberStat -> stat.count
+        else -> return
+    }
+    
+    val percentage = when (stat) {
+        is CategoryStat -> stat.percentage
+        is MemberStat -> stat.percentage
+        else -> return
+    }
+
+    Card(
+        modifier = modifier
+            .fillMaxWidth()
+            .padding(horizontal = 16.dp, vertical = 4.dp)
+            .clickable(onClick = onClick),
+        elevation = CardDefaults.cardElevation(defaultElevation = 2.dp)
+    ) {
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(16.dp),
+            horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Column(modifier = Modifier.weight(1f)) {
+                Text(
+                    text = name,
+                    style = MaterialTheme.typography.bodyLarge
+                )
+                Text(
+                    text = "${count}笔 · ${String.format("%.1f%%", percentage)}",
+                    style = MaterialTheme.typography.bodySmall,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant
+                )
+            }
+            Text(
+                text = NumberFormat.getCurrencyInstance(Locale.CHINA).format(amount),
+                style = MaterialTheme.typography.titleMedium
+            )
+        }
+    }
+}
--- a/app/src/main/java/com/yovinchen/bookkeeping/ui/components/DateRangePicker.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/ui/components/DateRangePicker.kt
@@ -0,0 +1,62 @@
+package com.yovinchen.bookkeeping.ui.components
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import java.time.YearMonth
+import java.time.format.DateTimeFormatter
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun DateRangePicker(
+    startMonth: YearMonth,
+    endMonth: YearMonth,
+    onStartMonthSelected: (YearMonth) -> Unit,
+    onEndMonthSelected: (YearMonth) -> Unit,
+    modifier: Modifier = Modifier
+) {
+    var showStartMonthPicker by remember { mutableStateOf(false) }
+    var showEndMonthPicker by remember { mutableStateOf(false) }
+    val formatter = DateTimeFormatter.ofPattern("yyyy年MM月")
+
+    Row(
+        modifier = modifier
+            .fillMaxWidth()
+            .padding(horizontal = 16.dp, vertical = 8.dp),
+        horizontalArrangement = Arrangement.SpaceBetween,
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        Button(onClick = { showStartMonthPicker = true }) {
+            Text(startMonth.format(formatter))
+        }
+        Text("至")
+        Button(onClick = { showEndMonthPicker = true }) {
+            Text(endMonth.format(formatter))
+        }
+    }
+
+    if (showStartMonthPicker) {
+        MonthYearPicker(
+            selectedMonth = startMonth,
+            onMonthSelected = {
+                onStartMonthSelected(it)
+                showStartMonthPicker = false
+            },
+            onDismiss = { showStartMonthPicker = false }
+        )
+    }
+
+    if (showEndMonthPicker) {
+        MonthYearPicker(
+            selectedMonth = endMonth,
+            onMonthSelected = {
+                onEndMonthSelected(it)
+                showEndMonthPicker = false
+            },
+            onDismiss = { showEndMonthPicker = false }
+        )
+    }
+}
--- a/app/src/main/java/com/yovinchen/bookkeeping/ui/components/MonthYearPicker.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/ui/components/MonthYearPicker.kt
@@ -0,0 +1,88 @@
+package com.yovinchen.bookkeeping.ui.components
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import java.time.YearMonth
+
+@Composable
+fun MonthYearPicker(
+    selectedMonth: YearMonth,
+    onMonthSelected: (YearMonth) -> Unit,
+    onDismiss: () -> Unit
+) {
+    var year by remember { mutableStateOf(selectedMonth.year) }
+    var month by remember { mutableStateOf(selectedMonth.monthValue) }
+
+    AlertDialog(
+        onDismissRequest = onDismiss,
+        title = { Text("选择月份") },
+        text = {
+            Column(
+                modifier = Modifier.padding(16.dp),
+                horizontalAlignment = Alignment.CenterHorizontally
+            ) {
+                // 年份选择
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                    horizontalArrangement = Arrangement.spacedBy(8.dp)
+                ) {
+                    Text("年份:")
+                    OutlinedButton(
+                        onClick = { year-- }
+                    ) {
+                        Text("-")
+                    }
+                    Text(year.toString())
+                    OutlinedButton(
+                        onClick = { year++ }
+                    ) {
+                        Text("+")
+                    }
+                }
+
+                Spacer(modifier = Modifier.height(16.dp))
+
+                // 月份选择
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                    horizontalArrangement = Arrangement.spacedBy(8.dp)
+                ) {
+                    Text("月份:")
+                    OutlinedButton(
+                        onClick = { 
+                            if (month > 1) month--
+                        }
+                    ) {
+                        Text("-")
+                    }
+                    Text(month.toString())
+                    OutlinedButton(
+                        onClick = { 
+                            if (month < 12) month++
+                        }
+                    ) {
+                        Text("+")
+                    }
+                }
+            }
+        },
+        confirmButton = {
+            TextButton(
+                onClick = {
+                    onMonthSelected(YearMonth.of(year, month))
+                }
+            ) {
+                Text("确定")
+            }
+        },
+        dismissButton = {
+            TextButton(onClick = onDismiss) {
+                Text("取消")
+            }
+        }
+    )
+}
--- a/app/src/main/java/com/yovinchen/bookkeeping/ui/components/RecordItem.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/ui/components/RecordItem.kt
@@ -52,10 +52,8 @@ fun RecordItem(
                Text(
                    text = buildString {
                        append(timeFormat.format(record.date))
-                        if (member != null && member.name != "自己") {
-                            append(" | ")
-                            append(member.name)
-                        }
+                        append(" | ")
+                        append(member?.name ?: "自己")
                        if (record.description.isNotEmpty()) {
                            append(" | ")
                            append(record.description)
--- a/app/src/main/java/com/yovinchen/bookkeeping/ui/components/TrendLineChart.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/ui/components/TrendLineChart.kt
@@ -0,0 +1,173 @@
+package com.yovinchen.bookkeeping.ui.components
+
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.foundation.layout.*
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.*
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.toArgb
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.viewinterop.AndroidView
+import com.github.mikephil.charting.charts.LineChart
+import com.github.mikephil.charting.components.XAxis
+import com.github.mikephil.charting.data.Entry
+import com.github.mikephil.charting.data.LineData
+import com.github.mikephil.charting.data.LineDataSet
+import com.github.mikephil.charting.formatter.ValueFormatter
+import com.yovinchen.bookkeeping.model.BookkeepingRecord
+import com.yovinchen.bookkeeping.model.TransactionType
+import java.text.SimpleDateFormat
+import java.util.*
+
+@Composable
+fun TrendLineChart(
+    records: List<BookkeepingRecord>,
+    modifier: Modifier = Modifier
+) {
+    val isDarkTheme = isSystemInDarkTheme()
+    var textColor = if (isDarkTheme) {
+        MaterialTheme.colorScheme.onSurface.copy(alpha = 0.87f).toArgb()
+    } else {
+        MaterialTheme.colorScheme.onSurface.toArgb()
+    }
+    
+    var gridColor = if (isDarkTheme) {
+        MaterialTheme.colorScheme.onSurface.copy(alpha = 0.2f).toArgb()
+    } else {
+        MaterialTheme.colorScheme.onSurface.copy(alpha = 0.1f).toArgb()
+    }
+
+    val incomeColor = MaterialTheme.colorScheme.primary.toArgb()
+    val expenseColor = MaterialTheme.colorScheme.error.toArgb()
+
+    AndroidView(
+        modifier = modifier
+            .fillMaxWidth()
+            .height(300.dp),
+        factory = { context ->
+            LineChart(context).apply {
+                description.isEnabled = false
+                
+                // 基本设置
+                setDrawGridBackground(false)
+                setDrawBorders(false)
+                
+                // X轴设置
+                xAxis.apply {
+                    position = XAxis.XAxisPosition.BOTTOM
+                    this.textColor = textColor
+                    this.gridColor = gridColor
+                    setDrawGridLines(true)
+                    setDrawAxisLine(true)
+                    labelRotationAngle = -45f
+                    textSize = 12f
+                    yOffset = 10f
+                }
+
+                // Y轴设置
+                axisLeft.apply {
+                    this.textColor = textColor
+                    this.gridColor = gridColor
+                    setDrawGridLines(true)
+                    setDrawAxisLine(true)
+                    textSize = 12f
+                    valueFormatter = object : ValueFormatter() {
+                        override fun getFormattedValue(value: Float): String {
+                            return String.format("%.0f", value)
+                        }
+                    }
+                }
+                axisRight.isEnabled = false
+
+                // 图例设置
+                legend.apply {
+                    this.textColor = textColor
+                    this.textSize = 12f
+                    isEnabled = true
+                    yOffset = 10f
+                }
+
+                // 交互设置
+                setTouchEnabled(true)
+                isDragEnabled = true
+                setScaleEnabled(true)
+                
+                // 边距设置
+                setExtraOffsets(8f, 16f, 8f, 24f)
+            }
+        },
+        update = { chart ->
+            // 按日期分组计算收入和支出
+            val dailyData = records
+                .groupBy { record ->
+                    SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(record.date)
+                }
+                .mapValues { (_, dayRecords) ->
+                    val income = dayRecords
+                        .filter { it.type == TransactionType.INCOME }
+                        .sumOf { it.amount }
+                        .toFloat()
+                    val expense = dayRecords
+                        .filter { it.type == TransactionType.EXPENSE }
+                        .sumOf { it.amount }
+                        .toFloat()
+                    Pair(income, expense)
+                }
+                .toList()
+                .sortedBy { it.first }
+
+            // 创建收入数据点
+            val incomeEntries = dailyData.mapIndexed { index, (_, amounts) ->
+                Entry(index.toFloat(), amounts.first)
+            }
+
+            // 创建支出数据点
+            val expenseEntries = dailyData.mapIndexed { index, (_, amounts) ->
+                Entry(index.toFloat(), amounts.second)
+            }
+
+            // 创建收入数据集
+            val incomeDataSet = LineDataSet(incomeEntries, "收入").apply {
+                color = incomeColor
+                lineWidth = 2.5f
+                setDrawCircles(true)
+                circleRadius = 4f
+                setCircleColor(incomeColor)
+                valueTextColor = textColor
+                valueTextSize = 12f
+                setDrawFilled(true)
+                fillColor = incomeColor
+                fillAlpha = if (isDarkTheme) 40 else 50
+            }
+
+            // 创建支出数据集
+            val expenseDataSet = LineDataSet(expenseEntries, "支出").apply {
+                color = expenseColor
+                lineWidth = 2.5f
+                setDrawCircles(true)
+                circleRadius = 4f
+                setCircleColor(expenseColor)
+                valueTextColor = textColor
+                valueTextSize = 12f
+                setDrawFilled(true)
+                fillColor = expenseColor
+                fillAlpha = if (isDarkTheme) 40 else 50
+            }
+
+            // 设置X轴标签
+            chart.xAxis.valueFormatter = object : ValueFormatter() {
+                override fun getFormattedValue(value: Float): String {
+                    return try {
+                        dailyData[value.toInt()].first.substring(5) // 只显示MM-dd
+                    } catch (e: Exception) {
+                        ""
+                    }
+                }
+            }
+
+            // 更新图表数据
+            chart.data = LineData(incomeDataSet, expenseDataSet)
+            chart.invalidate()
+        }
+    )
+}
--- a/app/src/main/java/com/yovinchen/bookkeeping/ui/navigation/MainNavigation.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/ui/navigation/MainNavigation.kt
@@ -2,40 +2,70 @@ 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.automirrored.filled.List
+import androidx.compose.material.icons.filled.Analytics
 import androidx.compose.material.icons.filled.Settings
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.NavigationBar
 import androidx.compose.material3.NavigationBarItem
-import androidx.compose.material3.NavigationBarItemDefaults
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
-import androidx.navigation.NavDestination.Companion.hierarchy
+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.AnalysisType
 import com.yovinchen.bookkeeping.model.ThemeMode
-import com.yovinchen.bookkeeping.ui.screen.HomeScreen
-import com.yovinchen.bookkeeping.ui.screen.SettingsScreen
+import com.yovinchen.bookkeeping.ui.screen.*
+import java.time.YearMonth
+import java.time.format.DateTimeFormatter

-sealed class Screen(val route: String, val icon: @Composable () -> Unit, val label: String) {
-    object Home : Screen(
-        route = "home",
-        icon = { Icon(Icons.Default.Home, contentDescription = "主页") },
-        label = "主页"
-    )
-    object Settings : Screen(
-        route = "settings",
-        icon = { Icon(Icons.Default.Settings, contentDescription = "设置") },
-        label = "设置"
-    )
+sealed class Screen(
+    val route: String,
+    val title: String,
+    val icon: ImageVector? = null
+) {
+    object Home : Screen("home", "记账", Icons.AutoMirrored.Filled.List)
+    object Analysis : Screen("analysis", "分析", Icons.Default.Analytics)
+    object Settings : Screen("settings", "设置", Icons.Default.Settings)
+    object CategoryDetail : Screen(
+        "category_detail/{category}/{startMonth}/{endMonth}",
+        "分类详情"
+    ) {
+        fun createRoute(
+            category: String,
+            startMonth: YearMonth,
+            endMonth: YearMonth
+        ): String {
+            return "category_detail/$category/${startMonth.format(DateTimeFormatter.ofPattern("yyyy-MM"))}/${endMonth.format(DateTimeFormatter.ofPattern("yyyy-MM"))}"
+        }
+    }
+    object MemberDetail : Screen(
+        "member_detail/{memberName}/{category}/{startMonth}/{endMonth}?type={type}",
+        "成员详情"
+    ) {
+        fun createRoute(
+            memberName: String,
+            category: String,
+            startMonth: YearMonth,
+            endMonth: YearMonth,
+            type: AnalysisType
+        ): String {
+            return "member_detail/$memberName/$category/${startMonth.format(DateTimeFormatter.ofPattern("yyyy-MM"))}/${endMonth.format(DateTimeFormatter.ofPattern("yyyy-MM"))}?type=${type.name}"
+        }
+    }
+
+    companion object {
+        fun bottomNavigationItems() = listOf(Home, Analysis, Settings)
+    }
 }

@OptIn(ExperimentalMaterial3Api::class)
@@ -45,22 +75,18 @@ fun MainNavigation(
    onThemeChange: (ThemeMode) -> Unit
 ) {
    val navController = rememberNavController()
-    val items = listOf(Screen.Home, Screen.Settings)

    Scaffold(
        bottomBar = {
-            NavigationBar(
-                containerColor = MaterialTheme.colorScheme.surface,
-                contentColor = MaterialTheme.colorScheme.onSurface,
-            ) {
+            NavigationBar {
                val navBackStackEntry by navController.currentBackStackEntryAsState()
-                val currentDestination = navBackStackEntry?.destination
+                val currentRoute = navBackStackEntry?.destination?.route

-                items.forEach { screen ->
+                Screen.bottomNavigationItems().forEach { screen ->
                    NavigationBarItem(
-                        icon = screen.icon,
-                        label = { Text(screen.label) },
-                        selected = currentDestination?.hierarchy?.any { it.route == screen.route } == true,
+                        icon = { Icon(screen.icon!!, contentDescription = screen.title) },
+                        label = { Text(screen.title) },
+                        selected = currentRoute == screen.route,
                        onClick = {
                            navController.navigate(screen.route) {
                                popUpTo(navController.graph.findStartDestination().id) {
@@ -69,33 +95,107 @@ fun MainNavigation(
                                launchSingleTop = true
                                restoreState = true
                            }
-                        },
-                        colors = NavigationBarItemDefaults.colors(
-                            selectedIconColor = MaterialTheme.colorScheme.primary,
-                            selectedTextColor = MaterialTheme.colorScheme.primary,
-                            unselectedIconColor = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.6f),
-                            unselectedTextColor = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.6f),
-                            indicatorColor = MaterialTheme.colorScheme.surfaceVariant
-                        )
+                        }
                    )
                }
            }
        }
-    ) { paddingValues ->
+    ) { innerPadding ->
        NavHost(
            navController = navController,
            startDestination = Screen.Home.route,
-            modifier = Modifier.padding(paddingValues)
+            modifier = Modifier.padding(innerPadding)
        ) {
-            composable(Screen.Home.route) {
-                HomeScreen()
+            composable(Screen.Home.route) { HomeScreen() }
+            
+            composable(Screen.Analysis.route) {
+                AnalysisScreen(
+                    onNavigateToCategoryDetail = { category, startMonth, endMonth ->
+                        navController.navigate(Screen.CategoryDetail.createRoute(category, startMonth, endMonth))
+                    },
+                    onNavigateToMemberDetail = { memberName, startMonth, endMonth, analysisType ->
+                        navController.navigate(Screen.MemberDetail.createRoute(memberName, "", startMonth, endMonth, analysisType))
+                    }
+                )
            }
+            
            composable(Screen.Settings.route) {
                SettingsScreen(
                    currentTheme = currentTheme,
                    onThemeChange = onThemeChange
                )
            }
+
+            composable(
+                route = Screen.CategoryDetail.route,
+                arguments = listOf(
+                    navArgument("category") { type = NavType.StringType },
+                    navArgument("startMonth") { type = NavType.StringType },
+                    navArgument("endMonth") { type = NavType.StringType }
+                )
+            ) { backStackEntry ->
+                val category = backStackEntry.arguments?.getString("category") ?: ""
+                val startMonth = YearMonth.parse(
+                    backStackEntry.arguments?.getString("startMonth") ?: "",
+                    DateTimeFormatter.ofPattern("yyyy-MM")
+                )
+                val endMonth = YearMonth.parse(
+                    backStackEntry.arguments?.getString("endMonth") ?: "",
+                    DateTimeFormatter.ofPattern("yyyy-MM")
+                )
+                CategoryDetailScreen(
+                    category = category,
+                    startMonth = startMonth,
+                    endMonth = endMonth,
+                    onNavigateBack = { navController.popBackStack() },
+                    onNavigateToMemberDetail = { memberName ->
+                        navController.navigate(
+                            Screen.MemberDetail.createRoute(
+                                memberName = memberName,
+                                category = category,
+                                startMonth = startMonth,
+                                endMonth = endMonth,
+                                type = AnalysisType.EXPENSE
+                            )
+                        )
+                    }
+                )
+            }
+            composable(
+                route = Screen.MemberDetail.route,
+                arguments = listOf(
+                    navArgument("memberName") { type = NavType.StringType },
+                    navArgument("category") { type = NavType.StringType },
+                    navArgument("startMonth") { type = NavType.StringType },
+                    navArgument("endMonth") { type = NavType.StringType },
+                    navArgument("type") {
+                        type = NavType.StringType
+                        defaultValue = AnalysisType.EXPENSE.name
+                    }
+                )
+            ) { backStackEntry ->
+                val memberName = backStackEntry.arguments?.getString("memberName") ?: ""
+                val category = backStackEntry.arguments?.getString("category") ?: ""
+                val startMonth = YearMonth.parse(
+                    backStackEntry.arguments?.getString("startMonth") ?: "",
+                    DateTimeFormatter.ofPattern("yyyy-MM")
+                )
+                val endMonth = YearMonth.parse(
+                    backStackEntry.arguments?.getString("endMonth") ?: "",
+                    DateTimeFormatter.ofPattern("yyyy-MM")
+                )
+                val type = AnalysisType.valueOf(
+                    backStackEntry.arguments?.getString("type") ?: AnalysisType.EXPENSE.name
+                )
+                MemberDetailScreen(
+                    memberName = memberName,
+                    category = category,
+                    startMonth = startMonth,
+                    endMonth = endMonth,
+                    analysisType = type,
+                    onNavigateBack = { navController.popBackStack() }
+                )
+            }
        }
    }
 }
--- a/app/src/main/java/com/yovinchen/bookkeeping/ui/screen/AnalysisScreen.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/ui/screen/AnalysisScreen.kt
@@ -0,0 +1,203 @@
+package com.yovinchen.bookkeeping.ui.screen
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ArrowDropDown
+import androidx.compose.material3.Button
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.FilterChip
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.viewmodel.compose.viewModel
+import com.yovinchen.bookkeeping.model.AnalysisType
+import com.yovinchen.bookkeeping.model.CategoryStat
+import com.yovinchen.bookkeeping.model.MemberStat
+import com.yovinchen.bookkeeping.ui.components.CategoryPieChart
+import com.yovinchen.bookkeeping.ui.components.CategoryStatItem
+import com.yovinchen.bookkeeping.ui.components.DateRangePicker
+import com.yovinchen.bookkeeping.ui.components.TrendLineChart
+import com.yovinchen.bookkeeping.viewmodel.AnalysisViewModel
+import java.time.YearMonth
+
+enum class ViewMode {
+    CATEGORY, MEMBER
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun AnalysisScreen(
+    onNavigateToCategoryDetail: (String, YearMonth, YearMonth) -> Unit,
+    onNavigateToMemberDetail: (String, YearMonth, YearMonth, AnalysisType) -> Unit,
+    modifier: Modifier = Modifier
+) {
+    val viewModel: AnalysisViewModel = viewModel()
+    val startMonth by viewModel.startMonth.collectAsState()
+    val endMonth by viewModel.endMonth.collectAsState()
+    val selectedAnalysisType by viewModel.selectedAnalysisType.collectAsState()
+    val categoryStats by viewModel.categoryStats.collectAsState()
+    val memberStats by viewModel.memberStats.collectAsState()
+    val records by viewModel.records.collectAsState()
+
+    var showViewModeMenu by remember { mutableStateOf(false) }
+    var currentViewMode by rememberSaveable { mutableStateOf(ViewMode.CATEGORY) }
+
+    Scaffold(
+        modifier = modifier.fillMaxSize()
+    ) { paddingValues ->
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(paddingValues)
+        ) {
+            // 时间区间选择
+            DateRangePicker(
+                startMonth = startMonth,
+                endMonth = endMonth,
+                onStartMonthSelected = viewModel::setStartMonth,
+                onEndMonthSelected = viewModel::setEndMonth
+            )
+
+            // 分析类型和视图模式选择行
+            Row(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 16.dp, vertical = 8.dp),
+                horizontalArrangement = Arrangement.SpaceBetween,
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                // 分类/成员切换下拉菜单
+                Box {
+                    Button(
+                        onClick = { showViewModeMenu = true }
+                    ) {
+                        Text(if (currentViewMode == ViewMode.CATEGORY) "分类" else "成员")
+                        Icon(Icons.Default.ArrowDropDown, "切换视图")
+                    }
+                    DropdownMenu(
+                        expanded = showViewModeMenu,
+                        onDismissRequest = { showViewModeMenu = false }
+                    ) {
+                        DropdownMenuItem(
+                            text = { Text("分类") },
+                            onClick = {
+                                currentViewMode = ViewMode.CATEGORY
+                                showViewModeMenu = false
+                            }
+                        )
+                        DropdownMenuItem(
+                            text = { Text("成员") },
+                            onClick = {
+                                currentViewMode = ViewMode.MEMBER
+                                showViewModeMenu = false
+                            }
+                        )
+                    }
+                }
+
+                // 类型切换
+                Row {
+                    AnalysisType.entries.forEach { type ->
+                        FilterChip(
+                            selected = selectedAnalysisType == type,
+                            onClick = { viewModel.setAnalysisType(type) },
+                            label = {
+                                Text(
+                                    when (type) {
+                                        AnalysisType.EXPENSE -> "支出"
+                                        AnalysisType.INCOME -> "收入"
+                                        AnalysisType.TREND -> "趋势"
+                                    }
+                                )
+                            },
+                            modifier = Modifier.padding(horizontal = 4.dp)
+                        )
+                    }
+                }
+            }
+
+            // 使用LazyColumn包含饼图和列表
+            LazyColumn(
+                modifier = Modifier.fillMaxSize(),
+                contentPadding = PaddingValues(16.dp)
+            ) {
+                when (selectedAnalysisType) {
+                    AnalysisType.TREND -> {
+                        // 趋势视图
+                        item {
+                            if (records.isNotEmpty()) {
+                                TrendLineChart(
+                                    records = records,
+                                    modifier = Modifier
+                                        .fillMaxWidth()
+                                        .height(300.dp)
+                                        .padding(vertical = 16.dp)
+                                )
+                            }
+                        }
+                    }
+                    else -> {
+                        // 饼图视图
+                        item {
+                            CategoryPieChart(
+                                categoryData = categoryStats.map { Pair(it.category, it.percentage.toFloat()) },
+                                memberData = memberStats.map { Pair(it.member, it.percentage.toFloat()) },
+                                currentViewMode = currentViewMode == ViewMode.MEMBER,
+                                modifier = Modifier
+                                    .fillMaxWidth()
+                                    .height(200.dp)
+                                    .padding(bottom = 16.dp),
+                                onCategoryClick = { category ->
+                                    if (currentViewMode == ViewMode.CATEGORY) {
+                                        onNavigateToCategoryDetail(category, startMonth, endMonth)
+                                    } else {
+                                        onNavigateToMemberDetail(category, startMonth, endMonth, selectedAnalysisType)
+                                    }
+                                }
+                            )
+                        }
+
+                        // 统计列表
+                        items(if (currentViewMode == ViewMode.CATEGORY) categoryStats else memberStats) { stat ->
+                            val category = if (stat is CategoryStat) stat.category else null
+                            val member = if (stat is MemberStat) stat.member else null
+
+                            CategoryStatItem(
+                                stat = stat,
+                                onClick = {
+                                    if (currentViewMode == ViewMode.CATEGORY && category != null) {
+                                        onNavigateToCategoryDetail(category, startMonth, endMonth)
+                                    } else if (currentViewMode == ViewMode.MEMBER && member != null) {
+                                        onNavigateToMemberDetail(member, startMonth, endMonth, selectedAnalysisType)
+                                    }
+                                }
+                            )
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
--- a/app/src/main/java/com/yovinchen/bookkeeping/ui/screen/CategoryDetailScreen.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/ui/screen/CategoryDetailScreen.kt
@@ -0,0 +1,291 @@
+package com.yovinchen.bookkeeping.ui.screen
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.ListItem
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.font.FontWeight
+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.model.MemberStat
+import com.yovinchen.bookkeeping.model.TransactionType
+import com.yovinchen.bookkeeping.ui.components.CategoryPieChart
+import com.yovinchen.bookkeeping.ui.components.RecordItem
+import com.yovinchen.bookkeeping.viewmodel.CategoryDetailViewModel
+import com.yovinchen.bookkeeping.viewmodel.CategoryDetailViewModelFactory
+import java.text.NumberFormat
+import java.text.SimpleDateFormat
+import java.time.YearMonth
+import java.util.Locale
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun CategoryDetailScreen(
+    category: String,
+    startMonth: YearMonth,
+    endMonth: YearMonth,
+    onNavigateBack: () -> Unit,
+    onNavigateToMemberDetail: (String) -> Unit,
+    viewModel: CategoryDetailViewModel = viewModel(
+        factory = CategoryDetailViewModelFactory(
+            database = BookkeepingDatabase.getDatabase(LocalContext.current),
+            category = category,
+            startMonth = startMonth,
+            endMonth = endMonth
+        )
+    ),
+    modifier: Modifier = Modifier
+) {
+    val records by viewModel.records.collectAsState()
+    val memberStats by viewModel.memberStats.collectAsState()
+    val total by viewModel.total.collectAsState()
+
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                title = { Text(category) },
+                navigationIcon = {
+                    IconButton(onClick = onNavigateBack) {
+                        Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "返回")
+                    }
+                }
+            )
+        }
+    ) { padding ->
+        LazyColumn(
+            modifier = modifier
+                .fillMaxSize()
+                .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 = if (records.isNotEmpty() && records.first().type == TransactionType.INCOME) "总收入" else "总支出",
+                            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(16.dp)
+                ) {
+                    Column(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(16.dp),
+                        horizontalAlignment = Alignment.CenterHorizontally
+                    ) {
+                        Text(
+                            text = "成员分布",
+                            style = MaterialTheme.typography.titleMedium,
+                            modifier = Modifier.padding(bottom = 16.dp)
+                        )
+                        
+                        // 饼状图
+                        CategoryPieChart(
+                            categoryData = emptyList(),
+                            memberData = memberStats.map { Pair(it.member, it.percentage.toFloat()) },
+                            currentViewMode = true,
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .height(200.dp),
+                            onCategoryClick = { memberName -> 
+                                onNavigateToMemberDetail(memberName)
+                            }
+                        )
+
+                        Spacer(modifier = Modifier.height(16.dp))
+                        HorizontalDivider()
+                        Spacer(modifier = Modifier.height(16.dp))
+
+                        // 成员列表
+                        Column {
+                            memberStats.forEach { stat ->
+                                MemberStatItem(
+                                    stat = stat,
+                                    onClick = { onNavigateToMemberDetail(stat.member) }
+                                )
+                            }
+                        }
+                    }
+                }
+            }
+
+            // 第三部分：详细信息
+            item {
+                Text(
+                    text = "详细记录",
+                    style = MaterialTheme.typography.titleMedium,
+                    modifier = Modifier.padding(16.dp)
+                )
+            }
+
+            // 按日期分组的记录列表
+            val groupedRecords = records.groupBy { record ->
+                SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(record.date)
+            }.toSortedMap(compareByDescending { it })
+
+            groupedRecords.forEach { (date, dayRecords) ->
+                item {
+                    Card(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(horizontal = 16.dp, vertical = 8.dp)
+                    ) {
+                        Column(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .padding(16.dp)
+                        ) {
+                            // 日期标题和总金额
+                            Row(
+                                modifier = Modifier
+                                    .fillMaxWidth()
+                                    .padding(bottom = 8.dp),
+                                horizontalArrangement = Arrangement.SpaceBetween
+                            ) {
+                                Text(
+                                    text = date,
+                                    style = MaterialTheme.typography.titleMedium,
+                                    fontWeight = FontWeight.Bold
+                                )
+                                Text(
+                                    text = NumberFormat.getCurrencyInstance(Locale.CHINA)
+                                        .format(dayRecords.sumOf { it.amount }),
+                                    style = MaterialTheme.typography.titleMedium,
+                                    color = MaterialTheme.colorScheme.error
+                                )
+                            }
+
+                            Spacer(modifier = Modifier.height(8.dp))
+
+                            // 当天的记录列表
+                            dayRecords.forEach { record ->
+                                RecordItem(record = record)
+                                if (record != dayRecords.last()) {
+                                    HorizontalDivider(
+                                        modifier = Modifier.padding(vertical = 8.dp),
+                                        color = MaterialTheme.colorScheme.outlineVariant
+                                    )
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun MemberStatItem(
+    stat: MemberStat,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier
+) {
+    ListItem(
+        headlineContent = { Text(stat.member) },
+        supportingContent = {
+            Text(
+                buildString {
+                    append("金额: ¥%.2f".format(stat.amount))
+                    append(" | ")
+                    append("次数: ${stat.count}")
+                    append(" | ")
+                    append("占比: %.1f%%".format(stat.percentage))
+                }
+            )
+        },
+        modifier = modifier.clickable(onClick = onClick)
+    )
+}
+
+@Composable
+private fun RecordItem(
+    record: BookkeepingRecord,
+    modifier: Modifier = Modifier
+) {
+    Row(
+        modifier = modifier
+            .fillMaxWidth()
+            .padding(vertical = 8.dp),
+        horizontalArrangement = Arrangement.SpaceBetween,
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        Column(
+            modifier = Modifier.weight(1f)
+        ) {
+            Text(
+                text = record.memberId.toString(),  // 暂时显示 memberId，后续可以通过 MemberDao 获取成员名称
+                style = MaterialTheme.typography.titleMedium
+            )
+            if (record.description.isNotBlank()) {
+                Text(
+                    text = record.description,
+                    style = MaterialTheme.typography.bodyMedium,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant
+                )
+            }
+            Text(
+                text = SimpleDateFormat("HH:mm", Locale.getDefault()).format(record.date),
+                style = MaterialTheme.typography.bodySmall,
+                color = MaterialTheme.colorScheme.onSurfaceVariant
+            )
+        }
+        Text(
+            text = NumberFormat.getCurrencyInstance(Locale.CHINA).format(record.amount),
+            style = MaterialTheme.typography.titleMedium,
+            color = MaterialTheme.colorScheme.error
+        )
+    }
+}
--- a/app/src/main/java/com/yovinchen/bookkeeping/ui/screen/MemberDetailScreen.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/ui/screen/MemberDetailScreen.kt
@@ -0,0 +1,226 @@
+package com.yovinchen.bookkeeping.ui.screen
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.viewmodel.compose.viewModel
+import com.yovinchen.bookkeeping.data.Record
+import com.yovinchen.bookkeeping.model.AnalysisType
+import com.yovinchen.bookkeeping.model.TransactionType
+import com.yovinchen.bookkeeping.ui.components.CategoryPieChart
+import com.yovinchen.bookkeeping.ui.components.RecordItem
+import com.yovinchen.bookkeeping.viewmodel.MemberDetailViewModel
+import java.text.NumberFormat
+import java.text.SimpleDateFormat
+import java.time.YearMonth
+import java.util.Locale
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun MemberDetailScreen(
+    memberName: String,
+    startMonth: YearMonth,
+    endMonth: YearMonth,
+    category: String = "",
+    analysisType: AnalysisType = AnalysisType.EXPENSE,
+    onNavigateBack: () -> Unit,
+    viewModel: MemberDetailViewModel = viewModel()
+) {
+    val records by viewModel.memberRecords.collectAsState(initial = emptyList())
+    val totalAmount by viewModel.totalAmount.collectAsState(initial = 0.0)
+    val categoryData by viewModel.categoryData.collectAsState(initial = emptyList())
+
+    LaunchedEffect(memberName, category, startMonth, endMonth, analysisType) {
+        viewModel.loadMemberRecords(
+            memberName = memberName,
+            category = category,
+            startMonth = startMonth,
+            endMonth = endMonth,
+            analysisType = analysisType
+        )
+    }
+
+    val groupedRecords = remember(records) {
+        records.groupBy { record ->
+            SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(record.date)
+        }.toSortedMap(reverseOrder())
+    }
+
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                title = { 
+                    Text(memberName) 
+                },
+                navigationIcon = {
+                    IconButton(onClick = onNavigateBack) {
+                        Icon(Icons.AutoMirrored.Filled.ArrowBack, "返回")
+                    }
+                }
+            )
+        }
+    ) { padding ->
+        LazyColumn(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(padding)
+        ) {
+            // 第一层：总金额卡片
+            item {
+                Card(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(16.dp),
+                    elevation = CardDefaults.cardElevation(defaultElevation = 4.dp)
+                ) {
+                    Column(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(16.dp)
+                    ) {
+                        Text(
+                            text = "总金额",
+                            style = MaterialTheme.typography.titleMedium,
+                            fontWeight = FontWeight.Bold
+                        )
+                        Spacer(modifier = Modifier.height(8.dp))
+                        Text(
+                            text = NumberFormat.getCurrencyInstance(Locale.CHINA)
+                                .format(totalAmount),
+                            style = MaterialTheme.typography.headlineMedium,
+                            color = MaterialTheme.colorScheme.primary
+                        )
+                    }
+                }
+            }
+
+            // 当从成员视图进入时显示饼图
+            if (category.isEmpty()) {
+                item {
+                    Card(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(16.dp),
+                        elevation = CardDefaults.cardElevation(defaultElevation = 4.dp)
+                    ) {
+                        Column(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .padding(16.dp)
+                        ) {
+                            Text(
+                                text = "分类统计",
+                                style = MaterialTheme.typography.titleMedium,
+                                fontWeight = FontWeight.Bold
+                            )
+                            Spacer(modifier = Modifier.height(16.dp))
+                            CategoryPieChart(
+                                categoryData = categoryData,
+                                memberData = emptyList(),
+                                currentViewMode = false,
+                                onCategoryClick = { selectedCategory ->
+                                    // 暂时不处理点击事件
+                                }
+                            )
+                        }
+                    }
+                }
+            }
+
+            // 第二层：按日期分组的记录列表
+            groupedRecords.forEach { (date, dayRecords) ->
+                item {
+                    Card(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(horizontal = 16.dp, vertical = 8.dp),
+                        elevation = CardDefaults.cardElevation(defaultElevation = 2.dp)
+                    ) {
+                        Column(
+                            modifier = Modifier.padding(16.dp)
+                        ) {
+                            Row(
+                                modifier = Modifier
+                                    .fillMaxWidth()
+                                    .padding(bottom = 8.dp),
+                                horizontalArrangement = Arrangement.SpaceBetween
+                            ) {
+                                Text(
+                                    text = date,
+                                    style = MaterialTheme.typography.titleMedium
+                                )
+                                Text(
+                                    text = NumberFormat.getCurrencyInstance(Locale.CHINA)
+                                        .format(dayRecords.sumOf { it.amount }),
+                                    style = MaterialTheme.typography.titleMedium,
+                                    color = MaterialTheme.colorScheme.primary
+                                )
+                            }
+                            dayRecords.forEach { record ->
+                                RecordItem(record = record)
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun RecordItem(record: Record) {
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(vertical = 4.dp),
+        horizontalArrangement = Arrangement.SpaceBetween,
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        Column {
+            if (record.description.isNotBlank()) {
+                Text(
+                    text = record.description,
+                    style = MaterialTheme.typography.bodyMedium
+                )
+            }
+            Text(
+                text = SimpleDateFormat("HH:mm", Locale.getDefault())
+                    .format(record.dateTime),
+                style = MaterialTheme.typography.bodySmall,
+                color = MaterialTheme.colorScheme.onSurfaceVariant
+            )
+        }
+        Text(
+            text = NumberFormat.getCurrencyInstance(Locale.CHINA)
+                .format(record.amount),
+            style = MaterialTheme.typography.bodyMedium,
+            color = MaterialTheme.colorScheme.primary
+        )
+    }
+}
--- a/app/src/main/java/com/yovinchen/bookkeeping/viewmodel/AnalysisViewModel.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/viewmodel/AnalysisViewModel.kt
@@ -0,0 +1,139 @@
+package com.yovinchen.bookkeeping.viewmodel
+
+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.BookkeepingRecord
+import com.yovinchen.bookkeeping.model.CategoryStat
+import com.yovinchen.bookkeeping.model.MemberStat
+import com.yovinchen.bookkeeping.model.TransactionType
+import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.launch
+import java.time.LocalDateTime
+import java.time.YearMonth
+import java.time.ZoneId
+import java.util.*
+
+class AnalysisViewModel(application: Application) : AndroidViewModel(application) {
+    private val recordDao = BookkeepingDatabase.getDatabase(application).bookkeepingDao()
+    private val memberDao = BookkeepingDatabase.getDatabase(application).memberDao()
+
+    private val _startMonth = MutableStateFlow(YearMonth.now())
+    val startMonth: StateFlow<YearMonth> = _startMonth.asStateFlow()
+
+    private val _endMonth = MutableStateFlow(YearMonth.now())
+    val endMonth: StateFlow<YearMonth> = _endMonth.asStateFlow()
+
+    private val _selectedAnalysisType = MutableStateFlow(AnalysisType.EXPENSE)
+    val selectedAnalysisType: StateFlow<AnalysisType> = _selectedAnalysisType.asStateFlow()
+
+    private val _categoryStats = MutableStateFlow<List<CategoryStat>>(emptyList())
+    val categoryStats: StateFlow<List<CategoryStat>> = _categoryStats.asStateFlow()
+
+    private val _memberStats = MutableStateFlow<List<MemberStat>>(emptyList())
+    val memberStats: StateFlow<List<MemberStat>> = _memberStats.asStateFlow()
+
+    private val _records = MutableStateFlow<List<BookkeepingRecord>>(emptyList())
+    val records: StateFlow<List<BookkeepingRecord>> = _records.asStateFlow()
+
+    init {
+        viewModelScope.launch {
+            combine(startMonth, endMonth, selectedAnalysisType) { start, end, type ->
+                Triple(start, end, type)
+            }.collect { (start, end, type) ->
+                updateStats(start, end, type)
+            }
+        }
+    }
+
+    fun setStartMonth(month: YearMonth) {
+        _startMonth.value = month
+    }
+
+    fun setEndMonth(month: YearMonth) {
+        _endMonth.value = month
+    }
+
+    fun setAnalysisType(type: AnalysisType) {
+        _selectedAnalysisType.value = type
+    }
+
+    private suspend fun updateStats(startMonth: YearMonth, endMonth: YearMonth, type: AnalysisType) {
+        val records = recordDao.getAllRecords().first()
+        
+        // 过滤日期范围内的记录
+        val monthRecords = records.filter {
+            val recordDate = Date(it.date.time)
+            val localDateTime = LocalDateTime.ofInstant(recordDate.toInstant(), ZoneId.systemDefault())
+            val yearMonth = YearMonth.from(localDateTime)
+            yearMonth.isAfter(startMonth.minusMonths(1)) && 
+            yearMonth.isBefore(endMonth.plusMonths(1))
+        }
+
+        // 更新记录数据
+        _records.value = monthRecords
+
+        // 根据分析类型过滤记录
+        val filteredRecords = if (type == AnalysisType.TREND) {
+            monthRecords
+        } else {
+            monthRecords.filter {
+                it.type == when(type) {
+                    AnalysisType.EXPENSE -> TransactionType.EXPENSE
+                    AnalysisType.INCOME -> TransactionType.INCOME
+                    else -> return@filter true
+                }
+            }
+        }
+
+        // 更新统计数据
+        updateCategoryStats(filteredRecords)
+        updateMemberStats(filteredRecords)
+    }
+
+    private suspend fun updateCategoryStats(records: List<BookkeepingRecord>) {
+        // 按分类统计
+        val categoryMap = records.groupBy { it.category }
+        val categoryStats = categoryMap.map { (category, records) ->
+            CategoryStat(
+                category = category,
+                amount = records.sumOf { it.amount },
+                count = records.size
+            )
+        }.sortedByDescending { it.amount }
+
+        // 计算分类总额和百分比
+        val categoryTotal = categoryStats.sumOf { it.amount }
+        val categoryStatsWithPercentage = categoryStats.map { 
+            it.copy(percentage = if (categoryTotal > 0) it.amount / categoryTotal * 100 else 0.0) 
+        }
+
+        _categoryStats.value = categoryStatsWithPercentage
+    }
+
+    private suspend fun updateMemberStats(records: List<BookkeepingRecord>) {
+        // 按成员统计
+        val members = memberDao.getAllMembers().first()
+        val memberMap = records.groupBy { record ->
+            members.find { it.id == record.memberId }?.name ?: "未分配"
+        }
+        
+        val memberStats = memberMap.map { (memberName, records) ->
+            MemberStat(
+                member = memberName,
+                amount = records.sumOf { it.amount },
+                count = records.size
+            )
+        }.sortedByDescending { it.amount }
+
+        // 计算成员总额和百分比
+        val memberTotal = memberStats.sumOf { it.amount }
+        val memberStatsWithPercentage = memberStats.map { 
+            it.copy(percentage = if (memberTotal > 0) it.amount / memberTotal * 100 else 0.0) 
+        }
+
+        _memberStats.value = memberStatsWithPercentage
+    }
+}
--- a/app/src/main/java/com/yovinchen/bookkeeping/viewmodel/CategoryDetailViewModel.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/viewmodel/CategoryDetailViewModel.kt
@@ -0,0 +1,69 @@
+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.MemberStat
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.stateIn
+import java.time.YearMonth
+import java.time.ZoneId
+import java.util.Date
+
+class CategoryDetailViewModel(
+    database: BookkeepingDatabase,
+    category: String,
+    startMonth: YearMonth,
+    endMonth: YearMonth
+) : ViewModel() {
+    private val recordDao = database.bookkeepingDao()
+
+    private val _records = MutableStateFlow<List<BookkeepingRecord>>(emptyList())
+    val records: StateFlow<List<BookkeepingRecord>> = _records.asStateFlow()
+
+    private val _memberStats = MutableStateFlow<List<MemberStat>>(emptyList())
+    val memberStats: StateFlow<List<MemberStat>> = _memberStats.asStateFlow()
+
+    val total: StateFlow<Double> = records
+        .map { records -> records.sumOf { it.amount } }
+        .stateIn(
+            scope = viewModelScope,
+            started = SharingStarted.WhileSubscribed(5000),
+            initialValue = 0.0
+        )
+
+    init {
+        val startDate = startMonth.atDay(1).atStartOfDay()
+            .atZone(ZoneId.systemDefault())
+            .toInstant()
+            .let { Date.from(it) }
+
+        val endDate = endMonth.atEndOfMonth().atTime(23, 59, 59)
+            .atZone(ZoneId.systemDefault())
+            .toInstant()
+            .let { Date.from(it) }
+
+        recordDao.getRecordsByCategoryAndDateRange(
+            category = category,
+            startDate = startDate,
+            endDate = endDate
+        )
+        .onEach { records -> _records.value = records }
+        .launchIn(viewModelScope)
+
+        recordDao.getMemberStatsByCategoryAndDateRange(
+            category = category,
+            startDate = startDate,
+            endDate = endDate
+        )
+        .onEach { stats -> _memberStats.value = stats }
+        .launchIn(viewModelScope)
+    }
+}
--- a/app/src/main/java/com/yovinchen/bookkeeping/viewmodel/CategoryDetailViewModelFactory.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/viewmodel/CategoryDetailViewModelFactory.kt
@@ -0,0 +1,21 @@
+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 startMonth: YearMonth,
+    private val endMonth: 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, startMonth, endMonth) as T
+        }
+        throw IllegalArgumentException("Unknown ViewModel class")
+    }
+}
--- a/app/src/main/java/com/yovinchen/bookkeeping/viewmodel/MemberDetailViewModel.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/viewmodel/MemberDetailViewModel.kt
@@ -0,0 +1,83 @@
+package com.yovinchen.bookkeeping.viewmodel
+
+import android.app.Application
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.viewModelScope
+import com.yovinchen.bookkeeping.data.BookkeepingDatabase
+import com.yovinchen.bookkeeping.model.BookkeepingRecord
+import com.yovinchen.bookkeeping.model.AnalysisType
+import com.yovinchen.bookkeeping.model.TransactionType
+import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.launch
+import java.time.YearMonth
+import java.time.ZoneId
+import java.util.Date
+
+class MemberDetailViewModel(application: Application) : AndroidViewModel(application) {
+    private val database = BookkeepingDatabase.getDatabase(application)
+    private val recordDao = database.bookkeepingDao()
+
+    private val _memberRecords = MutableStateFlow<List<BookkeepingRecord>>(emptyList())
+    val memberRecords: StateFlow<List<BookkeepingRecord>> = _memberRecords.asStateFlow()
+
+    private val _totalAmount = MutableStateFlow(0.0)
+    val totalAmount: StateFlow<Double> = _totalAmount.asStateFlow()
+
+    private val _categoryData = MutableStateFlow<List<Pair<String, Float>>>(emptyList())
+    val categoryData: StateFlow<List<Pair<String, Float>>> = _categoryData.asStateFlow()
+
+    fun loadMemberRecords(
+        memberName: String,
+        category: String,
+        startMonth: YearMonth,
+        endMonth: YearMonth,
+        analysisType: AnalysisType
+    ) {
+        val startDate = startMonth.atDay(1).atStartOfDay()
+            .atZone(ZoneId.systemDefault())
+            .toInstant()
+            .let { Date.from(it) }
+
+        val endDate = endMonth.atEndOfMonth().atTime(23, 59, 59)
+            .atZone(ZoneId.systemDefault())
+            .toInstant()
+            .let { Date.from(it) }
+
+        val transactionType = when (analysisType) {
+            AnalysisType.INCOME -> TransactionType.INCOME
+            AnalysisType.EXPENSE -> TransactionType.EXPENSE
+            else -> null
+        }
+
+        val recordsFlow = if (category.isEmpty()) {
+            recordDao.getRecordsByMemberAndDateRange(
+                memberName = memberName,
+                startDate = startDate,
+                endDate = endDate,
+                transactionType = transactionType
+            )
+        } else {
+            recordDao.getRecordsByMemberCategoryAndDateRange(
+                memberName = memberName,
+                category = category,
+                startDate = startDate,
+                endDate = endDate,
+                transactionType = transactionType
+            )
+        }
+
+        viewModelScope.launch {
+            recordsFlow.collect { records ->
+                _memberRecords.value = records
+                _totalAmount.value = records.sumOf { it.amount }
+                
+                // 计算分类数据
+                val categoryAmounts = records.groupBy { it.category }
+                    .mapValues { (_, records) -> records.sumOf { it.amount }.toFloat() }
+                    .toList()
+                    .sortedByDescending { it.second }
+                _categoryData.value = categoryAmounts
+            }
+        }
+    }
+}
--- a/app/src/main/res/drawable/category/ic_category_baby_24dp.xml
+++ b/app/src/main/res/drawable/category/ic_category_baby_24dp.xml
--- a/app/src/main/res/drawable/category/ic_category_bar_24dp.xml
+++ b/app/src/main/res/drawable/category/ic_category_bar_24dp.xml
--- a/app/src/main/res/drawable/category/ic_category_clothes_24dp.xml
+++ b/app/src/main/res/drawable/category/ic_category_clothes_24dp.xml
--- a/app/src/main/res/drawable/category/ic_category_convenience_24dp.xml
+++ b/app/src/main/res/drawable/category/ic_category_convenience_24dp.xml
--- a/app/src/main/res/drawable/category/ic_category_cosmetics_24dp.xml
+++ b/app/src/main/res/drawable/category/ic_category_cosmetics_24dp.xml
--- a/app/src/main/res/drawable/category/ic_category_delivery_24dp.xml
+++ b/app/src/main/res/drawable/category/ic_category_delivery_24dp.xml
--- a/app/src/main/res/drawable/category/ic_category_digital_24dp.xml
+++ b/app/src/main/res/drawable/category/ic_category_digital_24dp.xml
--- a/app/src/main/res/drawable/category/ic_category_drink_24dp.xml
+++ b/app/src/main/res/drawable/category/ic_category_drink_24dp.xml
--- a/app/src/main/res/drawable/category/ic_category_flower_24dp.xml
+++ b/app/src/main/res/drawable/category/ic_category_flower_24dp.xml
--- a/app/src/main/res/drawable/category/ic_category_food_24dp.xml
+++ b/app/src/main/res/drawable/category/ic_category_food_24dp.xml
--- a/app/src/main/res/drawable/category/ic_category_fruit_24dp.xml
+++ b/app/src/main/res/drawable/category/ic_category_fruit_24dp.xml
--- a/app/src/main/res/drawable/category/ic_category_gift_24dp.xml
+++ b/app/src/main/res/drawable/category/ic_category_gift_24dp.xml
--- a/app/src/main/res/drawable/category/ic_category_hotel_24dp.xml
+++ b/app/src/main/res/drawable/category/ic_category_hotel_24dp.xml
--- a/app/src/main/res/drawable/category/ic_category_medicine_24dp.xml
+++ b/app/src/main/res/drawable/category/ic_category_medicine_24dp.xml
--- a/app/src/main/res/drawable/category/ic_category_membership_24dp.xml
+++ b/app/src/main/res/drawable/category/ic_category_membership_24dp.xml
--- a/app/src/main/res/drawable/category/ic_category_more_24dp.xml
+++ b/app/src/main/res/drawable/category/ic_category_more_24dp.xml
--- a/app/src/main/res/drawable/category/ic_category_pet_24dp.xml
+++ b/app/src/main/res/drawable/category/ic_category_pet_24dp.xml
--- a/app/src/main/res/drawable/category/ic_category_scenic_24dp.xml
+++ b/app/src/main/res/drawable/category/ic_category_scenic_24dp.xml
--- a/app/src/main/res/drawable/category/ic_category_snack_24dp.xml
+++ b/app/src/main/res/drawable/category/ic_category_snack_24dp.xml
--- a/app/src/main/res/drawable/category/ic_category_supermarket_24dp.xml
+++ b/app/src/main/res/drawable/category/ic_category_supermarket_24dp.xml
--- a/app/src/main/res/drawable/category/ic_category_taxi_24dp.xml
+++ b/app/src/main/res/drawable/category/ic_category_taxi_24dp.xml
--- a/app/src/main/res/drawable/category/ic_category_training_24dp.xml
+++ b/app/src/main/res/drawable/category/ic_category_training_24dp.xml
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1733368452865" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2083" data-darkreader-inline-fill="" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M259.69 193.89h456.53c8.52 0 15.44 6.92 15.44 15.44v521.43H202.21v-479.4c0-31.72 25.75-57.47 57.47-57.47z" fill="#57B7F9" p-id="2084" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #0a5b92;"></path><path d="M259.69 665.92h471.97v125.74H259.69c-31.72 0-57.47-25.75-57.47-57.47V723.4c0-31.72 25.75-57.47 57.47-57.47z" fill="#33A1F2" p-id="2085" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #1067a6;"></path><path d="M267.14 701.58h453.9c0.67 0 1.21 0.54 1.21 1.21v52.1c0 0.67-0.54 1.21-1.21 1.21h-453.9c-15.04 0-27.26-12.21-27.26-27.26 0-15.04 12.21-27.26 27.26-27.26z" fill="#A1DCFF" p-id="2086" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #343839;"></path><path d="M262.27 193.66v472.26s-55.01 10.41-55.01 38.17V239.34s11.15-33.61 55.01-45.68z" fill="#33A1F2" p-id="2087" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #1067a6;"></path><path d="M515.07 801.66H265.09c-40.18 0-72.87-32.69-72.87-72.87s32.69-72.87 72.87-72.87h417.4c5.52 0 10 4.48 10 10s-4.48 10-10 10H265.08c-29.15 0-52.87 23.72-52.87 52.87s23.72 52.87 52.87 52.87h249.98c5.52 0 10 4.48 10 10s-4.48 10-10 10z" fill="#333333" p-id="2088" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #272a2b;"></path><path d="M202.21 741.89c-5.52 0-10-4.48-10-10V257.88c0-40.18 32.69-72.87 72.87-72.87h451.96c13.57 0 24.61 11.04 24.61 24.61v336.04c0 5.52-4.48 10-10 10s-10-4.48-10-10V209.63c0-2.54-2.07-4.61-4.61-4.61H265.08c-29.15 0-52.87 23.72-52.87 52.87V731.9c0 5.52-4.48 10-10 10z" fill="#333333" p-id="2089" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #272a2b;"></path><path d="M610.28 253.75h-58.59v154.39l58.59-28.83V253.75z" fill="#FFAC3B" p-id="2090" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #ffb148;"></path><path d="M610.28 253.75h58.6v154.39l-58.6-28.83V253.75z" fill="#FFD44A" p-id="2091" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #ffd753;"></path><path d="M789.78 646.03l-43.7-43.7L568.5 779.9l13.7 73.71 207.58-207.58z" fill="#FFAC3B" p-id="2092" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #a86205;"></path><path d="M789.78 646.03l43.7 43.7L655.9 867.31l-73.7-13.7 207.58-207.58z" fill="#FFD44A" p-id="2093" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #785c04;"></path><path d="M668.88 418.14c-1.51 0-3.02-0.34-4.41-1.03l-54.18-26.66-54.18 26.66a10.002 10.002 0 0 1-14.42-8.97V253.75c0-5.52 4.48-10 10-10h117.19c5.52 0 10 4.48 10 10v154.39a10 10 0 0 1-4.72 8.49c-1.61 1-3.45 1.51-5.28 1.51z m-58.59-48.83c1.51 0 3.02 0.34 4.42 1.03l44.18 21.74V263.75H561.7v128.33l44.18-21.74c1.39-0.69 2.9-1.03 4.42-1.03z" fill="#333333" p-id="2094" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #cbc5bc;"></path><path d="M813.81 573.291l48.7 48.698c10.677 10.678 10.684 28.023 0 38.708l-29.034 29.033-87.406-87.405 29.034-29.034c10.677-10.677 28.022-10.684 38.707 0z" fill="#F76C69" p-id="2095" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #f56d68;"></path><path d="M640.86 876.79c-0.51 0-1.02 0-1.54-0.03l-48.58-1.59c-16.35-0.54-29.58-13.76-30.11-30.11l-1.59-48.58c-0.43-13.08 4.63-25.89 13.88-35.14L765.4 568.86c13.44-13.44 35.31-13.44 48.75 0l52.79 52.79c13.44 13.44 13.44 35.31 0 48.75L674.46 862.88c-8.89 8.89-21.06 13.91-33.6 13.91z m148.91-298.03c-3.71 0-7.41 1.41-10.23 4.23L587.06 775.47a27.575 27.575 0 0 0-8.04 20.34l1.59 48.58c0.19 5.85 4.93 10.59 10.78 10.78l48.58 1.59c7.57 0.24 14.99-2.68 20.34-8.04l192.48-192.48c5.64-5.64 5.64-14.82 0-20.47L800 582.98a14.43 14.43 0 0 0-10.23-4.23z" fill="#333333" p-id="2096" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #272a2b;"></path><path d="M799.92 666.17c-2.56 0-5.12-0.98-7.07-2.93l-48.74-48.74c-3.91-3.91-3.91-10.24 0-14.14s10.24-3.91 14.14 0l48.74 48.74c3.91 3.91 3.91 10.24 0 14.14a9.973 9.973 0 0 1-7.07 2.93z" fill="#333333" p-id="2097" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #cbc5bc;"></path></svg>
--- a/app/src/main/res/drawable/category/ic_category_travel_24dp.xml
+++ b/app/src/main/res/drawable/category/ic_category_travel_24dp.xml
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1733368445240" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1583" data-darkreader-inline-fill="" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M788.15 816.26H255.01c-49.14 0-88.98-39.84-88.98-88.98V475.71c0-49.14 39.84-88.98 88.98-88.98h155.68c155.29 0 301.1 74.66 391.87 200.65l0.26 0.37a276.537 276.537 0 0 1 52.17 161.66c0 36.92-29.93 66.85-66.85 66.85z" fill="#57B7F9" p-id="1584" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #0a5b92;"></path><path d="M506.75 396.43s0 88.27 87.97 163.08c74.13 63.04 230.31 59.19 230.31 59.19S700.77 413.67 506.75 396.42z" fill="#D4EFFF" p-id="1585" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #252729;"></path><path d="M817.24 628.74h-0.06c-15.5-0.1-56.38-1.2-101.09-9.37-56.13-10.26-99.15-27.83-127.85-52.24-50.61-43.04-73-90.57-82.87-122.87-1.61-5.28 1.36-10.87 6.64-12.49 5.28-1.61 10.87 1.36 12.49 6.64 9.09 29.74 29.77 73.57 76.7 113.48 25.99 22.1 65.86 38.19 118.49 47.8 43.16 7.88 82.64 8.95 97.62 9.05 5.52 0.03 9.97 4.54 9.94 10.06-0.03 5.5-4.51 9.94-10 9.94z" fill="#333333" p-id="1586" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #272a2b;"></path><path d="M384.59 618.75H177.34V501.3h104.04c42.46 0 82.33 20.42 107.15 54.87l0.07 0.1a75.653 75.653 0 0 1 14.27 44.2c0 10.09-8.18 18.28-18.28 18.28z" fill="#D4EFFF" p-id="1587" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #252729;"></path><path d="M165.5 723.68h688.29s11.23 92.58-65.64 92.58H247.82s-82.32-20.45-82.32-92.58z" fill="#33A1F2" p-id="1588" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #1067a6;"></path><path d="M788.15 826.26H255.01c-54.58 0-98.98-44.4-98.98-98.98v-30.54c0-5.52 4.48-10 10-10s10 4.48 10 10v30.54c0 43.55 35.43 78.98 78.98 78.98h533.14c31.34 0 56.85-25.5 56.85-56.85 0-56.27-17.39-110.15-50.28-155.81l-0.26-0.37c-43.62-60.54-101.77-110.51-168.19-144.52-66.41-34.01-140.96-51.98-215.57-51.98H255.01c-43.55 0-78.98 35.43-78.98 78.98v142.76c0 5.52-4.48 10-10 10s-10-4.48-10-10V475.71c0-54.58 44.4-98.98 98.98-98.98h155.68c77.77 0 155.46 18.73 224.69 54.18s129.84 87.53 175.3 150.63l0.26 0.37C846.3 630.99 865 688.92 865 749.41c0 42.37-34.47 76.85-76.85 76.85z" fill="#333333" p-id="1589" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #272a2b;"></path><path d="M754.79 733.68H170.87c-5.52 0-10-4.48-10-10s4.48-10 10-10h583.92c5.52 0 10 4.48 10 10s-4.48 10-10 10z" fill="#333333" p-id="1590" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #272a2b;"></path><path d="M638.22 278.13l120.21-93.43c1.6-1.25 3.66-1.8 5.68-1.57 14.18 1.57 26.44 1.95 41.48 5.19 2.43 0.52 3.51 3.38 2 5.35L717.5 310.78l-79.28-32.64z" fill="#A1DCFF" p-id="1591" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #90d5fb;"></path><path d="M717.5 311.77l62 27.6c2.06 0.94 4.45 0.84 6.43-0.27l65.04-36.36a9.275 9.275 0 0 1 7.6-0.66l16.74 5.87a7.736 7.736 0 0 1 3.33 12.31l-52.47 61.75c-15.4 18.36-48.05 9.04-48.05 9.04s-251.8-69.94-251.83-69.95c-45.45-13.7-51.3-23.32-51.3-37.31 0-18.65 37.31-23.32 37.31-23.32 8.61-4.28 27.72-14.13 54.54-4.93l71.38 23.58 79.28 32.64z" fill="#FFF6DB" p-id="1592" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #362902;"></path><path d="M482 271.73L782 369s33.47 8 55.23 0c0 0-21.97 30.11-58.1 21.05l-281.54-79.28s-27.58-10.3-15.58-39.04z" fill="#33A1F2" p-id="1593" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #1067a6;"></path><path d="M797.61 402.42h-0.27c-11.34-0.04-20.57-2.64-20.96-2.75q-251.74-69.93-251.79-69.94c-0.06-0.02-0.12-0.04-0.18-0.05C480.19 316.35 466 304.95 466 282.8c0-24.61 35.1-31.59 44.31-32.99 9.93-4.91 31.47-14.74 60.73-4.73l66.26 21.89 116-90.16c3.61-2.81 8.32-4.13 12.91-3.62 3.88 0.43 7.7 0.78 11.4 1.11 9.67 0.88 19.67 1.78 31.08 4.24 4.53 0.97 8.18 4.15 9.77 8.49 1.58 4.32 0.86 9.08-1.95 12.73l-64.75 84.18c-3.37 4.38-9.65 5.2-14.02 1.83-4.38-3.37-5.2-9.65-1.83-14.02l58.1-75.53c-6.17-0.9-12.08-1.44-18.2-1.99-3.53-0.32-7.18-0.65-10.96-1.06l-119.49 92.87a9.997 9.997 0 0 1-9.27 1.6l-71.38-23.58s-0.07-0.02-0.11-0.04c-22.45-7.7-38.05 0.05-46.43 4.22l-0.42 0.21c-1.01 0.5-2.09 0.83-3.21 0.97-13.19 1.69-28.55 7.91-28.55 13.4 0 6.75 0 14.4 44.08 27.7 5.88 1.63 251.72 69.92 251.72 69.92 0.31 0.09 26.88 7.08 37.71-5.83l50.37-59.29-13.32-4.67-64.75 36.2a17.182 17.182 0 0 1-15.44 0.65l-61.93-27.57c-5.05-2.25-7.32-8.16-5.07-13.2 2.25-5.05 8.16-7.31 13.2-5.07l60.74 27.04 63.78-35.66c4.82-2.7 10.58-3.19 15.79-1.37l16.74 5.87c2.06 0.72 3.94 1.8 5.6 3.21 7.46 6.33 8.37 17.54 2.05 25l-52.47 61.76c-8.18 9.75-21.05 14.93-37.18 14.93z m-13.08-73.2h0.03-0.03z" fill="#333333" p-id="1594" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #272a2b;"></path></svg>
--- a/app/src/main/res/drawable/category/ic_category_vegetable_24dp.xml
+++ b/app/src/main/res/drawable/category/ic_category_vegetable_24dp.xml
--- a/app/src/main/res/drawable/member/ic_member_baby_boy_24dp.xml
+++ b/app/src/main/res/drawable/member/ic_member_baby_boy_24dp.xml
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1733382768845" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2690" data-darkreader-inline-fill="" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M653 727.5c-2.9 0-5.8-0.8-8.4-2.5-7.1-4.6-9.1-14.1-4.4-21.2 14.3-21.9 48-43.7 69.3-49.6 8.1-2.2 16.6 2.5 18.8 10.7s-2.5 16.6-10.7 18.8c-15.2 4.2-42.1 22-51.8 36.8-2.9 4.5-7.8 7-12.8 7z" fill="#F5C73E" p-id="2691" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #f6cc4d;"></path><path d="M635.5 750.3c-4.6 0-9.2-2.1-12.2-6.1-5.1-6.8-3.7-16.3 3-21.4 30.8-23.2 69.1-30.4 92.6-29.5 8.4 0.3 15 7.4 14.7 15.9-0.3 8.4-7.4 15.1-15.9 14.7-19.2-0.7-50.3 6.3-73 23.4-2.8 2-6 3-9.2 3z" fill="#F5C73E" p-id="2692" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #f6cc4d;"></path><path d="M629.3 906.1H394.7l-77.9-74c23.4-89.3 83.4-130.1 83.4-130.1h223.7s59.9 40.8 83.4 130.1l-78 74z" fill="#64C4F6" p-id="2693" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #0d608a;"></path><path d="M394.7 827.1v79h-87.2c0-27.6 3.5-57.2 9.3-79h77.9zM716.5 906.1h-87.2v-79h77.9c5.7 21.8 9.3 51.4 9.3 79z" fill="#FFECE3" p-id="2694" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #431702;"></path><path d="M628.7 700.6c64.7 102.9-28.9 155.3-116.7 155.3s-181.4-52.3-116.7-155.3h233.4z" fill="#99D37A" p-id="2695" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #52762a;"></path><path d="M512 878.5c-56 0-122.2-19.9-149.3-68.9-13.4-24.2-21.9-64.9 13.4-121.1 6.7-10.6 20.6-13.8 31.2-7.1s13.8 20.6 7.1 31.2c-18.9 30.1-23 55.3-12.1 75.1 15 27.2 59.1 45.5 109.6 45.5s94.6-18.3 109.6-45.5c10.9-19.7 6.8-45-12.1-75.1-6.7-10.6-3.5-24.6 7.1-31.2 10.6-6.7 24.6-3.5 31.2 7.1 35.3 56.2 26.8 96.9 13.4 121.1-26.9 49-93.2 68.9-149.1 68.9z" fill="#FCE170" p-id="2696" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #665306;"></path><path d="M249.7 470.5m-76.8 0a76.8 76.8 0 1 0 153.6 0 76.8 76.8 0 1 0-153.6 0Z" fill="#F7DBD0" p-id="2697" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #f4c7b4;"></path><path d="M774.3 470.5m-76.8 0a76.8 76.8 0 1 0 153.6 0 76.8 76.8 0 1 0-153.6 0Z" fill="#F7DBD0" p-id="2698" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #f4c7b4;"></path><path d="M512 459.5m-269.3 0a269.3 269.3 0 1 0 538.6 0 269.3 269.3 0 1 0-538.6 0Z" fill="#FFECE3" p-id="2699" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #431702;"></path><path d="M509.3 265c-14 3-27.8-5.8-30.8-19.8s5.8-27.7 19.8-30.8c26-5.6 37.7-30.6 17-56.4-8.9-11.2-7.1-27.5 4.1-36.4 11.2-8.9 27.5-7.1 36.4 4.1 44.5 55.7 17 125.4-46.5 139.3z" fill="#47515E" p-id="2700" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #b7afa4;"></path><path d="M560 670.9h-96c-44.1 0-80-32.3-80-72s35.9-72 80-72h2.4l2 1.3c26.4 17.6 60.8 17.6 87.1 0l2-1.3h2.4c44.1 0 80 32.3 80 72s-35.8 72-79.9 72z" fill="#4EAEE0" p-id="2701" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #1f6b93;"></path><path d="M543.3 750.9h-62.7c-22.1 0-40-17.9-40-40 0-1 0-2.1 0.1-3.1l2.9-37.7c2.9-37.7 35.9-65.9 73.6-63 33.6 2.6 60.4 29.3 63 63l2.9 37.7c1.7 22-14.8 41.3-36.8 43-0.9 0-1.9 0.1-3 0.1z m-31.3-128c-27.4 0.1-50.1 21.2-52.3 48.5l-2.9 37.7c-1 13.2 8.9 24.8 22.1 25.8 0.6 0 1.2 0.1 1.9 0.1h62.7c13.3 0 24-10.7 24-24 0-0.6 0-1.2-0.1-1.9l-2.9-37.7c-2.4-27.4-25.1-48.4-52.5-48.5z" fill="#64C4F6" p-id="2702" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #69c4f2;"></path><path d="M512 622.9m-48 0a48 48 0 1 0 96 0 48 48 0 1 0-96 0Z" fill="#64C4F6" p-id="2703" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #69c4f2;"></path><path d="M600 582.9m-8 0a8 8 0 1 0 16 0 8 8 0 1 0-16 0Z" fill="#64C4F6" p-id="2704" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #69c4f2;"></path><path d="M600 614.9m-8 0a8 8 0 1 0 16 0 8 8 0 1 0-16 0Z" fill="#64C4F6" p-id="2705" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #69c4f2;"></path><path d="M424 582.9m-8 0a8 8 0 1 0 16 0 8 8 0 1 0-16 0Z" fill="#64C4F6" p-id="2706" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #69c4f2;"></path><path d="M424 614.9m-8 0a8 8 0 1 0 16 0 8 8 0 1 0-16 0Z" fill="#64C4F6" p-id="2707" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #69c4f2;"></path><path d="M436.3 516.3c-7 0-12.7-5.7-12.7-12.7v-10.2c0-7 5.7-12.7 12.7-12.7s12.7 5.7 12.7 12.7v10.2c0 7.1-5.7 12.7-12.7 12.7zM587.7 516.3c-7 0-12.7-5.7-12.7-12.7v-10.2c0-7 5.7-12.7 12.7-12.7s12.7 5.7 12.7 12.7v10.2c0 7.1-5.7 12.7-12.7 12.7z" fill="#450064" p-id="2708" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #cbc6bd;"></path></svg>
--- a/app/src/main/res/drawable/member/ic_member_baby_girl_24dp.xml
+++ b/app/src/main/res/drawable/member/ic_member_baby_girl_24dp.xml
--- a/app/src/main/res/drawable/member/ic_member_boy_24dp.xml
+++ b/app/src/main/res/drawable/member/ic_member_boy_24dp.xml
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1733382780211" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3211" data-darkreader-inline-fill="" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M629.3 906.1H394.7l-77.9-74c23.4-89.3 83.4-130.1 83.4-130.1h223.7s59.9 40.8 83.4 130.1l-78 74z" fill="#99D37A" p-id="3212" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #52762a;"></path><path d="M394.7 827.1v79h-87.2c0-27.6 3.5-57.2 9.3-79h77.9zM716.5 906.1h-87.2v-79h77.9c5.7 21.8 9.3 51.4 9.3 79z" fill="#FFECE3" p-id="3213" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #431702;"></path><path d="M438.4 707.7a73.6 47.4 0 1 0 147.2 0 73.6 47.4 0 1 0-147.2 0Z" fill="#F7DBD0" p-id="3214" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #f4c7b4;"></path><path d="M507.3 720l-0.3 0.5-0.3-0.5h0.3z" fill="#EFEAEB" p-id="3215" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #e0dbd5;"></path><path d="M507.3 720l-0.3 0.5-0.3-0.5h0.3z" fill="#EFEAEB" p-id="3216" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #e0dbd5;"></path><path d="M507.3 720l-0.3 0.5-0.3-0.5h0.3z" fill="#EFEAEB" p-id="3217" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #e0dbd5;"></path><path d="M507.3 720l-0.3 0.5-0.3-0.5h0.3z" fill="#EFEAEB" p-id="3218" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #e0dbd5;"></path><path d="M249.7 470.5m-76.8 0a76.8 76.8 0 1 0 153.6 0 76.8 76.8 0 1 0-153.6 0Z" fill="#F7DBD0" p-id="3219" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #f4c7b4;"></path><path d="M774.3 470.5m-76.8 0a76.8 76.8 0 1 0 153.6 0 76.8 76.8 0 1 0-153.6 0Z" fill="#F7DBD0" p-id="3220" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #f4c7b4;"></path><path d="M512 459.5m-269.3 0a269.3 269.3 0 1 0 538.6 0 269.3 269.3 0 1 0-538.6 0Z" fill="#FFECE3" p-id="3221" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #431702;"></path><path d="M436.3 526.3c-7 0-12.7-5.7-12.7-12.7v-10.2c0-7 5.7-12.7 12.7-12.7s12.7 5.7 12.7 12.7v10.2c0 7.1-5.7 12.7-12.7 12.7zM587.7 526.3c-7 0-12.7-5.7-12.7-12.7v-10.2c0-7 5.7-12.7 12.7-12.7s12.7 5.7 12.7 12.7v10.2c0 7.1-5.7 12.7-12.7 12.7zM512 597.7c-16.4 0-31.9-7.1-42.7-19.4-4.6-5.3-4-13.3 1.2-17.9 5.3-4.6 13.3-4 17.9 1.2 6 6.8 14.6 10.8 23.6 10.8s17.6-3.9 23.6-10.7c4.6-5.3 12.6-5.8 17.9-1.2 5.3 4.6 5.8 12.6 1.2 17.9-10.8 12.2-26.3 19.3-42.7 19.3z" fill="#450064" p-id="3222" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #cbc6bd;"></path><path d="M812.6 394c-4.1 0.1-8.3 0.2-12.4 0.2-83.8 0-162.2-23.1-229.1-63.4-69.3 44.5-151.8 70.4-240.4 70.4-40.9 0-80.6-5.5-118.3-15.9 11-87.8 60.1-164.1 130.1-211.9C390.9 140.3 449.3 121 512 121s121 19.4 169.4 52.4c15.7 10.7 30.4 22.9 43.8 36.3 48.4 48.3 80.5 112.7 87.4 184.3z" fill="#5C6A7C" p-id="3223" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #4c5662;"></path><path d="M342.6 328.1c0 10.3-4.2 19.6-11 26.4s-16.1 11-26.4 11H121.9c-20.5 0-37.3-16.8-37.3-37.3 0-10.3 4.2-19.6 11-26.4s16.1-11 26.4-11h183.4c20.4 0 37.2 16.8 37.2 37.3z" fill="#4EAEE0" p-id="3224" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #1f6b93;"></path><path d="M807 287.7C779.9 149.5 658.1 45.2 512 45.2S244.1 149.5 217 287.7c-3.7 18.8-5.6 38.2-5.6 58.1 0 3.6 0.1 7.1 0.2 10.6 0.2 5.1 4.3 9.1 9.4 9.1h582c5.1 0 9.2-4 9.4-9.1 0.1-3.5 0.2-7.1 0.2-10.6 0-19.9-1.9-39.3-5.6-58.1z m-223.9 19c-4.1 4.1-9.7 6.6-15.9 6.6H456.8c-12.4 0-22.5-10.1-22.5-22.5 0-6.2 2.5-11.8 6.6-15.9s9.7-6.6 15.9-6.6h110.4c12.4 0 22.5 10.1 22.5 22.5 0 6.2-2.5 11.8-6.6 15.9z" fill="#64C4F6" p-id="3225" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #0d608a;"></path></svg>
--- a/app/src/main/res/drawable/member/ic_member_bride_24dp.xml
+++ b/app/src/main/res/drawable/member/ic_member_bride_24dp.xml
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1733382752696" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2177" data-darkreader-inline-fill="" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M903.5 836.3c0 23.5-0.6 46.7-1.6 69.8H122.1c-1-22.9-1.6-46.3-1.6-69.8C120.5 415.9 295.8 75 512 75s391.5 340.9 391.5 761.3z" fill="#F3F3F3" p-id="2178" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #202123;"></path><path d="M181.8 906c0-414.3 95.2-833.6 265.1-833.6 0 0 19.6-34.4 65.1-34.4s65.1 34.4 65.1 34.4c201.7 0 265.1 419.3 265.1 833.6H181.8z" fill="#DEE3E3" p-id="2179" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #2a2d2e;"></path><path d="M548.6 50.4c-12.6-5.7-26.6-8.9-41.3-8.9-55.5 0-100.4 45-100.4 100.4s45 100.4 100.4 100.4c14.7 0 28.7-3.2 41.3-8.9 34.8-15.8 59.1-50.8 59.1-91.5s-24.2-75.8-59.1-91.5z" fill="#47515E" p-id="2180" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #b7afa4;"></path><path d="M707.3 832.1l-78 74H394.7l-77.9-74c2-7.7 4.3-15 6.8-22 26.5-74 76.6-108.1 76.6-108.1h223.7s50 34.1 76.6 108.1c2.5 7 4.8 14.3 6.8 22z" fill="#FFECE3" p-id="2181" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #431702;"></path><path d="M707.3 832.1l-78 74H394.7l-77.9-74c2-7.7 4.3-15 6.8-22h376.8c2.6 7 4.9 14.3 6.9 22z" fill="#E96E67" p-id="2182" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #851c16;"></path><path d="M394.7 827.1v79h-87.2c0-27.6 3.5-57.2 9.3-79h77.9zM716.5 906.1h-87.2v-79h77.9c5.7 21.8 9.3 51.4 9.3 79z" fill="#FFECE3" p-id="2183" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #431702;"></path><path d="M249.7 470.5m-76.8 0a76.8 76.8 0 1 0 153.6 0 76.8 76.8 0 1 0-153.6 0Z" fill="#F7DBD0" p-id="2184" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #f4c7b4;"></path><path d="M774.3 470.5m-76.8 0a76.8 76.8 0 1 0 153.6 0 76.8 76.8 0 1 0-153.6 0Z" fill="#F7DBD0" p-id="2185" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #f4c7b4;"></path><path d="M512 459.5m-269.3 0a269.3 269.3 0 1 0 538.6 0 269.3 269.3 0 1 0-538.6 0Z" fill="#FFECE3" p-id="2186" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #431702;"></path><path d="M813.6 407.5c-113.6-0.1-218.4-38.2-302.2-102.3-83.5 63.9-187.8 101.9-300.9 102.3 5.7-112.3 72.7-208.3 168.2-255.4 40.2-19.8 85.5-31 133.4-31 47.5 0 92.4 11 132.4 30.5 96 46.8 163.4 143.2 169.1 255.9z" fill="#5C6A7C" p-id="2187" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #4c5662;"></path><path d="M704.9 827.1H319.7c-4.2 0-7-4.4-5.1-8.2l34.5-71.7c0.9-2 2.9-3.2 5.1-3.2h316.3c2.2 0 4.2 1.3 5.1 3.2l34.5 71.7c1.8 3.8-1 8.2-5.2 8.2z" fill="#F7867F" p-id="2188" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #7a110a;"></path><path d="M326.5 558.2a49.8 39.5 0 1 0 99.6 0 49.8 39.5 0 1 0-99.6 0Z" fill="#FFD7DF" p-id="2189" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #ffb3c0;"></path><path d="M597.9 558.2a49.8 39.5 0 1 0 99.6 0 49.8 39.5 0 1 0-99.6 0Z" fill="#FFD7DF" p-id="2190" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #ffb3c0;"></path><path d="M436.3 526.3c-7 0-12.7-5.7-12.7-12.7v-10.2c0-7 5.7-12.7 12.7-12.7s12.7 5.7 12.7 12.7v10.2c0 7.1-5.7 12.7-12.7 12.7zM587.7 526.3c-7 0-12.7-5.7-12.7-12.7v-10.2c0-7 5.7-12.7 12.7-12.7s12.7 5.7 12.7 12.7v10.2c0 7.1-5.7 12.7-12.7 12.7zM512 597.7c-16.4 0-31.9-7.1-42.7-19.4-4.6-5.3-4-13.3 1.2-17.9 5.3-4.6 13.3-4 17.9 1.2 6 6.8 14.6 10.8 23.6 10.8s17.6-3.9 23.6-10.7c4.6-5.3 12.6-5.8 17.9-1.2 5.3 4.6 5.8 12.6 1.2 17.9-10.8 12.2-26.3 19.3-42.7 19.3z" fill="#450064" p-id="2191" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #cbc6bd;"></path><path d="M606.2 94.4l-20.8 54.5H435l-21-55 0.8-0.5c13.2 22 24.6 34.7 33 29.9 14.5-8.1 13.9-25.3 13.5-42.4h0.7c8.3 19 16.7 36.4 27.2 35 18.1-2.3 19-31.3 20.8-57.8h0.8c1.7 26.5 2.7 55.6 20.8 57.8 6.2 0.8 11.6-4.9 16.9-13.5 3.6-6.1 7-13.6 10.5-21.5l0.7 0.1c-0.4 17.1-1 34.3 13.5 42.5 8.4 4.8 19.6-7.7 32.7-29.2l0.3 0.1z" fill="#FCE170" p-id="2192" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #fee26e;"></path><path d="M606.2 94.4c0.7 0.2 1.3 0.3 2.1 0.3 4.4 0 7.9-3.6 7.9-8 0.1-4.4-3.5-8-7.8-8-4.4 0-7.9 3.6-7.9 8 0 3.3 2.1 6.2 5 7.4M414.6 93.3c2.2-1.4 3.6-3.9 3.6-6.8 0-4.5-3.5-8-7.9-8s-7.8 3.7-7.8 8.1c0 4.5 3.5 8 7.9 8 1.2 0 2.5-0.3 3.5-0.9M461.8 81c5-0.6 9-5 9-10.2 0-5.7-4.5-10.3-10.1-10.3-5.5 0-10.1 4.6-10.1 10.3s4.5 10.3 10.1 10.3h0.4M510.6 58.1c6.9-0.2 12.4-5.8 12.4-12.8s-5.7-12.8-12.8-12.8c-7.1 0-12.8 5.7-12.8 12.8 0 6.9 5.5 12.6 12.4 12.8M559.3 81c0.4 0 0.7 0.1 1 0.1 5.5 0 10.1-4.6 10.1-10.3s-4.4-10.3-10.1-10.3c-5.6 0-10.1 4.6-10.1 10.3 0 5 3.6 9.3 8.4 10.1" fill="#FCE170" p-id="2193" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #665306;"></path></svg>
--- a/app/src/main/res/drawable/member/ic_member_family_24dp.xml
+++ b/app/src/main/res/drawable/member/ic_member_family_24dp.xml
--- a/app/src/main/res/drawable/member/ic_member_father_24dp.xml
+++ b/app/src/main/res/drawable/member/ic_member_father_24dp.xml
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1733382737759" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1666" data-darkreader-inline-fill="" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M707.3 832.1L631.5 904l-2.2 2.1H394.7l-2.2-2.1-75.7-71.9c23.4-89.3 83.4-130.1 83.4-130.1h223.7s59.9 40.8 83.4 130.1z" fill="#D79B89" p-id="1667" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #6c3726;"></path><path d="M394.7 827.1v79h-87.2c0-27.6 3.5-57.2 9.3-79h77.9zM716.5 906.1h-87.2v-79h77.9c5.7 21.8 9.3 51.4 9.3 79z" fill="#FFECE3" p-id="1668" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #431702;"></path><path d="M640.3 819.4c0 29.9-3.1 58.4-8.8 84.6l-2.2 2.1H394.7l-2.2-2.1c-5.7-26.2-8.8-54.8-8.8-84.6 0-42.9 6.5-83 17.7-117.4h58.5c1.8 74.9 24.4 134.2 52.1 134.2 27.7 0 50.3-59.2 52.1-134.2h58.5c11.3 34.4 17.7 74.6 17.7 117.4z" fill="#64C4F6" p-id="1669" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #0d608a;"></path><path d="M517.3 720.1l-26.8 38.6c-9.6 13.9-30 14.4-40.3 1l-46.4-60.4 113.5 20.8z" fill="#FFFFFF" p-id="1670" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #ece8e2;"></path><path d="M506.7 720.1l26.8 38.6c9.6 13.9 30 14.4 40.3 1l46.4-60.4-113.5 20.8z" fill="#FFFFFF" p-id="1671" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #ece8e2;"></path><path d="M507.3 720l-0.3 0.5-0.3-0.5h0.3z" fill="#EFEAEB" p-id="1672" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #e0dbd5;"></path><path d="M507.3 720l-0.3 0.5-0.3-0.5h0.3z" fill="#EFEAEB" p-id="1673" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #e0dbd5;"></path><path d="M507.3 720l-0.3 0.5-0.3-0.5h0.3z" fill="#EFEAEB" p-id="1674" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #e0dbd5;"></path><path d="M507.3 720l-0.3 0.5-0.3-0.5h0.3z" fill="#EFEAEB" p-id="1675" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #e0dbd5;"></path><path d="M249.7 470.5m-76.8 0a76.8 76.8 0 1 0 153.6 0 76.8 76.8 0 1 0-153.6 0Z" fill="#F7DBD0" p-id="1676" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #f4c7b4;"></path><path d="M774.3 470.5m-76.8 0a76.8 76.8 0 1 0 153.6 0 76.8 76.8 0 1 0-153.6 0Z" fill="#F7DBD0" p-id="1677" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #f4c7b4;"></path><path d="M512 459.5m-269.3 0a269.3 269.3 0 1 0 538.6 0 269.3 269.3 0 1 0-538.6 0Z" fill="#FFECE3" p-id="1678" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #431702;"></path><path d="M812.6 394c-4.1 0.1-8.3 0.2-12.4 0.2-83.8 0-162.2-23.1-229.1-63.4-69.3 44.5-151.8 70.4-240.4 70.4-40.9 0-80.6-5.5-118.3-15.9 11-87.8 60.1-164.1 130.1-211.9C390.9 140.3 449.3 121 512 121s121 19.4 169.4 52.4c15.7 10.7 30.4 22.9 43.8 36.3 48.4 48.3 80.5 112.7 87.4 184.3z" fill="#5C6A7C" p-id="1679" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #4c5662;"></path><path d="M436.3 526.3c-7 0-12.7-5.7-12.7-12.7v-10.2c0-7 5.7-12.7 12.7-12.7s12.7 5.7 12.7 12.7v10.2c0 7.1-5.7 12.7-12.7 12.7zM587.7 526.3c-7 0-12.7-5.7-12.7-12.7v-10.2c0-7 5.7-12.7 12.7-12.7s12.7 5.7 12.7 12.7v10.2c0 7.1-5.7 12.7-12.7 12.7zM512 645.3c-16.4 0-31.9-7.1-42.7-19.4-4.6-5.3-4-13.3 1.2-17.9 5.3-4.6 13.3-4 17.9 1.2 6 6.8 14.6 10.8 23.6 10.8s17.6-3.9 23.6-10.7c4.6-5.3 12.6-5.8 17.9-1.2 5.3 4.6 5.8 12.6 1.2 17.9-10.8 12.2-26.3 19.3-42.7 19.3z" fill="#450064" p-id="1680" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #cbc6bd;"></path><path d="M609.6 619H414.4c-5.9 0-10.7-4.8-10.7-10.7 0-28.1 23-51.1 51.1-51.1h114.4c28.1 0 51.1 23 51.1 51.1 0 5.9-4.8 10.7-10.7 10.7z" fill="#5C6A7C" p-id="1681" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #4c5662;"></path></svg>
--- a/app/src/main/res/drawable/member/ic_member_girl_24dp.xml
+++ b/app/src/main/res/drawable/member/ic_member_girl_24dp.xml
--- a/app/src/main/res/drawable/member/ic_member_grandfather_24dp.xml
+++ b/app/src/main/res/drawable/member/ic_member_grandfather_24dp.xml
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1733382759052" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2347" data-darkreader-inline-fill="" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M707.3 832.1L631.5 904l-2.2 2.1H394.7l-2.2-2.1-75.7-71.9c23.4-89.3 83.4-130.1 83.4-130.1h223.7s59.9 40.8 83.4 130.1z" fill="#64C4F6" p-id="2348" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #0d608a;"></path><path d="M394.7 827.1v79h-87.2c0-27.6 3.5-57.2 9.3-79h77.9zM716.5 906.1h-87.2v-79h77.9c5.7 21.8 9.3 51.4 9.3 79z" fill="#FFECE3" p-id="2349" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #431702;"></path><path d="M640.3 819.4c0 29.9-3.1 58.4-8.8 84.6l-2.2 2.1H394.7l-2.2-2.1c-5.7-26.2-8.8-54.8-8.8-84.6 0-42.9 6.5-83 17.7-117.4h58.5c1.8 74.9 24.4 134.2 52.1 134.2 27.7 0 50.3-59.2 52.1-134.2h58.5c11.3 34.4 17.7 74.6 17.7 117.4z" fill="#D79B89" p-id="2350" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #6c3726;"></path><path d="M517.3 720.1l-26.8 38.6c-9.6 13.9-30 14.4-40.3 1l-46.4-60.4 113.5 20.8z" fill="#FFFFFF" p-id="2351" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #ece8e2;"></path><path d="M506.7 720.1l26.8 38.6c9.6 13.9 30 14.4 40.3 1l46.4-60.4-113.5 20.8z" fill="#FFFFFF" p-id="2352" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #ece8e2;"></path><path d="M507.3 720l-0.3 0.5-0.3-0.5h0.3z" fill="#EFEAEB" p-id="2353" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #e0dbd5;"></path><path d="M507.3 720l-0.3 0.5-0.3-0.5h0.3z" fill="#EFEAEB" p-id="2354" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #e0dbd5;"></path><path d="M507.3 720l-0.3 0.5-0.3-0.5h0.3z" fill="#EFEAEB" p-id="2355" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #e0dbd5;"></path><path d="M507.3 720l-0.3 0.5-0.3-0.5h0.3z" fill="#EFEAEB" p-id="2356" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #e0dbd5;"></path><path d="M249.7 470.5m-76.8 0a76.8 76.8 0 1 0 153.6 0 76.8 76.8 0 1 0-153.6 0Z" fill="#F7DBD0" p-id="2357" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #f4c7b4;"></path><path d="M774.3 470.5m-76.8 0a76.8 76.8 0 1 0 153.6 0 76.8 76.8 0 1 0-153.6 0Z" fill="#F7DBD0" p-id="2358" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #f4c7b4;"></path><path d="M512 459.5m-269.3 0a269.3 269.3 0 1 0 538.6 0 269.3 269.3 0 1 0-538.6 0Z" fill="#FFECE3" p-id="2359" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #431702;"></path><path d="M450.9 552.3H328.7c-28.2 0-51.2-23-51.2-51.2v-17.8c0-28.2 23-51.2 51.2-51.2h122.2c28.2 0 51.2 23 51.2 51.2v17.8c0 28.2-23 51.2-51.2 51.2zM328.7 452.1c-17.2 0-31.2 14-31.2 31.2v17.8c0 17.2 14 31.2 31.2 31.2h122.2c17.2 0 31.2-14 31.2-31.2v-17.8c0-17.2-14-31.2-31.2-31.2H328.7zM695.5 552.3H573.3c-28.2 0-51.2-23-51.2-51.2v-17.8c0-28.2 23-51.2 51.2-51.2h122.2c28.2 0 51.2 23 51.2 51.2v17.8c0 28.2-23 51.2-51.2 51.2zM573.3 452.1c-17.2 0-31.2 14-31.2 31.2v17.8c0 17.2 14 31.2 31.2 31.2h122.2c17.2 0 31.2-14 31.2-31.2v-17.8c0-17.2-14-31.2-31.2-31.2H573.3z" fill="#450064" p-id="2360" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #36024d;"></path><path d="M719.6 459.4c-3 0-5.9-1.3-7.9-3.8-3.4-4.3-2.6-10.6 1.7-14l63.6-49.8c4.3-3.4 10.6-2.6 14 1.7 3.4 4.3 2.6 10.6-1.7 14l-63.6 49.8c-1.8 1.4-3.9 2.1-6.1 2.1zM304.6 459.4c-2.2 0-4.3-0.7-6.2-2.1l-63.6-49.8c-4.3-3.4-5.1-9.7-1.7-14 3.4-4.3 9.7-5.1 14-1.7l63.6 49.8c4.3 3.4 5.1 9.7 1.7 14-1.9 2.5-4.8 3.8-7.8 3.8zM532.1 511.1h-40c-5.5 0-10-4.5-10-10s4.5-10 10-10h40c5.5 0 10 4.5 10 10s-4.5 10-10 10z" fill="#450064" p-id="2361" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #36024d;"></path><path d="M242.4 418.4c52.1 2.2 55.6-121.9 90.9-160.4-79.2-46.8-128.2 30.1-137.4 73.5-9.1 43.5 5.6 85.1 46.5 86.9zM781.5 418.4c-52.1 2.2-55.6-121.9-90.9-160.4 79.2-46.8 128.2 30.1 137.4 73.5 9.2 43.5-5.5 85.1-46.5 86.9z" fill="#F3F3F3" p-id="2362" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #202123;"></path><path d="M436.3 526.3c-7 0-12.7-5.7-12.7-12.7v-10.2c0-7 5.7-12.7 12.7-12.7s12.7 5.7 12.7 12.7v10.2c0 7.1-5.7 12.7-12.7 12.7zM587.7 526.3c-7 0-12.7-5.7-12.7-12.7v-10.2c0-7 5.7-12.7 12.7-12.7s12.7 5.7 12.7 12.7v10.2c0 7.1-5.7 12.7-12.7 12.7zM512 597.7c-16.4 0-31.9-7.1-42.7-19.4-4.6-5.3-4-13.3 1.2-17.9 5.3-4.6 13.3-4 17.9 1.2 6 6.8 14.6 10.8 23.6 10.8s17.6-3.9 23.6-10.7c4.6-5.3 12.6-5.8 17.9-1.2 5.3 4.6 5.8 12.6 1.2 17.9-10.8 12.2-26.3 19.3-42.7 19.3z" fill="#450064" p-id="2363" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #cbc6bd;"></path></svg>
--- a/app/src/main/res/drawable/member/ic_member_grandmother_24dp.xml
+++ b/app/src/main/res/drawable/member/ic_member_grandmother_24dp.xml
--- a/app/src/main/res/drawable/member/ic_member_groom_24dp.xml
+++ b/app/src/main/res/drawable/member/ic_member_groom_24dp.xml
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1733382748360" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2007" data-darkreader-inline-fill="" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M629.3 906.1H394.7l-77.9-74c23.4-89.3 83.4-130.1 83.4-130.1h223.7s59.9 40.8 83.4 130.1l-78 74z" fill="#F3F3F3" p-id="2008" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #202123;"></path><path d="M394.7 827.1v79h-87.2c0-27.6 3.5-57.2 9.3-79h77.9zM716.5 906.1h-87.2v-79h77.9c5.7 21.8 9.3 51.4 9.3 79z" fill="#F3F3F3" p-id="2009" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #202123;"></path><path d="M549.3 735.6L538.5 764l-1.8 4.6-7.4 19.5h-37.6l-20-52.5z" fill="#E96E67" p-id="2010" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #e7726a;"></path><path d="M529.3 788.1h-37.6l-20 118h77.6z" fill="#F7867F" p-id="2011" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #f48077;"></path><path d="M640.3 819.4c0 29.9-3.1 58.4-8.8 84.6l-2.2 2.1H394.7l-2.2-2.1c-5.7-26.2-8.8-54.8-8.8-84.6 0-42.9 6.5-83 17.7-117.4h58.5c1.8 74.9 24.4 134.2 52.1 134.2 27.7 0 50.3-59.2 52.1-134.2h58.5c11.3 34.4 17.7 74.6 17.7 117.4z" fill="#47515E" p-id="2012" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #3a424a;"></path><path d="M517.3 720.1l-26.8 38.6c-9.6 13.9-30 14.4-40.3 1l-46.4-60.4 113.5 20.8z" fill="#FFFFFF" p-id="2013" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #ece8e2;"></path><path d="M506.7 720.1l26.8 38.6c9.6 13.9 30 14.4 40.3 1l46.4-60.4-113.5 20.8z" fill="#FFFFFF" p-id="2014" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #ece8e2;"></path><path d="M507.3 720l-0.3 0.5-0.3-0.5h0.3z" fill="#EFEAEB" p-id="2015" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #e0dbd5;"></path><path d="M507.3 720l-0.3 0.5-0.3-0.5h0.3z" fill="#EFEAEB" p-id="2016" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #e0dbd5;"></path><path d="M507.3 720l-0.3 0.5-0.3-0.5h0.3z" fill="#EFEAEB" p-id="2017" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #e0dbd5;"></path><path d="M507.3 720l-0.3 0.5-0.3-0.5h0.3z" fill="#EFEAEB" p-id="2018" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #e0dbd5;"></path><path d="M249.7 470.5m-76.8 0a76.8 76.8 0 1 0 153.6 0 76.8 76.8 0 1 0-153.6 0Z" fill="#F7DBD0" p-id="2019" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #f4c7b4;"></path><path d="M774.3 470.5m-76.8 0a76.8 76.8 0 1 0 153.6 0 76.8 76.8 0 1 0-153.6 0Z" fill="#F7DBD0" p-id="2020" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #f4c7b4;"></path><path d="M512 459.5m-269.3 0a269.3 269.3 0 1 0 538.6 0 269.3 269.3 0 1 0-538.6 0Z" fill="#FFECE3" p-id="2021" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #431702;"></path><path d="M813.6 407.5c-113.6-0.1-218.4-38.2-302.2-102.3-83.5 63.9-187.8 101.9-300.9 102.3 5.7-112.3 72.7-208.3 168.2-255.4 40.2-19.8 85.5-31 133.4-31 47.5 0 92.4 11 132.4 30.5 96 46.8 163.4 143.2 169.1 255.9z" fill="#5C6A7C" p-id="2022" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #4c5662;"></path><path d="M436.3 526.3c-7 0-12.7-5.7-12.7-12.7v-10.2c0-7 5.7-12.7 12.7-12.7s12.7 5.7 12.7 12.7v10.2c0 7.1-5.7 12.7-12.7 12.7zM587.7 526.3c-7 0-12.7-5.7-12.7-12.7v-10.2c0-7 5.7-12.7 12.7-12.7s12.7 5.7 12.7 12.7v10.2c0 7.1-5.7 12.7-12.7 12.7zM512 597.7c-16.4 0-31.9-7.1-42.7-19.4-4.6-5.3-4-13.3 1.2-17.9 5.3-4.6 13.3-4 17.9 1.2 6 6.8 14.6 10.8 23.6 10.8s17.6-3.9 23.6-10.7c4.6-5.3 12.6-5.8 17.9-1.2 5.3 4.6 5.8 12.6 1.2 17.9-10.8 12.2-26.3 19.3-42.7 19.3z" fill="#450064" p-id="2023" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #cbc6bd;"></path></svg>
--- a/app/src/main/res/drawable/member/ic_member_mother_24dp.xml
+++ b/app/src/main/res/drawable/member/ic_member_mother_24dp.xml
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1733382743744" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1835" data-darkreader-inline-fill="" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M884.7 678.4c-39 0-70.7-31.7-70.7-70.7V422.9c0-9.7-0.5-19.4-1.5-28.9-6.9-71.5-39-136-87.3-184.3-13.4-13.4-28.1-25.6-43.8-36.3C633 140.4 574.7 121 512 121s-121.1 19.3-169.4 52.4c-70 47.8-119.1 124.1-130.1 211.9-1.6 12.3-2.4 24.9-2.4 37.6v184.8c0 39-31.7 70.7-70.7 70.7h-0.1c0 82.1 66.6 148.7 148.7 148.7h448c82.1 0 148.7-66.6 148.7-148.7z" fill="#AD6D5A" p-id="1836" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #855343;"></path><path d="M629.3 906.1H394.7l-77.9-74c23.4-89.3 83.4-130.1 83.4-130.1h223.7s59.9 40.8 83.4 130.1l-78 74z" fill="#F7867F" p-id="1837" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #7a110a;"></path><path d="M394.7 827.1v79h-87.2c0-27.6 3.5-57.2 9.3-79h77.9zM716.5 906.1h-87.2v-79h77.9c5.7 21.8 9.3 51.4 9.3 79z" fill="#FFECE3" p-id="1838" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #431702;"></path><path d="M517.3 720.1l-26.8 38.6c-9.6 13.9-30 14.4-40.3 1l-46.4-60.4 113.5 20.8z" fill="#FFFFFF" p-id="1839" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #ece8e2;"></path><path d="M506.7 720.1l26.8 38.6c9.6 13.9 30 14.4 40.3 1l46.4-60.4-113.5 20.8z" fill="#FFFFFF" p-id="1840" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #ece8e2;"></path><path d="M507.3 720l-0.3 0.5-0.3-0.5h0.3z" fill="#EFEAEB" p-id="1841" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #e0dbd5;"></path><path d="M507.3 720l-0.3 0.5-0.3-0.5h0.3z" fill="#EFEAEB" p-id="1842" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #e0dbd5;"></path><path d="M507.3 720l-0.3 0.5-0.3-0.5h0.3z" fill="#EFEAEB" p-id="1843" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #e0dbd5;"></path><path d="M507.3 720l-0.3 0.5-0.3-0.5h0.3z" fill="#EFEAEB" p-id="1844" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #e0dbd5;"></path><path d="M249.7 470.5m-76.8 0a76.8 76.8 0 1 0 153.6 0 76.8 76.8 0 1 0-153.6 0Z" fill="#F7DBD0" p-id="1845" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #f4c7b4;"></path><path d="M774.3 470.5m-76.8 0a76.8 76.8 0 1 0 153.6 0 76.8 76.8 0 1 0-153.6 0Z" fill="#F7DBD0" p-id="1846" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #f4c7b4;"></path><path d="M251.5 547.6m-36.9 0a36.9 36.9 0 1 0 73.8 0 36.9 36.9 0 1 0-73.8 0Z" fill="#FCE170" p-id="1847" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #fee26e;"></path><path d="M772.5 547.6m-36.9 0a36.9 36.9 0 1 0 73.8 0 36.9 36.9 0 1 0-73.8 0Z" fill="#FCE170" p-id="1848" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #fee26e;"></path><path d="M512 459.5m-269.3 0a269.3 269.3 0 1 0 538.6 0 269.3 269.3 0 1 0-538.6 0Z" fill="#FFECE3" p-id="1849" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #431702;"></path><path d="M326.5 558.2a49.8 39.5 0 1 0 99.6 0 49.8 39.5 0 1 0-99.6 0Z" fill="#FFD7DF" p-id="1850" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #ffb3c0;"></path><path d="M597.9 558.2a49.8 39.5 0 1 0 99.6 0 49.8 39.5 0 1 0-99.6 0Z" fill="#FFD7DF" p-id="1851" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #ffb3c0;"></path><path d="M436.3 526.3c-7 0-12.7-5.7-12.7-12.7v-10.2c0-7 5.7-12.7 12.7-12.7s12.7 5.7 12.7 12.7v10.2c0 7.1-5.7 12.7-12.7 12.7zM587.7 526.3c-7 0-12.7-5.7-12.7-12.7v-10.2c0-7 5.7-12.7 12.7-12.7s12.7 5.7 12.7 12.7v10.2c0 7.1-5.7 12.7-12.7 12.7zM512 597.7c-16.4 0-31.9-7.1-42.7-19.4-4.6-5.3-4-13.3 1.2-17.9 5.3-4.6 13.3-4 17.9 1.2 6 6.8 14.6 10.8 23.6 10.8s17.6-3.9 23.6-10.7c4.6-5.3 12.6-5.8 17.9-1.2 5.3 4.6 5.8 12.6 1.2 17.9-10.8 12.2-26.3 19.3-42.7 19.3z" fill="#450064" p-id="1852" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #cbc6bd;"></path><path d="M812.6 394c-4.1 0.1-8.3 0.2-12.4 0.2-83.8 0-162.2-23.1-229.1-63.4-69.3 44.5-151.8 70.4-240.4 70.4-40.9 0-80.6-5.5-118.3-15.9 11-87.8 60.1-164.1 130.1-211.9C390.9 140.3 449.3 121 512 121s121 19.4 169.4 52.4c15.7 10.7 30.4 22.9 43.8 36.3 48.4 48.3 80.5 112.7 87.4 184.3z" fill="#D79B89" p-id="1853" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #6c3726;"></path></svg>
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.Bookkeeping" parent="android:Theme.Material.NoActionBar">
+        <item name="android:windowBackground">@android:color/black</item>
+    </style>
+</resources>
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <style name="Theme.Bookkeeping" parent="android:Theme.Material.Light.NoActionBar" />
+    <style name="Theme.Bookkeeping" parent="android:Theme.Material.Light.NoActionBar">
+        <item name="android:windowBackground">@android:color/white</item>
+    </style>
 </resources>
--- a/gradle.properties
+++ b/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
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -11,6 +11,7 @@ composeBom = "2024.04.01"
 roomCommon = "2.6.1"
 navigationCommonKtx = "2.8.4"
 navigationCompose = "2.8.4"
+visionInternalVkp = "18.2.3"

 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -30,6 +31,7 @@ androidx-material3 = { group = "androidx.compose.material3", name = "material3"
 androidx-room-common = { group = "androidx.room", name = "room-common", version.ref = "roomCommon" }
 androidx-navigation-common-ktx = { group = "androidx.navigation", name = "navigation-common-ktx", version.ref = "navigationCommonKtx" }
 androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigationCompose" }
+vision-internal-vkp = { group = "com.google.mlkit", name = "vision-internal-vkp", version.ref = "visionInternalVkp" }

 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -9,6 +9,7 @@ pluginManagement {
        }
        mavenCentral()
        gradlePluginPortal()
+        maven { url = uri("https://jitpack.io") }
    }
 }
 dependencyResolutionManagement {
@@ -16,6 +17,7 @@ dependencyResolutionManagement {
    repositories {
        google()
        mavenCentral()
+        maven { url = uri("https://jitpack.io") }
    }
 }
Author	SHA1	Message	Date
yovinchen	af8898e60f	update: 新增默认数据	2024-12-10 14:08:07 +08:00
yovinchen	aad8b13a01	docs: 更新项目开源协议为 Apache License 2.0	2024-12-06 16:34:19 +08:00
yovinchen	bd60e62af3	fix: 修改构建版本号	2024-12-05 17:06:04 +08:00
yovinchen	6795b59431	更新 README.md	2024-12-05 16:57:35 +08:00
yovinchen	0ca5e9d39e	更新 README.md	2024-12-05 16:55:32 +08:00
yovinchen	eea4d2441c	Merge pull request '1.2.4稳定版' (#3 ) from develop into master Reviewed-on: #3	2024-12-05 16:52:25 +08:00
yovinchen	e577744ed9	Merge branch 'feature/chart' into develop	2024-12-05 16:51:08 +08:00
yovinchen	c8ebe27082	docs: 更新README文档 - 添加v1.1.0版本成员管理系统的详细说明 - 添加v1.2.0-v1.2.4图表分析系统的功能说明 - 完善版本历史文档 README.md	2024-12-05 16:49:16 +08:00
yovinchen	5cb620b875	feat: 添加趋势分析图表 - 新增趋势图组件，分别显示收入和支出折线 - 更新分析页面ViewModel，处理趋势数据 - 修改分析页面，集成趋势图显示 - 支持深色/浅色主题适配 - 优化图表布局和可读性	2024-12-05 16:43:48 +08:00
yovinchen	02375747fc	docs: 规范文档	2024-12-05 16:01:02 +08:00
yovinchen	119ca539a6	docs: 规范文档	2024-12-05 15:55:08 +08:00
yovinchen	d815960e40	Merge feature/chart into develop Add category pie chart to member detail screen	2024-12-05 15:51:40 +08:00
yovinchen	80ebddfc13	feat: 将类别饼图添加到成员详细信息屏幕 - 在DeliverDetailView模型中添加类别数据状态流 - 从成员视图访问时，在DeliverDetailScreen中显示饼图 - 计算并显示会员记录的类别分布	2024-12-05 15:51:06 +08:00
yovinchen	f717f0ad36	修改版本号	2024-12-05 15:39:57 +08:00
yovinchen	37ecb77a28	Merge branch 'feature/chart' into develop	2024-12-05 15:37:17 +08:00
yovinchen	f6e3acd646	合并 feature/member 分支 - 保留 develop 分支的主题设置 - 合并其他功能更改	2024-12-05 15:34:47 +08:00
yovinchen	b00e01dffb	init: 初始化图标 1. 规范化分类图标命名格式为 ic_category_[name]_24dp.xml 2. 规范化成员图标命名格式为 ic_member_[name]_24dp.xml 3. 统一使用英文命名，便于代码引用 4. 将 SVG 文件转换为 Android Vector Drawable 格式	2024-12-05 15:23:03 +08:00
yovinchen	c7603c0f69	fix: 修复告警	2024-12-05 14:36:34 +08:00
yovinchen	3296f6d154	feat: 增强时间范围筛选和成员统计显示 1. 更新 BookkeepingDao 支持时间范围筛选 2. 重构 CategoryDetailViewModel 及其工厂类 3. 为 MemberStat 添加 Room 注解 4. 改进 CategoryDetailScreen，结合饼状图和列表视图 5. 优化数据库查询和状态管理	2024-12-05 14:35:01 +08:00
yovinchen	c92cc18dde	feat: 添加时间区间选择和数据统计改进 1. 添加 DateRangePicker 组件用于时间区间选择 2. 新增 MemberStat 模型用于成员统计 3. 重构 CategoryStatItem 以支持多类型统计数据 4. 更新 AnalysisViewModel 以支持时间区间统计 5. 改进分类和成员视图的切换逻辑	2024-12-05 13:46:17 +08:00
yovinchen	96d5fab40c	feat: 统一 RecordItem 展示逻辑，与首页保持一致	2024-12-05 11:56:43 +08:00
yovinchen	abf529117f	chore: update misc.xml	2024-12-05 11:52:50 +08:00
yovinchen	713037b266	fix: 修复警告	2024-12-05 11:46:39 +08:00
yovinchen	a0d47864d8	fix: 修复分类视图展示逻辑错误	2024-12-05 11:43:44 +08:00
yovinchen	63149f9abb	fix: 修复成员视图展示逻辑错误	2024-12-05 11:26:21 +08:00
yovinchen	70e79ec584	fix: 修复文字显示错误改进导入语句和UI组件	2024-11-28 23:26:31 +08:00
yovinchen	882435e25a	chore: 更新应用版本号到 v1.2.2	2024-11-28 18:03:35 +08:00
yovinchen	37b91ded7f	refactor: UI界面和代码重构 1. 简化 AnalysisViewModel 使用 Flow 组合 2. 改进 AnalysisScreen 的布局结构 3. 优化 CategoryDetailScreen 的视觉层次 4. 修复统计中成员名称的处理	2024-11-28 18:01:55 +08:00
yovinchen	94fc7b2a7e	feat: 优化记账分析功能 - 重构导航系统，支持更细粒度的页面跳转 - 增强数据访问层，添加新的查询方法 - 优化界面布局和交互体验 - 添加成员分布分析功能 - 改进日期和金额的显示方式	2024-11-28 17:38:54 +08:00
yovinchen	380fdd5589	feat: 成员分析与详情功能实现 1. 新增成员详情页面，按天分组显示记录 2. 优化分析页面，支持分类/成员视图切换 3. 使用 rememberSaveable 保持视图模式状态 4. 改进 UI 布局和交互体验	2024-11-28 16:14:49 +08:00
yovinchen	76d0286883	fix: 修复警告	2024-11-28 14:35:10 +08:00
yovinchen	f134304646	feat: 为饼图添加点击事件 1. 为CategoryPieChart添加点击事件处理 2. 点击饼图可跳转到对应类别详情页面	2024-11-28 14:34:24 +08:00
yovinchen	8339d3d5da	feat: 添加类别详情页面 1. 新增类别详情相关组件和视图模型 2. 优化饼图显示效果 3. 完善导航系统 4. 改进数据查询接口	2024-11-28 14:21:32 +08:00
yovinchen	c3f108ab57	fix: 修复警告	2024-11-28 11:17:20 +08:00
yovinchen	9772fd6e59	fix: 修复警告	2024-11-28 11:17:07 +08:00
yovinchen	0a738fc7e1	fix: 修复警告	2024-11-28 11:15:57 +08:00
yovinchen	6c3b366d45	fix: 修复多余文字	2024-11-28 10:52:08 +08:00
yovinchen	3c080fbc05	fix: 修复月份选择器参数错误 - 将 MonthYearPicker 的 initialMonth 参数改为 selectedMonth - 保持与组件定义一致	2024-11-28 10:51:49 +08:00
yovinchen	e7e630921d	merge: 合并深色模式下开屏白屏问题修复	2024-11-28 09:20:45 +08:00
yovinchen	025b0aade0	fix: 修复深色模式下开屏白屏问题 - 在 values-night/themes.xml 中设置窗口背景色为黑色 - 在 values/themes.xml 中明确设置窗口背景色为白色 - 修改主题文件确保在不同主题模式下有正确的背景色	2024-11-28 09:20:09 +08:00
yovinchen	71deaaa288	style: 简化饼图显示 - 禁用饼图的图例显示 - 移除图例相关的配置代码 - 将 PieDataSet 的标题设置为空字符串 - 优化界面简洁度	2024-11-28 09:10:03 +08:00
yovinchen	47e202fa61	fix: 修复饼图在浅色模式下图例文字颜色显示问题 - 使用 Material Theme 的 onSurface 颜色来设置图例文字颜色 - 确保文字颜色正确跟随系统主题 - 优化代码结构和注释	2024-11-27 18:07:41 +08:00
yovinchen	af880c23eb	新增分析页面，完善大体展示内容 - 顶部月份选择器：可以前后切换月份或直接选择具体月份 - 分析类型切换：支出分析/收入分析/收支趋势 - 数据可视化： - 使用饼图展示各分类占比 - 使用列表展示详细数据，包括金额、百分比和进度条	2024-11-27 17:49:47 +08:00
				`@@ -0,0 +1 @@`
				<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1733368452865" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2083" data-darkreader-inline-fill="" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M259.69 193.89h456.53c8.52 0 15.44 6.92 15.44 15.44v521.43H202.21v-479.4c0-31.72 25.75-57.47 57.47-57.47z" fill="#57B7F9" p-id="2084" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #0a5b92;"></path><path d="M259.69 665.92h471.97v125.74H259.69c-31.72 0-57.47-25.75-57.47-57.47V723.4c0-31.72 25.75-57.47 57.47-57.47z" fill="#33A1F2" p-id="2085" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #1067a6;"></path><path d="M267.14 701.58h453.9c0.67 0 1.21 0.54 1.21 1.21v52.1c0 0.67-0.54 1.21-1.21 1.21h-453.9c-15.04 0-27.26-12.21-27.26-27.26 0-15.04 12.21-27.26 27.26-27.26z" fill="#A1DCFF" p-id="2086" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #343839;"></path><path d="M262.27 193.66v472.26s-55.01 10.41-55.01 38.17V239.34s11.15-33.61 55.01-45.68z" fill="#33A1F2" p-id="2087" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #1067a6;"></path><path d="M515.07 801.66H265.09c-40.18 0-72.87-32.69-72.87-72.87s32.69-72.87 72.87-72.87h417.4c5.52 0 10 4.48 10 10s-4.48 10-10 10H265.08c-29.15 0-52.87 23.72-52.87 52.87s23.72 52.87 52.87 52.87h249.98c5.52 0 10 4.48 10 10s-4.48 10-10 10z" fill="#333333" p-id="2088" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #272a2b;"></path><path d="M202.21 741.89c-5.52 0-10-4.48-10-10V257.88c0-40.18 32.69-72.87 72.87-72.87h451.96c13.57 0 24.61 11.04 24.61 24.61v336.04c0 5.52-4.48 10-10 10s-10-4.48-10-10V209.63c0-2.54-2.07-4.61-4.61-4.61H265.08c-29.15 0-52.87 23.72-52.87 52.87V731.9c0 5.52-4.48 10-10 10z" fill="#333333" p-id="2089" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #272a2b;"></path><path d="M610.28 253.75h-58.59v154.39l58.59-28.83V253.75z" fill="#FFAC3B" p-id="2090" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #ffb148;"></path><path d="M610.28 253.75h58.6v154.39l-58.6-28.83V253.75z" fill="#FFD44A" p-id="2091" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #ffd753;"></path><path d="M789.78 646.03l-43.7-43.7L568.5 779.9l13.7 73.71 207.58-207.58z" fill="#FFAC3B" p-id="2092" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #a86205;"></path><path d="M789.78 646.03l43.7 43.7L655.9 867.31l-73.7-13.7 207.58-207.58z" fill="#FFD44A" p-id="2093" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #785c04;"></path><path d="M668.88 418.14c-1.51 0-3.02-0.34-4.41-1.03l-54.18-26.66-54.18 26.66a10.002 10.002 0 0 1-14.42-8.97V253.75c0-5.52 4.48-10 10-10h117.19c5.52 0 10 4.48 10 10v154.39a10 10 0 0 1-4.72 8.49c-1.61 1-3.45 1.51-5.28 1.51z m-58.59-48.83c1.51 0 3.02 0.34 4.42 1.03l44.18 21.74V263.75H561.7v128.33l44.18-21.74c1.39-0.69 2.9-1.03 4.42-1.03z" fill="#333333" p-id="2094" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #cbc5bc;"></path><path d="M813.81 573.291l48.7 48.698c10.677 10.678 10.684 28.023 0 38.708l-29.034 29.033-87.406-87.405 29.034-29.034c10.677-10.677 28.022-10.684 38.707 0z" fill="#F76C69" p-id="2095" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #f56d68;"></path><path d="M640.86 876.79c-0.51 0-1.02 0-1.54-0.03l-48.58-1.59c-16.35-0.54-29.58-13.76-30.11-30.11l-1.59-48.58c-0.43-13.08 4.63-25.89 13.88-35.14L765.4 568.86c13.44-13.44 35.31-13.44 48.75 0l52.79 52.79c13.44 13.44 13.44 35.31 0 48.75L674.46 862.88c-8.89 8.89-21.06 13.91-33.6 13.91z m148.91-298.03c-3.71 0-7.41 1.41-10.23 4.23L587.06 775.47a27.575 27.575 0 0 0-8.04 20.34l1.59 48.58c0.19 5.85 4.93 10.59 10.78 10.78l48.58 1.59c7.57 0.24 14.99-2.68 20.34-8.04l192.48-192.48c5.64-5.64 5.64-14.82 0-20.47L800 582.98a14.43 14.43 0 0 0-10.23-4.23z" fill="#333333" p-id="2096" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #272a2b;"></path><path d="M799.92 666.17c-2.56 0-5.12-0.98-7.07-2.93l-48.74-48.74c-3.91-3.91-3.91-10.24 0-14.14s10.24-3.91 14.14 0l48.74 48.74c3.91 3.91 3.91 10.24 0 14.14a9.973 9.973 0 0 1-7.07 2.93z" fill="#333333" p-id="2097" data-darkreader-inline-fill="" style="--darkreader-inline-fill: #cbc5bc;"></path></svg>