91 changed files with 1252 additions and 6211 deletions
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@ -4,14 +4,6 @@
    <selectionStates>
      <SelectionState runConfigName="app">
        <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-11-27T02:15:16.043756Z">
-          <Target type="DEFAULT_BOOT">
-            <handle>
-              <DeviceId pluginId="LocalEmulator" identifier="path=/Users/yovinchen/.android/avd/Pixel_7a_API_34.avd" />
-            </handle>
-          </Target>
-        </DropdownSelection>
-        <DialogSelection />
      </SelectionState>
    </selectionStates>
  </component>
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
  <component name="GradleSettings">
    <option name="linkedExternalProjectsSettings">
      <GradleProjectSettings>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@ -1,10 +1,5 @@
 <?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/.idea/studiobot.xml
+++ b/.idea/studiobot.xml
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="StudioBotProjectSettings">
-    <option name="shareContext" value="OptedIn" />
-  </component>
-</project>
--- a/167
+++ b/167
@ -1,73 +1,158 @@
-Apache License
-Version 2.0, January 2004
-http://www.apache.org/licenses/
+Creative Commons Attribution-NonCommercial 4.0 International

-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+ 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.

-1. Definitions.
+Using Creative Commons Public Licenses

-"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+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.

-"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+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.

-"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.
+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.

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

-"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+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.

-"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.
+Section 1 – Definitions.

-"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).
+     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.

-"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.
+     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.

-"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."
+     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.

-"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.
+     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.

-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.
+     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.

-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.
+     f.	Licensed Material means the artistic or literary work, database, or other material to which the Licensor applied this Public 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:
+     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.

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

-     (b) You must cause any modified files to carry prominent notices stating that You changed the files; 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.

-     (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
+     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.

-     (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.
+     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.

-     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.
+     l.	You means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning.

-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.
+Section 2 – Scope.

-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.
+     a.	License grant.

-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.
+          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:

-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.
+               A. reproduce and Share the Licensed Material, in whole or in part, for NonCommercial purposes only; and

-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.
+               B. produce, reproduce, and Share Adapted Material for NonCommercial purposes only.

-END OF TERMS AND CONDITIONS
+          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.

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

-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.
+          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.

-Copyright 2024 yovinchen
+          5. Downstream recipients.

-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
+               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.

-http://www.apache.org/licenses/LICENSE-2.0
+               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.

-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.
+          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.
--- a/README.md
+++ b/README.md
@ -1,192 +1,71 @@
-# 轻记账 (Lightweight Bookkeeping)
+# Bookkeeping App

-一个轻量级的个人记账应用，专注于隐私和离线使用。
+一个基于 Jetpack Compose 开发的现代化记账应用。

-## 📖 项目概述
+## 项目概述

 本项目是一个使用 Kotlin 和 Jetpack Compose 开发的 Android 记账应用，采用 MVVM 架构，提供简洁直观的用户界面和丰富的记账功能。

-## ⭐️ 主要特性
+## 主要特性

- 🔒 完全离线运行，无需网络连接
- 📱 极简权限要求，仅使用必要的系统权限
- 💰 支持收入和支出记录
- 👥 支持多人记账
- 📊 按日期和类别统计
+- 💰 收入/支出记录管理
+- 📊 分类管理系统
+- 📅 自定义日期选择器
+- 📈 月度统计视图
+- 🎨 Material 3 设计风格

-## 🛠 技术栈
+## 技术栈

- 💻 开发语言：Kotlin
- 🎨 UI 框架：Jetpack Compose
- 🏗️ 架构模式：MVVM
- 💾 数据存储：Room Database
- 💉 依赖注入：Hilt
- ⚡️ 异步处理：Kotlin Coroutines
+- 开发语言：Kotlin
+- UI 框架：Jetpack Compose
+- 架构模式：MVVM
+- 数据存储：Room Database
+- 依赖注入：Hilt
+- 异步处理：Kotlin Coroutines

-## 🗺 开发路线图
+## 开发计划

-### 0. 基础记账 (已完成 ✨)
- [x] 收入/支出记录管理
- [x] 分类管理系统
- [x] 自定义日期选择器
- [x] Material 3 设计界面
- [x] 深色/浅色主题切换
- [x] 主题色自定义
-
-### 1. 成员系统 (已完成 🎉)
- [x] 成员添加/编辑/删除
- [x] 记账时选择相关成员
- [x] 主页账单修改相关成员
- [x] 成员消费统计
-
-### 2. 图表分析 (已完成 🎉)
- [x] 支出/收入趋势图表
- [x] 分类占比饼图
+### 1. 数据统计与可视化 (feature/statistics)
+- [ ] 支出/收入趋势图表
+- [ ] 分类占比饼图
 - [ ] 月度/年度报表
- [x] 成员消费分析
- [x] 自定义统计周期

-### 3 图标美化计划 (已完成 🎉)
- [x] 食品类图标 (餐饮、零食、饮料等)
- [x] 交通类图标 (公交、打车、加油等)
- [x] 购物类图标 (超市、数码、服装等)
- [x] 居住类图标 (房租、水电、物业等)
- [x] 医疗类图标 (药品、诊疗、保健等)
- [x] 娱乐类图标 (游戏、电影、旅游等)
- [x] 学习类图标 (书籍、课程、文具等)
- [x] 其他类图标 (礼物、捐赠、其他等)
- [x] 收入类图标 (工资、奖金、理财等)
- [x] 成员图标 (家人、朋友、同事等)
+### 2. 数据导出与备份 (feature/backup)
+- [ ] 导出 CSV/Excel 功能
+- [ ] 云端备份支持
+- [ ] 数据迁移工具

-### 4. 数据管理 (进行中 🚀)
- [x] 导出 CSV/Excel 功能
- [x] 数据导入
- [x] 数据迁移工具
- [x] 定期自动备份
- [ ] 备份加密功能
-
-### 5. 预算管理 (计划中 💡)
+### 3. 预算管理 (feature/budget)
 - [ ] 月度预算设置
 - [ ] 预算超支提醒
 - [ ] 分类预算管理
- [ ] 成员预算管理
- [ ] 预算分析报告

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

-### 7. 性能提升 (持续进行 ⚡️)
+### 5. 性能优化 (feature/performance)
 - [ ] 大数据量处理优化
 - [ ] 启动速度优化
 - [ ] 内存使用优化
- [ ] 缓存策略优化
- [ ] 数据库查询优化

-## 🌲 分支管理
+## 分支管理

- `master`: 稳定主分支
- `develop`: 主开发分支
- `feature/*`: 功能开发分支
- `release/*`: 版本发布分支
- `hotfix/*`: 紧急修复分支
+- `master`: 主分支，保持稳定可用
+- `develop`: 开发分支，新功能开发的基础分支
+- `feature/*`: 具体功能开发分支
+- `release/*`: 发布准备分支

-## 🔄 提交规范
+## 如何贡献

-提交信息应遵循以下格式：`<type>: <description>`
-
-### 提交类型（Type）
-
- `feat`: 新功能（feature）
- `fix`: 修复bug
- `docs`: 文档更新（documentation）
- `style`: 代码格式（不影响代码运行的变动）
- `refactor`: 代码重构（既不是新增功能，也不是修复bug）
- `perf`: 性能优化
- `test`: 测试相关
- `build`: 构建相关
- `ci`: 持续集成
- `chore`: 构建过程或辅助工具的变动
- `revert`: 回退提交
- `improvement`: 改进
-
-## 📝 版本历史
-
-### v1.3
- 图标美化计划
-  - 增加图标美化
-  - 支持图标选择
-
-### v1.2.0 - v1.2.4
- 分类数据可视化
-  - 支出/收入分类饼图展示
-  - 分类占比详细统计
-  - 分类数据交互和筛选
- 成员数据可视化
-  - 成员消费饼图展示
-  - 成员支出占比统计
-  - 成员数据交互和筛选
- 趋势分析
-  - 日收支趋势折线图
-  - 收入支出双线对比
-  - 支持深色/浅色主题
-  - 图表交互和缩放
- 数据筛选
-  - 支持按日期范围筛选
-  - 支持按收入/支出类型筛选
-  - 支持按成员/分类筛选
-
-### v1.1.0
- 成员管理功能
-  - 成员添加/编辑/删除
-  - 记账时选择相关成员
-  - 成员消费统计
- UI/UX 优化
-  - 记录展示优化
-  - 月度统计界面
-  - 分组展示优化
- 数据管理
-  - 记录筛选增强
-  - 数据库性能优化
-  - 状态管理重构
-
-### v1.0.0
- 基础记账功能
-  - 收入/支出记录
-  - 金额、日期、分类、备注管理
- Material 3 设计界面
-  - 深色/浅色主题切换
-  - 主题色自定义
- 分类管理
-  - 默认分类预设
-  - 自定义分类支持
-  - 分类编辑与删除
- 月度统计
-  - 月度收支总览
-  - 月份快速切换
- 自定义日期选择器
-
-## 🤝 贡献指南
-
-1. Fork 项目
-2. 创建功能分支 (`git checkout -b feature/AmazingFeature`)
-3. 提交更改 (`git commit -m 'feat: Add some AmazingFeature'`)
+1. Fork 本仓库
+2. 创建你的功能分支 (`git checkout -b feature/AmazingFeature`)
+3. 提交你的改动 (`git commit -m 'Add some AmazingFeature'`)
 4. 推送到分支 (`git push origin feature/AmazingFeature`)
-5. 提交 Pull Request
+5. 开启一个 Pull Request

-## 📄 许可证
+## 许可证

-本项目采用 Apache License 2.0 许可证 - 查看 [LICENSE](LICENSE) 文件了解详细信息
-
-## 📮 联系方式
-
- 作者：YovinChen
- 邮箱：gzh298255@gmail.com
- 博客：[blog.hhdxw.top](https://blog.hhdxw.top)
-
-## 🙏 致谢
-
-感谢所有为这个项目做出贡献的开发者！
+本项目采用 GNU GPLv3 许可证 - 详见 [LICENSE](LICENSE) 文件
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@ -4,10 +4,6 @@ plugins {
    id("com.google.devtools.ksp")
 }

-import java.text.SimpleDateFormat
-import java.util.Date
-import com.android.build.api.variant.FilterConfiguration
-
 android {
    namespace = "com.yovinchen.bookkeeping"
    compileSdk = 34
@ -16,8 +12,8 @@ android {
        applicationId = "com.yovinchen.bookkeeping"
        minSdk = 26
        targetSdk = 34
-        versionCode = 6
-        versionName = "1.4.0"
+        versionCode = 1
+        versionName = "1.0"

        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
        vectorDrawables {
@ -27,37 +23,19 @@ android {

    buildTypes {
        release {
-            isMinifyEnabled = true
-            isShrinkResources = true
+            isMinifyEnabled = false
            proguardFiles(
                getDefaultProguardFile("proguard-android-optimize.txt"),
                "proguard-rules.pro"
            )
-            signingConfig = signingConfigs.getByName("debug") // 使用debug签名，实际发布时应该使用正式的签名配置
        }
    }
-    
-    applicationVariants.all {
-        val variant = this
-        variant.outputs
-            .map { it as com.android.build.gradle.internal.api.BaseVariantOutputImpl }
-            .forEach { output ->
-                // 获取当前时间
-                val date = SimpleDateFormat("yyyyMMdd_HHmm").format(Date())
-                // 获取CPU架构，如果没有则使用universal
-                val buildType = variant.buildType.name
-                // 构建文件名
-                val outputFileName = "轻记账_${buildType}_v${variant.versionName}_${date}.apk"
-                output.outputFileName = outputFileName
-            }
-    }
-    
    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
    }
    kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = "1.8"
    }
    buildFeatures {
        compose = true
@ -89,7 +67,6 @@ 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"
@ -97,9 +74,6 @@ 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")
@ -107,9 +81,4 @@ dependencies {
    androidTestImplementation("androidx.compose.ui:ui-test-junit4")
    debugImplementation("androidx.compose.ui:ui-tooling")
    debugImplementation("androidx.compose.ui:ui-test-manifest")
-
-    // CSV Excel 库
-    implementation("com.opencsv:opencsv:5.7.1")
-    implementation("org.apache.poi:poi:5.2.3")
-    implementation("org.apache.poi:poi-ooxml:5.2.3")
 }
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -2,9 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools">

-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
    <application
        android:allowBackup="true"
        android:dataExtractionRules="@xml/data_extraction_rules"
@ -18,6 +15,7 @@
        <activity
            android:name=".MainActivity"
            android:exported="true"
+            android:label="@string/app_name"
            android:theme="@style/Theme.Bookkeeping">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
--- a/app/src/main/java/com/yovinchen/bookkeeping/MainActivity.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/MainActivity.kt
@ -1,12 +1,9 @@
 package com.yovinchen.bookkeeping

 import android.app.Activity
-import android.net.Uri
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.MaterialTheme
@ -22,31 +19,6 @@ import com.yovinchen.bookkeeping.model.ThemeMode
 import com.yovinchen.bookkeeping.ui.components.predefinedColors
 import com.yovinchen.bookkeeping.ui.navigation.MainNavigation
 import com.yovinchen.bookkeeping.ui.theme.BookkeepingTheme
-import com.yovinchen.bookkeeping.utils.FilePickerUtil
-
-private var filePickerLauncher: ActivityResultLauncher<Array<String>>? = null
-
-fun ComponentActivity.getPreregisteredFilePickerLauncher(): ActivityResultLauncher<Array<String>> {
-    return filePickerLauncher ?: throw IllegalStateException("FilePickerLauncher not initialized")
-}
-
-class MainActivity : ComponentActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        WindowCompat.setDecorFitsSystemWindows(window, false)
-
-        // 预注册文件选择器
-        filePickerLauncher = registerForActivityResult(
-            ActivityResultContracts.OpenDocument()
-        ) { uri: Uri? ->
-            FilePickerUtil.handleFileSelection(this, uri)
-        }
-
-        setContent {
-            BookkeepingApp()
-        }
-    }
-}

@Composable
 private fun SystemBarColor(isDarkTheme: Boolean) {
@ -116,6 +88,16 @@ fun BookkeepingApp() {
    }
 }

+class MainActivity : ComponentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+        setContent {
+            BookkeepingApp()
+        }
+    }
+}
+
@Composable
 fun Greeting(name: String, modifier: Modifier = Modifier) {
    Text(
--- a/app/src/main/java/com/yovinchen/bookkeeping/data/BookkeepingDao.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/data/BookkeepingDao.kt
@ -3,7 +3,6 @@ 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
@ -13,201 +12,53 @@ interface BookkeepingDao {
    @Query("SELECT * FROM bookkeeping_records ORDER BY date DESC")
    fun getAllRecords(): Flow<List<BookkeepingRecord>>

-    @Query("SELECT * FROM bookkeeping_records WHERE memberId = :memberId OR memberId IS NULL ORDER BY date DESC")
-    fun getRecordsByMember(memberId: Int): Flow<List<BookkeepingRecord>>
-
-    @Query("SELECT * FROM bookkeeping_records WHERE date BETWEEN :startDate AND :endDate ORDER BY date DESC")
-    fun getRecordsByDateRange(startDate: Date, endDate: Date): Flow<List<BookkeepingRecord>>
-
-    @Query("SELECT * FROM bookkeeping_records WHERE (memberId = :memberId OR memberId IS NULL) AND date BETWEEN :startDate AND :endDate ORDER BY date DESC")
-    fun getRecordsByMemberAndDateRange(memberId: Int, startDate: Date, endDate: Date): Flow<List<BookkeepingRecord>>
-
-    @Query("SELECT * FROM bookkeeping_records WHERE type = :type ORDER BY date DESC")
-    fun getRecordsByType(type: TransactionType): Flow<List<BookkeepingRecord>>
-
-    @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
-
-    @Update
-    suspend fun updateRecord(record: BookkeepingRecord)
+    suspend fun insertRecord(record: BookkeepingRecord)

    @Delete
    suspend fun deleteRecord(record: BookkeepingRecord)

+    @Update
+    suspend fun updateRecord(record: BookkeepingRecord)
+
+    @Query("SELECT * FROM bookkeeping_records WHERE type = 'INCOME'")
+    fun getAllIncome(): Flow<List<BookkeepingRecord>>
+
+    @Query("SELECT * FROM bookkeeping_records WHERE type = 'EXPENSE'")
+    fun getAllExpense(): Flow<List<BookkeepingRecord>>
+
+    // 按日期查询
+    @Query("SELECT * FROM bookkeeping_records WHERE date >= :startOfDay AND date < :endOfDay ORDER BY date DESC")
+    fun getRecordsByDate(startOfDay: Date, endOfDay: Date): Flow<List<BookkeepingRecord>>
+
+    // 按日期范围查询
+    @Query("SELECT * FROM bookkeeping_records WHERE date BETWEEN :startDate AND :endDate ORDER BY date DESC")
+    fun getRecordsByDateRange(startDate: Date, endDate: Date): Flow<List<BookkeepingRecord>>
+
+    // 按类别查询
+    @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 type = :type ORDER BY date DESC")
+    fun getRecordsByType(type: TransactionType): Flow<List<BookkeepingRecord>>
+
+    // Category related queries
    @Query("SELECT * FROM categories WHERE type = :type ORDER BY name ASC")
    fun getCategoriesByType(type: TransactionType): Flow<List<Category>>

    @Insert
-    suspend fun insertCategory(category: Category): Long
-
-    @Update
-    suspend fun updateCategory(category: Category)
+    suspend fun insertCategory(category: Category)

    @Delete
    suspend fun deleteCategory(category: Category)

+    @Update
+    suspend fun updateCategory(category: Category)
+
    @Query("SELECT EXISTS(SELECT 1 FROM bookkeeping_records WHERE category = :categoryName LIMIT 1)")
    suspend fun isCategoryInUse(categoryName: String): Boolean

    @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
@ -8,201 +8,162 @@ import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
 import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
-import com.yovinchen.bookkeeping.R
 import com.yovinchen.bookkeeping.model.BookkeepingRecord
 import com.yovinchen.bookkeeping.model.Category
 import com.yovinchen.bookkeeping.model.Converters
-import com.yovinchen.bookkeeping.model.Member
 import com.yovinchen.bookkeeping.model.TransactionType
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch

-@Database(
-    entities = [BookkeepingRecord::class, Category::class, Member::class],
-    version = 4,
-    exportSchema = false
-)
+@Database(entities = [BookkeepingRecord::class, Category::class], version = 2, exportSchema = false)
@TypeConverters(Converters::class)
 abstract class BookkeepingDatabase : RoomDatabase() {
    abstract fun bookkeepingDao(): BookkeepingDao
-    abstract fun categoryDao(): CategoryDao
-    abstract fun memberDao(): MemberDao

    companion object {
        private const val TAG = "BookkeepingDatabase"
+        
+        @Volatile
+        private var Instance: BookkeepingDatabase? = null

        private val MIGRATION_1_2 = object : Migration(1, 2) {
            override fun migrate(db: SupportSQLiteDatabase) {
-                // 创建成员表
-                db.execSQL("""
-                    CREATE TABLE IF NOT EXISTS members (
-                        id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
-                        name TEXT NOT NULL,
-                        description TEXT NOT NULL DEFAULT '',
-                        icon INTEGER NOT NULL DEFAULT 0
-                    )
-                """)
+                try {
+                    Log.d(TAG, "Starting migration from version 1 to 2")
+                    
+                    // 检查表是否存在
+                    val cursor = db.query("SELECT name FROM sqlite_master WHERE type='table' AND name='categories'")
+                    val tableExists = cursor.moveToFirst()
+                    cursor.close()
+                    
+                    if (tableExists) {
+                        // 如果表存在，执行迁移
+                        Log.d(TAG, "Categories table exists, performing migration")
+                        db.execSQL("ALTER TABLE categories RENAME TO categories_old")
+                        
+                        db.execSQL("""
+                            CREATE TABLE categories (
+                                id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                                name TEXT NOT NULL,
+                                type TEXT NOT NULL
+                            )
+                        """)
+                        
+                        db.execSQL("""
+                            INSERT INTO categories (name, type)
+                            SELECT name, type FROM categories_old
+                        """)
+                        
+                        db.execSQL("DROP TABLE categories_old")
+                    } else {
+                        // 如果表不存在，直接创建新表
+                        Log.d(TAG, "Categories table does not exist, creating new table")
+                        db.execSQL("""
+                            CREATE TABLE IF NOT EXISTS categories (
+                                id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                                name TEXT NOT NULL,
+                                type TEXT NOT NULL
+                            )
+                        """)
+                    }
+                    
+                    // 确保 bookkeeping_records 表存在
+                    db.execSQL("""
+                        CREATE TABLE IF NOT EXISTS bookkeeping_records (
+                            id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                            type TEXT NOT NULL,
+                            amount REAL NOT NULL,
+                            category TEXT NOT NULL,
+                            description TEXT NOT NULL,
+                            date INTEGER NOT NULL
+                        )
+                    """)
+                    
+                    Log.d(TAG, "Migration completed successfully")
+                } catch (e: Exception) {
+                    Log.e(TAG, "Error during migration", e)
+                    throw e
+                }
+            }
+        }
+
+        private suspend fun populateDefaultCategories(dao: BookkeepingDao) {
+            try {
+                Log.d(TAG, "Starting to populate default categories")
+                // 支出类别
+                listOf(
+                    "餐饮",
+                    "交通",
+                    "购物",
+                    "娱乐",
+                    "医疗",
+                    "住房",
+                    "其他支出"
+                ).forEach { name ->
+                    try {
+                        dao.insertCategory(Category(name = name, type = TransactionType.EXPENSE))
+                        Log.d(TAG, "Added expense category: $name")
+                    } catch (e: Exception) {
+                        Log.e(TAG, "Error adding expense category: $name", e)
+                    }
+                }
                
-                // 插入默认成员
-                db.execSQL("""
-                    INSERT INTO members (name, description, icon)
-                    VALUES ('自己', '默认成员', ${R.drawable.ic_member_boy_24dp})
-                """)
-
-                // 修改记账记录表，添加成员ID字段
-                db.execSQL("""
-                    ALTER TABLE bookkeeping_records
-                    ADD COLUMN memberId INTEGER DEFAULT NULL
-                    REFERENCES members(id) ON DELETE SET NULL
-                """)
-
-                // 更新现有记录，将其关联到默认成员
-                db.execSQL("""
-                    UPDATE bookkeeping_records
-                    SET memberId = (SELECT id FROM members WHERE name = '我自己')
-                """)
+                // 收入类别
+                listOf(
+                    "工资",
+                    "奖金",
+                    "投资",
+                    "其他收入"
+                ).forEach { name ->
+                    try {
+                        dao.insertCategory(Category(name = name, type = TransactionType.INCOME))
+                        Log.d(TAG, "Added income category: $name")
+                    } catch (e: Exception) {
+                        Log.e(TAG, "Error adding income category: $name", e)
+                    }
+                }
+                Log.d(TAG, "Finished populating default categories")
+            } catch (e: Exception) {
+                Log.e(TAG, "Error during category population", e)
            }
        }

-        private val MIGRATION_2_3 = object : Migration(2, 3) {
-            override fun migrate(db: SupportSQLiteDatabase) {
-                // 重新创建记账记录表
-                db.execSQL("""
-                    CREATE TABLE IF NOT EXISTS bookkeeping_records_new (
-                        id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
-                        amount REAL NOT NULL,
-                        type TEXT NOT NULL,
-                        category TEXT NOT NULL,
-                        description TEXT NOT NULL,
-                        date INTEGER NOT NULL,
-                        memberId INTEGER,
-                        FOREIGN KEY(memberId) REFERENCES members(id) ON DELETE SET NULL
-                    )
-                """)
-
-                // 复制数据
-                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
-                """)
-
-                // 删除旧表
-                db.execSQL("DROP TABLE bookkeeping_records")
-
-                // 重命名新表
-                db.execSQL("ALTER TABLE bookkeeping_records_new RENAME TO bookkeeping_records")
-
-                // 重新创建分类表
-                db.execSQL("""
-                    CREATE TABLE IF NOT EXISTS categories_new (
-                        id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
-                        name TEXT NOT NULL,
-                        type TEXT NOT NULL,
-                        icon INTEGER NOT NULL DEFAULT 0
-                    )
-                """)
-
-                // 复制分类数据
-                db.execSQL("""
-                    INSERT INTO categories_new (id, name, type, icon)
-                    SELECT id, name, type, 0 FROM categories
-                """)
-
-                // 删除旧表
-                db.execSQL("DROP TABLE categories")
-
-                // 重命名新表
-                db.execSQL("ALTER TABLE categories_new RENAME TO categories")
-            }
-        }
-
-        private val MIGRATION_3_4 = object : Migration(3, 4) {
-            override fun migrate(db: SupportSQLiteDatabase) {
-                // 如果需要，在这里添加数据库迁移逻辑
-                // 由于这次更改可能只是schema hash的变化，我们不需要实际的数据库更改
-            }
-        }
-
-        @Volatile
-        private var INSTANCE: BookkeepingDatabase? = null
-
        fun getDatabase(context: Context): BookkeepingDatabase {
-            return INSTANCE ?: synchronized(this) {
-                val instance = Room.databaseBuilder(
-                    context.applicationContext,
-                    BookkeepingDatabase::class.java,
-                    "bookkeeping_database"
-                )
-                    .addMigrations(MIGRATION_1_2, MIGRATION_2_3, MIGRATION_3_4)
-                    .addCallback(object : Callback() {
+            return Instance ?: synchronized(this) {
+                try {
+                    Log.d(TAG, "Creating new database instance")
+                    val instance = Room.databaseBuilder(
+                        context.applicationContext,
+                        BookkeepingDatabase::class.java,
+                        "bookkeeping_database"
+                    )
+                    .addCallback(object : RoomDatabase.Callback() {
                        override fun onCreate(db: SupportSQLiteDatabase) {
                            super.onCreate(db)
-                            Log.d(TAG, "Database created, initializing default data")
+                            Log.d(TAG, "Database created, initializing default categories")
                            CoroutineScope(Dispatchers.IO).launch {
                                try {
-                                    val database = getDatabase(context)
-                                    
-                                    // 初始化默认成员
-                                    database.memberDao().apply {
-                                        if (getMemberCount() == 0) {
-                                            insertMember(Member(name = "自己", description = "默认成员", icon = R.drawable.ic_member_boy_24dp))
-                                            insertMember(Member(name = "老婆", description = "默认成员", icon = R.drawable.ic_member_girl_24dp))
-                                            insertMember(Member(name = "老公", description = "默认成员", icon = R.drawable.ic_member_boy_24dp))
-                                            insertMember(Member(name = "家庭", description = "默认成员", icon = R.drawable.ic_member_family_24dp))
-                                            insertMember(Member(name = "儿子", description = "默认成员", icon = R.drawable.ic_member_baby_boy_24dp))
-                                            insertMember(Member(name = "女儿", description = "默认成员", icon = R.drawable.ic_member_baby_girl_24dp))
-                                            insertMember(Member(name = "爸爸", description = "默认成员", icon = R.drawable.ic_member_father_24dp))
-                                            insertMember(Member(name = "妈妈", description = "默认成员", icon = R.drawable.ic_member_mother_24dp))
-                                            insertMember(Member(name = "爷爷", description = "默认成员", icon = R.drawable.ic_member_grandfather_24dp))
-                                            insertMember(Member(name = "奶奶", description = "默认成员", icon = R.drawable.ic_member_grandmother_24dp))
-                                            insertMember(Member(name = "外公", description = "默认成员", icon = R.drawable.ic_member_grandfather_24dp))
-                                            insertMember(Member(name = "外婆", description = "默认成员", icon = R.drawable.ic_member_grandmother_24dp))
-                                            insertMember(Member(name = "其他人", description = "默认成员", icon = R.drawable.ic_member_boy_24dp))
-                                        }
+                                    Instance?.let { database ->
+                                        populateDefaultCategories(database.bookkeepingDao())
                                    }
-
-// 初始化默认分类
-                                    database.categoryDao().apply {
-                                        // 支出分类
-                                        insertCategory(Category(name = "餐饮", type = TransactionType.EXPENSE, icon = R.drawable.ic_category_food_24dp))      // "餐饮" to R.drawable.ic_category_food_24dp
-                                        insertCategory(Category(name = "交通", type = TransactionType.EXPENSE, icon = R.drawable.ic_category_taxi_24dp))      // "交通" to R.drawable.ic_category_taxi_24dp
-                                        insertCategory(Category(name = "购物", type = TransactionType.EXPENSE, icon = R.drawable.ic_category_supermarket_24dp)) // "购物" to R.drawable.ic_category_supermarket_24dp
-                                        insertCategory(Category(name = "娱乐", type = TransactionType.EXPENSE, icon = R.drawable.ic_category_bar_24dp))       // "娱乐" to R.drawable.ic_category_bar_24dp
-                                        insertCategory(Category(name = "居住", type = TransactionType.EXPENSE, icon = R.drawable.ic_category_hotel_24dp))     // "居住" to R.drawable.ic_category_hotel_24dp
-                                        insertCategory(Category(name = "医疗", type = TransactionType.EXPENSE, icon = R.drawable.ic_category_medicine_24dp))  // "医疗" to R.drawable.ic_category_medicine_24dp
-                                        insertCategory(Category(name = "教育", type = TransactionType.EXPENSE, icon = R.drawable.ic_category_training_24dp))  // "教育" to R.drawable.ic_category_training_24dp
-                                        insertCategory(Category(name = "宠物", type = TransactionType.EXPENSE, icon = R.drawable.ic_category_pet_24dp))       // "宠物" to R.drawable.ic_category_pet_24dp
-                                        insertCategory(Category(name = "鲜花", type = TransactionType.EXPENSE, icon = R.drawable.ic_category_flower_24dp))    // "鲜花" to R.drawable.ic_category_flower_24dp
-                                        insertCategory(Category(name = "外卖", type = TransactionType.EXPENSE, icon = R.drawable.ic_category_delivery_24dp))  // "外卖" to R.drawable.ic_category_delivery_24dp
-                                        insertCategory(Category(name = "数码", type = TransactionType.EXPENSE, icon = R.drawable.ic_category_digital_24dp))   // "数码" to R.drawable.ic_category_digital_24dp
-                                        insertCategory(Category(name = "化妆品", type = TransactionType.EXPENSE, icon = R.drawable.ic_category_cosmetics_24dp)) // "化妆品" to R.drawable.ic_category_cosmetics_24dp
-                                        insertCategory(Category(name = "水果", type = TransactionType.EXPENSE, icon = R.drawable.ic_category_fruit_24dp))     // "水果" to R.drawable.ic_category_fruit_24dp
-                                        insertCategory(Category(name = "零食", type = TransactionType.EXPENSE, icon = R.drawable.ic_category_snack_24dp))     // "零食" to R.drawable.ic_category_snack_24dp
-                                        insertCategory(Category(name = "蔬菜", type = TransactionType.EXPENSE, icon = R.drawable.ic_category_vegetable_24dp)) // "蔬菜" to R.drawable.ic_category_vegetable_24dp
-                                        insertCategory(Category(name = "会员", type = TransactionType.EXPENSE, icon = R.drawable.ic_category_membership_24dp)) // "工资" to R.drawable.ic_category_membership_24dp
-                                        insertCategory(Category(name = "礼物", type = TransactionType.EXPENSE, icon = R.drawable.ic_category_gift_24dp))      // "礼物" to R.drawable.ic_category_gift_24dp
-                                        insertCategory(Category(name = "其他支出", type = TransactionType.EXPENSE, icon = R.drawable.ic_category_more_24dp))  // "其他" to R.drawable.ic_category_more_24dp
-
-// 收入分类
-                                        insertCategory(Category(name = "工资", type = TransactionType.INCOME, icon = R.drawable.ic_category_membership_24dp)) // "工资" to R.drawable.ic_category_membership_24dp
-                                        insertCategory(Category(name = "奖金", type = TransactionType.INCOME, icon = R.drawable.ic_category_gift_24dp))      // "奖金" to R.drawable.ic_category_gift_24dp
-                                        insertCategory(Category(name = "投资", type = TransactionType.INCOME, icon = R.drawable.ic_category_digital_24dp))   // "投资" to R.drawable.ic_category_digital_24dp
-                                        insertCategory(Category(name = "其他收入", type = TransactionType.INCOME, icon = R.drawable.ic_category_more_24dp))   // "其他" to R.drawable.ic_category_more_24dp
-
-                                    }
-
-                                    
-                                    Log.d(TAG, "Default data initialized successfully")
                                } catch (e: Exception) {
-                                    Log.e(TAG, "Error initializing default data", e)
+                                    Log.e(TAG, "Error in onCreate callback", e)
                                }
                            }
                        }
                    })
+                    .addMigrations(MIGRATION_1_2)
+                    .fallbackToDestructiveMigration()  // 如果迁移失败，允许重建数据库
                    .build()
-                INSTANCE = instance
-                instance
+                    
+                    Instance = instance
+                    Log.d(TAG, "Database instance created successfully")
+                    instance
+                } catch (e: Exception) {
+                    Log.e(TAG, "Error creating database", e)
+                    throw e
+                }
            }
        }
    }
--- a/app/src/main/java/com/yovinchen/bookkeeping/data/CategoryDao.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/data/CategoryDao.kt
@ -1,30 +0,0 @@
-package com.yovinchen.bookkeeping.data
-
-import androidx.room.*
-import com.yovinchen.bookkeeping.model.Category
-import com.yovinchen.bookkeeping.model.TransactionType
-import kotlinx.coroutines.flow.Flow
-
-@Dao
-interface CategoryDao {
-    @Query("SELECT * FROM categories WHERE type = :type ORDER BY name ASC")
-    fun getCategoriesByType(type: TransactionType): Flow<List<Category>>
-
-    @Query("SELECT * FROM categories ORDER BY type ASC, name ASC")
-    fun getAllCategories(): Flow<List<Category>>
-
-    @Insert
-    suspend fun insertCategory(category: Category): Long
-
-    @Update
-    suspend fun updateCategory(category: Category)
-
-    @Delete
-    suspend fun deleteCategory(category: Category)
-
-    @Query("SELECT EXISTS(SELECT 1 FROM bookkeeping_records WHERE category = :categoryName LIMIT 1)")
-    suspend fun isCategoryInUse(categoryName: String): Boolean
-
-    @Query("SELECT COUNT(*) FROM categories WHERE type = :type")
-    suspend fun getCategoryCountByType(type: TransactionType): Int
-}
--- a/app/src/main/java/com/yovinchen/bookkeeping/data/Converters.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/data/Converters.kt
@ -3,7 +3,6 @@ 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
@ -19,14 +18,4 @@ 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/MemberDao.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/data/MemberDao.kt
@ -1,26 +0,0 @@
-package com.yovinchen.bookkeeping.data
-
-import androidx.room.*
-import com.yovinchen.bookkeeping.model.Member
-import kotlinx.coroutines.flow.Flow
-
-@Dao
-interface MemberDao {
-    @Query("SELECT * FROM members ORDER BY name ASC")
-    fun getAllMembers(): Flow<List<Member>>
-
-    @Query("SELECT * FROM members WHERE id = :memberId")
-    suspend fun getMemberById(memberId: Int): Member?
-
-    @Insert
-    suspend fun insertMember(member: Member): Long
-
-    @Update
-    suspend fun updateMember(member: Member)
-
-    @Delete
-    suspend fun deleteMember(member: Member)
-
-    @Query("SELECT COUNT(*) FROM members")
-    suspend fun getMemberCount(): Int
-}
--- a/app/src/main/java/com/yovinchen/bookkeeping/data/Record.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/data/Record.kt
@ -12,6 +12,5 @@ data class Record(
    val category: String,
    val description: String,
    val dateTime: LocalDateTime = LocalDateTime.now(),
-    val isExpense: Boolean = true,
-    val member: String = "Default"
+    val isExpense: Boolean = true
 )
--- a/app/src/main/java/com/yovinchen/bookkeeping/model/AnalysisType.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/model/AnalysisType.kt
@ -1,7 +0,0 @@
-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
@ -1,12 +1,9 @@
 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
-import com.yovinchen.bookkeeping.model.Member
 import java.util.Date

 enum class TransactionType {
@ -35,20 +32,7 @@ class Converters {
    }
 }

-@Entity(
-    tableName = "bookkeeping_records",
-    foreignKeys = [
-        ForeignKey(
-            entity = Member::class,
-            parentColumns = ["id"],
-            childColumns = ["memberId"],
-            onDelete = ForeignKey.SET_NULL
-        )
-    ],
-    indices = [
-        Index(value = ["memberId"])
-    ]
-)
+@Entity(tableName = "bookkeeping_records")
@TypeConverters(Converters::class)
 data class BookkeepingRecord(
    @PrimaryKey(autoGenerate = true)
@ -57,6 +41,5 @@ data class BookkeepingRecord(
    val type: TransactionType,
    val category: String,
    val description: String,
-    val date: Date,
-    val memberId: Int? = null  // 可为空，表示未指定成员
+    val date: Date
 )
--- a/app/src/main/java/com/yovinchen/bookkeeping/model/Category.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/model/Category.kt
@ -8,6 +8,5 @@ data class Category(
    @PrimaryKey(autoGenerate = true)
    val id: Long = 0,
    val name: String,
-    val type: TransactionType,
-    val icon: Int? = null
+    val type: TransactionType
 )
--- a/app/src/main/java/com/yovinchen/bookkeeping/model/CategoryStat.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/model/CategoryStat.kt
@ -1,8 +0,0 @@
-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/Member.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/model/Member.kt
@ -8,6 +8,5 @@ data class Member(
    @PrimaryKey(autoGenerate = true)
    val id: Int = 0,
    val name: String,
-    val description: String = "",  // 可选的描述信息
-    val icon: Int? = null  // 新增icon字段，可为空
+    val description: String = ""  // 可选的描述信息
 )
--- a/app/src/main/java/com/yovinchen/bookkeeping/model/MemberStat.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/model/MemberStat.kt
@ -1,17 +0,0 @@
-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
@ -1,82 +0,0 @@
-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
@ -1,76 +0,0 @@
-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
@ -1,62 +0,0 @@
-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
@ -1,88 +0,0 @@
-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/MonthlyStatistics.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/ui/components/MonthlyStatistics.kt
@ -1,254 +0,0 @@
-package com.yovinchen.bookkeeping.ui.components
-
-import android.annotation.SuppressLint
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.grid.GridCells
-import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
-import androidx.compose.foundation.lazy.grid.items
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.KeyboardArrowLeft
-import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.window.Dialog
-import com.yovinchen.bookkeeping.model.TransactionType
-import java.time.YearMonth
-
-@Composable
-fun MonthYearPickerDialog(
-    selectedMonth: YearMonth, onMonthSelected: (YearMonth) -> Unit, onDismiss: () -> Unit
-) {
-    var currentYearMonth by remember { mutableStateOf(selectedMonth) }
-
-    Dialog(onDismissRequest = onDismiss) {
-        Surface(
-            modifier = Modifier
-                .fillMaxWidth()
-                .wrapContentHeight(),
-            shape = MaterialTheme.shapes.extraLarge,
-            tonalElevation = 6.dp
-        ) {
-            Column(
-                modifier = Modifier.padding(16.dp)
-            ) {
-                Text(
-                    text = "选择年月",
-                    style = MaterialTheme.typography.titleLarge,
-                    modifier = Modifier.padding(bottom = 16.dp)
-                )
-
-                // 年份选择
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.SpaceBetween,
-                    verticalAlignment = Alignment.CenterVertically
-                ) {
-                    IconButton(onClick = {
-                        currentYearMonth = currentYearMonth.minusYears(1)
-                    }) {
-                        Text("<")
-                    }
-                    Text(
-                        text = "${currentYearMonth.year}年",
-                        style = MaterialTheme.typography.titleMedium
-                    )
-                    IconButton(onClick = {
-                        currentYearMonth = currentYearMonth.plusYears(1)
-                    }) {
-                        Text(">")
-                    }
-                }
-
-                Spacer(modifier = Modifier.height(16.dp))
-
-                // 月份网格
-                LazyVerticalGrid(
-                    columns = GridCells.Fixed(3), modifier = Modifier.height(200.dp)
-                ) {
-                    items(12) { index ->
-                        val month = index + 1
-                        val isSelected = month == currentYearMonth.monthValue
-
-                        Surface(
-                            modifier = Modifier
-                                .padding(4.dp)
-                                .aspectRatio(1.5f)
-                                .clickable {
-                                    currentYearMonth = YearMonth.of(currentYearMonth.year, month)
-                                },
-                            shape = MaterialTheme.shapes.small,
-                            color = if (isSelected) MaterialTheme.colorScheme.primary
-                            else MaterialTheme.colorScheme.surface
-                        ) {
-                            Box(
-                                contentAlignment = Alignment.Center,
-                                modifier = Modifier.fillMaxSize()
-                            ) {
-                                Text(
-                                    text = "${month}月",
-                                    color = if (isSelected) MaterialTheme.colorScheme.onPrimary
-                                    else MaterialTheme.colorScheme.onSurface
-                                )
-                            }
-                        }
-                    }
-                }
-
-                // 按钮行
-                Row(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(top = 16.dp),
-                    horizontalArrangement = Arrangement.End
-                ) {
-                    TextButton(onClick = onDismiss) {
-                        Text("取消")
-                    }
-                    Spacer(modifier = Modifier.width(8.dp))
-                    Button(onClick = {
-                        onMonthSelected(currentYearMonth)
-                        onDismiss()
-                    }) {
-                        Text("确定")
-                    }
-                }
-            }
-        }
-    }
-}
-
-@SuppressLint("DefaultLocale")
-@Composable
-fun MonthlyStatistics(
-    totalIncome: Double,
-    totalExpense: Double,
-    onIncomeClick: () -> Unit,
-    onExpenseClick: () -> Unit,
-    selectedType: TransactionType?,
-    onClearFilter: () -> Unit,
-    selectedMonth: YearMonth,
-    onPreviousMonth: () -> Unit,
-    onNextMonth: () -> Unit,
-    onMonthSelected: (YearMonth) -> Unit,
-    modifier: Modifier = Modifier
-) {
-    var showMonthPicker by remember { mutableStateOf(false) }
-
-    Card(
-        modifier = modifier
-            .fillMaxWidth()
-            .padding(16.dp),
-        elevation = CardDefaults.cardElevation(defaultElevation = 4.dp)
-    ) {
-        Column(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(16.dp)
-        ) {
-            // 月份选择器
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.SpaceBetween,
-                verticalAlignment = Alignment.CenterVertically
-            ) {
-                IconButton(onClick = onPreviousMonth) {
-                    Icon(Icons.AutoMirrored.Filled.KeyboardArrowLeft, "上个月")
-                }
-
-                Text(text = "${selectedMonth.year}年${selectedMonth.monthValue}月",
-                    style = MaterialTheme.typography.titleLarge,
-                    modifier = Modifier.clickable { showMonthPicker = true })
-
-                IconButton(onClick = onNextMonth) {
-                    Icon(Icons.AutoMirrored.Filled.KeyboardArrowRight, "下个月")
-                }
-            }
-
-            Spacer(modifier = Modifier.height(16.dp))
-
-            Row(
-                modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween
-            ) {
-                // 支出统计
-                Column(modifier = Modifier
-                    .weight(1f)
-                    .clickable { onExpenseClick() }
-                    .background(
-                        if (selectedType == TransactionType.EXPENSE) MaterialTheme.colorScheme.primaryContainer
-                        else Color.Transparent, RoundedCornerShape(8.dp)
-                    )
-                    .padding(8.dp)) {
-                    Text(
-                        text = "支出", style = MaterialTheme.typography.titleMedium
-                    )
-                    Text(
-                        text = "¥${String.format("%.2f", totalExpense)}",
-                        style = MaterialTheme.typography.bodyLarge,
-                        color = MaterialTheme.colorScheme.error
-                    )
-                }
-                Spacer(modifier = Modifier.width(16.dp))
-                // 收入统计
-                Column(modifier = Modifier
-                    .weight(1f)
-                    .clickable { onIncomeClick() }
-                    .background(
-                        if (selectedType == TransactionType.INCOME) MaterialTheme.colorScheme.primaryContainer
-                        else Color.Transparent, RoundedCornerShape(8.dp)
-                    )
-                    .padding(8.dp)) {
-                    Text(
-                        text = "收入", style = MaterialTheme.typography.titleMedium
-                    )
-                    Text(
-                        text = "¥${String.format("%.2f", totalIncome)}",
-                        style = MaterialTheme.typography.bodyLarge,
-                        color = MaterialTheme.colorScheme.primary
-                    )
-                }
-
-                Spacer(modifier = Modifier.width(16.dp))
-                // 结余统计
-                Column(modifier = Modifier
-                    .weight(1f)
-                    .clickable { onClearFilter() }
-                    .background(
-                        if (selectedType == TransactionType.INCOME) MaterialTheme.colorScheme.primaryContainer
-                        else Color.Transparent, RoundedCornerShape(8.dp)
-                    )
-                    .padding(8.dp)) {
-                    Text(
-                        text = "结余", style = MaterialTheme.typography.titleMedium
-                    )
-                    Text(
-                        text = "¥${String.format("%.2f", totalIncome - totalExpense)}",
-                        style = MaterialTheme.typography.bodyLarge,
-                        color = if (totalIncome >= totalExpense) MaterialTheme.colorScheme.tertiary
-                        else MaterialTheme.colorScheme.error
-                    )
-                }
-            }
-
-            if (selectedType != null) {
-                TextButton(
-                    onClick = onClearFilter, modifier = Modifier.align(Alignment.End)
-                ) {
-                    Text("清除筛选")
-                }
-            }
-        }
-    }
-
-    if (showMonthPicker) {
-        MonthYearPickerDialog(selectedMonth = selectedMonth,
-            onMonthSelected = onMonthSelected,
-            onDismiss = { showMonthPicker = false })
-    }
-}
--- a/app/src/main/java/com/yovinchen/bookkeeping/ui/components/RecordItem.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/ui/components/RecordItem.kt
@ -1,117 +0,0 @@
-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.graphics.Color
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.res.vectorResource
-import androidx.compose.ui.unit.dp
-import com.yovinchen.bookkeeping.model.BookkeepingRecord
-import com.yovinchen.bookkeeping.model.Member
-import com.yovinchen.bookkeeping.model.TransactionType
-import com.yovinchen.bookkeeping.utils.IconManager
-import java.text.SimpleDateFormat
-import java.util.*
-
-@Composable
-fun RecordItem(
-    record: BookkeepingRecord,
-    onClick: () -> Unit = {},
-    onDelete: () -> Unit = {},
-    modifier: Modifier = Modifier,
-    members: List<Member> = emptyList()
-) {
-    var showDeleteDialog by remember { mutableStateOf(false) }
-    val timeFormat = remember { SimpleDateFormat("HH:mm", Locale.getDefault()) }
-    val member = members.find { it.id == record.memberId }
-    val categoryIcon = IconManager.getCategoryIconVector(record.category)
-
-    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.spacedBy(12.dp),
-            verticalAlignment = Alignment.CenterVertically
-        ) {
-            // 左侧分类图标
-            if (categoryIcon != null) {
-                Icon(
-                    imageVector = categoryIcon,
-                    contentDescription = record.category,
-                    modifier = Modifier.size(24.dp),
-                    tint = Color.Unspecified
-                )
-            }
-
-            // 中间内容区域
-            Column(
-                modifier = Modifier.weight(1f)
-            ) {
-                // 第一行：分类
-                Text(
-                    text = record.category,
-                    style = MaterialTheme.typography.bodyLarge
-                )
-                
-                // 第二行：时间 | 成员 | 详情
-                Text(
-                    text = buildString {
-                        append(timeFormat.format(record.date))
-                        append(" | ")
-                        append(member?.name ?: "自己")
-                        if (record.description.isNotEmpty()) {
-                            append(" | ")
-                            append(record.description)
-                        }
-                    },
-                    style = MaterialTheme.typography.bodySmall,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant
-                )
-            }
-
-            // 右侧金额显示
-            Text(
-                text = String.format("%.2f", record.amount),
-                style = MaterialTheme.typography.titleMedium,
-                color = if (record.type == TransactionType.EXPENSE)
-                    MaterialTheme.colorScheme.error
-                else
-                    MaterialTheme.colorScheme.primary
-            )
-        }
-    }
-
-    if (showDeleteDialog) {
-        AlertDialog(
-            onDismissRequest = { showDeleteDialog = false },
-            title = { Text("确认删除") },
-            text = { Text("确定要删除这条记录吗？") },
-            confirmButton = {
-                TextButton(
-                    onClick = {
-                        onDelete()
-                        showDeleteDialog = false
-                    }
-                ) {
-                    Text("删除")
-                }
-            },
-            dismissButton = {
-                TextButton(onClick = { showDeleteDialog = false }) {
-                    Text("取消")
-                }
-            }
-        )
-    }
-}
--- a/app/src/main/java/com/yovinchen/bookkeeping/ui/components/TrendLineChart.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/ui/components/TrendLineChart.kt
@ -1,173 +0,0 @@
-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/dialog/AddRecordDialog.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/ui/dialog/AddRecordDialog.kt
@ -1,57 +1,36 @@
-@file:OptIn(ExperimentalMaterial3Api::class)
-
 package com.yovinchen.bookkeeping.ui.dialog

 import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
 import com.yovinchen.bookkeeping.model.Category
-import com.yovinchen.bookkeeping.model.Member
 import com.yovinchen.bookkeeping.model.TransactionType
 import com.yovinchen.bookkeeping.ui.components.DateTimePicker
 import java.time.LocalDateTime
-import java.time.ZoneId
-import java.util.Date

+@OptIn(ExperimentalMaterial3Api::class)
@Composable
 fun AddRecordDialog(
-    categories: List<Category>,
-    members: List<Member>,
    onDismiss: () -> Unit,
-    onConfirm: (amount: Double, category: String, description: String, date: Date, type: TransactionType, memberId: Int?) -> Unit
+    onConfirm: (TransactionType, Double, String, String) -> Unit,
+    categories: List<Category>,
+    selectedType: TransactionType,
+    onTypeChange: (TransactionType) -> Unit,
+    selectedDateTime: LocalDateTime,
+    onDateTimeSelected: (LocalDateTime) -> Unit
 ) {
    var amount by remember { mutableStateOf("") }
-    var expanded by remember { mutableStateOf(false) }
-    var memberExpanded by remember { mutableStateOf(false) }
+    var selectedCategory by remember { mutableStateOf<Category?>(null) }
    var description by remember { mutableStateOf("") }
-    var selectedType by remember { mutableStateOf(TransactionType.EXPENSE) }
-    
-    // 找到默认成员（"自己"）
-    val defaultMember = remember(members) { 
-        members.find { it.name == "自己" } 
-    }
-    var currentSelectedMember by remember(defaultMember) { 
-        mutableStateOf(defaultMember)
-    }
-    
-    // 设置默认分类为"餐饮"
-    var selectedCategory by remember { 
-        mutableStateOf(categories.find { it.type == selectedType && it.name == "餐饮" }?.name ?: categories.firstOrNull { it.type == selectedType }?.name ?: "")
-    }
-    
-    var selectedDateTime by remember {
-        mutableStateOf(LocalDateTime.now())
-    }
+    var expanded by remember { mutableStateOf(false) }

-    // 当类型改变时更新分类
-    LaunchedEffect(selectedType) {
-        selectedCategory = categories.find { it.type == selectedType && it.name == "餐饮" }?.name 
-            ?: categories.firstOrNull { it.type == selectedType }?.name 
-            ?: ""
-    }
+    // 根据当前选择的类型过滤类别
+    val filteredCategories = categories.filter { it.type == selectedType }

    Dialog(onDismissRequest = onDismiss) {
        Card(
@ -72,59 +51,74 @@ fun AddRecordDialog(

                Spacer(modifier = Modifier.height(16.dp))

-                // 收入/支出选择
+                // 类型选择
                Row(
                    modifier = Modifier.fillMaxWidth(),
                    horizontalArrangement = Arrangement.SpaceEvenly
                ) {
                    FilterChip(
                        selected = selectedType == TransactionType.EXPENSE,
-                        onClick = { selectedType = TransactionType.EXPENSE },
+                        onClick = { 
+                            onTypeChange(TransactionType.EXPENSE)
+                            selectedCategory = null
+                        },
                        label = { Text("支出") }
                    )
                    FilterChip(
                        selected = selectedType == TransactionType.INCOME,
-                        onClick = { selectedType = TransactionType.INCOME },
+                        onClick = { 
+                            onTypeChange(TransactionType.INCOME)
+                            selectedCategory = null
+                        },
                        label = { Text("收入") }
                    )
                }

                Spacer(modifier = Modifier.height(16.dp))

-                OutlinedTextField(
-                    value = amount,
-                    onValueChange = { amount = it },
-                    label = { Text("金额") },
-                    modifier = Modifier.fillMaxWidth(),
-                    singleLine = true
+                // 日期时间选择
+                DateTimePicker(
+                    selectedDateTime = selectedDateTime,
+                    onDateTimeSelected = onDateTimeSelected,
+                    modifier = Modifier.fillMaxWidth()
                )

                Spacer(modifier = Modifier.height(16.dp))

+                // 金额输入
+                OutlinedTextField(
+                    value = amount,
+                    onValueChange = { amount = it },
+                    label = { Text("金额") },
+                    keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
+                    modifier = Modifier.fillMaxWidth()
+                )
+
+                Spacer(modifier = Modifier.height(8.dp))
+
+                // 类别选择
                ExposedDropdownMenuBox(
                    expanded = expanded,
                    onExpandedChange = { expanded = it }
                ) {
                    OutlinedTextField(
-                        value = selectedCategory,
+                        value = selectedCategory?.name ?: "",
                        onValueChange = {},
                        readOnly = true,
                        label = { Text("类别") },
-                        trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded) },
                        modifier = Modifier
                            .fillMaxWidth()
                            .menuAnchor()
                    )
-
                    ExposedDropdownMenu(
                        expanded = expanded,
                        onDismissRequest = { expanded = false }
                    ) {
-                        categories.filter { it.type == selectedType }.forEach { category ->
+                        filteredCategories.forEach { category ->
                            DropdownMenuItem(
                                text = { Text(category.name) },
                                onClick = {
-                                    selectedCategory = category.name
+                                    selectedCategory = category
                                    expanded = false
                                }
                            )
@ -132,59 +126,19 @@ fun AddRecordDialog(
                    }
                }

-                Spacer(modifier = Modifier.height(16.dp))
+                Spacer(modifier = Modifier.height(8.dp))

-                ExposedDropdownMenuBox(
-                    expanded = memberExpanded,
-                    onExpandedChange = { memberExpanded = it }
-                ) {
-                    OutlinedTextField(
-                        value = currentSelectedMember?.name ?: "选择成员",
-                        onValueChange = {},
-                        readOnly = true,
-                        label = { Text("成员") },
-                        trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = memberExpanded) },
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .menuAnchor()
-                    )
-
-                    ExposedDropdownMenu(
-                        expanded = memberExpanded,
-                        onDismissRequest = { memberExpanded = false }
-                    ) {
-                        members.forEach { member ->
-                            DropdownMenuItem(
-                                text = { Text(member.name) },
-                                onClick = {
-                                    currentSelectedMember = member
-                                    memberExpanded = false
-                                }
-                            )
-                        }
-                    }
-                }
-
-                Spacer(modifier = Modifier.height(16.dp))
-
-                DateTimePicker(
-                    selectedDateTime = selectedDateTime,
-                    onDateTimeSelected = { selectedDateTime = it },
+                // 描述输入
+                OutlinedTextField(
+                    value = description,
+                    onValueChange = { description = it },
+                    label = { Text("描述") },
                    modifier = Modifier.fillMaxWidth()
                )

                Spacer(modifier = Modifier.height(16.dp))

-                OutlinedTextField(
-                    value = description,
-                    onValueChange = { description = it },
-                    label = { Text("备注") },
-                    modifier = Modifier.fillMaxWidth(),
-                    singleLine = true
-                )
-
-                Spacer(modifier = Modifier.height(24.dp))
-
+                // 按钮
                Row(
                    modifier = Modifier.fillMaxWidth(),
                    horizontalArrangement = Arrangement.End
@ -195,21 +149,13 @@ fun AddRecordDialog(
                    Spacer(modifier = Modifier.width(8.dp))
                    Button(
                        onClick = {
-                            val amountValue = amount.toDoubleOrNull()
-                            if (amountValue != null) {
-                                onConfirm(
-                                    amountValue,
-                                    selectedCategory,
-                                    description,
-                                    Date.from(
-                                        selectedDateTime.atZone(ZoneId.systemDefault()).toInstant()
-                                    ),
-                                    selectedType,
-                                    currentSelectedMember?.id
-                                )
+                            val amountValue = amount.toDoubleOrNull() ?: 0.0
+                            selectedCategory?.let { category ->
+                                onConfirm(selectedType, amountValue, category.name, description)
+                                onDismiss()
                            }
                        },
-                        enabled = amount.isNotEmpty() && selectedCategory.isNotEmpty()
+                        enabled = amount.isNotEmpty() && selectedCategory != null
                    ) {
                        Text("确定")
                    }
--- a/app/src/main/java/com/yovinchen/bookkeeping/ui/dialog/CategoryManagementDialog.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/ui/dialog/CategoryManagementDialog.kt
@ -1,5 +1,6 @@
 package com.yovinchen.bookkeeping.ui.dialog

+import android.util.Log
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
@ -7,17 +8,14 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
 import androidx.compose.material.icons.filled.Delete
+import androidx.compose.material.icons.filled.Edit
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.unit.dp
 import com.yovinchen.bookkeeping.model.Category
 import com.yovinchen.bookkeeping.model.TransactionType
-import com.yovinchen.bookkeeping.utils.IconManager

 private const val TAG = "CategoryManagementDialog"

@ -26,217 +24,233 @@ private const val TAG = "CategoryManagementDialog"
 fun CategoryManagementDialog(
    onDismiss: () -> Unit,
    categories: List<Category>,
-    onAddCategory: (String, TransactionType, Int?) -> Unit,
+    onAddCategory: (String, TransactionType) -> Unit,
    onDeleteCategory: (Category) -> Unit,
-    onUpdateCategory: (Category, String, Int?) -> Unit,
+    onUpdateCategory: (Category, String) -> Unit,
    selectedType: TransactionType,
    onTypeChange: (TransactionType) -> Unit
 ) {
-    var showAddDialog by remember { mutableStateOf(false) }
-    var editingCategory by remember { mutableStateOf<Category?>(null) }
+    var newCategoryName by remember { mutableStateOf("") }
+    var showDialog by remember { mutableStateOf(true) }
+    var showDeleteDialog by remember { mutableStateOf(false) }
+    var showEditDialog by remember { mutableStateOf(false) }
+    var selectedCategory: Category? by remember { mutableStateOf(null) }
+    var editingCategoryName by remember { mutableStateOf("") }
+    val filteredCategories = categories.filter { it.type == selectedType }

-    AlertDialog(
-        onDismissRequest = onDismiss,
-        title = { Text("类别管理") },
-        text = {
-            Column {
-                // 类型选择器
-                Row(
+    Log.d(TAG, "Dialog state - showDialog: $showDialog, showDeleteDialog: $showDeleteDialog")
+    Log.d(TAG, "Selected category: ${selectedCategory?.name}")
+
+    if (showDialog) {
+        AlertDialog(
+            onDismissRequest = { 
+                Log.d(TAG, "Main dialog dismiss requested")
+                showDialog = false
+                onDismiss()
+            },
+            title = { Text("类别管理") },
+            text = {
+                Column(
                    modifier = Modifier
                        .fillMaxWidth()
-                        .padding(bottom = 8.dp),
-                    horizontalArrangement = Arrangement.spacedBy(8.dp)
+                        .padding(vertical = 8.dp)
                ) {
-                    TransactionType.values().forEach { type ->
+                    // 类型选择
+                    Row(
+                        modifier = Modifier.fillMaxWidth(),
+                        horizontalArrangement = Arrangement.SpaceEvenly
+                    ) {
                        FilterChip(
-                            selected = type == selectedType,
-                            onClick = { onTypeChange(type) },
-                            label = { 
-                                Text(when (type) {
-                                    TransactionType.EXPENSE -> "支出"
-                                    TransactionType.INCOME -> "收入"
-                                })
-                            }
+                            selected = selectedType == TransactionType.EXPENSE,
+                            onClick = { 
+                                Log.d(TAG, "Switching to EXPENSE type")
+                                onTypeChange(TransactionType.EXPENSE) 
+                            },
+                            label = { Text("支出") }
+                        )
+                        FilterChip(
+                            selected = selectedType == TransactionType.INCOME,
+                            onClick = { 
+                                Log.d(TAG, "Switching to INCOME type")
+                                onTypeChange(TransactionType.INCOME) 
+                            },
+                            label = { Text("收入") }
                        )
                    }
-                }

-                // 类别列表
-                LazyColumn(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .weight(1f)
-                ) {
-                    items(categories.filter { it.type == selectedType }) { category ->
-                        Row(
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .padding(vertical = 8.dp)
-                                .clickable { editingCategory = category },
-                            horizontalArrangement = Arrangement.SpaceBetween,
-                            verticalAlignment = Alignment.CenterVertically
-                        ) {
-                            Row(
-                                verticalAlignment = Alignment.CenterVertically,
-                                modifier = Modifier.weight(1f)
-                            ) {
-                                // 显示类别图标
-                                if (category.icon != null) {
-                                    Icon(
-                                        imageVector = ImageVector.vectorResource(id = category.icon),
-                                        contentDescription = null,
-                                        modifier = Modifier.size(24.dp),
-                                        tint = Color.Unspecified
-                                    )
-                                } else {
-                                    IconManager.getCategoryIconVector(category.name)?.let { icon ->
-                                        Icon(
-                                            imageVector = icon,
-                                            contentDescription = null,
-                                            modifier = Modifier.size(24.dp),
-                                            tint = Color.Unspecified
-                                        )
-                                    }
+                    Spacer(modifier = Modifier.height(16.dp))
+
+                    // 添加新类别
+                    Row(
+                        modifier = Modifier.fillMaxWidth(),
+                        verticalAlignment = Alignment.CenterVertically
+                    ) {
+                        OutlinedTextField(
+                            value = newCategoryName,
+                            onValueChange = { newCategoryName = it },
+                            label = { Text("新类别名称") },
+                            modifier = Modifier.weight(1f)
+                        )
+                        Spacer(modifier = Modifier.width(8.dp))
+                        IconButton(
+                            onClick = {
+                                if (newCategoryName.isNotBlank()) {
+                                    Log.d(TAG, "Adding new category: $newCategoryName")
+                                    onAddCategory(newCategoryName, selectedType)
+                                    newCategoryName = ""
                                }
-                                
-                                Spacer(modifier = Modifier.width(8.dp))
-                                Text(category.name)
                            }
+                        ) {
+                            Icon(Icons.Default.Add, contentDescription = "添加类别")
+                        }
+                    }

-                            IconButton(
-                                onClick = { onDeleteCategory(category) },
-                                enabled = categories.size > 1
+                    Spacer(modifier = Modifier.height(16.dp))
+
+                    // 类别列表
+                    LazyColumn(
+                        modifier = Modifier.fillMaxWidth(),
+                        verticalArrangement = Arrangement.spacedBy(8.dp)
+                    ) {
+                        items(filteredCategories) { category ->
+                            Row(
+                                modifier = Modifier.fillMaxWidth(),
+                                horizontalArrangement = Arrangement.SpaceBetween,
+                                verticalAlignment = Alignment.CenterVertically
                            ) {
-                                Icon(
-                                    Icons.Default.Delete,
-                                    contentDescription = "删除",
-                                    tint = if (categories.size > 1)
-                                        MaterialTheme.colorScheme.error
-                                    else
-                                        MaterialTheme.colorScheme.onSurface.copy(alpha = 0.38f)
+                                Text(
+                                    text = category.name,
+                                    modifier = Modifier
+                                        .weight(1f)
+                                        .clickable {
+                                            selectedCategory = category
+                                            editingCategoryName = category.name
+                                            showEditDialog = true
+                                        }
                                )
+                                IconButton(
+                                    onClick = { 
+                                        Log.d(TAG, "Selected category for deletion: ${category.name}")
+                                        selectedCategory = category
+                                        showDeleteDialog = true
+                                    }
+                                ) {
+                                    Icon(Icons.Default.Delete, contentDescription = "删除类别")
+                                }
                            }
                        }
                    }
                }
-
-                // 添加类别按钮
-                Button(
-                    onClick = { showAddDialog = true },
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(top = 8.dp)
+            },
+            confirmButton = {
+                TextButton(
+                    onClick = { 
+                        Log.d(TAG, "Main dialog confirmed")
+                        showDialog = false
+                        onDismiss()
+                    }
                ) {
-                    Icon(Icons.Default.Add, contentDescription = null)
-                    Spacer(modifier = Modifier.width(8.dp))
-                    Text("添加类别")
+                    Text("完成")
                }
            }
-        },
-        confirmButton = {
-            TextButton(onClick = onDismiss) {
-                Text("完成")
-            }
-        }
-    )
+        )
+    }

-    // 添加类别对话框
-    if (showAddDialog) {
-        CategoryEditDialog(
-            onDismiss = { showAddDialog = false },
-            onConfirm = { name, iconResId ->
-                onAddCategory(name, selectedType, iconResId)
-                showAddDialog = false
+    // 删除确认对话框
+    if (showDeleteDialog && selectedCategory != null) {
+        AlertDialog(
+            onDismissRequest = { 
+                Log.d(TAG, "Delete dialog dismissed")
+                showDeleteDialog = false
+                selectedCategory = null
+            },
+            title = { Text("确认删除") },
+            text = { 
+                Text(
+                    text = buildString {
+                        append("确定要删除类别 ")
+                        append(selectedCategory?.name ?: "")
+                        append(" 吗？")
+                    }
+                )
+            },
+            confirmButton = {
+                TextButton(
+                    onClick = {
+                        try {
+                            selectedCategory?.let { category ->
+                                Log.d(TAG, "Confirming deletion of category: ${category.name}")
+                                onDeleteCategory(category)
+                            }
+                        } catch (e: Exception) {
+                            Log.e(TAG, "Error during category deletion callback", e)
+                            e.printStackTrace()
+                        } finally {
+                            showDeleteDialog = false
+                            selectedCategory = null
+                        }
+                    }
+                ) {
+                    Text("确定")
+                }
+            },
+            dismissButton = {
+                TextButton(
+                    onClick = { 
+                        Log.d(TAG, "Canceling deletion")
+                        showDeleteDialog = false
+                        selectedCategory = null
+                    }
+                ) {
+                    Text("取消")
+                }
            }
        )
    }

    // 编辑类别对话框
-    editingCategory?.let { category ->
-        CategoryEditDialog(
-            onDismiss = { editingCategory = null },
-            onConfirm = { name, iconResId ->
-                onUpdateCategory(category, name, iconResId)
-                editingCategory = null
+    if (showEditDialog && selectedCategory != null) {
+        AlertDialog(
+            onDismissRequest = {
+                showEditDialog = false
+                selectedCategory = null
+                editingCategoryName = ""
            },
-            initialName = category.name,
-            initialIcon = category.icon
-        )
-    }
-}
-
-@Composable
-private fun CategoryEditDialog(
-    onDismiss: () -> Unit,
-    onConfirm: (String, Int?) -> Unit,
-    initialName: String = "",
-    initialIcon: Int? = null
-) {
-    var name by remember { mutableStateOf(initialName) }
-    var selectedIcon by remember { mutableStateOf(initialIcon) }
-    var showIconPicker by remember { mutableStateOf(false) }
-
-    AlertDialog(
-        onDismissRequest = onDismiss,
-        title = { Text(if (initialName.isEmpty()) "添加类别" else "编辑类别") },
-        text = {
-            Column(
-                modifier = Modifier.fillMaxWidth(),
-                verticalArrangement = Arrangement.spacedBy(8.dp)
-            ) {
+            title = { Text("编辑类别") },
+            text = {
                OutlinedTextField(
-                    value = name,
-                    onValueChange = { name = it },
-                    label = { Text("名称") },
-                    modifier = Modifier.fillMaxWidth()
+                    value = editingCategoryName,
+                    onValueChange = { editingCategoryName = it },
+                    label = { Text("类别名称") }
                )
-
-                // 图标选择按钮
-                Button(
-                    onClick = { showIconPicker = true },
-                    modifier = Modifier.fillMaxWidth()
-                ) {
-                    selectedIcon?.let { iconResId ->
-                        Icon(
-                            imageVector = ImageVector.vectorResource(id = iconResId),
-                            contentDescription = null,
-                            modifier = Modifier.size(24.dp),
-                            tint = Color.Unspecified
-                        )
-                        Spacer(modifier = Modifier.width(8.dp))
-                    }
-                    Text(if (selectedIcon == null) "选择图标" else "更改图标")
-                }
-            }
-        },
-        confirmButton = {
-            TextButton(
-                onClick = {
-                    if (name.isNotBlank()) {
-                        onConfirm(name, selectedIcon)
-                    }
-                }
-            ) {
-                Text("确定")
-            }
-        },
-        dismissButton = {
-            TextButton(onClick = onDismiss) {
-                Text("取消")
-            }
-        }
-    )
-
-    if (showIconPicker) {
-        IconPickerDialog(
-            onDismiss = { showIconPicker = false },
-            onIconSelected = { 
-                selectedIcon = it
-                showIconPicker = false
            },
-            selectedIcon = selectedIcon,
-            isMemberIcon = false,
-            title = "选择类别图标"
+            confirmButton = {
+                TextButton(
+                    onClick = {
+                        if (editingCategoryName.isNotBlank()) {
+                            selectedCategory?.let { category ->
+                                onUpdateCategory(category, editingCategoryName)
+                            }
+                        }
+                        showEditDialog = false
+                        selectedCategory = null
+                        editingCategoryName = ""
+                    }
+                ) {
+                    Text("确定")
+                }
+            },
+            dismissButton = {
+                TextButton(
+                    onClick = {
+                        showEditDialog = false
+                        selectedCategory = null
+                        editingCategoryName = ""
+                    }
+                ) {
+                    Text("取消")
+                }
+            }
        )
    }
 }
--- a/app/src/main/java/com/yovinchen/bookkeeping/ui/dialog/IconPickerDialog.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/ui/dialog/IconPickerDialog.kt
@ -1,61 +0,0 @@
-package com.yovinchen.bookkeeping.ui.dialog
-
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.grid.GridCells
-import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
-import androidx.compose.foundation.lazy.grid.items
-import androidx.compose.material3.*
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.res.vectorResource
-import androidx.compose.ui.unit.dp
-import com.yovinchen.bookkeeping.utils.IconManager
-
-@Composable
-fun IconPickerDialog(
-    onDismiss: () -> Unit,
-    onIconSelected: (Int) -> Unit,
-    selectedIcon: Int? = null,
-    isMemberIcon: Boolean = false,
-    title: String = "选择图标"
-) {
-    AlertDialog(
-        onDismissRequest = onDismiss,
-        title = { Text(title) },
-        text = {
-            LazyVerticalGrid(
-                columns = GridCells.Fixed(4),
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .height(300.dp),
-                horizontalArrangement = Arrangement.spacedBy(8.dp),
-                verticalArrangement = Arrangement.spacedBy(8.dp)
-            ) {
-                val icons = if (isMemberIcon) {
-                    IconManager.getAllMemberIcons()
-                } else {
-                    IconManager.getAllCategoryIcons()
-                }
-
-                items(icons) { iconResId ->
-                    Icon(
-                        imageVector = ImageVector.vectorResource(id = iconResId),
-                        contentDescription = null,
-                        modifier = Modifier
-                            .size(40.dp)
-                            .clickable { onIconSelected(iconResId) },
-                        tint = if (selectedIcon == iconResId) MaterialTheme.colorScheme.primary else Color.Unspecified
-                    )
-                }
-            }
-        },
-        confirmButton = {
-            TextButton(onClick = onDismiss) {
-                Text("取消")
-            }
-        }
-    )
-}
--- a/app/src/main/java/com/yovinchen/bookkeeping/ui/dialog/MemberManagementDialog.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/ui/dialog/MemberManagementDialog.kt
@ -7,25 +7,20 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
 import androidx.compose.material.icons.filled.Delete
 import androidx.compose.material.icons.filled.Edit
-import androidx.compose.material.icons.filled.Person
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.unit.dp
 import com.yovinchen.bookkeeping.model.Member
-import com.yovinchen.bookkeeping.utils.IconManager

@Composable
 fun MemberManagementDialog(
    onDismiss: () -> Unit,
    members: List<Member>,
-    onAddMember: (String, String, Int?) -> Unit,
+    onAddMember: (String, String) -> Unit,
    onDeleteMember: (Member) -> Unit,
-    onUpdateMember: (Member, String, String, Int?) -> Unit
+    onUpdateMember: (Member, String, String) -> Unit
 ) {
    var showAddDialog by remember { mutableStateOf(false) }
    var selectedMember by remember { mutableStateOf<Member?>(null) }
@ -48,65 +43,41 @@ fun MemberManagementDialog(
                            horizontalArrangement = Arrangement.SpaceBetween,
                            verticalAlignment = Alignment.CenterVertically
                        ) {
-                            Row(
-                                verticalAlignment = Alignment.CenterVertically,
-                                modifier = Modifier.weight(1f)
-                            ) {
-                                // 显示成员图标
-                                if (member.icon != null) {
-                                    Icon(
-                                        imageVector = ImageVector.vectorResource(member.icon),
-                                        contentDescription = null,
-                                        modifier = Modifier.size(24.dp),
-                                        tint = Color.Unspecified
-                                    )
-                                } else {
-                                    IconManager.getMemberIconVector(member.name)?.let { icon ->
-                                        Icon(
-                                            imageVector = icon,
-                                            contentDescription = null,
-                                            modifier = Modifier.size(24.dp),
-                                            tint = Color.Unspecified
-                                        )
-                                    }
-                                }
-                                
-                                Spacer(modifier = Modifier.width(8.dp))
-                                
-                                Column {
+                            Column(modifier = Modifier.weight(1f)) {
+                                Text(
+                                    text = member.name,
+                                    style = MaterialTheme.typography.titleMedium
+                                )
+                                if (member.description.isNotEmpty()) {
                                    Text(
-                                        text = member.name,
-                                        style = MaterialTheme.typography.titleMedium
+                                        text = member.description,
+                                        style = MaterialTheme.typography.bodyMedium,
+                                        color = MaterialTheme.colorScheme.onSurfaceVariant
                                    )
-                                    if (member.description.isNotEmpty()) {
-                                        Text(
-                                            text = member.description,
-                                            style = MaterialTheme.typography.bodyMedium,
-                                            color = MaterialTheme.colorScheme.onSurfaceVariant
-                                        )
-                                    }
                                }
                            }
-
                            Row {
                                IconButton(onClick = { selectedMember = member }) {
-                                    Icon(Icons.Default.Edit, contentDescription = "编辑")
+                                    Icon(Icons.Default.Edit, "编辑成员")
                                }
                                IconButton(onClick = { onDeleteMember(member) }) {
-                                    Icon(Icons.Default.Delete, contentDescription = "删除")
+                                    Icon(Icons.Default.Delete, "删除成员")
                                }
                            }
                        }
+                        if (members.indexOf(member) < members.size - 1) {
+                            HorizontalDivider()
+                        }
                    }
                }
-
+                
                Button(
                    onClick = { showAddDialog = true },
                    modifier = Modifier
                        .fillMaxWidth()
-                        .padding(top = 8.dp)
+                        .padding(top = 16.dp)
                ) {
-                    Icon(Icons.Default.Add, contentDescription = null)
+                    Icon(Icons.Default.Add, "添加成员")
                    Spacer(modifier = Modifier.width(8.dp))
                    Text("添加成员")
                }
@ -114,31 +85,32 @@ fun MemberManagementDialog(
        },
        confirmButton = {
            TextButton(onClick = onDismiss) {
-                Text("完成")
+                Text("关闭")
            }
        }
    )

+    // 添加成员对话框
    if (showAddDialog) {
        MemberEditDialog(
            onDismiss = { showAddDialog = false },
-            onConfirm = { name, description, iconResId ->
-                onAddMember(name, description, iconResId)
+            onConfirm = { name, description ->
+                onAddMember(name, description)
                showAddDialog = false
            }
        )
    }

+    // 编辑成员对话框
    selectedMember?.let { member ->
        MemberEditDialog(
            onDismiss = { selectedMember = null },
-            onConfirm = { name, description, iconResId ->
-                onUpdateMember(member, name, description, iconResId)
+            onConfirm = { name, description ->
+                onUpdateMember(member, name, description)
                selectedMember = null
            },
            initialName = member.name,
-            initialDescription = member.description,
-            initialIcon = member.icon
+            initialDescription = member.description
        )
    }
 }
@ -146,63 +118,45 @@ fun MemberManagementDialog(
@Composable
 private fun MemberEditDialog(
    onDismiss: () -> Unit,
-    onConfirm: (String, String, Int?) -> Unit,
+    onConfirm: (String, String) -> Unit,
    initialName: String = "",
-    initialDescription: String = "",
-    initialIcon: Int? = null
+    initialDescription: String = ""
 ) {
    var name by remember { mutableStateOf(initialName) }
    var description by remember { mutableStateOf(initialDescription) }
-    var selectedIcon by remember { mutableStateOf(initialIcon) }
-    var showIconPicker by remember { mutableStateOf(false) }

    AlertDialog(
        onDismissRequest = onDismiss,
        title = { Text(if (initialName.isEmpty()) "添加成员" else "编辑成员") },
        text = {
            Column(
-                modifier = Modifier.fillMaxWidth(),
-                verticalArrangement = Arrangement.spacedBy(8.dp)
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(vertical = 8.dp)
            ) {
                OutlinedTextField(
                    value = name,
                    onValueChange = { name = it },
-                    label = { Text("名称") },
+                    label = { Text("成员名称") },
                    modifier = Modifier.fillMaxWidth()
                )
-
+                Spacer(modifier = Modifier.height(16.dp))
                OutlinedTextField(
                    value = description,
                    onValueChange = { description = it },
-                    label = { Text("描述") },
+                    label = { Text("描述（可选）") },
                    modifier = Modifier.fillMaxWidth()
                )
-
-                // 图标选择按钮
-                Button(
-                    onClick = { showIconPicker = true },
-                    modifier = Modifier.fillMaxWidth()
-                ) {
-                    selectedIcon?.let { iconResId ->
-                        Icon(
-                            imageVector = ImageVector.vectorResource(iconResId),
-                            contentDescription = null,
-                            modifier = Modifier.size(24.dp),
-                            tint = Color.Unspecified
-                        )
-                        Spacer(modifier = Modifier.width(8.dp))
-                    }
-                    Text(if (selectedIcon == null) "选择图标" else "更改图标")
-                }
            }
        },
        confirmButton = {
            TextButton(
                onClick = {
                    if (name.isNotBlank()) {
-                        onConfirm(name, description, selectedIcon)
+                        onConfirm(name.trim(), description.trim())
                    }
-                }
+                },
+                enabled = name.isNotBlank()
            ) {
                Text("确定")
            }
@ -213,17 +167,4 @@ private fun MemberEditDialog(
            }
        }
    )
-
-    if (showIconPicker) {
-        IconPickerDialog(
-            onDismiss = { showIconPicker = false },
-            onIconSelected = { 
-                selectedIcon = it
-                showIconPicker = false
-            },
-            selectedIcon = selectedIcon,
-            isMemberIcon = true,
-            title = "选择成员图标"
-        )
-    }
 }
--- a/app/src/main/java/com/yovinchen/bookkeeping/ui/dialog/RecordEditDialog.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/ui/dialog/RecordEditDialog.kt
@ -8,33 +8,25 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
-import androidx.lifecycle.viewmodel.compose.viewModel
 import com.yovinchen.bookkeeping.model.BookkeepingRecord
 import com.yovinchen.bookkeeping.model.Category
-import com.yovinchen.bookkeeping.model.Member
 import com.yovinchen.bookkeeping.ui.components.DateTimePicker
-import com.yovinchen.bookkeeping.viewmodel.HomeViewModel
 import java.time.Instant
 import java.time.LocalDateTime
 import java.time.ZoneId
 import java.util.Date
-import kotlinx.coroutines.launch

@Composable
 fun RecordEditDialog(
    record: BookkeepingRecord,
    categories: List<Category>,
-    members: List<Member>,
    onDismiss: () -> Unit,
-    onConfirm: (BookkeepingRecord) -> Unit,
-    viewModel: HomeViewModel = viewModel()
+    onConfirm: (BookkeepingRecord) -> Unit
 ) {
    var amount by remember { mutableStateOf(record.amount.toString()) }
    var selectedCategory by remember { mutableStateOf(record.category) }
    var description by remember { mutableStateOf(record.description) }
    var expanded by remember { mutableStateOf(false) }
-    var memberExpanded by remember { mutableStateOf(false) }
-    var currentSelectedMember by remember { mutableStateOf<Member?>(null) }
    var selectedDateTime by remember {
        mutableStateOf(
            LocalDateTime.ofInstant(
@ -44,16 +36,6 @@ fun RecordEditDialog(
        )
    }

-    // 加载原关联成员
-    val coroutineScope = rememberCoroutineScope()
-    LaunchedEffect(record.memberId) {
-        if (record.memberId != null) {
-            coroutineScope.launch {
-                currentSelectedMember = viewModel.getMemberById(record.memberId)
-            }
-        }
-    }
-
    Dialog(onDismissRequest = onDismiss) {
        Card(
            modifier = Modifier
@ -73,16 +55,24 @@ fun RecordEditDialog(

                Spacer(modifier = Modifier.height(16.dp))

+                // 日期时间选择
+                DateTimePicker(
+                    selectedDateTime = selectedDateTime,
+                    onDateTimeSelected = { selectedDateTime = it },
+                    modifier = Modifier.fillMaxWidth()
+                )
+
+                Spacer(modifier = Modifier.height(16.dp))
+
                // 金额输入
                OutlinedTextField(
                    value = amount,
                    onValueChange = { amount = it },
                    label = { Text("金额") },
-                    modifier = Modifier.fillMaxWidth(),
-                    singleLine = true
+                    modifier = Modifier.fillMaxWidth()
                )

-                Spacer(modifier = Modifier.height(16.dp))
+                Spacer(modifier = Modifier.height(8.dp))

                // 类别选择
                ExposedDropdownMenuBox(
@ -94,12 +84,10 @@ fun RecordEditDialog(
                        onValueChange = {},
                        readOnly = true,
                        label = { Text("类别") },
-                        trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded) },
                        modifier = Modifier
                            .fillMaxWidth()
                            .menuAnchor()
                    )
-
                    ExposedDropdownMenu(
                        expanded = expanded,
                        onDismissRequest = { expanded = false }
@ -116,72 +104,19 @@ fun RecordEditDialog(
                    }
                }

-                Spacer(modifier = Modifier.height(16.dp))
+                Spacer(modifier = Modifier.height(8.dp))

-                // 成员选择
-                ExposedDropdownMenuBox(
-                    expanded = memberExpanded,
-                    onExpandedChange = { memberExpanded = it }
-                ) {
-                    OutlinedTextField(
-                        value = currentSelectedMember?.name ?: "选择成员",
-                        onValueChange = {},
-                        readOnly = true,
-                        label = { Text("成员") },
-                        trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = memberExpanded) },
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .menuAnchor()
-                    )
-
-                    ExposedDropdownMenu(
-                        expanded = memberExpanded,
-                        onDismissRequest = { memberExpanded = false }
-                    ) {
-                        // 添加一个"清除选择"选项
-                        DropdownMenuItem(
-                            text = { Text("清除选择") },
-                            onClick = {
-                                currentSelectedMember = null
-                                memberExpanded = false
-                            }
-                        )
-                        
-                        members.forEach { member ->
-                            DropdownMenuItem(
-                                text = { Text(member.name) },
-                                onClick = {
-                                    currentSelectedMember = member
-                                    memberExpanded = false
-                                }
-                            )
-                        }
-                    }
-                }
-
-                Spacer(modifier = Modifier.height(16.dp))
-
-                // 日期时间选择
-                DateTimePicker(
-                    selectedDateTime = selectedDateTime,
-                    onDateTimeSelected = { selectedDateTime = it },
+                // 描述输入
+                OutlinedTextField(
+                    value = description,
+                    onValueChange = { description = it },
+                    label = { Text("描述") },
                    modifier = Modifier.fillMaxWidth()
                )

                Spacer(modifier = Modifier.height(16.dp))

-                // 备注输入
-                OutlinedTextField(
-                    value = description,
-                    onValueChange = { description = it },
-                    label = { Text("备注") },
-                    modifier = Modifier.fillMaxWidth(),
-                    singleLine = true
-                )
-
-                Spacer(modifier = Modifier.height(24.dp))
-
-                // 按钮行
+                // 按钮
                Row(
                    modifier = Modifier.fillMaxWidth(),
                    horizontalArrangement = Arrangement.End
@ -192,22 +127,15 @@ fun RecordEditDialog(
                    Spacer(modifier = Modifier.width(8.dp))
                    Button(
                        onClick = {
-                            val amountValue = amount.toDoubleOrNull()
-                            if (amountValue != null) {
-                                onConfirm(
-                                    record.copy(
-                                        amount = amountValue,
-                                        category = selectedCategory,
-                                        description = description,
-                                        date = Date.from(
-                                            selectedDateTime.atZone(ZoneId.systemDefault()).toInstant()
-                                        ),
-                                        memberId = currentSelectedMember?.id
-                                    )
-                                )
-                            }
-                        },
-                        enabled = amount.isNotEmpty()
+                            val updatedRecord = record.copy(
+                                amount = amount.toDoubleOrNull() ?: record.amount,
+                                category = selectedCategory,
+                                description = description,
+                                date = Date.from(selectedDateTime.atZone(ZoneId.systemDefault()).toInstant())
+                            )
+                            onConfirm(updatedRecord)
+                            onDismiss()
+                        }
                    ) {
                        Text("确定")
                    }
--- a/app/src/main/java/com/yovinchen/bookkeeping/ui/navigation/MainNavigation.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/ui/navigation/MainNavigation.kt
@ -1,82 +1,34 @@
 package com.yovinchen.bookkeeping.ui.navigation

 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Home
+import androidx.compose.material.icons.filled.Settings
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.res.vectorResource
+import androidx.navigation.NavDestination.Companion.hierarchy
 import androidx.navigation.NavGraph.Companion.findStartDestination
-import androidx.navigation.NavType
 import androidx.navigation.compose.NavHost
+import androidx.compose.ui.graphics.Color
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
-import androidx.navigation.navArgument
-import com.yovinchen.bookkeeping.R
-import com.yovinchen.bookkeeping.model.AnalysisType
 import com.yovinchen.bookkeeping.model.ThemeMode
-import com.yovinchen.bookkeeping.ui.screen.*
-import androidx.compose.material3.*
-import androidx.compose.ui.unit.dp
-import java.time.YearMonth
-import java.time.format.DateTimeFormatter
-
-sealed class Screen(
-    val route: String,
-    val title: String,
-    val iconResId: Int? = null
-) {
-    @Composable
-    fun icon(): ImageVector? = iconResId?.let { ImageVector.vectorResource(it) }
+import com.yovinchen.bookkeeping.ui.screen.HomeScreen
+import com.yovinchen.bookkeeping.ui.screen.SettingsScreen

+sealed class Screen(val route: String, val icon: @Composable () -> Unit, val label: String) {
    object Home : Screen(
-        "home", 
-        "记账",
-        iconResId = R.drawable.account
-    )
-    object Analysis : Screen(
-        "analysis", 
-        "分析",
-        iconResId = R.drawable.piechart
+        route = "home",
+        icon = { Icon(Icons.Default.Home, contentDescription = "主页") },
+        label = "主页"
    )
    object Settings : Screen(
-        "settings", 
-        "设置",
-        iconResId = R.drawable.setting
+        route = "settings",
+        icon = { Icon(Icons.Default.Settings, contentDescription = "设置") },
+        label = "设置"
    )
-    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)
@ -86,33 +38,22 @@ fun MainNavigation(
    onThemeChange: (ThemeMode) -> Unit
 ) {
    val navController = rememberNavController()
-    val items = listOf(
-        Screen.Home,
-        Screen.Analysis,
-        Screen.Settings
-    )
-    
+    val items = listOf(Screen.Home, Screen.Settings)
+
    Scaffold(
        bottomBar = {
-            NavigationBar {
+            NavigationBar(
+                containerColor = MaterialTheme.colorScheme.surface,
+                contentColor = MaterialTheme.colorScheme.onSurface,
+            ) {
                val navBackStackEntry by navController.currentBackStackEntryAsState()
-                val currentRoute = navBackStackEntry?.destination?.route
-                
+                val currentDestination = navBackStackEntry?.destination
+
                items.forEach { screen ->
-                    val selected = currentRoute == screen.route
                    NavigationBarItem(
-                        icon = { 
-                            screen.icon()?.let { icon ->
-                                Icon(
-                                    imageVector = icon,
-                                    contentDescription = screen.title,
-                                    modifier = Modifier.size(24.dp),
-                                    tint = Color.Unspecified
-                                )
-                            }
-                        },
-                        label = { Text(screen.title) },
-                        selected = selected,
+                        icon = screen.icon,
+                        label = { Text(screen.label) },
+                        selected = currentDestination?.hierarchy?.any { it.route == screen.route } == true,
                        onClick = {
                            navController.navigate(screen.route) {
                                popUpTo(navController.graph.findStartDestination().id) {
@ -121,107 +62,33 @@ 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
+                        )
                    )
                }
            }
        }
-    ) { innerPadding ->
+    ) { paddingValues ->
        NavHost(
            navController = navController,
            startDestination = Screen.Home.route,
-            modifier = Modifier.padding(innerPadding)
+            modifier = Modifier.padding(paddingValues)
        ) {
-            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.Home.route) {
+                HomeScreen()
            }
-            
            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
@ -1,203 +0,0 @@
-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
@ -1,291 +0,0 @@
-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/HomeScreen.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/ui/screen/HomeScreen.kt
@ -1,72 +1,60 @@
 package com.yovinchen.bookkeeping.ui.screen

 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-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.clickable
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
+import androidx.compose.foundation.lazy.grid.GridCells
+import androidx.compose.foundation.lazy.grid.items
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.KeyboardArrowLeft
+import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
 import androidx.compose.material.icons.filled.Add
-import androidx.compose.material3.Card
-import androidx.compose.material3.CardDefaults
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.ExtendedFloatingActionButton
-import androidx.compose.material3.HorizontalDivider
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Surface
-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.setValue
+import androidx.compose.material.icons.filled.Delete
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.window.Dialog
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.yovinchen.bookkeeping.model.BookkeepingRecord
 import com.yovinchen.bookkeeping.model.TransactionType
-import com.yovinchen.bookkeeping.ui.components.MonthlyStatistics
-import com.yovinchen.bookkeeping.ui.components.RecordItem
 import com.yovinchen.bookkeeping.ui.dialog.AddRecordDialog
 import com.yovinchen.bookkeeping.ui.dialog.RecordEditDialog
 import com.yovinchen.bookkeeping.viewmodel.HomeViewModel
+import java.time.YearMonth
 import java.text.SimpleDateFormat
-import java.util.Locale
+import java.util.*

@OptIn(ExperimentalMaterial3Api::class)
@Composable
 fun HomeScreen(
-    modifier: Modifier = Modifier,
-    viewModel: HomeViewModel = viewModel()
+    modifier: Modifier = Modifier, viewModel: HomeViewModel = viewModel()
 ) {
-    var showAddDialog by remember { mutableStateOf(false) }
-    var selectedRecord by remember { mutableStateOf<BookkeepingRecord?>(null) }
-    
-    val selectedMonth by viewModel.selectedMonth.collectAsState()
    val filteredRecords by viewModel.filteredRecords.collectAsState()
-    val categories by viewModel.categories.collectAsState(initial = emptyList())
-    val members by viewModel.members.collectAsState(initial = emptyList())
    val totalIncome by viewModel.totalIncome.collectAsState()
    val totalExpense by viewModel.totalExpense.collectAsState()
+    val categories by viewModel.categories.collectAsState()
+    val selectedRecordType by viewModel.selectedRecordType.collectAsState()
+    val selectedMonth by viewModel.selectedMonth.collectAsState()

-    Scaffold(
-        modifier = modifier.fillMaxSize(),
-        floatingActionButton = {
-            ExtendedFloatingActionButton(
-                onClick = { showAddDialog = true },
-                icon = { Icon(Icons.Default.Add, contentDescription = null) },
-                text = { Text("记一笔") }
-            )
+    var showAddDialog by remember { mutableStateOf(false) }
+    var selectedRecord by remember { mutableStateOf<BookkeepingRecord?>(null) }
+
+    Scaffold(modifier = modifier.fillMaxSize(), floatingActionButton = {
+        FloatingActionButton(onClick = { showAddDialog = true }) {
+            Icon(Icons.Default.Add, contentDescription = "添加记录")
        }
-    ) { padding ->
+    }, floatingActionButtonPosition = FabPosition.End, topBar = {
+        TopAppBar(title = { Text("记账本") })
+    }) { padding ->
        Column(
            modifier = Modifier
                .fillMaxSize()
@ -74,103 +62,408 @@ fun HomeScreen(
                .background(MaterialTheme.colorScheme.background)
        ) {
            // 顶部统计信息
-            MonthlyStatistics(
-                totalIncome = totalIncome,
+            MonthlyStatistics(totalIncome = totalIncome,
                totalExpense = totalExpense,
-                selectedType = null,
                onIncomeClick = { viewModel.setSelectedRecordType(TransactionType.INCOME) },
                onExpenseClick = { viewModel.setSelectedRecordType(TransactionType.EXPENSE) },
+                selectedType = selectedRecordType,
                onClearFilter = { viewModel.setSelectedRecordType(null) },
                selectedMonth = selectedMonth,
-                onPreviousMonth = { viewModel.moveMonth(false) },
-                onNextMonth = { viewModel.moveMonth(true) },
-                onMonthSelected = { viewModel.setSelectedMonth(it) }
-            )
+                onPreviousMonth = { viewModel.setSelectedMonth(selectedMonth.minusMonths(1)) },
+                onNextMonth = { viewModel.setSelectedMonth(selectedMonth.plusMonths(1)) },
+                onMonthSelected = { viewModel.setSelectedMonth(it) })

            // 记录列表
            LazyColumn(
                modifier = Modifier.fillMaxSize(),
                contentPadding = PaddingValues(16.dp),
-                verticalArrangement = Arrangement.spacedBy(8.dp)
+                verticalArrangement = Arrangement.spacedBy(12.dp)
            ) {
-                items(filteredRecords.size) { index ->
-                    val (date, dayRecords) = filteredRecords.toList()[index]
-                    Card(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .padding(vertical = 4.dp),
-                        elevation = CardDefaults.cardElevation(defaultElevation = 2.dp)
-                    ) {
-                        Column(
+                filteredRecords.forEach { (date, records) ->
+                    item {
+                        Surface(
                            modifier = Modifier
                                .fillMaxWidth()
-                                .padding(16.dp)
+                                .padding(vertical = 4.dp),
+                            color = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.7f),
+                            shape = RoundedCornerShape(12.dp),
+                            tonalElevation = 2.dp
                        ) {
-                            // 日期标签
-                            Text(
-                                text = SimpleDateFormat(
-                                    "yyyy年MM月dd日 E",
-                                    Locale.CHINESE
-                                ).format(date),
-                                style = MaterialTheme.typography.titleMedium,
-                                color = MaterialTheme.colorScheme.onSurfaceVariant
-                            )
-
-                            Spacer(modifier = Modifier.height(8.dp))
-
-                            // 当天的记录
                            Column(
-                                modifier = Modifier.fillMaxWidth(),
-                                verticalArrangement = Arrangement.spacedBy(4.dp)
+                                modifier = Modifier.padding(horizontal = 16.dp, vertical = 12.dp)
                            ) {
-                                dayRecords.forEachIndexed { recordIndex, record ->
-                                    RecordItem(
-                                        record = record,
-                                        onClick = { selectedRecord = record },
-                                        onDelete = { viewModel.deleteRecord(record) },
-                                        members = members
-                                    )
+                                // 日期标签
+                                Text(
+                                    text = SimpleDateFormat(
+                                        "yyyy年MM月dd日 E", Locale.CHINESE
+                                    ).format(date),
+                                    style = MaterialTheme.typography.titleMedium,
+                                    color = MaterialTheme.colorScheme.onSurfaceVariant
+                                )

-                                    if (recordIndex < dayRecords.size - 1) {
+                                Spacer(modifier = Modifier.height(12.dp))
+
+                                // 当天的记录
+                                records.forEachIndexed { index, record ->
+                                    RecordItem(record = record,
+                                        onClick = { selectedRecord = record },
+                                        onDelete = { viewModel.deleteRecord(record) })
+
+                                    if (index < records.size - 1) {
                                        HorizontalDivider(
-                                            modifier = Modifier.padding(vertical = 4.dp),
+                                            modifier = Modifier.padding(vertical = 8.dp),
                                            color = MaterialTheme.colorScheme.surfaceVariant,
                                            thickness = 0.5.dp
                                        )
                                    }
                                }
+
+                                Spacer(modifier = Modifier.height(8.dp))
+
+                                // 当天统计
+                                HorizontalDivider(
+                                    color = MaterialTheme.colorScheme.surfaceVariant,
+                                    thickness = 0.5.dp
+                                )
+
+                                val dayIncome = records.filter { it.type == TransactionType.INCOME }
+                                    .sumOf { it.amount }
+                                val dayExpense =
+                                    records.filter { it.type == TransactionType.EXPENSE }
+                                        .sumOf { it.amount }
+                                Row(
+                                    modifier = Modifier
+                                        .fillMaxWidth()
+                                        .padding(top = 12.dp),
+                                    horizontalArrangement = Arrangement.SpaceBetween
+                                ) {
+                                    Text(
+                                        text = "收入: ¥%.2f".format(dayIncome),
+                                        style = MaterialTheme.typography.bodyMedium,
+                                        color = MaterialTheme.colorScheme.primary
+                                    )
+                                    Text(
+                                        text = "支出: ¥%.2f".format(dayExpense),
+                                        style = MaterialTheme.typography.bodyMedium,
+                                        color = MaterialTheme.colorScheme.error
+                                    )
+                                }
                            }
                        }
                    }
                }
            }
        }
-    }

-    // 添加记录对话框
-    if (showAddDialog) {
-        AddRecordDialog(
-            categories = categories,
-            members = members,
-            onDismiss = { showAddDialog = false },
-            onConfirm = { amount, category, description, date, type, memberId ->
-                viewModel.addRecord(amount, category, description, date, type, memberId)
+        // 添加记录对话框
+        if (showAddDialog) {
+            val selectedDateTime by viewModel.selectedDateTime.collectAsState()
+            val selectedCategoryType by viewModel.selectedCategoryType.collectAsState()
+            AddRecordDialog(onDismiss = {
                showAddDialog = false
-            }
-        )
-    }
+                viewModel.resetSelectedDateTime()
+            },
+                onConfirm = { type, amount, category, description ->
+                    viewModel.addRecord(type, amount, category, description)
+                    showAddDialog = false
+                },
+                categories = categories,
+                selectedType = selectedCategoryType,
+                onTypeChange = viewModel::setSelectedCategoryType,
+                selectedDateTime = selectedDateTime,
+                onDateTimeSelected = viewModel::setSelectedDateTime
+            )
+        }

-    // 编辑记录对话框
-    selectedRecord?.let { record ->
-        RecordEditDialog(
-            record = record,
-            categories = categories,
-            members = members,
-            onDismiss = { selectedRecord = null },
-            onConfirm = { updatedRecord ->
-                viewModel.updateRecord(updatedRecord)
-                selectedRecord = null
-            }
-        )
+        // 编辑记录对话框
+        selectedRecord?.let { record ->
+            RecordEditDialog(record = record,
+                categories = categories,
+                onDismiss = { selectedRecord = null },
+                onConfirm = { updatedRecord ->
+                    viewModel.updateRecord(updatedRecord)
+                    selectedRecord = null
+                })
+        }
+    }
+}
+
+@Composable
+fun MonthYearPickerDialog(
+    selectedMonth: YearMonth, onMonthSelected: (YearMonth) -> Unit, onDismiss: () -> Unit
+) {
+    var currentYearMonth by remember { mutableStateOf(selectedMonth) }
+
+    Dialog(onDismissRequest = onDismiss) {
+        Surface(
+            modifier = Modifier
+                .fillMaxWidth()
+                .wrapContentHeight(),
+            shape = MaterialTheme.shapes.extraLarge,
+            tonalElevation = 6.dp
+        ) {
+            Column(
+                modifier = Modifier.padding(16.dp)
+            ) {
+                Text(
+                    text = "选择年月",
+                    style = MaterialTheme.typography.titleLarge,
+                    modifier = Modifier.padding(bottom = 16.dp)
+                )
+
+                // 年份选择
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.SpaceBetween,
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    IconButton(onClick = {
+                        currentYearMonth = currentYearMonth.minusYears(1)
+                    }) {
+                        Text("<")
+                    }
+                    Text(
+                        text = "${currentYearMonth.year}年",
+                        style = MaterialTheme.typography.titleMedium
+                    )
+                    IconButton(onClick = {
+                        currentYearMonth = currentYearMonth.plusYears(1)
+                    }) {
+                        Text(">")
+                    }
+                }
+
+                Spacer(modifier = Modifier.height(16.dp))
+
+                // 月份网格
+                LazyVerticalGrid(
+                    columns = GridCells.Fixed(3), modifier = Modifier.height(200.dp)
+                ) {
+                    items(12) { index ->
+                        val month = index + 1
+                        val isSelected = month == currentYearMonth.monthValue
+
+                        Surface(
+                            modifier = Modifier
+                                .padding(4.dp)
+                                .aspectRatio(1.5f)
+                                .clickable {
+                                    currentYearMonth = YearMonth.of(currentYearMonth.year, month)
+                                },
+                            shape = MaterialTheme.shapes.small,
+                            color = if (isSelected) MaterialTheme.colorScheme.primary
+                            else MaterialTheme.colorScheme.surface
+                        ) {
+                            Box(
+                                contentAlignment = Alignment.Center,
+                                modifier = Modifier.fillMaxSize()
+                            ) {
+                                Text(
+                                    text = "${month}月",
+                                    color = if (isSelected) MaterialTheme.colorScheme.onPrimary
+                                    else MaterialTheme.colorScheme.onSurface
+                                )
+                            }
+                        }
+                    }
+                }
+
+                // 按钮行
+                Row(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(top = 16.dp),
+                    horizontalArrangement = Arrangement.End
+                ) {
+                    TextButton(onClick = onDismiss) {
+                        Text("取消")
+                    }
+                    Spacer(modifier = Modifier.width(8.dp))
+                    Button(onClick = {
+                        onMonthSelected(currentYearMonth)
+                        onDismiss()
+                    }) {
+                        Text("确定")
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun MonthlyStatistics(
+    totalIncome: Double,
+    totalExpense: Double,
+    onIncomeClick: () -> Unit,
+    onExpenseClick: () -> Unit,
+    selectedType: TransactionType?,
+    onClearFilter: () -> Unit,
+    selectedMonth: YearMonth,
+    onPreviousMonth: () -> Unit,
+    onNextMonth: () -> Unit,
+    onMonthSelected: (YearMonth) -> Unit,
+    modifier: Modifier = Modifier
+) {
+    var showMonthPicker by remember { mutableStateOf(false) }
+
+    Card(
+        modifier = modifier
+            .fillMaxWidth()
+            .padding(16.dp),
+        elevation = CardDefaults.cardElevation(defaultElevation = 4.dp)
+    ) {
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(16.dp)
+        ) {
+            // 月份选择器
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.SpaceBetween,
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                IconButton(onClick = onPreviousMonth) {
+                    Icon(Icons.AutoMirrored.Filled.KeyboardArrowLeft, "上个月")
+                }
+
+                Text(text = "${selectedMonth.year}年${selectedMonth.monthValue}月",
+                    style = MaterialTheme.typography.titleLarge,
+                    modifier = Modifier.clickable { showMonthPicker = true })
+
+                IconButton(onClick = onNextMonth) {
+                    Icon(Icons.AutoMirrored.Filled.KeyboardArrowRight, "下个月")
+                }
+            }
+
+            Spacer(modifier = Modifier.height(16.dp))
+
+            Row(
+                modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween
+            ) {
+                // 收入统计
+                Column(modifier = Modifier
+                    .weight(1f)
+                    .clickable { onIncomeClick() }
+                    .background(
+                        if (selectedType == TransactionType.INCOME) MaterialTheme.colorScheme.primaryContainer
+                        else Color.Transparent, RoundedCornerShape(8.dp)
+                    )
+                    .padding(8.dp)) {
+                    Text(
+                        text = "收入", style = MaterialTheme.typography.titleMedium
+                    )
+                    Text(
+                        text = "¥${String.format("%.2f", totalIncome)}",
+                        style = MaterialTheme.typography.bodyLarge,
+                        color = MaterialTheme.colorScheme.primary
+                    )
+                }
+
+                Spacer(modifier = Modifier.width(16.dp))
+
+                // 支出统计
+                Column(modifier = Modifier
+                    .weight(1f)
+                    .clickable { onExpenseClick() }
+                    .background(
+                        if (selectedType == TransactionType.EXPENSE) MaterialTheme.colorScheme.primaryContainer
+                        else Color.Transparent, RoundedCornerShape(8.dp)
+                    )
+                    .padding(8.dp)) {
+                    Text(
+                        text = "支出", style = MaterialTheme.typography.titleMedium
+                    )
+                    Text(
+                        text = "¥${String.format("%.2f", totalExpense)}",
+                        style = MaterialTheme.typography.bodyLarge,
+                        color = MaterialTheme.colorScheme.error
+                    )
+                }
+            }
+
+            if (selectedType != null) {
+                TextButton(
+                    onClick = onClearFilter, modifier = Modifier.align(Alignment.End)
+                ) {
+                    Text("清除筛选")
+                }
+            }
+        }
+    }
+
+    if (showMonthPicker) {
+        MonthYearPickerDialog(selectedMonth = selectedMonth,
+            onMonthSelected = onMonthSelected,
+            onDismiss = { showMonthPicker = false })
+    }
+}
+
+@Composable
+fun RecordItem(
+    record: BookkeepingRecord,
+    onClick: () -> Unit = {},
+    onDelete: () -> Unit = {},
+    modifier: Modifier = Modifier
+) {
+    Card(
+        modifier = modifier
+            .fillMaxWidth()
+            .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 = record.category, style = MaterialTheme.typography.titleMedium
+                )
+                if (record.description.isNotEmpty()) {
+                    Text(
+                        text = record.description,
+                        style = MaterialTheme.typography.bodyMedium,
+                        color = MaterialTheme.colorScheme.onSurfaceVariant
+                    )
+                }
+                Text(
+                    text = SimpleDateFormat(
+                        "yyyy-MM-dd HH:mm", Locale.getDefault()
+                    ).format(record.date),
+                    style = MaterialTheme.typography.bodySmall,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant
+                )
+            }
+
+            Row(
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                Text(
+                    text = if (record.type == TransactionType.EXPENSE) "-" else "+",
+                    color = if (record.type == TransactionType.EXPENSE) MaterialTheme.colorScheme.error
+                    else MaterialTheme.colorScheme.primary,
+                    style = MaterialTheme.typography.titleMedium
+                )
+                Text(
+                    text = String.format("%.2f", record.amount),
+                    color = if (record.type == TransactionType.EXPENSE) MaterialTheme.colorScheme.error
+                    else MaterialTheme.colorScheme.primary,
+                    style = MaterialTheme.typography.titleMedium,
+                    modifier = Modifier.padding(end = 8.dp)
+                )
+                IconButton(onClick = onDelete) {
+                    Icon(
+                        Icons.Default.Delete,
+                        contentDescription = "删除",
+                        tint = 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
@ -1,226 +0,0 @@
-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 = {
-                                    // 暂时不处理点击事件
-                                }
-                            )
-                        }
-                    }
-                }
-            }
-
-            // 第二层：按日期分组的记录列表
-            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/ui/screen/SettingsScreen.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/ui/screen/SettingsScreen.kt
@ -1,53 +1,35 @@
 package com.yovinchen.bookkeeping.ui.screen

-import android.content.Context
-import android.widget.Toast
-import androidx.activity.ComponentActivity
-import androidx.appcompat.app.AppCompatActivity
 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.platform.LocalContext
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
+import com.yovinchen.bookkeeping.model.Category
 import com.yovinchen.bookkeeping.model.ThemeMode
-import com.yovinchen.bookkeeping.ui.components.*
-import com.yovinchen.bookkeeping.ui.dialog.*
-import com.yovinchen.bookkeeping.utils.FilePickerUtil
-import com.yovinchen.bookkeeping.viewmodel.*
+import com.yovinchen.bookkeeping.model.TransactionType
+import com.yovinchen.bookkeeping.ui.components.ColorPicker
+import com.yovinchen.bookkeeping.ui.components.predefinedColors
+import com.yovinchen.bookkeeping.ui.dialog.CategoryManagementDialog
+import com.yovinchen.bookkeeping.viewmodel.SettingsViewModel

@OptIn(ExperimentalMaterial3Api::class)
@Composable
 fun SettingsScreen(
    currentTheme: ThemeMode,
    onThemeChange: (ThemeMode) -> Unit,
-    viewModel: SettingsViewModel = viewModel(),
-    memberViewModel: MemberViewModel = viewModel()
+    viewModel: SettingsViewModel = viewModel()
 ) {
    var showThemeDialog by remember { mutableStateOf(false) }
    var showCategoryDialog by remember { mutableStateOf(false) }
-    var showMemberDialog by remember { mutableStateOf(false) }
-    var showBackupDialog by remember { mutableStateOf(false) }
-    var showRestoreDialog by remember { mutableStateOf(false) }
    
    val categories by viewModel.categories.collectAsState()
    val selectedType by viewModel.selectedCategoryType.collectAsState()
-    val members by memberViewModel.allMembers.collectAsState(initial = emptyList())
-    val context = LocalContext.current

    Column(modifier = Modifier.fillMaxSize()) {
-        // 成员管理设置项
-        ListItem(
-            headlineContent = { Text("成员管理") },
-            supportingContent = { Text("管理账本成员") },
-            modifier = Modifier.clickable { showMemberDialog = true }
-        )
-
-        HorizontalDivider()
-
        // 类别管理设置项
        ListItem(
            headlineContent = { Text("类别管理") },
@ -55,16 +37,7 @@ fun SettingsScreen(
            modifier = Modifier.clickable { showCategoryDialog = true }
        )

-        HorizontalDivider()
-
-        // 数据备份设置项
-        ListItem(
-            headlineContent = { Text("数据备份") },
-            supportingContent = { Text("备份和恢复数据") },
-            modifier = Modifier.clickable { showBackupDialog = true }
-        )
-
-        HorizontalDivider()
+        Divider()

        // 主题设置项
        ListItem(
@ -116,7 +89,7 @@ fun SettingsScreen(
                            }
                        )

-                        HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp))
+                        Divider(modifier = Modifier.padding(vertical = 8.dp))

                        // 颜色选择器
                        Text(
@ -144,137 +117,19 @@ fun SettingsScreen(
                }
            )
        }
+    }

-        // 备份对话框
-        if (showBackupDialog) {
-            AlertDialog(
-                onDismissRequest = { showBackupDialog = false },
-                title = { Text("数据备份") },
-                text = {
-                    Column(
-                        modifier = Modifier.fillMaxWidth(),
-                        verticalArrangement = Arrangement.spacedBy(8.dp)
-                    ) {
-                        Button(
-                            onClick = { viewModel.exportToCSV(context) },
-                            modifier = Modifier.fillMaxWidth()
-                        ) {
-                            Text("导出为CSV")
-                        }
-                        Button(
-                            onClick = { viewModel.exportToExcel(context) },
-                            modifier = Modifier.fillMaxWidth()
-                        ) {
-                            Text("导出为Excel")
-                        }
-                        Button(
-                            onClick = { showRestoreDialog = true },
-                            modifier = Modifier.fillMaxWidth()
-                        ) {
-                            Text("恢复数据")
-                        }
-                        Row(
-                            modifier = Modifier.fillMaxWidth(),
-                            verticalAlignment = Alignment.CenterVertically
-                        ) {
-                            Text("自动备份", modifier = Modifier.weight(1f))
-                            Switch(
-                                checked = viewModel.isAutoBackupEnabled.collectAsState().value,
-                                onCheckedChange = { viewModel.setAutoBackup(it) }
-                            )
-                        }
-                        if (viewModel.isAutoBackupEnabled.collectAsState().value) {
-                            Text(
-                                "自动备份将每24小时创建一次备份，保存在应用私有目录中",
-                                style = MaterialTheme.typography.bodySmall
-                            )
-                        }
-                    }
-                },
-                confirmButton = {
-                    TextButton(onClick = { showBackupDialog = false }) {
-                        Text("关闭")
-                    }
-                }
-            )
-        }
-
-        // 恢复对话框
-        if (showRestoreDialog) {
-            AlertDialog(
-                onDismissRequest = { showRestoreDialog = false },
-                title = { Text("恢复数据") },
-                text = {
-                    Column {
-                        Text("请选择要恢复的备份文件（CSV或Excel格式）")
-                        Text(
-                            "注意：恢复数据将覆盖当前的所有数据！",
-                            style = MaterialTheme.typography.bodySmall,
-                            color = MaterialTheme.colorScheme.error
-                        )
-                    }
-                },
-                confirmButton = {
-                    TextButton(
-                        onClick = {
-                            showRestoreDialog = false
-                            // 启动文件选择器
-                            val activity = context as? ComponentActivity
-                            if (activity != null) {
-                                FilePickerUtil.startFilePicker(activity) { file ->
-                                    viewModel.restoreData(context, file)
-                                }
-                            } else {
-                                Toast.makeText(context, "无法启动文件选择器", Toast.LENGTH_SHORT).show()
-                            }
-                        }
-                    ) {
-                        Text("选择文件")
-                    }
-                },
-                dismissButton = {
-                    TextButton(onClick = { showRestoreDialog = false }) {
-                        Text("取消")
-                    }
-                }
-            )
-        }
-
-        // 类别管理对话框
-        if (showCategoryDialog) {
-            CategoryManagementDialog(
-                onDismiss = { showCategoryDialog = false },
-                categories = categories,
-                onAddCategory = { name, type, iconResId -> 
-                    viewModel.addCategory(name, type, iconResId)
-                },
-                onDeleteCategory = viewModel::deleteCategory,
-                onUpdateCategory = { category, newName, iconResId ->
-                    viewModel.updateCategory(category, newName, iconResId)
-                },
-                selectedType = selectedType,
-                onTypeChange = viewModel::setSelectedCategoryType
-            )
-        }
-
-        // 成员管理对话框
-        if (showMemberDialog) {
-            MemberManagementDialog(
-                onDismiss = { showMemberDialog = false },
-                members = members,
-                onAddMember = { name, description, iconResId ->
-                    memberViewModel.addMember(name, description, iconResId)
-                },
-                onDeleteMember = memberViewModel::deleteMember,
-                onUpdateMember = { member, name, description, iconResId ->
-                    memberViewModel.updateMember(member.copy(
-                        name = name,
-                        description = description,
-                        icon = iconResId
-                    ))
-                }
-            )
-        }
+    // 类别管理对话框
+    if (showCategoryDialog) {
+        CategoryManagementDialog(
+            onDismiss = { showCategoryDialog = false },
+            categories = categories,
+            onAddCategory = viewModel::addCategory,
+            onDeleteCategory = viewModel::deleteCategory,
+            onUpdateCategory = viewModel::updateCategory,
+            selectedType = selectedType,
+            onTypeChange = viewModel::setSelectedCategoryType
+        )
    }
 }

--- a/app/src/main/java/com/yovinchen/bookkeeping/utils/FilePickerUtil.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/utils/FilePickerUtil.kt
@ -1,105 +0,0 @@
-package com.yovinchen.bookkeeping.utils
-
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import android.widget.Toast
-import androidx.activity.ComponentActivity
-import androidx.activity.result.contract.ActivityResultContracts
-import com.yovinchen.bookkeeping.getPreregisteredFilePickerLauncher
-import java.io.File
-import java.io.FileOutputStream
-
-object FilePickerUtil {
-    private var currentCallback: ((File) -> Unit)? = null
-
-    fun startFilePicker(activity: ComponentActivity, onFileSelected: (File) -> Unit) {
-        currentCallback = onFileSelected
-        
-        try {
-            val mimeTypes = arrayOf(
-                "text/csv",
-                "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-                "application/vnd.ms-excel"
-            )
-            activity.getPreregisteredFilePickerLauncher().launch(mimeTypes)
-        } catch (e: Exception) {
-            Toast.makeText(activity, "无法启动文件选择器：${e.message}", Toast.LENGTH_SHORT).show()
-            currentCallback = null
-        }
-    }
-
-    fun handleFileSelection(context: Context, uri: Uri?) {
-        if (uri == null) {
-            Toast.makeText(context, "未选择文件", Toast.LENGTH_SHORT).show()
-            currentCallback = null
-            return
-        }
-
-        try {
-            val mimeType = context.contentResolver.getType(uri)
-            if (!isValidFileType(uri.toString(), mimeType)) {
-                Toast.makeText(context, "请选择CSV或Excel文件", Toast.LENGTH_SHORT).show()
-                return
-            }
-
-            // 获取持久性权限
-            val takeFlags: Int = Intent.FLAG_GRANT_READ_URI_PERMISSION or
-                    Intent.FLAG_GRANT_WRITE_URI_PERMISSION
-            context.contentResolver.takePersistableUriPermission(uri, takeFlags)
-
-            // 将选中的文件复制到应用私有目录
-            val tempFile = copyUriToTempFile(context, uri)
-            if (tempFile != null) {
-                currentCallback?.invoke(tempFile)
-            } else {
-                Toast.makeText(context, "文件处理失败，请重试", Toast.LENGTH_SHORT).show()
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-            Toast.makeText(context, "文件处理出错：${e.message}", Toast.LENGTH_SHORT).show()
-        } finally {
-            currentCallback = null
-        }
-    }
-
-    private fun isValidFileType(fileName: String, mimeType: String?): Boolean {
-        val fileExtension = fileName.lowercase()
-        return fileExtension.endsWith(".csv") || 
-               fileExtension.endsWith(".xlsx") ||
-               fileExtension.endsWith(".xls") ||
-               mimeType == "text/csv" ||
-               mimeType == "application/vnd.ms-excel" ||
-               mimeType == "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
-    }
-
-    private fun copyUriToTempFile(context: Context, uri: Uri): File? {
-        return try {
-            val fileName = getFileName(context, uri) ?: "temp_backup_${System.currentTimeMillis()}"
-            val tempFile = File(context.cacheDir, fileName)
-            
-            context.contentResolver.openInputStream(uri)?.use { inputStream ->
-                FileOutputStream(tempFile).use { outputStream ->
-                    inputStream.copyTo(outputStream)
-                }
-            }
-            tempFile
-        } catch (e: Exception) {
-            e.printStackTrace()
-            null
-        }
-    }
-
-    private fun getFileName(context: Context, uri: Uri): String? {
-        var fileName: String? = null
-        context.contentResolver.query(uri, null, null, null, null)?.use { cursor ->
-            if (cursor.moveToFirst()) {
-                val displayNameIndex = cursor.getColumnIndex(android.provider.OpenableColumns.DISPLAY_NAME)
-                if (displayNameIndex != -1) {
-                    fileName = cursor.getString(displayNameIndex)
-                }
-            }
-        }
-        return fileName
-    }
-}
--- a/app/src/main/java/com/yovinchen/bookkeeping/utils/IconManager.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/utils/IconManager.kt
@ -1,83 +0,0 @@
-package com.yovinchen.bookkeeping.utils
-
-import androidx.annotation.DrawableRes
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.res.vectorResource
-import com.yovinchen.bookkeeping.R
-
-object IconManager {
-    // 类别图标映射
-    private val categoryIcons = mapOf(
-        "餐饮" to R.drawable.ic_category_food_24dp,
-        "交通" to R.drawable.ic_category_taxi_24dp,
-        "购物" to R.drawable.ic_category_supermarket_24dp,
-        "娱乐" to R.drawable.ic_category_bar_24dp,
-        "居住" to R.drawable.ic_category_hotel_24dp,
-        "医疗" to R.drawable.ic_category_medicine_24dp,
-        "教育" to R.drawable.ic_category_training_24dp,
-        "宠物" to R.drawable.ic_category_pet_24dp,
-        "鲜花" to R.drawable.ic_category_flower_24dp,
-        "外卖" to R.drawable.ic_category_delivery_24dp,
-        "数码" to R.drawable.ic_category_digital_24dp,
-        "化妆品" to R.drawable.ic_category_cosmetics_24dp,
-        "水果" to R.drawable.ic_category_fruit_24dp,
-        "零食" to R.drawable.ic_category_snack_24dp,
-        "蔬菜" to R.drawable.ic_category_vegetable_24dp,
-        "工资" to R.drawable.ic_category_membership_24dp,
-        "礼物" to R.drawable.ic_category_gift_24dp,
-        "其他" to R.drawable.ic_category_more_24dp,
-        "工资" to R.drawable.ic_category_membership_24dp,
-        "会员" to R.drawable.ic_category_membership_24dp,
-        "奖金" to R.drawable.ic_category_gift_24dp,
-        "投资" to R.drawable.ic_category_digital_24dp,
-        "其他" to R.drawable.ic_category_more_24dp
-    )
-
-    // 成员图标映射
-    private val memberIcons = mapOf(
-        "自己" to R.drawable.ic_member_boy_24dp,
-        "老婆" to R.drawable.ic_member_bride_24dp,
-        "老公" to R.drawable.ic_member_groom_24dp,
-        "家庭" to R.drawable.ic_member_family_24dp,
-        "儿子" to R.drawable.ic_member_baby_boy_24dp,
-        "女儿" to R.drawable.ic_member_baby_girl_24dp,
-        "爸爸" to R.drawable.ic_member_father_24dp,
-        "妈妈" to R.drawable.ic_member_mother_24dp,
-        "爷爷" to R.drawable.ic_member_grandfather_24dp,
-        "奶奶" to R.drawable.ic_member_grandmother_24dp,
-        "男生" to R.drawable.ic_member_boy_24dp,
-        "女生" to R.drawable.ic_member_girl_24dp,
-        "外公" to R.drawable.ic_member_grandfather_24dp,
-        "外婆" to R.drawable.ic_member_grandmother_24dp,
-        "其他" to R.drawable.ic_member_girl_24dp
-    )
-
-    @Composable
-    fun getCategoryIconVector(name: String): ImageVector? {
-        return categoryIcons[name]?.let { ImageVector.vectorResource(id = it) }
-    }
-
-    @Composable
-    fun getMemberIconVector(name: String): ImageVector? {
-        return memberIcons[name]?.let { ImageVector.vectorResource(id = it) }
-    }
-
-    @DrawableRes
-    fun getCategoryIcon(name: String): Int? {
-        return categoryIcons[name]
-    }
-
-    @DrawableRes
-    fun getMemberIcon(name: String): Int? {
-        return memberIcons[name]
-    }
-
-    fun getAllCategoryIcons(): List<Int> {
-        return categoryIcons.values.toList()
-    }
-
-    fun getAllMemberIcons(): List<Int> {
-        return memberIcons.values.toList()
-    }
-}
--- a/app/src/main/java/com/yovinchen/bookkeeping/viewmodel/AnalysisViewModel.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/viewmodel/AnalysisViewModel.kt
@ -1,139 +0,0 @@
-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
@ -1,69 +0,0 @@
-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
@ -1,21 +0,0 @@
-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/HomeViewModel.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/viewmodel/HomeViewModel.kt
@ -1,12 +1,12 @@
 package com.yovinchen.bookkeeping.viewmodel

 import android.app.Application
+import android.util.Log
 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.Category
-import com.yovinchen.bookkeeping.model.Member
 import com.yovinchen.bookkeeping.model.TransactionType
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.*
@ -14,38 +14,37 @@ import kotlinx.coroutines.launch
 import java.time.LocalDateTime
 import java.time.ZoneId
 import java.time.YearMonth
-import java.util.*
+import java.util.Date
+import java.util.Calendar

@OptIn(ExperimentalCoroutinesApi::class)
 class HomeViewModel(application: Application) : AndroidViewModel(application) {
-    private val bookkeepingDao = BookkeepingDatabase.getDatabase(application).bookkeepingDao()
-    private val memberDao = BookkeepingDatabase.getDatabase(application).memberDao()
-    private val categoryDao = BookkeepingDatabase.getDatabase(application).categoryDao()
+    private val TAG = "HomeViewModel"
+    private val dao = BookkeepingDatabase.getDatabase(application).bookkeepingDao()

    private val _selectedRecordType = MutableStateFlow<TransactionType?>(null)
    val selectedRecordType: StateFlow<TransactionType?> = _selectedRecordType.asStateFlow()

+    private val _selectedDateTime = MutableStateFlow(LocalDateTime.now())
+    val selectedDateTime: StateFlow<LocalDateTime> = _selectedDateTime.asStateFlow()
+
+    private val _selectedCategoryType = MutableStateFlow(TransactionType.EXPENSE)
+    val selectedCategoryType: StateFlow<TransactionType> = _selectedCategoryType.asStateFlow()
+
    private val _selectedMonth = MutableStateFlow(YearMonth.now())
    val selectedMonth: StateFlow<YearMonth> = _selectedMonth.asStateFlow()

-    private val _selectedMember = MutableStateFlow<Member?>(null)
-    val selectedMember: StateFlow<Member?> = _selectedMember.asStateFlow()
-
-    val members = memberDao.getAllMembers()
+    private val records = dao.getAllRecords()
        .stateIn(
            scope = viewModelScope,
            started = SharingStarted.WhileSubscribed(5000),
            initialValue = emptyList()
        )

-    val categories = categoryDao.getAllCategories()
-        .stateIn(
-            scope = viewModelScope,
-            started = SharingStarted.WhileSubscribed(5000),
-            initialValue = emptyList()
-        )
-
-    private val allRecords = bookkeepingDao.getAllRecords()
+    val categories: StateFlow<List<Category>> = _selectedCategoryType
+        .flatMapLatest { type ->
+            dao.getCategoriesByType(type)
+        }
        .stateIn(
            scope = viewModelScope,
            started = SharingStarted.WhileSubscribed(5000),
@ -53,28 +52,26 @@ class HomeViewModel(application: Application) : AndroidViewModel(application) {
        )

    val filteredRecords = combine(
-        allRecords,
+        records,
        _selectedRecordType,
-        _selectedMonth,
-        _selectedMember
-    ) { records, selectedType, selectedMonth, selectedMember ->
+        _selectedMonth
+    ) { records, selectedType, selectedMonth ->
        records
            .filter { record ->
                val recordDate = record.date.toInstant()
                    .atZone(ZoneId.systemDefault())
                    .toLocalDate()
                val recordYearMonth = YearMonth.from(recordDate)
-
+                
                val typeMatches = selectedType?.let { record.type == it } ?: true
                val monthMatches = recordYearMonth == selectedMonth
-                val memberMatches = selectedMember?.let { record.memberId == it.id } ?: true
-
-                monthMatches && memberMatches && typeMatches
+                
+                typeMatches && monthMatches
            }
            .sortedByDescending { it.date }
            .groupBy { record ->
-                Calendar.getInstance().apply { 
-                    time = record.date
+                val calendar = Calendar.getInstance().apply { time = record.date }
+                calendar.apply {
                    set(Calendar.HOUR_OF_DAY, 0)
                    set(Calendar.MINUTE, 0)
                    set(Calendar.SECOND, 0)
@ -82,16 +79,15 @@ class HomeViewModel(application: Application) : AndroidViewModel(application) {
                }.time
            }
    }.stateIn(
-        scope = viewModelScope,
-        started = SharingStarted.WhileSubscribed(5000),
-        initialValue = emptyMap()
+        viewModelScope,
+        SharingStarted.WhileSubscribed(5000),
+        emptyMap()
    )

    val totalIncome = combine(
-        allRecords,
-        _selectedMonth,
-        _selectedMember
-    ) { records, selectedMonth, selectedMember ->
+        records,
+        _selectedMonth
+    ) { records, selectedMonth ->
        records
            .filter { record ->
                val recordDate = record.date.toInstant()
@ -99,24 +95,19 @@ class HomeViewModel(application: Application) : AndroidViewModel(application) {
                    .toLocalDate()
                val recordYearMonth = YearMonth.from(recordDate)
                
-                val monthMatches = recordYearMonth == selectedMonth
-                val memberMatches = selectedMember?.let { record.memberId == it.id } ?: true
-                val typeMatches = record.type == TransactionType.INCOME
-
-                monthMatches && memberMatches && typeMatches
+                record.type == TransactionType.INCOME && recordYearMonth == selectedMonth
            }
            .sumOf { it.amount }
    }.stateIn(
-        scope = viewModelScope,
-        started = SharingStarted.WhileSubscribed(5000),
-        initialValue = 0.0
+        viewModelScope,
+        SharingStarted.WhileSubscribed(5000),
+        0.0
    )

    val totalExpense = combine(
-        allRecords,
-        _selectedMonth,
-        _selectedMember
-    ) { records, selectedMonth, selectedMember ->
+        records,
+        _selectedMonth
+    ) { records, selectedMonth ->
        records
            .filter { record ->
                val recordDate = record.date.toInstant()
@ -124,73 +115,111 @@ class HomeViewModel(application: Application) : AndroidViewModel(application) {
                    .toLocalDate()
                val recordYearMonth = YearMonth.from(recordDate)
                
-                val monthMatches = recordYearMonth == selectedMonth
-                val memberMatches = selectedMember?.let { record.memberId == it.id } ?: true
-                val typeMatches = record.type == TransactionType.EXPENSE
-
-                monthMatches && memberMatches && typeMatches
+                record.type == TransactionType.EXPENSE && recordYearMonth == selectedMonth
            }
            .sumOf { it.amount }
    }.stateIn(
-        scope = viewModelScope,
-        started = SharingStarted.WhileSubscribed(5000),
-        initialValue = 0.0
+        viewModelScope,
+        SharingStarted.WhileSubscribed(5000),
+        0.0
    )

-    fun setSelectedMonth(yearMonth: YearMonth) {
-        _selectedMonth.value = yearMonth
+    private fun updateTotals() {
+        // 移除未使用的参数
    }

-    fun setSelectedMember(member: Member?) {
-        _selectedMember.value = member
-    }
-
-    fun moveMonth(forward: Boolean) {
-        _selectedMonth.value = if (forward) {
-            _selectedMonth.value.plusMonths(1)
-        } else {
-            _selectedMonth.value.minusMonths(1)
+    init {
+        viewModelScope.launch {
+            records.collect {
+                updateTotals()
+            }
        }
    }

-    suspend fun getMemberById(memberId: Int): Member? {
-        return memberDao.getMemberById(memberId)
-    }
-
-    fun addRecord(
-        amount: Double,
-        category: String,
-        description: String,
-        date: Date,
-        type: TransactionType,
-        memberId: Int?
-    ) {
+    fun addRecord(type: TransactionType, amount: Double, category: String, description: String) {
        viewModelScope.launch {
            val record = BookkeepingRecord(
-                type = type,
                amount = amount,
+                type = type,
                category = category,
                description = description,
-                date = date,
-                memberId = memberId
+                date = Date.from(_selectedDateTime.value.atZone(ZoneId.systemDefault()).toInstant())
            )
-            bookkeepingDao.insertRecord(record)
+            dao.insertRecord(record)
+            resetSelectedDateTime()
        }
    }

-    fun updateRecord(record: BookkeepingRecord) {
-        viewModelScope.launch {
-            bookkeepingDao.updateRecord(record)
-        }
-    }
-
-    fun deleteRecord(record: BookkeepingRecord) {
-        viewModelScope.launch {
-            bookkeepingDao.deleteRecord(record)
-        }
+    fun setSelectedDateTime(dateTime: LocalDateTime) {
+        _selectedDateTime.value = dateTime
    }

    fun setSelectedRecordType(type: TransactionType?) {
        _selectedRecordType.value = type
    }
+
+    fun setSelectedCategoryType(type: TransactionType) {
+        _selectedCategoryType.value = type
+    }
+
+    fun setSelectedMonth(yearMonth: YearMonth) {
+        _selectedMonth.value = yearMonth
+    }
+
+    fun moveMonth(forward: Boolean) {
+        val current = _selectedMonth.value
+        _selectedMonth.value = if (forward) {
+            current.plusMonths(1)
+        } else {
+            current.minusMonths(1)
+        }
+    }
+
+    fun resetSelectedDateTime() {
+        _selectedDateTime.value = LocalDateTime.now()
+    }
+
+    fun updateRecord(record: BookkeepingRecord) {
+        viewModelScope.launch {
+            dao.updateRecord(record)
+        }
+    }
+
+    fun deleteRecord(record: BookkeepingRecord) {
+        viewModelScope.launch {
+            dao.deleteRecord(record)
+        }
+    }
+
+    // 获取指定日期的记录
+    fun getRecordsByDate(date: LocalDateTime): Flow<List<BookkeepingRecord>> {
+        val calendar = Calendar.getInstance().apply {
+            time = Date.from(date.atZone(ZoneId.systemDefault()).toInstant())
+            set(Calendar.HOUR_OF_DAY, 0)
+            set(Calendar.MINUTE, 0)
+            set(Calendar.SECOND, 0)
+            set(Calendar.MILLISECOND, 0)
+        }
+        val startOfDay = calendar.time
+        calendar.add(Calendar.DAY_OF_MONTH, 1)
+        val endOfDay = calendar.time
+        return dao.getRecordsByDateRange(startOfDay, endOfDay)
+    }
+
+    // 获取指定日期范围的记录
+    fun getRecordsByDateRange(startDate: LocalDateTime, endDate: LocalDateTime): Flow<List<BookkeepingRecord>> {
+        val start = Date.from(startDate.atZone(ZoneId.systemDefault()).toInstant())
+        val end = Date.from(endDate.atZone(ZoneId.systemDefault()).toInstant())
+        return dao.getRecordsByDateRange(start, end)
+    }
+
+    // 获取指定类型的记录
+    fun getRecordsByType(type: TransactionType): Flow<List<BookkeepingRecord>> {
+        return dao.getRecordsByType(type)
+    }
 }
+
+data class UiState(
+    val isAddingRecord: Boolean = false,
+    val isManagingCategories: Boolean = false
+)
--- a/app/src/main/java/com/yovinchen/bookkeeping/viewmodel/MemberDetailViewModel.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/viewmodel/MemberDetailViewModel.kt
@ -1,83 +0,0 @@
-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/java/com/yovinchen/bookkeeping/viewmodel/MemberViewModel.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/viewmodel/MemberViewModel.kt
@ -1,38 +0,0 @@
-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.Member
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.launch
-
-class MemberViewModel(application: Application) : AndroidViewModel(application) {
-    private val memberDao = BookkeepingDatabase.getDatabase(application).memberDao()
-    
-    val allMembers: Flow<List<Member>> = memberDao.getAllMembers()
-
-    fun addMember(name: String, description: String = "", iconResId: Int? = null) {
-        viewModelScope.launch {
-            val member = Member(name = name, description = description, icon = iconResId)
-            memberDao.insertMember(member)
-        }
-    }
-
-    fun updateMember(member: Member) {
-        viewModelScope.launch {
-            memberDao.updateMember(member)
-        }
-    }
-
-    fun deleteMember(member: Member) {
-        viewModelScope.launch {
-            memberDao.deleteMember(member)
-        }
-    }
-
-    suspend fun getMemberCount(): Int {
-        return memberDao.getMemberCount()
-    }
-}
--- a/app/src/main/java/com/yovinchen/bookkeeping/viewmodel/SettingsViewModel.kt
+++ b/app/src/main/java/com/yovinchen/bookkeeping/viewmodel/SettingsViewModel.kt
@ -1,52 +1,28 @@
 package com.yovinchen.bookkeeping.viewmodel

 import android.app.Application
-import android.content.Context
-import android.os.Environment
-import android.widget.Toast
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.viewModelScope
-import com.opencsv.CSVReader
-import com.opencsv.CSVWriter
 import com.yovinchen.bookkeeping.data.BookkeepingDatabase
-import com.yovinchen.bookkeeping.model.BookkeepingRecord
 import com.yovinchen.bookkeeping.model.Category
 import com.yovinchen.bookkeeping.model.TransactionType
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.flatMapLatest
-import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import org.apache.poi.xssf.usermodel.XSSFWorkbook
-import java.io.File
-import java.io.FileReader
-import java.io.FileWriter
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
-import java.util.concurrent.TimeUnit

@OptIn(ExperimentalCoroutinesApi::class)
 class SettingsViewModel(application: Application) : AndroidViewModel(application) {
    private val database = BookkeepingDatabase.getDatabase(application)
    private val dao = database.bookkeepingDao()
-    private val memberDao = database.memberDao()
-    private val _isAutoBackupEnabled = MutableStateFlow(false)
-    val isAutoBackupEnabled: StateFlow<Boolean> = _isAutoBackupEnabled.asStateFlow()

    private val _selectedCategoryType = MutableStateFlow(TransactionType.EXPENSE)
    val selectedCategoryType: StateFlow<TransactionType> = _selectedCategoryType.asStateFlow()

-    val categories: StateFlow<List<Category>> = _selectedCategoryType.flatMapLatest { type ->
+    val categories: StateFlow<List<Category>> = _selectedCategoryType
+        .flatMapLatest { type ->
            dao.getCategoriesByType(type)
-        }.stateIn(
+        }
+        .stateIn(
            scope = viewModelScope,
            started = SharingStarted.WhileSubscribed(5000),
            initialValue = emptyList()
@ -56,9 +32,9 @@ class SettingsViewModel(application: Application) : AndroidViewModel(application
        _selectedCategoryType.value = type
    }

-    fun addCategory(name: String, type: TransactionType, iconResId: Int?) {
+    fun addCategory(name: String, type: TransactionType) {
        viewModelScope.launch {
-            val category = Category(name = name, type = type, icon = iconResId)
+            val category = Category(name = name, type = type)
            dao.insertCategory(category)
        }
    }
@ -69,9 +45,9 @@ class SettingsViewModel(application: Application) : AndroidViewModel(application
        }
    }

-    fun updateCategory(category: Category, newName: String, iconResId: Int?) {
+    fun updateCategory(category: Category, newName: String) {
        viewModelScope.launch {
-            val updatedCategory = category.copy(name = newName, icon = iconResId)
+            val updatedCategory = category.copy(name = newName)
            dao.updateCategory(updatedCategory)
            // 更新所有使用该类别的记录
            dao.updateRecordCategories(category.name, newName)
@ -81,228 +57,4 @@ class SettingsViewModel(application: Application) : AndroidViewModel(application
    suspend fun isCategoryInUse(categoryName: String): Boolean {
        return dao.isCategoryInUse(categoryName)
    }
-
-    fun setAutoBackup(enabled: Boolean) {
-        viewModelScope.launch {
-            _isAutoBackupEnabled.value = enabled
-            if (enabled) {
-                schedulePeriodicBackup()
-            }
-        }
-    }
-
-    private fun schedulePeriodicBackup() {
-        viewModelScope.launch(Dispatchers.IO) {
-            while (isAutoBackupEnabled.value) {
-                try {
-                    // 创建自动备份
-                    SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault()).format(Date())
-                    val backupDir = File(
-                        getApplication<Application>().getExternalFilesDir(null), "auto_backups"
-                    )
-                    if (!backupDir.exists()) {
-                        backupDir.mkdirs()
-                    }
-
-                    // 导出CSV
-                    exportToCSV(getApplication(), backupDir)
-
-                    // 等待24小时
-                    delay(TimeUnit.HOURS.toMillis(24))
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                }
-            }
-        }
-    }
-
-    fun exportToCSV(context: Context, customDir: File? = null) {
-        viewModelScope.launch(Dispatchers.IO) {
-            try {
-                val timestamp =
-                    SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault()).format(Date())
-                val fileName = "bookkeeping_backup_$timestamp.csv"
-                val downloadsDir = customDir ?: Environment.getExternalStoragePublicDirectory(
-                    Environment.DIRECTORY_DOWNLOADS
-                )
-                val file = File(downloadsDir, fileName)
-
-                CSVWriter(FileWriter(file)).use { writer ->
-                    // 写入头部
-                    writer.writeNext(arrayOf("日期", "类型", "金额", "类别", "备注", "成员"))
-
-                    // 获取所有记录和成员
-                    val records = dao.getAllRecords().first()
-                    val members = memberDao.getAllMembers().first()
-
-                    // 写入数据行
-                    records.forEach { record ->
-                        val member = members.find { member -> member.id == record.memberId }
-                        writer.writeNext(
-                            arrayOf(
-                                SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault()).format(
-                                    record.date
-                                ),
-                                record.type.toString(),
-                                record.amount.toString(),
-                                record.category,
-                                record.description,
-                                member?.name ?: "自己"
-                            )
-                        )
-                    }
-                }
-
-                withContext(Dispatchers.Main) {
-                    Toast.makeText(context, "CSV导出成功: ${file.absolutePath}", Toast.LENGTH_LONG)
-                        .show()
-                }
-            } catch (e: Exception) {
-                e.printStackTrace()
-                withContext(Dispatchers.Main) {
-                    Toast.makeText(context, "CSV导出失败: ${e.message}", Toast.LENGTH_LONG).show()
-                }
-            }
-        }
-    }
-
-    fun exportToExcel(context: Context) {
-        viewModelScope.launch(Dispatchers.IO) {
-            try {
-                val workbook = XSSFWorkbook()
-                val sheet = workbook.createSheet("账目记录")
-
-                // 创建标题行
-                val headerRow = sheet.createRow(0)
-                val headers = arrayOf("日期", "类型", "金额", "类别", "备注", "成员")
-                headers.forEachIndexed { index, header ->
-                    headerRow.createCell(index).setCellValue(header)
-                }
-
-                // 获取所有记录和成员
-                val records = dao.getAllRecords().first()
-                val members = memberDao.getAllMembers().first()
-
-                records.forEachIndexed { index, record ->
-                    val row = sheet.createRow(index + 1)
-                    val member = members.find { member -> member.id == record.memberId }
-
-                    row.createCell(0).setCellValue(
-                        SimpleDateFormat(
-                            "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-                        ).format(record.date)
-                    )
-                    row.createCell(1).setCellValue(record.type.toString())
-                    row.createCell(2).setCellValue(record.amount)
-                    row.createCell(3).setCellValue(record.category)
-                    row.createCell(4).setCellValue(record.description)
-                    row.createCell(5).setCellValue(member?.name ?: "自己")
-                }
-
-                val timestamp =
-                    SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault()).format(Date())
-                val fileName = "bookkeeping_backup_$timestamp.xlsx"
-                val downloadsDir =
-                    Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
-                val file = File(downloadsDir, fileName)
-
-                workbook.write(file.outputStream())
-                workbook.close()
-
-                withContext(Dispatchers.Main) {
-                    Toast.makeText(
-                        context, "Excel导出成功: ${file.absolutePath}", Toast.LENGTH_LONG
-                    ).show()
-                }
-            } catch (e: Exception) {
-                e.printStackTrace()
-                withContext(Dispatchers.Main) {
-                    Toast.makeText(context, "Excel导出失败: ${e.message}", Toast.LENGTH_LONG).show()
-                }
-            }
-        }
-    }
-
-    fun restoreData(context: Context, backupFile: File) {
-        viewModelScope.launch(Dispatchers.IO) {
-            try {
-                when {
-                    backupFile.name.endsWith(".csv", ignoreCase = true) -> {
-                        restoreFromCSV(backupFile)
-                    }
-
-                    backupFile.name.endsWith(".xlsx", ignoreCase = true) -> {
-                        restoreFromExcel(backupFile)
-                    }
-
-                    else -> {
-                        withContext(Dispatchers.Main) {
-                            Toast.makeText(context, "不支持的文件格式", Toast.LENGTH_LONG).show()
-                        }
-                        return@launch
-                    }
-                }
-
-                withContext(Dispatchers.Main) {
-                    Toast.makeText(context, "数据恢复成功", Toast.LENGTH_LONG).show()
-                }
-            } catch (e: Exception) {
-                e.printStackTrace()
-                withContext(Dispatchers.Main) {
-                    Toast.makeText(context, "数据恢复失败: ${e.message}", Toast.LENGTH_LONG).show()
-                }
-            }
-        }
-    }
-
-    private suspend fun restoreFromCSV(file: File) {
-        CSVReader(FileReader(file)).use { reader ->
-            // 跳过标题行
-            reader.readNext()
-
-            // 读取数据行
-            var currentLine = reader.readNext()
-            while (currentLine != null) {
-                val record = BookkeepingRecord(
-                    type = TransactionType.valueOf(currentLine[1]),
-                    amount = currentLine[2].toDouble(),
-                    category = currentLine[3],
-                    description = currentLine[4],
-                    date = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault()).parse(
-                        currentLine[0]
-                    ) ?: Date(),
-                    memberId = findMemberIdByName(currentLine[5])
-                )
-                dao.insertRecord(record)
-                currentLine = reader.readNext()
-            }
-        }
-    }
-
-    private suspend fun restoreFromExcel(file: File) {
-        val workbook = XSSFWorkbook(file)
-        val sheet = workbook.getSheetAt(0)
-
-        // 跳过标题行
-        for (rowIndex in 1..sheet.lastRowNum) {
-            val row = sheet.getRow(rowIndex)
-            val record = BookkeepingRecord(
-                type = TransactionType.valueOf(row.getCell(1).stringCellValue),
-                amount = row.getCell(2).numericCellValue,
-                category = row.getCell(3).stringCellValue,
-                description = row.getCell(4).stringCellValue,
-                date = SimpleDateFormat(
-                    "yyyy-MM-dd HH:mm:ss",
-                    Locale.getDefault()
-                ).parse(row.getCell(0).stringCellValue),
-                memberId = findMemberIdByName(row.getCell(5).stringCellValue)
-            )
-            dao.insertRecord(record)
-        }
-        workbook.close()
-    }
-
-    private suspend fun findMemberIdByName(name: String): Int? {
-        return memberDao.getAllMembers().first().find { member -> member.name == name }?.id
-    }
 }
--- a/app/src/main/res/drawable/account.xml
+++ b/app/src/main/res/drawable/account.xml
@ -1,24 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M193.3,124.3h480.5A106.1,106.1 0,0 1,779.8 230.4v63.7H87V230.4a106.1,106.1 0,0 1,106.2 -106.1z"
-      android:fillColor="#FCB423"/>
-  <path
-      android:pathData="M157.8,160.9h512a70.6,70.6 0,0 1,70.6 70.6v99.3H87V231.5a70.6,70.6 0,0 1,70.8 -70.6z"
-      android:fillColor="#FFD62C"/>
-  <path
-      android:pathData="M87,240.3h743a107.5,107.5 0,0 1,107.5 107.5v420.7a134.5,134.5 0,0 1,-134.5 134.5H197.6A110.4,110.4 0,0 1,87 792.7V240.3z"
-      android:fillColor="#7518ED"/>
-  <path
-      android:pathData="M87,280.8h734.3A74.5,74.5 0,0 1,896 355.3v444.8a101.3,101.3 0,0 1,-101.3 101.3H197.6A110.4,110.4 0,0 1,87 791V280.8z"
-      android:fillColor="#9539FC"/>
-  <path
-      android:pathData="M760.1,504.4a112.9,112.9 0,0 0,0 225.9L896,730.3L896,504.4zM757.3,663.9a46.5,46.5 0,1 1,46.5 -46.5,46.5 46.5,0 0,1 -46.5,46.5z"
-      android:fillColor="#741AE8"/>
-  <path
-      android:pathData="M760.1,467.9a112.9,112.9 0,0 0,0 225.9L896,693.8L896,467.9zM757.3,627.4a46.5,46.5 0,1 1,46.5 -46.5,46.5 46.5,0 0,1 -46.5,46.5z"
-      android:fillColor="#FFFFFF"/>
-</vector>
--- a/app/src/main/res/drawable/ic_category_baby_24dp.xml
+++ b/app/src/main/res/drawable/ic_category_baby_24dp.xml
@ -1,60 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M295.9,355.2c0,-99.1 80.3,-179.4 179.4,-179.4s179.4,80.3 179.4,179.4H295.9z"
-      android:fillColor="#D4EFFF"/>
-  <path
-      android:pathData="M647.4,371.5c0,-54 -77.1,-97.8 -172.1,-97.8s-172.1,43.8 -172.1,97.8h344.2z"
-      android:fillColor="#89CBF4"/>
-  <path
-      android:pathData="M436.8,226.8m38.5,0l0,0q38.5,0 38.5,38.5l0,42.7q0,38.5 -38.5,38.5l-0,0q-38.5,0 -38.5,-38.5l0,-42.7q0,-38.5 38.5,-38.5Z"
-      android:fillColor="#89CBF4"/>
-  <path
-      android:pathData="M256.3,362.1m41,0l356,0q41,0 41,41l0,26.8q0,41 -41,41l-356,0q-41,0 -41,-41l0,-26.8q0,-41 41,-41Z"
-      android:fillColor="#35A5F6"/>
-  <path
-      android:pathData="M273,471.2m41.7,0l321,0q41.7,0 41.7,41.7l0,289.8q0,41.7 -41.7,41.7l-321,0q-41.7,0 -41.7,-41.7l0,-289.8q0,-41.7 41.7,-41.7Z"
-      android:fillColor="#B1DCFD"/>
-  <path
-      android:pathData="M356.8,666.7m29.6,0l93.8,0q29.6,0 29.6,29.6l0,-0q0,29.6 -29.6,29.6l-93.8,0q-29.6,0 -29.6,-29.6l0,0q0,-29.6 29.6,-29.6Z"
-      android:fillColor="#35A5F6"/>
-  <path
-      android:pathData="M356.8,558.8m29.6,0l93.8,0q29.6,0 29.6,29.6l0,-0q0,29.6 -29.6,29.6l-93.8,0q-29.6,0 -29.6,-29.6l0,0q0,-29.6 29.6,-29.6Z"
-      android:fillColor="#35A5F6"/>
-  <path
-      android:pathData="M311.9,479.2v305.8s-1.9,20.8 17.3,20.8h302.3s31,1 42.5,-25v32.3s-11.6,28.4 -41.4,28.4h-329.1s-30.5,-7.5 -30.5,-35.1V499s5.1,-21.7 38.9,-19.8z"
-      android:fillColor="#89CBF4"/>
-  <path
-      android:pathData="M491.6,854.5H311.2c-26.6,0 -48.2,-21.6 -48.2,-48.2V509.4c0,-26.6 21.6,-48.2 48.2,-48.2h24.2c5.5,0 10,4.5 10,10s-4.5,10 -10,10h-24.2c-15.5,0 -28.2,12.6 -28.2,28.2v297c0,15.5 12.6,28.2 28.2,28.2h180.4c5.5,0 10,4.5 10,10s-4.5,10 -10,10zM677.6,583.5c-5.5,0 -10,-4.5 -10,-10V509.4c0,-15.5 -12.6,-28.2 -28.2,-28.2H436.2c-5.5,0 -10,-4.5 -10,-10s4.5,-10 10,-10h203.2c26.6,0 48.2,21.6 48.2,48.2v64.1c0,5.5 -4.5,10 -10,10z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M335,367.1s-24.4,2.5 -24.4,26.7v52.3s0.2,19 24.4,19h-54.3c-11.5,0 -20.8,-9.3 -20.8,-20.8v-56.4c0,-11.5 9.3,-20.8 20.8,-20.8H335z"
-      android:fillColor="#0080E0"/>
-  <path
-      android:pathData="M437.1,276s-68.4,14.4 -90.6,78h-43.4s28,-66.5 133.9,-78z"
-      android:fillColor="#71C2EA"/>
-  <path
-      android:pathData="M656.8,481H433.9c-5.5,0 -10,-4.5 -10,-10s4.5,-10 10,-10h222.9c15.2,0 27.5,-12.4 27.5,-27.5v-33.8c0,-15.2 -12.4,-27.5 -27.5,-27.5h-363c-15.2,0 -27.5,12.4 -27.5,27.5v33.8c0,15.2 12.4,27.5 27.5,27.5h48.5c5.5,0 10,4.5 10,10s-4.5,10 -10,10h-48.5c-26.2,0 -47.5,-21.3 -47.5,-47.5v-33.8c0,-26.2 21.3,-47.5 47.5,-47.5h363c26.2,0 47.5,21.3 47.5,47.5v33.8c0,26.2 -21.3,47.5 -47.5,47.5z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M295.9,365.5c-5.5,0 -10,-4.5 -10,-10 0,-104.4 85,-189.4 189.4,-189.4 41.2,0 80.4,13 113.3,37.6 31.8,23.8 55.8,57.7 67.6,95.4 1.6,5.3 -1.3,10.9 -6.6,12.5 -5.3,1.6 -10.9,-1.3 -12.5,-6.6 -10.5,-33.8 -32,-64.1 -60.4,-85.4 -29.4,-22 -64.5,-33.7 -101.3,-33.7 -93.4,0 -169.4,76 -169.4,169.4 0,5.5 -4.5,10 -10,10z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M834,690.9v-6.7c0,-7.6 -6.2,-13.7 -13.7,-13.7s-13.7,-6.2 -13.7,-13.7S800.4,643 792.8,643s-13.7,-6.2 -13.7,-13.7 -6.2,-13.7 -13.7,-13.7 -13.7,-6.2 -13.7,-13.7 -6.2,-13.7 -13.7,-13.7h-6.7c-4.4,0 -8.6,2.1 -11.1,5.7l-34.8,48.2c-3.9,5.5 -3.3,13 1.4,17.7l75.6,75.6c4.8,4.8 12.3,5.4 17.7,1.4l48.2,-34.8c3.6,-2.6 5.7,-6.7 5.7,-11.1zM523.3,795.9v6.7c0,7.6 6.2,13.7 13.7,13.7s13.7,6.2 13.7,13.7 6.2,13.7 13.7,13.7 13.7,6.2 13.7,13.7 6.2,13.7 13.7,13.7 13.7,6.2 13.7,13.7 6.2,13.7 13.7,13.7h6.7c4.4,0 8.6,-2.1 11.1,-5.7l34.8,-48.2c3.9,-5.5 3.3,-13 -1.4,-17.7l-75.6,-75.6c-4.8,-4.8 -12.3,-5.4 -17.7,-1.4l-48.2,34.8c-3.6,2.6 -5.7,6.7 -5.7,11.1z"
-      android:fillColor="#F76C69"/>
-  <path
-      android:pathData="M745.4,676.3c52.9,52.9 53.2,81 0.3,133.9 -52.9,52.9 -80.7,52.4 -133.6,-0.6 -52.9,-52.9 -53.2,-80.4 -0.3,-133.4s80.7,-52.9 133.6,0z"
-      android:fillColor="#F76C69"/>
-  <path
-      android:pathData="M785.4,743c-3.1,0 -6.2,-1.4 -8.1,-4.2 -3.2,-4.5 -2.2,-10.7 2.3,-14l42.9,-30.9c1,-0.7 1.5,-1.8 1.5,-3v-6.7a3.7,3.7 0,0 0,-3.7 -3.7c-13.1,0 -23.7,-10.6 -23.7,-23.7a3.7,3.7 0,0 0,-3.7 -3.7c-13.1,0 -23.7,-10.6 -23.7,-23.7a3.7,3.7 0,0 0,-3.7 -3.7c-13.1,0 -23.7,-10.6 -23.7,-23.7a3.7,3.7 0,0 0,-3.7 -3.7h-6.7c-1.2,0 -2.3,0.6 -3,1.5L698,641.5c-3.2,4.5 -9.5,5.5 -14,2.3s-5.5,-9.5 -2.3,-14l30.2,-41.8c4.4,-6.2 11.6,-9.9 19.3,-9.9h6.7c13.1,0 23.7,10.6 23.7,23.7a3.7,3.7 0,0 0,3.7 3.7c13.1,0 23.7,10.6 23.7,23.7a3.7,3.7 0,0 0,3.7 3.7c13.1,0 23.7,10.6 23.7,23.7a3.7,3.7 0,0 0,3.7 3.7c13.1,0 23.7,10.6 23.7,23.7v6.7c0,7.6 -3.7,14.8 -9.9,19.3l-42.9,30.9a10,10 0,0 1,-5.8 1.9zM626.2,908.7h-6.7c-13.1,0 -23.7,-10.6 -23.7,-23.7a3.7,3.7 0,0 0,-3.7 -3.7c-13.1,0 -23.7,-10.6 -23.7,-23.7a3.7,3.7 0,0 0,-3.7 -3.7c-13.1,0 -23.7,-10.6 -23.7,-23.7a3.7,3.7 0,0 0,-3.7 -3.7c-13.1,0 -23.7,-10.6 -23.7,-23.7v-6.7c0,-7.6 3.7,-14.8 9.9,-19.3l41.8,-30.1c4.5,-3.2 10.7,-2.2 14,2.3 3.2,4.5 2.2,10.7 -2.3,14l-41.8,30.1c-1,0.7 -1.5,1.8 -1.5,3v6.7a3.7,3.7 0,0 0,3.7 3.7c13.1,0 23.7,10.6 23.7,23.7a3.7,3.7 0,0 0,3.7 3.7c13.1,0 23.7,10.6 23.7,23.7a3.7,3.7 0,0 0,3.7 3.7c13.1,0 23.7,10.6 23.7,23.7a3.7,3.7 0,0 0,3.7 3.7h6.7c1.2,0 2.3,-0.6 3,-1.5l30.2,-41.9c3.2,-4.5 9.5,-5.5 14,-2.3s5.5,9.5 2.3,14l-30.2,41.9c-4.4,6.2 -11.6,9.9 -19.3,9.9z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M674.1,647.4s-46.2,53.5 -54.9,78.5c0,0 -7.7,15.3 0,28.8 0,0 21,57.3 63.5,89.8 0,0 -20.7,5 -33.4,0 0,0 -82.6,-56.5 -77,-107.3 0,0 35.4,-85.4 101.9,-89.8z"
-      android:fillColor="#E54E4E"/>
-  <path
-      android:pathData="M679.3,859.7h-0.4c-22.1,-0.2 -43.5,-12.6 -73.8,-42.9 -30.3,-30.3 -42.7,-51.7 -42.8,-73.7 -0.1,-22.1 12.2,-43.5 42.5,-73.8 30.3,-30.3 51.7,-42.6 73.9,-42.6s43.6,12.4 73.9,42.6c3.9,3.9 3.9,10.2 0,14.1s-10.2,3.9 -14.1,0c-25.8,-25.8 -43.7,-36.8 -59.8,-36.8s-34,11 -59.8,36.8c-25.7,25.7 -36.7,43.5 -36.6,59.6 0.1,16 11.1,33.8 36.9,59.6 25.9,25.9 43.8,37 59.8,37.1h0.3c16.1,0 33.9,-10.9 59.4,-36.5 20.4,-20.4 31.2,-35.4 35,-48.8 3.7,-12.7 1,-25 -8.7,-39.8 -3,-4.6 -1.8,-10.8 2.9,-13.9s10.8,-1.8 13.9,2.9c28,42.7 9.7,75.1 -28.9,113.7 -30,30 -51.4,42.3 -73.5,42.3z"
-      android:fillColor="#333333"/>
-</vector>
--- a/app/src/main/res/drawable/ic_category_bar_24dp.xml
+++ b/app/src/main/res/drawable/ic_category_bar_24dp.xml
@ -1,57 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M327.4,462.9V511H254.1c-7.4,0 -13.5,6 -13.5,13.5v184.1c0,7.4 6,13.5 13.5,13.5h73.3v48.1H254.1c-33.9,0 -61.5,-27.6 -61.5,-61.5V524.5c0,-33.9 27.6,-61.5 61.5,-61.5h73.3z"
-      android:fillColor="#FFAC3B"/>
-  <path
-      android:pathData="M253.9,732.4c-12.9,0 -23.5,-10.5 -23.5,-23.5V524.8c0,-12.9 10.5,-23.5 23.5,-23.5h28c5.5,0 10,4.5 10,10s-4.5,10 -10,10h-28c-1.9,0 -3.5,1.6 -3.5,3.5v184.1c0,1.9 1.6,3.5 3.5,3.5 5.5,0 10,4.5 10,10s-4.5,10 -10,10z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M281.9,780.5h-28c-39.5,0 -71.6,-32.1 -71.6,-71.6V524.8c0,-39.5 32.1,-71.6 71.6,-71.6 5.5,0 10,4.5 10,10s-4.5,10 -10,10c-28.4,0 -51.5,23.1 -51.5,51.5v184.1c0,28.4 23.1,51.5 51.5,51.5h28c5.5,0 10,4.5 10,10s-4.5,10 -10,10z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M316,405h408.1v337.5c0,48.3 -39.2,87.5 -87.5,87.5H403.5c-48.3,0 -87.5,-39.2 -87.5,-87.5V405z"
-      android:fillColor="#FFAC3B"/>
-  <path
-      android:pathData="M407,525m37.5,0l0,0q37.5,0 37.5,37.5l0,143q0,37.5 -37.5,37.5l0,0q-37.5,0 -37.5,-37.5l0,-143q0,-37.5 37.5,-37.5Z"
-      android:fillColor="#FFD44A"/>
-  <path
-      android:pathData="M559,525m37.5,0l0,0q37.5,0 37.5,37.5l0,143q0,37.5 -37.5,37.5l0,0q-37.5,0 -37.5,-37.5l0,-143q0,-37.5 37.5,-37.5Z"
-      android:fillColor="#FFD44A"/>
-  <path
-      android:pathData="M714.8,273.3c-4,0 -8,0.4 -11.8,1.1 -4.6,-44.1 -41.8,-78.5 -87.1,-78.5 -26.6,0 -50.3,11.8 -66.4,30.5 -15.8,-35.6 -51.4,-60.4 -92.9,-60.4 -48.5,0 -89.1,34 -99.2,79.6a81.2,81.2 0,0 0,-17.3 -1.9c-43.5,0 -79,34.5 -80.6,77.7h-0.1v122.5c0,47.8 38.8,86.7 86.7,86.7 47.8,0 86.7,-38.8 86.7,-86.7v-38.8h274.9v-0.4c2.4,0.3 4.8,0.4 7.2,0.4 36.4,0 65.9,-29.5 65.9,-65.9s-29.5,-65.9 -65.9,-65.9z"
-      android:fillColor="#FFF6DB"/>
-  <path
-      android:pathData="M348,252s-49,19 -49,60v139.5s6,41 49,41c0,0 54,4.4 76,-36.5 0,0 -4.7,69 -77.3,69 0,0 -85.5,-1.6 -85.5,-74.3V307.7S282,236 348,252zM433,364h274s46,2 66,-33c0,0 6.2,61.3 -65.4,74.6H433V364z"
-      android:fillColor="#F8E0BB"/>
-  <path
-      android:pathData="M359,521v212.3S358,789 402,789h247s47,-3 71,-47c0,0 -3,87 -74,87H398.9S318,814 318,743V533.5L359,521z"
-      android:fillColor="#F29816"/>
-  <path
-      android:pathData="M513,840H408.6C352,840 306,794 306,737.4V525.5c0,-5.5 4.5,-10 10,-10s10,4.5 10,10v211.9c0,45.5 37,82.6 82.6,82.6H513c5.5,0 10,4.5 10,10s-4.5,10 -10,10zM724.1,595c-5.5,0 -10,-4.5 -10,-10V462c0,-5.5 4.5,-10 10,-10s10,4.5 10,10v123c0,5.5 -4.5,10 -10,10z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M346.1,540.5c-53.3,0 -96.7,-43.4 -96.7,-96.7v-122.5c0,-0.6 0.1,-1.1 0.1,-1.7 1.2,-23 10.9,-44.5 27.5,-60.5 17,-16.4 39.4,-25.5 63,-25.5h0.9c5.4,0 10.3,-3.3 12.4,-8.4C370.6,183.2 411.1,156 456.6,156c39.3,0 75.4,20.7 95.4,53.7a97.5,97.5 0,0 1,63.9 -23.8c45.2,0 84.2,30.7 94.8,74.6 0.4,1.7 1.8,2.8 3.6,2.8h0.5c20,0 38.9,7.7 53.1,21.7 14.3,14 22.3,32.7 22.7,52.6 0.4,20.3 -7.3,39.5 -21.6,54.2 -14.7,15 -34.3,23.2 -55.3,23.2h-234.1c-5.5,0 -10,-4.5 -10,-10s4.5,-10 10,-10h234.1c15.6,0 30.1,-6.1 41,-17.2 10.6,-10.8 16.2,-24.9 15.9,-39.8 -0.3,-14.7 -6.2,-28.4 -16.7,-38.7 -10.5,-10.3 -24.4,-16 -39.1,-16h-0.5c-11,0 -20.4,-7.4 -23,-18.1 -8.4,-34.9 -39.5,-59.3 -75.4,-59.3 -22.6,0 -44,9.9 -58.8,27a10,10 0,0 1,-9 3.4c-3.4,-0.5 -6.3,-2.7 -7.7,-5.8 -14.7,-33.1 -47.6,-54.5 -83.7,-54.5s-70.6,22.3 -84.8,56.9c-5.2,12.7 -17.3,20.8 -30.9,20.8H340.1c-18.4,0 -35.8,7 -49.1,19.8 -13.2,12.8 -20.8,29.9 -21.5,48.2 -0,0.3 -0,0.6 -0.1,0.9v121.3c0,42.3 34.4,76.7 76.7,76.7s76.7,-34.4 76.7,-76.7v-79.5c0,-5.5 4.5,-10 10,-10s10,4.5 10,10v79.5c0,53.3 -43.4,96.7 -96.7,96.7z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M530.3,291.1c-5.5,0 -10,-4.5 -10,-10 0,-52.3 42.5,-94.8 94.8,-94.8 5.5,0 10,4.5 10,10s-4.5,10 -10,10c-41.3,0 -74.8,33.6 -74.8,74.8 0,5.5 -4.5,10 -10,10z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M777.5,692.1l71.8,-83.9c3.6,2.8 8.8,2.3 11.8,-1.3l11,-13.3a8.5,8.5 0,0 0,-0.5 -11.5l-36,-36c-3.1,-3.1 -8.1,-3.3 -11.5,-0.5l-13.3,11c-3.6,3 -4.1,8.2 -1.3,11.8l-83.9,71.8c-16,-13.2 -39.6,-12.3 -54.6,2.7L559.6,754.3c-15.9,15.9 -15.9,41.6 0,57.5l46.3,46.3c15.9,15.9 41.6,15.9 57.5,0L774.9,746.6c14.9,-14.9 15.8,-38.6 2.7,-54.6z"
-      android:fillColor="#54D533"/>
-  <path
-      android:pathData="M562,764l67.5,67.5s9.6,12.1 21.7,0l130.8,-128.8c10.4,10.7 10.3,27.8 -0.3,38.3L663.4,858s-27.3,27.4 -50.7,4l-58.4,-58.4s-13.3,-27.7 7.7,-39.7z"
-      android:fillColor="#44A00E"/>
-  <path
-      android:pathData="M634.7,880c-13.5,0 -26.3,-5.3 -35.8,-14.8l-46.3,-46.3c-9.6,-9.6 -14.8,-22.3 -14.8,-35.8s5.3,-26.3 14.8,-35.8l111.4,-111.4c16.5,-16.5 41.4,-19.4 61,-8.2l72.8,-62.3c-0.7,-6 1.6,-12.2 6.6,-16.3l13.3,-11c7.4,-6.1 18.1,-5.6 24.9,1.2l36,36c6.8,6.8 7.3,17.5 1.2,24.9l-11,13.3c-4.2,5 -10.3,7.3 -16.3,6.6l-62.3,72.9c11.3,19.5 8.3,44.5 -8.2,61L670.5,865.2c-9.6,9.6 -22.3,14.8 -35.8,14.8zM699.8,640.9c-7.9,0 -15.7,3 -21.7,9L566.7,761.3c-11.9,11.9 -11.9,31.4 0,43.3l46.3,46.3c5.8,5.8 13.5,9 21.7,9s15.9,-3.2 21.7,-9l111.4,-111.4c11.2,-11.2 12.1,-28.9 2,-41.1a10,10 0,0 1,0.1 -12.9l71.8,-83.9c3.2,-3.7 8.4,-4.5 12.5,-2.2l9.3,-11.3 -34.1,-34.1 -11.3,9.3c2.3,4.1 1.5,9.4 -2.2,12.5l-83.9,71.8a10,10 0,0 1,-12.9 0.1c-5.7,-4.7 -12.6,-7 -19.5,-7z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M713.8,712.7l40,40 -86.3,86.3 -40,-40c-4.8,-4.8 -4.8,-12.7 0,-17.5l68.7,-68.7c4.8,-4.8 12.7,-4.8 17.5,0z"
-      android:fillColor="#D8F9CC"/>
-  <path
-      android:pathData="M742,741l12,12L668,839l-12,-12z"
-      android:fillColor="#BFEAAD"/>
-</vector>
--- a/app/src/main/res/drawable/ic_category_clothes_24dp.xml
+++ b/app/src/main/res/drawable/ic_category_clothes_24dp.xml
@ -1,42 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M282.4,226.3h206.2V835.3H282.4c-37.3,0 -67.6,-30.3 -67.6,-67.6V293.9c0,-37.3 30.3,-67.6 67.6,-67.6z"
-      android:fillColor="#57B7F9"/>
-  <path
-      android:pathData="M693.7,835.3H487.5V226.3h206.2c37.3,0 67.6,30.3 67.6,67.6V767.7c0,37.3 -30.3,67.6 -67.6,67.6z"
-      android:fillColor="#33A1F2"/>
-  <path
-      android:pathData="M487.9,347.7l120.6,-161.6H367.3l120.6,161.6z"
-      android:fillColor="#33A1F2"/>
-  <path
-      android:pathData="M367.3,186.1l120.6,161.6 -67.8,42.4c-7.7,4.8 -18,1.2 -20.9,-7.4l-50.5,-147.8a22.1,22.1 0,0 1,1.6 -17.8l17.1,-31zM608.8,186.1l-120.6,161.6 67.8,42.4c7.7,4.8 18,1.2 20.9,-7.4l50.5,-147.8a22.1,22.1 0,0 0,-1.6 -17.8l-17.1,-31z"
-      android:fillColor="#A1DCFF"/>
-  <path
-      android:pathData="M414.7,400.3c-3,0 -6.1,-0.5 -9.1,-1.6 -7.8,-2.8 -13.8,-8.8 -16.5,-16.6l-41.4,-119.2c-1.8,-5.2 0.9,-10.9 6.2,-12.7 5.2,-1.8 10.9,0.9 12.7,6.2l41.4,119.2c1,2.8 3.1,3.9 4.3,4.3 1.2,0.4 3.6,0.9 6.1,-0.6l52.4,-32.5c10.6,-6.6 24.3,-6.5 34.9,0.2l50.5,32.2c2.5,1.6 4.9,1.1 6.1,0.7 1.2,-0.4 3.3,-1.5 4.3,-4.3l43.1,-119.2c1.9,-5.2 7.6,-7.9 12.8,-6 5.2,1.9 7.9,7.6 6,12.8l-43.1,119.2c-2.8,7.8 -8.9,13.8 -16.7,16.4 -7.8,2.7 -16.3,1.6 -23.3,-2.8l-50.5,-32.2c-4.1,-2.6 -9.4,-2.7 -13.6,-0.1l-52.4,32.5c-4.3,2.7 -9.3,4.1 -14.2,4.1zM488.1,732c-5.5,0 -10,-4.5 -10,-10V415.7c0,-5.5 4.5,-10 10,-10s10,4.5 10,10V722c0,5.5 -4.5,10 -10,10z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M257.3,239.9v530s-1.6,25.6 29.6,25.6h159.6V836H275.7s-56.4,-16.1 -56.4,-66V282.7s5.2,-38.8 38,-42.7z"
-      android:fillColor="#33A1F2"/>
-  <path
-      android:pathData="M373,845.3h-85.2c-45.2,0 -82,-36.8 -82,-82V298.3c0,-45.2 36.8,-82 82,-82h53.3c0.7,0 1.4,-0.4 1.7,-1 4.3,-8.9 9.5,-19.3 13.1,-26.5 3.9,-7.8 11.8,-12.7 20.5,-12.7h225.2c8.8,0 16.6,4.9 20.5,12.7l13.3,26.5c0.3,0.6 0.9,1 1.7,1h53.4c45.2,0 82,36.8 82,82v319.7c0,5.5 -4.5,10 -10,10s-10,-4.5 -10,-10V298.3c0,-34.2 -27.8,-62 -62,-62h-53.4c-8.3,0 -15.8,-4.6 -19.5,-12.1l-13.3,-26.5c-0.5,-1 -1.5,-1.6 -2.6,-1.6H376.4c-1.1,0 -2.1,0.6 -2.6,1.6 -3.6,7.1 -8.7,17.5 -13,26.3 -3.6,7.5 -11.4,12.3 -19.7,12.3H287.8c-34.2,0 -62,27.8 -62,62v465.1c0,34.2 27.8,62 62,62H373c5.5,0 10,4.5 10,10s-4.5,10 -10,10z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M848.3,817.2l-5.1,-100.3s-1.9,-12.9 -12.2,-6.4c0,0 -26.4,35.3 -63,26.4 0,0 -39.4,-6.7 -38.5,-50.1 0,0 4.1,-33.7 -13.5,-33.4 0,0 -12.4,-3.6 -16.1,21.2 0,0 -1.4,23.5 -22.5,37.3 0,0 -54.1,36.6 -188.7,71.2 0,0 -20,6.1 -46.5,11.7 0,0 -21,5.8 -16.6,22.5 0,0 1.3,34.7 44.6,51.6 11.8,4.6 24.5,6.9 37.2,6.9h285.1s63.5,7.1 55.8,-58.5z"
-      android:fillColor="#FFD44A"/>
-  <path
-      android:pathData="M592.5,805.5c-2.3,0 -4.6,-0.8 -6.5,-2.4l-29.6,-25.6c-4.2,-3.6 -4.6,-9.9 -1,-14.1 3.6,-4.2 9.9,-4.6 14.1,-1l29.6,25.6c4.2,3.6 4.6,9.9 1,14.1a10,10 0,0 1,-7.6 3.5zM643.9,782.6c-2.3,0 -4.6,-0.8 -6.5,-2.4l-29.6,-25.6c-4.2,-3.6 -4.6,-9.9 -1,-14.1 3.6,-4.2 9.9,-4.6 14.1,-1l29.6,25.6c4.2,3.6 4.6,9.9 1,14.1a10,10 0,0 1,-7.6 3.5zM699.1,757.2c-2.3,0 -4.6,-0.8 -6.5,-2.4l-29.6,-25.6c-4.2,-3.6 -4.6,-9.9 -1,-14.1 3.6,-4.2 9.9,-4.6 14.1,-1l29.6,25.6c4.2,3.6 4.6,9.9 1,14.1a10,10 0,0 1,-7.6 3.5z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M436,829s32.8,9.9 220.9,10.9c0,0 140.1,-9.9 191.1,-28 0,0 11.3,56 -42.3,63.5l-298.3,0.2S448,874 436,829z"
-      android:fillColor="#FC981C"/>
-  <path
-      android:pathData="M797.7,885.9c-2.7,0 -4.7,-0.1 -5.6,-0.2L507.4,885.7c-14.3,0 -28,-2.5 -40.8,-7.5 -44.7,-17.5 -50.2,-52.3 -50.8,-59.3 -2.4,-10.4 1.4,-20.3 10.6,-27.1 6.1,-4.5 12.6,-6.4 13.3,-6.6 0.2,-0.1 0.4,-0.1 0.6,-0.1 25.7,-5.5 45.5,-11.5 45.7,-11.5l0.4,-0.1c130.8,-33.6 185.1,-69.4 185.6,-69.8 0,-0 0.1,-0.1 0.1,-0.1 16.4,-10.7 17.9,-28.8 18,-29.5 0,-0.3 0,-0.5 0.1,-0.8 1.9,-13.1 6.6,-22.1 13.7,-26.8 4.7,-3 9.7,-3.5 13.3,-3 5.8,0.2 10.8,2.6 14.7,6.8 9.9,11 8.3,31.9 7.7,37.2 -0.2,14.1 4.6,24.9 14.2,32.2 7.7,5.8 15.9,7.4 16,7.4 0.2,0 0.4,0.1 0.6,0.1 12.1,3 24.5,0.2 36.8,-8.1 9.8,-6.7 15.9,-14.5 15.9,-14.6 0.7,-1 1.7,-1.8 2.7,-2.5 7.8,-4.9 14,-3.3 17,-1.9 8.3,3.8 10.1,13.4 10.4,15.3 0.1,0.3 0.1,0.6 0.1,1l5.1,99.9c2.6,22.7 -2.3,40.4 -14.5,52.7 -14.7,14.8 -35.8,16.8 -46.2,16.8zM444.7,804.4c-0.8,0.3 -4,1.4 -6.7,3.5 -3.4,2.7 -3.2,4.8 -2.7,6.7 0.2,0.8 0.3,1.4 0.3,2.2 0.1,1.1 2.1,28.5 38.2,42.7 10.4,4.1 21.7,6.2 33.5,6.2h285.1c0.4,0 0.7,0 1.1,0.1 0.2,0 23.2,2.3 36.1,-10.8 7.7,-7.8 10.6,-20.1 8.7,-36.5 -0,-0.2 -0,-0.4 -0.1,-0.7l-4.9,-94.9c-10.5,11 -35.3,31.5 -67.6,23.8 -2.4,-0.5 -12.9,-2.8 -23.4,-10.5 -10.8,-7.9 -23.6,-22.9 -23,-49.7 0,-0.3 0,-0.7 0.1,-1 1.2,-9.9 -0.6,-20.9 -2.9,-22.2s-0.1,-0.1 -0.5,-0.1c-0.6,0 -1.1,-0 -1.6,-0.1 -0.6,0.5 -3.2,3.1 -4.6,12.5 -0.4,4.2 -3.5,29.2 -26.9,44.5 -3.2,2.1 -58.2,38.2 -191.5,72.4 -2.4,0.7 -21.5,6.4 -46.7,11.8zM713.3,663zM713.2,662.9s0.1,0 0.1,0c-0,0 -0.1,-0 -0.1,-0z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M520.6,850c-3.4,0 -6.7,0 -9.9,-0 -5.5,-0 -10,-4.5 -10,-10 0,-5.5 4.5,-10 10,-10h0c289.4,0.7 324.2,-24.7 328.2,-29.8 3.4,-4.3 9.7,-5.1 14.1,-1.6 4.3,3.4 5.1,9.7 1.6,14.1 -7.3,9.2 -24,16.1 -52.6,21.6 -22.4,4.3 -52.3,7.8 -89.1,10.4 -64,4.5 -138.2,5.5 -192.4,5.5z"
-      android:fillColor="#333333"/>
-</vector>
--- a/app/src/main/res/drawable/ic_category_convenience_24dp.xml
+++ b/app/src/main/res/drawable/ic_category_convenience_24dp.xml
@ -1,60 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M198.9,437.1m53.7,0l463.2,0q53.7,0 53.7,53.7l0,251q0,53.7 -53.7,53.7l-463.2,0q-53.7,0 -53.7,-53.7l0,-251q0,-53.7 53.7,-53.7Z"
-      android:fillColor="#EA5959"/>
-  <path
-      android:pathData="M199.4,553.7S260,595 352.8,533.7c0,0 119.2,92.3 260,0 0,0 75.9,55.4 156.7,21.4V436.3H200.2l-0.8,117.3z"
-      android:fillColor="#CE4141"/>
-  <path
-      android:pathData="M612.9,483.2c-72.5,70.2 -187.6,70.2 -260,0S394.8,219 394.8,219h176.1l41.9,264.2z"
-      android:fillColor="#FEC773"/>
-  <path
-      android:pathData="M251.1,219h143.7l-41.9,264.2c-45.5,59.6 -133.1,65.3 -185.9,12.1a31.8,31.8 0,0 1,-8.6 -28.7l41.6,-205.7c4.9,-24.4 26.3,-41.9 51.2,-41.9z"
-      android:fillColor="#FDBC2C"/>
-  <path
-      android:pathData="M247.3,226.7l-42.5,238.3s15.9,21.3 52.1,21.3c0,0 55,5 98.2,-49.1L349,487s-31.3,46.1 -93,45c0,0 -67.2,-3.2 -91.7,-58.5l43.6,-215.9s9.6,-27.6 39.3,-30.8z"
-      android:fillColor="#F29816"/>
-  <path
-      android:pathData="M366.4,444.7s60.6,48.6 117,47.7c0,0 79.8,-5.2 119.1,-48.8l9.4,35.3s-36,48.5 -132.7,52.9c0,0 -75.5,-3.1 -120.2,-47.8l7.4,-39.3z"
-      android:fillColor="#FDBC2C"/>
-  <path
-      android:pathData="M485.1,545.8c-51.4,0 -100,-19.7 -137,-55.4a10,10 0,0 1,-2.9 -8.8l41.9,-264.2a10,10 0,0 1,9.9 -8.4h176.1c4.9,0 9.1,3.6 9.9,8.4L625,481.7c0.5,3.2 -0.6,6.5 -2.9,8.8 -36.9,35.7 -85.6,55.4 -137,55.4zM365.8,479.6c32.7,29.9 74.8,46.3 119.3,46.3s86.6,-16.4 119.3,-46.3L564.6,229L405.6,229l-39.8,250.6z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M235,554v190S235,763 255,763h504c0,20.5 -16.7,37.2 -37.2,37.2H249.4s-51,-5.7 -51,-51V523L235,554z"
-      android:fillColor="#CE4141"/>
-  <path
-      android:pathData="M717.1,810.2H253.9c-35.1,0 -63.7,-28.6 -63.7,-63.7V584c0,-5.5 4.5,-10 10,-10s10,4.5 10,10v162.5c0,24.1 19.6,43.7 43.7,43.7h463.1c5.5,0 10,4.5 10,10s-4.5,10 -10,10zM770.8,648.3c-5.5,0 -10,-4.5 -10,-10V495.5c0,-5.5 4.5,-10 10,-10s10,4.5 10,10v142.8c0,5.5 -4.5,10 -10,10zM256.7,541.8c-4.9,0 -9.9,-0.3 -14.9,-0.8 -30.5,-3.4 -58.1,-16.8 -79.8,-38.7a41.7,41.7 0,0 1,-11.3 -37.7l41.6,-205.7c5.8,-28.9 31.5,-49.9 61,-49.9h143.7c2.9,0 5.7,1.3 7.6,3.5s2.7,5.2 2.3,8.1L365,484.8c-0.9,5.4 -6,9.2 -11.4,8.3 -5.4,-0.9 -9.2,-6 -8.3,-11.4l40.1,-252.7H253.4c-20,0 -37.4,14.2 -41.4,33.9L170.4,468.6c-1.4,7.1 0.8,14.5 5.9,19.7 18.4,18.6 41.9,30 67.8,32.9 24.9,2.8 50.4,-2.8 71.7,-15.7 4.7,-2.9 10.9,-1.4 13.7,3.4 2.9,4.7 1.4,10.9 -3.4,13.7 -20.8,12.6 -45,19.3 -69.5,19.3z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M425.7,614h119.6c15.3,0 27.7,12.4 27.7,27.7V789H398V641.7c0,-15.3 12.4,-27.7 27.7,-27.7z"
-      android:fillColor="#FFD44A"/>
-  <path
-      android:pathData="M573,799c-5.5,0 -10,-4.5 -10,-10V641.7c0,-9.8 -7.9,-17.7 -17.7,-17.7H425.7c-9.8,0 -17.7,7.9 -17.7,17.7V750c0,5.5 -4.5,10 -10,10s-10,-4.5 -10,-10V641.7c0,-20.8 16.9,-37.7 37.7,-37.7h119.6c20.8,0 37.7,16.9 37.7,37.7V789c0,5.5 -4.5,10 -10,10z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M714.3,219H570.6l41.9,264.2c45.5,59.6 133.1,65.3 185.9,12.1a31.8,31.8 0,0 0,8.6 -28.7l-41.6,-205.7c-4.9,-24.4 -26.3,-41.9 -51.2,-41.9z"
-      android:fillColor="#FDBC2C"/>
-  <path
-      android:pathData="M615.1,443.7s42.7,40.4 100.1,40.4c0,0 54.2,-6.4 83,-33l8.5,29.4s-25.7,45.1 -95.8,46.2c0,0 -43.9,6.8 -95.8,-43.4v-39.5z"
-      android:fillColor="#F29816"/>
-  <path
-      android:pathData="M713,541.8a133.4,133.4 0,0 1,-106.2 -52.5c-1,-1.3 -1.7,-2.9 -1.9,-4.5l-41.9,-264.2c-0.5,-2.9 0.4,-5.8 2.3,-8.1s4.7,-3.5 7.6,-3.5h143.7c29.5,0 55.1,21 61,49.9l41.6,205.7a41.7,41.7 0,0 1,-11.3 37.7,133.4 133.4,0 0,1 -94.8,39.5zM624.3,479.1a113.4,113.4 0,0 0,81.4 42.5,113.4 113.4,0 0,0 87.9,-33.4 21.8,21.8 0,0 0,5.9 -19.7l-41.6,-205.7c-4,-19.6 -21.4,-33.9 -41.4,-33.9L584.6,229l39.7,250.1z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M813.2,859H668.5c-28.3,0 -49,-26.6 -42.2,-54l19.8,-79c4.8,-19.3 22.2,-32.9 42.2,-32.9h144.7c28.3,0 49,26.6 42.2,54l-19.8,79c-4.8,19.3 -22.2,32.9 -42.2,32.9z"
-      android:fillColor="#57B7F9"/>
-  <path
-      android:pathData="M684,754.2c-1.4,-1.7 -1.7,-3.9 -0.7,-6.6 1.5,-4 3.8,-7.6 6.8,-10.9s6.7,-5.8 10.8,-7.7c4.1,-1.9 8.4,-2.8 12.9,-2.8 5.6,0 10.8,1.4 15.5,4.2 4.7,2.8 8.5,6.6 11.3,11.2 2.8,4.7 4.2,9.7 4.2,14.9 0,4.3 -0.9,8.5 -2.7,12.6 -1.8,4 -4.7,8.3 -8.7,12.9l-32,34.7v-9.8h35.9c2.7,0 4.8,0.7 6.2,2.2 1.4,1.4 2.2,3.5 2.2,6.2v0.3c0,2.7 -0.7,4.8 -2.2,6.2 -1.4,1.4 -3.5,2.2 -6.2,2.2h-44.3c-2.8,0 -5,-0.7 -6.6,-2 -1.6,-1.3 -2.4,-3.2 -2.4,-5.5v-0.3c0,-2.1 0.4,-4 1.2,-5.8 0.8,-1.8 2.1,-3.7 3.9,-5.7l31.1,-33.8c2.9,-3.1 4.8,-5.7 5.8,-7.7 1,-2 1.5,-4.2 1.5,-6.6 0,-2.8 -0.5,-5.2 -1.6,-7.2 -1.1,-2 -2.6,-3.6 -4.6,-4.7 -2,-1.1 -4.4,-1.6 -7.3,-1.6 -1.9,0 -3.7,0.3 -5.3,0.8 -1.6,0.5 -3.1,1.3 -4.3,2.2 -1.3,0.9 -2.3,2.1 -3.2,3.4 -1.4,2.4 -2.8,4.2 -4.3,5.4 -1.5,1.2 -3.5,1.8 -5.8,1.8h-0.4c-2.9,0 -5,-0.8 -6.4,-2.5zM817.6,790.2c1.4,1.4 2.2,3.5 2.2,6.2v0.3c0,2.7 -0.7,4.7 -2.2,6.2 -1.4,1.4 -3.5,2.1 -6.2,2.1h-0.3v10.5c0,2.8 -0.7,4.9 -2.2,6.4s-3.6,2.2 -6.4,2.2h-0.3c-2.8,0 -4.9,-0.7 -6.4,-2.2 -1.5,-1.5 -2.2,-3.6 -2.2,-6.4v-10.5h-30.5c-2.8,0 -4.9,-0.6 -6.4,-1.7 -1.5,-1.1 -2.2,-2.7 -2.2,-4.8v-0.6c0,-2.1 0.2,-3.9 0.7,-5.5 0.5,-1.6 1.3,-3.3 2.4,-5.1l34.3,-54c1.2,-1.9 2.7,-3.3 4.3,-4.2 1.7,-0.9 3.7,-1.4 6,-1.4h0.1c2.8,0 4.9,0.7 6.4,2.2 1.5,1.5 2.2,3.6 2.2,6.4v51.7h0.3c2.7,0 4.8,0.7 6.2,2.2zM793.8,788L793.8,760.1l-17.3,28h17.3z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M679.6,701.5L652,816s-4,16.6 14.8,16.6h186.4s-11.7,26.4 -39.9,26.4h-149.8s-38.4,-9.9 -38.4,-44l24.4,-98s11.8,-15.6 30.2,-15.6z"
-      android:fillColor="#33A1F2"/>
-  <path
-      android:pathData="M813.2,869H668.5c-16.6,0 -31.9,-7.5 -42.1,-20.6 -10.2,-13.1 -13.7,-29.8 -9.7,-45.9l19.8,-79a53.4,53.4 0,0 1,51.8 -40.5h144.7c16.6,0 31.9,7.5 42.1,20.6 10.2,13.1 13.7,29.8 9.7,45.9l-12.1,48.5c-1.3,5.4 -6.8,8.6 -12.1,7.3 -5.4,-1.3 -8.6,-6.8 -7.3,-12.1l12.1,-48.5c2.5,-10.1 0.3,-20.5 -6.1,-28.7 -6.4,-8.2 -16,-12.9 -26.4,-12.9H688.2a33.4,33.4 0,0 0,-32.5 25.3l-19.8,79c-2.5,10.1 -0.3,20.5 6.1,28.7 6.4,8.2 16,12.9 26.4,12.9H813.2c7.4,0 14.7,-2.5 20.6,-7.1 4.3,-3.4 10.6,-2.6 14,1.7s2.6,10.6 -1.7,14c-9.4,7.3 -21,11.3 -32.9,11.3z"
-      android:fillColor="#333333"/>
-</vector>
--- a/app/src/main/res/drawable/ic_category_cosmetics_24dp.xml
+++ b/app/src/main/res/drawable/ic_category_cosmetics_24dp.xml
@ -1,51 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M189.7,387.6m51.5,0l469.3,0q51.5,0 51.5,51.5l0,325.3q0,51.5 -51.5,51.5l-469.3,0q-51.5,0 -51.5,-51.5l0,-325.3q0,-51.5 51.5,-51.5Z"
-      android:fillColor="#EA5959"/>
-  <path
-      android:pathData="M448.9,498h313.2v207.3H448.9c-28.4,0 -51.5,-23.1 -51.5,-51.5V549.5c0,-28.4 23.1,-51.5 51.5,-51.5z"
-      android:fillColor="#FEC773"/>
-  <path
-      android:pathData="M552,715.3H448.9c-33.9,0 -61.5,-27.6 -61.5,-61.5V549.5c0,-33.9 27.6,-61.5 61.5,-61.5H762c5.5,0 10,4.5 10,10s-4.5,10 -10,10H448.9c-22.9,0 -41.5,18.6 -41.5,41.5v104.4c0,22.9 18.6,41.5 41.5,41.5H552c5.5,0 10,4.5 10,10s-4.5,10 -10,10z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M281.4,321.8H670.2c21.6,0 39.2,17.6 39.2,39.2v26.8h-467.2v-26.8c0,-21.6 17.6,-39.2 39.2,-39.2z"
-      android:fillColor="#CE4141"/>
-  <path
-      android:pathData="M648,321.8S626.4,175.6 440.3,160.8c-9.7,-0.8 -16.1,9.3 -10.3,16.5 1,1.3 1.9,2.5 2.8,3.9 6.3,9.9 9.3,26.8 -8.4,32.5 0,0 -105.3,27.6 -120.7,108.2h344.3z"
-      android:fillColor="#FEC773"/>
-  <path
-      android:pathData="M439.5,217S371,258 371,314h-67.3s32.3,-97 135.8,-97z"
-      android:fillColor="#FDBC2C"/>
-  <path
-      android:pathData="M761.9,564c-5.5,0 -10,-4.5 -10,-10V439c0,-22.9 -18.6,-41.5 -41.5,-41.5h-1c-5.5,0 -10,-4.5 -10,-10V361c0,-16.1 -13.1,-29.2 -29.2,-29.2H303.7c-5.5,0 -10,-4.5 -10,-10s4.5,-10 10,-10h366.5c27.1,0 49.2,22.1 49.2,49.2v17.2c29.7,4.3 52.5,30 52.5,60.8V554c0,5.5 -4.5,10 -10,10z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M247.9,350.5c-1.8,0 -3.6,-0.5 -5.2,-1.5 -4.7,-2.9 -6.2,-9 -3.3,-13.8 9,-14.7 24.7,-23.5 42,-23.5h14.3c8.8,-32.5 32.5,-61 68.9,-82.9 27.8,-16.7 53.6,-24 56.9,-24.9 4.7,-1.5 5.4,-3.7 5.7,-4.5 1.1,-3.2 -0,-8.6 -2.9,-13.1 -0.6,-1 -1.3,-2 -2.2,-3 -5,-6.3 -5.8,-14.5 -2.1,-21.5 4,-7.5 12.2,-11.9 21,-11.2 53.5,4.3 99,19.6 135.3,45.5 27,19.3 48.3,44 63.6,73.3a10,10 0,0 1,-4.3 13.5c-4.9,2.5 -10.9,0.6 -13.5,-4.3 -23,-44.5 -73.4,-99.4 -182.7,-108.1 -0.9,-0.1 -1.4,0.3 -1.6,0.5 1.2,1.5 2.3,3 3.3,4.6 6.3,10 8.2,21.4 4.8,30.6 -2,5.6 -6.9,13 -18.6,16.8l-0.5,0.2c-0.2,0.1 -25.6,6.9 -52.4,23 -34.7,21 -55.2,47 -61,77.3a10,10 0,0 1,-9.8 8.1h-22.3c-10.3,0 -19.6,5.2 -24.9,14a10,10 0,0 1,-8.5 4.8zM437.7,170.9z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M232,393v366S232,778 252,778h504c0,20.5 -16.7,37.2 -37.2,37.2H246.4s-51,-5.7 -51,-51V428.5c0,-20 16.5,-36.1 36.5,-35.5z"
-      android:fillColor="#CE4141"/>
-  <path
-      android:pathData="M557,825.8H241.2c-33.9,0 -61.5,-27.6 -61.5,-61.5V439c0,-33.9 27.6,-61.5 61.5,-61.5h376.9c5.5,0 10,4.5 10,10s-4.5,10 -10,10h-376.9c-22.9,0 -41.5,18.6 -41.5,41.5v325.2c0,22.9 18.6,41.5 41.5,41.5H557c5.5,0 10,4.5 10,10s-4.5,10 -10,10z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M736,743m-140.7,0a140.7,140.7 0,1 0,281.4 0,140.7 140.7,0 1,0 -281.4,0Z"
-      android:fillColor="#FFD44A"/>
-  <path
-      android:pathData="M709,610s-71,34 -71,143c0,0 1.9,118.5 123.9,118.5 0,0 -140.4,52.5 -166.6,-128.5 0,0 -0.3,-123 113.7,-133z"
-      android:fillColor="#FDBC2C"/>
-  <path
-      android:pathData="M736,893.7c-40.3,0 -78.1,-15.7 -106.6,-44.1 -58.8,-58.8 -58.8,-154.4 0,-213.1 28.5,-28.5 66.3,-44.1 106.6,-44.1s78.1,15.7 106.6,44.1c58.8,58.8 58.8,154.4 0,213.1 -28.5,28.5 -66.3,44.1 -106.6,44.1zM736,612.3c-34.9,0 -67.7,13.6 -92.4,38.3 -51,51 -51,133.9 0,184.9 24.7,24.7 57.5,38.3 92.4,38.3s67.7,-13.6 92.4,-38.3c51,-51 51,-133.9 0,-184.9 -24.7,-24.7 -57.5,-38.3 -92.4,-38.3z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M778.8,659.2m20.5,20.5l0,0q20.5,20.5 0,41l-85.7,85.7q-20.5,20.5 -41,0l0,0q-20.5,-20.5 0,-41l85.7,-85.7q20.5,-20.5 41,0Z"
-      android:fillColor="#FFEBA4"/>
-  <path
-      android:pathData="M693.2,824.8c-10,0 -20,-3.8 -27.6,-11.4 -15.2,-15.2 -15.2,-39.9 0,-55.1l85.7,-85.7c15.2,-15.2 39.9,-15.2 55.1,0 15.2,15.2 15.2,39.9 0,55.1l-85.7,85.7c-7.6,7.6 -17.6,11.4 -27.6,11.4zM778.8,681.2c-5.1,0 -9.8,2 -13.4,5.6l-85.7,85.7c-7.4,7.4 -7.4,19.5 0,26.9s19.5,7.4 26.9,0l85.7,-85.7c7.4,-7.4 7.4,-19.5 0,-26.9a18.9,18.9 0,0 0,-13.4 -5.6z"
-      android:fillColor="#333333"/>
-</vector>
--- a/app/src/main/res/drawable/ic_category_delivery_24dp.xml
+++ b/app/src/main/res/drawable/ic_category_delivery_24dp.xml
@ -1,39 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M856,509.9c0,236.8 -62,300.1 -298.8,300.1S259.7,746.6 259.7,509.9s60.8,-298.8 297.5,-298.8S856,273.1 856,509.9z"
-      android:fillColor="#FEC773"/>
-  <path
-      android:pathData="M303.5,509.9c0,-229.3 57,-294.7 275.6,-298.6 -7.1,-0.1 -14.4,-0.2 -21.9,-0.2 -236.8,0 -297.5,62 -297.5,298.8s60.8,300.1 297.5,300.1c7.5,0 14.8,-0.1 21.9,-0.2 -218.6,-4 -275.6,-70.6 -275.6,-299.9z"
-      android:fillColor="#F29816"/>
-  <path
-      android:pathData="M557.2,819.9c-5.5,0 -10,-4.5 -10,-10s4.5,-10 10,-10c61.5,0 107.3,-4.2 144.2,-13.3 37.6,-9.3 66.1,-24 86.9,-45 20.8,-21 35.4,-49.6 44.6,-87.4C841.8,617.4 846,571.5 846,509.9s-4.2,-107.4 -13.1,-144.2c-9.2,-37.6 -23.7,-66.1 -44.6,-86.9 -20.8,-20.8 -49.3,-35.4 -86.9,-44.6 -36.8,-8.9 -82.6,-13.1 -144.2,-13.1 -52.4,0 -94.2,3.1 -127.8,9.6 -35,6.7 -62.3,17.2 -83.7,32.2 -41.9,29.3 -64.2,78.4 -72.3,159.5 -0.6,5.5 -5.4,9.5 -10.9,9 -5.5,-0.6 -9.5,-5.4 -9,-10.9 8.7,-87.4 33.6,-141 80.7,-173.9 45.5,-31.8 112.2,-45.3 222.9,-45.3 242.4,0 308.8,66.4 308.8,308.8 0,63.3 -4.3,110.7 -13.7,149.1 -10.1,41.4 -26.4,73.1 -49.8,96.7 -23.5,23.7 -55,40.2 -96.3,50.3 -38.5,9.5 -85.8,13.9 -149,13.9z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M208.7,808.8c-5.4,-7.2 -4.4,-17.4 2.3,-23.4l129.4,-117.8c15.2,-13.8 39,-11.5 51.2,4.9 12.3,16.5 7.7,39.9 -9.9,50.5l-149.9,90.3c-7.7,4.7 -17.7,2.7 -23.1,-4.5z"
-      android:fillColor="#FE4933"/>
-  <path
-      android:pathData="M410.6,832c4.9,6.6 13.8,8.6 21.1,4.8l142.1,-75.1c25,-13.2 30.7,-46.5 11.6,-67.3l-54.2,-58.9c-5.2,-5.7 -5.7,-14.2 -1.2,-20.5l30,-41c4.9,-6.8 14.4,-8.2 21.1,-3.2l44.9,33.7c8.8,6.6 20.2,8.8 30.9,5.9l95.8,-25.9c8.8,-2.4 14.4,-11 13.1,-20 -1.4,-8.9 -9.2,-15.5 -18.2,-15.3l-79.8,2.2c-4.4,0.1 -8.8,-1.4 -12.1,-4.3l-43,-36.5a88.2,88.2 0,0 1,-12.8 -13.4l-47.2,-61.2a45.5,45.5 0,0 0,-17.4 -13.7l-64,-28.7a59.1,59.1 0,0 0,-35.8 -4l-111.3,22.3c-8.5,1.7 -14.3,9.6 -13.3,18.3 1,8.4 8.1,14.8 16.6,14.8h109.6c3.8,0 7.5,0.9 10.8,2.6l35.4,18.2c9,4.6 11.9,16.1 6.2,24.5l-58.6,85.8c-17.9,26.2 -14.3,61.5 8.5,83.5l62.8,60.8c6.7,6.4 6,17.3 -1.4,22.9l-86.8,65.4c-7.3,5.5 -8.8,15.9 -3.3,23.2z"
-      android:fillColor="#FE4933"/>
-  <path
-      android:pathData="M663.4,402m-64,0a64,64 0,1 0,128 0,64 64,0 1,0 -128,0Z"
-      android:fillColor="#FE4933"/>
-  <path
-      android:pathData="M240,585.7m21.5,0l64.5,0q21.5,0 21.5,21.5l0,0q0,21.5 -21.5,21.5l-64.5,0q-21.5,0 -21.5,-21.5l0,0q0,-21.5 21.5,-21.5Z"
-      android:fillColor="#FE4933"/>
-  <path
-      android:pathData="M165.5,483m30.5,0l123.3,0q30.5,0 30.5,30.5l0,0q0,30.5 -30.5,30.5l-123.3,0q-30.5,0 -30.5,-30.5l0,0q0,-30.5 30.5,-30.5Z"
-      android:fillColor="#FE4933"/>
-  <path
-      android:pathData="M222.7,825.9c-8.4,0 -16.7,-3.9 -22,-11.1a27.4,27.4 0,0 1,3.5 -36.8L333.6,660.2c9.3,-8.5 21.9,-12.7 34.4,-11.4 12.5,1.2 24.1,7.7 31.6,17.8s10.5,23 8,35.4a44.8,44.8 0,0 1,-20.8 29.7l-149.9,90.3a27.5,27.5 0,0 1,-14.2 4zM363.6,668.5c-6.2,0 -12,2.3 -16.6,6.4L217.7,792.8a7.5,7.5 0,0 0,-1 10.1,7.5 7.5,0 0,0 9.9,2l149.9,-90.3c6.1,-3.7 10.1,-9.5 11.5,-16.4 1.4,-6.9 -0.2,-13.9 -4.4,-19.5s-10.4,-9.2 -17.5,-9.8c-0.8,-0.1 -1.6,-0.1 -2.5,-0.1z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M423.9,848.7c-8.1,0 -16.1,-3.8 -21.3,-10.7 -8.7,-11.7 -6.3,-28.4 5.3,-37.2l86.8,-65.4a5,5 0,0 0,2 -3.7c0.1,-0.9 -0.1,-2.5 -1.5,-4l-62.8,-60.8a74.9,74.9 0,0 1,-9.8 -96.3l58.6,-85.8a6.7,6.7 0,0 0,1 -5.5c-0.3,-1.1 -1.1,-3.2 -3.5,-4.4l-35.4,-18.2c-1.9,-1 -4.1,-1.5 -6.2,-1.5L327.5,455c-13.6,0 -25,-10.2 -26.5,-23.7 -1.6,-13.9 7.6,-26.5 21.3,-29.2l111.3,-22.3c14.2,-2.8 28.6,-1.2 41.8,4.7l64,28.7a55.6,55.6 0,0 1,21.2 16.7l47.2,61.2c3.4,4.3 7.2,8.4 11.4,11.9l43,36.5a8,8 0,0 0,5.4 1.9l79.8,-2.2c14.1,-0.4 26.3,9.8 28.4,23.8 2.1,14 -6.6,27.4 -20.3,31.1l-95.8,25.9c-13.7,3.7 -28.1,0.9 -39.5,-7.6l-44.9,-33.7a5,5 0,0 0,-3.8 -0.9c-0.8,0.1 -2.2,0.5 -3.3,2l-30,41a6.2,6.2 0,0 0,0.4 7.8l54.2,58.9c11.2,12.2 16.1,28.6 13.2,44.9 -2.8,16.4 -12.8,30.2 -27.5,37.9L436.4,845.6c-4,2.1 -8.3,3.1 -12.5,3.1zM418.7,826a6.6,6.6 0,0 0,8.4 1.9l142.1,-75.1c9.1,-4.8 15.4,-13.4 17.1,-23.6 1.8,-10.2 -1.3,-20.4 -8.3,-28l-54.2,-58.9c-8.4,-9.1 -9.2,-23.1 -1.9,-33.1l30,-41c4,-5.4 9.8,-9 16.5,-10 6.7,-1 13.3,0.7 18.7,4.7l44.9,33.7c6.4,4.8 14.5,6.4 22.2,4.3l95.8,-25.9a7.9,7.9 0,0 0,5.8 -8.8c-0.6,-4 -4.1,-6.8 -8.1,-6.7l-79.8,2.2c-6.9,0.2 -13.6,-2.2 -18.9,-6.6l-43,-36.5a99.1,99.1 0,0 1,-14.3 -15l-47.2,-61.2a35.5,35.5 0,0 0,-13.6 -10.7l-64,-28.7c-9.4,-4.2 -19.6,-5.4 -29.7,-3.3l-111.3,22.3a6.7,6.7 0,0 0,-5.3 7.3,6.7 6.7,0 0,0 6.7,5.9h109.6c5.3,0 10.7,1.3 15.4,3.7l35.4,18.2a26.9,26.9 0,0 1,13.7 17.3c1.9,7.4 0.5,15.4 -3.9,21.7l-58.6,85.8a55,55 0,0 0,7.2 70.7l62.8,60.8c5.3,5.1 8,12.2 7.6,19.6s-4.1,14.1 -9.9,18.5l-86.8,65.4c-2.9,2.2 -3.5,6.3 -1.3,9.3z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M663.4,476c-40.8,0 -74,-33.2 -74,-74s33.2,-74 74,-74 74,33.2 74,74 -33.2,74 -74,74zM663.4,348c-29.8,0 -54,24.2 -54,54s24.2,54 54,54 54,-24.2 54,-54 -24.2,-54 -54,-54zM326,638.7h-64.5c-17.4,0 -31.5,-14.1 -31.5,-31.5s14.1,-31.5 31.5,-31.5h64.5c17.4,0 31.5,14.1 31.5,31.5s-14.1,31.5 -31.5,31.5zM261.5,595.7c-6.3,0 -11.5,5.2 -11.5,11.5s5.2,11.5 11.5,11.5h64.5c6.3,0 11.5,-5.2 11.5,-11.5s-5.2,-11.5 -11.5,-11.5h-64.5zM319.3,554L196,554c-22.3,0 -40.5,-18.2 -40.5,-40.5s18.2,-40.5 40.5,-40.5h123.3c22.3,0 40.5,18.2 40.5,40.5s-18.2,40.5 -40.5,40.5zM196,493c-11.3,0 -20.5,9.2 -20.5,20.5s9.2,20.5 20.5,20.5h123.3c11.3,0 20.5,-9.2 20.5,-20.5s-9.2,-20.5 -20.5,-20.5L196,493z"
-      android:fillColor="#333333"/>
-</vector>
--- a/app/src/main/res/drawable/ic_category_digital_24dp.xml
+++ b/app/src/main/res/drawable/ic_category_digital_24dp.xml
@ -1,39 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M188.9,170m82.3,0l327.5,0q82.3,0 82.3,82.3l0,514.4q0,82.3 -82.3,82.3l-327.5,0q-82.3,0 -82.3,-82.3l0,-514.4q0,-82.3 82.3,-82.3Z"
-      android:fillColor="#35A5F6"/>
-  <path
-      android:pathData="M598.7,859H271.2c-50.9,0 -92.3,-41.4 -92.3,-92.3V252.3c0,-50.9 41.4,-92.3 92.3,-92.3H598.7c50.9,0 92.3,41.4 92.3,92.3v327.6c0,5.5 -4.5,10 -10,10s-10,-4.5 -10,-10V252.3c0,-39.9 -32.4,-72.3 -72.3,-72.3H271.2c-39.9,0 -72.3,32.4 -72.3,72.3v514.4c0,39.9 32.4,72.3 72.3,72.3H598.7c5.5,0 10,4.5 10,10s-4.5,10 -10,10z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M237.2,217.7m38.2,0l319.1,0q38.2,0 38.2,38.2l0,433q0,38.2 -38.2,38.2l-319.1,0q-38.2,0 -38.2,-38.2l0,-433q0,-38.2 38.2,-38.2Z"
-      android:fillColor="#DCF1FC"/>
-  <path
-      android:pathData="M591.5,737H272.4c-26.5,0 -48.2,-21.6 -48.2,-48.2v-433c0,-26.5 21.6,-48.2 48.2,-48.2H591.5c26.5,0 48.2,21.6 48.2,48.2v300.1c0,5.5 -4.5,10 -10,10s-10,-4.5 -10,-10V255.9c0,-15.5 -12.6,-28.1 -28.1,-28.1H272.4c-15.5,0 -28.1,12.6 -28.1,28.1v433c0,15.5 12.6,28.1 28.1,28.1H591.5c15.5,0 28.1,-12.6 28.1,-28.1v-54.7c0,-5.5 4.5,-10 10,-10s10,4.5 10,10v54.7c0,26.5 -21.6,48.2 -48.2,48.2z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M354.4,760m24.5,0l112,0q24.5,0 24.5,24.5l0,0q0,24.5 -24.5,24.5l-112,0q-24.5,0 -24.5,-24.5l0,0q0,-24.5 24.5,-24.5Z"
-      android:fillColor="#DCF1FC"/>
-  <path
-      android:pathData="M337.5,469.4c-2.4,-2.3 -3.6,-5.7 -3.6,-10.2v-1.2c0,-4.5 1.2,-7.9 3.5,-10.1 2.3,-2.3 6,-3.8 10.9,-4.6 6.1,-1 10.9,-3 14.6,-6.3 3.6,-3.2 5.4,-7.1 5.4,-11.6 0,-4 -0.8,-7.5 -2.4,-10.4 -1.6,-2.9 -4,-5.1 -7.1,-6.6 -3.1,-1.5 -6.9,-2.3 -11.2,-2.3 -2.9,0 -5.5,0.3 -7.7,0.8 -2.3,0.6 -4.3,1.4 -6,2.5l-4.3,3.4c-2.7,2.3 -5.2,3.9 -7.3,5.1 -2.2,1.1 -4.8,1.7 -7.8,1.7h-1.2c-6.1,0 -10.5,-1.8 -13.2,-5.3 -2.7,-3.5 -2.7,-7.8 0.2,-12.8 3,-5.1 6.9,-9.7 11.7,-13.7 4.7,-4 10.1,-7.2 16.3,-9.5 6.1,-2.3 12.6,-3.5 19.5,-3.5 9.3,0 18,2.1 26.2,6.4s14.7,10.1 19.5,17.5c4.8,7.4 7.2,15.5 7.2,24.3 0,8.2 -2.8,15.5 -8.3,22 -5.5,6.5 -13,11.7 -22.5,15.5l-0.2,-6c13,3.2 23,8.7 30.1,16.5 7.1,7.8 10.6,17.9 10.6,30.5 0,10.1 -2.8,19.5 -8.4,28.3 -5.6,8.8 -13.1,15.7 -22.5,20.9 -9.4,5.2 -19.4,7.8 -30,7.8 -8.7,0 -17,-1.7 -24.9,-5.2s-14.9,-8.2 -20.8,-14.3c-5.9,-6.1 -10.2,-12.9 -12.8,-20.5 -1.8,-5 -1.3,-9 1.3,-12 2.7,-3 6.6,-4.6 11.9,-4.6h2.4c4.2,0 7.3,1 9.5,2.9 2.2,1.9 4.6,5.3 7.3,10.1 1.6,2.6 3.7,4.8 6.3,6.6 2.6,1.9 5.5,3.3 8.8,4.2 3.3,1 6.9,1.4 10.9,1.4 5.6,0 10.6,-1.1 14.9,-3.3s7.7,-5.2 10.1,-9.1c2.4,-3.9 3.6,-8.4 3.6,-13.4 0,-7.9 -2.5,-14.2 -7.5,-19 -5,-4.8 -12.3,-7.8 -21.9,-8.9 -5,-0.5 -8.7,-1.9 -11.1,-4.2zM478.1,546.2c-13.7,-8.3 -24.5,-19.4 -32.3,-33.5 -7.8,-14 -11.7,-29.4 -11.7,-46.1s3.9,-31.8 11.7,-45.8c7.8,-14 18.5,-25.2 32.3,-33.5 13.7,-8.3 28.9,-12.4 45.6,-12.4 11.7,0 22.5,2.1 32.5,6.3 9.9,4.2 19,10.1 27.2,17.8 3.8,3.7 5.6,7.4 5.3,11.2 -0.3,3.8 -2.6,7.3 -6.7,10.7l-0.7,0.5c-3.8,3 -7.5,4.4 -11.1,4.1 -3.5,-0.3 -7.2,-2.3 -11.1,-5.8 -5.1,-4.8 -10.5,-8.4 -16.1,-10.7 -5.6,-2.3 -12,-3.5 -19.3,-3.5 -11.4,0 -21.5,2.6 -30.2,7.8 -8.8,5.2 -15.6,12.5 -20.5,21.8 -4.9,9.3 -7.3,19.8 -7.3,31.5s2.4,22.5 7.2,31.8c4.8,9.3 11.6,16.6 20.5,21.8 8.8,5.2 18.9,7.8 30.3,7.8v30.6c-16.7,0 -31.9,-4.1 -45.6,-12.4zM570.3,508.9c3.5,-0.4 7.1,0.8 10.9,3.7l0.7,0.5c4.3,3.2 6.7,6.8 7.1,10.7 0.4,3.9 -1.3,7.7 -5.2,11.2 -8,7.2 -17.2,13 -27.4,17.2s-21.2,6.4 -32.7,6.4c-16.7,0 -31.9,-4.1 -45.6,-12.4 -13.7,-8.3 -24.5,-19.4 -32.3,-33.5 -7.8,-14 -11.7,-29.4 -11.7,-46.1s3.9,-31.8 11.7,-45.8c7.8,-14 18.5,-25.2 32.3,-33.5 13.7,-8.3 28.9,-12.4 45.6,-12.4v30.6c-11.4,0 -21.5,2.6 -30.2,7.8 -8.8,5.2 -15.6,12.5 -20.5,21.8 -4.9,9.3 -7.3,19.8 -7.3,31.5s2.4,22.5 7.2,31.8c4.8,9.3 11.6,16.6 20.5,21.8 8.8,5.2 18.9,7.8 30.3,7.8 7.1,0 13.5,-1.2 19.4,-3.5 5.9,-2.3 11.3,-5.7 16.3,-10 3.8,-3.4 7.5,-5.3 10.9,-5.7z"
-      android:fillColor="#0080E0"/>
-  <path
-      android:pathData="M701.3,683c0,-33.8 -30.7,-61.3 -68.5,-61.3s-68.5,27.4 -68.5,61.3 30.7,61.3 68.5,61.3c6.6,0 12.9,-0.8 18.9,-2.4v117.3c0,13.7 11.1,24.8 24.8,24.8 13.7,0 24.8,-11.1 24.8,-24.8V688c0,-0.7 -0,-1.3 -0.1,-2 0.1,-1 0.1,-2 0.1,-3zM811.2,556c-37.8,0 -68.5,27.4 -68.5,61.3 0,1 0,2 0.1,3 -0.1,0.6 -0.1,1.3 -0.1,2v171.2c0,13.7 11.1,24.8 24.8,24.8 13.7,0 24.8,-11.1 24.8,-24.8V676.2a76.2,76.2 0,0 0,18.9 2.4c37.8,0 68.5,-27.4 68.5,-61.3S849,556 811.2,556z"
-      android:fillColor="#FEDC5A"/>
-  <path
-      android:pathData="M626,632s-28,16 -29,45c0,0 -5,43 42,57l-6.2,7.5s-68.7,1.1 -68.2,-63.7c0,0 13.4,-54.8 57.4,-51.8l4,6z"
-      android:fillColor="#F29816"/>
-  <path
-      android:pathData="M676.5,894c-19.2,0 -34.8,-15.6 -34.8,-34.8L641.7,756.9c0,-1 -0.5,-1.7 -0.9,-2 -0.3,-0.3 -1.1,-0.8 -2.2,-0.8 -1.9,0.1 -3.9,0.2 -5.9,0.2 -43.3,0 -78.5,-32 -78.5,-71.3s35.2,-71.3 78.5,-71.3 78.5,32 78.5,71.3c0,0.9 -0,1.9 -0.1,2.9 0.1,0.7 0.1,1.4 0.1,2.1v171.2c0,19.2 -15.6,34.8 -34.8,34.8zM638.8,734.1c5.8,0 11.4,2.2 15.6,6.2 4.6,4.3 7.2,10.4 7.2,16.7v102.3c0,8.1 6.6,14.8 14.8,14.8s14.8,-6.6 14.8,-14.8L691.3,688c0,-0.3 -0,-0.7 -0.1,-1.2 -0,-0.4 -0,-0.9 -0,-1.3 0.1,-0.9 0.1,-1.7 0.1,-2.5 0,-28.3 -26.2,-51.3 -58.5,-51.3s-58.5,23 -58.5,51.3 26.2,51.3 58.5,51.3c1.5,0 3,-0.1 4.5,-0.2 0.5,-0 1,-0.1 1.5,-0.1z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M811.2,564.5S770,577 769,605v213.2s-24.1,1.4 -25.6,-18.9V606.8s12,-48.7 67.8,-42.3z"
-      android:fillColor="#F29816"/>
-  <path
-      android:pathData="M767.5,828.2c-19.2,0 -34.8,-15.6 -34.8,-34.8V622.2c0,-0.7 0,-1.3 0.1,-2.1 -0.1,-1 -0.1,-2 -0.1,-2.9 0,-39.3 35.2,-71.3 78.5,-71.3s78.5,32 78.5,71.3 -35.2,71.3 -78.5,71.3c-2.4,0 -4.9,-0.1 -7.3,-0.3 -0.6,-0.1 -1,0.2 -1.2,0.4 -0.4,0.4 -0.4,0.8 -0.4,0.9v103.9c0,19.2 -15.6,34.8 -34.8,34.8zM811.2,566c-32.3,0 -58.5,23 -58.5,51.3 0,0.8 0,1.6 0.1,2.5 0,0.4 0,0.9 -0,1.3 -0,0.5 -0.1,0.9 -0.1,1.2v171.2c0,8.1 6.6,14.8 14.8,14.8s14.8,-6.6 14.8,-14.8V689.5c0,-5.9 2.5,-11.6 6.9,-15.6 4.4,-4.1 10.4,-6.1 16.4,-5.6 1.9,0.2 3.8,0.2 5.6,0.2 32.3,0 58.5,-23 58.5,-51.3s-26.2,-51.3 -58.5,-51.3z"
-      android:fillColor="#333333"/>
-</vector>
--- a/app/src/main/res/drawable/ic_category_drink_24dp.xml
+++ b/app/src/main/res/drawable/ic_category_drink_24dp.xml
@ -1,75 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M679.2,668.4m19.8,2.6l77,10q19.8,2.6 17.2,22.3l-10,77q-2.6,19.8 -22.3,17.2l-77,-10q-19.8,-2.6 -17.2,-22.3l10,-77q2.6,-19.8 22.3,-17.2Z"
-      android:fillColor="#B1DCFD"/>
-  <path
-      android:pathData="M704,679l-8.5,63.4s-3,32.8 13.5,33.6l72,8 -2.2,6.6 -22.7,7.4L664,789l12.1,-97 14.4,-14.3L704,679z"
-      android:fillColor="#89CBF4"/>
-  <path
-      android:pathData="M763.4,807.6c-1.3,0 -2.6,-0.1 -3.9,-0.3l-77,-10c-5.5,-0.7 -9.3,-5.7 -8.6,-11.2 0.7,-5.5 5.7,-9.3 11.2,-8.6l77,10c2.6,0.3 5.2,-0.4 7.3,-2a9.8,9.8 0,0 0,3.8 -6.6l10,-77c0.3,-2.6 -0.4,-5.2 -2,-7.3a9.8,9.8 0,0 0,-6.6 -3.8l-77,-10c-2.6,-0.3 -5.2,0.4 -7.3,2s-3.4,4 -3.8,6.6l-2.4,18.7c-0.7,5.5 -5.7,9.3 -11.2,8.6 -5.5,-0.7 -9.3,-5.7 -8.6,-11.2l2.4,-18.7c1,-7.9 5.1,-15 11.4,-19.9 6.3,-4.9 14.2,-7 22.1,-6l77,10c7.9,1 15,5.1 19.9,11.4 4.9,6.3 7,14.2 6,22.1l-10,77c-1,7.9 -5.1,15 -11.4,19.9 -5.3,4.1 -11.6,6.2 -18.2,6.2z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M277.6,467.3l31.5,353.6c1.4,15.9 14.7,28.1 30.7,28.1h250.1c15.9,0 29.3,-12.2 30.7,-28.1l27.6,-309.8 3.5,-46.5 -374.1,2.6z"
-      android:fillColor="#FFD9D9"/>
-  <path
-      android:pathData="M662.6,407.5H268.8c0,-108.7 88.1,-196.9 196.9,-196.9s196.9,88.1 196.9,196.9z"
-      android:fillColor="#FFD44A"/>
-  <path
-      android:pathData="M612.2,175.8l-44.5,-12.5c-4.3,-1.2 -8.8,1.2 -10.1,5.5l-16.4,53.8a196.9,196.9 0,0 1,56.5 35.5l20.3,-72.2a8.3,8.3 0,0 0,-5.7 -10.2z"
-      android:fillColor="#FE972B"/>
-  <path
-      android:pathData="M597.6,268.2c-0.9,0 -1.8,-0.1 -2.7,-0.4 -5.3,-1.5 -8.4,-7 -6.9,-12.3l19.8,-70.5 -41.2,-11.6 -6.1,20c-1.6,5.3 -7.2,8.3 -12.5,6.6 -5.3,-1.6 -8.3,-7.2 -6.6,-12.5l6.6,-21.6c2.9,-9.4 12.9,-14.9 22.4,-12.3l44.5,12.5c9.7,2.7 15.4,12.8 12.6,22.5l-20.3,72.2c-1.2,4.4 -5.3,7.3 -9.6,7.3z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M450,592.9c-56,21.5 -117.5,18.1 -159.3,11.4l19.3,216.1c1.4,16.2 15,28.6 31.3,28.6h248.9c16.3,0 29.9,-12.4 31.3,-28.6l21.8,-245c-95.2,-23.2 -193.4,17.6 -193.4,17.6z"
-      android:fillColor="#F76C69"/>
-  <path
-      android:pathData="M327.3,608.8l16.8,185.4s0,19.4 15.9,19.4h225.2s25.6,1.8 32.7,-15l-1.8,31.8 -18.5,15.9H333.8l-22.1,-17.8 -19.8,-222.3 35.4,2.5z"
-      android:fillColor="#CE4141"/>
-  <path
-      android:pathData="M465.9,217.4s-128.8,34.6 -137.2,167.1h-59.9s10.6,-164.6 197.1,-167.1z"
-      android:fillColor="#F29816"/>
-  <path
-      android:pathData="M662.8,417.5L269,417.5c-5.5,0 -10,-4.5 -10,-10 0,-114.1 92.8,-206.9 206.9,-206.9s206.9,92.8 206.9,206.9c0,5.5 -4.5,10 -10,10zM279.3,397.5h373.2c-5.2,-98.4 -86.9,-176.9 -186.6,-176.9s-181.4,78.5 -186.6,176.9z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M239.2,384.5m21.6,0l409.9,0q21.6,0 21.6,21.6l0,35.5q0,21.6 -21.6,21.6l-409.9,0q-21.6,0 -21.6,-21.6l0,-35.5q0,-21.6 21.6,-21.6Z"
-      android:fillColor="#FFD44A"/>
-  <path
-      android:pathData="M308.8,389.8s-16.9,1.7 -16.9,18.5v36.2s0.1,13.2 16.9,13.2h-65.6v-67.9h65.6z"
-      android:fillColor="#F29816"/>
-  <path
-      android:pathData="M313.7,465.1l12.3,137.1h-29.8l-11.1,-137.5 28.6,0.4z"
-      android:fillColor="#FFC7C7"/>
-  <path
-      android:pathData="M352.9,619.4c-23.6,0 -45.5,-2.3 -63.8,-5.3 -5.4,-0.9 -9.2,-6 -8.3,-11.5 0.9,-5.4 6,-9.2 11.5,-8.3 40.5,6.5 100.1,9.9 154,-10.8 2.3,-0.9 26.7,-10.8 62.7,-18 34.2,-6.8 85.8,-12.4 136.7,0 5.4,1.3 8.6,6.7 7.3,12.1 -1.3,5.4 -6.7,8.6 -12.1,7.3 -90.9,-22.2 -186.2,16.7 -187.1,17.1 -0.1,0 -0.2,0.1 -0.3,0.1 -33.4,12.9 -68.6,17.1 -100.7,17.1z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M590.8,859H340.7c-21.3,0 -38.7,-16 -40.6,-37.2l-31.5,-353.6c-0.5,-5.5 3.6,-10.4 9.1,-10.9 5.5,-0.5 10.4,3.6 10.9,9.1l31.5,353.6c1,10.8 9.9,19 20.7,19h250.1c10.8,0 19.8,-8.1 20.7,-19l27.6,-309.8c0.5,-5.5 5.3,-9.6 10.9,-9.1 5.5,0.5 9.6,5.3 9.1,10.9l-27.6,309.8c-1.9,21.2 -19.4,37.2 -40.6,37.2z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M673.9,473.1H259c-16,0 -29,-13 -29,-29v-40.5c0,-16 13,-29 29,-29h82.1c5.5,0 10,4.5 10,10s-4.5,10 -10,10h-82.1c-5,0 -9,4.1 -9,9v40.5c0,5 4.1,9 9,9h414.9c5,0 9,-4.1 9,-9v-40.5c0,-5 -4.1,-9 -9,-9H419.2c-5.5,0 -10,-4.5 -10,-10s4.5,-10 10,-10h254.7c16,0 29,13 29,29v40.5c0,16 -13,29 -29,29z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M738.3,724.8m17.7,9.2l68.8,35.9q17.7,9.2 8.4,26.9l-35.9,68.8q-9.2,17.7 -26.9,8.4l-68.8,-35.9q-17.7,-9.2 -8.4,-26.9l35.9,-68.8q9.2,-17.7 26.9,-8.4Z"
-      android:fillColor="#B1DCFD"/>
-  <path
-      android:pathData="M755,740l-27,56s-9,16 6,23l69.2,35.4L787.1,872l-23.8,-1.7L684,828l45,-86 18.7,-7.8L755,740z"
-      android:fillColor="#89CBF4"/>
-  <path
-      android:pathData="M779.7,886.3c-4.7,0 -9.4,-1.1 -13.8,-3.4L697.1,847c-4.9,-2.6 -6.8,-8.6 -4.2,-13.5 2.6,-4.9 8.6,-6.8 13.5,-4.2l68.8,35.9c4.8,2.5 10.9,0.6 13.4,-4.2l35.9,-68.8a9.8,9.8 0,0 0,0.7 -7.6,9.8 9.8,0 0,0 -4.9,-5.8l-68.8,-35.9a9.8,9.8 0,0 0,-7.6 -0.7,9.8 9.8,0 0,0 -5.8,4.9c-2.6,4.9 -8.6,6.8 -13.5,4.2 -4.9,-2.6 -6.8,-8.6 -4.2,-13.5 3.7,-7.1 9.9,-12.3 17.6,-14.7 7.6,-2.4 15.7,-1.7 22.8,2l68.8,35.9c7.1,3.7 12.3,9.9 14.7,17.6 2.4,7.6 1.7,15.7 -2,22.8l-35.9,68.8c-5.3,10.2 -15.8,16.1 -26.6,16.1z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M582,768.8m19.5,-3.9l76.1,-15.3q19.5,-3.9 23.5,15.6l15.3,76.1q3.9,19.5 -15.6,23.5l-76.1,15.3q-19.5,3.9 -23.5,-15.6l-15.3,-76.1q-3.9,-19.5 15.6,-23.5Z"
-      android:fillColor="#B1DCFD"/>
-  <path
-      android:pathData="M607.2,774.2l12.7,60.9s2.6,18.2 18.8,14.6l76.4,-14.1 -2.1,23.8 -19.9,13.1 -88.6,14.8 -16.7,-95.6 10.1,-17.6 9.3,0.2z"
-      android:fillColor="#89CBF4"/>
-  <path
-      android:pathData="M620.8,890.4c-5.8,0 -11.5,-1.7 -16.5,-5 -6.7,-4.4 -11.2,-11.2 -12.8,-19l-15.3,-76.1c-1.6,-7.8 0,-15.8 4.4,-22.5 4.4,-6.7 11.2,-11.2 19,-12.8l76.1,-15.3c16.2,-3.3 32,7.3 35.2,23.4l15.3,76.1c1.6,7.8 0,15.8 -4.4,22.5 -4.4,6.7 -11.2,11.2 -19,12.8s-76.1,15.3 -76.1,15.3c-2,0.4 -4,0.6 -6,0.6zM681.6,759.2c-0.6,0 -1.3,0.1 -2,0.2l-76.1,15.3a9.9,9.9 0,0 0,-6.3 4.2,9.8 9.8,0 0,0 -1.5,7.4l15.3,76.1a9.9,9.9 0,0 0,4.2 6.3,9.8 9.8,0 0,0 7.4,1.5l76.1,-15.3a9.9,9.9 0,0 0,6.3 -4.2,9.8 9.8,0 0,0 1.5,-7.4l-15.3,-76.1c-0.9,-4.7 -5.1,-8 -9.7,-8z"
-      android:fillColor="#333333"/>
-</vector>
--- a/app/src/main/res/drawable/ic_category_flower_24dp.xml
+++ b/app/src/main/res/drawable/ic_category_flower_24dp.xml
@ -1,51 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M525,192.6l-23.7,41.1 -23.7,-41c-74.9,11.9 -106.7,81.7 -92.7,188 15.8,120.1 70.3,148.9 116.6,148.9s100.5,-32.6 116.1,-148.9c14.2,-106.4 -17.4,-176.3 -92.6,-188z"
-      android:fillColor="#F76C69"/>
-  <path
-      android:pathData="M183.3,395.9L215,431.1l-46.3,9.9c-11.9,74.9 44.7,126.7 150.1,146.2 119.1,22 163.3,-20.8 177.6,-64.8 14.6,-45 0,-105.7 -105.8,-156.4 -96.8,-46.4 -173.1,-37.9 -207.4,29.9z"
-      android:fillColor="#F76C69"/>
-  <path
-      android:pathData="M819.2,395.9l-31.7,35.3 46.3,9.9c11.9,74.9 -44.7,126.7 -150.1,146.2 -119.1,22 -163.3,-20.8 -177.6,-64.8 -14.6,-45 -0,-105.7 105.8,-156.4 3.5,-1.7 6.9,-3.3 10.3,-4.8 91.9,-41 164,-30.7 197.1,34.7z"
-      android:fillColor="#F76C69"/>
-  <path
-      android:pathData="M284.5,781.3l43.3,-19.3 -4.9,47.1c67.6,34.4 134.3,-3.3 185.5,-97.6 57.8,-106.4 30.7,-161.8 -6.8,-189 -38.3,-27.8 -100.5,-32.7 -181.4,52.2 -74.1,77.8 -89.6,152.9 -35.6,206.5z"
-      android:fillColor="#F76C69"/>
-  <path
-      android:pathData="M679.9,809.3l-5,-47.2 43.3,19.3c53.6,-53.6 38.3,-128.8 -35.5,-206.5 -83.4,-87.8 -144.4,-79.2 -181.8,-52 -38.3,27.8 -62.2,85.5 -6.4,188.7 51,94.5 117.7,132.4 185.4,97.7z"
-      android:fillColor="#F76C69"/>
-  <path
-      android:pathData="M692,346s-32.5,149.7 -119.7,159.4c0,0 51.7,-87.5 53.2,-138.9 0,0 38.5,-22.4 66.5,-20.4zM731.9,646s-146.6,12.2 -182.7,-67.8c0,0 99.2,22.1 148.6,7.7 0,0 27.4,32.8 34.1,60.1zM463.5,779s-63.8,-142.8 1.1,-201.9c0,0 9.6,101.2 38.6,143.7 0,0 -15.9,43.4 -39.8,58.2zM250.1,565.3S364,457.2 440.3,500.7c0,0 -93.3,40.4 -124.7,81.1 0,0 -44,1.6 -65.5,-16.5zM388.2,290.1s131.9,76 114.1,161.9c0,0 -67.3,-76.2 -115.7,-93.6 0,0 -8.9,-42.4 1.6,-68.4z"
-      android:fillColor="#E54E4E"/>
-  <path
-      android:pathData="M387.4,371c-5.2,0 -9.5,-4 -10,-9.2 -3.8,-46.1 1.5,-84.7 15.8,-114.5 15,-31.4 39.1,-51.9 71.6,-61.2 12.8,-3.6 26.3,1.8 32.8,13.2l16.9,29.2c2.8,4.8 1.1,10.9 -3.7,13.7s-10.9,1.1 -13.7,-3.7l-16.9,-29.2c-2,-3.5 -6.1,-5.1 -10.1,-4 -26.8,7.6 -46.6,24.6 -59,50.5 -12.7,26.6 -17.4,61.7 -13.9,104.2 0.4,5.5 -3.7,10.3 -9.1,10.8 -0.3,0 -0.6,0 -0.8,0zM576,508.7a10,10 0,0 1,-6.8 -2.7,10 10,0 0,1 -0.5,-14.1c22,-23.6 36.7,-61.5 43.5,-112.6 6.8,-50.8 2.7,-93.7 -11.9,-123.9 -14.4,-29.9 -38.7,-47.7 -72.3,-52.9 -5.5,-0.9 -9.2,-6 -8.3,-11.4 0.9,-5.5 6,-9.2 11.4,-8.3 79.4,12.4 116.2,85 100.9,199.2 -7.4,55.2 -23.8,96.8 -48.7,123.6a10,10 0,0 1,-7.3 3.2zM309,594.3c-0.7,0 -1.5,-0.1 -2.2,-0.2 -46.7,-10.4 -82.9,-27.4 -107.8,-50.4 -26.1,-24.2 -38.7,-54 -37.3,-88.6 0.5,-13 9.9,-24 22.7,-26.7l33,-7c5.4,-1.1 10.7,2.3 11.9,7.7 1.1,5.4 -2.3,10.7 -7.7,11.9l-33,7c-3.9,0.8 -6.7,4.1 -6.9,8 -1.2,28.4 9.2,53 30.9,73.1 22.2,20.6 55.4,35.9 98.5,45.5 5.4,1.2 8.8,6.6 7.6,11.9a10,10 0,0 1,-9.8 7.8z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M497,463.6c-3.8,0 -7.4,-2.2 -9.1,-5.8 -14.2,-30.9 -46.8,-58.8 -97,-82.8 -46.2,-22.2 -88.2,-31.5 -121.5,-27 -32.9,4.5 -57.3,22.1 -72.7,52.4 -2.5,4.9 -8.5,6.9 -13.4,4.4s-6.9,-8.5 -4.4,-13.4c36.3,-71.7 116.7,-84.3 220.7,-34.4 54.5,26.1 90.3,57.3 106.5,92.5 2.3,5 0.1,11 -4.9,13.3 -1.4,0.6 -2.8,0.9 -4.2,0.9zM629.2,603.2c-30.8,0 -56.8,-5.6 -77.6,-16.8 -4.9,-2.6 -6.7,-8.7 -4.1,-13.5 2.6,-4.9 8.7,-6.7 13.5,-4.1 29.2,15.7 71.4,18.6 125.5,8.6 50.3,-9.3 89.7,-26.5 113.9,-49.7 24,-23 33.4,-51.6 28.1,-85.1 -0.9,-5.4 2.9,-10.6 8.3,-11.4 5.4,-0.9 10.6,2.9 11.4,8.3 12.6,79.3 -45.1,136.7 -158.2,157.6 -22,4.1 -42.4,6.1 -61,6.1zM792.1,441.1a10,10 0,0 1,-6.7 -2.6c-4.1,-3.7 -4.4,-10 -0.7,-14.1l22.6,-25.1c2.7,-3 3,-7.3 0.9,-10.5 -15.9,-24.1 -39.1,-37.9 -68.9,-41.2 -30.6,-3.4 -67.1,4.3 -108.5,22.7 -5,2.3 -11,-0 -13.2,-5.1 -2.3,-5 0,-11 5.1,-13.2 44.6,-19.9 84.6,-28.1 118.8,-24.3 36,4 64.1,20.8 83.4,50 7.2,10.8 6.1,25.2 -2.7,34.9l-22.6,25.1a10,10 0,0 1,-7.4 3.3zM376.9,831.8c-13.1,0 -26.3,-2.5 -39.6,-7.4 -12.2,-4.5 -19.7,-16.8 -18.4,-29.9l3.5,-33.5c0.6,-5.5 5.5,-9.5 11,-8.9 5.5,0.6 9.5,5.5 8.9,11l-3.5,33.5c-0.4,4 1.8,7.7 5.4,9 26.5,9.8 53,7.7 78.6,-6.5 26.3,-14.5 51,-40.9 73.4,-78.5 2.8,-4.7 9,-6.3 13.7,-3.5s6.3,9 3.5,13.7c-24.3,40.7 -51.5,69.5 -80.9,85.8 -18.2,10.1 -36.8,15.1 -55.7,15.1zM289.1,791.3c-2.5,0 -5.1,-1 -7.1,-2.9 -57,-56.7 -44.1,-137.1 35.4,-220.5 40.9,-43 80.9,-67.3 118.9,-72.4 5.5,-0.7 10.5,3.1 11.3,8.6 0.7,5.5 -3.1,10.5 -8.6,11.3 -33.3,4.5 -69.3,26.8 -107.1,66.4 -35.4,37.1 -57.2,74.2 -63.2,107.2 -5.9,32.7 3.3,61.4 27.4,85.3 3.9,3.9 3.9,10.2 0,14.1a10,10 0,0 1,-7.1 3z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M718,787.5c-4,0 -7.9,-0.8 -11.8,-2.5l-30.8,-13.7c-5.1,-2.3 -7.3,-8.2 -5.1,-13.2s8.2,-7.3 13.2,-5.1l30.8,13.7c3.6,1.6 7.8,0.6 10.2,-2.4 17.5,-22.2 23.6,-48 18.1,-76.7 -5.7,-29.5 -23.1,-61.1 -51.8,-94 -3.6,-4.2 -3.2,-10.5 0.9,-14.1 4.2,-3.6 10.5,-3.2 14.1,0.9 31.1,35.6 50.1,70.4 56.4,103.4 6.7,34.7 -0.8,65.9 -22.1,92.8 -5.5,7 -13.8,10.8 -22.3,10.8zM587.9,820.1c-1.5,0 -3.1,-0.3 -4.6,-1.1 -34.4,-17.6 -65.7,-52.2 -93,-102.7 -27.8,-51.4 -38.7,-96.4 -32.5,-133.7 0.9,-5.4 6.1,-9.1 11.5,-8.2 5.4,0.9 9.1,6.1 8.2,11.5 -5.5,32.8 4.7,73.5 30.3,120.9 25,46.2 54.2,78.8 84.5,94.3a10,10 0,1 1,-4.6 18.9z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M509,524m-70.4,0a70.4,70.4 0,1 0,140.9 0,70.4 70.4,0 1,0 -140.9,0Z"
-      android:fillColor="#FEDC5A"/>
-  <path
-      android:pathData="M509,604.5c-44.3,0 -80.4,-36.1 -80.4,-80.4s36.1,-80.4 80.4,-80.4 80.4,36.1 80.4,80.4 -36.1,80.4 -80.4,80.4zM509,463.6c-33.3,0 -60.4,27.1 -60.4,60.4s27.1,60.4 60.4,60.4 60.4,-27.1 60.4,-60.4 -27.1,-60.4 -60.4,-60.4z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M641.6,802.9c-22,-44.4 -22.4,-126.7 49,-165.5 30.1,-16.3 60.6,-19.5 97.4,-32.2 26.6,-9.3 42.2,-28 48.6,-37.3 0.9,-1.5 2.8,-2 4.3,-1.1 0.7,0.4 1.2,1 1.4,1.8 11.8,32 59,180.4 -39.2,251.6 -43.2,31.3 -96.2,26.9 -125.6,15.4 -22.3,-10.7 -35.9,-32.7 -35.9,-32.7z"
-      android:fillColor="#54D533"/>
-  <path
-      android:pathData="M805.2,609.5S698,639 672,702c0,0 -21,46 -4,123 0,0 -49.8,-19.5 -39.4,-102.8 0,0 23.7,-110.3 176.6,-112.8z"
-      android:fillColor="#54B721"/>
-  <path
-      android:pathData="M726.5,854.2c-9.6,0 -17.9,-0.9 -24.5,-1.9 -5.5,-0.9 -9.2,-6 -8.3,-11.4 0.9,-5.5 6,-9.2 11.4,-8.3 19.6,3.1 57.7,4.5 92.2,-20.5 83.9,-60.8 54,-184 39.7,-228.4 -9,10.2 -24,23.4 -45.6,31 -14.1,4.9 -27,8.3 -39.5,11.6 -20.7,5.5 -38.6,10.3 -56.5,19.9 -35.2,19.2 -49.2,47.7 -54.8,68.3 -7.7,28.7 -4.1,60.5 9.6,83.1 0.4,0.6 6.7,10.4 17.1,19.3a10,10 0,0 1,1.1 14.1,10 10,0 0,1 -14.1,1.1c-13.2,-11.2 -20.8,-23.5 -21.2,-24 -16.5,-27.2 -21,-65 -11.9,-98.8 6.6,-24.4 23.1,-58.1 64.6,-80.7 20,-10.8 39.8,-16.1 60.8,-21.7 12.2,-3.2 24.7,-6.6 38.1,-11.2 24.4,-8.6 38.5,-26 43.5,-33.3 1.8,-2.8 4.6,-4.8 7.9,-5.7 3.4,-0.9 6.9,-0.3 10,1.5 2.7,1.6 4.7,4.1 5.7,7.1 6.4,17.4 21.2,63 22.2,114.2 0.6,29.5 -3.5,56.2 -12.3,79.4 -10.7,28.5 -28.5,51.8 -52.7,69.4 -28.6,20.7 -59.1,25.9 -82.6,25.9zM845.2,573.1z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M614.9,860.2c-4.2,0 -8.1,-2.6 -9.5,-6.8 -1.8,-5.2 1,-10.9 6.3,-12.7 65.5,-22.2 111.2,-69.9 138,-105.9 29.4,-39.5 43.2,-74.1 43.3,-74.4 2,-5.1 7.8,-7.7 13,-5.6 5.1,2 7.7,7.8 5.6,13 -0.6,1.5 -14.7,37 -45.5,78.6 -28.6,38.5 -77.4,89.4 -148,113.4 -1.1,0.4 -2.2,0.5 -3.2,0.5z"
-      android:fillColor="#333333"/>
-</vector>
--- a/app/src/main/res/drawable/ic_category_food_24dp.xml
+++ b/app/src/main/res/drawable/ic_category_food_24dp.xml
@ -1,66 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M678.5,502.9m-83.9,0a83.9,83.9 0,1 0,167.9 0,83.9 83.9,0 1,0 -167.9,0Z"
-      android:fillColor="#FFF6DB"/>
-  <path
-      android:pathData="M679.7,427.7s10.1,86.3 -62.8,108.8l-20.2,-92s44.9,-34.8 83,-16.8z"
-      android:fillColor="#F8E0BB"/>
-  <path
-      android:pathData="M531.7,471.5m-115.4,0a115.4,115.4 0,1 0,230.8 0,115.4 115.4,0 1,0 -230.8,0Z"
-      android:fillColor="#FFF6DB"/>
-  <path
-      android:pathData="M647,481.5c-5.5,0 -10,-4.5 -10,-10 0,-58.1 -47.3,-105.4 -105.4,-105.4s-105.4,47.3 -105.4,105.4c0,5.5 -4.5,10 -10,10s-10,-4.5 -10,-10c0,-69.2 56.3,-125.4 125.4,-125.4s125.4,56.3 125.4,125.4c0,5.5 -4.5,10 -10,10z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M757.4,541.6c-1.1,0 -2.3,-0.2 -3.4,-0.6 -5.2,-1.9 -7.9,-7.6 -6,-12.8 2.9,-8.1 4.4,-16.6 4.4,-25.3 0,-40.8 -33.2,-73.9 -73.9,-73.9 -11.5,0 -22.4,2.5 -32.6,7.6 -4.9,2.4 -10.9,0.4 -13.4,-4.6 -2.4,-4.9 -0.4,-10.9 4.6,-13.4 13,-6.4 26.9,-9.6 41.5,-9.6 51.8,0 93.9,42.1 93.9,93.9 0,11 -1.9,21.8 -5.6,32.1a10,10 0,0 1,-9.4 6.6z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M352.1,355.8l-6.9,-15.6L286.7,356l1.8,16.5c1.5,13 -3.7,25.8 -13.5,34.4 -25.4,22.4 -40.8,54.6 -42,88.9 -0.4,11.9 0.9,24 4.1,36 17.5,65.7 85.4,105.2 151.1,88 61.7,-16.2 100.2,-76.1 91.2,-137.6 -0.7,-4.8 -1.7,-9.7 -3,-14.5 -12.7,-47.1 -51,-80.6 -95.8,-89.3 -12.6,-2.5 -23.4,-10.8 -28.6,-22.6z"
-      android:fillColor="#FFAC3B"/>
-  <path
-      android:pathData="M742.3,333.6c-4.6,0 -8.7,-3.2 -9.8,-7.9 -1.2,-5.4 2.2,-10.7 7.6,-11.9 0.5,-0.1 13.4,-3.3 13.7,-13.6 0.2,-8.7 -2.8,-11.8 -7.9,-16.9 -5.8,-5.8 -13.6,-13.6 -13.6,-29.5 0,-22.6 21.9,-32.1 33.4,-34 5.4,-0.9 10.6,2.8 11.5,8.3 0.9,5.4 -2.8,10.6 -8.2,11.5 -0.8,0.1 -16.7,3.1 -16.7,14.3 0,7.6 2.9,10.5 7.8,15.4 6,6 14.3,14.3 13.8,31.6 -0.6,20.8 -19.5,30.4 -29.4,32.6 -0.7,0.2 -1.4,0.2 -2.2,0.2zM666.5,333.6c-4.6,0 -8.7,-3.2 -9.8,-7.9 -1.2,-5.4 2.2,-10.7 7.6,-11.9 0.5,-0.1 13.4,-3.3 13.7,-13.6 0.2,-8.2 -2.9,-11.5 -8.1,-17 -5.7,-6 -13.4,-14.2 -13.4,-29.4 0,-22.6 21.9,-32.1 33.4,-34 5.4,-0.9 10.6,2.8 11.5,8.3 0.9,5.4 -2.8,10.6 -8.2,11.5 -0.8,0.1 -16.7,3.1 -16.7,14.3 0,7.2 3,10.4 8,15.7 5.9,6.3 14.1,14.9 13.6,31.3 -0.6,20.8 -19.5,30.4 -29.4,32.6 -0.7,0.2 -1.4,0.2 -2.2,0.2zM590.8,333.6c-4.6,0 -8.7,-3.2 -9.8,-7.9 -1.2,-5.4 2.2,-10.7 7.6,-11.9 0.5,-0.1 13.4,-3.3 13.7,-13.6 0.2,-8.2 -2.9,-11.5 -8.1,-17 -5.7,-6 -13.4,-14.2 -13.4,-29.4 0,-22.6 21.9,-32.1 33.4,-34 5.4,-0.9 10.6,2.8 11.5,8.3 0.9,5.4 -2.8,10.6 -8.2,11.5 -0.8,0.1 -16.7,3.1 -16.7,14.3 0,7.2 3,10.4 8,15.7 5.9,6.3 14.1,14.9 13.6,31.3 -0.6,20.8 -19.5,30.4 -29.4,32.6 -0.7,0.2 -1.4,0.2 -2.2,0.2z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M290,401.9s-31.1,52.8 -9.1,124.2h-42.7s-21,-81.5 51.8,-124.2z"
-      android:fillColor="#F29816"/>
-  <path
-      android:pathData="M342.5,341L326,283.3c-1.7,-6.1 0.8,-12.4 6,-15.9 11.3,-7.6 16.9,-21.9 12.6,-35.7 -4.8,-15.6 -21.1,-25 -37,-21.4 -7.6,1.7 -14,6 -18.3,11.7 -3.2,4.2 -8.9,5.7 -13.8,3.7a31.5,31.5 0,0 0,-21.7 -0.9c-15.5,4.9 -24.8,21.2 -21.2,37.1 3.2,14.1 15.4,23.7 29,24.5 6.2,0.4 11.6,4.6 13.2,10.6l15.4,58.1"
-      android:fillColor="#FFF6DB"/>
-  <path
-      android:pathData="M358,633.9c-59.2,0 -113.6,-39.7 -129.5,-99.4 -3.4,-12.7 -4.9,-25.8 -4.5,-38.9 1.2,-36.7 17.7,-71.7 45.4,-96.1 7.4,-6.6 11.2,-16.2 10.2,-25.8l-1.8,-16.5a10,10 0,0 1,7.3 -10.8l58.5,-15.8c4.8,-1.3 9.8,1.1 11.8,5.6l6.9,15.6c3.8,8.6 11.8,14.9 21.3,16.8 24.2,4.8 46.6,16.1 64.8,32.7 18.7,17.1 32.1,39.2 38.8,63.8 1.4,5.2 2.5,10.4 3.3,15.7 9.9,67.5 -32.5,131.4 -98.6,148.7 -11.3,3 -22.6,4.4 -33.8,4.4zM298.6,363.4l0.9,8c1.8,16.1 -4.5,32.2 -16.8,43 -23.5,20.7 -37.6,50.5 -38.6,81.7 -0.4,11.1 0.9,22.2 3.8,33.1 13.5,50.8 59.8,84.6 110.1,84.6 9.5,0 19.2,-1.2 28.8,-3.7 56.2,-14.7 92.3,-69.1 83.9,-126.5 -0.6,-4.5 -1.6,-9 -2.8,-13.4 -5.7,-20.9 -17,-39.7 -33,-54.3a114.2,114.2 0,0 0,-55.2 -27.9c-15.9,-3.1 -29.3,-13.7 -35.8,-28.3l-3.4,-7.7 -42,11.3z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M291.1,365.1c-4.4,0 -8.5,-3 -9.7,-7.4l-15.4,-58.1c-0.5,-1.8 -2.1,-3.1 -4.1,-3.2 -18.3,-1.1 -34,-14.4 -38.1,-32.3 -4.8,-20.9 7.5,-42.4 27.9,-48.9a41.7,41.7 0,0 1,28.6 1.2c0.7,0.3 1.5,0.1 2,-0.5 5.9,-7.8 14.5,-13.3 24.1,-15.4 20.9,-4.7 42.3,7.8 48.7,28.2 5.4,17.5 -1.4,36.8 -16.6,47 -1.7,1.1 -2.5,3.1 -2,4.9l16.5,57.7c1.5,5.3 -1.5,10.9 -6.9,12.4 -5.3,1.5 -10.9,-1.5 -12.4,-6.9l-16.5,-57.7c-2.9,-10.2 1.1,-21 10.1,-27 8,-5.4 11.5,-15.2 8.6,-24.4 -3.3,-10.6 -14.4,-17.1 -25.3,-14.6 -5.1,1.1 -9.4,3.9 -12.5,8 -6,7.8 -16.5,10.7 -25.6,6.9 -4.8,-2 -9.9,-2.2 -14.9,-0.6 -10.6,3.4 -17,14.5 -14.5,25.4 2.1,9.3 10.3,16.2 19.8,16.8 10.6,0.6 19.6,7.9 22.3,18l15.4,58.1c1.4,5.3 -1.8,10.8 -7.1,12.2 -0.9,0.2 -1.7,0.3 -2.6,0.3z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M155,534.4m38,0l607,0q38,0 38,38l0,3.7q0,38 -38,38l-607,0q-38,0 -38,-38l0,-3.7q0,-38 38,-38Z"
-      android:fillColor="#FEC773"/>
-  <path
-      android:pathData="M195.9,574.3c0,-22 17.9,-39.9 39.9,-39.9h-33.6c-22,0 -39.9,17.9 -39.9,39.9 0,22 17.9,39.9 39.9,39.9h33.6c-22,0 -39.9,-17.9 -39.9,-39.9z"
-      android:fillColor="#F29816"/>
-  <path
-      android:pathData="M194.9,614.2h603.3v25.7c0,87.8 -71.2,159 -159,159H353.9c-87.8,0 -159,-71.2 -159,-159v-25.7z"
-      android:fillColor="#FEC773"/>
-  <path
-      android:pathData="M239.6,623.8s-3.9,167.6 140.9,167.6c0,0 -179.4,23.6 -185.7,-167.6h44.8z"
-      android:fillColor="#F29816"/>
-  <path
-      android:pathData="M631.3,808.8H361.7c-97.5,0 -176.8,-79.3 -176.8,-176.8v-15.8c0,-5.5 4.5,-10 10,-10s10,4.5 10,10V632c0,86.5 70.3,156.8 156.8,156.8h269.6c86.5,0 156.8,-70.3 156.8,-156.8v-15.8c0,-5.5 4.5,-10 10,-10s10,4.5 10,10V632c0,97.5 -79.3,176.8 -176.8,176.8z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M798.1,624.2H399.5c-5.5,0 -10,-4.5 -10,-10s4.5,-10 10,-10h398.7c16.5,0 29.9,-13.4 29.9,-29.9s-13.4,-29.9 -29.9,-29.9H194.9c-16.5,0 -29.9,13.4 -29.9,29.9s13.4,29.9 29.9,29.9h84.6c5.5,0 10,4.5 10,10s-4.5,10 -10,10h-84.6c-27.5,0 -49.9,-22.4 -49.9,-49.9s22.4,-49.9 49.9,-49.9h603.3c27.5,0 49.9,22.4 49.9,49.9s-22.4,49.9 -49.9,49.9z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M875.6,686H626.8c-8.8,0 -15.6,7.7 -14.6,16.5 5.8,49.2 37,90.5 80.2,110.6 5.1,2.4 8.4,7.6 8.4,13.3 0,8.1 6.6,14.7 14.7,14.7h71.6c8.1,0 14.7,-6.6 14.7,-14.7 0,-5.7 3.2,-10.9 8.4,-13.3 43.2,-20 74.4,-61.4 80.2,-110.6 1,-8.8 -5.8,-16.5 -14.6,-16.5z"
-      android:fillColor="#FFF6DB"/>
-  <path
-      android:pathData="M653.2,692.5s0.3,72.3 49.1,117.9c0,0 -80.1,-17.1 -86.2,-119.7l37.1,1.9z"
-      android:fillColor="#F8E0BB"/>
-  <path
-      android:pathData="M787,851H715.4c-13.6,0 -24.7,-11.1 -24.7,-24.7 0,-1.8 -1,-3.5 -2.6,-4.2 -22.9,-10.6 -43,-27.1 -58,-47.5 -15.3,-20.8 -24.9,-45.3 -27.9,-70.9 -0.8,-7 1.4,-14.1 6.1,-19.4a24.7,24.7 0,0 1,18.4 -8.3h248.9c7,0 13.8,3 18.4,8.3 4.7,5.3 6.9,12.3 6.1,19.4 -3,25.6 -12.7,50.1 -27.9,70.9 -15,20.4 -35,36.9 -58,47.5 -1.6,0.7 -2.6,2.4 -2.6,4.2 0,13.6 -11.1,24.7 -24.7,24.7zM626.8,696c-1.8,0 -3,1 -3.5,1.6 -0.5,0.6 -1.4,1.9 -1.2,3.8 5.2,44.4 33.7,83.8 74.4,102.6 8.6,4 14.2,12.8 14.2,22.3 0,2.6 2.1,4.7 4.7,4.7h71.6c2.6,0 4.7,-2.1 4.7,-4.7 0,-9.6 5.6,-18.3 14.2,-22.3 40.7,-18.9 69.2,-58.2 74.4,-102.6 0.2,-1.9 -0.6,-3.2 -1.2,-3.8 -0.5,-0.6 -1.7,-1.6 -3.5,-1.6H626.8z"
-      android:fillColor="#333333"/>
-</vector>
--- a/app/src/main/res/drawable/ic_category_fruit_24dp.xml
+++ b/app/src/main/res/drawable/ic_category_fruit_24dp.xml
@ -1,39 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M190.9,606.9c84.3,64.9 189.9,103.6 304.6,103.6s221.4,-39.1 306,-104.6L506.3,228.8c-7.1,-9.1 -20.9,-9 -27.9,0.2L190.9,606.9z"
-      android:fillColor="#F9675A"/>
-  <path
-      android:pathData="M496.2,710.5c-114.7,0 -220.3,-38.7 -304.6,-103.6l-46.7,61.3c-10.3,13.5 -7.1,32.8 6.9,42.3 203.6,139.1 479,143.1 689,-4.8 13.9,-9.8 16.8,-29.1 6.3,-42.4l-45,-57.5C717.6,671.4 611.4,710.5 496.2,710.5z"
-      android:fillColor="#54B721"/>
-  <path
-      android:pathData="M497.4,771.1c129.1,0 248,-47.6 342.8,-113.3l-34.6,-39.5c-85.2,59.2 -192.1,94.4 -308.2,94.4S280.9,667.6 196,609.1l-39.4,50.1c94.5,64.8 212.6,111.9 340.8,111.9z"
-      android:fillColor="#D8E032"/>
-  <path
-      android:pathData="M477.3,363.6c-0.2,-9.1 5.9,-18.1 14.9,-24.1a6.3,6.3 0,0 1,7 -0c8.9,5.9 14.9,14.7 14.9,23.8 0,10.1 -8.1,18.3 -18.2,18.4s-18.4,-8 -18.5,-18zM477.3,613.4c-0.2,-9.1 5.9,-18.1 14.9,-24.1a6.3,6.3 0,0 1,7 -0c8.9,5.9 14.9,14.7 14.9,23.8 0,10.1 -8.1,18.3 -18.2,18.4 -10.1,0.1 -18.4,-8 -18.5,-18zM400.5,488c-0.2,-9.1 5.9,-18.1 14.9,-24.1a6.3,6.3 0,0 1,7 -0c8.9,5.9 14.9,14.7 14.9,23.8 0,10.1 -8.1,18.3 -18.2,18.4 -10.1,0.1 -18.4,-8 -18.5,-18zM556.5,488c-0.2,-9.1 5.9,-18.1 14.9,-24.1a6.3,6.3 0,0 1,7 -0c8.9,5.9 14.9,14.7 14.9,23.8 0,10.1 -8.1,18.3 -18.2,18.4 -10.1,0.1 -18.4,-8 -18.5,-18zM630.2,590.8c-0.2,-9.1 5.9,-18.1 14.9,-24.1a6.3,6.3 0,0 1,7 -0c8.9,5.9 14.9,14.7 14.9,23.8 0,10.1 -8.1,18.3 -18.2,18.4 -10.1,0.1 -18.4,-8 -18.5,-18zM325.6,590.8c-0.2,-9.1 5.9,-18.1 14.9,-24.1a6.3,6.3 0,0 1,7 -0c8.9,5.9 14.9,14.7 14.9,23.8 0,10.1 -8.1,18.3 -18.2,18.4 -10.1,0.1 -18.4,-8 -18.5,-18z"
-      android:fillColor="#000333"/>
-  <path
-      android:pathData="M487,236L261,577s-14,18 5,41c0,0 37.9,46.8 68,66 0,0 -95.1,-39.9 -138,-74.9L487,236z"
-      android:fillColor="#E2433B"/>
-  <path
-      android:pathData="M190.9,616.9c-2.1,0 -4.2,-0.7 -6.1,-2 -4.4,-3.3 -5.3,-9.6 -1.9,-14L469.2,224.7c5.5,-7.3 14,-11.5 23.1,-11.6 9.1,-0.1 17.6,4 23.3,11.2l293.8,375.4c3.4,4.3 2.6,10.6 -1.7,14 -4.3,3.4 -10.6,2.6 -14,-1.7L499.8,236.7c-1.8,-2.3 -4.5,-3.6 -7.4,-3.6 -2.9,0 -5.6,1.4 -7.3,3.7L198.8,613c-2,2.6 -4.9,3.9 -8,3.9z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M496.2,720.5c-66.4,0 -131.1,-12.6 -192.1,-37.5 -5.1,-2.1 -7.6,-7.9 -5.5,-13 2.1,-5.1 7.9,-7.6 13,-5.5 58.6,23.9 120.7,36 184.6,36 55.3,0 109.5,-9.1 161.2,-27.2 50,-17.4 96.6,-42.8 138.6,-75.4 4.3,-3.4 10.6,-2.6 14,1.7l45,57.5c3.4,4.3 2.6,10.6 -1.7,14 -4.3,3.4 -10.6,2.6 -14,-1.7l-38.9,-49.7c-41.6,31 -87.5,55.4 -136.4,72.4 -53.8,18.8 -110.3,28.3 -167.8,28.3z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M493.3,825.8c-57.7,0 -115,-8.1 -170.5,-24 -63.1,-18.1 -122.6,-46 -176.6,-83 -9.1,-6.2 -15,-15.6 -16.8,-26.4 -1.8,-10.8 0.9,-21.5 7.6,-30.3l46.7,-61.3c3.3,-4.4 9.6,-5.3 14,-1.9 4.4,3.3 5.3,9.6 1.9,14l-46.7,61.3c-3.3,4.3 -4.6,9.6 -3.7,14.9 0.9,5.4 3.8,10 8.3,13.1 52.3,35.7 109.7,62.7 170.8,80.3a597,597 0,0 0,185.5 22.9c5.5,-0.2 10.1,4.1 10.3,9.6 0.2,5.5 -4.1,10.1 -9.6,10.3 -7,0.2 -14.1,0.4 -21.1,0.4z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M549.6,771.4c77.6,77.7 203.5,77.7 281.2,0.1 70.5,-70.5 77,-180.8 19.5,-258.6 -9.4,-12.7 -27.9,-14.1 -39.1,-3l-261.6,261.5z"
-      android:fillColor="#FFB000"/>
-  <path
-      android:pathData="M672.3,681.1l-66.1,66.1c-1.9,1.9 -1.9,5.7 0,7.6 20.1,16.4 44.7,25.8 69.3,29 3.2,0.6 5.7,-1.9 5,-5v-94.5c0.6,-4.4 -5,-6.3 -8.2,-3.2zM742.6,623.4h94.5c2.5,0 5,-2.5 5,-5 -2.5,-25.2 -12,-48.5 -29,-69.3 -1.9,-1.9 -5,-2.5 -7.6,0l-66.1,66.1c-3.8,2.5 -1.9,8.2 3.2,8.2zM703.4,676v103c0,2.8 2.8,5.5 5.5,5.5 27.5,-2.8 52.9,-13 75.5,-31.6 2.1,-2.1 2.8,-5.5 0,-8.2l-72.1,-72.1c-2.8,-4.1 -8.9,-2.1 -8.9,3.4zM729.6,655.3l72.8,72.8c2.1,2.1 6.2,2.1 8.2,0 17.9,-22 28.1,-48.7 31.6,-75.5 0.7,-3.4 -2.1,-6.2 -5.5,-5.5l-103,-1.4c-5.5,0 -7.6,6.2 -4.1,9.6z"
-      android:fillColor="#ED7A1F"/>
-  <path
-      android:pathData="M690,839.6c-44.8,0 -89.8,-14.3 -127.5,-43.5a32.5,32.5 0,0 1,-12.5 -23.6,32.6 32.6,0 0,1 9.5,-25.1l222,-222c3.9,-3.9 10.2,-3.9 14.1,0s3.9,10.2 0,14.1l-222,222c-2.6,2.6 -3.9,6.1 -3.7,9.7 0.2,3.6 1.9,6.9 4.8,9.1 74.8,58 181.9,51.1 248.9,-15.9 33.5,-33.5 53.1,-78 55.2,-125.3 2,-47 -13.4,-92.8 -43.3,-128.8 -3.5,-4.3 -3,-10.6 1.3,-14.1 4.3,-3.5 10.6,-3 14.1,1.3 33.2,39.9 50.2,90.5 48,142.5 -2.3,52.3 -23.9,101.6 -61,138.6 -40.5,40.4 -94,61.1 -147.8,61.1z"
-      android:fillColor="#333333"/>
-</vector>
--- a/app/src/main/res/drawable/ic_category_gift_24dp.xml
+++ b/app/src/main/res/drawable/ic_category_gift_24dp.xml
@ -1,63 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M442.9,330.6L305.5,330.6c-9.5,0 -16.8,-2.2 -21.9,-6.6s-8.6,-10 -10.7,-16.8c-2,-6.8 -3,-14.4 -3,-22.9 0,-8.5 0.7,-16.5 2,-23.9 0.7,-7.5 2,-15.6 4.1,-24.4 2,-8.8 4.9,-16.3 8.6,-22.4 3.7,-6.1 8.6,-10.2 14.8,-12.2 6.1,-2 13.6,-0.3 22.4,5.1 10.2,6.1 21.7,12.7 34.6,19.8a1861.1,1861.1 0,0 1,37.7 21.4c12.2,7.1 23.6,13.6 34.1,19.3s18.5,10.4 23.9,13.7c6.8,4.8 11.9,10 15.3,15.8 3.4,5.8 4.8,11.2 4.1,16.3 -0.7,5.1 -3.4,9.3 -8.1,12.7 -4.8,3.4 -11.5,5.1 -20.4,5.1zM522.3,329.6h136.4c9.5,0 16.8,-2.2 21.9,-6.6s8.6,-10 10.7,-16.8c2,-6.8 3,-14.4 3,-22.9 0,-8.5 -0.3,-16.5 -1,-23.9 -1.4,-7.5 -2.9,-15.4 -4.6,-23.9 -1.7,-8.5 -4.4,-15.8 -8.1,-21.9 -3.7,-6.1 -8.6,-10.2 -14.8,-12.2 -6.1,-2 -13.6,-0.7 -22.4,4.1 -10.2,6.1 -21.7,12.7 -34.6,19.8 -12.9,7.1 -25.6,14.3 -38.2,21.4 -12.6,7.1 -24.1,13.6 -34.6,19.3 -10.5,5.8 -18.1,10.4 -22.9,13.7 -7.5,4.8 -12.9,10 -16.3,15.8 -3.4,5.8 -4.8,11.2 -4.1,16.3 0.7,5.1 3.4,9.3 8.1,12.7s11.9,5.1 21.4,5.1z"
-      android:fillColor="#FFD44A"/>
-  <path
-      android:pathData="M442.9,340.6L305.5,340.6c-11.9,0 -21.5,-3 -28.4,-9.1 -6.5,-5.7 -11.1,-12.9 -13.7,-21.5 -2.3,-7.7 -3.5,-16.4 -3.5,-25.8 0,-8.9 0.7,-17.4 2.1,-25.3 0.7,-7.8 2.2,-16.3 4.2,-25.3 2.3,-9.8 5.6,-18.4 9.9,-25.4 5,-8.1 11.8,-13.7 20.1,-16.5 9,-3 19.4,-1 30.8,6 10,6 21.5,12.6 34.2,19.6 12.9,7.1 25.6,14.4 37.9,21.5 4.8,2.8 6.4,8.9 3.6,13.7s-8.9,6.4 -13.7,3.6c-12.1,-7.1 -24.7,-14.2 -37.5,-21.3 -12.9,-7.1 -24.7,-13.9 -34.9,-20 -0,-0 -0.1,-0 -0.1,-0.1 -6,-3.7 -10.9,-5.1 -14,-4.1 -3.8,1.3 -6.9,3.9 -9.4,7.9 -3.2,5.2 -5.7,11.7 -7.4,19.4 -1.9,8.3 -3.2,16.1 -3.9,23.1 -0,0.3 -0.1,0.6 -0.1,0.9 -1.2,6.8 -1.9,14.3 -1.9,22.1s0.9,14.2 2.6,20c1.5,5 4,8.9 7.7,12.1 3.2,2.8 8.4,4.2 15.3,4.2h137.4c6.6,0 11.6,-1.1 14.5,-3.2 3.2,-2.3 3.8,-4.3 4,-5.9 0.4,-2.8 -0.6,-6.1 -2.8,-9.9 -2.8,-4.8 -1.2,-10.9 3.5,-13.7 4.8,-2.8 10.9,-1.2 13.7,3.5 4.5,7.7 6.3,15.3 5.4,22.7 -1,7.8 -5.3,14.6 -12.2,19.5 -6.5,4.6 -15.3,6.9 -26.2,6.9zM658.7,339.6L522.3,339.6c-11.7,0 -20.6,-2.3 -27.2,-6.9 -7,-5 -11.2,-11.7 -12.2,-19.5 -1,-7.3 0.8,-15 5.4,-22.7 4.2,-7.1 10.6,-13.4 19.3,-19 5.1,-3.6 12.9,-8.3 23.7,-14.2 10.4,-5.7 22,-12.2 34.5,-19.3 12.5,-7.1 25.4,-14.3 38.3,-21.4 12.7,-7 24.3,-13.6 34.3,-19.7 0.1,-0.1 0.3,-0.2 0.4,-0.2 11.3,-6.1 21.5,-7.7 30.3,-4.8 8.4,2.8 15.1,8.3 20.1,16.5 4.3,7.1 7.5,15.5 9.4,25.1a10,10 0,0 1,-7.8 11.8c-5.4,1.1 -10.7,-2.4 -11.8,-7.8 -1.5,-7.3 -3.8,-13.6 -6.9,-18.6 -2.5,-4.1 -5.6,-6.7 -9.4,-7.9 -3.3,-1.1 -8.2,0 -14.3,3.3 -10.2,6.1 -21.9,12.8 -34.7,19.9a3686,3686 0,0 0,-38.1 21.3c-12.6,7.1 -24.2,13.6 -34.7,19.4 -10.1,5.6 -17.5,10 -21.9,13.1 -0.2,0.1 -0.3,0.2 -0.4,0.3 -6.1,3.9 -10.5,8 -13,12.4 -2.2,3.8 -3.2,7.1 -2.8,9.9 0.2,1.5 0.9,3.6 4,5.9 2.1,1.5 6.4,3.2 15.6,3.2h136.4c7,0 12.1,-1.4 15.3,-4.2 3.7,-3.2 6.2,-7.1 7.7,-12.1 1.6,-5.3 7.2,-8.3 12.4,-6.7 5.3,1.6 8.3,7.2 6.7,12.4 -2.6,8.6 -7.2,15.8 -13.7,21.5 -6.9,6 -16.5,9.1 -28.4,9.1z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M149,291.4m29.8,0l606.6,0q29.8,0 29.8,29.8l0,95.2q0,29.8 -29.8,29.8l-606.6,0q-29.8,0 -29.8,-29.8l0,-95.2q0,-29.8 29.8,-29.8Z"
-      android:fillColor="#EA5959"/>
-  <path
-      android:pathData="M180.6,435.7h47.1c-15.5,0 -28,-12.5 -28,-28v-83.1c0,-15.5 12.5,-28 28,-28h-47.1c-15.5,0 -28,12.5 -28,28v83.1c0,15.5 12.5,28 28,28z"
-      android:fillColor="#CE4141"/>
-  <path
-      android:pathData="M195.7,494.4h572.8v275.5c0,17 -13.8,30.9 -30.9,30.9h-511.1c-17,0 -30.9,-13.8 -30.9,-30.9v-275.5z"
-      android:fillColor="#EA5959"/>
-  <path
-      android:pathData="M195.7,445.5h572.8v48.7H195.7z"
-      android:fillColor="#CE4141"/>
-  <path
-      android:pathData="M426.2,291.4h111.9v154.8H426.2z"
-      android:fillColor="#FFD44A"/>
-  <path
-      android:pathData="M426.2,494.3h111.9v267.8H426.2z"
-      android:fillColor="#FDBC2C"/>
-  <path
-      android:pathData="M426.2,444.1h111.9v50.2H426.2z"
-      android:fillColor="#F29816"/>
-  <path
-      android:pathData="M785.4,454.1H178.8c-22,0 -39.8,-17.9 -39.8,-39.8v-95.2c0,-22 17.9,-39.8 39.8,-39.8h606.6c22,0 39.8,17.9 39.8,39.8v95.2c0,22 -17.9,39.8 -39.8,39.8zM178.8,299.2c-10.9,0 -19.8,8.9 -19.8,19.8v95.2c0,10.9 8.9,19.8 19.8,19.8h606.6c10.9,0 19.8,-8.9 19.8,-19.8v-95.2c0,-10.9 -8.9,-19.8 -19.8,-19.8H178.8z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M207.8,723.3s-3.1,38.7 42.9,38.7h473.8s44.5,-4.2 44.5,-38.7v61.4S763.1,807 727.6,807H230.5s-31.8,-3.9 -31.8,-23.9l9,-59.8z"
-      android:fillColor="#CE4141"/>
-  <path
-      android:pathData="M425.9,762h111.9v38.7H425.9z"
-      android:fillColor="#F29816"/>
-  <path
-      android:pathData="M578,811.1H230.1c-23.3,0 -42.3,-19 -42.3,-42.3V530.9c0,-5.5 4.5,-10 10,-10s10,4.5 10,10v238c0,12.3 10,22.3 22.3,22.3H578c5.5,0 10,4.5 10,10s-4.5,10 -10,10zM770.7,544c-5.5,0 -10,-4.5 -10,-10v-88.9c0,-5.5 4.5,-10 10,-10s10,4.5 10,10V534c0,5.5 -4.5,10 -10,10z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M425.9,740.7c-5.5,0 -10,-4.5 -10,-10v-280.3c0,-5.5 4.5,-10 10,-10s10,4.5 10,10v280.3c0,5.5 -4.5,10 -10,10zM537.8,805.4c-5.5,0 -10,-4.5 -10,-10V534c0,-5.5 4.5,-10 10,-10s10,4.5 10,10v261.4c0,5.5 -4.5,10 -10,10zM537.8,445.7c-5.5,0 -10,-4.5 -10,-10v-99.4c0,-5.5 4.5,-10 10,-10s10,4.5 10,10v99.4c0,5.5 -4.5,10 -10,10zM425.9,408c-5.5,0 -10,-4.5 -10,-10v-99.4c0,-5.5 4.5,-10 10,-10s10,4.5 10,10v99.4c0,5.5 -4.5,10 -10,10z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M755,720m-140.7,0a140.7,140.7 0,1 0,281.4 0,140.7 140.7,0 1,0 -281.4,0Z"
-      android:fillColor="#FFD44A"/>
-  <path
-      android:pathData="M728,587s-71,34 -71,143c0,0 1.9,118.5 123.9,118.5 0,0 -140.4,52.5 -166.6,-128.5 0,0 -0.3,-123 113.7,-133z"
-      android:fillColor="#FDBC2C"/>
-  <path
-      android:pathData="M755,870.6c-38.6,0 -77.2,-14.7 -106.6,-44.1 -28.5,-28.5 -44.1,-66.3 -44.1,-106.6s15.7,-78.1 44.1,-106.6c58.8,-58.8 154.4,-58.8 213.1,0 20.3,20.3 34.3,45.7 40.5,73.5 6.1,27.1 4.6,55.2 -4.3,81.5a10,10 0,0 1,-12.7 6.3,10 10,0 0,1 -6.3,-12.7c7.7,-22.8 9,-47.2 3.7,-70.7 -5.4,-24.1 -17.5,-46.2 -35.1,-63.7 -51,-51 -133.9,-51 -184.9,0 -24.7,24.7 -38.3,57.5 -38.3,92.4s13.6,67.7 38.3,92.4c51,51 133.9,51 184.9,0 3.9,-3.9 10.2,-3.9 14.1,0s3.9,10.2 0,14.1c-29.4,29.4 -68,44.1 -106.6,44.1z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M756,644l23.8,48.2 53.2,7.7 -38.5,37.5 9.1,53L756,765.4l-47.6,25 9.1,-53 -38.5,-37.5 53.2,-7.7L756,644z"
-      android:fillColor="#FFEBA4"/>
-  <path
-      android:pathData="M803.6,800.4c-1.6,0 -3.2,-0.4 -4.7,-1.1L756,776.7l-42.9,22.6a10,10 0,0 1,-10.5 -0.8,10 10,0 0,1 -4,-9.8l8.2,-47.8 -34.7,-33.8c-2.7,-2.7 -3.7,-6.6 -2.5,-10.3s4.3,-6.3 8.1,-6.8l48,-7 21.5,-43.5c1.7,-3.4 5.2,-5.6 9,-5.6s7.3,2.2 9,5.6l23.8,48.2c2.4,4.9 0.4,10.9 -4.5,13.4 -4.9,2.4 -10.9,0.4 -13.4,-4.5L756,666.6l-14.8,30c-1.5,3 -4.3,5 -7.5,5.5l-33.1,4.8 24,23.4c2.4,2.3 3.4,5.6 2.9,8.9l-5.7,33 29.6,-15.6c2.9,-1.5 6.4,-1.5 9.3,0l29.6,15.6 -5.7,-33c-0.6,-3.2 0.5,-6.6 2.9,-8.9l38.5,-37.5c4,-3.8 10.3,-3.8 14.1,0.2 3.8,4 3.8,10.3 -0.2,14.1l-34.7,33.8 8.2,47.8c0.6,3.8 -0.9,7.5 -4,9.8a10,10 0,0 1,-5.9 1.9z"
-      android:fillColor="#333333"/>
-</vector>
--- a/app/src/main/res/drawable/ic_category_hotel_24dp.xml
+++ b/app/src/main/res/drawable/ic_category_hotel_24dp.xml
@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M455.8,189.3h243.1c38.3,0 69.5,31.1 69.5,69.5v485.5H386.4V258.8c0,-38.3 31.1,-69.5 69.5,-69.5z"
-      android:fillColor="#54D533"/>
-  <path
-      android:pathData="M768.4,548c-5.5,0 -10,-4.5 -10,-10V257.6c0,-31.2 -25.4,-56.5 -56.5,-56.5H452.9c-31.2,0 -56.5,25.4 -56.5,56.5v105.6c0,5.5 -4.5,10 -10,10s-10,-4.5 -10,-10V257.6c0,-42.2 34.3,-76.5 76.5,-76.5H701.9c42.2,0 76.5,34.3 76.5,76.5V538c0,5.5 -4.5,10 -10,10z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M489.4,712.7H210.2V523.1c0,-19.4 12,-36.8 30.1,-43.7l185.6,-71c30.6,-11.7 63.5,10.9 63.5,43.7v260.5z"
-      android:fillColor="#44A00E"/>
-  <path
-      android:pathData="M146.8,714.6m58.9,0l564.9,0q58.9,0 58.9,58.9l0,-0q0,58.9 -58.9,58.9l-564.9,0q-58.9,0 -58.9,-58.9l0,0q0,-58.9 58.9,-58.9Z"
-      android:fillColor="#54D533"/>
-  <path
-      android:pathData="M771.8,832.3H206.8c-32.5,0 -58.9,-26.4 -58.9,-58.9v0.5h682.7v-0.5c0,32.5 -26.4,58.9 -58.9,58.9z"
-      android:fillColor="#44A00E"/>
-  <path
-      android:pathData="M450.5,256.9m35.4,0l185.8,0q35.4,0 35.4,35.4l0,0q0,35.4 -35.4,35.4l-185.8,0q-35.4,0 -35.4,-35.4l0,0q0,-35.4 35.4,-35.4Z"
-      android:fillColor="#D8F9CC"/>
-  <path
-      android:pathData="M547.2,373.2m35.4,0l89,0q35.4,0 35.4,35.4l0,0q0,35.4 -35.4,35.4l-89,0q-35.4,0 -35.4,-35.4l0,0q0,-35.4 35.4,-35.4Z"
-      android:fillColor="#D8F9CC"/>
-  <path
-      android:pathData="M547.2,489.6m35.4,0l89,0q35.4,0 35.4,35.4l0,0q0,35.4 -35.4,35.4l-89,0q-35.4,0 -35.4,-35.4l0,0q0,-35.4 35.4,-35.4Z"
-      android:fillColor="#D8F9CC"/>
-  <path
-      android:pathData="M317.8,583.4h64.4c15.5,0 28.1,12.6 28.1,28.1v92.5H289.6v-92.5c0,-15.5 12.6,-28.1 28.1,-28.1zM249.4,482.9v225.4l-33.5,-0.4V519.1s-1.9,-31.5 33.5,-36.3z"
-      android:fillColor="#377F08"/>
-  <path
-      android:pathData="M210.2,722.7c-5.5,0 -10,-4.5 -10,-10V523.1c0,-23.4 14.7,-44.7 36.5,-53l185.6,-71a56.8,56.8 0,0 1,52.5 6.3,56.8 56.8,0 0,1 24.6,46.8v206c0,5.5 -4.5,10 -10,10s-10,-4.5 -10,-10V452.1c0,-12.3 -5.8,-23.3 -15.9,-30.3 -10.1,-7 -22.5,-8.4 -34,-4.1l-185.6,71c-14.1,5.4 -23.6,19.2 -23.6,34.3v189.6c0,5.5 -4.5,10 -10,10z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M592,842.3H205.6c-38,0 -68.9,-30.9 -68.9,-68.9s30.9,-68.9 68.9,-68.9h564.9c5.5,0 10,4.5 10,10s-4.5,10 -10,10H205.6c-27,0 -48.9,21.9 -48.9,48.9s21.9,48.9 48.9,48.9H592c5.5,0 10,4.5 10,10s-4.5,10 -10,10z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M749.3,728m-134.7,0a134.7,134.7 0,1 0,269.5 0,134.7 134.7,0 1,0 -269.5,0Z"
-      android:fillColor="#F76C69"/>
-  <path
-      android:pathData="M723.4,600.6s-68,32.6 -68,136.9c0,0 1.8,113.4 118.7,113.4 0,0 -134.4,50.3 -159.6,-123 0,0 -0.3,-117.8 108.9,-127.3z"
-      android:fillColor="#E54E4E"/>
-  <path
-      android:pathData="M749.3,872.7c-38.7,0 -75,-15.1 -102.3,-42.4 -27.3,-27.3 -42.4,-63.7 -42.4,-102.3s15.1,-75 42.4,-102.3c56.4,-56.4 148.3,-56.4 204.7,0C879,653 894,689.3 894,728s-15.1,75 -42.4,102.3c-27.3,27.3 -63.7,42.4 -102.3,42.4zM749.3,603.3c-31.9,0 -63.9,12.2 -88.2,36.5 -23.6,23.6 -36.5,54.9 -36.5,88.2s13,64.6 36.5,88.2c23.6,23.6 54.9,36.5 88.2,36.5s64.6,-13 88.2,-36.5c23.6,-23.6 36.5,-54.9 36.5,-88.2s-13,-64.6 -36.5,-88.2c-24.3,-24.3 -56.3,-36.5 -88.2,-36.5z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M771.1,736.6c0.1,-0.7 0.1,-1.4 0.1,-2v-51.8c0,-12.1 -9.8,-22 -22,-22s-22,9.8 -22,22v51.8c0,0.9 0.1,1.8 0.2,2.7 -8.3,6.6 -13.7,16.8 -13.7,28.2 0,19.8 16.1,35.9 35.9,35.9s35.9,-16.1 35.9,-35.9c0,-11.8 -5.7,-22.3 -14.5,-28.8z"
-      android:fillColor="#FFEBA4"/>
-  <path
-      android:pathData="M749.7,811c-25.3,0 -45.9,-20.6 -45.9,-45.9 0,-12.4 4.9,-23.9 13.5,-32.5v-50.1c0,-17.6 14.3,-32 32,-32s32,14.3 32,32v49.3c9.1,8.6 14.4,20.7 14.4,33.3 0,25.3 -20.6,45.9 -45.9,45.9zM749.3,670.4c-6.6,0 -12,5.4 -12,12v51.8c0,0.5 0,0.9 0.1,1.5 0.4,3.5 -1,6.9 -3.7,9 -6.3,5 -9.9,12.4 -9.9,20.3 0,14.3 11.6,25.9 25.9,25.9s25.9,-11.6 25.9,-25.9c0,-8.3 -3.8,-15.8 -10.4,-20.8a10,10 0,0 1,-4 -8.9c0,-0.4 0.1,-0.8 0.1,-1.1v-51.8c0,-6.6 -5.4,-12 -12,-12z"
-      android:fillColor="#333333"/>
-</vector>
--- a/app/src/main/res/drawable/ic_category_medicine_24dp.xml
+++ b/app/src/main/res/drawable/ic_category_medicine_24dp.xml
@ -1,57 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M718.7,394.5h-68.5V290.2c0,-10.6 -8.6,-19.2 -19.2,-19.2H368.9c-10.6,0 -19.2,8.6 -19.2,19.2v104.3H281.2V290.2c0,-48.3 39.3,-87.7 87.7,-87.7h262.2c48.3,0 87.7,39.3 87.7,87.7v104.3z"
-      android:fillColor="#CE4141"/>
-  <path
-      android:pathData="M219.6,421.9m49.2,0l462.2,0q49.2,0 49.2,49.2l0,301.3q0,49.2 -49.2,49.2l-462.2,0q-49.2,0 -49.2,-49.2l0,-301.3q0,-49.2 49.2,-49.2Z"
-      android:fillColor="#EA5959"/>
-  <path
-      android:pathData="M175.3,334.1m49.2,0l549.9,0q49.2,0 49.2,49.2l0,42.9q0,49.2 -49.2,49.2l-549.9,0q-49.2,0 -49.2,-49.2l0,-42.9q0,-49.2 49.2,-49.2Z"
-      android:fillColor="#FEDC5A"/>
-  <path
-      android:pathData="M175.3,430.4h648.4c0,24.8 -20.2,45 -45,45H220.3c-24.8,0 -45,-20.2 -45,-45z"
-      android:fillColor="#F29816"/>
-  <path
-      android:pathData="M254,469.8v284.8s-1.6,36.9 27.2,36.9h368.6v30.2H267.8s-46.7,3.9 -46.7,-64.6V470l33,-0.2z"
-      android:fillColor="#CE4141"/>
-  <path
-      android:pathData="M732.1,831.6H267.8c-32.1,0 -58.2,-26.1 -58.2,-58.2v-221.3c0,-5.5 4.5,-10 10,-10s10,4.5 10,10v221.3c0,21 17.1,38.2 38.2,38.2h464.4c21,0 38.2,-17.1 38.2,-38.2V475.3c0,-5.2 4,-9.5 9.1,-10 19.5,-1.7 34.8,-18.4 34.8,-38v-45.1c0,-21 -17.1,-38.2 -38.2,-38.2H223.9c-21,0 -38.2,17.1 -38.2,38.2v45.1c0,19.5 15.1,36 34.3,38h491.3c5.5,0 10,4.5 10,10s-4.5,10 -10,10H219.6c-0.3,0 -0.6,-0 -0.9,-0 -14.4,-1.3 -27.8,-7.9 -37.6,-18.5 -9.9,-10.8 -15.4,-24.7 -15.4,-39.4v-45.1c0,-32.1 26.1,-58.2 58.2,-58.2h552.1c32.1,0 58.2,26.1 58.2,58.2v45.1c0,14.6 -5.5,28.6 -15.4,39.4 -7.7,8.4 -17.6,14.3 -28.5,17v289.7c0,32.1 -26.1,58.2 -58.2,58.2z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M864.9,645.2c28.2,28.2 28.2,74.1 0,102.3l-51.2,51.2 -102.4,-102.4 51.2,-51.2c28.2,-28.2 74.1,-28.2 102.3,0z"
-      android:fillColor="#B1DCFD"/>
-  <path
-      android:pathData="M660.2,849.9c-28.2,-28.2 -28.2,-74.1 0,-102.3l51.2,-51.2 102.4,102.4 -51.2,51.2c-28.2,28.2 -74.1,28.2 -102.3,0z"
-      android:fillColor="#45A6FC"/>
-  <path
-      android:pathData="M799,781.5l-53.8,47.9s-23.5,19.6 -47.9,10.8c0,0 -44.6,-14.2 -53.6,-48.2 0,0 -16.3,54.2 56.8,78.6 0,0 37.9,5.8 71,-29.5l42.3,-43 -14.7,-16.6z"
-      android:fillColor="#389BE5"/>
-  <path
-      android:pathData="M817.9,790l73,-72.2 3.1,-21 -94.9,84.8 18.8,8.4z"
-      android:fillColor="#89CBF4"/>
-  <path
-      android:pathData="M813.7,808.8c-2.6,0 -5.1,-1 -7.1,-2.9l-66.7,-66.7c-3.9,-3.9 -3.9,-10.2 0,-14.1s10.2,-3.9 14.1,0l59.6,59.6 44.1,-44.1c24.3,-24.3 24.3,-63.9 0,-88.2 -24.3,-24.3 -63.9,-24.3 -88.2,0l-51.2,51.2c-3.9,3.9 -10.2,3.9 -14.1,0 -3.9,-3.9 -3.9,-10.2 0,-14.1l51.2,-51.2c32.1,-32.1 84.4,-32.1 116.5,0 32.1,32.1 32.1,84.4 0,116.5l-51.2,51.2a10,10 0,0 1,-7.1 2.9z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M711.4,881.1c-21.1,0 -42.2,-8 -58.3,-24.1 -15.6,-15.6 -24.1,-36.2 -24.1,-58.3s8.6,-42.7 24.1,-58.3l51.2,-51.2c3.9,-3.9 10.2,-3.9 14.1,0 3.9,3.9 3.9,10.2 0,14.1l-51.2,51.2c-11.8,11.8 -18.3,27.4 -18.3,44.1s6.5,32.3 18.3,44.1c24.3,24.3 63.9,24.3 88.2,0l51.2,-51.2c3.9,-3.9 10.2,-3.9 14.1,0s3.9,10.2 0,14.1l-51.2,51.2c-16.1,16.1 -37.2,24.1 -58.3,24.1z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M499.8,648.5m-114.8,0a114.8,114.8 0,1 0,229.5 0,114.8 114.8,0 1,0 -229.5,0Z"
-      android:fillColor="#FDFBF7"/>
-  <path
-      android:pathData="M520.3,578.3m0,12.3l0,116q0,12.3 -12.3,12.3l-16.6,0q-12.3,0 -12.3,-12.3l0,-116q0,-12.3 12.3,-12.3l16.6,0q12.3,0 12.3,12.3Z"
-      android:fillColor="#EA5959"/>
-  <path
-      android:pathData="M570,669.1m-12.3,0l-116,0q-12.3,0 -12.3,-12.3l0,-16.6q0,-12.3 12.3,-12.3l116,0q12.3,0 12.3,12.3l0,16.6q0,12.3 -12.3,12.3Z"
-      android:fillColor="#EA5959"/>
-  <path
-      android:pathData="M649.8,339.7c-5.5,0 -10,-4.5 -10,-10v-39.8c0,-5.1 -4.1,-9.2 -9.2,-9.2H368.4c-5.1,0 -9.2,4.1 -9.2,9.2 0,5.5 -4.5,10 -10,10s-10,-4.5 -10,-10c0,-16.1 13.1,-29.2 29.2,-29.2h262.2c16.1,0 29.2,13.1 29.2,29.2v39.8c0,5.5 -4.5,10 -10,10z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M280.8,339.7c-5.5,0 -10,-4.5 -10,-10v-39.8c0,-53.8 43.8,-97.7 97.7,-97.7h262.2c53.8,0 97.7,43.8 97.7,97.7 0,5.5 -4.5,10 -10,10s-10,-4.5 -10,-10c0,-42.8 -34.8,-77.7 -77.7,-77.7H368.4c-42.8,0 -77.7,34.8 -77.7,77.7v39.8c0,5.5 -4.5,10 -10,10zM499.8,773.2c-32,0 -63.9,-12.2 -88.2,-36.5 -48.7,-48.7 -48.7,-127.8 0,-176.4 26.8,-26.8 63.9,-39.9 101.7,-35.8 5.5,0.6 9.5,5.5 8.9,11 -0.6,5.5 -5.5,9.5 -11,8.9 -31.7,-3.4 -62.8,7.5 -85.4,30.1 -40.8,40.8 -40.8,107.3 0,148.2 20.4,20.4 47.3,30.6 74.1,30.6 26.8,0 53.7,-10.2 74.1,-30.6 19.8,-19.8 30.7,-46.1 30.7,-74.1s-10.9,-54.3 -30.7,-74.1c-3.9,-3.9 -3.9,-10.2 0,-14.1 3.9,-3.9 10.2,-3.9 14.1,0 23.6,23.6 36.5,54.9 36.5,88.2s-13,64.7 -36.5,88.2c-24.3,24.3 -56.3,36.5 -88.2,36.5z"
-      android:fillColor="#333333"/>
-</vector>
--- a/app/src/main/res/drawable/ic_category_membership_24dp.xml
+++ b/app/src/main/res/drawable/ic_category_membership_24dp.xml
@ -1,51 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M181,418l305.1,360.2c12.4,14.7 35.1,14.7 47.5,0L838.7,418H181z"
-      android:fillColor="#FFD44A"/>
-  <path
-      android:pathData="M495.7,789.6L181,418h213.2l109.4,367.3c1.4,4.8 -4.7,8.1 -7.9,4.3z"
-      android:fillColor="#FFAC3B"/>
-  <path
-      android:pathData="M523.3,790.6L838.8,418H625.6L515.9,786.6c-1.3,4.5 4.4,7.6 7.4,4z"
-      android:fillColor="#FC981C"/>
-  <path
-      android:pathData="M394.2,418.2H625.6L509.8,240.8l-115.6,177.4z"
-      android:fillColor="#FFEBA4"/>
-  <path
-      android:pathData="M394.2,418.2l115.6,-177.4H306.6l87.6,177.4z"
-      android:fillColor="#FBE87D"/>
-  <path
-      android:pathData="M625.6,418.2l87.5,-177.4H509.8L625.6,418.2z"
-      android:fillColor="#FDCD6E"/>
-  <path
-      android:pathData="M625.6,418.2h213.1L713.1,240.8 625.6,418.2z"
-      android:fillColor="#FDBC2C"/>
-  <path
-      android:pathData="M394.2,418.2H181l125.6,-177.4 87.6,177.4z"
-      android:fillColor="#FEDB55"/>
-  <path
-      android:pathData="M509.8,801a38.5,38.5 0,0 1,-29.4 -13.6L187.7,441.8c-11.4,-13.4 -12.2,-32.8 -2,-47.2l104.3,-147.3c7.2,-10.2 19,-16.3 31.5,-16.3h376.9c12.5,0 24.3,6.1 31.5,16.3l104.3,147.3c10.2,14.4 9.3,33.8 -2,47.2l-51,60.2c-3.6,4.2 -9.9,4.7 -14.1,1.2s-4.7,-9.9 -1.2,-14.1l51,-60.2a18.5,18.5 0,0 0,1 -22.7L713.5,258.8c-3.5,-4.9 -9.1,-7.8 -15.1,-7.8H321.4c-6,0 -11.7,2.9 -15.1,7.8L201.9,406.1a18.6,18.6 0,0 0,1 22.7l292.8,345.6c3.5,4.2 8.7,6.6 14.1,6.6 5.5,0 10.6,-2.4 14.1,-6.6l59.8,-70.6c3.6,-4.2 9.9,-4.7 14.1,-1.2s4.7,9.9 1.2,14.1l-59.8,70.6a38.5,38.5 0,0 1,-29.4 13.6z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M472.2,698.2c-4.3,0 -8.3,-2.8 -9.6,-7.2l-64,-220c-1.5,-5.3 1.5,-10.9 6.8,-12.4 5.3,-1.5 10.9,1.5 12.4,6.8l64,220c1.5,5.3 -1.5,10.9 -6.8,12.4 -0.9,0.3 -1.9,0.4 -2.8,0.4zM545.2,698.2c-0.9,0 -1.9,-0.1 -2.8,-0.4 -5.3,-1.5 -8.4,-7.1 -6.8,-12.4l64,-220c1.5,-5.3 7.1,-8.4 12.4,-6.8 5.3,1.5 8.4,7.1 6.8,12.4l-64,220c-1.3,4.4 -5.3,7.2 -9.6,7.2z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M612.8,572.8m29.8,-5.1l130.7,-22.5q29.8,-5.1 34.9,24.6l29.6,172.1q5.1,29.8 -24.6,34.9l-130.7,22.5q-29.8,5.1 -34.9,-24.6l-29.6,-172.1q-5.1,-29.8 24.6,-34.9Z"
-      android:fillColor="#EA5959"/>
-  <path
-      android:pathData="M614.8,616.4c5,29.1 54.1,45 109.6,35.4 55.5,-9.6 96.4,-40.9 91.4,-70l-2.5,-14.8c-2.5,-14.3 -16.1,-23.9 -30.4,-21.4l-149.2,25.7c-14.3,2.5 -23.9,16.1 -21.4,30.4l2.5,14.8z"
-      android:fillColor="#CE4141"/>
-  <path
-      android:pathData="M677.3,809.7c-8.2,0 -16.2,-2.5 -23.1,-7.4 -8.8,-6.2 -14.6,-15.4 -16.4,-26l-29.6,-172.1c-1.8,-10.6 0.6,-21.2 6.8,-30 6.2,-8.8 15.4,-14.6 26,-16.4L771.6,535.3c10.6,-1.8 21.2,0.6 30,6.8 8.8,6.2 14.6,15.4 16.4,26l14.6,84.8c0.9,5.4 -2.7,10.6 -8.2,11.6 -5.4,0.9 -10.6,-2.7 -11.6,-8.2l-14.6,-84.8c-0.9,-5.3 -3.8,-10 -8.3,-13.1A20.1,20.1 0,0 0,775 555l-130.7,22.5c-5.3,0.9 -10,3.8 -13.1,8.3a20.1,20.1 0,0 0,-3.4 15.1l29.6,172.1c0.9,5.3 3.8,10 8.3,13.1 4.4,3.1 9.8,4.3 15.1,3.4l130.7,-22.5c11,-1.9 18.4,-12.4 16.5,-23.3l-5.2,-30.1c-0.9,-5.4 2.7,-10.6 8.2,-11.6 5.4,-0.9 10.6,2.7 11.6,8.2l5.2,30.1c3.8,21.8 -10.9,42.7 -32.8,46.4l-130.7,22.5c-2.3,0.4 -4.6,0.6 -6.9,0.6z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M723.2,647.7m-40.5,0a40.5,40.5 0,1 0,81 0,40.5 40.5,0 1,0 -81,0Z"
-      android:fillColor="#FFD44A"/>
-  <path
-      android:pathData="M375.2,389.7c-3.7,0 -7.2,-2 -9,-5.6l-48.1,-97.3c-2.5,-4.9 -0.4,-10.9 4.5,-13.4 4.9,-2.5 10.9,-0.4 13.4,4.5l48.1,97.3c2.5,4.9 0.4,10.9 -4.5,13.4 -1.4,0.7 -2.9,1 -4.4,1zM645.1,389.7c-1.5,0 -3,-0.3 -4.4,-1 -4.9,-2.5 -7,-8.4 -4.5,-13.4l48.1,-97.3c2.5,-4.9 8.4,-7 13.4,-4.5 4.9,2.5 7,8.4 4.5,13.4l-48.1,97.3c-1.7,3.5 -5.3,5.6 -9,5.6zM419.3,389.7c-1.9,0 -3.8,-0.5 -5.4,-1.6 -4.6,-3 -5.9,-9.2 -2.9,-13.8l63.4,-97.3c3,-4.6 9.2,-5.9 13.8,-2.9s5.9,9.2 2.9,13.8l-63.4,97.3a10,10 0,0 1,-8.4 4.5zM599.8,389.7a10,10 0,0 1,-8.4 -4.5l-63.4,-97.3c-3,-4.6 -1.7,-10.8 2.9,-13.8 4.6,-3 10.8,-1.7 13.8,2.9l63.4,97.3c3,4.6 1.7,10.8 -2.9,13.8a9.9,9.9 0,0 1,-5.4 1.6z"
-      android:fillColor="#333333"/>
-</vector>
--- a/app/src/main/res/drawable/ic_category_more_24dp.xml
+++ b/app/src/main/res/drawable/ic_category_more_24dp.xml
@ -1,39 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M861.7,510.2c0,275.1 -72.1,348.7 -347.2,348.7s-345.7,-73.6 -345.7,-348.7S239.3,163 514.5,163s347.2,72.1 347.2,347.2z"
-      android:fillColor="#D4EFFF"/>
-  <path
-      android:pathData="M514.5,869c-73.3,0 -128.1,-5.1 -172.5,-16.1 -47.5,-11.7 -83.7,-30.7 -110.7,-58.1 -26.9,-27.3 -45.5,-63.8 -57,-111.7 -10.6,-44.5 -15.6,-99.4 -15.6,-172.9s5,-128.3 15.6,-172.6c11.5,-47.7 30.1,-84.1 57,-111.2 26.9,-27.1 63.1,-45.9 110.7,-57.5 44.3,-10.8 99.1,-15.9 172.4,-15.9s128.2,5 172.7,15.9c47.7,11.6 84.1,30.4 111.2,57.5 27.1,27.1 45.9,63.5 57.5,111.2 10.8,44.4 15.9,99.3 15.9,172.7 0,5.5 -4.5,10 -10,10s-10,-4.5 -10,-10c0,-71.7 -4.9,-125.1 -15.3,-167.9 -10.7,-44 -27.8,-77.3 -52.2,-101.8 -24.4,-24.4 -57.7,-41.5 -101.8,-52.2 -42.8,-10.4 -96.2,-15.3 -167.9,-15.3s-125,4.8 -167.7,15.3c-43.9,10.7 -77,27.8 -101.2,52.2 -24.2,24.4 -41.2,57.7 -51.7,101.8 -10.3,42.8 -15.1,96.1 -15.1,168s4.8,125.3 15.1,168.2c10.6,44.2 27.5,77.7 51.8,102.3 24.3,24.6 57.4,41.9 101.2,52.7 42.8,10.6 96.1,15.5 167.7,15.5 60.9,0 109.5,-3.7 148.8,-11.3 40.9,-7.9 73.1,-20.4 98.3,-38 49.5,-34.6 75.9,-92.2 85.6,-186.8 0.6,-5.5 5.5,-9.5 11,-8.9 5.5,0.6 9.5,5.5 8.9,11 -10.3,100.9 -39.3,162.9 -94.1,201.1 -27.5,19.2 -62.2,32.7 -105.9,41.2 -40.5,7.9 -90.4,11.7 -152.6,11.7z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M334.8,264.1h88.1c36.3,0 65.8,29.5 65.8,65.8v130.6c0,12.9 -10.5,23.4 -23.4,23.4H334.8c-36.3,0 -65.8,-29.5 -65.8,-65.8v-88.1c0,-36.3 29.5,-65.8 65.8,-65.8z"
-      android:fillColor="#35A5F6"/>
-  <path
-      android:pathData="M693.3,483.9H562.7c-12.9,0 -23.4,-10.5 -23.4,-23.4V329.9c0,-36.3 29.5,-65.8 65.8,-65.8h88.1c36.3,0 65.8,29.5 65.8,65.8v88.1c0,36.3 -29.5,65.8 -65.8,65.8z"
-      android:fillColor="#FFAC3B"/>
-  <path
-      android:pathData="M334.8,532.3h130.6c12.9,0 23.4,10.5 23.4,23.4v130.6c0,36.3 -29.5,65.8 -65.8,65.8h-88.1c-36.3,0 -65.8,-29.5 -65.8,-65.8v-88.1c0,-36.3 29.5,-65.8 65.8,-65.8z"
-      android:fillColor="#54D533"/>
-  <path
-      android:pathData="M693.3,752.1h-88.1c-36.3,0 -65.8,-29.5 -65.8,-65.8V555.7c0,-12.9 10.5,-23.4 23.4,-23.4h130.6c36.3,0 65.8,29.5 65.8,65.8v88.1c0,36.3 -29.5,65.8 -65.8,65.8z"
-      android:fillColor="#EA5959"/>
-  <path
-      android:pathData="M309,279v134.9S309,444 338,444h146v34.6H316.6S269,472.1 269,425.5s0.8,-100.3 0.8,-100.3S274,279 309,279z"
-      android:fillColor="#0080E0"/>
-  <path
-      android:pathData="M309,541v144.9S309,716 338,716h146c0,19.1 -15.5,34.6 -34.6,34.6H316.6s-47.6,-6.5 -47.6,-53.1 0.8,-100.3 0.8,-100.3S274,541 309,541z"
-      android:fillColor="#54B721"/>
-  <path
-      android:pathData="M579,280v134.9S579,445 608,445h146c0,19.1 -15.5,34.6 -34.6,34.6H568s-29,10.4 -29,-53.1c0,-46.5 0.8,-100.3 0.8,-100.3S544,280 579,280z"
-      android:fillColor="#FC981C"/>
-  <path
-      android:pathData="M578,529v156.9S578,716 607,716h146c0,19.1 -15.5,34.6 -34.6,34.6H597s-59,-9.6 -59,-53.1c0,-46.5 0.8,-122.3 0.8,-122.3S543,529 578,529z"
-      android:fillColor="#CE4141"/>
-  <path
-      android:pathData="M466.1,493.9H332.7c-40.7,0 -73.8,-33.1 -73.8,-73.8v-23c0,-5.5 4.5,-10 10,-10s10,4.5 10,10v23c0,29.6 24.1,53.8 53.8,53.8H466.1c7,0 12.6,-5.7 12.6,-12.6V327.9c0,-29.6 -24.1,-53.8 -53.8,-53.8h-92.3c-29.6,0 -53.8,24.1 -53.8,53.8v21.1c0,5.5 -4.5,10 -10,10s-10,-4.5 -10,-10v-21.1c0,-40.7 33.1,-73.8 73.8,-73.8h92.3c40.7,0 73.8,33.1 73.8,73.8v133.4c0,18 -14.6,32.6 -32.6,32.6zM695.4,493.9H562c-18,0 -32.6,-14.6 -32.6,-32.6V327.9c0,-40.7 33.1,-73.8 73.8,-73.8h23.9c5.5,0 10,4.5 10,10s-4.5,10 -10,10h-23.9c-29.6,0 -53.8,24.1 -53.8,53.8v133.4c0,7 5.7,12.6 12.6,12.6H695.4c29.6,0 53.8,-24.1 53.8,-53.8v-92.3c0,-29.6 -24.1,-53.8 -53.8,-53.8h-18c-5.5,0 -10,-4.5 -10,-10s4.5,-10 10,-10h18c40.7,0 73.8,33.1 73.8,73.8v92.3c0,40.7 -33.1,73.8 -73.8,73.8zM425,762.1h-16.8c-5.5,0 -10,-4.5 -10,-10s4.5,-10 10,-10h16.8c29.6,0 53.8,-24.1 53.8,-53.8V554.9c0,-7 -5.7,-12.6 -12.6,-12.6H332.7c-29.6,0 -53.8,24.1 -53.8,53.8v92.3c0,29.6 24.1,53.8 53.8,53.8h20.7c5.5,0 10,4.5 10,10s-4.5,10 -10,10h-20.7c-40.7,0 -73.8,-33.1 -73.8,-73.8v-92.3c0,-40.7 33.1,-73.8 73.8,-73.8h133.4c18,0 32.6,14.6 32.6,32.6v133.4c0,40.7 -33.1,73.8 -73.8,73.8zM695.4,762.1h-92.3c-40.7,0 -73.8,-33.1 -73.8,-73.8V554.9c0,-18 14.6,-32.6 32.6,-32.6h133.4c40.7,0 73.8,33.1 73.8,73.8v22.3c0,5.5 -4.5,10 -10,10s-10,-4.5 -10,-10v-22.3c0,-29.6 -24.1,-53.8 -53.8,-53.8H562c-7,0 -12.6,5.7 -12.6,12.6v133.4c0,29.6 24.1,53.8 53.8,53.8h92.3c29.6,0 53.8,-24.1 53.8,-53.8v-19.6c0,-5.5 4.5,-10 10,-10s10,4.5 10,10v19.6c0,40.7 -33.1,73.8 -73.8,73.8z"
-      android:fillColor="#333333"/>
-</vector>
--- a/app/src/main/res/drawable/ic_category_pet_24dp.xml
+++ b/app/src/main/res/drawable/ic_category_pet_24dp.xml
@ -1,39 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M782,461.7c0,-53.5 -40.8,-97.5 -92.9,-102.6 -7.8,-66.9 -64.6,-118.8 -133.6,-118.8 -36.7,0 -70,14.7 -94.3,38.6 -24.3,-23.9 -57.6,-38.6 -94.3,-38.6 -69,0 -125.8,51.9 -133.6,118.8 -52.2,5.1 -92.9,49.1 -92.9,102.6s38.5,95 88.5,102.1v92.8c0,50.4 40.9,91.3 91.3,91.3h280.6c50.4,0 91.3,-40.9 91.3,-91.3v-92.6c50.8,-6.5 90,-49.8 90,-102.3z"
-      android:fillColor="#FFD44A"/>
-  <path
-      android:pathData="M333.6,614.3c0,18.9 14.2,34.8 33,36.8a873.3,873.3 0,0 0,188.2 0c18.8,-2 33,-17.9 33,-36.8s-2,-120.8 -127.1,-120.8 -127.1,120.8 -127.1,120.8z"
-      android:fillColor="#FC981C"/>
-  <path
-      android:pathData="M678.9,461.7m-43.5,0a43.5,43.5 0,1 0,87 0,43.5 43.5,0 1,0 -87,0Z"
-      android:fillColor="#FC981C"/>
-  <path
-      android:pathData="M555.5,374.8m-63.2,0a63.2,63.2 0,1 0,126.4 0,63.2 63.2,0 1,0 -126.4,0Z"
-      android:fillColor="#FC981C"/>
-  <path
-      android:pathData="M243.6,461.7m-43.5,0a43.5,43.5 0,1 0,87 0,43.5 43.5,0 1,0 -87,0Z"
-      android:fillColor="#FC981C"/>
-  <path
-      android:pathData="M366.9,374.8m-63.2,0a63.2,63.2 0,1 0,126.4 0,63.2 63.2,0 1,0 -126.4,0Z"
-      android:fillColor="#FC981C"/>
-  <path
-      android:pathData="M345.5,239.3s-72.4,48.6 -79.2,124.8c-1,10.7 -8.9,19.5 -19.5,21.7 -27,5.7 -73,22.9 -72.9,74 0,0 -12.9,67.3 74.1,92.3 0,0 11.4,3.8 11.4,20.9V666s1.6,56 46.6,68l-7.3,8.4s-71.8,-21 -71.3,-88.2v-87.8s-89.9,-19.1 -89.9,-112.7c0,0 8.1,-96.6 90.8,-96.6 0,0 11.7,-104.6 117.2,-117.8z"
-      android:fillColor="#F29816"/>
-  <path
-      android:pathData="M475.3,757.9H330.1c-61.7,0 -111.8,-50.2 -111.8,-111.8v-73.4c0,-0.3 -0.2,-0.5 -0.5,-0.6 -24.6,-5.6 -47,-19.5 -62.9,-39.3 -16.2,-20 -25.1,-45.3 -25.1,-71.1s9.6,-52.9 26.9,-73.3c17.2,-20.2 40.9,-33.8 66.9,-38.2 0.1,-0 0.3,-0.2 0.4,-0.5 5.8,-33.1 23.1,-63.3 48.9,-85.2 26,-22.1 59.2,-34.3 93.4,-34.3s67.8,12.3 94,34.7c0.2,0.2 0.5,0.2 0.7,0 26.1,-22.4 59.5,-34.7 94,-34.7s67.4,12.2 93.4,34.3c25.7,21.8 43.1,52.1 48.9,85.2 0.1,0.3 0.2,0.5 0.4,0.5 36.5,6.3 67.6,30.1 83.3,63.8 2.3,5 0.2,11 -4.8,13.3 -5,2.3 -11,0.2 -13.3,-4.8 -12.9,-27.7 -38.5,-47.3 -68.6,-52.5 -8.5,-1.5 -15.2,-8.2 -16.7,-16.8 -5,-28.5 -19.9,-54.5 -42.1,-73.4 -22.4,-19 -51,-29.5 -80.5,-29.5s-58.4,10.6 -80.9,29.9c-7.7,6.6 -19,6.6 -26.7,0 -22.5,-19.3 -51.3,-29.9 -80.9,-29.9s-58.1,10.5 -80.5,29.5c-22.2,18.8 -37.1,44.9 -42.1,73.4 -1.5,8.6 -8.2,15.3 -16.7,16.8 -44.7,7.7 -77.2,46.3 -77.2,91.8 0,21.5 7.2,41.8 20.7,58.5 13.1,16.3 31.5,27.7 51.8,32.3 9.4,2.1 16,10.4 16,20.1v73.4c0,50.6 41.2,91.8 91.8,91.8h145.1c5.5,0 10,4.5 10,10s-4.5,10 -10,10zM635.4,747c-3.7,0 -7.2,-2 -8.9,-5.5 -2.5,-4.9 -0.5,-10.9 4.4,-13.4 31.1,-15.7 50.5,-47.2 50.5,-82v-73.1c0,-9.6 6.9,-18.1 16.3,-20.1 15.4,-3.3 29.9,-10.5 41.8,-21 4.2,-3.6 10.5,-3.2 14.1,0.9 3.6,4.2 3.2,10.5 -0.9,14.1 -14.5,12.7 -32.1,21.5 -50.8,25.5 -0.3,0.1 -0.5,0.3 -0.5,0.6v73.1c0,42.5 -23.6,80.7 -61.5,99.9a10,10 0,0 1,-4.5 1.1z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M875.8,562.4c-11.5,-11.5 -26.8,-16.9 -41.9,-16.1 0.8,-15.1 -4.6,-30.4 -16.1,-41.9 -21.5,-21.5 -56.4,-21.5 -78,0 -21.2,21.2 -21.5,55.3 -1,76.9L633.2,687.1c-21.6,-20.5 -55.7,-20.1 -76.9,1 -21.5,21.5 -21.5,56.4 0,78 11.5,11.5 26.8,16.9 41.9,16.1 -0.8,15.1 4.6,30.4 16.1,41.9 21.5,21.5 56.4,21.5 78,0 21.5,-21.5 21.5,-56.4 0,-78 -0.4,-0.4 -0.7,-0.7 -1.1,-1l105.7,-105.7c0.3,0.4 0.7,0.7 1,1.1 21.5,21.5 56.4,21.5 78,0 21.5,-21.5 21.5,-56.4 0,-78z"
-      android:fillColor="#FFF6E6"/>
-  <path
-      android:pathData="M807.3,505.2s-25.9,-0.7 -42.4,15.8c0,0 -18.9,19 -2.9,49 0,0 13,13 -1,27L648,710s-11,13 -26,4c0,0 -25,-25 -46,-5 0,0 -20,22 -14,53 0,0 -40.3,-34.6 -1.1,-75.8 0,0 40.1,-28.2 68.1,-4.2 0,0 8.5,4.7 14.3,-3.6l93.8,-93.8s-37.3,-58.5 11.4,-87.1c0,0 38.3,-16.1 59,7.7z"
-      android:fillColor="#FFDCA9"/>
-  <path
-      android:pathData="M653.2,850.2c-16.7,0 -33.4,-6.3 -46.1,-19 -10.6,-10.6 -17.1,-24.5 -18.7,-39.2 -14.7,-1.6 -28.6,-8.1 -39.2,-18.7 -12.3,-12.3 -19.1,-28.7 -19.1,-46.1s6.8,-33.8 19.1,-46.1c12.1,-12.1 28.1,-18.9 45.2,-19.1 13.8,-0.2 27,3.9 38,11.7l93,-93c-7.7,-11.1 -11.8,-24.3 -11.7,-38 0.2,-17.1 7,-33.2 19.1,-45.2 12.3,-12.3 28.7,-19.1 46.1,-19.1s33.8,6.8 46.1,19.1c10.6,10.6 17.1,24.5 18.7,39.2 14.7,1.6 28.6,8.1 39.2,18.7 12.3,12.3 19.1,28.7 19.1,46.1s-6.8,33.8 -19.1,46.1c-25.4,25.4 -66.7,25.4 -92.1,0 -3.9,-3.9 -3.9,-10.2 0,-14.1s10.2,-3.9 14.1,0c17.6,17.6 46.2,17.6 63.8,0 8.5,-8.5 13.2,-19.9 13.2,-31.9s-4.7,-23.4 -13.2,-31.9a45.2,45.2 0,0 0,-34.3 -13.1c-2.8,0.2 -5.6,-0.9 -7.6,-2.9s-3.1,-4.8 -2.9,-7.6a45.2,45.2 0,0 0,-13.1 -34.3c-8.5,-8.5 -19.9,-13.2 -31.9,-13.2s-23.4,4.7 -31.9,13.2c-17.4,17.4 -17.8,45.1 -0.9,62.9 3.7,3.9 3.6,10.1 -0.2,13.9L640.2,694.1c-3.8,3.8 -10,3.9 -13.9,0.2 -17.9,-16.9 -45.5,-16.6 -62.9,0.9 -8.5,8.5 -13.2,19.9 -13.2,31.9s4.7,23.4 13.2,31.9a45.2,45.2 0,0 0,34.3 13.1,10 10,0 0,1 7.6,2.9c2,2 3.1,4.8 2.9,7.6a45.2,45.2 0,0 0,13.1 34.3c17.6,17.6 46.2,17.6 63.8,0 8.5,-8.5 13.2,-19.9 13.2,-31.9s-4.7,-23.4 -13.2,-31.9c-0.2,-0.2 -0.3,-0.3 -0.5,-0.5l-0.4,-0.4a10,10 0,0 1,-3.1 -7.2,10 10,0 0,1 3,-7.2c0.4,-0.4 41.9,-41.3 72.8,-71.6 3.9,-3.9 10.3,-3.8 14.1,0.1 3.9,3.9 3.8,10.3 -0.1,14.1 -23.4,23 -52.9,52 -65.9,64.9 8.7,11.3 13.4,25.1 13.4,39.6 0,17.4 -6.8,33.8 -19.1,46.1 -12.7,12.7 -29.4,19 -46.1,19z"
-      android:fillColor="#333333"/>
-</vector>
--- a/app/src/main/res/drawable/ic_category_scenic_24dp.xml
+++ b/app/src/main/res/drawable/ic_category_scenic_24dp.xml
@ -1,48 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M708.3,806.4H233c-24,0 -43.5,-19.5 -43.5,-43.5v-317.4h562.2V762.9c0,24 -19.5,43.5 -43.5,43.5z"
-      android:fillColor="#EA5959"/>
-  <path
-      android:pathData="M226.4,456V752.9s-1.1,19.3 13.8,19.3h464.2s36.5,-6.1 47.3,-26.3c0,0 2.3,49.3 -46.3,60H240.6s-51,-6.6 -51,-40.8V447.6l36.9,8.3z"
-      android:fillColor="#CE4141"/>
-  <path
-      android:pathData="M468.4,630.2h8.7c40.6,0 73.6,33 73.6,73.6v88.9H394.8v-88.9c0,-40.6 33,-73.6 73.6,-73.6z"
-      android:fillColor="#FFD9D9"/>
-  <path
-      android:pathData="M254,457.7h433.5c66.3,0 116.2,-40.4 138.5,-97.6 2.4,-6.3 -4.8,-12 -11,-9.6a93,93 0,0 1,-34 5.9c-31.3,-0 -61.4,-3.8 -84.1,-25.2 -18.5,-17.4 -31,-52.4 -36,-77 -2,-9.6 -9.9,-17.2 -19.6,-17.2H300.3c-9.8,0 -17.7,7.7 -19.6,17.2 -5,24.6 -17.6,59.7 -36.2,77.1 -22.8,21.5 -53,25.1 -84.4,25a90.9,90.9 0,0 1,-33.3 -5.7c-6.3,-2.3 -13.6,3.4 -11.1,9.7 22.7,57.1 72.8,97.4 138.3,97.4z"
-      android:fillColor="#FDBC2C"/>
-  <path
-      android:pathData="M290.8,254.8S277.9,386 174.5,389c0,0 21.9,31.8 65.6,34.8H718.1s50,-7 95.7,-61.6c0,0 -15.8,69.8 -98.3,93H242.6s-92.1,-2.2 -124.8,-102.8c0,0 68.8,16 97.1,-5 0,0 55.2,-41.9 76,-92.6z"
-      android:fillColor="#F29816"/>
-  <path
-      android:pathData="M687.5,467.7L254,467.7c-33.5,0 -64.9,-10.1 -91.1,-29.2 -24.8,-18.1 -44.3,-43.9 -56.5,-74.5 -2.5,-6.2 -1.1,-13.2 3.7,-18.2 5.2,-5.4 13.1,-7.2 20.1,-4.6a80.6,80.6 0,0 0,29.7 5.1h0.2c27.8,0.1 56.5,-2.5 77.5,-22.3 15.9,-14.9 28.1,-46.8 33.2,-71.8 2.9,-14.6 15.3,-25.2 29.4,-25.2h341c14,0 26.4,10.6 29.4,25.2 5.1,25 17.3,56.9 33.1,71.7 4,3.8 4.2,10.1 0.4,14.1 -3.8,4 -10.1,4.2 -14.1,0.4 -20.3,-19.1 -33.7,-56.2 -39,-82.3 -0.9,-4.6 -4.6,-9.2 -9.8,-9.2L300.3,247c-5.2,0 -8.9,4.6 -9.8,9.2 -5.3,26.1 -18.7,63.4 -39.1,82.5 -26.2,24.6 -60.8,27.8 -91.2,27.7 -11.3,0.2 -22.5,-1.5 -33.2,-5.1 10.9,25.1 27.3,46.1 47.8,61.1 22.7,16.6 50.1,25.4 79.3,25.4h433.5c57,0 104.3,-32.2 127.3,-86.5a102.3,102.3 0,0 1,-33.9 5.2c-9.4,-0 -17.5,-0.4 -24.9,-1.1 -5.5,-0.5 -9.5,-5.4 -9,-10.9 0.5,-5.5 5.4,-9.5 10.9,-9 6.8,0.6 14.3,1 23.1,1h0.2c10.4,0.2 20.6,-1.6 30.4,-5.3 6.8,-2.6 14.7,-0.9 19.9,4.4 4.9,4.9 6.4,11.9 3.9,18.2 -12,30.8 -31.4,56.6 -56.2,74.7 -26.2,19.2 -57.9,29.3 -91.7,29.3zM818.6,359.9h-0,0zM125,356.6v0z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M473,638.7s-47.8,21.4 -47.8,57.4v103.8h-30.2V694.8s18.9,-65.9 77.9,-56.1z"
-      android:fillColor="#FFC0C0"/>
-  <path
-      android:pathData="M639.7,813.7H240.6c-32.4,0 -58.7,-26.3 -58.7,-58.7V496.5c0,-5.5 4.5,-10 10,-10s10,4.5 10,10v258.5c0,21.3 17.4,38.7 38.7,38.7h399.1c5.5,0 10,4.5 10,10s-4.5,10 -10,10zM754.1,527.4c-5.5,0 -10,-4.5 -10,-10v-74.5c0,-5.5 4.5,-10 10,-10s10,4.5 10,10v74.5c0,5.5 -4.5,10 -10,10z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M395.1,800.7c-5.5,0 -10,-4.5 -10,-10v-84.6c0,-48.5 39.5,-88 88,-88S561,657.6 561,706.1v50.2c0,5.5 -4.5,10 -10,10s-10,-4.5 -10,-10v-50.2c0,-37.5 -30.5,-68 -68,-68s-68,30.5 -68,68v84.6c0,5.5 -4.5,10 -10,10z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M835.3,610.6c-9.3,-9.3 -11,-23.4 -5,-34.5 2.2,-4 1.4,-8.9 -1.8,-12.1l-22.8,-22.8c-4,-4 -10.5,-4 -14.4,0L614.3,718.2c-4,4 -4,10.5 0,14.4l22.8,22.8c3.2,3.2 8.1,3.9 12.1,1.8 11.1,-6 25.1,-4.3 34.5,5 9.3,9.3 11,23.4 5,34.5a10.2,10.2 0,0 0,1.8 12.1l22.8,22.8c4,4 10.5,4 14.4,0l177,-177c4,-4 4,-10.5 0,-14.4l-22.8,-22.8c-3.2,-3.2 -8.1,-3.9 -12.1,-1.8 -11.1,6 -25.1,4.3 -34.5,-5z"
-      android:fillColor="#FFF6E6"/>
-  <path
-      android:pathData="M639.1,703.4l17.4,17.4s25.3,-9.1 47.8,13.3c0,0 24,19.5 20.2,45.7l5.2,5.2 159.9,-159.9 20.9,20.9 -188.3,188.3 -28.7,-28.7s2.5,-25.9 -15.5,-43.9c0,0 -20.4,-21.1 -37.4,-4l-28.6,-28.6 27.1,-25.7z"
-      android:fillColor="#F8E0BB"/>
-  <path
-      android:pathData="M720.4,844.5c-5.4,0 -10.5,-2.1 -14.3,-5.9l-22.8,-22.8c-6.3,-6.3 -7.7,-16.1 -3.5,-23.9 4,-7.4 2.6,-16.7 -3.3,-22.7 -5.9,-5.9 -15.3,-7.3 -22.7,-3.3 -7.8,4.2 -17.6,2.8 -23.9,-3.5l-22.8,-22.8c-7.9,-7.9 -7.9,-20.7 0,-28.6L784.2,534.2c3.8,-3.8 8.9,-5.9 14.3,-5.9s10.5,2.1 14.3,5.9l22.8,22.8c6.3,6.3 7.7,16.1 3.5,23.9 -4,7.4 -2.6,16.7 3.3,22.7 5.9,5.9 15.3,7.3 22.7,3.3 7.8,-4.2 17.6,-2.8 23.9,3.5l22.8,22.8c3.8,3.8 5.9,8.9 5.9,14.3s-2.1,10.5 -5.9,14.3L734.7,838.6a20.1,20.1 0,0 1,-14.3 5.9zM662.9,743.8c10.2,0 20.3,3.9 27.8,11.4 12.2,12.2 14.9,31.2 6.8,46.3 -0,0.1 -0,0.2 0,0.2l22.8,22.8c0.1,0.1 0.3,0.1 0.3,0L897.5,647.5s0.1,-0.1 0.1,-0.2 -0,-0.1 -0.1,-0.2l-22.8,-22.8a0.2,0.2 0,0 0,-0.2 -0c-15.1,8.2 -34.2,5.4 -46.3,-6.8 -12.2,-12.2 -14.9,-31.2 -6.8,-46.3 0,-0.1 0,-0.2 -0,-0.2l-22.8,-22.8c-0.1,-0.1 -0.3,-0.1 -0.3,0L621.4,725.3c-0.1,0.1 -0.1,0.2 0,0.3l22.8,22.8a0.2,0.2 0,0 0,0.2 0c5.8,-3.1 12.2,-4.7 18.5,-4.7z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M740.9,753.8c-2.7,0 -5.4,-1.1 -7.4,-3.3 -4.9,-5.5 -47.5,-54.3 -20.6,-81.2 1.4,-1.4 8.9,-8.1 23.4,-8.3 17.4,-0.3 37.2,9 58.9,27.4a10,10 0,0 1,1.1 14.1,10 10,0 0,1 -14.1,1.1c-37.6,-31.9 -54.1,-21 -55.4,-20 -10.2,10.8 10.4,41.2 21.5,53.4 3.7,4.1 3.4,10.4 -0.7,14.1a9.9,9.9 0,0 1,-6.7 2.6zM727,683.5l-0.1,0.1 0.1,-0.1z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M820.8,673.8c-2.6,0 -5.1,-1 -7.1,-2.9 -16.9,-16.9 -26.6,-18.2 -29.9,-17.9 -2,0.2 -3.4,1 -3.4,1 -0.3,0.4 -0.6,0.8 -1,1.2 -1.4,1.4 -0.3,4.3 -0.3,4.3l-0.1,-0.2 -18.4,7.9c-2.4,-5.5 -4.1,-17 4.2,-25.7 1.9,-2.3 7.4,-7.6 17.5,-8.4 13.5,-1 28.8,6.9 45.6,23.7 3.9,3.9 3.9,10.2 0,14.1a10,10 0,0 1,-7.1 2.9z"
-      android:fillColor="#333333"/>
-</vector>
--- a/app/src/main/res/drawable/ic_category_snack_24dp.xml
+++ b/app/src/main/res/drawable/ic_category_snack_24dp.xml
@ -1,51 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M726.7,707.8H215.4a1637.1,1637.1 0,0 1,0 -434.7h511.3a1637.1,1637.1 0,0 1,0 434.7z"
-      android:fillColor="#FFEF7B"/>
-  <path
-      android:pathData="M726.7,273.1H215.4l-15.4,-74.7c-2.1,-10 5.6,-19.4 15.8,-19.4h510.5c10.2,0 17.9,9.4 15.8,19.4l-15.4,74.7z"
-      android:fillColor="#F7CA11"/>
-  <path
-      android:pathData="M215.4,707.8h511.3l15.4,74.7c2.1,10 -5.6,19.4 -15.8,19.4H215.8c-10.2,0 -17.9,-9.4 -15.8,-19.4l15.4,-74.7z"
-      android:fillColor="#EAA51B"/>
-  <path
-      android:pathData="M616.3,553.5a205.8,205.8 0,0 1,-140.9 2.5,205.8 205.8,0 0,0 -135.3,0.4l-27.5,9.6c-20.1,7.1 -41.1,-7.8 -41.1,-29.1v-33.2c0,-36 22.7,-68.1 56.7,-80l11.8,-4.2a205.8,205.8 0,0 1,135.3 -0.4c45.8,15.8 95.7,14.9 140.9,-2.5l12.5,-4.8c20.2,-7.8 41.9,7.2 41.9,28.8v33.6c0,35.1 -21.6,66.6 -54.4,79.2z"
-      android:fillColor="#E2433B"/>
-  <path
-      android:pathData="M720,283.6H473.2c-5.5,0 -10,-4.5 -10,-10s4.5,-10 10,-10h246.8c5.5,0 10,4.5 10,10s-4.5,10 -10,10z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M216.7,354.9s14.8,234.6 65.7,286.9c53.9,55.3 301.5,66.2 301.5,66.2l-363.4,-0.9s-48.3,-251.5 -3.9,-352.2z"
-      android:fillColor="#F7CA11"/>
-  <path
-      android:pathData="M348.4,717.9H224.7c-5.5,0 -10,-4.5 -10,-10s4.5,-10 10,-10h123.7c5.5,0 10,4.5 10,10s-4.5,10 -10,10z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M568,781.5c-8.4,-83.4 24.8,-144 129.7,-158.3 72.9,-9.9 129.8,22.5 161.3,54.7 15.7,16.1 9.5,43.1 -11.6,51 -48,17.9 -128.7,56.7 -162.2,123.2 -7.1,14.1 -23.4,21.1 -38.4,16.2 -30.1,-9.8 -73.4,-33.1 -78.8,-86.8zM676,875"
-      android:fillColor="#F7B82A"/>
-  <path
-      android:pathData="M657.8,861.5s-15.1,-147.3 71.4,-190.7c86.5,-43.4 120.6,-8.6 134.5,28.4 0,0 -69.4,45.9 -100,67.6 -37.7,26.6 -72.6,83.7 -102.1,100.9l-3.7,-6.2zM662.1,867.8"
-      android:fillColor="#E5A21A"/>
-  <path
-      android:pathData="M661.5,870.2s-1.9,-131.9 79.3,-172.6 121.9,-2.3 129.7,14.4c0,0 -72.1,30 -100.8,50.4 -35.4,25 -94.9,91.3 -108.1,107.9zM661.5,870.2"
-      android:fillColor="#FFE360"/>
-  <path
-      android:pathData="M658.6,880.7c-3.7,0 -7.4,-0.5 -11,-1.6 -30.7,-9.3 -83.2,-34.1 -89.5,-96.6 -1.1,-10.6 -5.3,-65.5 16.9,-100.4 3,-4.7 9.1,-6 13.8,-3.1 4.7,3 6,9.1 3.1,13.8 -14.5,22.8 -16.6,61.5 -13.9,87.7 2.7,26.7 17.9,62.1 75.4,79.4 8.6,2.6 17.8,-1.5 21.8,-9.9 15.2,-31.4 41.6,-60 78.6,-84.9 32.1,-21.6 66.2,-36.5 89.2,-45.2 7.1,-2.7 12.1,-8.4 13.7,-15.9 1.6,-7.4 -0.5,-14.7 -5.9,-20.1 -11.9,-12 -32.3,-28.7 -61.5,-40.3 -28.7,-11.3 -59,-14.9 -90.3,-10.6 -5.5,0.8 -10.5,-3.1 -11.3,-8.6 -0.8,-5.5 3.1,-10.5 8.6,-11.3 34.7,-4.7 68.4,-0.8 100.3,11.8 32.5,12.8 55.1,31.4 68.4,44.8 10.1,10.1 14.2,24.5 11.2,38.4 -3,13.9 -12.9,25.3 -26.2,30.3 -45.1,17 -125.5,55.1 -156.9,120.1 -6.6,13.7 -20.2,21.9 -34.6,21.9z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M617.5,536.7a205.8,205.8 0,0 1,-140.9 2.5,205.8 205.8,0 0,0 -135.3,0.4l-27.5,9.6c-20.1,7.1 -41.1,-7.8 -41.1,-29.1v-33.2c0,-36 22.7,-68.1 56.7,-80l11.8,-4.2a205.8,205.8 0,0 1,135.3 -0.4c45.8,15.8 95.7,14.9 140.9,-2.5l12.5,-4.8c20.2,-7.8 41.9,7.2 41.9,28.8v33.6c0,35.1 -21.6,66.6 -54.4,79.2z"
-      android:fillColor="#F9675A"/>
-  <path
-      android:pathData="M473.2,185.8s175.4,9.2 225.6,27.9c0,0 21.1,7.1 21.2,51.9l22.5,-59.4 -4.1,-21.8 -265.2,1.5z"
-      android:fillColor="#EAA51B"/>
-  <path
-      android:pathData="M224.7,716.8s5.6,47 27.1,49.3c0,0 109.6,20.8 268.6,28.8l-308.4,6 -11,-8.9 23.7,-75.2z"
-      android:fillColor="#D88F0F"/>
-  <path
-      android:pathData="M520.8,811.9H217.8c-7.9,0 -15.3,-3.5 -20.3,-9.6s-6.9,-14.1 -5.3,-21.8l15.1,-73a1647.8,1647.8 0,0 1,0 -434l-15.1,-73c-1.6,-7.7 0.3,-15.7 5.3,-21.8s12.4,-9.6 20.3,-9.6h510.5c7.9,0 15.3,3.5 20.3,9.6 5,6.1 6.9,14.1 5.3,21.8l-15.1,73c13.5,101.3 17.5,204.4 11.9,306.4 -0.3,5.5 -5,9.7 -10.5,9.4 -5.5,-0.3 -9.7,-5 -9.4,-10.5 5.5,-101.3 1.5,-203.8 -12,-304.4 -0.2,-1.1 -0.1,-2.3 0.1,-3.3l15.4,-74.7c0.5,-2.5 -0.6,-4.3 -1.3,-5.1 -0.7,-0.9 -2.2,-2.3 -4.8,-2.3H217.8c-2.5,0 -4.1,1.4 -4.8,2.3 -0.7,0.9 -1.8,2.6 -1.3,5.1l15.4,74.7c0.2,1.1 0.3,2.2 0.1,3.3a1627.3,1627.3 0,0 0,0 432c0.2,1.1 0.1,2.3 -0.1,3.3l-15.4,74.7c-0.5,2.5 0.6,4.3 1.3,5.1 0.7,0.9 2.2,2.3 4.8,2.3h303c5.5,0 10,4.5 10,10s-4.5,10 -10,10z"
-      android:fillColor="#333333"/>
-</vector>
--- a/app/src/main/res/drawable/ic_category_supermarket_24dp.xml
+++ b/app/src/main/res/drawable/ic_category_supermarket_24dp.xml
@ -1,45 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M694.5,402h-61c0,-83.7 -68.1,-151.8 -151.8,-151.8S329.9,318.3 329.9,402h-61c0,-117.3 95.5,-212.8 212.8,-212.8S694.5,284.7 694.5,402zM667.8,811H295.6c-37.2,0 -68.4,-27.9 -72.7,-64.8l-30.2,-264.9h578L740.5,746.2C736.3,783.1 705,811 667.8,811z"
-      android:fillColor="#35A5F6"/>
-  <path
-      android:pathData="M767.8,506H195.6c-22,0 -40.5,-16.5 -43.1,-38.3l-7,-59.6c-2.6,-21.6 14.4,-40.7 36.2,-40.7h600.3c21.8,0 38.7,19 36.2,40.7l-7,59.6c-2.6,21.9 -21.1,38.3 -43.1,38.3z"
-      android:fillColor="#8FD4FF"/>
-  <path
-      android:pathData="M548.8,579.3m38.8,4.1l0,0q38.8,4.1 34.6,42.9l-6.9,64.6q-4.1,38.8 -42.9,34.6l0,0q-38.8,-4.1 -34.6,-42.9l6.9,-64.6q4.1,-38.8 42.9,-34.6Z"
-      android:fillColor="#FDFBF7"/>
-  <path
-      android:pathData="M430.3,721.5m-38.8,4.1l0,0q-38.8,4.1 -42.9,-34.6l-6.9,-64.6q-4.1,-38.8 34.6,-42.9l0,0q38.8,-4.1 42.9,34.6l6.9,64.6q4.1,38.8 -34.6,42.9Z"
-      android:fillColor="#FDFBF7"/>
-  <path
-      android:pathData="M690.9,372.8c-4.7,0 -8.9,-3.4 -9.8,-8.2 -5.4,-29 -16.9,-55.9 -34.1,-80 -3.2,-4.5 -2.2,-10.7 2.3,-13.9 4.5,-3.2 10.7,-2.2 13.9,2.3 18.9,26.5 31.5,56.1 37.4,88 1,5.4 -2.6,10.6 -8,11.7 -0.6,0.1 -1.2,0.2 -1.9,0.2zM272.5,372.9c-0.6,0 -1.2,-0.1 -1.9,-0.2 -5.4,-1 -9,-6.2 -8,-11.7 9.4,-50.4 36.4,-96.5 75.9,-129.7 40,-33.6 90.9,-52.2 143.1,-52.2 48.5,0 94.7,15.4 133.5,44.5 4.4,3.3 5.3,9.6 2,14a10,10 0,0 1,-14 2c-35.3,-26.5 -77.3,-40.5 -121.5,-40.5 -47.5,0 -93.8,16.9 -130.3,47.5 -36,30.3 -60.6,72.2 -69.1,118 -0.9,4.8 -5.1,8.2 -9.8,8.2z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M334.9,373.6c-0.8,0 -1.7,-0.1 -2.5,-0.3 -5.3,-1.4 -8.5,-6.9 -7.1,-12.2 18.6,-71.2 83,-120.8 156.5,-120.8S619.1,289.5 638,360.1c1.4,5.3 -1.7,10.8 -7.1,12.3 -5.3,1.4 -10.8,-1.7 -12.3,-7.1 -16.6,-61.9 -72.9,-105.1 -137,-105.1s-120.9,43.5 -137.2,105.9a10,10 0,0 1,-9.7 7.5zM576.6,735.8c-1.7,0 -3.5,-0.1 -5.2,-0.3 -26.9,-2.9 -46.4,-27 -43.5,-53.9l6.9,-64.6c1.4,-13 7.8,-24.7 17.9,-32.9 10.2,-8.2 23,-12 36,-10.6 26.9,2.9 46.4,27 43.5,53.9l-6.9,64.6a49,49 0,0 1,-48.7 43.8zM583.4,593.2c-6.6,0 -13,2.2 -18.2,6.4 -6,4.9 -9.8,11.8 -10.6,19.5l-6.9,64.6c-1.7,15.9 9.9,30.2 25.8,31.9 6.9,0.7 13.9,-1 19.6,-5a29,29 0,0 0,12.3 -20.8l6.9,-64.6c1.7,-15.9 -9.9,-30.2 -25.8,-31.9 -1,-0.1 -2.1,-0.2 -3.1,-0.2zM387.4,735.8c-11.1,0 -21.9,-3.8 -30.7,-10.9 -10.2,-8.2 -16.5,-19.9 -17.9,-32.9l-6.9,-64.6c-2.9,-26.9 16.7,-51 43.5,-53.9 13,-1.4 25.8,2.4 36,10.6 10.2,8.2 16.5,19.9 17.9,32.9l6.9,64.6c2.9,26.9 -16.7,51 -43.5,53.9 -1.8,0.2 -3.5,0.3 -5.3,0.3zM380.6,593.2c-1,0 -2.1,0.1 -3.1,0.2 -15.9,1.7 -27.5,16 -25.8,31.9l6.9,64.6c0.8,7.7 4.6,14.6 10.6,19.5 6,4.9 13.6,7.1 21.3,6.3 15.9,-1.7 27.5,-16 25.8,-31.9l-6.9,-64.6c-0.8,-7.7 -4.6,-14.6 -10.6,-19.5 -5.2,-4.2 -11.6,-6.4 -18.2,-6.4z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M811.1,469.4l0.9,-7.8H157.4l0.9,7.8c2.6,22.5 21.6,39.4 44.2,39.4h564.5c22.6,0 41.6,-17 44.2,-39.4z"
-      android:fillColor="#76C1FF"/>
-  <path
-      android:pathData="M234.9,512L263,735s7,34 31,34h385.5s39.5,-1 55.5,-27c0,0 4,56.3 -62,64.6H298S238,809 227,748l-30.8,-236h38.7z"
-      android:fillColor="#0080E0"/>
-  <path
-      android:pathData="M667.8,821c-5.5,0 -10,-4.5 -10,-10s4.5,-10 10,-10c32.1,0 59.1,-24.1 62.7,-56l25.8,-226.3c1.3,-11.5 9.3,-20.9 20.4,-24 13.2,-3.6 22.7,-14.7 24.3,-28.3l7,-59.6c0.9,-7.5 -1.5,-15 -6.5,-20.6a26.4,26.4 0,0 0,-19.7 -8.9H181.5a26.4,26.4 0,0 0,-26.2 29.5l7,59.6c2,16.8 16.3,29.5 33.2,29.5h458.9c5.5,0 10,4.5 10,10s-4.5,10 -10,10H195.5c-27.1,-0 -49.9,-20.3 -53,-47.2l-7,-59.6a46.4,46.4 0,0 1,11.4 -36.3,46.4 46.4,0 0,1 34.7,-15.6h600.3a46.4,46.4 0,0 1,34.7 15.6c8.8,9.9 12.9,23.1 11.4,36.3l-7,59.6c-2.6,21.7 -17.8,39.5 -38.8,45.3 -3.1,0.9 -5.4,3.7 -5.8,7l-25.8,226.3c-4.8,42 -40.3,73.7 -82.6,73.7zM594,821H295.6c-42.3,0 -77.8,-31.7 -82.6,-73.7l-20.2,-177.3c-0.6,-5.5 3.3,-10.4 8.8,-11.1 5.5,-0.6 10.4,3.3 11.1,8.8l20.2,177.3c3.6,31.9 30.6,56 62.7,56h298.4c5.5,0 10,4.5 10,10s-4.5,10 -10,10z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M842,862H708.3c-30.9,0 -54.8,-27.1 -50.9,-57.7l14.5,-115.2c3.2,-25.6 25,-44.9 50.9,-44.9h104.8c25.9,0 47.7,19.2 50.9,44.9l14.5,115.2c3.8,30.6 -20,57.7 -50.9,57.7z"
-      android:fillColor="#FEDC5A"/>
-  <path
-      android:pathData="M775.1,748.2c-30.5,0 -55.3,-24.8 -55.3,-55.3 0,-5.5 4.5,-10 10,-10s10,4.5 10,10c0,19.5 15.8,35.3 35.3,35.3s35.3,-15.8 35.3,-35.3c0,-5.5 4.5,-10 10,-10s10,4.5 10,10c0,30.5 -24.8,55.3 -55.3,55.3z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M704.2,654.5l-15.3,152.1S683,832.4 711.2,832.4h140.7s25.2,0.6 32.7,-25.8c0,0 9.5,40.4 -35.5,55.4h-140s-50,-9 -52,-51l17.6,-133.2s15.6,-24.8 29.5,-23.3z"
-      android:fillColor="#FFB236"/>
-  <path
-      android:pathData="M812,872H708.3c-17.6,0 -34.3,-7.6 -46,-20.8a61.3,61.3 0,0 1,-14.9 -48.2l14.5,-115.2c3.8,-30.6 30,-53.7 60.8,-53.7h104.8c30.8,0 57,23.1 60.8,53.7l14.5,115.2a61.3,61.3 0,0 1,-34.2 62.9,10 10,0 0,1 -13.4,-4.7 10,10 0,0 1,4.7 -13.4,41.3 41.3,0 0,0 23.1,-42.4l-14.5,-115.2c-2.6,-20.6 -20.2,-36.2 -41,-36.2H722.8c-20.8,0 -38.4,15.5 -41,36.2L667.3,805.6a41.3,41.3 0,0 0,10 32.5,41.3 41.3,0 0,0 31,14h103.7c5.5,0 10,4.5 10,10s-4.5,10 -10,10z"
-      android:fillColor="#333333"/>
-</vector>
--- a/app/src/main/res/drawable/ic_category_taxi_24dp.xml
+++ b/app/src/main/res/drawable/ic_category_taxi_24dp.xml
@ -1,51 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M598.3,275.2l-9.2,-37.8c-1.9,-7.9 -10.3,-18 -20.9,-19.4 -35.7,-4.2 -71.8,-4.2 -107.4,0 -9.6,1.4 -18.8,11.9 -20.9,21.1l-9.1,36.2c55.8,-3.3 111.8,-3.3 167.6,-0z"
-      android:fillColor="#FFD44A"/>
-  <path
-      android:pathData="M234,726m26.6,0l57.8,0q26.6,0 26.6,26.6l0,36.8q0,26.6 -26.6,26.6l-57.8,0q-26.6,0 -26.6,-26.6l0,-36.8q0,-26.6 26.6,-26.6Z"
-      android:fillColor="#B52828"/>
-  <path
-      android:pathData="M348.3,744.4h460.3c10.4,0 18.8,-8.4 18.8,-18.8V616.4h-0.2l-16.1,-99.3c-0.9,-12 -7.7,-22.4 -17.7,-29.2l56.9,-7.2a12.9,12.9 0,0 0,11.3 -12.8V446.2c0,-7.1 -5.8,-12.9 -12.9,-12.9h-65.8c-6.3,0 -11.7,4.6 -12.7,10.9l-23.2,-95.7c-5.9,-24.7 -32.2,-56.3 -65.3,-60.7a1436.7,1436.7 0,0 0,-335.7 0c-30,4.5 -58.9,37.4 -65.3,66l-22.4,88.5a12.9,12.9 0,0 0,-12.1 -8.7H180.3c-7.1,0 -12.9,5.8 -12.9,12.9v21.8c0,6.5 4.8,12 11.3,12.8l55.3,7.1c-9.9,6.8 -16.6,17.2 -17.5,29.1l-16.1,99.2h-0.2v109.2c0,10.4 8.4,18.8 18.8,18.8h129.3z"
-      android:fillColor="#EA5959"/>
-  <path
-      android:pathData="M322.2,471.4c-9.3,0 -16.9,-7.5 -16.9,-16.9 0,-1.1 0.1,-2.3 0.3,-3.4l15.2,-74.3c5.3,-23.8 27.2,-42.4 52.2,-46.2h2.1c92.1,-10.9 185.2,-10.9 277.3,0h-2.1c27.6,3.7 49.4,20.4 54.3,40.9l18.6,79c2.2,9.1 -3.5,18.2 -12.6,20.4 -1.3,0.3 -2.6,0.4 -3.9,0.4h-384.6z"
-      android:fillColor="#FFD9D9"/>
-  <path
-      android:pathData="M322.1,481.4c-14.8,0 -26.9,-12 -26.9,-26.9 0,-1.8 0.2,-3.6 0.5,-5.4L311,374.9c0,-0.1 0,-0.1 0,-0.2 6.1,-27.3 31,-49.5 60.5,-53.9 0.5,-0.1 1,-0.1 1.5,-0.1h1.5a1188.6,1188.6 0,0 1,279 0.1c1,0.1 2,0.4 2.9,0.8 29.3,5.5 52.3,24.2 57.9,47.7l18.6,79c3.4,14.5 -5.6,29 -20,32.4 -2,0.5 -4.1,0.7 -6.2,0.7h-20.8c-5.5,0 -10,-4.5 -10,-10s4.5,-10 10,-10h20.8c0.5,0 1.1,-0.1 1.6,-0.2 3.7,-0.9 6,-4.6 5.2,-8.4l-18.6,-78.9c-3.9,-16.5 -22.8,-30.2 -45.9,-33.3a9.2,9.2 0,0 1,-2 -0.5c-89.8,-10.3 -180.9,-10.1 -270.7,0.5 -0.4,0.1 -0.8,0.1 -1.2,0.1h-1.3c-21.2,3.4 -38.9,19.1 -43.2,38.3l-15.2,74.2a7.1,7.1 0,0 0,-0.1 1.4c0,3.8 3.1,6.9 6.9,6.9h302.9c5.5,0 10,4.5 10,10s-4.5,10 -10,10H322.1z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M291,648m-39,0a39,39 0,1 0,78 0,39 39,0 1,0 -78,0Z"
-      android:fillColor="#FFD44A"/>
-  <path
-      android:pathData="M291,697c-27,0 -49,-22 -49,-49s22,-49 49,-49 49,22 49,49 -22,49 -49,49zM291,619c-16,0 -29,13 -29,29s13,29 29,29 29,-13 29,-29 -13,-29 -29,-29zM431.1,285.6c-0.8,0 -1.6,-0.1 -2.5,-0.3 -5.3,-1.4 -8.6,-6.8 -7.2,-12.1l9.1,-36c2.8,-12.1 14.7,-26.5 29.1,-28.7 0.1,-0 0.2,-0 0.3,-0 36.4,-4.3 73.4,-4.3 109.8,0 0.1,0 0.1,0 0.2,0 14.8,2 26.5,15.3 29.3,27l9.2,37.8c1.3,5.4 -2,10.8 -7.3,12.1 -5.4,1.3 -10.8,-2 -12.1,-7.3l-9.2,-37.8c-1,-4.3 -6.4,-11 -12.4,-11.9a449.3,449.3 0,0 0,-104.8 0c-4.8,0.8 -11.2,7.6 -12.5,13.4l-0.1,0.3 -9.1,36.2a10,10 0,0 1,-9.7 7.6z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M252,490.6s-11.9,132.3 -11.9,188.4c0,0 -2.1,28 16.9,28h382.7v38.3H219s-18.8,-1.6 -18.8,-23.9c0,0 -9.2,-242.2 51.8,-230.8z"
-      android:fillColor="#CE4141"/>
-  <path
-      android:pathData="M682,726m26.6,0l57.8,0q26.6,0 26.6,26.6l0,36.8q0,26.6 -26.6,26.6l-57.8,0q-26.6,0 -26.6,-26.6l0,-36.8q0,-26.6 26.6,-26.6Z"
-      android:fillColor="#CE4141"/>
-  <path
-      android:pathData="M326.7,825.2h-71.5c-17.4,0 -31.6,-14.2 -31.6,-31.6v-39.2h-4.6c-15.9,0 -28.8,-12.9 -28.8,-28.8V616.4c0,-1.3 0.3,-2.6 0.7,-3.7l15.7,-96.7c0.6,-7.3 3,-14.2 6.8,-20.5l-35.9,-4.6c-11.4,-1.4 -20,-11.2 -20,-22.7v-21.8c0,-12.6 10.3,-22.9 22.9,-22.9h65.8c1.9,0 4.2,0 6.3,0l18.5,-72.2c7.1,-31.3 38.3,-68.3 73.5,-73.5 0.1,-0 0.2,-0 0.3,-0a1449,1449 0,0 1,338.1 0c0.1,0 0.1,0 0.2,0 36.6,4.9 66.8,39.3 73.7,68.3l18.7,77.2c2.5,-0.1 5.1,-0.1 7.4,-0.2h65.9c12.6,0 22.9,10.3 22.9,22.9v21.8c0,11.5 -8.6,21.3 -20,22.7l-37.4,4.7c3.9,6.3 6.2,13.3 6.8,20.6l3,18.4c0.9,5.4 -2.8,10.6 -8.3,11.5 -5.4,0.9 -10.6,-2.8 -11.5,-8.3l-3.1,-18.8c-0.1,-0.3 -0.1,-0.6 -0.1,-0.9 -0.6,-8.4 -5.5,-16.3 -13.4,-21.7 -3.4,-2.3 -5.1,-6.6 -4.1,-10.6s4.3,-7.1 8.5,-7.6l56.9,-7.2c1.4,-0.2 2.5,-1.4 2.5,-2.8v-21.8c0,-1.6 -1.3,-2.9 -2.9,-2.9h-65.8c-6,0 -14.6,0.5 -14.7,0.5a10,10 0,0 1,-10.3 -7.6l-20.7,-85.3c-4.7,-19.7 -27,-49.1 -56.8,-53.2 -110.5,-13 -222.6,-13 -333.1,0 -21.5,3.3 -50.3,28.8 -56.8,58.3 -0,0.1 -0.1,0.2 -0.1,0.3l-20.5,79.9a10,10 0,0 1,-9.8 7.5s-8.5,-0.1 -14,-0.1H180.3c-1.6,0 -2.9,1.3 -2.9,2.9v21.8a2.9,2.9 0,0 0,2.5 2.8l55.3,7.1c4.1,0.5 7.5,3.5 8.5,7.6s-0.6,8.3 -4.1,10.6c-7.7,5.3 -12.5,13.2 -13.2,21.6 -0,0.3 -0.1,0.6 -0.1,0.9l-16.1,99.2c-0,0.2 -0.1,0.4 -0.1,0.6v107c0,4.8 3.9,8.8 8.8,8.8h14.6c5.5,0 10,4.5 10,10v49.2c0,6.4 5.2,11.6 11.6,11.6h71.5c6.4,0 11.6,-5.2 11.6,-11.6v-16.5c0,-5.5 4.5,-10 10,-10s10,4.5 10,10v16.5c0,17.4 -14.2,31.6 -31.6,31.6zM586,754.4H278c-5.5,0 -10,-4.5 -10,-10s4.5,-10 10,-10h308c5.5,0 10,4.5 10,10s-4.5,10 -10,10z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M859.8,674.8c1,60.2 -38.7,119.4 -98,158.7 -13.9,9.2 -32.1,9.3 -46,0.1 -58.7,-38.8 -98.2,-97.1 -98.2,-156.5 0,-66.5 53.7,-120.5 120.1,-121.1 66.2,-0.6 121,52.6 122.1,118.8z"
-      android:fillColor="#FFD44A"/>
-  <path
-      android:pathData="M738.7,677m-57,0a57,57 0,1 0,114 0,57 57,0 1,0 -114,0Z"
-      android:fillColor="#FC981C"/>
-  <path
-      android:pathData="M737.5,563.2S656,596 656,664c0,0 -14.5,84.2 82.7,167.1l-15,6.6s-121,-66.9 -104.8,-177.8c0,0 26.1,-111.5 118.7,-96.7z"
-      android:fillColor="#FFAC3B"/>
-  <path
-      android:pathData="M738.7,850.5c-9.9,0 -19.8,-2.8 -28.4,-8.6 -64.3,-42.5 -102.6,-104.1 -102.6,-164.9 0,-34.8 13.5,-67.6 38,-92.3 24.5,-24.7 57.2,-38.5 91.9,-38.8h1.1c71.2,0 129.9,57.5 131.1,128.7 0.5,28.1 -7.1,56.3 -22.6,83.8 -2.7,4.8 -8.8,6.5 -13.6,3.8 -4.8,-2.7 -6.5,-8.8 -3.8,-13.6 13.7,-24.3 20.4,-49.1 20,-73.6 -1,-60.6 -51.3,-109.5 -112,-109 -29.5,0.3 -57.2,11.9 -77.9,32.8 -20.8,21 -32.2,48.7 -32.2,78.3 0,26.7 8.8,54.6 25.5,80.6 16.4,25.5 39.9,48.9 68.2,67.6 10.6,7 24.3,7 35,-0.1 15.7,-10.4 30,-22.2 42.5,-35.2 3.8,-4 10.2,-4.1 14.1,-0.3 4,3.8 4.1,10.2 0.3,14.1 -13.5,14 -28.9,26.8 -45.8,38a51.9,51.9 0,0 1,-28.6 8.6z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M740.8,744.9c-36.9,0 -67,-30 -67,-67s30,-67 67,-67c11.8,0 23.4,3.1 33.6,9 4.8,2.8 6.4,8.9 3.6,13.7 -2.8,4.8 -8.9,6.4 -13.7,3.6a47,47 0,0 0,-23.5 -6.3c-25.9,0 -47,21.1 -47,47s21.1,47 47,47 47,-21.1 47,-47c0,-5.4 -0.9,-10.7 -2.7,-15.7 -1.8,-5.2 0.9,-10.9 6.1,-12.8 5.2,-1.8 10.9,0.9 12.8,6.1 2.5,7.2 3.8,14.7 3.8,22.4 0,36.9 -30,67 -67,67z"
-      android:fillColor="#333333"/>
-</vector>
--- a/app/src/main/res/drawable/ic_category_training_24dp.xml
+++ b/app/src/main/res/drawable/ic_category_training_24dp.xml
@ -1,48 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M259.7,193.9h456.5c8.5,0 15.4,6.9 15.4,15.4v521.4H202.2v-479.4c0,-31.7 25.8,-57.5 57.5,-57.5z"
-      android:fillColor="#57B7F9"/>
-  <path
-      android:pathData="M259.7,665.9h472v125.7H259.7c-31.7,0 -57.5,-25.8 -57.5,-57.5V723.4c0,-31.7 25.8,-57.5 57.5,-57.5z"
-      android:fillColor="#33A1F2"/>
-  <path
-      android:pathData="M267.1,701.6h453.9c0.7,0 1.2,0.5 1.2,1.2v52.1c0,0.7 -0.5,1.2 -1.2,1.2h-453.9c-15,0 -27.3,-12.2 -27.3,-27.3 0,-15 12.2,-27.3 27.3,-27.3z"
-      android:fillColor="#A1DCFF"/>
-  <path
-      android:pathData="M262.3,193.7v472.3s-55,10.4 -55,38.2V239.3s11.1,-33.6 55,-45.7z"
-      android:fillColor="#33A1F2"/>
-  <path
-      android:pathData="M515.1,801.7H265.1c-40.2,0 -72.9,-32.7 -72.9,-72.9s32.7,-72.9 72.9,-72.9h417.4c5.5,0 10,4.5 10,10s-4.5,10 -10,10H265.1c-29.1,0 -52.9,23.7 -52.9,52.9s23.7,52.9 52.9,52.9h250c5.5,0 10,4.5 10,10s-4.5,10 -10,10z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M202.2,741.9c-5.5,0 -10,-4.5 -10,-10V257.9c0,-40.2 32.7,-72.9 72.9,-72.9h452c13.6,0 24.6,11 24.6,24.6v336c0,5.5 -4.5,10 -10,10s-10,-4.5 -10,-10V209.6c0,-2.5 -2.1,-4.6 -4.6,-4.6H265.1c-29.1,0 -52.9,23.7 -52.9,52.9V731.9c0,5.5 -4.5,10 -10,10z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M610.3,253.8h-58.6v154.4l58.6,-28.8V253.8z"
-      android:fillColor="#FFAC3B"/>
-  <path
-      android:pathData="M610.3,253.8h58.6v154.4l-58.6,-28.8V253.8z"
-      android:fillColor="#FFD44A"/>
-  <path
-      android:pathData="M789.8,646l-43.7,-43.7L568.5,779.9l13.7,73.7 207.6,-207.6z"
-      android:fillColor="#FFAC3B"/>
-  <path
-      android:pathData="M789.8,646l43.7,43.7L655.9,867.3l-73.7,-13.7 207.6,-207.6z"
-      android:fillColor="#FFD44A"/>
-  <path
-      android:pathData="M668.9,418.1c-1.5,0 -3,-0.3 -4.4,-1l-54.2,-26.7 -54.2,26.7a10,10 0,0 1,-14.4 -9L541.7,253.8c0,-5.5 4.5,-10 10,-10h117.2c5.5,0 10,4.5 10,10v154.4a10,10 0,0 1,-4.7 8.5c-1.6,1 -3.5,1.5 -5.3,1.5zM610.3,369.3c1.5,0 3,0.3 4.4,1l44.2,21.7L658.9,263.8L561.7,263.8v128.3l44.2,-21.7c1.4,-0.7 2.9,-1 4.4,-1z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M813.8,573.3l48.7,48.7c10.7,10.7 10.7,28 0,38.7l-29,29 -87.4,-87.4 29,-29c10.7,-10.7 28,-10.7 38.7,0z"
-      android:fillColor="#F76C69"/>
-  <path
-      android:pathData="M640.9,876.8c-0.5,0 -1,0 -1.5,-0l-48.6,-1.6c-16.4,-0.5 -29.6,-13.8 -30.1,-30.1l-1.6,-48.6c-0.4,-13.1 4.6,-25.9 13.9,-35.1L765.4,568.9c13.4,-13.4 35.3,-13.4 48.8,0l52.8,52.8c13.4,13.4 13.4,35.3 0,48.8L674.5,862.9c-8.9,8.9 -21.1,13.9 -33.6,13.9zM789.8,578.8c-3.7,0 -7.4,1.4 -10.2,4.2L587.1,775.5a27.6,27.6 0,0 0,-8 20.3l1.6,48.6c0.2,5.8 4.9,10.6 10.8,10.8l48.6,1.6c7.6,0.2 15,-2.7 20.3,-8l192.5,-192.5c5.6,-5.6 5.6,-14.8 0,-20.5L800,583a14.4,14.4 0,0 0,-10.2 -4.2z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M799.9,666.2c-2.6,0 -5.1,-1 -7.1,-2.9l-48.7,-48.7c-3.9,-3.9 -3.9,-10.2 0,-14.1s10.2,-3.9 14.1,0l48.7,48.7c3.9,3.9 3.9,10.2 0,14.1a10,10 0,0 1,-7.1 2.9z"
-      android:fillColor="#333333"/>
-</vector>
--- a/app/src/main/res/drawable/ic_category_travel_24dp.xml
+++ b/app/src/main/res/drawable/ic_category_travel_24dp.xml
@ -1,39 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M788.2,816.3H255c-49.1,0 -89,-39.8 -89,-89V475.7c0,-49.1 39.8,-89 89,-89h155.7c155.3,0 301.1,74.7 391.9,200.6l0.3,0.4a276.5,276.5 0,0 1,52.2 161.7c0,36.9 -29.9,66.8 -66.8,66.8z"
-      android:fillColor="#57B7F9"/>
-  <path
-      android:pathData="M506.8,396.4s0,88.3 88,163.1c74.1,63 230.3,59.2 230.3,59.2S700.8,413.7 506.8,396.4z"
-      android:fillColor="#D4EFFF"/>
-  <path
-      android:pathData="M817.2,628.7h-0.1c-15.5,-0.1 -56.4,-1.2 -101.1,-9.4 -56.1,-10.3 -99.2,-27.8 -127.8,-52.2 -50.6,-43 -73,-90.6 -82.9,-122.9 -1.6,-5.3 1.4,-10.9 6.6,-12.5 5.3,-1.6 10.9,1.4 12.5,6.6 9.1,29.7 29.8,73.6 76.7,113.5 26,22.1 65.9,38.2 118.5,47.8 43.2,7.9 82.6,8.9 97.6,9.1 5.5,0 10,4.5 9.9,10.1 -0,5.5 -4.5,9.9 -10,9.9z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M384.6,618.8H177.3V501.3h104c42.5,0 82.3,20.4 107.2,54.9l0.1,0.1a75.7,75.7 0,0 1,14.3 44.2c0,10.1 -8.2,18.3 -18.3,18.3z"
-      android:fillColor="#D4EFFF"/>
-  <path
-      android:pathData="M165.5,723.7h688.3s11.2,92.6 -65.6,92.6H247.8s-82.3,-20.5 -82.3,-92.6z"
-      android:fillColor="#33A1F2"/>
-  <path
-      android:pathData="M788.2,826.3H255c-54.6,0 -99,-44.4 -99,-99v-30.5c0,-5.5 4.5,-10 10,-10s10,4.5 10,10v30.5c0,43.5 35.4,79 79,79h533.1c31.3,0 56.8,-25.5 56.8,-56.8 0,-56.3 -17.4,-110.2 -50.3,-155.8l-0.3,-0.4c-43.6,-60.5 -101.8,-110.5 -168.2,-144.5 -66.4,-34 -141,-52 -215.6,-52H255c-43.5,0 -79,35.4 -79,79v142.8c0,5.5 -4.5,10 -10,10s-10,-4.5 -10,-10V475.7c0,-54.6 44.4,-99 99,-99h155.7c77.8,0 155.5,18.7 224.7,54.2s129.8,87.5 175.3,150.6l0.3,0.4C846.3,631 865,688.9 865,749.4c0,42.4 -34.5,76.8 -76.8,76.8z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M754.8,733.7H170.9c-5.5,0 -10,-4.5 -10,-10s4.5,-10 10,-10h583.9c5.5,0 10,4.5 10,10s-4.5,10 -10,10z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M638.2,278.1l120.2,-93.4c1.6,-1.3 3.7,-1.8 5.7,-1.6 14.2,1.6 26.4,2 41.5,5.2 2.4,0.5 3.5,3.4 2,5.3L717.5,310.8l-79.3,-32.6z"
-      android:fillColor="#A1DCFF"/>
-  <path
-      android:pathData="M717.5,311.8l62,27.6c2.1,0.9 4.4,0.8 6.4,-0.3l65,-36.4a9.3,9.3 0,0 1,7.6 -0.7l16.7,5.9a7.7,7.7 0,0 1,3.3 12.3l-52.5,61.8c-15.4,18.4 -48,9 -48,9s-251.8,-69.9 -251.8,-69.9c-45.5,-13.7 -51.3,-23.3 -51.3,-37.3 0,-18.6 37.3,-23.3 37.3,-23.3 8.6,-4.3 27.7,-14.1 54.5,-4.9l71.4,23.6 79.3,32.6z"
-      android:fillColor="#FFF6DB"/>
-  <path
-      android:pathData="M482,271.7L782,369s33.5,8 55.2,0c0,0 -22,30.1 -58.1,21l-281.5,-79.3s-27.6,-10.3 -15.6,-39z"
-      android:fillColor="#33A1F2"/>
-  <path
-      android:pathData="M797.6,402.4h-0.3c-11.3,-0 -20.6,-2.6 -21,-2.8q-251.7,-69.9 -251.8,-69.9c-0.1,-0 -0.1,-0 -0.2,-0.1C480.2,316.4 466,305 466,282.8c0,-24.6 35.1,-31.6 44.3,-33 9.9,-4.9 31.5,-14.7 60.7,-4.7l66.3,21.9 116,-90.2c3.6,-2.8 8.3,-4.1 12.9,-3.6 3.9,0.4 7.7,0.8 11.4,1.1 9.7,0.9 19.7,1.8 31.1,4.2 4.5,1 8.2,4.2 9.8,8.5 1.6,4.3 0.9,9.1 -2,12.7l-64.8,84.2c-3.4,4.4 -9.6,5.2 -14,1.8 -4.4,-3.4 -5.2,-9.6 -1.8,-14l58.1,-75.5c-6.2,-0.9 -12.1,-1.4 -18.2,-2 -3.5,-0.3 -7.2,-0.6 -11,-1.1l-119.5,92.9a10,10 0,0 1,-9.3 1.6l-71.4,-23.6s-0.1,-0 -0.1,-0c-22.5,-7.7 -38,0.1 -46.4,4.2l-0.4,0.2c-1,0.5 -2.1,0.8 -3.2,1 -13.2,1.7 -28.5,7.9 -28.5,13.4 0,6.8 0,14.4 44.1,27.7 5.9,1.6 251.7,69.9 251.7,69.9 0.3,0.1 26.9,7.1 37.7,-5.8l50.4,-59.3 -13.3,-4.7 -64.8,36.2a17.2,17.2 0,0 1,-15.4 0.6l-61.9,-27.6c-5.1,-2.3 -7.3,-8.2 -5.1,-13.2 2.3,-5.1 8.2,-7.3 13.2,-5.1l60.7,27 63.8,-35.7c4.8,-2.7 10.6,-3.2 15.8,-1.4l16.7,5.9c2.1,0.7 3.9,1.8 5.6,3.2 7.5,6.3 8.4,17.5 2,25l-52.5,61.8c-8.2,9.8 -21,14.9 -37.2,14.9zM784.5,329.2h0,-0z"
-      android:fillColor="#333333"/>
-</vector>
--- a/app/src/main/res/drawable/ic_category_vegetable_24dp.xml
+++ b/app/src/main/res/drawable/ic_category_vegetable_24dp.xml
@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M440.3,725.9c-74.5,10.3 -168.4,-24 -220.6,-213.7 -50.8,-184.7 3.8,-264.3 151.8,-284.8 147.9,-20.4 221.6,41.5 222.4,233.1 0.8,190.5 -77.5,254.8 -153.7,265.3z"
-      android:fillColor="#44A00E"/>
-  <path
-      android:pathData="M560.4,687.5c-6.1,-44.4 -47.1,-95.4 -47.1,-95.4 -53.7,-66.8 -98.3,-160.8 -108.6,-183.4a7.5,7.5 0,0 0,-7.8 -4.3,7.5 7.5,0 0,0 -6.4,6.3c-3.9,24.6 -21.3,127.2 -54.9,206 0,0 -25.7,60.2 -19.5,104.6 0,0 5.8,123.8 139.1,105.3 133.3,-18.4 105.3,-139.1 105.3,-139.1z"
-      android:fillColor="#ABEE93"/>
-  <path
-      android:pathData="M564.9,725.9c74.5,10.3 168.4,-24 220.6,-213.7 50.8,-184.7 -3.8,-264.3 -151.8,-284.8 -147.9,-20.4 -221.6,41.5 -222.4,233.1 -0.8,190.5 77.5,254.8 153.7,265.3z"
-      android:fillColor="#54B721"/>
-  <path
-      android:pathData="M444.7,687.5c6.1,-44.4 47.1,-95.4 47.1,-95.4 53.7,-66.8 98.3,-160.8 108.6,-183.4a7.5,7.5 0,0 1,7.8 -4.3c3.3,0.4 5.9,3 6.4,6.3 3.9,24.6 21.3,127.2 54.9,206 0,0 25.7,60.2 19.5,104.6 0,0 -5.8,123.8 -139.1,105.3C416.7,808.2 444.7,687.5 444.7,687.5z"
-      android:fillColor="#ABEE93"/>
-  <path
-      android:pathData="M496,710.9c-80.3,0 -174.7,-50 -202.1,-258.2 -26.8,-202.8 42.7,-279 202.1,-279s228.4,76.3 201.3,279C670.3,654.3 578.2,710.9 496,710.9z"
-      android:fillColor="#54D533"/>
-  <path
-      android:pathData="M500.2,840.3c-14.8,0 -28.6,-1.5 -41.3,-4.3 -1.2,0.2 -2.3,0.3 -3.5,0.5 -44.1,6.1 -79.9,-2 -106.4,-24 -39.3,-32.7 -43.6,-84.3 -44,-90.3 -0.6,-4.5 -0.9,-9.3 -1,-14.3 -0.1,-9.1 -3.6,-17.8 -10,-24.5 -35.9,-37.4 -64.6,-94.1 -85,-168.5 -25.9,-94.3 -25.1,-163.7 2.6,-212.1 21,-36.7 57.1,-61.6 110.2,-75.9 5.3,-1.4 10.8,1.7 12.3,7.1 1.4,5.3 -1.7,10.8 -7.1,12.3 -47.8,12.9 -79.8,34.6 -98.1,66.5 -24.9,43.5 -25.1,107.9 -0.7,196.9 19.6,71.2 46.5,125 80.2,159.9 9.9,10.3 15.5,23.9 15.6,38.1 0,4.3 0.3,8.4 0.9,12.2 0,0.3 0.1,0.6 0.1,0.9 0,0.5 2.8,48.2 36.9,76.4 22,18.2 52.5,24.8 90.8,19.5 1.7,-0.2 3.3,-0.5 4.9,-0.8 1.3,-0.2 2.7,-0.2 4,0.2 11.6,2.8 24.5,4.3 38.5,4.3s27.7,-1.5 39.6,-4.5c1.4,-0.3 2.8,-0.4 4.1,-0.2 2.3,0.4 4.4,0.7 6.6,1 38.3,5.3 68.9,-1.3 90.9,-19.6 34.2,-28.4 36.8,-75.8 36.8,-76.3 0,-0.3 0,-0.6 0.1,-0.9 0.5,-3.8 0.8,-7.9 0.9,-12.2 0.1,-14.3 5.7,-27.8 15.6,-38.1 33.6,-34.9 60.6,-88.7 80.2,-159.9 16.1,-58.5 21.4,-105.6 16.3,-144 -4.9,-36.4 -19.2,-64.1 -43.8,-84.8 -4.2,-3.5 -4.8,-9.9 -1.2,-14.1s9.9,-4.8 14.1,-1.2c28.6,24 45.2,55.9 50.7,97.5 5.5,41 -0,90.7 -16.9,151.9 -20.5,74.4 -49.1,131.1 -85,168.5 -6.4,6.6 -9.9,15.3 -10,24.5 -0.1,5 -0.4,9.8 -1,14.3 -0.4,5.9 -4.6,57.6 -44,90.3 -26.5,22 -62.3,30.1 -106.4,24 -1.7,-0.2 -3.4,-0.5 -5.1,-0.8 -12.9,3.1 -27.2,4.6 -42.4,4.6z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M371,252s-35,56 -25,146c0,0 0,118.6 63.5,208.3l-33.9,54.1S323,608 307.3,524c0,0 -74,-234.5 58.9,-322.8 0,0 47.2,-27.2 101,-26.7 0,0 -84.2,38.5 -96.2,77.5z"
-      android:fillColor="#54B721"/>
-  <path
-      android:pathData="M496,720.9c-5.5,0 -10,-4.5 -10,-10s4.5,-10 10,-10c43.9,0 83.3,-17.4 114,-50.3 39.3,-42.1 65.3,-109.2 77.3,-199.2 13.7,-102.6 2.5,-172.9 -34.2,-214.9 -31.1,-35.5 -82.5,-52.8 -157.2,-52.8s-126.3,17.3 -157.6,53c-36.8,42 -48.2,112.3 -34.7,214.8 5.5,42 14.1,79.3 25.6,111 1.9,5.2 -0.8,10.9 -6,12.8 -5.2,1.9 -10.9,-0.8 -12.8,-6 -11.9,-33 -20.9,-71.8 -26.6,-115.2 -14.3,-108.6 -1.4,-184 39.4,-230.6 35.3,-40.2 91.7,-59.8 172.6,-59.8s137.1,19.5 172.2,59.6c40.8,46.6 53.5,122 39,230.7 -12.6,94.2 -40.4,165 -82.6,210.2 -34.6,37.1 -79.1,56.7 -128.6,56.7z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M624.5,707c0,-44.9 -33.7,-100.9 -33.7,-100.9 -44.1,-73.5 -75.4,-172.7 -82.6,-196.6a7.5,7.5 0,0 0,-7.2 -5.3c-3.3,0 -6.2,2.2 -7.2,5.3 -7.2,23.9 -38.4,123.1 -82.6,196.6 0,0 -33.7,56.1 -33.7,100.9 0,0 -11.2,123.4 123.4,123.4s123.4,-123.4 123.4,-123.4z"
-      android:fillColor="#D8F9CC"/>
-  <path
-      android:pathData="M442.3,566.7S399.3,670.9 414,724c0,0 10.3,66.4 99.6,97.2l-25.1,9.2s-111.8,0.1 -112.7,-123.1c0,0 18.7,-105.9 66.4,-140.6z"
-      android:fillColor="#ABEE93"/>
-  <path
-      android:pathData="M499.2,840.6c-44.5,0 -78.9,-12.9 -102.2,-38.4 -34.5,-37.8 -31.7,-89.5 -31.2,-95.4 0.2,-47 33.7,-103.3 35.1,-105.7 44,-73.4 75.7,-174.7 81.6,-194.3 2.2,-7.4 9,-12.4 16.8,-12.4s14.5,5 16.8,12.4c4.3,14.4 16.3,52.5 34,96.3 2.1,5.1 -0.4,10.9 -5.5,13 -5.1,2.1 -10.9,-0.4 -13,-5.5 -15.4,-38.2 -26.6,-72.1 -32.3,-90.3 -11,35.3 -40.5,123.3 -81.2,191 -0.3,0.5 -32.2,54.3 -32.2,95.8 0,0.3 -0,0.6 -0,0.9 -0,0.5 -3.8,48.1 26.1,80.8 19.3,21 48.7,31.7 87.3,31.7s68,-10.7 87.3,-31.7c29.9,-32.7 26.2,-80.3 26.1,-80.8 -0,-0.3 -0,-0.6 -0,-0.9 0,-41.6 -31.9,-95.3 -32.2,-95.8 -2.8,-4.7 -1.3,-10.9 3.4,-13.7s10.9,-1.3 13.7,3.4c1.4,2.4 34.9,58.7 35.1,105.7 0.4,5.9 3.3,57.7 -31.2,95.4 -23.2,25.5 -57.6,38.4 -102.2,38.4z"
-      android:fillColor="#333333"/>
-  <path
-      android:pathData="M703.5,860.6l-59.7,-2.4c-57,-2.3 -101.8,-50.8 -99.5,-107.8l1.1,-28.6c2.3,-57 50.8,-101.8 107.8,-99.5l59.7,2.4c57,2.3 101.8,50.8 99.5,107.8l-1.1,28.6c-2.3,57 -50.8,101.8 -107.8,99.5z"
-      android:fillColor="#F76C69"/>
-  <path
-      android:pathData="M731.9,830.7l-57.3,1.7c-66.1,-2.6 -107.2,-74.1 -104.5,-140.2l0.2,-4.4c0.3,-7.5 1.3,-14.9 2.9,-22 -14.8,19.1 -24,42.8 -25.1,68.6 -2.6,66.1 49.3,122.3 115.3,124.9l31.8,1.3c45.8,1.9 86.9,-22.6 108.7,-59.8 -29.9,17.4 -46.9,30.9 -72,29.9z"
-      android:fillColor="#E54E4E"/>
-  <path
-      android:pathData="M726.1,689.9l13.1,12.9c5.2,5.2 1.6,14.1 -5.7,14.1l-36.6,0.2c-2,0 -3.9,0.7 -5.3,2l-26.8,23.2c-4.4,3.8 -11.2,2 -13.2,-3.5l-7.7,-22a8.2,8.2 0,0 0,-6.2 -5.4l-26.1,-5.2c-7.8,-1.6 -9.1,-12.2 -1.8,-15.6l24.1,-11.2c2.7,-1.2 4.5,-3.8 4.7,-6.7l2.3,-23.1c0.6,-5.8 6.8,-9.2 12,-6.5l31.5,16.2c1.8,0.9 3.8,1.2 5.7,0.7l35.6,-8.4c7.2,-1.7 12.8,6.1 8.9,12.4l-9.7,15.6c-2,3.3 -1.5,7.6 1.2,10.3z"
-      android:fillColor="#EA5959"/>
-  <path
-      android:pathData="M705.9,678.3l23.1,21.1 -41.6,1.9 -25.8,24.2 -10.3,-26.1 -39.1,-6.2 35.3,-18 1.6,-28 32.1,15 40.1,-11.2 -15.4,27.3z"
-      android:fillColor="#54D533"/>
-  <path
-      android:pathData="M695.6,876.9c-1.8,0 -3.7,-0 -5.5,-0.1l-31.8,-1.3c-18.2,-0.7 -35.8,-5 -52.3,-12.8 -15.9,-7.5 -30,-17.9 -42,-30.9 -11.9,-12.9 -21.2,-27.8 -27.4,-44.3 -6.4,-17 -9.3,-34.9 -8.7,-53.2 0.7,-18.2 5,-35.8 12.8,-52.3 7.5,-15.9 17.9,-30 30.9,-42 12.9,-11.9 27.8,-21.2 44.3,-27.4 17,-6.4 34.9,-9.4 53.2,-8.6l31.8,1.3c18.2,0.7 35.8,5 52.3,12.8 15.9,7.5 30,17.9 42,30.9 11.9,12.9 21.2,27.8 27.4,44.3v0c6.4,17 9.3,34.9 8.6,53.2 -0.7,18.2 -5,35.8 -12.8,52.3 -7.5,15.9 -17.9,30 -30.9,42 -12.9,11.9 -27.8,21.2 -44.3,27.4a134.1,134.1 0,0 1,-47.7 8.7zM663.7,624c-13.9,0 -27.6,2.5 -40.6,7.4 -14,5.3 -26.8,13.2 -37.8,23.4 -11.1,10.2 -19.9,22.3 -26.3,35.8 -6.6,14 -10.3,29 -10.9,44.5 -0.6,15.6 1.9,30.8 7.4,45.3 5.3,14 13.2,26.8 23.4,37.8 10.2,11.1 22.3,19.9 35.8,26.4 14,6.6 29,10.3 44.5,10.9l31.8,1.3c1.5,0.1 3.1,0.1 4.7,0.1 13.9,0 27.6,-2.5 40.6,-7.4 14,-5.3 26.8,-13.2 37.8,-23.4 11.1,-10.2 19.9,-22.3 26.3,-35.8 6.6,-14 10.3,-29 10.9,-44.5 0.6,-15.5 -1.9,-30.8 -7.4,-45.3 -5.3,-14 -13.2,-26.7 -23.4,-37.8 -10.2,-11.1 -22.3,-19.9 -35.8,-26.4 -14,-6.6 -29,-10.3 -44.5,-10.9l-31.8,-1.3c-1.5,-0.1 -3.1,-0.1 -4.7,-0.1zM662.3,733.4a10,10 0,0 1,-9.4 -6.6l-6.9,-19.1 -30.5,-5.7a10,10 0,0 1,-8.1 -8.5c-0.6,-4.3 1.7,-8.5 5.6,-10.3l28.1,-13.4 1.8,-20.3a10,10 0,0 1,14.4 -8.1l26.1,13.1 34,-8.4c3.9,-1 8.1,0.5 10.5,3.8s2.6,7.6 0.5,11.1l-10.9,18.1 15.2,14.7a10,10 0,0 1,2.3 10.9,10 10,0 0,1 -9.1,6.3l-35,0.6 -21.8,19.4a10,10 0,0 1,-6.6 2.5zM649.3,687.9l6,1.1a10,10 0,0 1,7.6 6.4l3.8,10.6 13.6,-12.1a10,10 0,0 1,6.5 -2.5l14.6,-0.3 -3.6,-3.5a10,10 0,0 1,-1.6 -12.4l2.6,-4.3 -14.1,3.5c-2.3,0.6 -4.8,0.3 -6.9,-0.8l-16.2,-8.1 -1,11.3c-0.3,3.5 -2.5,6.6 -5.7,8.2l-5.5,2.6z"
-      android:fillColor="#333333"/>
-</vector>
--- a/app/src/main/res/drawable/ic_member_baby_boy_24dp.xml
+++ b/app/src/main/res/drawable/ic_member_baby_boy_24dp.xml
@ -1,60 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="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"
-      android:fillColor="#F5C73E"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#F5C73E"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#64C4F6"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#FFECE3"/>
-  <path
-      android:pathData="M628.7,700.6c64.7,102.9 -28.9,155.3 -116.7,155.3s-181.4,-52.3 -116.7,-155.3h233.4z"
-      android:fillColor="#99D37A"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#FCE170"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#F7DBD0"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#F7DBD0"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#FFECE3"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#47515E"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#4EAEE0"/>
-  <path
-      android:pathData="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.1zM512,622.9c-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"
-      android:fillColor="#64C4F6"/>
-  <path
-      android:pathData="M512,622.9m-48,0a48,48 0,1 0,96 0,48 48,0 1,0 -96,0Z"
-      android:fillColor="#64C4F6"/>
-  <path
-      android:pathData="M600,582.9m-8,0a8,8 0,1 0,16 0,8 8,0 1,0 -16,0Z"
-      android:fillColor="#64C4F6"/>
-  <path
-      android:pathData="M600,614.9m-8,0a8,8 0,1 0,16 0,8 8,0 1,0 -16,0Z"
-      android:fillColor="#64C4F6"/>
-  <path
-      android:pathData="M424,582.9m-8,0a8,8 0,1 0,16 0,8 8,0 1,0 -16,0Z"
-      android:fillColor="#64C4F6"/>
-  <path
-      android:pathData="M424,614.9m-8,0a8,8 0,1 0,16 0,8 8,0 1,0 -16,0Z"
-      android:fillColor="#64C4F6"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#450064"/>
-</vector>
--- a/app/src/main/res/drawable/ic_member_baby_girl_24dp.xml
+++ b/app/src/main/res/drawable/ic_member_baby_girl_24dp.xml
@ -1,72 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="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"
-      android:fillColor="#F5C73E"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#F5C73E"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#F7867F"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#FFECE3"/>
-  <path
-      android:pathData="M628.7,700.6c64.7,102.9 -28.9,155.3 -116.7,155.3s-181.4,-52.3 -116.7,-155.3h233.4z"
-      android:fillColor="#99D37A"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#FCE170"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#F7DBD0"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#F7DBD0"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#FFECE3"/>
-  <path
-      android:pathData="M326.5,558.2a49.8,39.5 0,1 0,99.6 0,49.8 39.5,0 1,0 -99.6,0Z"
-      android:fillColor="#FFD7DF"/>
-  <path
-      android:pathData="M597.9,558.2a49.8,39.5 0,1 0,99.6 0,49.8 39.5,0 1,0 -99.6,0Z"
-      android:fillColor="#FFD7DF"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#47515E"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#E96E67"/>
-  <path
-      android:pathData="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.1zM512,622.9c-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"
-      android:fillColor="#F7867F"/>
-  <path
-      android:pathData="M512,622.9m-48,0a48,48 0,1 0,96 0,48 48,0 1,0 -96,0Z"
-      android:fillColor="#F7867F"/>
-  <path
-      android:pathData="M600,582.9m-8,0a8,8 0,1 0,16 0,8 8,0 1,0 -16,0Z"
-      android:fillColor="#F7867F"/>
-  <path
-      android:pathData="M600,614.9m-8,0a8,8 0,1 0,16 0,8 8,0 1,0 -16,0Z"
-      android:fillColor="#F7867F"/>
-  <path
-      android:pathData="M424,582.9m-8,0a8,8 0,1 0,16 0,8 8,0 1,0 -16,0Z"
-      android:fillColor="#F7867F"/>
-  <path
-      android:pathData="M424,614.9m-8,0a8,8 0,1 0,16 0,8 8,0 1,0 -16,0Z"
-      android:fillColor="#F7867F"/>
-  <path
-      android:pathData="M582,302.8c-3,0 -6,-0.5 -8.9,-1.6L512,279l-61.1,22.2c-13.5,4.9 -28.4,-2.1 -33.3,-15.5 -1,-2.8 -1.6,-5.9 -1.6,-8.9v-60.6c0,-14.4 11.6,-26 26,-26 3,0 6,0.5 8.9,1.6L512,214l61.1,-22.2c13.5,-4.9 28.4,2.1 33.3,15.5 1,2.8 1.6,5.9 1.6,8.9v60.6c0,14.4 -11.6,26 -26,26z"
-      android:fillColor="#F5C73E"/>
-  <path
-      android:pathData="M512,286.5c-13.2,0 -24,-10.8 -24,-24v-32c0,-13.3 10.7,-24 24,-24s24,10.7 24,24v32c0,13.3 -10.8,24 -24,24z"
-      android:fillColor="#FCE170"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#450064"/>
-</vector>
--- a/app/src/main/res/drawable/ic_member_boy_24dp.xml
+++ b/app/src/main/res/drawable/ic_member_boy_24dp.xml
@ -1,48 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="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"
-      android:fillColor="#99D37A"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#FFECE3"/>
-  <path
-      android:pathData="M438.4,707.7a73.6,47.4 0,1 0,147.2 0,73.6 47.4,0 1,0 -147.2,0Z"
-      android:fillColor="#F7DBD0"/>
-  <path
-      android:pathData="M507.3,720l-0.3,0.5 -0.3,-0.5h0.3z"
-      android:fillColor="#EFEAEB"/>
-  <path
-      android:pathData="M507.3,720l-0.3,0.5 -0.3,-0.5h0.3z"
-      android:fillColor="#EFEAEB"/>
-  <path
-      android:pathData="M507.3,720l-0.3,0.5 -0.3,-0.5h0.3z"
-      android:fillColor="#EFEAEB"/>
-  <path
-      android:pathData="M507.3,720l-0.3,0.5 -0.3,-0.5h0.3z"
-      android:fillColor="#EFEAEB"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#F7DBD0"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#F7DBD0"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#FFECE3"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#450064"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#5C6A7C"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#4EAEE0"/>
-  <path
-      android:pathData="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.1zM583.1,306.7c-4.1,4.1 -9.7,6.6 -15.9,6.6L456.8,313.3c-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"
-      android:fillColor="#64C4F6"/>
-</vector>
--- a/app/src/main/res/drawable/ic_member_bride_24dp.xml
+++ b/app/src/main/res/drawable/ic_member_bride_24dp.xml
@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="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"
-      android:fillColor="#F3F3F3"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#DEE3E3"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#47515E"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#FFECE3"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#E96E67"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#FFECE3"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#F7DBD0"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#F7DBD0"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#FFECE3"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#5C6A7C"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#F7867F"/>
-  <path
-      android:pathData="M326.5,558.2a49.8,39.5 0,1 0,99.6 0,49.8 39.5,0 1,0 -99.6,0Z"
-      android:fillColor="#FFD7DF"/>
-  <path
-      android:pathData="M597.9,558.2a49.8,39.5 0,1 0,99.6 0,49.8 39.5,0 1,0 -99.6,0Z"
-      android:fillColor="#FFD7DF"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#450064"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#FCE170"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#FCE170"/>
-</vector>
--- a/app/src/main/res/drawable/ic_member_family_24dp.xml
+++ b/app/src/main/res/drawable/ic_member_family_24dp.xml
@ -1,120 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M966.8,623.5l-0.4,97.9L513.3,984.6l0.4,-97.9 453,-263.3z"
-      android:fillColor="#3DB542"/>
-  <path
-      android:pathData="M690.8,783.9v97.6l275.5,-160.1 0.4,-97.9 -276,160.4z"
-      android:fillColor="#6DCB60"/>
-  <path
-      android:pathData="M860.4,685.3v97.6l106,-61.6 0.4,-97.9 -106.4,61.9z"
-      android:fillColor="#3DB542"/>
-  <path
-      android:pathData="M513.8,886.8l-0.4,97.9L57.2,721.3l0.4,-97.8 456.2,263.4z"
-      android:fillColor="#6DCB60"/>
-  <path
-      android:pathData="M194.2,702.2v98.1l319.2,184.3 0.4,-97.8 -319.6,-184.5z"
-      android:fillColor="#3DB542"/>
-  <path
-      android:pathData="M361.1,798.6v98.1l152.3,87.9 0.4,-97.9 -152.7,-88.2z"
-      android:fillColor="#6DCB60"/>
-  <path
-      android:pathData="M966.8,623.5L513.8,886.8 57.6,623.4l453,-263.3 456.2,263.4z"
-      android:fillColor="#81D672"/>
-  <path
-      android:pathData="M877.7,398.4l-353.2,-205.3 -26.6,-16.7 353.2,205.3 26.5,16.7z"
-      android:fillColor="#792D2D"/>
-  <path
-      android:pathData="M512,831.5L158.8,626.3l-0.7,-253.7 353.2,205.3 0.7,253.7z"
-      android:fillColor="#E9E8E6"/>
-  <path
-      android:pathData="M851.2,381.6L497.9,176.4l-170.5,-107.3 353.2,205.3 170.5,107.3z"
-      android:fillColor="#792D2D"/>
-  <path
-      android:pathData="M680.6,274.3l170.5,107.3 0.7,253.7L512,831.5l-0.7,-253.7 169.4,-303.6z"
-      android:fillColor="#D6D4D2"/>
-  <path
-      android:pathData="M511.3,577.9l-353.2,-205.3L327.4,69l353.2,205.3 -169.4,303.6z"
-      android:fillColor="#ABABA9"/>
-  <path
-      android:pathData="M472,618.5L118.7,413.2l208.6,-373.9 353.2,205.3 -208.6,373.9z"
-      android:fillColor="#F25A5A"/>
-  <path
-      android:pathData="M472,618.5L191.1,455.3l208.6,-373.8 280.9,163.3 -208.6,373.8z"
-      android:fillColor="#DD4A4A"/>
-  <path
-      android:pathData="M472,618.5l-208.6,-121.2 208.6,-373.9 208.6,121.2 -208.6,373.9z"
-      android:fillColor="#FC7E7E"/>
-  <path
-      android:pathData="M472,618.5l-136.3,-79.2 208.6,-373.9 136.3,79.2 -208.6,373.9z"
-      android:fillColor="#F25A5A"/>
-  <path
-      android:pathData="M680.6,244.6l210,132.2 -12.9,21.5 -26.5,-16.7 -170.5,-107.3 -169.4,303.6 -26.4,47.3 -12.9,-6.6 208.6,-373.9z"
-      android:fillColor="#CC4848"/>
-  <path
-      android:pathData="M465.1,241.1l-0.4,66.2 -87.7,157.6 0.4,-172.8 87.7,-51z"
-      android:fillColor="#D6D4D2"/>
-  <path
-      android:pathData="M377.3,292.1l-0.4,172.8 -88.3,-51 0.4,-172.8 88.3,51z"
-      android:fillColor="#E9E8E6"/>
-  <path
-      android:pathData="M465.1,241.1l-87.7,51 -88.3,-51 87.7,-51 88.3,51z"
-      android:fillColor="#DCDCDC"/>
-  <path
-      android:pathData="M477.5,241.6l-0.1,40.1 -99.8,58 0.1,-40.1 99.8,-58z"
-      android:fillColor="#C4C2C0"/>
-  <path
-      android:pathData="M377.7,299.6l-0.1,40.1 -100.5,-58 0.1,-40.1 100.5,58z"
-      android:fillColor="#D6D4D2"/>
-  <path
-      android:pathData="M477.5,241.6l-99.8,58 -100.5,-58 99.8,-58 100.4,58z"
-      android:fillColor="#E9E8E6"/>
-  <path
-      android:pathData="M312.5,241.6l64.7,37.4v-75l-64.7,37.6z"
-      android:fillColor="#21201F"/>
-  <path
-      android:pathData="M442.3,241.6l-65.1,-37.6v75l0.4,0.3 64.7,-37.6z"
-      android:fillColor="#434240"/>
-  <path
-      android:pathData="M562.2,381.1c-7.5,2.4 -14.1,6.5 -19.6,12 -5.4,5.4 -9.5,12 -12,19.5 -0.7,2.4 -3.9,2.4 -4.8,0a48.9,48.9 0,0 0,-31.4 -31.4c-2.5,-0.8 -2.5,-4.1 0,-4.9 7.5,-2.4 14.1,-6.6 19.5,-12s9.6,-12 12,-19.4c0.8,-2.4 4.1,-2.4 4.8,0 2.5,7.5 6.6,14.1 12,19.5 5.5,5.4 12.1,9.6 19.6,12a2.6,2.6 0,0 1,0 4.9v0z"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M193.4,620.4l0.4,-122.2 12.8,7.4 -0.3,108.2 -12.8,6.7z"
-      android:fillColor="#D6D4D2"/>
-  <path
-      android:pathData="M206.2,613.8l93.6,54.1 -0,14 -106.4,-61.4 12.8,-6.7z"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M206.2,613.8l40.9,23.6 12.2,7.1 40.5,23.4 0.3,-108.2 -40.8,-23.6 -12.2,-7.1 -40.5,-23.4 -0.3,108.2z"
-      android:fillColor="#0074D1"/>
-  <path
-      android:pathData="M247,529v108.3l12.2,7.1v-108.3l-12.2,-7.1z"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M342.1,706.3l0.3,-122.2 12.8,7.4 -0.3,108.2 -12.8,6.7z"
-      android:fillColor="#D6D4D2"/>
-  <path
-      android:pathData="M354.9,699.6l93.6,54 -0,14.1 -106.4,-61.4 12.8,-6.7z"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M354.9,699.6l40.8,23.6 12.2,7.1 40.5,23.4 0.3,-108.2 -40.8,-23.6 -12.2,-7.1 -40.5,-23.4 -0.3,108.2z"
-      android:fillColor="#0074D1"/>
-  <path
-      android:pathData="M395.8,614.9V723.2l12.2,7.1V621.9l-12.2,-7.1z"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M761.1,442.7l-19,11 0.4,222.6 19.1,11 -0.4,-244.6z"
-      android:fillColor="#E9E8E6"/>
-  <path
-      android:pathData="M742.5,676.4l-103.5,59.8 0.1,22L761.6,687.4v-0.1l-19.1,-11z"
-      android:fillColor="#81D672"/>
-  <path
-      android:pathData="M742.1,453.7l-103.6,59.8 0.4,222.7 103.5,-59.8 -0.4,-222.7z"
-      android:fillColor="#3F9AE0"/>
-  <path
-      android:pathData="M742.5,568v22.1l-103.5,59.7 -0.1,-22 103.5,-59.9z"
-      android:fillColor="#0074D1"/>
-</vector>
--- a/app/src/main/res/drawable/ic_member_father_24dp.xml
+++ b/app/src/main/res/drawable/ic_member_father_24dp.xml
@ -1,51 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="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"
-      android:fillColor="#D79B89"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#FFECE3"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#64C4F6"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M506.7,720.1l26.8,38.6c9.6,13.9 30,14.4 40.3,1l46.4,-60.4 -113.5,20.8z"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M507.3,720l-0.3,0.5 -0.3,-0.5h0.3z"
-      android:fillColor="#EFEAEB"/>
-  <path
-      android:pathData="M507.3,720l-0.3,0.5 -0.3,-0.5h0.3z"
-      android:fillColor="#EFEAEB"/>
-  <path
-      android:pathData="M507.3,720l-0.3,0.5 -0.3,-0.5h0.3z"
-      android:fillColor="#EFEAEB"/>
-  <path
-      android:pathData="M507.3,720l-0.3,0.5 -0.3,-0.5h0.3z"
-      android:fillColor="#EFEAEB"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#F7DBD0"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#F7DBD0"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#FFECE3"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#5C6A7C"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#450064"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#5C6A7C"/>
-</vector>
--- a/app/src/main/res/drawable/ic_member_girl_24dp.xml
+++ b/app/src/main/res/drawable/ic_member_girl_24dp.xml
@ -1,63 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M246.6,745l-40.5,-40.5c-13.6,-13.6 -13.6,-35.7 0,-49.3 13.6,-13.6 35.7,-13.6 49.3,0l40.5,40.5c13.6,13.6 13.6,35.7 0,49.3 -13.5,13.5 -35.7,13.5 -49.3,0zM777.4,745l40.5,-40.5c13.6,-13.6 13.6,-35.7 0,-49.3 -13.6,-13.6 -35.7,-13.6 -49.3,0l-40.5,40.5c-13.6,13.6 -13.6,35.7 0,49.3 13.5,13.5 35.7,13.5 49.3,0z"
-      android:fillColor="#47515E"/>
-  <path
-      android:pathData="M252.4,698.7c-15.3,-15.3 -15.3,-40.3 0,-55.6l99.6,-99.6c15.3,-15.3 40.3,-15.3 55.6,0 15.3,15.3 15.3,40.3 0,55.6L308,698.7c-15.3,15.3 -40.3,15.3 -55.6,0zM771.6,698.7c15.3,-15.3 15.3,-40.3 0,-55.6L672,543.5c-15.3,-15.3 -40.3,-15.3 -55.6,0 -15.3,15.3 -15.3,40.3 0,55.6l99.6,99.6c15.3,15.3 40.3,15.3 55.6,0z"
-      android:fillColor="#5C6A7C"/>
-  <path
-      android:pathData="M716.5,906.1h-409c0,-27.6 3.5,-57.2 9.3,-79h1.4c24.3,-85.8 82,-125.1 82,-125.1h223.7s57.7,39.3 82,125.1h1.3c5.7,21.8 9.3,51.4 9.3,79z"
-      android:fillColor="#64C4F6"/>
-  <path
-      android:pathData="M507.3,720l-0.3,0.5 -0.3,-0.5h0.3z"
-      android:fillColor="#EFEAEB"/>
-  <path
-      android:pathData="M507.3,720l-0.3,0.5 -0.3,-0.5h0.3z"
-      android:fillColor="#EFEAEB"/>
-  <path
-      android:pathData="M507.3,720l-0.3,0.5 -0.3,-0.5h0.3z"
-      android:fillColor="#EFEAEB"/>
-  <path
-      android:pathData="M507.3,720l-0.3,0.5 -0.3,-0.5h0.3z"
-      android:fillColor="#EFEAEB"/>
-  <path
-      android:pathData="M521.4,702c-1.2,13.7 -4.4,28.2 -9.4,42.9 -12.8,38 -37.8,78 -73.2,113.4 -19,19 -39.4,35 -60,47.8h-71.2c0,-27.6 3.5,-57.2 9.3,-79h1.4c24.3,-85.8 82,-125.1 82,-125.1h121.1z"
-      android:fillColor="#E96E67"/>
-  <path
-      android:pathData="M716.5,906.1h-71.2c-20.7,-12.7 -41,-28.8 -60,-47.8 -35.4,-35.4 -60.4,-75.5 -73.2,-113.4 -5,-14.8 -8.2,-29.2 -9.4,-42.9H624s57.7,39.3 82,125.1h1.3c5.6,21.8 9.2,51.4 9.2,79z"
-      android:fillColor="#E96E67"/>
-  <path
-      android:pathData="M532,805.4c0,41.5 -20.9,75.1 -20.9,75.1s-20.9,-33.6 -20.9,-75.1 20.9,-75.1 20.9,-75.1 20.9,33.6 20.9,75.1z"
-      android:fillColor="#F7867F"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#F7DBD0"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#F7DBD0"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#FFECE3"/>
-  <path
-      android:pathData="M326.5,558.2a49.8,39.5 0,1 0,99.6 0,49.8 39.5,0 1,0 -99.6,0Z"
-      android:fillColor="#FFD7DF"/>
-  <path
-      android:pathData="M597.9,558.2a49.8,39.5 0,1 0,99.6 0,49.8 39.5,0 1,0 -99.6,0Z"
-      android:fillColor="#FFD7DF"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#450064"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#5C6A7C"/>
-  <path
-      android:pathData="M800.4,340.1c0,6.4 -0.2,12.7 -0.6,18.9H224.2c-0.4,-6.2 -0.6,-12.5 -0.6,-18.9 0,-19.1 1.8,-37.7 5.4,-55.8C255,151.7 371.8,51.6 512,51.6s257.1,100.1 283,232.7c3.6,18.1 5.4,36.7 5.4,55.8z"
-      android:fillColor="#FCE170"/>
-  <path
-      android:pathData="M851,321.7c0,10.3 -4.2,19.6 -11,26.4s-16.1,11 -26.4,11H210.3c-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,-11h603.4c20.4,-0.1 37.2,16.7 37.2,37.3z"
-      android:fillColor="#F5C73E"/>
-</vector>
--- a/app/src/main/res/drawable/ic_member_grandfather_24dp.xml
+++ b/app/src/main/res/drawable/ic_member_grandfather_24dp.xml
@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="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"
-      android:fillColor="#64C4F6"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#FFECE3"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#D79B89"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M506.7,720.1l26.8,38.6c9.6,13.9 30,14.4 40.3,1l46.4,-60.4 -113.5,20.8z"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M507.3,720l-0.3,0.5 -0.3,-0.5h0.3z"
-      android:fillColor="#EFEAEB"/>
-  <path
-      android:pathData="M507.3,720l-0.3,0.5 -0.3,-0.5h0.3z"
-      android:fillColor="#EFEAEB"/>
-  <path
-      android:pathData="M507.3,720l-0.3,0.5 -0.3,-0.5h0.3z"
-      android:fillColor="#EFEAEB"/>
-  <path
-      android:pathData="M507.3,720l-0.3,0.5 -0.3,-0.5h0.3z"
-      android:fillColor="#EFEAEB"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#F7DBD0"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#F7DBD0"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#FFECE3"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#450064"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#450064"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#F3F3F3"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#450064"/>
-</vector>
--- a/app/src/main/res/drawable/ic_member_grandmother_24dp.xml
+++ b/app/src/main/res/drawable/ic_member_grandmother_24dp.xml
@ -1,63 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="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"
-      android:fillColor="#F7867F"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#FFECE3"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M506.7,720.1l26.8,38.6c9.6,13.9 30,14.4 40.3,1l46.4,-60.4 -113.5,20.8z"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M507.3,720l-0.3,0.5 -0.3,-0.5h0.3z"
-      android:fillColor="#EFEAEB"/>
-  <path
-      android:pathData="M507.3,720l-0.3,0.5 -0.3,-0.5h0.3z"
-      android:fillColor="#EFEAEB"/>
-  <path
-      android:pathData="M507.3,720l-0.3,0.5 -0.3,-0.5h0.3z"
-      android:fillColor="#EFEAEB"/>
-  <path
-      android:pathData="M507.3,720l-0.3,0.5 -0.3,-0.5h0.3z"
-      android:fillColor="#EFEAEB"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#F7DBD0"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#F7DBD0"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#FCE170"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#FCE170"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#FFECE3"/>
-  <path
-      android:pathData="M326.5,558.2a49.8,39.5 0,1 0,99.6 0,49.8 39.5,0 1,0 -99.6,0Z"
-      android:fillColor="#FFD7DF"/>
-  <path
-      android:pathData="M597.9,558.2a49.8,39.5 0,1 0,99.6 0,49.8 39.5,0 1,0 -99.6,0Z"
-      android:fillColor="#FFD7DF"/>
-  <path
-      android:pathData="M776.9,213.8c-4.9,-1.9 -8.4,-6.3 -9.2,-11.5 -6.1,-38.9 -39.7,-68.6 -80.3,-68.6 -15.3,0 -29.6,4.2 -41.8,11.6 -6,3.6 -13.6,2.1 -18.3,-3.1 -23.7,-26.7 -66.5,-44.5 -115.3,-44.5s-91.6,17.8 -115.3,44.5c-4.6,5.2 -12.3,6.7 -18.3,3.1 -12.2,-7.3 -26.5,-11.6 -41.8,-11.6 -40.6,0 -74.2,29.7 -80.3,68.6 -0.8,5.2 -4.3,9.6 -9.2,11.5 -34,13.1 -58.3,47.3 -58.3,87.4 0,51.5 39.9,93.2 89.1,93.2 47.2,0 84.3,-27 97,-64.3 2.5,-7.2 10.1,-11.2 17.5,-9.2 38.3,10.3 81.4,2.4 110.2,-21.3a14.5,14.5 0,0 1,18.6 0c28.8,23.7 71.9,31.6 110.2,21.3 7.4,-2 15,2 17.5,9.2 12.7,37.3 49.8,64.3 97,64.3 49.2,0 89.1,-41.7 89.1,-93.2 0.2,-40.1 -24.1,-74.3 -58.1,-87.4z"
-      android:fillColor="#F3F3F3"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#450064"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#450064"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#450064"/>
-</vector>
--- a/app/src/main/res/drawable/ic_member_groom_24dp.xml
+++ b/app/src/main/res/drawable/ic_member_groom_24dp.xml
@ -1,54 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="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"
-      android:fillColor="#F3F3F3"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#F3F3F3"/>
-  <path
-      android:pathData="M549.3,735.6L538.5,764l-1.8,4.6 -7.4,19.5h-37.6l-20,-52.5z"
-      android:fillColor="#E96E67"/>
-  <path
-      android:pathData="M529.3,788.1h-37.6l-20,118h77.6z"
-      android:fillColor="#F7867F"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#47515E"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M506.7,720.1l26.8,38.6c9.6,13.9 30,14.4 40.3,1l46.4,-60.4 -113.5,20.8z"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M507.3,720l-0.3,0.5 -0.3,-0.5h0.3z"
-      android:fillColor="#EFEAEB"/>
-  <path
-      android:pathData="M507.3,720l-0.3,0.5 -0.3,-0.5h0.3z"
-      android:fillColor="#EFEAEB"/>
-  <path
-      android:pathData="M507.3,720l-0.3,0.5 -0.3,-0.5h0.3z"
-      android:fillColor="#EFEAEB"/>
-  <path
-      android:pathData="M507.3,720l-0.3,0.5 -0.3,-0.5h0.3z"
-      android:fillColor="#EFEAEB"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#F7DBD0"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#F7DBD0"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#FFECE3"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#5C6A7C"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#450064"/>
-</vector>
--- a/app/src/main/res/drawable/ic_member_mother_24dp.xml
+++ b/app/src/main/res/drawable/ic_member_mother_24dp.xml
@ -1,60 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="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"
-      android:fillColor="#AD6D5A"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#F7867F"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#FFECE3"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M506.7,720.1l26.8,38.6c9.6,13.9 30,14.4 40.3,1l46.4,-60.4 -113.5,20.8z"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M507.3,720l-0.3,0.5 -0.3,-0.5h0.3z"
-      android:fillColor="#EFEAEB"/>
-  <path
-      android:pathData="M507.3,720l-0.3,0.5 -0.3,-0.5h0.3z"
-      android:fillColor="#EFEAEB"/>
-  <path
-      android:pathData="M507.3,720l-0.3,0.5 -0.3,-0.5h0.3z"
-      android:fillColor="#EFEAEB"/>
-  <path
-      android:pathData="M507.3,720l-0.3,0.5 -0.3,-0.5h0.3z"
-      android:fillColor="#EFEAEB"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#F7DBD0"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#F7DBD0"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#FCE170"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#FCE170"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#FFECE3"/>
-  <path
-      android:pathData="M326.5,558.2a49.8,39.5 0,1 0,99.6 0,49.8 39.5,0 1,0 -99.6,0Z"
-      android:fillColor="#FFD7DF"/>
-  <path
-      android:pathData="M597.9,558.2a49.8,39.5 0,1 0,99.6 0,49.8 39.5,0 1,0 -99.6,0Z"
-      android:fillColor="#FFD7DF"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#450064"/>
-  <path
-      android:pathData="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"
-      android:fillColor="#D79B89"/>
-</vector>
--- a/app/src/main/res/drawable/piechart.xml
+++ b/app/src/main/res/drawable/piechart.xml
@ -1,21 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M615.3,574L512,753l-34.4,59.7 -34.4,59.6 -34.6,59.7c-30.9,-17.9 -59.6,-39.9 -85.5,-65.8s-47.9,-54.6 -65.8,-85.5c-36,-62.1 -55.2,-132.9 -55.2,-206.7h413.2z"
-      android:fillColor="#F9980D"/>
-  <path
-      android:pathData="M890.7,574c0,49.2 -12.8,96.4 -36.8,137.8 -11.9,20.6 -26.6,39.7 -43.9,57 -17.3,17.3 -36.4,32 -57,43.9L718.6,753 615.3,574l179,-103.3 59.7,-34.4c24,41.4 36.7,88.6 36.7,137.7z"
-      android:fillColor="#A6DB20"/>
-  <path
-      android:pathData="M787.5,872.3c-51.8,30 -110.8,46 -172.2,46s-120.4,-16 -172.2,-46l34.4,-59.6L512,753l103.3,-179 103.3,179 34.4,59.7 34.5,59.6z"
-      android:fillColor="#FAD60E"/>
-  <path
-      android:pathData="M794.3,470.7L615.3,574V367.4c36.9,0 72.3,9.6 103.3,27.6 15.4,8.9 29.8,20 42.7,32.9 13,13 24,27.4 33,42.8z"
-      android:fillColor="#3282FE"/>
-  <path
-      android:pathData="M615.3,92v482h-482c0,-87.8 23.5,-170.1 64.5,-241.1 42.3,-73.2 103.3,-134.2 176.5,-176.5 70.8,-40.9 153.2,-64.4 241,-64.4z"
-      android:fillColor="#C61700"/>
-</vector>
--- a/app/src/main/res/drawable/setting.xml
+++ b/app/src/main/res/drawable/setting.xml
@ -1,24 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M964.9,410.2a27.3,27.3 0,0 0,-27.2 -20.8,131.3 131.3,0 0,1 -114,-63.3 125.5,125.5 0,0 1,-1.4 -126.9,26.4 26.4,0 0,0 -5.5,-33.3 461.7,461.7 0,0 0,-157.5 -87.8,27.6 27.6,0 0,0 -31.9,12.1 132.2,132.2 0,0 1,-224.9 0,27.6 27.6,0 0,0 -32,-12.1A461.9,461.9 0,0 0,212.7 165.9a26.4,26.4 0,0 0,-5.5 33.3,125.5 125.5,0 0,1 -1.4,126.9 131.3,131.3 0,0 1,-114 63.3,27.3 27.3,0 0,0 -27.2,20.8 441.8,441.8 0,0 0,-10.6 96.2,378.1 378.1,0 0,0 9.1,89.6c6.2,25.3 36.8,31.9 50,31.7 45.7,-0.8 68.1,11.4 92.8,52.7a125.6,125.6 0,0 1,-0.6 130.5A26.3,26.3 0,0 0,209.9 844.8a462.6,462.6 0,0 0,157 88.9,27.6 27.6,0 0,0 32.7,-13 132.1,132.1 0,0 1,229.9 0,27.6 27.6,0 0,0 32.7,13A462.6,462.6 0,0 0,819.2 844.8a26.3,26.3 0,0 0,5.1 -33.9,125.6 125.6,0 0,1 -0.6,-130.5c24.7,-41.3 41.3,-52.6 87,-51.9 13.2,0 52,-15.4 55.8,-32.5a420.6,420.6 0,0 0,9.1 -89.6,441.8 441.8,0 0,0 -10.8,-96.3z"
-      android:fillColor="#0F059B"/>
-  <path
-      android:pathData="M931.5,432.5a25.6,25.6 0,0 0,-25.3 -19.8,121.2 121.2,0 0,1 -107.1,-180.3 25.6,25.6 0,0 0,-5.1 -31.6A426.1,426.1 0,0 0,647.9 117.8a25.6,25.6 0,0 0,-29.7 11.5,121.2 121.2,0 0,1 -208.6,0A25.6,25.6 0,0 0,379.9 117.8a426.1,426.1 0,0 0,-146.1 83.1,25.6 25.6,0 0,0 -5.1,31.6 121.2,121.2 0,0 1,-107.2 180.3,25.6 25.6,0 0,0 -25.2,19.8 424.1,424.1 0,0 0,-9.9 91.1,429.8 429.8,0 0,0 8.4,84.9 25.6,25.6 0,0 0,25.6 20.1,121.2 121.2,0 0,1 106.2,183.6 25.3,25.3 0,0 0,4.6 32.1,427.7 427.7,0 0,0 145.6,84.3 25.6,25.6 0,0 0,30.4 -12.2,121.3 121.3,0 0,1 213.3,0 25.6,25.6 0,0 0,30.3 12.3,427.7 427.7,0 0,0 145.6,-84.3 25.6,25.6 0,0 0,4.6 -32.1,121.2 121.2,0 0,1 106.2,-183.6 25.6,25.6 0,0 0,25.6 -20.1,429.8 429.8,0 0,0 8.4,-84.9 424.1,424.1 0,0 0,-9.8 -91.3z"
-      android:fillColor="#402AD2"/>
-  <path
-      android:pathData="M866.9,436.5a21,21 0,0 0,-21 -16A101.7,101.7 0,0 1,757.8 371.7a96.5,96.5 0,0 1,-1.1 -97.9,20.5 20.5,0 0,0 -4.3,-25.6 358.4,358.4 0,0 0,-121.9 -67.6,21.4 21.4,0 0,0 -24.7,9.3 102.4,102.4 0,0 1,-174.1 0,21.4 21.4,0 0,0 -24.7,-9.3 358.7,358.7 0,0 0,-122 67.6,20.5 20.5,0 0,0 -4.3,25.6 96.4,96.4 0,0 1,-1.1 97.9,101.7 101.7,0 0,1 -88.3,48.7 21,21 0,0 0,-21 16,337.5 337.5,0 0,0 -8.2,74.1A341.3,341.3 0,0 0,169 579.7a21,21 0,0 0,21.4 16.3,101.8 101.8,0 0,1 89.1,48.7 96.5,96.5 0,0 1,-0.5 100.6,20.5 20.5,0 0,0 3.8,26.1A358.9,358.9 0,0 0,404.5 839.9a21.5,21.5 0,0 0,25.2 -10.2,102.4 102.4,0 0,1 177.9,0 21.5,21.5 0,0 0,25.2 10.2,358.9 358.9,0 0,0 121.5,-68.6 20.5,20.5 0,0 0,3.8 -26.1,96.5 96.5,0 0,1 -0.5,-100.6 101.8,101.8 0,0 1,89.1 -48.7,21 21,0 0,0 21.4,-16.3 341.3,341.3 0,0 0,7.1 -69.1,337.5 337.5,0 0,0 -8.3,-74.1z"
-      android:fillColor="#0F059B"/>
-  <path
-      android:pathData="M840.2,452.4a20,20 0,0 0,-19.8 -15.4,94.8 94.8,0 0,1 -83.7,-140.9 19.8,19.8 0,0 0,-4 -24.7,333.9 333.9,0 0,0 -114.1,-65 19.9,19.9 0,0 0,-23.2 9,94.8 94.8,0 0,1 -163,0 19.9,19.9 0,0 0,-23.2 -9A333.9,333.9 0,0 0,295.1 271.4a19.8,19.8 0,0 0,-4 24.7A94.8,94.8 0,0 1,207.4 436.9a19.9,19.9 0,0 0,-19.8 15.4,335.3 335.3,0 0,0 -1.1,137.6 19.8,19.8 0,0 0,20 15.7,94.8 94.8,0 0,1 83,143.4 19.8,19.8 0,0 0,3.6 25.1,333.1 333.1,0 0,0 113.8,65.8 19.9,19.9 0,0 0,23.7 -9.6,94.8 94.8,0 0,1 166.6,0 19.8,19.8 0,0 0,23.7 9.6,333.1 333.1,0 0,0 113.8,-65.8 19.8,19.8 0,0 0,3.6 -25.1,94.8 94.8,0 0,1 83,-143.4 19.8,19.8 0,0 0,20 -15.7,335.3 335.3,0 0,0 -1.1,-137.6z"
-      android:fillColor="#534FFF"/>
-  <path
-      android:pathData="M513.9,695.2c-78,0 -141.4,-64.6 -141.4,-144s63.4,-144 141.4,-144S655.4,471.8 655.4,551.2s-63.5,144 -141.5,144zM513.9,480.2A71,71 0,1 0,583.7 551.2a70.5,70.5 0,0 0,-69.8 -71z"
-      android:fillColor="#402AD2"/>
-  <path
-      android:pathData="M513.9,665A141.4,141.4 0,1 1,655.4 523.6a141.6,141.6 0,0 1,-141.5 141.4zM513.9,453.8A69.7,69.7 0,1 0,583.7 523.6a69.8,69.8 0,0 0,-69.8 -69.7z"
-      android:fillColor="#F6E937"/>
-</vector>
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@ -1,6 +0,0 @@
-<?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,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="Theme.Bookkeeping" parent="android:Theme.Material.Light.NoActionBar">
-        <item name="android:windowBackground">@android:color/white</item>
-    </style>
+
+    <style name="Theme.Bookkeeping" parent="android:Theme.Material.Light.NoActionBar" />
 </resources>
--- a/gradle.properties
+++ b/gradle.properties
@ -20,6 +20,4 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # 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
+android.nonTransitiveRClass=true
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@ -11,7 +11,6 @@ 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" }
@ -31,7 +30,6 @@ 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,7 +9,6 @@ pluginManagement {
        }
        mavenCentral()
        gradlePluginPortal()
-        maven { url = uri("https://jitpack.io") }
    }
 }
 dependencyResolutionManagement {
@ -17,7 +16,6 @@ dependencyResolutionManagement {
    repositories {
        google()
        mavenCentral()
-        maven { url = uri("https://jitpack.io") }
    }
 }