chore: sync current changes

Author: JoyinJoester

.gitignore

@@ -40,10 +40,13 @@ keyguard-app-master/
 stratumauthapp/
 # Documentation and Analysis
 修复文档/
+doc/
 # Ignore plan documents
 计划文档/
 task_plan*.md
 task_plan_bottom_sheet_nav.md
+# Ignore root task checklist
+密码库V2-任务清单.md
 # Local backups - never commit
 monica_backup_*/
 # Ignore external project

Monica for Android/README.md

@@ -91,6 +91,7 @@ Built by developers, for developers (and everyone else).
 
 *   **Language**: [Kotlin](https://kotlinlang.org/)
 *   **UI Framework**: [Jetpack Compose](https://developer.android.com/jetpack/compose)
+*   **UI Baseline**: Compose BOM `2024.10.01` + Material 3 (version aligned by BOM)
 *   **Architecture**: MVVM + Clean Architecture
 *   **Database**: Room (SQLite) with SQLCipher support
 *   **Async**: Coroutines & Flow
@@ -101,6 +102,8 @@ Built by developers, for developers (and everyone else).
     *   `dom4j`: XML parsing for KeePass
     *   `sardine-android`: WebDAV client
 
+> Dependency versions are maintained in `gradle/libs.versions.toml` and consumed by `app/build.gradle`.
+
 ---
 
 ## 📸 Screenshots

Monica for Android/README_ZH.md

@@ -189,7 +189,7 @@ cd Monica
 ### 核心技术
 - **Kotlin** - 主要开发语言
 - **Jetpack Compose** - 现代化 UI 框架
-- **Material Design 3** - UI 设计规范
+- **Material Design 3** - UI 设计规范（通过 Compose BOM 统一版本）
 
 ### 架构组件
 - **Room Database** - 本地数据持久化
@@ -208,9 +208,13 @@ cd Monica
 - **CameraX** - 相机功能
 
 ### 构建工具
-- **Gradle 8.7** - 构建系统
-- **Android Gradle Plugin 8.5.0**
-- **Kotlin 1.9.0**
+- **Gradle Wrapper 8.7** - 构建系统
+- **Android Gradle Plugin 8.6.0**
+- **Kotlin 1.9.10**
+- **KSP 1.9.10-1.0.13**
+- **Compose BOM 2024.10.01（Material3 跟随 BOM）**
+
+> 说明：依赖版本的最终准确信息以 `gradle/libs.versions.toml` 与 `app/build.gradle` 为准。
 
 ---
 

Monica for Android/app/build.gradle

@@ -8,7 +8,7 @@ plugins {
 
 android {
     namespace 'takagi.ru.monica'
-    compileSdk 34
+    compileSdk 35
 
     defaultConfig {
         applicationId "takagi.ru.monica"
@@ -50,16 +50,32 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion '1.5.1'
+        kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
     }
     packaging {
         resources {
             excludes += '/META-INF/{AL2.0,LGPL2.1}'
+            excludes += 'META-INF/versions/9/OSGI-INF/MANIFEST.MF'
         }
     }
 }
 
+configurations.configureEach {
+    resolutionStrategy.force(
+        "org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.0",
+        "org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.0",
+        "org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.6.0",
+        "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0",
+        "org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.6.0"
+    )
+}
+
 dependencies {
+    constraints {
+        implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.0")
+        implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0")
+    }
+
     // Core Android libraries
     implementation libs.androidx.core.ktx
     implementation libs.androidx.core.splashscreen  // 添加splashscreen依赖

Monica for Android/app/src/main/java/takagi/ru/monica/autofill_ng/ui/PasswordList.kt

@@ -67,7 +67,7 @@ fun PasswordList(
                     },
                     modifier = Modifier
                         .fillMaxWidth()
-                        .animateItemPlacement()
+                        .animateItem()
                 )
             }
 

Monica for Android/app/src/main/java/takagi/ru/monica/autofill_ng/ui/PaymentInfoList.kt

@@ -64,7 +64,7 @@ fun PaymentInfoList(
                     },
                     modifier = Modifier
                         .fillMaxWidth()
-                        .animateItemPlacement()
+                        .animateItem()
                 )
             }
         }

Monica for Android/app/src/main/java/takagi/ru/monica/data/AppSettings.kt

@@ -56,6 +56,7 @@ enum class UnifiedProgressBarMode {
  * 用于经典本地密码库模式
  */
 enum class BottomNavContentTab {
+    VAULT_V2,
     PASSWORDS,
     AUTHENTICATOR,
     CARD_WALLET,
@@ -66,6 +67,7 @@ enum class BottomNavContentTab {
 
     companion object {
         val DEFAULT_ORDER: List<BottomNavContentTab> = listOf(
+            VAULT_V2,
             PASSWORDS,
             AUTHENTICATOR,
             CARD_WALLET,
@@ -93,6 +95,7 @@ enum class BottomNavContentTab {
 }
 
 data class BottomNavVisibility(
+    val vaultV2: Boolean = false,
     val passwords: Boolean = true,
     val authenticator: Boolean = true,
     val cardWallet: Boolean = true,
@@ -102,6 +105,7 @@ data class BottomNavVisibility(
     val passkey: Boolean = true       // 通行密钥功能默认开启
 ) {
     fun isVisible(tab: BottomNavContentTab): Boolean = when (tab) {
+        BottomNavContentTab.VAULT_V2 -> vaultV2
         // BottomNavContentTab.VAULT -> vault
         BottomNavContentTab.PASSWORDS -> passwords
         BottomNavContentTab.AUTHENTICATOR -> authenticator
@@ -112,7 +116,7 @@ data class BottomNavVisibility(
         BottomNavContentTab.PASSKEY -> passkey
     }
 
-    fun visibleCount(): Int = listOf(passwords, authenticator, cardWallet, generator, notes, send, passkey).count { it }
+    fun visibleCount(): Int = listOf(vaultV2, passwords, authenticator, cardWallet, generator, notes, send, passkey).count { it }
 }
 
 /**