diff --git a/.gitattributes b/.gitattributes
index 7d63010..a2b8357 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
 *.tflite filter=lfs diff=lfs merge=lfs -text
+* text=auto eol=lf
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..f7db1ce
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,178 @@
+name: Build & Release
+
+on:
+  pull_request:
+    branches:
+      - master
+  workflow_dispatch:
+
+jobs:
+  build-apk:
+    runs-on: ubuntu-latest
+    name: Build APK
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+
+      - name: Set Up Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
+      - name: Set Up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          flutter-version: '3.27.0-0.2.pre'
+
+      - name: Install Dependencies
+        run: flutter pub get
+
+      - name: Decode Keystore
+        run: |
+          echo "${{ secrets.ANDROID_KJS }}" | base64 --decode > android/app/key.jks
+
+      - name: Create local.properties
+        run: |
+          echo "storePassword=${{ secrets.ANDROID_STORE_PASSWORD }}" > android/local.properties
+          echo "keyPassword=${{ secrets.ANDROID_KEY_PASSWORD }}" >> android/local.properties
+
+      - name: Build APK
+        run: flutter build apk --release --obfuscate --split-debug-info=splitMap
+
+      - name: Upload APK Artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: android-apk
+          path: build/app/outputs/flutter-apk/app-release.apk
+
+  build-msix:
+    runs-on: windows-latest
+    name: Build MSIX
+    needs: build-apk
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+
+      - name: Set Up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          flutter-version: '3.27.0-0.2.pre'
+
+      - name: Install Dependencies
+        run: flutter pub get
+
+      - name: Build MSIX
+        run: flutter build windows --release
+
+      - name: Upload MSIX Artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: windows-msix
+          path: build/windows/runner/Release/*.msix
+
+  #  build-ios-macos:
+  #    runs-on: macos-latest
+  #    name: Build iOS & macOS
+  #    needs: build-apk
+  #
+  #    steps:
+  #      - name: Checkout Repository
+  #        uses: actions/checkout@v3
+  #
+  #      - name: Set Up Flutter
+  #        uses: subosito/flutter-action@v2
+  #        with:
+  #          flutter-version: '3.27.0-0.2.pre'
+  #
+  #      - name: Install Dependencies
+  #        run: flutter pub get
+  #
+  #      - name: Set Up Certificates and Profiles
+  #        run: |
+  #          echo "${{ secrets.CERTIFICATE }}" | base64 --decode > signing_certificate.p12
+  #          echo "${{ secrets.PROFILE }}" | base64 --decode > provisioning_profile.mobileprovision
+  #
+  #      - name: Build iOS
+  #        run: flutter build ipa --release
+  #
+  #      - name: Build macOS
+  #        run: flutter build macos --release
+  #
+  #      - name: Upload iOS Artifact
+  #        uses: actions/upload-artifact@v3
+  #        with:
+  #          name: ios-ipa
+  #          path: build/ios/ipa/*.ipa
+  #
+  #      - name: Upload macOS Artifact
+  #        uses: actions/upload-artifact@v3
+  #        with:
+  #          name: macos-app
+  #          path: build/macos/Build/Products/Release/*.app
+
+  release:
+    runs-on: ubuntu-latest
+    name: Publish Release
+    needs: [ build-apk, build-msix ]
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+
+      # 下载构建产物
+      - name: Download APK Artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: android-apk
+          path: artifacts/android
+
+      - name: Download MSIX Artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: windows-msix
+          path: artifacts/windows
+
+      #      - name: Download iOS Artifact
+      #        uses: actions/download-artifact@v3
+      #        with:
+      #          name: ios-ipa
+      #          path: artifacts/ios
+      #
+      #      - name: Download macOS Artifact
+      #        uses: actions/download-artifact@v3
+      #        with:
+      #          name: macos-app
+      #          path: artifacts/macos
+
+      # 提取版本号
+      - name: Extract Version
+        id: extract_version
+        run: |
+          version=$(grep '^version: ' pubspec.yaml | cut -d ' ' -f 2 | tr -d '\r')
+          echo "VERSION=$version" >> $GITHUB_ENV
+
+      # 重命名构建产物
+      - name: Rename Artifacts
+        run: |
+          mkdir -p renamed-artifacts
+          mv artifacts/android/app-release.apk renamed-artifacts/moodiary-${{ env.VERSION }}-android-arm64.apk
+          mv artifacts/windows/*.msix renamed-artifacts/moodiary-${{ env.VERSION }}-windows-x64.msix
+      #          mv artifacts/ios/*.ipa renamed-artifacts/moodiary-${{ env.VERSION }}-ios.ipa
+      #          mv artifacts/macos/*.app renamed-artifacts/moodiary-${{ env.VERSION }}-macos.app
+
+      # 生成 Release Notes
+      - name: Generate Release Notes
+        id: release_notes
+        uses: release-drafter/release-drafter@v5
+        with:
+          config-name: release-drafter.yml
+
+      # 发布 Release
+      - name: Create Release
+        uses: ncipollo/release-action@v1
+        with:
+          artifacts: renamed-artifacts/*
+          tag: v${{ env.VERSION }}
\ No newline at end of file
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 7589198..50ff83a 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -28,12 +28,12 @@ android {
     ndkVersion = "27.1.12297006"
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
+        jvmTarget = JavaVersion.VERSION_21.toString()
     }
     signingConfigs {
         config {
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 544ab64..e08654f 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -33,11 +33,10 @@
     </queries>
     <application
         android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@mipmap/launcher_icon"
         android:label="@string/appName"
         android:networkSecurityConfig="@xml/network_security_config"
         android:requestLegacyExternalStorage="true"
-        android:roundIcon="@mipmap/ic_launcher_round"
         android:usesCleartextTraffic="true">
 
         <activity
diff --git a/android/app/src/main/kotlin/cn/yooss/mood_diary/MainActivity.kt b/android/app/src/main/kotlin/cn/yooss/mood_diary/MainActivity.kt
index 74e3020..ea5b344 100644
--- a/android/app/src/main/kotlin/cn/yooss/mood_diary/MainActivity.kt
+++ b/android/app/src/main/kotlin/cn/yooss/mood_diary/MainActivity.kt
@@ -1,7 +1,6 @@
 package cn.yooss.mood_diary
 
 import android.os.Bundle
-import androidx.activity.enableEdgeToEdge
 import com.github.gzuliyujiang.oaid.DeviceID
 import io.flutter.embedding.android.FlutterFragmentActivity
 import io.flutter.embedding.engine.FlutterEngine
@@ -10,7 +9,6 @@ import io.flutter.plugin.common.MethodChannel
 
 class MainActivity : FlutterFragmentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
-        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
     }
 
diff --git a/android/app/src/main/res/drawable-hdpi/android12splash.png b/android/app/src/main/res/drawable-hdpi/android12splash.png
new file mode 100644
index 0000000..d883452
Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png b/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..fd2950a
Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/ic_launcher_monochrome.png b/android/app/src/main/res/drawable-hdpi/ic_launcher_monochrome.png
new file mode 100644
index 0000000..fd2950a
Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/ic_launcher_monochrome.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/splash.png b/android/app/src/main/res/drawable-hdpi/splash.png
new file mode 100644
index 0000000..d883452
Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/android12splash.png b/android/app/src/main/res/drawable-mdpi/android12splash.png
new file mode 100644
index 0000000..a044806
Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png b/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..81a4308
Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/ic_launcher_monochrome.png b/android/app/src/main/res/drawable-mdpi/ic_launcher_monochrome.png
new file mode 100644
index 0000000..81a4308
Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/ic_launcher_monochrome.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/splash.png b/android/app/src/main/res/drawable-mdpi/splash.png
new file mode 100644
index 0000000..a044806
Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-night-hdpi/android12splash.png b/android/app/src/main/res/drawable-night-hdpi/android12splash.png
new file mode 100644
index 0000000..eeb75aa
Binary files /dev/null and b/android/app/src/main/res/drawable-night-hdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-night-hdpi/splash.png b/android/app/src/main/res/drawable-night-hdpi/splash.png
new file mode 100644
index 0000000..eeb75aa
Binary files /dev/null and b/android/app/src/main/res/drawable-night-hdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-night-mdpi/android12splash.png b/android/app/src/main/res/drawable-night-mdpi/android12splash.png
new file mode 100644
index 0000000..1c5cabc
Binary files /dev/null and b/android/app/src/main/res/drawable-night-mdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-night-mdpi/splash.png b/android/app/src/main/res/drawable-night-mdpi/splash.png
new file mode 100644
index 0000000..1c5cabc
Binary files /dev/null and b/android/app/src/main/res/drawable-night-mdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-night-v21/background.png b/android/app/src/main/res/drawable-night-v21/background.png
new file mode 100644
index 0000000..71e9c81
Binary files /dev/null and b/android/app/src/main/res/drawable-night-v21/background.png differ
diff --git a/android/app/src/main/res/drawable-night-v21/launch_background.xml b/android/app/src/main/res/drawable-night-v21/launch_background.xml
new file mode 100644
index 0000000..077dfae
--- /dev/null
+++ b/android/app/src/main/res/drawable-night-v21/launch_background.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <bitmap
+            android:gravity="fill"
+            android:src="@drawable/background" />
+    </item>
+    <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/splash" />
+    </item>
+</layer-list>
diff --git a/android/app/src/main/res/drawable-night-xhdpi/android12splash.png b/android/app/src/main/res/drawable-night-xhdpi/android12splash.png
new file mode 100644
index 0000000..d844b49
Binary files /dev/null and b/android/app/src/main/res/drawable-night-xhdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-night-xhdpi/splash.png b/android/app/src/main/res/drawable-night-xhdpi/splash.png
new file mode 100644
index 0000000..d844b49
Binary files /dev/null and b/android/app/src/main/res/drawable-night-xhdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png b/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png
new file mode 100644
index 0000000..582ff95
Binary files /dev/null and b/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-night-xxhdpi/splash.png b/android/app/src/main/res/drawable-night-xxhdpi/splash.png
new file mode 100644
index 0000000..582ff95
Binary files /dev/null and b/android/app/src/main/res/drawable-night-xxhdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png b/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png
new file mode 100644
index 0000000..736d539
Binary files /dev/null and b/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-night-xxxhdpi/splash.png b/android/app/src/main/res/drawable-night-xxxhdpi/splash.png
new file mode 100644
index 0000000..736d539
Binary files /dev/null and b/android/app/src/main/res/drawable-night-xxxhdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-night/background.png b/android/app/src/main/res/drawable-night/background.png
new file mode 100644
index 0000000..71e9c81
Binary files /dev/null and b/android/app/src/main/res/drawable-night/background.png differ
diff --git a/android/app/src/main/res/drawable-night/launch_background.xml b/android/app/src/main/res/drawable-night/launch_background.xml
new file mode 100644
index 0000000..077dfae
--- /dev/null
+++ b/android/app/src/main/res/drawable-night/launch_background.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <bitmap
+            android:gravity="fill"
+            android:src="@drawable/background" />
+    </item>
+    <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/splash" />
+    </item>
+</layer-list>
diff --git a/android/app/src/main/res/drawable-v21/background.png b/android/app/src/main/res/drawable-v21/background.png
new file mode 100644
index 0000000..3107d37
Binary files /dev/null and b/android/app/src/main/res/drawable-v21/background.png differ
diff --git a/android/app/src/main/res/drawable-v21/launch_background.xml b/android/app/src/main/res/drawable-v21/launch_background.xml
index f74085f..077dfae 100644
--- a/android/app/src/main/res/drawable-v21/launch_background.xml
+++ b/android/app/src/main/res/drawable-v21/launch_background.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="?android:colorBackground" />
-
-    <!-- You can insert your own image assets here -->
-    <!-- <item>
+    <item>
+        <bitmap
+            android:gravity="fill"
+            android:src="@drawable/background" />
+    </item>
+    <item>
         <bitmap
             android:gravity="center"
-            android:src="@mipmap/launch_image" />
-    </item> -->
+            android:src="@drawable/splash" />
+    </item>
 </layer-list>
diff --git a/android/app/src/main/res/drawable-xhdpi/android12splash.png b/android/app/src/main/res/drawable-xhdpi/android12splash.png
new file mode 100644
index 0000000..bc51ba3
Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png b/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..9303b21
Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/ic_launcher_monochrome.png b/android/app/src/main/res/drawable-xhdpi/ic_launcher_monochrome.png
new file mode 100644
index 0000000..9303b21
Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/ic_launcher_monochrome.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/splash.png b/android/app/src/main/res/drawable-xhdpi/splash.png
new file mode 100644
index 0000000..bc51ba3
Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/android12splash.png b/android/app/src/main/res/drawable-xxhdpi/android12splash.png
new file mode 100644
index 0000000..6a8caf4
Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..a16a3e2
Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_launcher_monochrome.png b/android/app/src/main/res/drawable-xxhdpi/ic_launcher_monochrome.png
new file mode 100644
index 0000000..a16a3e2
Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/ic_launcher_monochrome.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/splash.png b/android/app/src/main/res/drawable-xxhdpi/splash.png
new file mode 100644
index 0000000..6a8caf4
Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/android12splash.png b/android/app/src/main/res/drawable-xxxhdpi/android12splash.png
new file mode 100644
index 0000000..e68db46
Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/android12splash.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..eb96212
Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_monochrome.png b/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_monochrome.png
new file mode 100644
index 0000000..eb96212
Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_monochrome.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/splash.png b/android/app/src/main/res/drawable-xxxhdpi/splash.png
new file mode 100644
index 0000000..e68db46
Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable/background.png b/android/app/src/main/res/drawable/background.png
new file mode 100644
index 0000000..3107d37
Binary files /dev/null and b/android/app/src/main/res/drawable/background.png differ
diff --git a/android/app/src/main/res/drawable/launch_background.xml b/android/app/src/main/res/drawable/launch_background.xml
index cd8c23c..077dfae 100644
--- a/android/app/src/main/res/drawable/launch_background.xml
+++ b/android/app/src/main/res/drawable/launch_background.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@android:color/white" />
-
-    <!-- You can insert your own image assets here -->
-<!--     <item>-->
-<!--        <bitmap-->
-<!--            android:gravity="center"-->
-<!--            android:src="@mipmap/ic_launcher_foreground" />-->
-<!--    </item>-->
+    <item>
+        <bitmap
+            android:gravity="fill"
+            android:src="@drawable/background" />
+    </item>
+    <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/splash" />
+    </item>
 </layer-list>
diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
deleted file mode 100644
index 31af4ff..0000000
--- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_launcher_background" />
-    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
-    <monochrome android:drawable="@mipmap/ic_launcher_foreground" />
-</adaptive-icon>
\ No newline at end of file
diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
deleted file mode 100644
index 4ae7d12..0000000
--- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/android/app/src/main/res/mipmap-anydpi-v26/launcher_icon.xml b/android/app/src/main/res/mipmap-anydpi-v26/launcher_icon.xml
new file mode 100644
index 0000000..0a31601
--- /dev/null
+++ b/android/app/src/main/res/mipmap-anydpi-v26/launcher_icon.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background" />
+    <foreground>
+        <inset
+            android:drawable="@drawable/ic_launcher_foreground"
+            android:inset="16%" />
+    </foreground>
+    <monochrome>
+        <inset
+            android:drawable="@drawable/ic_launcher_monochrome"
+            android:inset="16%" />
+    </monochrome>
+</adaptive-icon>
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/android/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index 1773772..0000000
Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.webp and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.webp b/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.webp
deleted file mode 100644
index d0534d7..0000000
Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.webp and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp
deleted file mode 100644
index e1f9062..0000000
Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index 341577c..0000000
Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-hdpi/launcher_icon.png b/android/app/src/main/res/mipmap-hdpi/launcher_icon.png
new file mode 100644
index 0000000..4e6e0cc
Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/launcher_icon.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/android/app/src/main/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index de0ebd9..0000000
Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.webp and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.webp b/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.webp
deleted file mode 100644
index 60b8e35..0000000
Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.webp and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp
deleted file mode 100644
index 295d7ed..0000000
Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
deleted file mode 100644
index aba352f..0000000
Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-mdpi/launcher_icon.png b/android/app/src/main/res/mipmap-mdpi/launcher_icon.png
new file mode 100644
index 0000000..799ab2b
Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/launcher_icon.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
deleted file mode 100644
index 1bae111..0000000
Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.webp b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.webp
deleted file mode 100644
index 34458b2..0000000
Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.webp and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp
deleted file mode 100644
index eccf4b1..0000000
Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
deleted file mode 100644
index 575c497..0000000
Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png b/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png
new file mode 100644
index 0000000..6f4622f
Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
deleted file mode 100644
index 0060480..0000000
Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.webp b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.webp
deleted file mode 100644
index 6c466a1..0000000
Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.webp and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp
deleted file mode 100644
index 4cd9188..0000000
Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 08a8131..0000000
Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png b/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png
new file mode 100644
index 0000000..2e447a8
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
deleted file mode 100644
index 2168208..0000000
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.webp b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.webp
deleted file mode 100644
index f73db9b..0000000
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.webp and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp
deleted file mode 100644
index ec51b5b..0000000
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 83e23b9..0000000
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png b/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png
new file mode 100644
index 0000000..9e688b9
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png differ
diff --git a/android/app/src/main/res/values-night-v31/styles.xml b/android/app/src/main/res/values-night-v31/styles.xml
new file mode 100644
index 0000000..2ddcec1
--- /dev/null
+++ b/android/app/src/main/res/values-night-v31/styles.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+        <item name="android:windowSplashScreenBackground">#000000</item>
+        <item name="android:windowSplashScreenAnimatedIcon">@drawable/android12splash</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+         
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>
diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml
index 06952be..dbc9ea9 100644
--- a/android/app/src/main/res/values-night/styles.xml
+++ b/android/app/src/main/res/values-night/styles.xml
@@ -5,6 +5,10 @@
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
diff --git a/android/app/src/main/res/values-v31/styles.xml b/android/app/src/main/res/values-v31/styles.xml
new file mode 100644
index 0000000..e437c38
--- /dev/null
+++ b/android/app/src/main/res/values-v31/styles.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+        <item name="android:windowSplashScreenBackground">#ffffff</item>
+        <item name="android:windowSplashScreenAnimatedIcon">@drawable/android12splash</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+         
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>
diff --git a/android/app/src/main/res/values/ic_launcher_background.xml b/android/app/src/main/res/values/colors.xml
similarity index 52%
rename from android/app/src/main/res/values/ic_launcher_background.xml
rename to android/app/src/main/res/values/colors.xml
index c5d5899..ab98328 100644
--- a/android/app/src/main/res/values/ic_launcher_background.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#FFFFFF</color>
+    <color name="ic_launcher_background">#ffffff</color>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index cb1ef88..0d1fa8f 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -5,6 +5,10 @@
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
diff --git a/android/settings.gradle b/android/settings.gradle
index 8eb1f58..8a9e93c 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -23,8 +23,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version '8.7.1' apply false
-    id "org.jetbrains.kotlin.android" version "2.0.20" apply false
+    id "com.android.application" version '8.7.3' apply false
+    id "org.jetbrains.kotlin.android" version "2.0.21" apply false
 }
 
 include ":app"
diff --git a/assets/icon/dark/dark_foreground.png b/assets/icon/dark/dark_foreground.png
new file mode 100644
index 0000000..e7ebd25
Binary files /dev/null and b/assets/icon/dark/dark_foreground.png differ
diff --git a/assets/icon/dark/dark_icon.png b/assets/icon/dark/dark_icon.png
new file mode 100644
index 0000000..c91ad6b
Binary files /dev/null and b/assets/icon/dark/dark_icon.png differ
diff --git a/assets/icon/dark/dark_splash_icon.png b/assets/icon/dark/dark_splash_icon.png
new file mode 100644
index 0000000..4d5ac88
Binary files /dev/null and b/assets/icon/dark/dark_splash_icon.png differ
diff --git a/assets/icon/icon.png b/assets/icon/icon.png
deleted file mode 100644
index 9e48793..0000000
Binary files a/assets/icon/icon.png and /dev/null differ
diff --git a/assets/icon/light/light_foreground.png b/assets/icon/light/light_foreground.png
new file mode 100644
index 0000000..b054521
Binary files /dev/null and b/assets/icon/light/light_foreground.png differ
diff --git a/assets/icon/light/light_icon.png b/assets/icon/light/light_icon.png
new file mode 100644
index 0000000..e087366
Binary files /dev/null and b/assets/icon/light/light_icon.png differ
diff --git a/assets/icon/light/light_splash_icon.png b/assets/icon/light/light_splash_icon.png
new file mode 100644
index 0000000..ec09a43
Binary files /dev/null and b/assets/icon/light/light_splash_icon.png differ
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 2577234..f961a5e 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -3,6 +3,9 @@ PODS:
     - Flutter
   - audioplayers_darwin (0.0.1):
     - Flutter
+  - connectivity_plus (0.0.1):
+    - Flutter
+    - FlutterMacOS
   - device_info_plus (0.0.1):
     - Flutter
   - DKImagePickerController/Core (4.3.9):
@@ -43,42 +46,30 @@ PODS:
     - DKImagePickerController/PhotoGallery
     - Flutter
   - Flutter (1.0.0)
-  - flutter_image_compress_common (1.0.0):
+  - flutter_inappwebview_ios (0.0.1):
     - Flutter
-    - Mantle
-    - SDWebImage
-    - SDWebImageWebPCoder
+    - flutter_inappwebview_ios/Core (= 0.0.1)
+    - OrderedSet (~> 6.0.3)
+  - flutter_inappwebview_ios/Core (0.0.1):
+    - Flutter
+    - OrderedSet (~> 6.0.3)
   - flutter_keyboard_visibility_temp_fork (0.0.1):
     - Flutter
   - fluttertoast (0.0.2):
     - Flutter
     - Toast
+  - gal (1.0.0):
+    - Flutter
+    - FlutterMacOS
   - geolocator_apple (1.2.0):
     - Flutter
   - image_picker_ios (0.0.1):
     - Flutter
-  - integration_test (0.0.1):
-    - Flutter
   - isar_flutter_libs (1.0.0):
     - Flutter
-  - libwebp (1.3.2):
-    - libwebp/demux (= 1.3.2)
-    - libwebp/mux (= 1.3.2)
-    - libwebp/sharpyuv (= 1.3.2)
-    - libwebp/webp (= 1.3.2)
-  - libwebp/demux (1.3.2):
-    - libwebp/webp
-  - libwebp/mux (1.3.2):
-    - libwebp/demux
-  - libwebp/sharpyuv (1.3.2)
-  - libwebp/webp (1.3.2):
-    - libwebp/sharpyuv
   - local_auth_darwin (0.0.1):
     - Flutter
     - FlutterMacOS
-  - Mantle (2.2.0):
-    - Mantle/extobjc (= 2.2.0)
-  - Mantle/extobjc (2.2.0)
   - media_kit_libs_ios_video (1.0.4):
     - Flutter
   - media_kit_native_event_loop (1.0.0):
@@ -91,6 +82,7 @@ PODS:
   - objectbox_flutter_libs (0.0.1):
     - Flutter
     - ObjectBox (= 4.0.1)
+  - OrderedSet (6.0.3)
   - package_info_plus (0.4.5):
     - Flutter
   - path_provider_foundation (0.0.1):
@@ -102,14 +94,13 @@ PODS:
     - Flutter
   - record_darwin (1.0.0):
     - Flutter
+  - rust_lib_mood_diary (0.0.1):
+    - Flutter
   - screen_brightness_ios (0.1.0):
     - Flutter
   - SDWebImage (5.19.7):
     - SDWebImage/Core (= 5.19.7)
   - SDWebImage/Core (5.19.7)
-  - SDWebImageWebPCoder (0.14.6):
-    - libwebp (~> 1.0)
-    - SDWebImage/Core (~> 5.17)
   - share_plus (0.0.1):
     - Flutter
   - shared_preferences_foundation (0.0.1):
@@ -144,6 +135,9 @@ PODS:
   - Toast (4.1.1)
   - url_launcher_ios (0.0.1):
     - Flutter
+  - video_player_avfoundation (0.0.1):
+    - Flutter
+    - FlutterMacOS
   - volume_controller (0.0.1):
     - Flutter
   - wakelock_plus (0.0.1):
@@ -152,16 +146,17 @@ PODS:
 DEPENDENCIES:
   - app_links (from `.symlinks/plugins/app_links/ios`)
   - audioplayers_darwin (from `.symlinks/plugins/audioplayers_darwin/ios`)
+  - connectivity_plus (from `.symlinks/plugins/connectivity_plus/darwin`)
   - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
   - fc_native_video_thumbnail (from `.symlinks/plugins/fc_native_video_thumbnail/darwin`)
   - file_picker (from `.symlinks/plugins/file_picker/ios`)
   - Flutter (from `Flutter`)
-  - flutter_image_compress_common (from `.symlinks/plugins/flutter_image_compress_common/ios`)
+  - flutter_inappwebview_ios (from `.symlinks/plugins/flutter_inappwebview_ios/ios`)
   - flutter_keyboard_visibility_temp_fork (from `.symlinks/plugins/flutter_keyboard_visibility_temp_fork/ios`)
   - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
+  - gal (from `.symlinks/plugins/gal/darwin`)
   - geolocator_apple (from `.symlinks/plugins/geolocator_apple/ios`)
   - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
-  - integration_test (from `.symlinks/plugins/integration_test/ios`)
   - isar_flutter_libs (from `.symlinks/plugins/isar_flutter_libs/ios`)
   - local_auth_darwin (from `.symlinks/plugins/local_auth_darwin/darwin`)
   - media_kit_libs_ios_video (from `.symlinks/plugins/media_kit_libs_ios_video/ios`)
@@ -174,12 +169,14 @@ DEPENDENCIES:
   - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
   - quill_native_bridge_ios (from `.symlinks/plugins/quill_native_bridge_ios/ios`)
   - record_darwin (from `.symlinks/plugins/record_darwin/ios`)
+  - rust_lib_mood_diary (from `.symlinks/plugins/rust_lib_mood_diary/ios`)
   - screen_brightness_ios (from `.symlinks/plugins/screen_brightness_ios/ios`)
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
   - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`)
   - tflite_flutter (from `.symlinks/plugins/tflite_flutter/ios`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
+  - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/darwin`)
   - volume_controller (from `.symlinks/plugins/volume_controller/ios`)
   - wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`)
 
@@ -187,11 +184,9 @@ SPEC REPOS:
   trunk:
     - DKImagePickerController
     - DKPhotoGallery
-    - libwebp
-    - Mantle
     - ObjectBox
+    - OrderedSet
     - SDWebImage
-    - SDWebImageWebPCoder
     - SwiftyGif
     - TensorFlowLiteC
     - TensorFlowLiteSwift
@@ -202,6 +197,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/app_links/ios"
   audioplayers_darwin:
     :path: ".symlinks/plugins/audioplayers_darwin/ios"
+  connectivity_plus:
+    :path: ".symlinks/plugins/connectivity_plus/darwin"
   device_info_plus:
     :path: ".symlinks/plugins/device_info_plus/ios"
   fc_native_video_thumbnail:
@@ -210,18 +207,18 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/file_picker/ios"
   Flutter:
     :path: Flutter
-  flutter_image_compress_common:
-    :path: ".symlinks/plugins/flutter_image_compress_common/ios"
+  flutter_inappwebview_ios:
+    :path: ".symlinks/plugins/flutter_inappwebview_ios/ios"
   flutter_keyboard_visibility_temp_fork:
     :path: ".symlinks/plugins/flutter_keyboard_visibility_temp_fork/ios"
   fluttertoast:
     :path: ".symlinks/plugins/fluttertoast/ios"
+  gal:
+    :path: ".symlinks/plugins/gal/darwin"
   geolocator_apple:
     :path: ".symlinks/plugins/geolocator_apple/ios"
   image_picker_ios:
     :path: ".symlinks/plugins/image_picker_ios/ios"
-  integration_test:
-    :path: ".symlinks/plugins/integration_test/ios"
   isar_flutter_libs:
     :path: ".symlinks/plugins/isar_flutter_libs/ios"
   local_auth_darwin:
@@ -246,6 +243,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/quill_native_bridge_ios/ios"
   record_darwin:
     :path: ".symlinks/plugins/record_darwin/ios"
+  rust_lib_mood_diary:
+    :path: ".symlinks/plugins/rust_lib_mood_diary/ios"
   screen_brightness_ios:
     :path: ".symlinks/plugins/screen_brightness_ios/ios"
   share_plus:
@@ -258,6 +257,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/tflite_flutter/ios"
   url_launcher_ios:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
+  video_player_avfoundation:
+    :path: ".symlinks/plugins/video_player_avfoundation/darwin"
   volume_controller:
     :path: ".symlinks/plugins/volume_controller/ios"
   wakelock_plus:
@@ -266,36 +267,36 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   app_links: e7a6750a915a9e161c58d91bc610e8cd1d4d0ad0
   audioplayers_darwin: 877d9a4d06331c5c374595e46e16453ac7eafa40
+  connectivity_plus: 4c41c08fc6d7c91f63bc7aec70ffe3730b04f563
   device_info_plus: bf2e3232933866d73fe290f2942f2156cdd10342
   DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
   DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
   fc_native_video_thumbnail: 927d4dcfd4c7e9f2cc1a20bb52dfee83de3792c2
   file_picker: 09aa5ec1ab24135ccd7a1621c46c84134bfd6655
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  flutter_image_compress_common: ec1d45c362c9d30a3f6a0426c297f47c52007e3e
-  flutter_keyboard_visibility_temp_fork: 442dadca3b81868a225cd6a2f605bffff1215844
+  flutter_inappwebview_ios: 6f63631e2c62a7c350263b13fa5427aedefe81d4
+  flutter_keyboard_visibility_temp_fork: 8a8809c4129e31d25fca77446e0f3fd548122ced
   fluttertoast: e9a18c7be5413da53898f660530c56f35edfba9c
-  geolocator_apple: 6cbaf322953988e009e5ecb481f07efece75c450
+  gal: 61e868295d28fe67ffa297fae6dacebf56fd53e1
+  geolocator_apple: 9bcea1918ff7f0062d98345d238ae12718acfbc1
   image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1
-  integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573
   isar_flutter_libs: b69f437aeab9c521821c3f376198c4371fa21073
-  libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009
   local_auth_darwin: 66e40372f1c29f383a314c738c7446e2f7fdadc3
-  Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d
   media_kit_libs_ios_video: a5fe24bc7875ccd6378a0978c13185e1344651c1
   media_kit_native_event_loop: e6b2ab20cf0746eb1c33be961fcf79667304fa2a
   media_kit_video: 5da63f157170e5bf303bf85453b7ef6971218a2e
   network_info_plus: 6613d9d7cdeb0e6f366ed4dbe4b3c51c52d567a9
   ObjectBox: 0bc4bb75eea85f6af06b369148b334c2056bbc29
   objectbox_flutter_libs: 2ce0da386c780878687c736b528ceaf371573efb
+  OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
   package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
   path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
   permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
-  quill_native_bridge_ios: 277bdf5bf0fa5d7a12999556b415a5c63dd76ec4
+  quill_native_bridge_ios: 2b01d585fcc73d0f5eed78c0bd244ee564b06f5a
   record_darwin: 3b1a8e7d5c0cbf45ad6165b4d83a6ca643d929c3
+  rust_lib_mood_diary: 38a92354760d3409ebc859f812193e7c69e184ef
   screen_brightness_ios: 715ca807df953bf676d339f11464e438143ee625
   SDWebImage: 8a6b7b160b4d710e2a22b6900e25301075c34cb3
-  SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380
   share_plus: 8b6f8b3447e494cca5317c8c3073de39b3600d1f
   shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
   sqflite_darwin: 5a7236e3b501866c1c9befc6771dfd73ffb8702d
@@ -305,9 +306,10 @@ SPEC CHECKSUMS:
   tflite_flutter: 9433d086a3060431bbc9f3c7c20d017db0e72d08
   Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e
   url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
+  video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3
   volume_controller: 531ddf792994285c9b17f9d8a7e4dcdd29b3eae9
   wakelock_plus: 78ec7c5b202cab7761af8e2b2b3d0671be6c4ae1
 
 PODFILE CHECKSUM: 9752b5340b4d3f9618318fcd530d907790e2a9f5
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.16.2
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index cf5c707..5592f1f 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -488,17 +488,21 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = 3XA29H789G;
+				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.lifestyle";
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = cn.yooss.moodDiary;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -562,7 +566,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -620,7 +624,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -677,17 +681,21 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = 3XA29H789G;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.lifestyle";
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = cn.yooss.moodDiary;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -701,17 +709,21 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = 3XA29H789G;
+				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.lifestyle";
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = cn.yooss.moodDiary;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
index d36b1fa..055df49 100644
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,122 +1,542 @@
 {
-  "images" : [
+  "images": [
     {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
+      "size": "20x20",
+      "idiom": "universal",
+      "filename": "Icon-App-20x20@2x.png",
+      "scale": "2x",
+      "platform": "ios"
     },
     {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@3x.png",
-      "scale" : "3x"
+      "size": "20x20",
+      "idiom": "universal",
+      "filename": "Icon-App-20x20@3x.png",
+      "scale": "3x",
+      "platform": "ios"
     },
     {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
+      "size": "29x29",
+      "idiom": "universal",
+      "filename": "Icon-App-29x29@2x.png",
+      "scale": "2x",
+      "platform": "ios"
     },
     {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
+      "size": "29x29",
+      "idiom": "universal",
+      "filename": "Icon-App-29x29@3x.png",
+      "scale": "3x",
+      "platform": "ios"
     },
     {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@3x.png",
-      "scale" : "3x"
+      "size": "38x38",
+      "idiom": "universal",
+      "filename": "Icon-App-38x38@2x.png",
+      "scale": "2x",
+      "platform": "ios"
     },
     {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
+      "size": "38x38",
+      "idiom": "universal",
+      "filename": "Icon-App-38x38@3x.png",
+      "scale": "3x",
+      "platform": "ios"
     },
     {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@3x.png",
-      "scale" : "3x"
+      "size": "40x40",
+      "idiom": "universal",
+      "filename": "Icon-App-40x40@2x.png",
+      "scale": "2x",
+      "platform": "ios"
     },
     {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@2x.png",
-      "scale" : "2x"
+      "size": "40x40",
+      "idiom": "universal",
+      "filename": "Icon-App-40x40@3x.png",
+      "scale": "3x",
+      "platform": "ios"
     },
     {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@3x.png",
-      "scale" : "3x"
+      "size": "60x60",
+      "idiom": "universal",
+      "filename": "Icon-App-60x60@2x.png",
+      "scale": "2x",
+      "platform": "ios"
     },
     {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@1x.png",
-      "scale" : "1x"
+      "size": "60x60",
+      "idiom": "universal",
+      "filename": "Icon-App-60x60@3x.png",
+      "scale": "3x",
+      "platform": "ios"
     },
     {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
+      "size": "64x64",
+      "idiom": "universal",
+      "filename": "Icon-App-64x64@2x.png",
+      "scale": "2x",
+      "platform": "ios"
     },
     {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
+      "size": "64x64",
+      "idiom": "universal",
+      "filename": "Icon-App-64x64@3x.png",
+      "scale": "3x",
+      "platform": "ios"
     },
     {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
+      "size": "68x68",
+      "idiom": "universal",
+      "filename": "Icon-App-68x68@2x.png",
+      "scale": "2x",
+      "platform": "ios"
     },
     {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@1x.png",
-      "scale" : "1x"
+      "size": "76x76",
+      "idiom": "universal",
+      "filename": "Icon-App-76x76@2x.png",
+      "scale": "2x",
+      "platform": "ios"
     },
     {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
+      "size": "83.5x83.5",
+      "idiom": "universal",
+      "filename": "Icon-App-83.5x83.5@2x.png",
+      "scale": "2x",
+      "platform": "ios"
     },
     {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@1x.png",
-      "scale" : "1x"
+      "size": "1024x1024",
+      "idiom": "universal",
+      "filename": "Icon-App-1024x1024@1x.png",
+      "scale": "1x",
+      "platform": "ios"
     },
     {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@2x.png",
-      "scale" : "2x"
+      "size": "1024x1024",
+      "idiom": "ios-marketing",
+      "filename": "Icon-App-1024x1024@1x.png",
+      "scale": "1x"
     },
     {
-      "size" : "83.5x83.5",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-83.5x83.5@2x.png",
-      "scale" : "2x"
+      "size": "20x20",
+      "idiom": "universal",
+      "filename": "Icon-App-Dark-20x20@2x.png",
+      "scale": "2x",
+      "platform": "ios",
+      "appearances": [
+        {
+          "appearance": "luminosity",
+          "value": "dark"
+        }
+      ]
     },
     {
-      "size" : "1024x1024",
-      "idiom" : "ios-marketing",
-      "filename" : "Icon-App-1024x1024@1x.png",
-      "scale" : "1x"
+      "size": "20x20",
+      "idiom": "universal",
+      "filename": "Icon-App-Dark-20x20@3x.png",
+      "scale": "3x",
+      "platform": "ios",
+      "appearances": [
+        {
+          "appearance": "luminosity",
+          "value": "dark"
+        }
+      ]
+    },
+    {
+      "size": "29x29",
+      "idiom": "universal",
+      "filename": "Icon-App-Dark-29x29@2x.png",
+      "scale": "2x",
+      "platform": "ios",
+      "appearances": [
+        {
+          "appearance": "luminosity",
+          "value": "dark"
+        }
+      ]
+    },
+    {
+      "size": "29x29",
+      "idiom": "universal",
+      "filename": "Icon-App-Dark-29x29@3x.png",
+      "scale": "3x",
+      "platform": "ios",
+      "appearances": [
+        {
+          "appearance": "luminosity",
+          "value": "dark"
+        }
+      ]
+    },
+    {
+      "size": "38x38",
+      "idiom": "universal",
+      "filename": "Icon-App-Dark-38x38@2x.png",
+      "scale": "2x",
+      "platform": "ios",
+      "appearances": [
+        {
+          "appearance": "luminosity",
+          "value": "dark"
+        }
+      ]
+    },
+    {
+      "size": "38x38",
+      "idiom": "universal",
+      "filename": "Icon-App-Dark-38x38@3x.png",
+      "scale": "3x",
+      "platform": "ios",
+      "appearances": [
+        {
+          "appearance": "luminosity",
+          "value": "dark"
+        }
+      ]
+    },
+    {
+      "size": "40x40",
+      "idiom": "universal",
+      "filename": "Icon-App-Dark-40x40@2x.png",
+      "scale": "2x",
+      "platform": "ios",
+      "appearances": [
+        {
+          "appearance": "luminosity",
+          "value": "dark"
+        }
+      ]
+    },
+    {
+      "size": "40x40",
+      "idiom": "universal",
+      "filename": "Icon-App-Dark-40x40@3x.png",
+      "scale": "3x",
+      "platform": "ios",
+      "appearances": [
+        {
+          "appearance": "luminosity",
+          "value": "dark"
+        }
+      ]
+    },
+    {
+      "size": "60x60",
+      "idiom": "universal",
+      "filename": "Icon-App-Dark-60x60@2x.png",
+      "scale": "2x",
+      "platform": "ios",
+      "appearances": [
+        {
+          "appearance": "luminosity",
+          "value": "dark"
+        }
+      ]
+    },
+    {
+      "size": "60x60",
+      "idiom": "universal",
+      "filename": "Icon-App-Dark-60x60@3x.png",
+      "scale": "3x",
+      "platform": "ios",
+      "appearances": [
+        {
+          "appearance": "luminosity",
+          "value": "dark"
+        }
+      ]
+    },
+    {
+      "size": "64x64",
+      "idiom": "universal",
+      "filename": "Icon-App-Dark-64x64@2x.png",
+      "scale": "2x",
+      "platform": "ios",
+      "appearances": [
+        {
+          "appearance": "luminosity",
+          "value": "dark"
+        }
+      ]
+    },
+    {
+      "size": "64x64",
+      "idiom": "universal",
+      "filename": "Icon-App-Dark-64x64@3x.png",
+      "scale": "3x",
+      "platform": "ios",
+      "appearances": [
+        {
+          "appearance": "luminosity",
+          "value": "dark"
+        }
+      ]
+    },
+    {
+      "size": "68x68",
+      "idiom": "universal",
+      "filename": "Icon-App-Dark-68x68@2x.png",
+      "scale": "2x",
+      "platform": "ios",
+      "appearances": [
+        {
+          "appearance": "luminosity",
+          "value": "dark"
+        }
+      ]
+    },
+    {
+      "size": "76x76",
+      "idiom": "universal",
+      "filename": "Icon-App-Dark-76x76@2x.png",
+      "scale": "2x",
+      "platform": "ios",
+      "appearances": [
+        {
+          "appearance": "luminosity",
+          "value": "dark"
+        }
+      ]
+    },
+    {
+      "size": "83.5x83.5",
+      "idiom": "universal",
+      "filename": "Icon-App-Dark-83.5x83.5@2x.png",
+      "scale": "2x",
+      "platform": "ios",
+      "appearances": [
+        {
+          "appearance": "luminosity",
+          "value": "dark"
+        }
+      ]
+    },
+    {
+      "size": "1024x1024",
+      "idiom": "universal",
+      "filename": "Icon-App-Dark-1024x1024@1x.png",
+      "scale": "1x",
+      "platform": "ios",
+      "appearances": [
+        {
+          "appearance": "luminosity",
+          "value": "dark"
+        }
+      ]
+    },
+    {
+      "size": "20x20",
+      "idiom": "universal",
+      "filename": "Icon-App-Tinted-20x20@2x.png",
+      "scale": "2x",
+      "platform": "ios",
+      "appearances": [
+        {
+          "appearance": "luminosity",
+          "value": "tinted"
+        }
+      ]
+    },
+    {
+      "size": "20x20",
+      "idiom": "universal",
+      "filename": "Icon-App-Tinted-20x20@3x.png",
+      "scale": "3x",
+      "platform": "ios",
+      "appearances": [
+        {
+          "appearance": "luminosity",
+          "value": "tinted"
+        }
+      ]
+    },
+    {
+      "size": "29x29",
+      "idiom": "universal",
+      "filename": "Icon-App-Tinted-29x29@2x.png",
+      "scale": "2x",
+      "platform": "ios",
+      "appearances": [
+        {
+          "appearance": "luminosity",
+          "value": "tinted"
+        }
+      ]
+    },
+    {
+      "size": "29x29",
+      "idiom": "universal",
+      "filename": "Icon-App-Tinted-29x29@3x.png",
+      "scale": "3x",
+      "platform": "ios",
+      "appearances": [
+        {
+          "appearance": "luminosity",
+          "value": "tinted"
+        }
+      ]
+    },
+    {
+      "size": "38x38",
+      "idiom": "universal",
+      "filename": "Icon-App-Tinted-38x38@2x.png",
+      "scale": "2x",
+      "platform": "ios",
+      "appearances": [
+        {
+          "appearance": "luminosity",
+          "value": "tinted"
+        }
+      ]
+    },
+    {
+      "size": "38x38",
+      "idiom": "universal",
+      "filename": "Icon-App-Tinted-38x38@3x.png",
+      "scale": "3x",
+      "platform": "ios",
+      "appearances": [
+        {
+          "appearance": "luminosity",
+          "value": "tinted"
+        }
+      ]
+    },
+    {
+      "size": "40x40",
+      "idiom": "universal",
+      "filename": "Icon-App-Tinted-40x40@2x.png",
+      "scale": "2x",
+      "platform": "ios",
+      "appearances": [
+        {
+          "appearance": "luminosity",
+          "value": "tinted"
+        }
+      ]
+    },
+    {
+      "size": "40x40",
+      "idiom": "universal",
+      "filename": "Icon-App-Tinted-40x40@3x.png",
+      "scale": "3x",
+      "platform": "ios",
+      "appearances": [
+        {
+          "appearance": "luminosity",
+          "value": "tinted"
+        }
+      ]
+    },
+    {
+      "size": "60x60",
+      "idiom": "universal",
+      "filename": "Icon-App-Tinted-60x60@2x.png",
+      "scale": "2x",
+      "platform": "ios",
+      "appearances": [
+        {
+          "appearance": "luminosity",
+          "value": "tinted"
+        }
+      ]
+    },
+    {
+      "size": "60x60",
+      "idiom": "universal",
+      "filename": "Icon-App-Tinted-60x60@3x.png",
+      "scale": "3x",
+      "platform": "ios",
+      "appearances": [
+        {
+          "appearance": "luminosity",
+          "value": "tinted"
+        }
+      ]
+    },
+    {
+      "size": "64x64",
+      "idiom": "universal",
+      "filename": "Icon-App-Tinted-64x64@2x.png",
+      "scale": "2x",
+      "platform": "ios",
+      "appearances": [
+        {
+          "appearance": "luminosity",
+          "value": "tinted"
+        }
+      ]
+    },
+    {
+      "size": "64x64",
+      "idiom": "universal",
+      "filename": "Icon-App-Tinted-64x64@3x.png",
+      "scale": "3x",
+      "platform": "ios",
+      "appearances": [
+        {
+          "appearance": "luminosity",
+          "value": "tinted"
+        }
+      ]
+    },
+    {
+      "size": "68x68",
+      "idiom": "universal",
+      "filename": "Icon-App-Tinted-68x68@2x.png",
+      "scale": "2x",
+      "platform": "ios",
+      "appearances": [
+        {
+          "appearance": "luminosity",
+          "value": "tinted"
+        }
+      ]
+    },
+    {
+      "size": "76x76",
+      "idiom": "universal",
+      "filename": "Icon-App-Tinted-76x76@2x.png",
+      "scale": "2x",
+      "platform": "ios",
+      "appearances": [
+        {
+          "appearance": "luminosity",
+          "value": "tinted"
+        }
+      ]
+    },
+    {
+      "size": "83.5x83.5",
+      "idiom": "universal",
+      "filename": "Icon-App-Tinted-83.5x83.5@2x.png",
+      "scale": "2x",
+      "platform": "ios",
+      "appearances": [
+        {
+          "appearance": "luminosity",
+          "value": "tinted"
+        }
+      ]
+    },
+    {
+      "size": "1024x1024",
+      "idiom": "universal",
+      "filename": "Icon-App-Tinted-1024x1024@1x.png",
+      "scale": "1x",
+      "platform": "ios",
+      "appearances": [
+        {
+          "appearance": "luminosity",
+          "value": "tinted"
+        }
+      ]
     }
   ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
+  "info": {
+    "version": 1,
+    "author": "xcode"
   }
-}
+}
\ No newline at end of file
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
index dc9ada4..afede1c 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
index 7353c41..dfa6c19 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
index 797d452..f6493ce 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
index 6ed2d93..fcca99b 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
index 4cd7b00..3a28b30 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
index fe73094..c36307f 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
index 321773c..0540f4e 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-38x38@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-38x38@2x.png
new file mode 100644
index 0000000..b522219
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-38x38@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-38x38@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-38x38@3x.png
new file mode 100644
index 0000000..e166f23
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-38x38@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
index 797d452..d5ebe91 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
index 502f463..e84f2d9 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
index 0ec3034..6663da6 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png
new file mode 100644
index 0000000..56ae8b3
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png
new file mode 100644
index 0000000..f12b915
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png
new file mode 100644
index 0000000..ba69bb5
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png
new file mode 100644
index 0000000..adf6be4
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
index 0ec3034..6663da6 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
index e9f5fea..31ca05b 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-64x64@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-64x64@2x.png
new file mode 100644
index 0000000..ffae4ed
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-64x64@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-64x64@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-64x64@3x.png
new file mode 100644
index 0000000..e2dcdf5
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-64x64@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-68x68@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-68x68@2x.png
new file mode 100644
index 0000000..bb88513
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-68x68@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png
new file mode 100644
index 0000000..2e6ebc8
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png
new file mode 100644
index 0000000..bfa1b2e
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
index 84ac32a..a4ea777 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
index 8953cba..13c856a 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
index 0467bf1..f1241de 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-1024x1024@1x.png
new file mode 100644
index 0000000..aaaefb4
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-1024x1024@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-20x20@2x.png
new file mode 100644
index 0000000..44f493b
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-20x20@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-20x20@3x.png
new file mode 100644
index 0000000..c6678ed
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-20x20@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-29x29@2x.png
new file mode 100644
index 0000000..93dea83
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-29x29@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-29x29@3x.png
new file mode 100644
index 0000000..151ddec
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-29x29@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-38x38@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-38x38@2x.png
new file mode 100644
index 0000000..46109ec
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-38x38@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-38x38@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-38x38@3x.png
new file mode 100644
index 0000000..5a94fa1
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-38x38@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-40x40@2x.png
new file mode 100644
index 0000000..272766d
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-40x40@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-40x40@3x.png
new file mode 100644
index 0000000..314cca8
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-40x40@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-60x60@2x.png
new file mode 100644
index 0000000..314cca8
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-60x60@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-60x60@3x.png
new file mode 100644
index 0000000..db61bd9
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-60x60@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-64x64@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-64x64@2x.png
new file mode 100644
index 0000000..4259733
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-64x64@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-64x64@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-64x64@3x.png
new file mode 100644
index 0000000..9820d86
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-64x64@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-68x68@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-68x68@2x.png
new file mode 100644
index 0000000..e8e3df9
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-68x68@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-76x76@2x.png
new file mode 100644
index 0000000..be10225
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-76x76@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-83.5x83.5@2x.png
new file mode 100644
index 0000000..146c35b
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Dark-83.5x83.5@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-1024x1024@1x.png
new file mode 100644
index 0000000..e0308a2
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-1024x1024@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-20x20@2x.png
new file mode 100644
index 0000000..b2f4cbe
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-20x20@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-20x20@3x.png
new file mode 100644
index 0000000..84887bb
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-20x20@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-29x29@2x.png
new file mode 100644
index 0000000..28f959f
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-29x29@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-29x29@3x.png
new file mode 100644
index 0000000..4e74850
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-29x29@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-38x38@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-38x38@2x.png
new file mode 100644
index 0000000..1a21b4d
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-38x38@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-38x38@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-38x38@3x.png
new file mode 100644
index 0000000..8a94fa2
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-38x38@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-40x40@2x.png
new file mode 100644
index 0000000..47099f6
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-40x40@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-40x40@3x.png
new file mode 100644
index 0000000..7aec81f
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-40x40@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-60x60@2x.png
new file mode 100644
index 0000000..7aec81f
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-60x60@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-60x60@3x.png
new file mode 100644
index 0000000..f978010
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-60x60@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-64x64@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-64x64@2x.png
new file mode 100644
index 0000000..78976d8
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-64x64@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-64x64@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-64x64@3x.png
new file mode 100644
index 0000000..17416a6
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-64x64@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-68x68@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-68x68@2x.png
new file mode 100644
index 0000000..9133f70
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-68x68@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-76x76@2x.png
new file mode 100644
index 0000000..326391d
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-76x76@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-83.5x83.5@2x.png
new file mode 100644
index 0000000..6c6f60a
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-Tinted-83.5x83.5@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchBackground.imageset/Contents.json b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/Contents.json
new file mode 100644
index 0000000..74298e8
--- /dev/null
+++ b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images": [
+    {
+      "filename": "background.png",
+      "idiom": "universal"
+    },
+    {
+      "appearances": [
+        {
+          "appearance": "luminosity",
+          "value": "dark"
+        }
+      ],
+      "filename": "darkbackground.png",
+      "idiom": "universal"
+    }
+  ],
+  "info": {
+    "author": "xcode",
+    "version": 1
+  }
+}
diff --git a/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png
new file mode 100644
index 0000000..3107d37
Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchBackground.imageset/darkbackground.png b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/darkbackground.png
new file mode 100644
index 0000000..71e9c81
Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/darkbackground.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
index 0bedcf2..74e5f0c 100644
--- a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
+++ b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
@@ -1,23 +1,56 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
       "filename" : "LaunchImage.png",
+      "idiom": "universal",
       "scale" : "1x"
     },
     {
+      "appearances": [
+        {
+          "appearance": "luminosity",
+          "value": "dark"
+        }
+      ],
+      "filename": "LaunchImageDark.png",
       "idiom" : "universal",
+      "scale": "1x"
+    },
+    {
       "filename" : "LaunchImage@2x.png",
+      "idiom": "universal",
       "scale" : "2x"
     },
     {
+      "appearances": [
+        {
+          "appearance": "luminosity",
+          "value": "dark"
+        }
+      ],
+      "filename": "LaunchImageDark@2x.png",
       "idiom" : "universal",
+      "scale": "2x"
+    },
+    {
       "filename" : "LaunchImage@3x.png",
+      "idiom": "universal",
+      "scale": "3x"
+    },
+    {
+      "appearances": [
+        {
+          "appearance": "luminosity",
+          "value": "dark"
+        }
+      ],
+      "filename": "LaunchImageDark@3x.png",
+      "idiom": "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author": "xcode",
+    "version": 1
   }
 }
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
index 9da19ea..a044806 100644
Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png
index 9da19ea..bc51ba3 100644
Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png
index 9da19ea..6a8caf4 100644
Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImageDark.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImageDark.png
new file mode 100644
index 0000000..1c5cabc
Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImageDark.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImageDark@2x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImageDark@2x.png
new file mode 100644
index 0000000..d844b49
Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImageDark@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImageDark@3x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImageDark@3x.png
new file mode 100644
index 0000000..582ff95
Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImageDark@3x.png differ
diff --git a/ios/Runner/Base.lproj/LaunchScreen.storyboard b/ios/Runner/Base.lproj/LaunchScreen.storyboard
index f2e259c..5a37630 100644
--- a/ios/Runner/Base.lproj/LaunchScreen.storyboard
+++ b/ios/Runner/Base.lproj/LaunchScreen.storyboard
@@ -16,13 +16,19 @@
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4">
-                            </imageView>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" image="LaunchBackground" translatesAutoresizingMaskIntoConstraints="NO" id="tWc-Dq-wcI"/>
+                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4"></imageView>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="1a2-6s-vTC"/>
-                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="4X2-HB-R7a"/>
+                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="3T2-ad-Qdv"/>
+                            <constraint firstItem="tWc-Dq-wcI" firstAttribute="bottom" secondItem="Ze5-6b-2t3" secondAttribute="bottom" id="RPx-PI-7Xg"/>
+                            <constraint firstItem="tWc-Dq-wcI" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="SdS-ul-q2q"/>
+                            <constraint firstAttribute="trailing" secondItem="tWc-Dq-wcI" secondAttribute="trailing" id="Swv-Gf-Rwn"/>
+                            <constraint firstAttribute="trailing" secondItem="YRO-k0-Ey4" secondAttribute="trailing" id="TQA-XW-tRk"/>
+                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="bottom" secondItem="Ze5-6b-2t3" secondAttribute="bottom" id="duK-uY-Gun"/>
+                            <constraint firstItem="tWc-Dq-wcI" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="kV7-tw-vXt"/>
+                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="xPn-NY-SIU"/>
                         </constraints>
                     </view>
                 </viewController>
@@ -32,6 +38,7 @@
         </scene>
     </scenes>
     <resources>
-        <image name="LaunchImage" width="168" height="185"/>
+        <image name="LaunchImage" width="1152" height="1152"/>
+        <image name="LaunchBackground" width="1" height="1"/>
     </resources>
 </document>
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index b7fd4c0..6332a01 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -1,59 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleDisplayName</key>
-	<string>Mood Diary</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>mood_diary</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>$(FLUTTER_BUILD_NAME)</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>$(FLUTTER_BUILD_NUMBER)</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIMainStoryboardFile</key>
-	<string>Main</string>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>CADisableMinimumFrameDurationOnPhone</key>
-	<true/>
-	<key>UIApplicationSupportsIndirectInputEvents</key>
-	<true/>
-	<key>NSFaceIDUsageDescription</key>
-    <string>Used to apply locks</string>
-    <key>NSPhotoLibraryUsageDescription</key>
-    <string>Used to apply locks</string>
-    <key>NSCameraUsageDescription</key>
-    <string>Used to apply locks</string>
-    <key>NSMicrophoneUsageDescription</key>
-    <string>Used to apply locks</string>
-    <key>NSLocationWhenInUseUsageDescription</key>
-    <string>This app needs access to location when open.</string>
-</dict>
+	<dict>
+		<key>CFBundleDevelopmentRegion</key>
+		<string>$(DEVELOPMENT_LANGUAGE)</string>
+		<key>CFBundleDisplayName</key>
+		<string>Mood Diary</string>
+		<key>CFBundleExecutable</key>
+		<string>$(EXECUTABLE_NAME)</string>
+		<key>CFBundleIdentifier</key>
+		<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+		<key>CFBundleInfoDictionaryVersion</key>
+		<string>6.0</string>
+		<key>CFBundleName</key>
+		<string>mood_diary</string>
+		<key>CFBundlePackageType</key>
+		<string>APPL</string>
+		<key>CFBundleShortVersionString</key>
+		<string>$(FLUTTER_BUILD_NAME)</string>
+		<key>CFBundleSignature</key>
+		<string>????</string>
+		<key>CFBundleVersion</key>
+		<string>$(FLUTTER_BUILD_NUMBER)</string>
+		<key>LSRequiresIPhoneOS</key>
+		<true/>
+		<key>UILaunchStoryboardName</key>
+		<string>LaunchScreen</string>
+		<key>UIMainStoryboardFile</key>
+		<string>Main</string>
+		<key>UISupportedInterfaceOrientations</key>
+		<array>
+			<string>UIInterfaceOrientationPortrait</string>
+			<string>UIInterfaceOrientationLandscapeLeft</string>
+			<string>UIInterfaceOrientationLandscapeRight</string>
+		</array>
+		<key>UISupportedInterfaceOrientations~ipad</key>
+		<array>
+			<string>UIInterfaceOrientationPortrait</string>
+			<string>UIInterfaceOrientationPortraitUpsideDown</string>
+			<string>UIInterfaceOrientationLandscapeLeft</string>
+			<string>UIInterfaceOrientationLandscapeRight</string>
+		</array>
+		<key>CADisableMinimumFrameDurationOnPhone</key>
+		<true/>
+		<key>UIApplicationSupportsIndirectInputEvents</key>
+		<true/>
+		<key>NSFaceIDUsageDescription</key>
+		<string>Used to apply locks</string>
+		<key>NSPhotoLibraryUsageDescription</key>
+		<string>Used to apply locks</string>
+		<key>NSCameraUsageDescription</key>
+		<string>Used to apply locks</string>
+		<key>NSMicrophoneUsageDescription</key>
+		<string>Used to apply locks</string>
+		<key>NSLocationWhenInUseUsageDescription</key>
+		<string>This app needs access to location when open.</string>
+		<key>UIStatusBarHidden</key>
+		<false/>
+	</dict>
 </plist>
diff --git a/lib/common/models/isar/diary.dart b/lib/common/models/isar/diary.dart
index e1cd296..173c101 100644
--- a/lib/common/models/isar/diary.dart
+++ b/lib/common/models/isar/diary.dart
@@ -38,6 +38,9 @@ class Diary {
   @Index()
   DateTime time = DateTime.now();
 
+  //上次更新的时间，用于增量同步
+  DateTime lastModified = DateTime.now();
+
   //是否显示，用于回收站
   @Index()
   bool show = true;
@@ -63,6 +66,9 @@ class Diary {
   // 位置信息
   List<String> position = [];
 
+  // 类型，富文本还是纯文本
+  String? type;
+
   //封面颜色，如果有的话
   int? imageColor;
 
@@ -81,6 +87,7 @@ class Diary {
           content == other.content &&
           contentText == other.contentText &&
           time == other.time &&
+          lastModified == other.lastModified &&
           show == other.show &&
           mood == other.mood &&
           const ListEquality().equals(weather, other.weather) &&
@@ -89,6 +96,7 @@ class Diary {
           const ListEquality().equals(videoName, other.videoName) &&
           const ListEquality().equals(tags, other.tags) &&
           const ListEquality().equals(position, other.position) &&
+          type == other.type &&
           imageColor == other.imageColor &&
           aspect == other.aspect;
 
@@ -100,6 +108,7 @@ class Diary {
         content.hashCode ^
         contentText.hashCode ^
         time.hashCode ^
+        lastModified.hashCode ^
         show.hashCode ^
         mood.hashCode ^
         const ListEquality().hash(weather) ^
@@ -108,6 +117,7 @@ class Diary {
         const ListEquality().hash(videoName) ^
         const ListEquality().hash(tags) ^
         const ListEquality().hash(position) ^
+        type.hashCode ^
         imageColor.hashCode ^
         aspect.hashCode;
   }
@@ -123,6 +133,7 @@ class Diary {
       ..content = content
       ..contentText = contentText
       ..time = DateTime.fromMillisecondsSinceEpoch(time.millisecondsSinceEpoch)
+      ..lastModified = DateTime.fromMillisecondsSinceEpoch(lastModified.millisecondsSinceEpoch)
       ..show = show
       ..mood = mood
       ..weather = List<String>.from(weather)
@@ -131,6 +142,7 @@ class Diary {
       ..videoName = List<String>.from(videoName)
       ..tags = List<String>.from(tags)
       ..position = List<String>.from(position)
+      ..type = type
       ..imageColor = imageColor
       ..aspect = aspect;
   }
@@ -144,6 +156,7 @@ class Diary {
       'content': content,
       'contentText': contentText,
       'time': time.toIso8601String(),
+      'lastModified': lastModified.toIso8601String(),
       'show': show,
       'mood': mood,
       'weather': weather,
@@ -152,6 +165,7 @@ class Diary {
       'videoName': videoName,
       'tags': tags,
       'position': position,
+      'type': type,
       'imageColor': imageColor,
       'aspect': aspect,
     };
@@ -165,6 +179,7 @@ class Diary {
       ..content = json['content'] as String
       ..contentText = json['contentText'] as String
       ..time = DateTime.parse(json['time'] as String)
+      ..lastModified = DateTime.parse(json['lastModified'] as String)
       ..show = json['show'] as bool
       ..mood = (json['mood'] as num).toDouble()
       ..weather = List<String>.from(json['weather'] as List)
@@ -173,6 +188,7 @@ class Diary {
       ..videoName = List<String>.from(json['videoName'] as List)
       ..tags = List<String>.from(json['tags'] as List)
       ..position = List<String>.from(json['position'] as List)
+      ..type = json['type'] as String
       ..imageColor = json['imageColor'] as int?
       ..aspect = (json['aspect'] as num?)?.toDouble();
   }
diff --git a/lib/common/models/isar/diary.g.dart b/lib/common/models/isar/diary.g.dart
index 32a1063..432beb2 100644
--- a/lib/common/models/isar/diary.g.dart
+++ b/lib/common/models/isar/diary.g.dart
@@ -44,6 +44,10 @@ const DiarySchema = IsarGeneratedSchema(
         name: 'time',
         type: IsarType.dateTime,
       ),
+      IsarPropertySchema(
+        name: 'lastModified',
+        type: IsarType.dateTime,
+      ),
       IsarPropertySchema(
         name: 'show',
         type: IsarType.bool,
@@ -76,6 +80,10 @@ const DiarySchema = IsarGeneratedSchema(
         name: 'position',
         type: IsarType.stringList,
       ),
+      IsarPropertySchema(
+        name: 'type',
+        type: IsarType.string,
+      ),
       IsarPropertySchema(
         name: 'imageColor',
         type: IsarType.long,
@@ -159,18 +167,11 @@ int serializeDiary(IsarWriter writer, Diary object) {
   IsarCore.writeString(writer, 4, object.content);
   IsarCore.writeString(writer, 5, object.contentText);
   IsarCore.writeLong(writer, 6, object.time.toUtc().microsecondsSinceEpoch);
-  IsarCore.writeBool(writer, 7, object.show);
-  IsarCore.writeDouble(writer, 8, object.mood);
+  IsarCore.writeLong(writer, 7, object.lastModified.toUtc().microsecondsSinceEpoch);
+  IsarCore.writeBool(writer, 8, object.show);
+  IsarCore.writeDouble(writer, 9, object.mood);
   {
     final list = object.weather;
-    final listWriter = IsarCore.beginList(writer, 9, list.length);
-    for (var i = 0; i < list.length; i++) {
-      IsarCore.writeString(listWriter, i, list[i]);
-    }
-    IsarCore.endList(writer, listWriter);
-  }
-  {
-    final list = object.imageName;
     final listWriter = IsarCore.beginList(writer, 10, list.length);
     for (var i = 0; i < list.length; i++) {
       IsarCore.writeString(listWriter, i, list[i]);
@@ -178,7 +179,7 @@ int serializeDiary(IsarWriter writer, Diary object) {
     IsarCore.endList(writer, listWriter);
   }
   {
-    final list = object.audioName;
+    final list = object.imageName;
     final listWriter = IsarCore.beginList(writer, 11, list.length);
     for (var i = 0; i < list.length; i++) {
       IsarCore.writeString(listWriter, i, list[i]);
@@ -186,7 +187,7 @@ int serializeDiary(IsarWriter writer, Diary object) {
     IsarCore.endList(writer, listWriter);
   }
   {
-    final list = object.videoName;
+    final list = object.audioName;
     final listWriter = IsarCore.beginList(writer, 12, list.length);
     for (var i = 0; i < list.length; i++) {
       IsarCore.writeString(listWriter, i, list[i]);
@@ -194,7 +195,7 @@ int serializeDiary(IsarWriter writer, Diary object) {
     IsarCore.endList(writer, listWriter);
   }
   {
-    final list = object.tags;
+    final list = object.videoName;
     final listWriter = IsarCore.beginList(writer, 13, list.length);
     for (var i = 0; i < list.length; i++) {
       IsarCore.writeString(listWriter, i, list[i]);
@@ -202,17 +203,33 @@ int serializeDiary(IsarWriter writer, Diary object) {
     IsarCore.endList(writer, listWriter);
   }
   {
-    final list = object.position;
+    final list = object.tags;
     final listWriter = IsarCore.beginList(writer, 14, list.length);
     for (var i = 0; i < list.length; i++) {
       IsarCore.writeString(listWriter, i, list[i]);
     }
     IsarCore.endList(writer, listWriter);
   }
-  IsarCore.writeLong(writer, 15, object.imageColor ?? -9223372036854775808);
-  IsarCore.writeDouble(writer, 16, object.aspect ?? double.nan);
-  IsarCore.writeString(writer, 17, object.yM);
-  IsarCore.writeString(writer, 18, object.yMd);
+  {
+    final list = object.position;
+    final listWriter = IsarCore.beginList(writer, 15, list.length);
+    for (var i = 0; i < list.length; i++) {
+      IsarCore.writeString(listWriter, i, list[i]);
+    }
+    IsarCore.endList(writer, listWriter);
+  }
+  {
+    final value = object.type;
+    if (value == null) {
+      IsarCore.writeNull(writer, 16);
+    } else {
+      IsarCore.writeString(writer, 16, value);
+    }
+  }
+  IsarCore.writeLong(writer, 17, object.imageColor ?? -9223372036854775808);
+  IsarCore.writeDouble(writer, 18, object.aspect ?? double.nan);
+  IsarCore.writeString(writer, 19, object.yM);
+  IsarCore.writeString(writer, 20, object.yMd);
   return object.isarId;
 }
 
@@ -232,10 +249,18 @@ Diary deserializeDiary(IsarReader reader) {
       object.time = DateTime.fromMicrosecondsSinceEpoch(value, isUtc: true).toLocal();
     }
   }
-  object.show = IsarCore.readBool(reader, 7);
-  object.mood = IsarCore.readDouble(reader, 8);
   {
-    final length = IsarCore.readList(reader, 9, IsarCore.readerPtrPtr);
+    final value = IsarCore.readLong(reader, 7);
+    if (value == -9223372036854775808) {
+      object.lastModified = DateTime.fromMillisecondsSinceEpoch(0, isUtc: true).toLocal();
+    } else {
+      object.lastModified = DateTime.fromMicrosecondsSinceEpoch(value, isUtc: true).toLocal();
+    }
+  }
+  object.show = IsarCore.readBool(reader, 8);
+  object.mood = IsarCore.readDouble(reader, 9);
+  {
+    final length = IsarCore.readList(reader, 10, IsarCore.readerPtrPtr);
     {
       final reader = IsarCore.readerPtr;
       if (reader.isNull) {
@@ -251,7 +276,7 @@ Diary deserializeDiary(IsarReader reader) {
     }
   }
   {
-    final length = IsarCore.readList(reader, 10, IsarCore.readerPtrPtr);
+    final length = IsarCore.readList(reader, 11, IsarCore.readerPtrPtr);
     {
       final reader = IsarCore.readerPtr;
       if (reader.isNull) {
@@ -267,7 +292,7 @@ Diary deserializeDiary(IsarReader reader) {
     }
   }
   {
-    final length = IsarCore.readList(reader, 11, IsarCore.readerPtrPtr);
+    final length = IsarCore.readList(reader, 12, IsarCore.readerPtrPtr);
     {
       final reader = IsarCore.readerPtr;
       if (reader.isNull) {
@@ -283,7 +308,7 @@ Diary deserializeDiary(IsarReader reader) {
     }
   }
   {
-    final length = IsarCore.readList(reader, 12, IsarCore.readerPtrPtr);
+    final length = IsarCore.readList(reader, 13, IsarCore.readerPtrPtr);
     {
       final reader = IsarCore.readerPtr;
       if (reader.isNull) {
@@ -299,7 +324,7 @@ Diary deserializeDiary(IsarReader reader) {
     }
   }
   {
-    final length = IsarCore.readList(reader, 13, IsarCore.readerPtrPtr);
+    final length = IsarCore.readList(reader, 14, IsarCore.readerPtrPtr);
     {
       final reader = IsarCore.readerPtr;
       if (reader.isNull) {
@@ -315,7 +340,7 @@ Diary deserializeDiary(IsarReader reader) {
     }
   }
   {
-    final length = IsarCore.readList(reader, 14, IsarCore.readerPtrPtr);
+    final length = IsarCore.readList(reader, 15, IsarCore.readerPtrPtr);
     {
       final reader = IsarCore.readerPtr;
       if (reader.isNull) {
@@ -330,8 +355,9 @@ Diary deserializeDiary(IsarReader reader) {
       }
     }
   }
+  object.type = IsarCore.readString(reader, 16);
   {
-    final value = IsarCore.readLong(reader, 15);
+    final value = IsarCore.readLong(reader, 17);
     if (value == -9223372036854775808) {
       object.imageColor = null;
     } else {
@@ -339,7 +365,7 @@ Diary deserializeDiary(IsarReader reader) {
     }
   }
   {
-    final value = IsarCore.readDouble(reader, 16);
+    final value = IsarCore.readDouble(reader, 18);
     if (value.isNaN) {
       object.aspect = null;
     } else {
@@ -372,26 +398,18 @@ dynamic deserializeDiaryProp(IsarReader reader, int property) {
         }
       }
     case 7:
-      return IsarCore.readBool(reader, 7);
-    case 8:
-      return IsarCore.readDouble(reader, 8);
-    case 9:
       {
-        final length = IsarCore.readList(reader, 9, IsarCore.readerPtrPtr);
-        {
-          final reader = IsarCore.readerPtr;
-          if (reader.isNull) {
-            return const <String>[];
-          } else {
-            final list = List<String>.filled(length, '', growable: true);
-            for (var i = 0; i < length; i++) {
-              list[i] = IsarCore.readString(reader, i) ?? '';
-            }
-            IsarCore.freeReader(reader);
-            return list;
-          }
+        final value = IsarCore.readLong(reader, 7);
+        if (value == -9223372036854775808) {
+          return DateTime.fromMillisecondsSinceEpoch(0, isUtc: true).toLocal();
+        } else {
+          return DateTime.fromMicrosecondsSinceEpoch(value, isUtc: true).toLocal();
         }
       }
+    case 8:
+      return IsarCore.readBool(reader, 8);
+    case 9:
+      return IsarCore.readDouble(reader, 9);
     case 10:
       {
         final length = IsarCore.readList(reader, 10, IsarCore.readerPtrPtr);
@@ -479,16 +497,35 @@ dynamic deserializeDiaryProp(IsarReader reader, int property) {
       }
     case 15:
       {
-        final value = IsarCore.readLong(reader, 15);
+        final length = IsarCore.readList(reader, 15, IsarCore.readerPtrPtr);
+        {
+          final reader = IsarCore.readerPtr;
+          if (reader.isNull) {
+            return const <String>[];
+          } else {
+            final list = List<String>.filled(length, '', growable: true);
+            for (var i = 0; i < length; i++) {
+              list[i] = IsarCore.readString(reader, i) ?? '';
+            }
+            IsarCore.freeReader(reader);
+            return list;
+          }
+        }
+      }
+    case 16:
+      return IsarCore.readString(reader, 16);
+    case 17:
+      {
+        final value = IsarCore.readLong(reader, 17);
         if (value == -9223372036854775808) {
           return null;
         } else {
           return value;
         }
       }
-    case 16:
+    case 18:
       {
-        final value = IsarCore.readDouble(reader, 16);
+        final value = IsarCore.readDouble(reader, 18);
         if (value.isNaN) {
           return null;
         } else {
@@ -497,10 +534,10 @@ dynamic deserializeDiaryProp(IsarReader reader, int property) {
       }
     case 0:
       return IsarCore.readId(reader);
-    case 17:
-      return IsarCore.readString(reader, 17) ?? '';
-    case 18:
-      return IsarCore.readString(reader, 18) ?? '';
+    case 19:
+      return IsarCore.readString(reader, 19) ?? '';
+    case 20:
+      return IsarCore.readString(reader, 20) ?? '';
     default:
       throw ArgumentError('Unknown property: $property');
   }
@@ -515,8 +552,10 @@ sealed class _DiaryUpdate {
     String? content,
     String? contentText,
     DateTime? time,
+    DateTime? lastModified,
     bool? show,
     double? mood,
+    String? type,
     int? imageColor,
     double? aspect,
     String? yM,
@@ -538,8 +577,10 @@ class _DiaryUpdateImpl implements _DiaryUpdate {
     Object? content = ignore,
     Object? contentText = ignore,
     Object? time = ignore,
+    Object? lastModified = ignore,
     Object? show = ignore,
     Object? mood = ignore,
+    Object? type = ignore,
     Object? imageColor = ignore,
     Object? aspect = ignore,
     Object? yM = ignore,
@@ -554,12 +595,14 @@ class _DiaryUpdateImpl implements _DiaryUpdate {
           if (content != ignore) 4: content as String?,
           if (contentText != ignore) 5: contentText as String?,
           if (time != ignore) 6: time as DateTime?,
-          if (show != ignore) 7: show as bool?,
-          if (mood != ignore) 8: mood as double?,
-          if (imageColor != ignore) 15: imageColor as int?,
-          if (aspect != ignore) 16: aspect as double?,
-          if (yM != ignore) 17: yM as String?,
-          if (yMd != ignore) 18: yMd as String?,
+          if (lastModified != ignore) 7: lastModified as DateTime?,
+          if (show != ignore) 8: show as bool?,
+          if (mood != ignore) 9: mood as double?,
+          if (type != ignore) 16: type as String?,
+          if (imageColor != ignore) 17: imageColor as int?,
+          if (aspect != ignore) 18: aspect as double?,
+          if (yM != ignore) 19: yM as String?,
+          if (yMd != ignore) 20: yMd as String?,
         }) >
         0;
   }
@@ -574,8 +617,10 @@ sealed class _DiaryUpdateAll {
     String? content,
     String? contentText,
     DateTime? time,
+    DateTime? lastModified,
     bool? show,
     double? mood,
+    String? type,
     int? imageColor,
     double? aspect,
     String? yM,
@@ -597,8 +642,10 @@ class _DiaryUpdateAllImpl implements _DiaryUpdateAll {
     Object? content = ignore,
     Object? contentText = ignore,
     Object? time = ignore,
+    Object? lastModified = ignore,
     Object? show = ignore,
     Object? mood = ignore,
+    Object? type = ignore,
     Object? imageColor = ignore,
     Object? aspect = ignore,
     Object? yM = ignore,
@@ -611,12 +658,14 @@ class _DiaryUpdateAllImpl implements _DiaryUpdateAll {
       if (content != ignore) 4: content as String?,
       if (contentText != ignore) 5: contentText as String?,
       if (time != ignore) 6: time as DateTime?,
-      if (show != ignore) 7: show as bool?,
-      if (mood != ignore) 8: mood as double?,
-      if (imageColor != ignore) 15: imageColor as int?,
-      if (aspect != ignore) 16: aspect as double?,
-      if (yM != ignore) 17: yM as String?,
-      if (yMd != ignore) 18: yMd as String?,
+      if (lastModified != ignore) 7: lastModified as DateTime?,
+      if (show != ignore) 8: show as bool?,
+      if (mood != ignore) 9: mood as double?,
+      if (type != ignore) 16: type as String?,
+      if (imageColor != ignore) 17: imageColor as int?,
+      if (aspect != ignore) 18: aspect as double?,
+      if (yM != ignore) 19: yM as String?,
+      if (yMd != ignore) 20: yMd as String?,
     });
   }
 }
@@ -635,8 +684,10 @@ sealed class _DiaryQueryUpdate {
     String? content,
     String? contentText,
     DateTime? time,
+    DateTime? lastModified,
     bool? show,
     double? mood,
+    String? type,
     int? imageColor,
     double? aspect,
     String? yM,
@@ -658,8 +709,10 @@ class _DiaryQueryUpdateImpl implements _DiaryQueryUpdate {
     Object? content = ignore,
     Object? contentText = ignore,
     Object? time = ignore,
+    Object? lastModified = ignore,
     Object? show = ignore,
     Object? mood = ignore,
+    Object? type = ignore,
     Object? imageColor = ignore,
     Object? aspect = ignore,
     Object? yM = ignore,
@@ -672,12 +725,14 @@ class _DiaryQueryUpdateImpl implements _DiaryQueryUpdate {
       if (content != ignore) 4: content as String?,
       if (contentText != ignore) 5: contentText as String?,
       if (time != ignore) 6: time as DateTime?,
-      if (show != ignore) 7: show as bool?,
-      if (mood != ignore) 8: mood as double?,
-      if (imageColor != ignore) 15: imageColor as int?,
-      if (aspect != ignore) 16: aspect as double?,
-      if (yM != ignore) 17: yM as String?,
-      if (yMd != ignore) 18: yMd as String?,
+      if (lastModified != ignore) 7: lastModified as DateTime?,
+      if (show != ignore) 8: show as bool?,
+      if (mood != ignore) 9: mood as double?,
+      if (type != ignore) 16: type as String?,
+      if (imageColor != ignore) 17: imageColor as int?,
+      if (aspect != ignore) 18: aspect as double?,
+      if (yM != ignore) 19: yM as String?,
+      if (yMd != ignore) 20: yMd as String?,
     });
   }
 }
@@ -702,8 +757,10 @@ class _DiaryQueryBuilderUpdateImpl implements _DiaryQueryUpdate {
     Object? content = ignore,
     Object? contentText = ignore,
     Object? time = ignore,
+    Object? lastModified = ignore,
     Object? show = ignore,
     Object? mood = ignore,
+    Object? type = ignore,
     Object? imageColor = ignore,
     Object? aspect = ignore,
     Object? yM = ignore,
@@ -718,12 +775,14 @@ class _DiaryQueryBuilderUpdateImpl implements _DiaryQueryUpdate {
         if (content != ignore) 4: content as String?,
         if (contentText != ignore) 5: contentText as String?,
         if (time != ignore) 6: time as DateTime?,
-        if (show != ignore) 7: show as bool?,
-        if (mood != ignore) 8: mood as double?,
-        if (imageColor != ignore) 15: imageColor as int?,
-        if (aspect != ignore) 16: aspect as double?,
-        if (yM != ignore) 17: yM as String?,
-        if (yMd != ignore) 18: yMd as String?,
+        if (lastModified != ignore) 7: lastModified as DateTime?,
+        if (show != ignore) 8: show as bool?,
+        if (mood != ignore) 9: mood as double?,
+        if (type != ignore) 16: type as String?,
+        if (imageColor != ignore) 17: imageColor as int?,
+        if (aspect != ignore) 18: aspect as double?,
+        if (yM != ignore) 19: yM as String?,
+        if (yMd != ignore) 20: yMd as String?,
       });
     } finally {
       q.close();
@@ -1670,13 +1729,93 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     });
   }
 
+  QueryBuilder<Diary, Diary, QAfterFilterCondition> lastModifiedEqualTo(
+    DateTime value,
+  ) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(
+        EqualCondition(
+          property: 7,
+          value: value,
+        ),
+      );
+    });
+  }
+
+  QueryBuilder<Diary, Diary, QAfterFilterCondition> lastModifiedGreaterThan(
+    DateTime value,
+  ) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(
+        GreaterCondition(
+          property: 7,
+          value: value,
+        ),
+      );
+    });
+  }
+
+  QueryBuilder<Diary, Diary, QAfterFilterCondition> lastModifiedGreaterThanOrEqualTo(
+    DateTime value,
+  ) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(
+        GreaterOrEqualCondition(
+          property: 7,
+          value: value,
+        ),
+      );
+    });
+  }
+
+  QueryBuilder<Diary, Diary, QAfterFilterCondition> lastModifiedLessThan(
+    DateTime value,
+  ) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(
+        LessCondition(
+          property: 7,
+          value: value,
+        ),
+      );
+    });
+  }
+
+  QueryBuilder<Diary, Diary, QAfterFilterCondition> lastModifiedLessThanOrEqualTo(
+    DateTime value,
+  ) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(
+        LessOrEqualCondition(
+          property: 7,
+          value: value,
+        ),
+      );
+    });
+  }
+
+  QueryBuilder<Diary, Diary, QAfterFilterCondition> lastModifiedBetween(
+    DateTime lower,
+    DateTime upper,
+  ) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(
+        BetweenCondition(
+          property: 7,
+          lower: lower,
+          upper: upper,
+        ),
+      );
+    });
+  }
+
   QueryBuilder<Diary, Diary, QAfterFilterCondition> showEqualTo(
     bool value,
   ) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         EqualCondition(
-          property: 7,
+          property: 8,
           value: value,
         ),
       );
@@ -1690,7 +1829,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         EqualCondition(
-          property: 8,
+          property: 9,
           value: value,
           epsilon: epsilon,
         ),
@@ -1705,7 +1844,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         GreaterCondition(
-          property: 8,
+          property: 9,
           value: value,
           epsilon: epsilon,
         ),
@@ -1720,7 +1859,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         GreaterOrEqualCondition(
-          property: 8,
+          property: 9,
           value: value,
           epsilon: epsilon,
         ),
@@ -1735,7 +1874,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         LessCondition(
-          property: 8,
+          property: 9,
           value: value,
           epsilon: epsilon,
         ),
@@ -1750,7 +1889,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         LessOrEqualCondition(
-          property: 8,
+          property: 9,
           value: value,
           epsilon: epsilon,
         ),
@@ -1766,7 +1905,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         BetweenCondition(
-          property: 8,
+          property: 9,
           lower: lower,
           upper: upper,
           epsilon: epsilon,
@@ -1782,7 +1921,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         EqualCondition(
-          property: 9,
+          property: 10,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -1797,7 +1936,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         GreaterCondition(
-          property: 9,
+          property: 10,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -1812,7 +1951,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         GreaterOrEqualCondition(
-          property: 9,
+          property: 10,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -1827,7 +1966,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         LessCondition(
-          property: 9,
+          property: 10,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -1842,7 +1981,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         LessOrEqualCondition(
-          property: 9,
+          property: 10,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -1858,7 +1997,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         BetweenCondition(
-          property: 9,
+          property: 10,
           lower: lower,
           upper: upper,
           caseSensitive: caseSensitive,
@@ -1874,7 +2013,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         StartsWithCondition(
-          property: 9,
+          property: 10,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -1889,7 +2028,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         EndsWithCondition(
-          property: 9,
+          property: 10,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -1901,7 +2040,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         ContainsCondition(
-          property: 9,
+          property: 10,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -1913,7 +2052,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         MatchesCondition(
-          property: 9,
+          property: 10,
           wildcard: pattern,
           caseSensitive: caseSensitive,
         ),
@@ -1925,7 +2064,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         const EqualCondition(
-          property: 9,
+          property: 10,
           value: '',
         ),
       );
@@ -1936,7 +2075,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         const GreaterCondition(
-          property: 9,
+          property: 10,
           value: '',
         ),
       );
@@ -1950,7 +2089,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
   QueryBuilder<Diary, Diary, QAfterFilterCondition> weatherIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
-        const GreaterOrEqualCondition(property: 9, value: null),
+        const GreaterOrEqualCondition(property: 10, value: null),
       );
     });
   }
@@ -1962,7 +2101,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         EqualCondition(
-          property: 10,
+          property: 11,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -1977,7 +2116,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         GreaterCondition(
-          property: 10,
+          property: 11,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -1992,7 +2131,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         GreaterOrEqualCondition(
-          property: 10,
+          property: 11,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -2007,7 +2146,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         LessCondition(
-          property: 10,
+          property: 11,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -2022,7 +2161,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         LessOrEqualCondition(
-          property: 10,
+          property: 11,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -2038,7 +2177,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         BetweenCondition(
-          property: 10,
+          property: 11,
           lower: lower,
           upper: upper,
           caseSensitive: caseSensitive,
@@ -2054,7 +2193,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         StartsWithCondition(
-          property: 10,
+          property: 11,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -2069,7 +2208,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         EndsWithCondition(
-          property: 10,
+          property: 11,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -2082,7 +2221,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         ContainsCondition(
-          property: 10,
+          property: 11,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -2095,7 +2234,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         MatchesCondition(
-          property: 10,
+          property: 11,
           wildcard: pattern,
           caseSensitive: caseSensitive,
         ),
@@ -2107,7 +2246,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         const EqualCondition(
-          property: 10,
+          property: 11,
           value: '',
         ),
       );
@@ -2118,7 +2257,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         const GreaterCondition(
-          property: 10,
+          property: 11,
           value: '',
         ),
       );
@@ -2132,7 +2271,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
   QueryBuilder<Diary, Diary, QAfterFilterCondition> imageNameIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
-        const GreaterOrEqualCondition(property: 10, value: null),
+        const GreaterOrEqualCondition(property: 11, value: null),
       );
     });
   }
@@ -2144,7 +2283,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         EqualCondition(
-          property: 11,
+          property: 12,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -2159,7 +2298,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         GreaterCondition(
-          property: 11,
+          property: 12,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -2174,7 +2313,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         GreaterOrEqualCondition(
-          property: 11,
+          property: 12,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -2189,7 +2328,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         LessCondition(
-          property: 11,
+          property: 12,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -2204,7 +2343,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         LessOrEqualCondition(
-          property: 11,
+          property: 12,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -2220,7 +2359,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         BetweenCondition(
-          property: 11,
+          property: 12,
           lower: lower,
           upper: upper,
           caseSensitive: caseSensitive,
@@ -2236,7 +2375,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         StartsWithCondition(
-          property: 11,
+          property: 12,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -2251,7 +2390,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         EndsWithCondition(
-          property: 11,
+          property: 12,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -2264,7 +2403,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         ContainsCondition(
-          property: 11,
+          property: 12,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -2277,7 +2416,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         MatchesCondition(
-          property: 11,
+          property: 12,
           wildcard: pattern,
           caseSensitive: caseSensitive,
         ),
@@ -2289,7 +2428,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         const EqualCondition(
-          property: 11,
+          property: 12,
           value: '',
         ),
       );
@@ -2300,7 +2439,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         const GreaterCondition(
-          property: 11,
+          property: 12,
           value: '',
         ),
       );
@@ -2314,7 +2453,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
   QueryBuilder<Diary, Diary, QAfterFilterCondition> audioNameIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
-        const GreaterOrEqualCondition(property: 11, value: null),
+        const GreaterOrEqualCondition(property: 12, value: null),
       );
     });
   }
@@ -2326,7 +2465,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         EqualCondition(
-          property: 12,
+          property: 13,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -2341,7 +2480,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         GreaterCondition(
-          property: 12,
+          property: 13,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -2356,7 +2495,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         GreaterOrEqualCondition(
-          property: 12,
+          property: 13,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -2371,7 +2510,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         LessCondition(
-          property: 12,
+          property: 13,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -2386,7 +2525,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         LessOrEqualCondition(
-          property: 12,
+          property: 13,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -2402,7 +2541,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         BetweenCondition(
-          property: 12,
+          property: 13,
           lower: lower,
           upper: upper,
           caseSensitive: caseSensitive,
@@ -2418,7 +2557,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         StartsWithCondition(
-          property: 12,
+          property: 13,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -2433,7 +2572,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         EndsWithCondition(
-          property: 12,
+          property: 13,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -2446,7 +2585,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         ContainsCondition(
-          property: 12,
+          property: 13,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -2459,7 +2598,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         MatchesCondition(
-          property: 12,
+          property: 13,
           wildcard: pattern,
           caseSensitive: caseSensitive,
         ),
@@ -2471,7 +2610,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         const EqualCondition(
-          property: 12,
+          property: 13,
           value: '',
         ),
       );
@@ -2482,7 +2621,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         const GreaterCondition(
-          property: 12,
+          property: 13,
           value: '',
         ),
       );
@@ -2496,7 +2635,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
   QueryBuilder<Diary, Diary, QAfterFilterCondition> videoNameIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
-        const GreaterOrEqualCondition(property: 12, value: null),
+        const GreaterOrEqualCondition(property: 13, value: null),
       );
     });
   }
@@ -2508,7 +2647,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         EqualCondition(
-          property: 13,
+          property: 14,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -2523,7 +2662,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         GreaterCondition(
-          property: 13,
+          property: 14,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -2538,7 +2677,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         GreaterOrEqualCondition(
-          property: 13,
+          property: 14,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -2553,7 +2692,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         LessCondition(
-          property: 13,
+          property: 14,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -2568,7 +2707,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         LessOrEqualCondition(
-          property: 13,
+          property: 14,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -2584,7 +2723,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         BetweenCondition(
-          property: 13,
+          property: 14,
           lower: lower,
           upper: upper,
           caseSensitive: caseSensitive,
@@ -2600,7 +2739,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         StartsWithCondition(
-          property: 13,
+          property: 14,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -2615,7 +2754,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         EndsWithCondition(
-          property: 13,
+          property: 14,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -2627,7 +2766,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         ContainsCondition(
-          property: 13,
+          property: 14,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -2639,7 +2778,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         MatchesCondition(
-          property: 13,
+          property: 14,
           wildcard: pattern,
           caseSensitive: caseSensitive,
         ),
@@ -2651,7 +2790,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         const EqualCondition(
-          property: 13,
+          property: 14,
           value: '',
         ),
       );
@@ -2662,7 +2801,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         const GreaterCondition(
-          property: 13,
+          property: 14,
           value: '',
         ),
       );
@@ -2676,7 +2815,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
   QueryBuilder<Diary, Diary, QAfterFilterCondition> tagsIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
-        const GreaterOrEqualCondition(property: 13, value: null),
+        const GreaterOrEqualCondition(property: 14, value: null),
       );
     });
   }
@@ -2688,7 +2827,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         EqualCondition(
-          property: 14,
+          property: 15,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -2703,7 +2842,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         GreaterCondition(
-          property: 14,
+          property: 15,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -2718,7 +2857,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         GreaterOrEqualCondition(
-          property: 14,
+          property: 15,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -2733,7 +2872,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         LessCondition(
-          property: 14,
+          property: 15,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -2748,7 +2887,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         LessOrEqualCondition(
-          property: 14,
+          property: 15,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -2764,7 +2903,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         BetweenCondition(
-          property: 14,
+          property: 15,
           lower: lower,
           upper: upper,
           caseSensitive: caseSensitive,
@@ -2780,7 +2919,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         StartsWithCondition(
-          property: 14,
+          property: 15,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -2795,7 +2934,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         EndsWithCondition(
-          property: 14,
+          property: 15,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -2807,7 +2946,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         ContainsCondition(
-          property: 14,
+          property: 15,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -2820,7 +2959,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         MatchesCondition(
-          property: 14,
+          property: 15,
           wildcard: pattern,
           caseSensitive: caseSensitive,
         ),
@@ -2832,7 +2971,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         const EqualCondition(
-          property: 14,
+          property: 15,
           value: '',
         ),
       );
@@ -2843,7 +2982,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         const GreaterCondition(
-          property: 14,
+          property: 15,
           value: '',
         ),
       );
@@ -2857,20 +2996,200 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
   QueryBuilder<Diary, Diary, QAfterFilterCondition> positionIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
-        const GreaterOrEqualCondition(property: 14, value: null),
+        const GreaterOrEqualCondition(property: 15, value: null),
+      );
+    });
+  }
+
+  QueryBuilder<Diary, Diary, QAfterFilterCondition> typeIsNull() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(const IsNullCondition(property: 16));
+    });
+  }
+
+  QueryBuilder<Diary, Diary, QAfterFilterCondition> typeIsNotNull() {
+    return QueryBuilder.apply(not(), (query) {
+      return query.addFilterCondition(const IsNullCondition(property: 16));
+    });
+  }
+
+  QueryBuilder<Diary, Diary, QAfterFilterCondition> typeEqualTo(
+    String? value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(
+        EqualCondition(
+          property: 16,
+          value: value,
+          caseSensitive: caseSensitive,
+        ),
+      );
+    });
+  }
+
+  QueryBuilder<Diary, Diary, QAfterFilterCondition> typeGreaterThan(
+    String? value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(
+        GreaterCondition(
+          property: 16,
+          value: value,
+          caseSensitive: caseSensitive,
+        ),
+      );
+    });
+  }
+
+  QueryBuilder<Diary, Diary, QAfterFilterCondition> typeGreaterThanOrEqualTo(
+    String? value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(
+        GreaterOrEqualCondition(
+          property: 16,
+          value: value,
+          caseSensitive: caseSensitive,
+        ),
+      );
+    });
+  }
+
+  QueryBuilder<Diary, Diary, QAfterFilterCondition> typeLessThan(
+    String? value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(
+        LessCondition(
+          property: 16,
+          value: value,
+          caseSensitive: caseSensitive,
+        ),
+      );
+    });
+  }
+
+  QueryBuilder<Diary, Diary, QAfterFilterCondition> typeLessThanOrEqualTo(
+    String? value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(
+        LessOrEqualCondition(
+          property: 16,
+          value: value,
+          caseSensitive: caseSensitive,
+        ),
+      );
+    });
+  }
+
+  QueryBuilder<Diary, Diary, QAfterFilterCondition> typeBetween(
+    String? lower,
+    String? upper, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(
+        BetweenCondition(
+          property: 16,
+          lower: lower,
+          upper: upper,
+          caseSensitive: caseSensitive,
+        ),
+      );
+    });
+  }
+
+  QueryBuilder<Diary, Diary, QAfterFilterCondition> typeStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(
+        StartsWithCondition(
+          property: 16,
+          value: value,
+          caseSensitive: caseSensitive,
+        ),
+      );
+    });
+  }
+
+  QueryBuilder<Diary, Diary, QAfterFilterCondition> typeEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(
+        EndsWithCondition(
+          property: 16,
+          value: value,
+          caseSensitive: caseSensitive,
+        ),
+      );
+    });
+  }
+
+  QueryBuilder<Diary, Diary, QAfterFilterCondition> typeContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(
+        ContainsCondition(
+          property: 16,
+          value: value,
+          caseSensitive: caseSensitive,
+        ),
+      );
+    });
+  }
+
+  QueryBuilder<Diary, Diary, QAfterFilterCondition> typeMatches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(
+        MatchesCondition(
+          property: 16,
+          wildcard: pattern,
+          caseSensitive: caseSensitive,
+        ),
+      );
+    });
+  }
+
+  QueryBuilder<Diary, Diary, QAfterFilterCondition> typeIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(
+        const EqualCondition(
+          property: 16,
+          value: '',
+        ),
+      );
+    });
+  }
+
+  QueryBuilder<Diary, Diary, QAfterFilterCondition> typeIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(
+        const GreaterCondition(
+          property: 16,
+          value: '',
+        ),
       );
     });
   }
 
   QueryBuilder<Diary, Diary, QAfterFilterCondition> imageColorIsNull() {
     return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(const IsNullCondition(property: 15));
+      return query.addFilterCondition(const IsNullCondition(property: 17));
     });
   }
 
   QueryBuilder<Diary, Diary, QAfterFilterCondition> imageColorIsNotNull() {
     return QueryBuilder.apply(not(), (query) {
-      return query.addFilterCondition(const IsNullCondition(property: 15));
+      return query.addFilterCondition(const IsNullCondition(property: 17));
     });
   }
 
@@ -2880,7 +3199,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         EqualCondition(
-          property: 15,
+          property: 17,
           value: value,
         ),
       );
@@ -2893,7 +3212,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         GreaterCondition(
-          property: 15,
+          property: 17,
           value: value,
         ),
       );
@@ -2906,7 +3225,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         GreaterOrEqualCondition(
-          property: 15,
+          property: 17,
           value: value,
         ),
       );
@@ -2919,7 +3238,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         LessCondition(
-          property: 15,
+          property: 17,
           value: value,
         ),
       );
@@ -2932,7 +3251,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         LessOrEqualCondition(
-          property: 15,
+          property: 17,
           value: value,
         ),
       );
@@ -2946,7 +3265,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         BetweenCondition(
-          property: 15,
+          property: 17,
           lower: lower,
           upper: upper,
         ),
@@ -2956,13 +3275,13 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
 
   QueryBuilder<Diary, Diary, QAfterFilterCondition> aspectIsNull() {
     return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(const IsNullCondition(property: 16));
+      return query.addFilterCondition(const IsNullCondition(property: 18));
     });
   }
 
   QueryBuilder<Diary, Diary, QAfterFilterCondition> aspectIsNotNull() {
     return QueryBuilder.apply(not(), (query) {
-      return query.addFilterCondition(const IsNullCondition(property: 16));
+      return query.addFilterCondition(const IsNullCondition(property: 18));
     });
   }
 
@@ -2973,7 +3292,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         EqualCondition(
-          property: 16,
+          property: 18,
           value: value,
           epsilon: epsilon,
         ),
@@ -2988,7 +3307,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         GreaterCondition(
-          property: 16,
+          property: 18,
           value: value,
           epsilon: epsilon,
         ),
@@ -3003,7 +3322,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         GreaterOrEqualCondition(
-          property: 16,
+          property: 18,
           value: value,
           epsilon: epsilon,
         ),
@@ -3018,7 +3337,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         LessCondition(
-          property: 16,
+          property: 18,
           value: value,
           epsilon: epsilon,
         ),
@@ -3033,7 +3352,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         LessOrEqualCondition(
-          property: 16,
+          property: 18,
           value: value,
           epsilon: epsilon,
         ),
@@ -3049,7 +3368,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         BetweenCondition(
-          property: 16,
+          property: 18,
           lower: lower,
           upper: upper,
           epsilon: epsilon,
@@ -3145,7 +3464,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         EqualCondition(
-          property: 17,
+          property: 19,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -3160,7 +3479,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         GreaterCondition(
-          property: 17,
+          property: 19,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -3175,7 +3494,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         GreaterOrEqualCondition(
-          property: 17,
+          property: 19,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -3190,7 +3509,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         LessCondition(
-          property: 17,
+          property: 19,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -3205,7 +3524,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         LessOrEqualCondition(
-          property: 17,
+          property: 19,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -3221,7 +3540,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         BetweenCondition(
-          property: 17,
+          property: 19,
           lower: lower,
           upper: upper,
           caseSensitive: caseSensitive,
@@ -3237,7 +3556,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         StartsWithCondition(
-          property: 17,
+          property: 19,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -3252,7 +3571,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         EndsWithCondition(
-          property: 17,
+          property: 19,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -3264,7 +3583,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         ContainsCondition(
-          property: 17,
+          property: 19,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -3276,7 +3595,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         MatchesCondition(
-          property: 17,
+          property: 19,
           wildcard: pattern,
           caseSensitive: caseSensitive,
         ),
@@ -3288,7 +3607,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         const EqualCondition(
-          property: 17,
+          property: 19,
           value: '',
         ),
       );
@@ -3299,7 +3618,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         const GreaterCondition(
-          property: 17,
+          property: 19,
           value: '',
         ),
       );
@@ -3313,7 +3632,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         EqualCondition(
-          property: 18,
+          property: 20,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -3328,7 +3647,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         GreaterCondition(
-          property: 18,
+          property: 20,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -3343,7 +3662,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         GreaterOrEqualCondition(
-          property: 18,
+          property: 20,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -3358,7 +3677,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         LessCondition(
-          property: 18,
+          property: 20,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -3373,7 +3692,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         LessOrEqualCondition(
-          property: 18,
+          property: 20,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -3389,7 +3708,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         BetweenCondition(
-          property: 18,
+          property: 20,
           lower: lower,
           upper: upper,
           caseSensitive: caseSensitive,
@@ -3405,7 +3724,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         StartsWithCondition(
-          property: 18,
+          property: 20,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -3420,7 +3739,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         EndsWithCondition(
-          property: 18,
+          property: 20,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -3432,7 +3751,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         ContainsCondition(
-          property: 18,
+          property: 20,
           value: value,
           caseSensitive: caseSensitive,
         ),
@@ -3444,7 +3763,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         MatchesCondition(
-          property: 18,
+          property: 20,
           wildcard: pattern,
           caseSensitive: caseSensitive,
         ),
@@ -3456,7 +3775,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         const EqualCondition(
-          property: 18,
+          property: 20,
           value: '',
         ),
       );
@@ -3467,7 +3786,7 @@ extension DiaryQueryFilter on QueryBuilder<Diary, Diary, QFilterCondition> {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(
         const GreaterCondition(
-          property: 18,
+          property: 20,
           value: '',
         ),
       );
@@ -3585,51 +3904,82 @@ extension DiaryQuerySortBy on QueryBuilder<Diary, Diary, QSortBy> {
     });
   }
 
-  QueryBuilder<Diary, Diary, QAfterSortBy> sortByShow() {
+  QueryBuilder<Diary, Diary, QAfterSortBy> sortByLastModified() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(7);
     });
   }
 
-  QueryBuilder<Diary, Diary, QAfterSortBy> sortByShowDesc() {
+  QueryBuilder<Diary, Diary, QAfterSortBy> sortByLastModifiedDesc() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(7, sort: Sort.desc);
     });
   }
 
-  QueryBuilder<Diary, Diary, QAfterSortBy> sortByMood() {
+  QueryBuilder<Diary, Diary, QAfterSortBy> sortByShow() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(8);
     });
   }
 
-  QueryBuilder<Diary, Diary, QAfterSortBy> sortByMoodDesc() {
+  QueryBuilder<Diary, Diary, QAfterSortBy> sortByShowDesc() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(8, sort: Sort.desc);
     });
   }
 
+  QueryBuilder<Diary, Diary, QAfterSortBy> sortByMood() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addSortBy(9);
+    });
+  }
+
+  QueryBuilder<Diary, Diary, QAfterSortBy> sortByMoodDesc() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addSortBy(9, sort: Sort.desc);
+    });
+  }
+
+  QueryBuilder<Diary, Diary, QAfterSortBy> sortByType({bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addSortBy(
+        16,
+        caseSensitive: caseSensitive,
+      );
+    });
+  }
+
+  QueryBuilder<Diary, Diary, QAfterSortBy> sortByTypeDesc({bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addSortBy(
+        16,
+        sort: Sort.desc,
+        caseSensitive: caseSensitive,
+      );
+    });
+  }
+
   QueryBuilder<Diary, Diary, QAfterSortBy> sortByImageColor() {
     return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(15);
+      return query.addSortBy(17);
     });
   }
 
   QueryBuilder<Diary, Diary, QAfterSortBy> sortByImageColorDesc() {
     return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(15, sort: Sort.desc);
+      return query.addSortBy(17, sort: Sort.desc);
     });
   }
 
   QueryBuilder<Diary, Diary, QAfterSortBy> sortByAspect() {
     return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(16);
+      return query.addSortBy(18);
     });
   }
 
   QueryBuilder<Diary, Diary, QAfterSortBy> sortByAspectDesc() {
     return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(16, sort: Sort.desc);
+      return query.addSortBy(18, sort: Sort.desc);
     });
   }
 
@@ -3648,7 +3998,7 @@ extension DiaryQuerySortBy on QueryBuilder<Diary, Diary, QSortBy> {
   QueryBuilder<Diary, Diary, QAfterSortBy> sortByYM({bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(
-        17,
+        19,
         caseSensitive: caseSensitive,
       );
     });
@@ -3657,7 +4007,7 @@ extension DiaryQuerySortBy on QueryBuilder<Diary, Diary, QSortBy> {
   QueryBuilder<Diary, Diary, QAfterSortBy> sortByYMDesc({bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(
-        17,
+        19,
         sort: Sort.desc,
         caseSensitive: caseSensitive,
       );
@@ -3667,7 +4017,7 @@ extension DiaryQuerySortBy on QueryBuilder<Diary, Diary, QSortBy> {
   QueryBuilder<Diary, Diary, QAfterSortBy> sortByYMd({bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(
-        18,
+        20,
         caseSensitive: caseSensitive,
       );
     });
@@ -3676,7 +4026,7 @@ extension DiaryQuerySortBy on QueryBuilder<Diary, Diary, QSortBy> {
   QueryBuilder<Diary, Diary, QAfterSortBy> sortByYMdDesc({bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(
-        18,
+        20,
         sort: Sort.desc,
         caseSensitive: caseSensitive,
       );
@@ -3757,51 +4107,75 @@ extension DiaryQuerySortThenBy on QueryBuilder<Diary, Diary, QSortThenBy> {
     });
   }
 
-  QueryBuilder<Diary, Diary, QAfterSortBy> thenByShow() {
+  QueryBuilder<Diary, Diary, QAfterSortBy> thenByLastModified() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(7);
     });
   }
 
-  QueryBuilder<Diary, Diary, QAfterSortBy> thenByShowDesc() {
+  QueryBuilder<Diary, Diary, QAfterSortBy> thenByLastModifiedDesc() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(7, sort: Sort.desc);
     });
   }
 
-  QueryBuilder<Diary, Diary, QAfterSortBy> thenByMood() {
+  QueryBuilder<Diary, Diary, QAfterSortBy> thenByShow() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(8);
     });
   }
 
-  QueryBuilder<Diary, Diary, QAfterSortBy> thenByMoodDesc() {
+  QueryBuilder<Diary, Diary, QAfterSortBy> thenByShowDesc() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(8, sort: Sort.desc);
     });
   }
 
+  QueryBuilder<Diary, Diary, QAfterSortBy> thenByMood() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addSortBy(9);
+    });
+  }
+
+  QueryBuilder<Diary, Diary, QAfterSortBy> thenByMoodDesc() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addSortBy(9, sort: Sort.desc);
+    });
+  }
+
+  QueryBuilder<Diary, Diary, QAfterSortBy> thenByType({bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addSortBy(16, caseSensitive: caseSensitive);
+    });
+  }
+
+  QueryBuilder<Diary, Diary, QAfterSortBy> thenByTypeDesc({bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addSortBy(16, sort: Sort.desc, caseSensitive: caseSensitive);
+    });
+  }
+
   QueryBuilder<Diary, Diary, QAfterSortBy> thenByImageColor() {
     return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(15);
+      return query.addSortBy(17);
     });
   }
 
   QueryBuilder<Diary, Diary, QAfterSortBy> thenByImageColorDesc() {
     return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(15, sort: Sort.desc);
+      return query.addSortBy(17, sort: Sort.desc);
     });
   }
 
   QueryBuilder<Diary, Diary, QAfterSortBy> thenByAspect() {
     return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(16);
+      return query.addSortBy(18);
     });
   }
 
   QueryBuilder<Diary, Diary, QAfterSortBy> thenByAspectDesc() {
     return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(16, sort: Sort.desc);
+      return query.addSortBy(18, sort: Sort.desc);
     });
   }
 
@@ -3819,25 +4193,25 @@ extension DiaryQuerySortThenBy on QueryBuilder<Diary, Diary, QSortThenBy> {
 
   QueryBuilder<Diary, Diary, QAfterSortBy> thenByYM({bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(17, caseSensitive: caseSensitive);
+      return query.addSortBy(19, caseSensitive: caseSensitive);
     });
   }
 
   QueryBuilder<Diary, Diary, QAfterSortBy> thenByYMDesc({bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(17, sort: Sort.desc, caseSensitive: caseSensitive);
+      return query.addSortBy(19, sort: Sort.desc, caseSensitive: caseSensitive);
     });
   }
 
   QueryBuilder<Diary, Diary, QAfterSortBy> thenByYMd({bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(18, caseSensitive: caseSensitive);
+      return query.addSortBy(20, caseSensitive: caseSensitive);
     });
   }
 
   QueryBuilder<Diary, Diary, QAfterSortBy> thenByYMdDesc({bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(18, sort: Sort.desc, caseSensitive: caseSensitive);
+      return query.addSortBy(20, sort: Sort.desc, caseSensitive: caseSensitive);
     });
   }
 }
@@ -3879,75 +4253,87 @@ extension DiaryQueryWhereDistinct on QueryBuilder<Diary, Diary, QDistinct> {
     });
   }
 
-  QueryBuilder<Diary, Diary, QAfterDistinct> distinctByShow() {
+  QueryBuilder<Diary, Diary, QAfterDistinct> distinctByLastModified() {
     return QueryBuilder.apply(this, (query) {
       return query.addDistinctBy(7);
     });
   }
 
-  QueryBuilder<Diary, Diary, QAfterDistinct> distinctByMood() {
+  QueryBuilder<Diary, Diary, QAfterDistinct> distinctByShow() {
     return QueryBuilder.apply(this, (query) {
       return query.addDistinctBy(8);
     });
   }
 
-  QueryBuilder<Diary, Diary, QAfterDistinct> distinctByWeather() {
+  QueryBuilder<Diary, Diary, QAfterDistinct> distinctByMood() {
     return QueryBuilder.apply(this, (query) {
       return query.addDistinctBy(9);
     });
   }
 
-  QueryBuilder<Diary, Diary, QAfterDistinct> distinctByImageName() {
+  QueryBuilder<Diary, Diary, QAfterDistinct> distinctByWeather() {
     return QueryBuilder.apply(this, (query) {
       return query.addDistinctBy(10);
     });
   }
 
-  QueryBuilder<Diary, Diary, QAfterDistinct> distinctByAudioName() {
+  QueryBuilder<Diary, Diary, QAfterDistinct> distinctByImageName() {
     return QueryBuilder.apply(this, (query) {
       return query.addDistinctBy(11);
     });
   }
 
-  QueryBuilder<Diary, Diary, QAfterDistinct> distinctByVideoName() {
+  QueryBuilder<Diary, Diary, QAfterDistinct> distinctByAudioName() {
     return QueryBuilder.apply(this, (query) {
       return query.addDistinctBy(12);
     });
   }
 
-  QueryBuilder<Diary, Diary, QAfterDistinct> distinctByTags() {
+  QueryBuilder<Diary, Diary, QAfterDistinct> distinctByVideoName() {
     return QueryBuilder.apply(this, (query) {
       return query.addDistinctBy(13);
     });
   }
 
-  QueryBuilder<Diary, Diary, QAfterDistinct> distinctByPosition() {
+  QueryBuilder<Diary, Diary, QAfterDistinct> distinctByTags() {
     return QueryBuilder.apply(this, (query) {
       return query.addDistinctBy(14);
     });
   }
 
-  QueryBuilder<Diary, Diary, QAfterDistinct> distinctByImageColor() {
+  QueryBuilder<Diary, Diary, QAfterDistinct> distinctByPosition() {
     return QueryBuilder.apply(this, (query) {
       return query.addDistinctBy(15);
     });
   }
 
+  QueryBuilder<Diary, Diary, QAfterDistinct> distinctByType({bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addDistinctBy(16, caseSensitive: caseSensitive);
+    });
+  }
+
+  QueryBuilder<Diary, Diary, QAfterDistinct> distinctByImageColor() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addDistinctBy(17);
+    });
+  }
+
   QueryBuilder<Diary, Diary, QAfterDistinct> distinctByAspect() {
     return QueryBuilder.apply(this, (query) {
-      return query.addDistinctBy(16);
+      return query.addDistinctBy(18);
     });
   }
 
   QueryBuilder<Diary, Diary, QAfterDistinct> distinctByYM({bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
-      return query.addDistinctBy(17, caseSensitive: caseSensitive);
+      return query.addDistinctBy(19, caseSensitive: caseSensitive);
     });
   }
 
   QueryBuilder<Diary, Diary, QAfterDistinct> distinctByYMd({bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
-      return query.addDistinctBy(18, caseSensitive: caseSensitive);
+      return query.addDistinctBy(20, caseSensitive: caseSensitive);
     });
   }
 }
@@ -3989,66 +4375,78 @@ extension DiaryQueryProperty1 on QueryBuilder<Diary, Diary, QProperty> {
     });
   }
 
-  QueryBuilder<Diary, bool, QAfterProperty> showProperty() {
+  QueryBuilder<Diary, DateTime, QAfterProperty> lastModifiedProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addProperty(7);
     });
   }
 
-  QueryBuilder<Diary, double, QAfterProperty> moodProperty() {
+  QueryBuilder<Diary, bool, QAfterProperty> showProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addProperty(8);
     });
   }
 
-  QueryBuilder<Diary, List<String>, QAfterProperty> weatherProperty() {
+  QueryBuilder<Diary, double, QAfterProperty> moodProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addProperty(9);
     });
   }
 
-  QueryBuilder<Diary, List<String>, QAfterProperty> imageNameProperty() {
+  QueryBuilder<Diary, List<String>, QAfterProperty> weatherProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addProperty(10);
     });
   }
 
-  QueryBuilder<Diary, List<String>, QAfterProperty> audioNameProperty() {
+  QueryBuilder<Diary, List<String>, QAfterProperty> imageNameProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addProperty(11);
     });
   }
 
-  QueryBuilder<Diary, List<String>, QAfterProperty> videoNameProperty() {
+  QueryBuilder<Diary, List<String>, QAfterProperty> audioNameProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addProperty(12);
     });
   }
 
-  QueryBuilder<Diary, List<String>, QAfterProperty> tagsProperty() {
+  QueryBuilder<Diary, List<String>, QAfterProperty> videoNameProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addProperty(13);
     });
   }
 
-  QueryBuilder<Diary, List<String>, QAfterProperty> positionProperty() {
+  QueryBuilder<Diary, List<String>, QAfterProperty> tagsProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addProperty(14);
     });
   }
 
-  QueryBuilder<Diary, int?, QAfterProperty> imageColorProperty() {
+  QueryBuilder<Diary, List<String>, QAfterProperty> positionProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addProperty(15);
     });
   }
 
-  QueryBuilder<Diary, double?, QAfterProperty> aspectProperty() {
+  QueryBuilder<Diary, String?, QAfterProperty> typeProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addProperty(16);
     });
   }
 
+  QueryBuilder<Diary, int?, QAfterProperty> imageColorProperty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addProperty(17);
+    });
+  }
+
+  QueryBuilder<Diary, double?, QAfterProperty> aspectProperty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addProperty(18);
+    });
+  }
+
   QueryBuilder<Diary, int, QAfterProperty> isarIdProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addProperty(0);
@@ -4057,13 +4455,13 @@ extension DiaryQueryProperty1 on QueryBuilder<Diary, Diary, QProperty> {
 
   QueryBuilder<Diary, String, QAfterProperty> yMProperty() {
     return QueryBuilder.apply(this, (query) {
-      return query.addProperty(17);
+      return query.addProperty(19);
     });
   }
 
   QueryBuilder<Diary, String, QAfterProperty> yMdProperty() {
     return QueryBuilder.apply(this, (query) {
-      return query.addProperty(18);
+      return query.addProperty(20);
     });
   }
 }
@@ -4105,66 +4503,78 @@ extension DiaryQueryProperty2<R> on QueryBuilder<Diary, R, QAfterProperty> {
     });
   }
 
-  QueryBuilder<Diary, (R, bool), QAfterProperty> showProperty() {
+  QueryBuilder<Diary, (R, DateTime), QAfterProperty> lastModifiedProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addProperty(7);
     });
   }
 
-  QueryBuilder<Diary, (R, double), QAfterProperty> moodProperty() {
+  QueryBuilder<Diary, (R, bool), QAfterProperty> showProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addProperty(8);
     });
   }
 
-  QueryBuilder<Diary, (R, List<String>), QAfterProperty> weatherProperty() {
+  QueryBuilder<Diary, (R, double), QAfterProperty> moodProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addProperty(9);
     });
   }
 
-  QueryBuilder<Diary, (R, List<String>), QAfterProperty> imageNameProperty() {
+  QueryBuilder<Diary, (R, List<String>), QAfterProperty> weatherProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addProperty(10);
     });
   }
 
-  QueryBuilder<Diary, (R, List<String>), QAfterProperty> audioNameProperty() {
+  QueryBuilder<Diary, (R, List<String>), QAfterProperty> imageNameProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addProperty(11);
     });
   }
 
-  QueryBuilder<Diary, (R, List<String>), QAfterProperty> videoNameProperty() {
+  QueryBuilder<Diary, (R, List<String>), QAfterProperty> audioNameProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addProperty(12);
     });
   }
 
-  QueryBuilder<Diary, (R, List<String>), QAfterProperty> tagsProperty() {
+  QueryBuilder<Diary, (R, List<String>), QAfterProperty> videoNameProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addProperty(13);
     });
   }
 
-  QueryBuilder<Diary, (R, List<String>), QAfterProperty> positionProperty() {
+  QueryBuilder<Diary, (R, List<String>), QAfterProperty> tagsProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addProperty(14);
     });
   }
 
-  QueryBuilder<Diary, (R, int?), QAfterProperty> imageColorProperty() {
+  QueryBuilder<Diary, (R, List<String>), QAfterProperty> positionProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addProperty(15);
     });
   }
 
-  QueryBuilder<Diary, (R, double?), QAfterProperty> aspectProperty() {
+  QueryBuilder<Diary, (R, String?), QAfterProperty> typeProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addProperty(16);
     });
   }
 
+  QueryBuilder<Diary, (R, int?), QAfterProperty> imageColorProperty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addProperty(17);
+    });
+  }
+
+  QueryBuilder<Diary, (R, double?), QAfterProperty> aspectProperty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addProperty(18);
+    });
+  }
+
   QueryBuilder<Diary, (R, int), QAfterProperty> isarIdProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addProperty(0);
@@ -4173,13 +4583,13 @@ extension DiaryQueryProperty2<R> on QueryBuilder<Diary, R, QAfterProperty> {
 
   QueryBuilder<Diary, (R, String), QAfterProperty> yMProperty() {
     return QueryBuilder.apply(this, (query) {
-      return query.addProperty(17);
+      return query.addProperty(19);
     });
   }
 
   QueryBuilder<Diary, (R, String), QAfterProperty> yMdProperty() {
     return QueryBuilder.apply(this, (query) {
-      return query.addProperty(18);
+      return query.addProperty(20);
     });
   }
 }
@@ -4221,66 +4631,78 @@ extension DiaryQueryProperty3<R1, R2> on QueryBuilder<Diary, (R1, R2), QAfterPro
     });
   }
 
-  QueryBuilder<Diary, (R1, R2, bool), QOperations> showProperty() {
+  QueryBuilder<Diary, (R1, R2, DateTime), QOperations> lastModifiedProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addProperty(7);
     });
   }
 
-  QueryBuilder<Diary, (R1, R2, double), QOperations> moodProperty() {
+  QueryBuilder<Diary, (R1, R2, bool), QOperations> showProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addProperty(8);
     });
   }
 
-  QueryBuilder<Diary, (R1, R2, List<String>), QOperations> weatherProperty() {
+  QueryBuilder<Diary, (R1, R2, double), QOperations> moodProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addProperty(9);
     });
   }
 
-  QueryBuilder<Diary, (R1, R2, List<String>), QOperations> imageNameProperty() {
+  QueryBuilder<Diary, (R1, R2, List<String>), QOperations> weatherProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addProperty(10);
     });
   }
 
-  QueryBuilder<Diary, (R1, R2, List<String>), QOperations> audioNameProperty() {
+  QueryBuilder<Diary, (R1, R2, List<String>), QOperations> imageNameProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addProperty(11);
     });
   }
 
-  QueryBuilder<Diary, (R1, R2, List<String>), QOperations> videoNameProperty() {
+  QueryBuilder<Diary, (R1, R2, List<String>), QOperations> audioNameProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addProperty(12);
     });
   }
 
-  QueryBuilder<Diary, (R1, R2, List<String>), QOperations> tagsProperty() {
+  QueryBuilder<Diary, (R1, R2, List<String>), QOperations> videoNameProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addProperty(13);
     });
   }
 
-  QueryBuilder<Diary, (R1, R2, List<String>), QOperations> positionProperty() {
+  QueryBuilder<Diary, (R1, R2, List<String>), QOperations> tagsProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addProperty(14);
     });
   }
 
-  QueryBuilder<Diary, (R1, R2, int?), QOperations> imageColorProperty() {
+  QueryBuilder<Diary, (R1, R2, List<String>), QOperations> positionProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addProperty(15);
     });
   }
 
-  QueryBuilder<Diary, (R1, R2, double?), QOperations> aspectProperty() {
+  QueryBuilder<Diary, (R1, R2, String?), QOperations> typeProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addProperty(16);
     });
   }
 
+  QueryBuilder<Diary, (R1, R2, int?), QOperations> imageColorProperty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addProperty(17);
+    });
+  }
+
+  QueryBuilder<Diary, (R1, R2, double?), QOperations> aspectProperty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addProperty(18);
+    });
+  }
+
   QueryBuilder<Diary, (R1, R2, int), QOperations> isarIdProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addProperty(0);
@@ -4289,13 +4711,13 @@ extension DiaryQueryProperty3<R1, R2> on QueryBuilder<Diary, (R1, R2), QAfterPro
 
   QueryBuilder<Diary, (R1, R2, String), QOperations> yMProperty() {
     return QueryBuilder.apply(this, (query) {
-      return query.addProperty(17);
+      return query.addProperty(19);
     });
   }
 
   QueryBuilder<Diary, (R1, R2, String), QOperations> yMdProperty() {
     return QueryBuilder.apply(this, (query) {
-      return query.addProperty(18);
+      return query.addProperty(20);
     });
   }
 }
diff --git a/lib/common/values/diary_type.dart b/lib/common/values/diary_type.dart
new file mode 100644
index 0000000..dad1a53
--- /dev/null
+++ b/lib/common/values/diary_type.dart
@@ -0,0 +1,8 @@
+enum DiaryType {
+  text('text'),
+  richText('richText');
+
+  final String value;
+
+  const DiaryType(this.value);
+}
diff --git a/lib/common/values/webdav.dart b/lib/common/values/webdav.dart
new file mode 100644
index 0000000..11e5f29
--- /dev/null
+++ b/lib/common/values/webdav.dart
@@ -0,0 +1,25 @@
+import 'package:flutter/material.dart';
+
+class WebDavOptions {
+  static const String basePath = '/Moodiary';
+  static const String imagePath = '/Moodiary/Asset/Image';
+  static const String audioPath = '/Moodiary/Asset/Audio';
+  static const String videoPath = '/Moodiary/Asset/Video';
+
+  static const String diaryPath = '/Moodiary/Diary';
+  static const String categoryPath = '/Moodiary/Category';
+
+  //增量同步标记文件路径
+  static const String syncFlagPath = '/Moodiary/sync.json';
+
+  // 连通性颜色标记
+  static const Color connectivityColor = Color(0xFF4CAF50);
+  static const Color unConnectivityColor = Color(0xFFF44336);
+  static const Color connectingColor = Color(0xFFFFC107);
+}
+
+enum WebDavConnectivityStatus {
+  connected,
+  unconnected,
+  connecting,
+}
diff --git a/lib/components/audio_player/audio_player_view.dart b/lib/components/audio_player/audio_player_view.dart
index 0251f16..7bc0473 100644
--- a/lib/components/audio_player/audio_player_view.dart
+++ b/lib/components/audio_player/audio_player_view.dart
@@ -52,11 +52,10 @@ class NoOverlayShape extends SfOverlayShape {
 }
 
 class AudioPlayerComponent extends StatelessWidget {
-  const AudioPlayerComponent({super.key, required this.path, this.isEdit = false});
+  const AudioPlayerComponent({super.key, required this.path});
 
   final String path;
 
-  final bool isEdit;
 
   @override
   Widget build(BuildContext context) {
@@ -132,15 +131,6 @@ class AudioPlayerComponent extends StatelessWidget {
                     ],
                   ),
                 ),
-                if (isEdit)
-                  IconButton(
-                    onPressed: () {
-                      logic.editLogic.deleteAudio(path);
-                    },
-                    icon: const Icon(
-                      Icons.cancel,
-                    ),
-                  )
               ],
             ),
           ),
diff --git a/lib/components/diary_card/large_diary_card/large_diary_card_view.dart b/lib/components/diary_card/large_diary_card/large_diary_card_view.dart
index 3fa6237..bb5fb4b 100644
--- a/lib/components/diary_card/large_diary_card/large_diary_card_view.dart
+++ b/lib/components/diary_card/large_diary_card/large_diary_card_view.dart
@@ -16,13 +16,17 @@ class LargeDiaryCardComponent extends StatelessWidget with BasicCardLogic {
   Widget build(BuildContext context) {
     final colorScheme = Theme.of(context).colorScheme;
     final textStyle = Theme.of(context).textTheme;
+    final pixelRatio = MediaQuery.devicePixelRatioOf(context);
 
     Widget buildImage() {
       return Container(
         height: 154.0,
         decoration: BoxDecoration(
           image: DecorationImage(
-            image: FileImage(File(Utils().fileUtil.getRealPath('image', diary.imageName.first))),
+            image: ResizeImage(
+              FileImage(File(Utils().fileUtil.getRealPath('image', diary.imageName.first))),
+              height: (154 * pixelRatio).toInt(),
+            ),
             fit: BoxFit.cover,
           ),
           borderRadius: AppBorderRadius.mediumBorderRadius,
diff --git a/lib/components/diary_card/small_diary_card/small_diary_card_view.dart b/lib/components/diary_card/small_diary_card/small_diary_card_view.dart
index 0dfb522..f531571 100644
--- a/lib/components/diary_card/small_diary_card/small_diary_card_view.dart
+++ b/lib/components/diary_card/small_diary_card/small_diary_card_view.dart
@@ -18,13 +18,17 @@ class SmallDiaryCardComponent extends StatelessWidget with BasicCardLogic {
   Widget build(BuildContext context) {
     final colorScheme = Theme.of(context).colorScheme;
     final textStyle = Theme.of(context).textTheme;
+    final pixelRatio = MediaQuery.devicePixelRatioOf(context);
     Widget buildImage() {
       return AspectRatio(
         aspectRatio: 1.0,
         child: Container(
           decoration: BoxDecoration(
             image: DecorationImage(
-              image: FileImage(File(Utils().fileUtil.getRealPath('image', diary.imageName.first))),
+              image: ResizeImage(
+                FileImage(File(Utils().fileUtil.getRealPath('image', diary.imageName.first))),
+                width: (122 * pixelRatio).toInt(),
+              ),
               fit: BoxFit.cover,
             ),
             borderRadius: AppBorderRadius.mediumBorderRadius,
diff --git a/lib/components/diary_tab_view/diary_tab_view_logic.dart b/lib/components/diary_tab_view/diary_tab_view_logic.dart
index 3de2f23..679a278 100644
--- a/lib/components/diary_tab_view/diary_tab_view_logic.dart
+++ b/lib/components/diary_tab_view/diary_tab_view_logic.dart
@@ -15,11 +15,11 @@ class DiaryTabViewLogic extends GetxController {
 
   @override
   void onReady() async {
-    await getDiary();
+    await _getDiary();
     super.onReady();
   }
 
-  Future<void> getDiary() async {
+  Future<void> _getDiary() async {
     state.isFetching = true;
     update(['PlaceHolder']);
     state.diaryList = await Utils().isarUtil.getDiaryByCategory(state.categoryId, 0, state.initLen);
@@ -28,6 +28,11 @@ class DiaryTabViewLogic extends GetxController {
     update(['TabView']);
   }
 
+  Future<void> updateDiary() async {
+    state.diaryList = await Utils().isarUtil.getDiaryByCategory(state.categoryId, 0, state.initLen);
+    update(['TabView']);
+  }
+
   Future<void> paginationDiary() async {
     state.diaryList +=
         await Utils().isarUtil.getDiaryByCategory(state.categoryId, state.diaryList.length, state.pageLen);
diff --git a/lib/components/keyboard_listener/keyboard_listener.dart b/lib/components/keyboard_listener/keyboard_listener.dart
new file mode 100644
index 0000000..e13ba05
--- /dev/null
+++ b/lib/components/keyboard_listener/keyboard_listener.dart
@@ -0,0 +1,65 @@
+import 'dart:ui';
+
+import 'package:flutter/widgets.dart';
+
+import '../../common/values/keyboard_state.dart';
+
+class KeyboardObserver with WidgetsBindingObserver {
+  /// 键盘高度变化回调
+  final void Function(double height) onHeightChanged;
+
+  /// 键盘状态变化回调
+  final void Function(KeyboardState state)? onStateChanged;
+
+  /// 上一次的键盘高度
+  double _lastHeight = 0;
+
+  /// 当前键盘状态
+  KeyboardState _keyboardState = KeyboardState.closed;
+
+  KeyboardObserver({
+    required this.onHeightChanged,
+    this.onStateChanged,
+  });
+
+  /// 开始监听
+  void start() {
+    WidgetsBinding.instance.addObserver(this);
+  }
+
+  /// 停止监听
+  void stop() {
+    WidgetsBinding.instance.removeObserver(this);
+  }
+
+  @override
+  void didChangeMetrics() {
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      // 当前键盘高度
+      final height = PlatformDispatcher.instance.views.first.viewInsets.bottom;
+
+      // 通知键盘高度变化
+      if (height != _lastHeight) {
+        onHeightChanged(height);
+      }
+
+      // 检测键盘状态变化
+      if (height > _lastHeight && _keyboardState != KeyboardState.opening) {
+        _keyboardState = KeyboardState.opening;
+        onStateChanged?.call(_keyboardState);
+      } else if (height < _lastHeight && _keyboardState != KeyboardState.closing) {
+        _keyboardState = KeyboardState.closing;
+        onStateChanged?.call(_keyboardState);
+      }
+
+      // 如果键盘完全关闭
+      if (height == 0 && _keyboardState != KeyboardState.closed) {
+        _keyboardState = KeyboardState.closed;
+        onStateChanged?.call(_keyboardState);
+      }
+
+      // 更新最后的高度
+      _lastHeight = height;
+    });
+  }
+}
diff --git a/lib/components/local_send/local_send_view.dart b/lib/components/local_send/local_send_view.dart
index 4d3dfa5..c7af1e4 100644
--- a/lib/components/local_send/local_send_view.dart
+++ b/lib/components/local_send/local_send_view.dart
@@ -111,10 +111,11 @@ class LocalSendComponent extends StatelessWidget {
       );
     }
 
-    return GetBuilder<LocalSendLogic>(
-      assignId: true,
-      builder: (_) {
-        return Padding(
+    return ExpansionTile(
+      leading: const Icon(Icons.wifi_tethering_rounded),
+      title: const Text('局域网传输'),
+      children: [
+        Padding(
           padding: const EdgeInsets.all(16.0),
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.stretch,
@@ -142,8 +143,8 @@ class LocalSendComponent extends StatelessWidget {
                   }),
             ],
           ),
-        );
-      },
+        )
+      ],
     );
   }
 }
diff --git a/lib/components/quill_embed/audio_embed.dart b/lib/components/quill_embed/audio_embed.dart
new file mode 100644
index 0000000..b7e4032
--- /dev/null
+++ b/lib/components/quill_embed/audio_embed.dart
@@ -0,0 +1,40 @@
+import 'package:flutter/widgets.dart';
+import 'package:flutter_quill/flutter_quill.dart';
+import 'package:mood_diary/utils/utils.dart';
+
+import '../audio_player/audio_player_view.dart';
+
+class AudioBlockEmbed extends BlockEmbed {
+  const AudioBlockEmbed(String value) : super(embedType, value);
+
+  static const String embedType = 'audio';
+
+  static AudioBlockEmbed fromName(String name) => AudioBlockEmbed(name);
+
+  String get name => data as String;
+}
+
+class AudioEmbedBuilder extends EmbedBuilder {
+  final bool isEdit;
+
+  AudioEmbedBuilder({required this.isEdit});
+
+  @override
+  String get key => AudioBlockEmbed.embedType;
+
+  @override
+  String toPlainText(Embed node) => '';
+
+  @override
+  Widget build(
+    BuildContext context,
+    EmbedContext embedContext,
+  ) {
+    final audioEmbed = AudioBlockEmbed(embedContext.node.value.data); // 从数据构造 AudioBlockEmbed
+    final path = isEdit
+        ? Utils().fileUtil.getCachePath(audioEmbed.name)
+        : Utils().fileUtil.getRealPath('audio', audioEmbed.name);
+
+    return AudioPlayerComponent(path: path); // 使用音频播放器组件渲染
+  }
+}
diff --git a/lib/components/quill_embed/image_embed.dart b/lib/components/quill_embed/image_embed.dart
new file mode 100644
index 0000000..e12ab9c
--- /dev/null
+++ b/lib/components/quill_embed/image_embed.dart
@@ -0,0 +1,42 @@
+import 'dart:io';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_quill/flutter_quill.dart';
+import 'package:mood_diary/utils/utils.dart';
+
+class ImageBlockEmbed extends BlockEmbed {
+  const ImageBlockEmbed(String value) : super(embedType, value);
+
+  static const String embedType = 'image';
+
+  static ImageBlockEmbed fromName(String name) => ImageBlockEmbed(name);
+
+  String get name => data as String;
+}
+
+class ImageEmbedBuilder extends EmbedBuilder {
+  final bool isEdit;
+
+  ImageEmbedBuilder({required this.isEdit});
+
+  @override
+  String get key => ImageBlockEmbed.embedType;
+
+  @override
+  String toPlainText(Embed node) => '';
+
+  @override
+  Widget build(
+    BuildContext context,
+    EmbedContext embedContext,
+  ) {
+    final imageEmbed = ImageBlockEmbed(embedContext.node.value.data);
+    // 从数据构造 ImageBlockEmbed
+    final imagePath = isEdit ? imageEmbed.name : Utils().fileUtil.getRealPath('image', imageEmbed.name);
+
+    return Card.filled(
+      clipBehavior: Clip.hardEdge,
+      child: Image.file(File(imagePath)),
+    );
+  }
+}
diff --git a/lib/components/quill_embed/text_indent.dart b/lib/components/quill_embed/text_indent.dart
new file mode 100644
index 0000000..9712714
--- /dev/null
+++ b/lib/components/quill_embed/text_indent.dart
@@ -0,0 +1,36 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_quill/flutter_quill.dart';
+
+class TextIndentEmbed extends BlockEmbed {
+  const TextIndentEmbed(String value) : super(embedType, value);
+  static const String embedType = 'text_indent';
+}
+
+class TextIndentEmbedBuilder extends EmbedBuilder {
+  final bool isEdit;
+
+  TextIndentEmbedBuilder({required this.isEdit});
+
+  @override
+  String get key => TextIndentEmbed.embedType;
+
+  @override
+  bool get expanded => false;
+
+  @override
+  String toPlainText(Embed node) => '';
+
+  @override
+  WidgetSpan buildWidgetSpan(Widget widget) {
+    return WidgetSpan(child: widget);
+  }
+
+  @override
+  Widget build(BuildContext context, EmbedContext embedContext) {
+    var indent = embedContext.node.value.data as String;
+    return SizedBox(
+      width: (embedContext.textStyle.fontSize ?? 16.0) * int.parse(indent),
+      child: isEdit ? Text('\u21E5' * int.parse(indent)) : null,
+    );
+  }
+}
diff --git a/lib/components/quill_embed/video_embed.dart b/lib/components/quill_embed/video_embed.dart
new file mode 100644
index 0000000..700ece0
--- /dev/null
+++ b/lib/components/quill_embed/video_embed.dart
@@ -0,0 +1,42 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_quill/flutter_quill.dart';
+import 'package:mood_diary/components/video_player/video_player_view.dart';
+import 'package:mood_diary/utils/utils.dart';
+
+class VideoBlockEmbed extends BlockEmbed {
+  const VideoBlockEmbed(String value) : super(embedType, value);
+
+  static const String embedType = 'video';
+
+  static VideoBlockEmbed fromName(String name) => VideoBlockEmbed(name);
+
+  String get name => data as String;
+}
+
+class VideoEmbedBuilder extends EmbedBuilder {
+  final bool isEdit;
+
+  VideoEmbedBuilder({required this.isEdit});
+
+  @override
+  String get key => VideoBlockEmbed.embedType;
+
+  @override
+  String toPlainText(Embed node) => '';
+
+  @override
+  Widget build(
+    BuildContext context,
+    EmbedContext embedContext,
+  ) {
+    final videoEmbed = VideoBlockEmbed(embedContext.node.value.data);
+    final videoPath = isEdit ? videoEmbed.name : Utils().fileUtil.getRealPath('video', videoEmbed.name);
+
+    return Card.filled(
+      clipBehavior: Clip.hardEdge,
+      child: VideoPlayerComponent(
+        videoPath: videoPath,
+      ),
+    ); // 使用音频播放器组件渲染
+  }
+}
diff --git a/lib/components/tile/setting_tile.dart b/lib/components/tile/setting_tile.dart
new file mode 100644
index 0000000..4b33059
--- /dev/null
+++ b/lib/components/tile/setting_tile.dart
@@ -0,0 +1,23 @@
+import 'package:flutter/material.dart';
+
+class SettingTitleTile extends StatelessWidget {
+  const SettingTitleTile({super.key, required this.title, this.subtitle});
+
+  final String title;
+
+  final String? subtitle;
+
+  @override
+  Widget build(BuildContext context) {
+    final textStyle = Theme.of(context).textTheme;
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return ListTile(
+      title: Text(
+        title,
+        style: textStyle.titleLarge!.copyWith(color: colorScheme.primary, fontWeight: FontWeight.bold),
+      ),
+      subtitle: subtitle != null ? Text(subtitle!) : null,
+    );
+  }
+}
diff --git a/lib/components/video_player/video_player_logic.dart b/lib/components/video_player/video_player_logic.dart
new file mode 100644
index 0000000..b5a8a48
--- /dev/null
+++ b/lib/components/video_player/video_player_logic.dart
@@ -0,0 +1,41 @@
+import 'dart:io';
+
+import 'package:chewie/chewie.dart';
+import 'package:get/get.dart';
+import 'package:video_player/video_player.dart';
+
+import 'video_player_state.dart';
+
+class VideoPlayerLogic extends GetxController {
+  final VideoPlayerState state = VideoPlayerState();
+
+  late final videoPlayerController = VideoPlayerController.file(File(state.videoPath));
+  late final chewieController = ChewieController(
+    videoPlayerController: videoPlayerController,
+    aspectRatio: 16 / 9,
+    useRootNavigator: false,
+  );
+
+  VideoPlayerLogic({required String videoPath}) {
+    state.videoPath = videoPath;
+  }
+
+  @override
+  void onInit() {
+    super.onInit();
+  }
+
+  @override
+  void onReady() async {
+    await videoPlayerController.initialize();
+    update();
+    super.onReady();
+  }
+
+  @override
+  void onClose() {
+    videoPlayerController.dispose();
+    chewieController.dispose();
+    super.onClose();
+  }
+}
diff --git a/lib/components/video_player/video_player_state.dart b/lib/components/video_player/video_player_state.dart
new file mode 100644
index 0000000..363901a
--- /dev/null
+++ b/lib/components/video_player/video_player_state.dart
@@ -0,0 +1,11 @@
+import 'package:media_kit/media_kit.dart';
+
+class VideoPlayerState {
+  late Playable playable;
+
+  late String videoPath;
+
+  VideoPlayerState() {
+    ///Initialize variables
+  }
+}
diff --git a/lib/components/video_player/video_player_view.dart b/lib/components/video_player/video_player_view.dart
new file mode 100644
index 0000000..a93fd1d
--- /dev/null
+++ b/lib/components/video_player/video_player_view.dart
@@ -0,0 +1,61 @@
+import 'dart:io';
+
+import 'package:chewie/chewie.dart';
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:media_kit_video/media_kit_video.dart';
+
+import 'video_player_logic.dart';
+import 'video_player_state.dart';
+
+class VideoPlayerComponent extends StatelessWidget {
+  final String videoPath;
+
+  const VideoPlayerComponent({super.key, required this.videoPath});
+
+  @override
+  Widget build(BuildContext context) {
+    final VideoPlayerLogic logic = Get.put(VideoPlayerLogic(videoPath: videoPath), tag: videoPath);
+    final VideoPlayerState state = Bind.find<VideoPlayerLogic>(tag: videoPath).state;
+    final colorScheme = Theme.of(context).colorScheme;
+
+    Widget buildCustomTheme({required Widget child}) {
+      if (Platform.isAndroid || Platform.isIOS) {
+        return MaterialVideoControlsTheme(
+          normal: kDefaultMaterialVideoControlsThemeData.copyWith(
+              seekBarPositionColor: colorScheme.primary,
+              seekBarThumbColor: colorScheme.primary,
+              seekBarMargin: const EdgeInsets.all(8.0)),
+          fullscreen: kDefaultMaterialVideoControlsThemeDataFullscreen.copyWith(
+            seekBarPositionColor: colorScheme.primary,
+            seekBarThumbColor: colorScheme.primary,
+          ),
+          child: child,
+        );
+      } else {
+        return MaterialDesktopVideoControlsTheme(
+          normal: kDefaultMaterialDesktopVideoControlsThemeData.copyWith(
+            seekBarPositionColor: colorScheme.primary,
+            seekBarThumbColor: colorScheme.primary,
+          ),
+          fullscreen: kDefaultMaterialDesktopVideoControlsThemeData.copyWith(
+            seekBarPositionColor: colorScheme.primary,
+            seekBarThumbColor: colorScheme.primary,
+          ),
+          child: child,
+        );
+      }
+    }
+
+    return AspectRatio(
+      aspectRatio: 16 / 9,
+      child: GetBuilder<VideoPlayerLogic>(
+        assignId: true,
+        tag: videoPath,
+        builder: (_) {
+          return Chewie(controller: logic.chewieController);
+        },
+      ),
+    );
+  }
+}
diff --git a/lib/components/web_dav/web_dav_logic.dart b/lib/components/web_dav/web_dav_logic.dart
new file mode 100644
index 0000000..efb8e12
--- /dev/null
+++ b/lib/components/web_dav/web_dav_logic.dart
@@ -0,0 +1,94 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:mood_diary/utils/webdav_util.dart';
+
+import '../../common/values/webdav.dart';
+import '../../utils/utils.dart';
+import 'web_dav_state.dart';
+
+class WebDavLogic extends GetxController {
+  final WebDavState state = WebDavState();
+
+  WebDavUtil get webDav => Utils().webDavUtil;
+
+  late TextEditingController webDavUrlController = TextEditingController(text: state.currentOptions[0]);
+  late FocusNode webDavUrlFocusNode = FocusNode();
+  late TextEditingController usernameController = TextEditingController(text: state.currentOptions[1]);
+  late FocusNode usernameFocusNode = FocusNode();
+  late TextEditingController passwordController = TextEditingController(text: state.currentOptions[2]);
+  late FocusNode passwordFocusNode = FocusNode();
+
+  @override
+  void onReady() async {
+    if (state.hasOption.value) {
+      await checkConnectivity();
+    }
+    super.onReady();
+  }
+
+  @override
+  void onClose() {
+    webDavUrlFocusNode.dispose();
+    usernameFocusNode.dispose();
+    passwordFocusNode.dispose();
+    webDavUrlController.dispose();
+    usernameController.dispose();
+    passwordController.dispose();
+    super.onClose();
+  }
+
+  Future<void> test() async {
+    var diary = await Utils().isarUtil.getAllDiaries();
+    await webDav.syncDiary(diary);
+  }
+
+  Future<void> checkConnectivity() async {
+    state.connectivityStatus.value = WebDavConnectivityStatus.connecting;
+    var res = await webDav.checkConnectivity();
+    state.connectivityStatus.value = res ? WebDavConnectivityStatus.connected : WebDavConnectivityStatus.unconnected;
+  }
+
+  void unFocus() {
+    if (webDavUrlFocusNode.hasFocus) webDavUrlFocusNode.unfocus();
+    if (usernameFocusNode.hasFocus) usernameFocusNode.unfocus();
+    if (passwordFocusNode.hasFocus) passwordFocusNode.unfocus();
+  }
+
+  void submitForm() async {
+    if (state.formKey.currentState?.validate() ?? false) {
+      unFocus();
+      state.formKey.currentState?.save();
+
+      await webDav.updateWebDav(
+          baseUrl: webDavUrlController.text, username: usernameController.text, password: passwordController.text);
+      state.hasOption.value = true;
+      await checkConnectivity();
+      Utils().noticeUtil.showToast('保存成功');
+    }
+  }
+
+  DateTime? _firstClickTime; // 用于记录第一次点击时间
+
+  void removeWebDavOption() {
+    final currentTime = DateTime.now();
+
+    if (_firstClickTime == null) {
+      _firstClickTime = currentTime;
+      Utils().noticeUtil.showToast('请再次点击确认删除');
+      return;
+    }
+    if (currentTime.difference(_firstClickTime!).inSeconds <= 2) {
+      _firstClickTime = null; // 重置点击时间
+      webDavUrlController.text = '';
+      usernameController.text = '';
+      passwordController.text = '';
+      state.hasOption.value = false;
+      webDav.removeWebDavOption();
+      Utils().noticeUtil.showToast('删除成功');
+    } else {
+      // 超过3秒，重置点击时间并提示
+      _firstClickTime = currentTime;
+      Utils().noticeUtil.showToast('请再次点击确认删除');
+    }
+  }
+}
diff --git a/lib/components/web_dav/web_dav_state.dart b/lib/components/web_dav/web_dav_state.dart
new file mode 100644
index 0000000..8e5429d
--- /dev/null
+++ b/lib/components/web_dav/web_dav_state.dart
@@ -0,0 +1,15 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:mood_diary/common/values/webdav.dart';
+import 'package:mood_diary/utils/utils.dart';
+
+class WebDavState {
+  final formKey = GlobalKey<FormState>();
+
+  RxBool hasOption = Utils().webDavUtil.hasOption.obs;
+  List<String> currentOptions = Utils().webDavUtil.options;
+
+  Rx<WebDavConnectivityStatus> connectivityStatus = WebDavConnectivityStatus.connecting.obs;
+
+  WebDavState();
+}
diff --git a/lib/components/web_dav/web_dav_view.dart b/lib/components/web_dav/web_dav_view.dart
new file mode 100644
index 0000000..52fd753
--- /dev/null
+++ b/lib/components/web_dav/web_dav_view.dart
@@ -0,0 +1,153 @@
+import 'package:flutter/material.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:get/get.dart';
+import 'package:mood_diary/common/values/border.dart';
+import 'package:mood_diary/common/values/webdav.dart';
+
+import 'web_dav_logic.dart';
+import 'web_dav_state.dart';
+
+class WebDavComponent extends StatelessWidget {
+  const WebDavComponent({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final WebDavLogic logic = Get.put(WebDavLogic());
+    final WebDavState state = Bind.find<WebDavLogic>().state;
+    final colorScheme = Theme.of(context).colorScheme;
+    return ExpansionTile(
+      leading: const Icon(Icons.backup_rounded),
+      title: const Text('WebDav'),
+      subtitle: Obx(() {
+        return state.hasOption.value
+            ? Row(
+                children: [
+                  const Text('已配置 连通性 '),
+                  Icon(
+                    Icons.circle,
+                    color: switch (state.connectivityStatus.value) {
+                      WebDavConnectivityStatus.connected => WebDavOptions.connectivityColor,
+                      WebDavConnectivityStatus.unconnected => WebDavOptions.unConnectivityColor,
+                      WebDavConnectivityStatus.connecting => WebDavOptions.connectingColor,
+                    },
+                    size: 16,
+                  ),
+                ],
+              )
+            : const Text('未配置');
+      }),
+      children: [
+        Padding(
+          padding: const EdgeInsets.all(16.0),
+          child: Form(
+            key: state.formKey,
+            child: Column(
+              spacing: 16.0,
+              children: [
+                TextFormField(
+                  decoration: InputDecoration(
+                    labelText: '服务器地址',
+                    border: const OutlineInputBorder(borderRadius: AppBorderRadius.smallBorderRadius),
+                    prefixIcon: const Padding(
+                      padding: EdgeInsets.all(16.0),
+                      child: FaIcon(
+                        FontAwesomeIcons.globe,
+                        size: 16,
+                      ),
+                    ),
+                    fillColor: colorScheme.surfaceContainer,
+                    filled: true,
+                  ),
+                  focusNode: logic.webDavUrlFocusNode,
+                  controller: logic.webDavUrlController,
+                  textInputAction: TextInputAction.next,
+                  keyboardType: TextInputType.url,
+                  validator: (value) {
+                    if (value == null || value.isEmpty) {
+                      return '请输入服务器地址';
+                    }
+                    return null;
+                  },
+                  onSaved: (value) {
+                    logic.webDavUrlController.text = value ?? '';
+                  },
+                ),
+                TextFormField(
+                  decoration: InputDecoration(
+                    labelText: '用户名',
+                    border: const OutlineInputBorder(borderRadius: AppBorderRadius.smallBorderRadius),
+                    prefixIcon: const Padding(
+                        padding: EdgeInsets.all(16.0),
+                        child: FaIcon(
+                          FontAwesomeIcons.solidUser,
+                          size: 16,
+                        )),
+                    fillColor: colorScheme.surfaceContainer,
+                    filled: true,
+                  ),
+                  textInputAction: TextInputAction.next,
+                  focusNode: logic.usernameFocusNode,
+                  controller: logic.usernameController,
+                  validator: (value) {
+                    if (value == null || value.isEmpty) {
+                      return '请输入用户名';
+                    }
+                    return null;
+                  },
+                  onSaved: (value) {
+                    logic.usernameController.text = value ?? '';
+                  },
+                ),
+                TextFormField(
+                  decoration: InputDecoration(
+                    labelText: '密码',
+                    border: const OutlineInputBorder(borderRadius: AppBorderRadius.smallBorderRadius),
+                    prefixIcon: const Padding(
+                      padding: EdgeInsets.all(16.0),
+                      child: FaIcon(
+                        FontAwesomeIcons.lock,
+                        size: 16,
+                      ),
+                    ),
+                    fillColor: colorScheme.surfaceContainer,
+                    filled: true,
+                  ),
+                  textInputAction: TextInputAction.done,
+                  focusNode: logic.passwordFocusNode,
+                  controller: logic.passwordController,
+                  obscureText: true,
+                  validator: (value) {
+                    if (value == null || value.isEmpty) {
+                      return '请输入密码';
+                    }
+                    return null;
+                  },
+                  onSaved: (value) {
+                    logic.passwordController.text = value ?? '';
+                  },
+                ),
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.end,
+                  children: [
+                    TextButton(
+                        onPressed: logic.removeWebDavOption,
+                        child: Text(
+                          '删除配置',
+                          style: TextStyle(color: colorScheme.error),
+                        )),
+                    TextButton(
+                      onPressed: logic.submitForm,
+                      child: Obx(() {
+                        return Text(!state.hasOption.value ? '保存配置' : '更新配置');
+                      }),
+                    ),
+                  ],
+                ),
+              ],
+            ),
+          ),
+        )
+      ],
+    );
+  }
+}
diff --git a/lib/components/web_dav_dashboard/web_dav_dashboard_logic.dart b/lib/components/web_dav_dashboard/web_dav_dashboard_logic.dart
new file mode 100644
index 0000000..f3b6445
--- /dev/null
+++ b/lib/components/web_dav_dashboard/web_dav_dashboard_logic.dart
@@ -0,0 +1,127 @@
+import 'package:get/get.dart';
+import 'package:mood_diary/pages/home/diary/diary_logic.dart';
+import 'package:mood_diary/router/app_routes.dart';
+import 'package:mood_diary/utils/utils.dart';
+
+import '../../common/values/webdav.dart';
+import 'web_dav_dashboard_state.dart';
+
+class WebDavDashboardLogic extends GetxController {
+  final WebDavDashboardState state = WebDavDashboardState();
+
+  @override
+  void onReady() async {
+    await updateWebdav(isInit: true);
+    super.onReady();
+  }
+
+  @override
+  void onClose() {
+    // TODO: implement onClose
+    super.onClose();
+  }
+
+  Future<void> updateWebdav({required bool isInit}) async {
+    state.isFetching = true;
+    if (!isInit) update();
+    await checkConnectivity();
+    if (state.connectivityStatus.value == WebDavConnectivityStatus.connected) {
+      await fetchingWebDavSyncFlag();
+      if (isInit) await fetchDiaryList();
+    }
+    state.isFetching = false;
+    update();
+  }
+
+  Future<void> fetchDiaryList() async {
+    // 获取所有日记
+    state.diaryList = await Utils().isarUtil.getAllDiaries();
+    state.toUploadDiaries.clear();
+    state.toDownloadIds.clear();
+    // 本地日记 Map，id 对应最后修改时间
+    final Map<String, DateTime> localDiaryMap = {for (var diary in state.diaryList) diary.id: diary.lastModified};
+    // 查找待上传的日记
+    _findToUploadDiaries(localDiaryMap);
+    // 查找待下载的日记
+    _findToDownloadIds(localDiaryMap);
+  }
+
+  void _findToUploadDiaries(Map<String, DateTime> localDiaryMap) {
+    for (var diary in state.diaryList) {
+      final remoteModifiedTime = state.webdavSyncMap[diary.id];
+      if (remoteModifiedTime == null || DateTime.parse(remoteModifiedTime).isBefore(diary.lastModified)) {
+        state.toUploadDiaries.add(diary);
+      }
+    }
+    state.toUploadDiariesCount.value = state.toUploadDiaries.length.toString();
+  }
+
+  void _findToDownloadIds(Map<String, DateTime> localDiaryMap) {
+    for (var id in state.webdavSyncMap.keys) {
+      if (!localDiaryMap.containsKey(id)) {
+        state.toDownloadIds.add(id);
+      }
+    }
+    state.toDownloadIdsCount.value = state.toDownloadIds.length.toString();
+  }
+
+  Future<void> checkConnectivity() async {
+    state.connectivityStatus.value = WebDavConnectivityStatus.connecting;
+    var res = await Utils().webDavUtil.checkConnectivity();
+    state.connectivityStatus.value = res ? WebDavConnectivityStatus.connected : WebDavConnectivityStatus.unconnected;
+  }
+
+  Future<void> fetchingWebDavSyncFlag() async {
+    state.webdavSyncMap = await Utils().webDavUtil.fetchServerSyncData();
+    state.webDavDiaryCount.value = state.webdavSyncMap.length.toString();
+  }
+
+  void toWebDavPage() async {
+    await Get.toNamed(AppRoutes.backupSyncPage);
+    await updateWebdav(isInit: false);
+  }
+
+  // 同步日记
+
+  Future<void> syncDiary() async {
+    checkIsUploading();
+    checkIsDownloading();
+    await Utils().webDavUtil.syncDiary(state.diaryList, onUpload: () {
+      state.toUploadDiariesCount.value = (int.parse(state.toUploadDiariesCount.value) - 1).toString();
+      checkIsUploading();
+    }, onDownload: () async {
+      state.toDownloadIdsCount.value = (int.parse(state.toDownloadIdsCount.value) - 1).toString();
+      checkIsDownloading();
+      await Bind.find<DiaryLogic>().updateCategory();
+      await Bind.find<DiaryLogic>().updateDiary(null);
+    }, onComplete: () {
+      Get.backLegacy();
+      Utils().noticeUtil.showToast('同步完成');
+    });
+  }
+
+  void checkIsUploading() {
+    state.isUploading.value = int.parse(state.toUploadDiariesCount.value) > 0;
+  }
+
+  void checkIsDownloading() {
+    state.isDownloading.value = int.parse(state.toDownloadIdsCount.value) > 0;
+  }
+
+// Future<void> uploadDiary() async {
+//   state.isUploading.value = true;
+//   await Utils().webDavUtil.syncDiary(state.toUploadDiaries);
+//   state.isUploading.value = false;
+//   await fetchingWebDavSyncFlag();
+//   await fetchDiaryList();
+// }
+//
+// // 下载日记
+// Future<void> downloadDiary() async {
+//   state.isDownloading.value = true;
+//   await Utils().webDavUtil.syncDiary();
+//   state.isDownloading.value = false;
+//   await fetchingWebDavSyncFlag();
+//   await fetchDiaryList();
+// }
+}
diff --git a/lib/components/web_dav_dashboard/web_dav_dashboard_state.dart b/lib/components/web_dav_dashboard/web_dav_dashboard_state.dart
new file mode 100644
index 0000000..1b842df
--- /dev/null
+++ b/lib/components/web_dav_dashboard/web_dav_dashboard_state.dart
@@ -0,0 +1,34 @@
+import 'package:get/get.dart';
+import 'package:mood_diary/common/models/isar/diary.dart';
+
+import '../../common/values/webdav.dart';
+
+class WebDavDashboardState {
+  Rx<WebDavConnectivityStatus> connectivityStatus = WebDavConnectivityStatus.connecting.obs;
+
+  RxString webDavDiaryCount = '...'.obs;
+
+  Map<String, String> webdavSyncMap = <String, String>{};
+
+  // 所有的日记
+  List<Diary> diaryList = <Diary>[];
+
+  // 待上传的日记，有两种情况，一种是本地有，服务器没有，一种是本地有，服务器有，但是本地的更新时间比服务器的新
+  List<Diary> toUploadDiaries = <Diary>[];
+
+  RxString toUploadDiariesCount = '...'.obs;
+
+  // 待下载的日记id，只有服务器有，本地没有的情况
+  List<String> toDownloadIds = <String>[];
+
+  RxString toDownloadIdsCount = '...'.obs;
+
+  bool isFetching = true;
+
+  RxBool isUploading = false.obs;
+  RxBool isDownloading = false.obs;
+
+  WebDavDashboardState() {
+    ///Initialize variables
+  }
+}
diff --git a/lib/components/web_dav_dashboard/web_dav_dashboard_view.dart b/lib/components/web_dav_dashboard/web_dav_dashboard_view.dart
new file mode 100644
index 0000000..e7b7fec
--- /dev/null
+++ b/lib/components/web_dav_dashboard/web_dav_dashboard_view.dart
@@ -0,0 +1,187 @@
+import 'package:flutter/material.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:get/get.dart';
+
+import '../../common/values/webdav.dart';
+import 'web_dav_dashboard_logic.dart';
+import 'web_dav_dashboard_state.dart';
+
+class WebDavDashboardComponent extends StatelessWidget {
+  const WebDavDashboardComponent({super.key});
+
+  Widget _buildError() {
+    return const Center(
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.center,
+        spacing: 8.0,
+        children: [
+          FaIcon(
+            FontAwesomeIcons.solidCircleXmark,
+            size: 56,
+          ),
+          Text('暂未配置或连接失败')
+        ],
+      ),
+    );
+  }
+
+  // 当前任务队列
+  Widget _buildTaskQueue({required RxBool isUploading, required RxBool isDownloading}) {
+    return ListTile(
+      title: const Text('当前任务队列'),
+      subtitle: Obx(() {
+        String status;
+        if (isUploading.value && isDownloading.value) {
+          status = '上传、下载中';
+        } else if (isUploading.value) {
+          status = '上传中';
+        } else if (isDownloading.value) {
+          status = '下载中';
+        } else {
+          status = '空闲';
+        }
+        return Text(status);
+      }),
+      trailing: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 12.0),
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+          children: [
+            Obx(() {
+              return isUploading.value
+                  ? const Row(
+                      mainAxisSize: MainAxisSize.min,
+                      spacing: 8.0,
+                      children: [
+                        FaIcon(
+                          FontAwesomeIcons.arrowUp,
+                          size: 12,
+                        ),
+                        Text('上传'),
+                      ],
+                    )
+                  : const SizedBox.shrink();
+            }),
+            Obx(() {
+              return isDownloading.value
+                  ? const Row(
+                      mainAxisSize: MainAxisSize.min,
+                      spacing: 8.0,
+                      children: [
+                        FaIcon(
+                          FontAwesomeIcons.arrowDown,
+                          size: 12,
+                        ),
+                        Text('下载'),
+                      ],
+                    )
+                  : const SizedBox.shrink();
+            }),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildCloudCount({required RxString cloudCount, required Function() onTap}) {
+    return ListTile(
+      title: const Text('云端日记数量'),
+      subtitle: Obx(() {
+        return Text(cloudCount.value);
+      }),
+      trailing: FilledButton(onPressed: onTap, child: const FaIcon(FontAwesomeIcons.arrowsRotate)),
+    );
+  }
+
+  // 本地日记数量，包括待上传和待下载
+  Widget _buildLocalDiaryCount(
+      {required RxString toUploadCount, required RxString toDownloadCount, required Function() onTap}) {
+    return ListTile(
+      title: const Text('本地日记数量'),
+      subtitle: Row(
+        spacing: 8.0,
+        children: [
+          Obx(() {
+            return Text('待上传 ${toUploadCount.value}');
+          }),
+          Obx(() {
+            return Text('待下载 ${toDownloadCount.value}');
+          }),
+        ],
+      ),
+      trailing: FilledButton(onPressed: onTap, child: const FaIcon(FontAwesomeIcons.arrowRightArrowLeft)),
+    );
+  }
+
+  // 本地待上传的日记数量
+  Widget _buildLocalSyncCount({required RxString localSyncCount, required Function() onTap}) {
+    return ListTile(
+        title: const Text('待上传日记数量'),
+        subtitle: Obx(() {
+          return Text(localSyncCount.value);
+        }),
+        trailing: FilledButton(onPressed: onTap, child: const FaIcon(FontAwesomeIcons.upload)));
+  }
+
+  // 本地待下载的日记数量
+  Widget _buildLocalUnSyncCount({required RxString localUnSyncCount, required Function() onTap}) {
+    return ListTile(
+        title: const Text('待下载日记数量'),
+        subtitle: Obx(() {
+          return Text(localUnSyncCount.value);
+        }),
+        trailing: FilledButton(onPressed: onTap, child: const FaIcon(FontAwesomeIcons.download)));
+  }
+
+  Widget _buildToWebDavSetting({required Rx<WebDavConnectivityStatus> state, required Function() onTap}) {
+    return ListTile(
+      title: Row(
+        children: [
+          const Text('服务连通性 '),
+          Obx(() {
+            return Icon(
+              Icons.circle,
+              color: switch (state.value) {
+                WebDavConnectivityStatus.connected => WebDavOptions.connectivityColor,
+                WebDavConnectivityStatus.unconnected => WebDavOptions.unConnectivityColor,
+                WebDavConnectivityStatus.connecting => WebDavOptions.connectingColor,
+              },
+              size: 16,
+            );
+          })
+        ],
+      ),
+      trailing: TextButton(onPressed: onTap, child: const Text('WebDav 设置')),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final WebDavDashboardLogic logic = Get.put(WebDavDashboardLogic());
+    final WebDavDashboardState state = Bind.find<WebDavDashboardLogic>().state;
+
+    return GetBuilder<WebDavDashboardLogic>(
+        assignId: true,
+        builder: (_) {
+          return Stack(
+            children: [
+              ListView(
+                children: [
+                  _buildToWebDavSetting(onTap: logic.toWebDavPage, state: state.connectivityStatus),
+                  if (state.connectivityStatus.value == WebDavConnectivityStatus.connected) ...[
+                    _buildTaskQueue(isUploading: state.isUploading, isDownloading: state.isDownloading),
+                    _buildCloudCount(cloudCount: state.webDavDiaryCount, onTap: logic.fetchingWebDavSyncFlag),
+                    _buildLocalDiaryCount(
+                        toUploadCount: state.toUploadDiariesCount,
+                        toDownloadCount: state.toDownloadIdsCount,
+                        onTap: logic.syncDiary)
+                  ],
+                ],
+              ),
+              if (state.isFetching) const Center(child: CircularProgressIndicator()),
+              if (state.connectivityStatus.value == WebDavConnectivityStatus.unconnected) _buildError(),
+            ],
+          );
+        });
+  }
+}
diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb
index 1ce8075..d953c6b 100644
--- a/lib/l10n/intl_en.arb
+++ b/lib/l10n/intl_en.arb
@@ -95,5 +95,10 @@
   "mediaTypeImage": "Image",
   "mediaTypeAudio": "Audio",
   "mediaTypeVideo": "Video",
-  "mediaDeleteUseLessFile": "Delete useless file"
+  "mediaDeleteUseLessFile": "Delete useless file",
+  "backupSyncTitle": "Backup and Sync",
+  "backupSyncLocal": "Local Network Transfer",
+  "backupSyncWebdav": "WebDAV",
+  "backupSyncWebdavNoOption": "Not Configured",
+  "backupSyncWebdavOption": "Configured"
 }
\ No newline at end of file
diff --git a/lib/l10n/intl_zh.arb b/lib/l10n/intl_zh.arb
index bf055e8..151eee7 100644
--- a/lib/l10n/intl_zh.arb
+++ b/lib/l10n/intl_zh.arb
@@ -95,5 +95,10 @@
   "mediaTypeImage": "图片",
   "mediaTypeAudio": "音频",
   "mediaTypeVideo": "视频",
-  "mediaDeleteUseLessFile": "清理无用文件"
+  "mediaDeleteUseLessFile": "清理无用文件",
+  "backupSyncTitle": "备份与同步",
+  "backupSyncLocal": "局域网传输",
+  "backupSyncWebdav": "WebDAV",
+  "backupSyncWebdavNoOption": "未配置",
+  "backupSyncWebdavOption": "已配置"
 }
\ No newline at end of file
diff --git a/lib/main.dart b/lib/main.dart
index 05a2e6b..a79a4da 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,24 +1,28 @@
 import 'dart:async';
 import 'dart:io';
+import 'dart:ui';
 
 import 'package:bitsdojo_window/bitsdojo_window.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_displaymode/flutter_displaymode.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_map_tile_caching/flutter_map_tile_caching.dart';
+import 'package:flutter_quill/flutter_quill.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:get/get.dart';
 import 'package:intl/find_locale.dart';
-import 'package:media_kit/media_kit.dart';
 import 'package:mood_diary/router/app_pages.dart';
 import 'package:mood_diary/router/app_routes.dart';
 import 'package:mood_diary/src/rust/frb_generated.dart';
 import 'package:mood_diary/utils/utils.dart';
+import 'package:video_player_media_kit/video_player_media_kit.dart';
 
 import 'components/window_buttons/window_buttons.dart';
 
 Future<void> initSystem() async {
   WidgetsFlutterBinding.ensureInitialized();
+  // GestureBinding.instance.resamplingEnabled = true;
   //获取系统语言
   await findSystemLocale();
   //初始化pref
@@ -26,11 +30,15 @@ Future<void> initSystem() async {
   //初始化Isar
   await Utils().isarUtil.initIsar();
   //初始化视频播放
-  MediaKit.ensureInitialized();
+  VideoPlayerMediaKit.ensureInitialized(android: true, iOS: true, macOS: true, windows: true, linux: true);
   //地图缓存
   await FMTCObjectBoxBackend().initialise();
   await const FMTCStore('mapStore').manage.create();
-  await RustLib.init();
+  unawaited(Utils().webDavUtil.initWebDav());
+  unawaited(RustLib.init());
+  SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
+  SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
+      systemNavigationBarColor: Colors.transparent, systemNavigationBarContrastEnforced: false));
   platFormOption();
 }
 
@@ -56,53 +64,43 @@ String getInitialRoute() {
   return AppRoutes.homePage;
 }
 
-void main() {
-  runZonedGuarded(() {
-    FlutterError.onError = (details) {
-      Utils().logUtil.printError('Flutter error', error: details.exception, stackTrace: details.stack);
-      if (details.exceptionAsString().contains('Render')) {
-        Utils().noticeUtil.showBug(message: '布局异常！');
-      } else {
-        Utils().noticeUtil.showBug(message: '出错了，请联系开发者！');
-      }
-    };
-    initSystem().then((_) {
-      return runApp(GetMaterialApp(
-        initialRoute: getInitialRoute(),
-        onGenerateTitle: (context) => AppLocalizations.of(context)!.appName,
-        builder: (context, child) {
-          final fontScale = Utils().prefUtil.getValue<double>('fontScale')!;
-          final colorScheme = Theme.of(context).colorScheme;
-          final mediaQuery = MediaQuery(
-            data: MediaQuery.of(context).copyWith(
-              textScaler: TextScaler.linear(fontScale),
-            ),
-            child: FToastBuilder()(context, child!),
-          );
-          // 根据平台决定是否需要 MoveWindow
-          final windowChild = (Platform.isWindows || Platform.isMacOS || Platform.isWindows)
-              ? Column(
-                  children: [
-                    WindowButtons(
-                      colorScheme: colorScheme,
-                    ),
-                    Expanded(child: mediaQuery),
-                  ],
-                )
-              : mediaQuery;
-          return windowChild;
-        },
-        theme: Utils().themeUtil.buildTheme(Brightness.light),
-        darkTheme: Utils().themeUtil.buildTheme(Brightness.dark),
-        themeMode: ThemeMode.values[Utils().prefUtil.getValue<int>('themeMode')!],
-        defaultTransition: Transition.cupertino,
-        getPages: AppPages.routes,
-        localizationsDelegates: AppLocalizations.localizationsDelegates,
-        supportedLocales: AppLocalizations.supportedLocales,
-      ));
-    });
-  }, (error, stack) {
+void main() async {
+  await initSystem();
+  FlutterError.onError = (details) async {
+    Utils().logUtil.printError('Flutter error', error: details.exception, stackTrace: details.stack);
+    if (details.exceptionAsString().contains('Render')) {
+      Utils().noticeUtil.showBug(message: '布局异常！');
+    } else {
+      Utils().noticeUtil.showBug(message: '出错了，请联系开发者！');
+    }
+  };
+  PlatformDispatcher.instance.onError = (error, stack) {
     Utils().logUtil.printWTF('Error', error: error, stackTrace: stack);
     Utils().noticeUtil.showBug(message: '出错了，请联系开发者！');
-  });
+    return true;
+  };
+  runApp(GetMaterialApp(
+    initialRoute: getInitialRoute(),
+    onGenerateTitle: (context) => AppLocalizations.of(context)!.appName,
+    builder: (context, child) {
+      final fontScale = Utils().prefUtil.getValue<double>('fontScale')!;
+      final colorScheme = Theme.of(context).colorScheme;
+      final mediaQuery = MediaQuery(
+        data: MediaQuery.of(context).copyWith(textScaler: TextScaler.linear(fontScale)),
+        child: FToastBuilder()(context, child!),
+      );
+      // 根据平台决定是否需要 MoveWindow
+      final windowChild = (Platform.isWindows || Platform.isMacOS || Platform.isLinux)
+          ? Column(children: [WindowButtons(colorScheme: colorScheme), Expanded(child: mediaQuery)])
+          : mediaQuery;
+      return windowChild;
+    },
+    theme: Utils().themeUtil.buildTheme(Brightness.light),
+    darkTheme: Utils().themeUtil.buildTheme(Brightness.dark),
+    themeMode: ThemeMode.values[Utils().prefUtil.getValue<int>('themeMode')!],
+    defaultTransition: Transition.cupertino,
+    getPages: AppPages.routes,
+    localizationsDelegates: const [...AppLocalizations.localizationsDelegates, FlutterQuillLocalizations.delegate],
+    supportedLocales: AppLocalizations.supportedLocales,
+  ));
 }
diff --git a/lib/pages/about/about_view.dart b/lib/pages/about/about_view.dart
index 7171f53..15a9593 100644
--- a/lib/pages/about/about_view.dart
+++ b/lib/pages/about/about_view.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:get/get.dart';
 import 'package:mood_diary/utils/utils.dart';
 
@@ -24,15 +23,13 @@ class AboutPage extends StatelessWidget {
         padding: const EdgeInsets.all(32.0),
         child: Column(
           mainAxisSize: MainAxisSize.min,
-          spacing: 16.0,
           children: [
-            ClipRRect(
-              borderRadius: const BorderRadius.all(Radius.circular(40.0)),
-              child: Image.asset(
-                'assets/icon/icon.png',
-                height: 80.0,
-                width: 80.0,
-              ),
+            Image.asset(
+              colorScheme.brightness == Brightness.light
+                  ? 'assets/icon/light/light_foreground.png'
+                  : 'assets/icon/dark/dark_foreground.png',
+              height: 160.0,
+              width: 160.0,
             ),
             Column(
               spacing: 4.0,
@@ -54,10 +51,10 @@ class AboutPage extends StatelessWidget {
           GetBuilder<AboutLogic>(builder: (_) {
             return buildLogoTitle();
           }),
-          Card.filled(
+          Card.outlined(
             color: colorScheme.surfaceContainerLow,
             child: Column(
-              children: ListTile.divideTiles(tiles: [
+              children: [
                 GetBuilder<AboutLogic>(builder: (_) {
                   return ListTile(
                     leading: const Icon(Icons.update),
@@ -100,37 +97,11 @@ class AboutPage extends StatelessWidget {
                     await logic.toReportPage();
                   },
                 ),
-              ], context: context)
-                  .toList(),
+              ],
             ),
           ),
         ],
       ),
-      bottomNavigationBar: Padding(
-        padding: const EdgeInsets.all(16.0),
-        child: Row(
-          mainAxisAlignment: MainAxisAlignment.center,
-          spacing: 4.0,
-          children: [
-            Text(
-              'Powered by',
-              style: textStyle.titleMedium,
-            ),
-            const FaIcon(
-              FontAwesomeIcons.flutter,
-              color: Colors.lightBlue,
-            ),
-            Text(
-              'with',
-              style: textStyle.titleMedium,
-            ),
-            const FaIcon(
-              FontAwesomeIcons.solidHeart,
-              color: Colors.pinkAccent,
-            )
-          ],
-        ),
-      ),
     );
   }
 }
diff --git a/lib/pages/backup_sync/backup_sync_view.dart b/lib/pages/backup_sync/backup_sync_view.dart
index 128048a..b04ac67 100644
--- a/lib/pages/backup_sync/backup_sync_view.dart
+++ b/lib/pages/backup_sync/backup_sync_view.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:mood_diary/components/local_send/local_send_view.dart';
+import 'package:mood_diary/components/web_dav/web_dav_view.dart';
 
 import 'backup_sync_logic.dart';
 import 'backup_sync_state.dart';
@@ -18,20 +19,7 @@ class BackupSyncPage extends StatelessWidget {
         title: const Text('备份与同步'),
       ),
       body: ListView(
-        children: const [
-          ExpansionTile(
-            leading: Icon(Icons.wifi_tethering_rounded),
-            title: Text('局域网传输'),
-            children: [LocalSendComponent()],
-          ),
-          ExpansionTile(
-            leading: Icon(Icons.backup_rounded),
-            title: Text('WebDav'),
-            subtitle: Text('即将支持'),
-            enabled: false,
-            children: [],
-          )
-        ],
+        children: const [LocalSendComponent(), WebDavComponent()],
       ),
     );
   }
diff --git a/lib/pages/diary_details/diary_details_logic.dart b/lib/pages/diary_details/diary_details_logic.dart
index 6af0bf5..cd55a52 100644
--- a/lib/pages/diary_details/diary_details_logic.dart
+++ b/lib/pages/diary_details/diary_details_logic.dart
@@ -50,7 +50,7 @@ class DiaryDetailsLogic extends GetxController {
   //编辑日记
   Future<void> toEditPage(Diary diary) async {
     //这里参数为diary，表示编辑日记，等待跳转结果为changed，重新获取日记
-    if ((await Get.toNamed(AppRoutes.editPage, arguments: diary)) == 'changed') {
+    if ((await Get.toNamed(AppRoutes.editPage, arguments: diary.clone())) == 'changed') {
       //重新获取日记
       state.diary = (await Utils().isarUtil.getDiaryByID(state.diary.isarId))!;
       quillController = QuillController(
diff --git a/lib/pages/diary_details/diary_details_state.dart b/lib/pages/diary_details/diary_details_state.dart
index fa038a6..08a9074 100644
--- a/lib/pages/diary_details/diary_details_state.dart
+++ b/lib/pages/diary_details/diary_details_state.dart
@@ -1,5 +1,6 @@
 import 'package:get/get.dart';
 import 'package:mood_diary/common/models/isar/diary.dart';
+import 'package:mood_diary/utils/utils.dart';
 
 class DiaryDetailsState {
   Diary diary = Get.arguments[0];
@@ -10,5 +11,9 @@ class DiaryDetailsState {
 
   int? get imageColor => diary.imageColor;
 
+  RxBool isScrolling = false.obs;
+
+  bool get diaryHeader => Utils().prefUtil.getValue<bool>('diaryHeader')!;
+
   DiaryDetailsState();
 }
diff --git a/lib/pages/diary_details/diary_details_view.dart b/lib/pages/diary_details/diary_details_view.dart
index 32c6565..8b5f617 100644
--- a/lib/pages/diary_details/diary_details_view.dart
+++ b/lib/pages/diary_details/diary_details_view.dart
@@ -15,6 +15,10 @@ import 'package:mood_diary/components/mood_icon/mood_icon_view.dart';
 import 'package:mood_diary/utils/utils.dart';
 import 'package:smooth_page_indicator/smooth_page_indicator.dart';
 
+import '../../components/quill_embed/audio_embed.dart';
+import '../../components/quill_embed/image_embed.dart';
+import '../../components/quill_embed/text_indent.dart';
+import '../../components/quill_embed/video_embed.dart';
 import 'diary_details_logic.dart';
 
 class DiaryDetailsPage extends StatelessWidget {
@@ -269,22 +273,24 @@ class DiaryDetailsPage extends StatelessWidget {
                 )
               : colorScheme;
           return Theme(
-            data: Theme.of(context).copyWith(
-              colorScheme: customColorScheme,
-            ),
+            data: Theme.of(context).copyWith(colorScheme: customColorScheme),
             child: Scaffold(
               backgroundColor: customColorScheme.surface,
               body: CustomScrollView(
                 slivers: [
                   SliverAppBar(
-                    expandedHeight: state.aspect != null ? min(size.width / state.aspect!, size.height * 0.618) : null,
+                    expandedHeight: state.diaryHeader
+                        ? (state.aspect != null ? min(size.width / state.aspect!, size.height * 0.382) : null)
+                        : null,
                     title: Text(
                       state.diary.title,
                       style: textStyle.titleMedium,
                     ),
                     flexibleSpace: FlexibleSpaceBar(
                       collapseMode: CollapseMode.pin,
-                      background: state.diary.imageName.isNotEmpty ? buildImageView(customColorScheme) : null,
+                      background: state.diaryHeader
+                          ? (state.diary.imageName.isNotEmpty ? buildImageView(customColorScheme) : null)
+                          : null,
                     ),
                     pinned: true,
                     actions: [
@@ -357,22 +363,24 @@ class DiaryDetailsPage extends StatelessWidget {
                               scrollDirection: Axis.horizontal, child: buildChipList(customColorScheme)),
                         ),
                         Card.filled(
-                          color: customColorScheme.surfaceContainer,
+                          color: customColorScheme.surfaceContainerLow,
                           child: Padding(
                             padding: const EdgeInsets.all(8.0),
                             child: QuillEditor.basic(
                               controller: logic.quillController,
-                              configurations: const QuillEditorConfigurations(
+                              config: QuillEditorConfig(
                                 showCursor: false,
-                                sharedConfigurations: QuillSharedConfigurations(),
+                                customStyles: Utils().themeUtil.getInstance(context),
+                                embedBuilders: [
+                                  ImageEmbedBuilder(isEdit: false),
+                                  VideoEmbedBuilder(isEdit: false),
+                                  AudioEmbedBuilder(isEdit: false),
+                                  TextIndentEmbedBuilder(isEdit: false),
+                                ],
                               ),
                             ),
                           ),
                         ),
-                        buildAudioList(),
-                        Wrap(
-                          children: [if (state.diary.videoName.isNotEmpty) ...buildMultiVideo(customColorScheme)],
-                        ),
                       ],
                     ),
                   ),
diff --git a/lib/pages/diary_setting/diary_setting_logic.dart b/lib/pages/diary_setting/diary_setting_logic.dart
index 9c52463..2dd61d3 100644
--- a/lib/pages/diary_setting/diary_setting_logic.dart
+++ b/lib/pages/diary_setting/diary_setting_logic.dart
@@ -10,20 +10,48 @@ class DiarySettingLogic extends GetxController {
   Future<void> quality(int value) async {
     Get.backLegacy();
     await Utils().prefUtil.setValue<int>('quality', value);
-    state.quality = value;
-    update(['Quality']);
+    state.quality.value = value;
   }
 
   //自动天气
   Future<void> autoWeather(bool value) async {
     await Utils().prefUtil.setValue<bool>('autoWeather', value);
-    state.autoWeather = value;
-    update(['AutoWeather']);
+    state.autoWeather.value = value;
   }
 
   //动态配色
   Future<void> dynamicColor(bool value) async {
     await Utils().prefUtil.setValue<bool>('dynamicColor', value);
-    state.dynamicColor = value;
+    state.dynamicColor.value = value;
+  }
+
+  // 日记页头图
+  Future<void> diaryHeader(bool value) async {
+    await Utils().prefUtil.setValue<bool>('diaryHeader', value);
+    state.diaryHeader.value = value;
+  }
+
+  // 首行缩进
+  Future<void> firstLineIndent(bool value) async {
+    await Utils().prefUtil.setValue<bool>('firstLineIndent', value);
+    state.firstLineIndent.value = value;
+  }
+
+  // 自动设置分类
+  Future<void> autoCategory(bool value) async {
+    await Utils().prefUtil.setValue<bool>('autoCategory', value);
+    state.autoCategory.value = value;
+  }
+
+  // 展示写作时长
+  Future<void> showWriteTime(bool value) async {
+    await Utils().prefUtil.setValue<bool>('showWritingTime', value);
+    state.showWriteTime.value = value;
+  }
+
+  // 展示字数统计
+  Future<void> showWordCount(bool value) async {
+    await Utils().prefUtil.setValue<bool>('showWordCount', value);
+    state.showWordCount.value = value;
   }
 }
diff --git a/lib/pages/diary_setting/diary_setting_state.dart b/lib/pages/diary_setting/diary_setting_state.dart
index ff6004d..0fd4468 100644
--- a/lib/pages/diary_setting/diary_setting_state.dart
+++ b/lib/pages/diary_setting/diary_setting_state.dart
@@ -1,12 +1,30 @@
+import 'package:get/get.dart';
 import 'package:mood_diary/utils/utils.dart';
 
 class DiarySettingState {
   // 图片质量
-  int quality = Utils().prefUtil.getValue<int>('quality')!;
+  RxInt quality = Utils().prefUtil.getValue<int>('quality')!.obs;
 
-  // 自动获取天气
-  bool dynamicColor = Utils().prefUtil.getValue<bool>('dynamicColor')!;
-  bool autoWeather = Utils().prefUtil.getValue<bool>('autoWeather')!;
+  // 动态配色
+  RxBool dynamicColor = Utils().prefUtil.getValue<bool>('dynamicColor')!.obs;
+
+  // 自动天气
+  RxBool autoWeather = Utils().prefUtil.getValue<bool>('autoWeather')!.obs;
+
+  // 日记页头图
+  RxBool diaryHeader = Utils().prefUtil.getValue<bool>('diaryHeader')!.obs;
+
+  // 首行缩进
+  RxBool firstLineIndent = Utils().prefUtil.getValue<bool>('firstLineIndent')!.obs;
+
+  // 自动分类
+  RxBool autoCategory = Utils().prefUtil.getValue<bool>('autoCategory')!.obs;
+
+  // 展示写作时长
+  RxBool showWriteTime = Utils().prefUtil.getValue<bool>('showWritingTime')!.obs;
+
+  // 展示字数统计
+  RxBool showWordCount = Utils().prefUtil.getValue<bool>('showWordCount')!.obs;
 
   DiarySettingState();
 }
diff --git a/lib/pages/diary_setting/diary_setting_view.dart b/lib/pages/diary_setting/diary_setting_view.dart
index 540ebbb..d7d348e 100644
--- a/lib/pages/diary_setting/diary_setting_view.dart
+++ b/lib/pages/diary_setting/diary_setting_view.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:get/get.dart';
+import 'package:mood_diary/components/tile/setting_tile.dart';
 
 import 'diary_setting_logic.dart';
 
@@ -15,21 +16,108 @@ class DiarySettingPage extends StatelessWidget {
     final colorScheme = Theme.of(context).colorScheme;
     final i18n = AppLocalizations.of(context)!;
 
-    return Scaffold(
-      appBar: AppBar(
-        title: const Text('日记个性化'),
-      ),
-      body: ListView(
-        children: [
-          ListTile(
-            title: Text(i18n.settingImageQuality),
-            subtitle: Text(i18n.settingImageQualityDes),
-            leading: const Icon(Icons.gradient_outlined),
-            trailing: GetBuilder<DiarySettingLogic>(
-                id: 'Quality',
-                builder: (_) {
+    // 通用设置
+    List<Widget> buildCommon() {
+      return [
+        const SettingTitleTile(
+          title: '通用',
+          subtitle: '所有模式共享的设置',
+        ),
+        Card.filled(
+          color: colorScheme.surfaceContainerLow,
+          child: Column(
+            children: [
+              Obx(() {
+                return SwitchListTile(
+                  value: state.autoWeather.value,
+                  onChanged: (value) {
+                    logic.autoWeather(value);
+                  },
+                  title: const Text('自动获取天气'),
+                  secondary: const Icon(Icons.wb_sunny_outlined),
+                );
+              }),
+              Obx(() {
+                return SwitchListTile(
+                  value: state.autoCategory.value,
+                  onChanged: logic.autoCategory,
+                  secondary: const Icon(Icons.category_outlined),
+                  title: const Text('自动设置分类'),
+                );
+              }),
+              Obx(() {
+                return SwitchListTile(
+                  value: state.showWriteTime.value,
+                  onChanged: logic.showWriteTime,
+                  secondary: const Icon(Icons.timer_outlined),
+                  title: const Text('展示写作时长'),
+                );
+              }),
+              Obx(() {
+                return SwitchListTile(
+                  value: state.showWordCount.value,
+                  onChanged: logic.showWordCount,
+                  secondary: const Icon(Icons.font_download_outlined),
+                  title: const Text('展示字数统计'),
+                );
+              }),
+              Obx(() {
+                return SwitchListTile(
+                  value: state.dynamicColor.value,
+                  onChanged: logic.dynamicColor,
+                  secondary: const Icon(Icons.color_lens_outlined),
+                  title: const Text('日记页动态配色'),
+                  subtitle: const Text('使用基于封面的配色'),
+                );
+              }),
+            ],
+          ),
+        ),
+      ];
+    }
+
+    List<Widget> buildPureText() {
+      return [
+        const SettingTitleTile(
+          title: '纯文本',
+          subtitle: '去除多余干扰，享受更专注的写作体验',
+        ),
+        Card.filled(
+          color: colorScheme.surfaceContainerLow,
+          child: Column(
+            children: [
+              Obx(() {
+                return SwitchListTile(
+                  value: state.firstLineIndent.value,
+                  onChanged: logic.firstLineIndent,
+                  title: const Text('首行缩进'),
+                  secondary: const Icon(Icons.format_indent_increase),
+                  subtitle: const Text('只对修改后的日记生效'),
+                );
+              }),
+            ],
+          ),
+        ),
+      ];
+    }
+
+    List<Widget> buildRichText() {
+      return [
+        const SettingTitleTile(
+          title: '富文本',
+          subtitle: '支持更多样式及附件，让内容呈现更丰富',
+        ),
+        Card.filled(
+          color: colorScheme.surfaceContainerLow,
+          child: Column(
+            children: [
+              ListTile(
+                title: Text(i18n.settingImageQuality),
+                subtitle: Text(i18n.settingImageQualityDes),
+                leading: const Icon(Icons.gradient_outlined),
+                trailing: Obx(() {
                   return Text(
-                    switch (state.quality) {
+                    switch (state.quality.value) {
                       0 => i18n.qualityLow,
                       1 => i18n.qualityMedium,
                       2 => i18n.qualityHigh,
@@ -40,13 +128,11 @@ class DiarySettingPage extends StatelessWidget {
                     ),
                   );
                 }),
-            onTap: () {
-              showDialog(
-                  context: context,
-                  builder: (context) {
-                    return GetBuilder<DiarySettingLogic>(
-                        id: 'Quality',
-                        builder: (_) {
+                onTap: () {
+                  showDialog(
+                      context: context,
+                      builder: (context) {
+                        return Obx(() {
                           return SimpleDialog(
                             title: Text(i18n.settingImageQuality),
                             children: [
@@ -55,7 +141,7 @@ class DiarySettingPage extends StatelessWidget {
                                   spacing: 8.0,
                                   children: [
                                     Text(i18n.qualityLow),
-                                    if (state.quality == 0) ...[
+                                    if (state.quality.value == 0) ...[
                                       const Icon(Icons.check),
                                     ],
                                   ],
@@ -69,7 +155,7 @@ class DiarySettingPage extends StatelessWidget {
                                   spacing: 8.0,
                                   children: [
                                     Text(i18n.qualityMedium),
-                                    if (state.quality == 1) ...[
+                                    if (state.quality.value == 1) ...[
                                       const Icon(Icons.check),
                                     ],
                                   ],
@@ -83,7 +169,7 @@ class DiarySettingPage extends StatelessWidget {
                                   spacing: 8.0,
                                   children: [
                                     Text(i18n.qualityHigh),
-                                    if (state.quality == 2) ...[
+                                    if (state.quality.value == 2) ...[
                                       const Icon(Icons.check),
                                     ],
                                   ],
@@ -95,22 +181,32 @@ class DiarySettingPage extends StatelessWidget {
                             ],
                           );
                         });
-                  });
-            },
-          ),
-          GetBuilder<DiarySettingLogic>(
-              id: 'AutoWeather',
-              builder: (_) {
+                      });
+                },
+              ),
+              Obx(() {
                 return SwitchListTile(
-                  value: state.autoWeather,
-                  onChanged: (value) {
-                    logic.autoWeather(value);
-                  },
-                  title: const Text('自动获取天气'),
-                  secondary: const Icon(Icons.sunny),
+                  value: state.diaryHeader.value,
+                  onChanged: logic.diaryHeader,
+                  title: const Text('日记页展示头图'),
+                  secondary: const Icon(Icons.broken_image_outlined),
                 );
-              })
-        ],
+              }),
+            ],
+          ),
+        ),
+      ];
+    }
+
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text('日记个性化'),
+      ),
+      body: SafeArea(
+        child: ListView(
+          padding: const EdgeInsets.all(4.0),
+          children: [...buildRichText(), ...buildPureText(), ...buildCommon()],
+        ),
       ),
     );
   }
diff --git a/lib/pages/draw/draw_logic.dart b/lib/pages/draw/draw_logic.dart
index 13f2231..34aaa1a 100644
--- a/lib/pages/draw/draw_logic.dart
+++ b/lib/pages/draw/draw_logic.dart
@@ -19,8 +19,8 @@ class DrawLogic extends GetxController {
   Future<void> getImageData() async {
     var data = await drawingController.getImageData();
     var image = data!.buffer.asUint8List();
-    editLogic.pickDraw(image);
     Get.backLegacy();
+    editLogic.pickDraw(image);
   }
 
   void pickColor(Color color) {
diff --git a/lib/pages/edit/edit_logic.dart b/lib/pages/edit/edit_logic.dart
index f8f9e1f..95202ae 100644
--- a/lib/pages/edit/edit_logic.dart
+++ b/lib/pages/edit/edit_logic.dart
@@ -10,31 +10,37 @@ import 'package:image_picker/image_picker.dart';
 import 'package:latlong2/latlong.dart';
 import 'package:mood_diary/api/api.dart';
 import 'package:mood_diary/common/models/isar/diary.dart';
-import 'package:mood_diary/common/values/keyboard_state.dart';
+import 'package:mood_diary/common/values/diary_type.dart';
+import 'package:mood_diary/components/quill_embed/text_indent.dart';
+import 'package:mood_diary/components/quill_embed/video_embed.dart';
 import 'package:mood_diary/router/app_routes.dart';
+import 'package:mood_diary/src/rust/api/kmp.dart';
 import 'package:mood_diary/utils/utils.dart';
 import 'package:uuid/uuid.dart';
 
+import '../../common/values/keyboard_state.dart';
+import '../../components/quill_embed/audio_embed.dart';
+import '../../components/quill_embed/image_embed.dart';
 import 'edit_state.dart';
 
 class EditLogic extends GetxController with WidgetsBindingObserver {
   final EditState state = EditState();
 
-  //分类控制器
+  //标签控制器
   late TextEditingController tagTextEditingController = TextEditingController();
 
   //标题
   late TextEditingController titleTextEditingController = TextEditingController();
-
   late PageController pageController = PageController();
 
   //编辑器控制器
-  late QuillController quillController = QuillController.basic();
+  late QuillController quillController;
 
   //聚焦对象
   late FocusNode contentFocusNode = FocusNode();
   late FocusNode titleFocusNode = FocusNode();
   List<double> heightList = [];
+  Timer? _timer;
 
   @override
   void didChangeMetrics() {
@@ -66,51 +72,24 @@ class EditLogic extends GetxController with WidgetsBindingObserver {
 
   @override
   void onInit() {
-    //如果是新增
+    if (state.showWriteTime) _calculateDuration();
     WidgetsBinding.instance.addObserver(this);
-    if (Get.arguments == 'new') {
-      state.currentDiary = Diary();
-      if (Utils().prefUtil.getValue<bool>('autoWeather') == true) {
-        unawaited(getPositionAndWeather());
-      }
-    } else {
-      //如果是编辑，将日记对象赋值
-      state.isNew = false;
-      var oldDiary = Get.arguments as Diary;
-      state.currentDiary = oldDiary;
-      // 初始化quill控制器
-      quillController = QuillController(
-          document: Document.fromJson(jsonDecode(oldDiary.content)),
-          selection: const TextSelection.collapsed(offset: 0));
-      // 获取分类名称
-      if (oldDiary.categoryId != null) {
-        state.categoryName = Utils().isarUtil.getCategoryName(oldDiary.categoryId!)!.categoryName;
-      }
-      // 初始化标题控制器
-      titleTextEditingController = TextEditingController(text: oldDiary.title);
-      //临时拷贝一份图片数据
-      for (var name in oldDiary.imageName) {
-        state.imageFileList.add(XFile(Utils().fileUtil.getRealPath('image', name)));
-      }
-      //临时拷贝一份拷贝音频数据到缓存目录
-      for (var name in oldDiary.audioName) {
-        state.audioNameList.add(name);
-        File(Utils().fileUtil.getRealPath('audio', name)).copySync(Utils().fileUtil.getCachePath(name));
-      }
-      //临时拷贝一份视频数据，别忘记了缩略图
-      for (var name in oldDiary.videoName) {
-        state.videoFileList.add(XFile(Utils().fileUtil.getRealPath('video', name)));
-        state.videoThumbnailFileList.add(XFile(Utils().fileUtil.getRealPath('thumbnail', name)));
-      }
-      state.totalCount = quillController.document.toPlainText().trim().length;
-    }
-    update(['All']);
     super.onInit();
   }
 
   @override
-  void onReady() {
-    listenCount();
+  void onReady() async {
+    await _initEdit();
+    quillController.addListener(_listenCount);
+    if (state.firstLineIndent) {
+      quillController.document.changes.listen((change) {
+        var operations = change.change.operations;
+        var lastOperation = operations.last;
+        if (lastOperation.key == 'insert' && lastOperation.value == '\n') {
+          insertNewLine();
+        }
+      });
+    }
     super.onReady();
   }
 
@@ -123,16 +102,95 @@ class EditLogic extends GetxController with WidgetsBindingObserver {
     contentFocusNode.dispose();
     pageController.dispose();
     quillController.dispose();
+    _timer?.cancel();
+    _timer = null;
     super.onClose();
   }
 
-  void listenCount() {
-    quillController.addListener(() {
-      state.totalCount = quillController.document.toPlainText().trim().length;
-      update(['Count']);
+  Future<void> _initEdit() async {
+    //如果是新增，更具不同的分类展示不同的操作
+    if (Get.arguments.runtimeType == DiaryType) {
+      // 配置日记类型
+      state.type = Get.arguments as DiaryType;
+      Utils().logUtil.printInfo(state.type);
+      quillController = QuillController.basic();
+      state.currentDiary = Diary();
+      if (state.firstLineIndent) insertNewLine();
+      if (state.autoWeather) {
+        unawaited(getPositionAndWeather());
+      }
+    } else {
+      //如果是编辑，将日记对象赋值
+      state.isNew = false;
+      var oldDiary = Get.arguments as Diary;
+      state.type = DiaryType.values.firstWhere((type) => type.value == oldDiary.type);
+      state.currentDiary = oldDiary;
+      // 获取分类名称
+      if (oldDiary.categoryId != null) {
+        state.categoryName = Utils().isarUtil.getCategoryName(oldDiary.categoryId!)!.categoryName;
+      }
+      // 初始化标题控制器
+      titleTextEditingController.text = oldDiary.title;
+      // 待替换的字符串map
+      Map<String, String> replaceMap = {};
+      //临时拷贝一份图片数据
+      for (var name in oldDiary.imageName) {
+        // 生成一个临时文件
+        var xFile = XFile(Utils().fileUtil.getRealPath('image', name));
+        replaceMap[name] = xFile.path;
+        state.imageFileList.add(xFile);
+      }
+      //临时拷贝一份拷贝音频数据到缓存目录
+      for (var name in oldDiary.audioName) {
+        state.audioNameList.add(name);
+        await File(Utils().fileUtil.getRealPath('audio', name)).copy(Utils().fileUtil.getCachePath(name));
+      }
+      //临时拷贝一份视频数据，别忘记了缩略图
+      for (var name in oldDiary.videoName) {
+        // 生成一个临时文件
+        var videoXFile = XFile(Utils().fileUtil.getRealPath('video', name));
+        replaceMap[name] = videoXFile.path;
+        state.videoFileList.add(videoXFile);
+      }
+      quillController = QuillController(
+          document:
+              Document.fromJson(jsonDecode(await Kmp.replaceWithKmp(text: oldDiary.content, replacements: replaceMap))),
+          selection: const TextSelection.collapsed(offset: 0));
+      state.totalCount.value = _toPlainText().length;
+    }
+    state.isInit = true;
+    update(['body']);
+  }
+
+  //计算写作时长
+  void _calculateDuration() {
+    _timer?.cancel();
+    _timer = Timer.periodic(const Duration(seconds: 1), (timer) {
+      state.duration += const Duration(seconds: 1);
+      state.durationString.value = state.duration.toString().split('.')[0].padLeft(8, '0');
     });
   }
 
+  String _toPlainText() {
+    return quillController.document.toPlainText([
+      ImageEmbedBuilder(isEdit: true),
+      VideoEmbedBuilder(isEdit: true),
+      AudioEmbedBuilder(isEdit: true),
+      TextIndentEmbedBuilder(isEdit: true),
+    ]).trim();
+  }
+
+  void _listenCount() {
+    state.totalCount.value = _toPlainText().length;
+  }
+
+  // 插入换行时自动首行缩进
+  void insertNewLine() {
+    final index = quillController.selection.baseOffset;
+    final length = quillController.selection.extentOffset - index;
+    quillController.replaceText(index, length, const TextIndentEmbed('2'), TextSelection.collapsed(offset: index + 1));
+  }
+
   Future<void> addNewImage(XFile xFile) async {
     //图片列表中新增一个
     state.imageFileList.add(xFile);
@@ -144,36 +202,41 @@ class EditLogic extends GetxController with WidgetsBindingObserver {
     //获取一张图片
     final XFile? photo = await Utils().mediaUtil.pickPhoto(imageSource);
     if (photo != null) {
-      //关闭dialog
       Get.backLegacy();
       await addNewImage(photo);
+      final imageBlock = ImageBlockEmbed.fromName(photo.path);
+      final index = quillController.selection.baseOffset;
+      final length = quillController.selection.extentOffset - index;
+      quillController.replaceText(index, length, imageBlock, TextSelection.collapsed(offset: index + 1));
     } else {
-      //关闭dialog
-      Get.backLegacy();
       //弹出一个提示
+      Get.backLegacy();
       Utils().noticeUtil.showToast('取消图片选择');
     }
   }
 
   //画图照片
   Future<void> pickDraw(Uint8List dataList) async {
-    var path = Utils().fileUtil.getCachePath('${const Uuid().v7()}.jpg');
-    await addNewImage(XFile.fromData(dataList, path: path)..saveTo(path));
+    var path = Utils().fileUtil.getCachePath('${const Uuid().v7()}.png');
+    await addNewImage(XFile.fromData(dataList, path: path));
+    Get.backLegacy(result: path);
   }
 
   //网络图片
   Future<void> networkImage() async {
-    //关闭dialog
-    Get.backLegacy();
     Utils().noticeUtil.showToast('图片获取中');
     var imageUrl = await Api().updateImageUrl();
+    String? result;
     if (imageUrl != null) {
       var imageData = await Api().getImageData(imageUrl.first);
       if (imageData != null) {
-        var path = Utils().fileUtil.getCachePath('${const Uuid().v7()}.jpg');
+        var path = Utils().fileUtil.getCachePath('${const Uuid().v7()}.png');
         addNewImage(XFile.fromData(imageData, path: path)..saveTo(path));
+        result = path;
       }
     }
+    //关闭dialog
+    Get.backLegacy(result: result);
   }
 
   //相册选择多张照片
@@ -198,11 +261,6 @@ class EditLogic extends GetxController with WidgetsBindingObserver {
   }
 
   Future<void> addNewVideo(XFile xFile) async {
-    //获取缩略图
-    String fileName = '${const Uuid().v7()}.jpeg';
-    if (await Utils().mediaUtil.getVideoThumbnail(xFile, Utils().fileUtil.getCachePath(fileName))) {
-      state.videoThumbnailFileList.add(XFile(Utils().fileUtil.getCachePath(fileName)));
-    }
     //视频list中新增一个
     state.videoFileList.add(xFile);
     update(['Video']);
@@ -210,13 +268,16 @@ class EditLogic extends GetxController with WidgetsBindingObserver {
 
   //选择视频
   Future<void> pickVideo(ImageSource imageSource) async {
+    // 获取一个视频
     XFile? video = await Utils().mediaUtil.pickVideo(imageSource);
     if (video != null) {
-      //关闭dialog
       Get.backLegacy();
       await addNewVideo(video);
+      final videoBlock = VideoBlockEmbed.fromName(video.path);
+      final index = quillController.selection.baseOffset;
+      final length = quillController.selection.extentOffset - index;
+      quillController.replaceText(index, length, videoBlock, TextSelection.collapsed(offset: index + 1));
     } else {
-      //关闭dialog
       Get.backLegacy();
       //弹出一个提示
       Utils().noticeUtil.showToast('取消视频选择');
@@ -234,10 +295,11 @@ class EditLogic extends GetxController with WidgetsBindingObserver {
   }
 
   //删除图片
-  void deleteImage(index) async {
-    var imageFile = state.imageFileList.removeAt(index);
-    await Utils().fileUtil.deleteFile(imageFile.path);
-    Get.backLegacy();
+  void deleteImage({required String path}) async {
+    // 移除这个图片
+    state.imageFileList.removeWhere((file) => file.path == path);
+    await Utils().fileUtil.deleteFile(path);
+    //Get.backLegacy();
     Utils().noticeUtil.showToast('删除成功');
     update(['Image']);
   }
@@ -245,9 +307,7 @@ class EditLogic extends GetxController with WidgetsBindingObserver {
   //删除视频
   void deleteVideo(index) async {
     var videoFile = state.videoFileList.removeAt(index);
-    var thumbnailFile = state.videoThumbnailFileList.removeAt(index);
     await Utils().fileUtil.deleteFile(videoFile.path);
-    await Utils().fileUtil.deleteFile(thumbnailFile.path);
     Get.backLegacy();
     Utils().noticeUtil.showToast('删除成功');
     update(['Video']);
@@ -284,54 +344,51 @@ class EditLogic extends GetxController with WidgetsBindingObserver {
 
   //保存日记
   Future<void> saveDiary() async {
-    // Get.dialog(SimpleDialog(
-    //   children: [
-    //     Lottie.asset(
-    //       'assets/lottie/file_process.json',
-    //       addRepaintBoundary: true,
-    //       width: 200,
-    //       height: 200,
-    //       frameRate: FrameRate.max,
-    //     ),
-    //     const Row(
-    //       mainAxisAlignment: MainAxisAlignment.center,
-    //       children: [Text('处理中')],
-    //     )
-    //   ],
-    // ));
     state.isSaving = true;
     update(['modal']);
-    //保存图片
-    var imageNameList = await Utils().mediaUtil.saveImages(imageFileList: state.imageFileList);
-    //保存视频
-    var videoNameList = await Utils()
-        .mediaUtil
-        .saveVideo(videoFileList: state.videoFileList, videoThumbnailFileList: state.videoThumbnailFileList);
+    // 根据文本中的实际内容移除不需要的资源
+    var originContent = jsonEncode(quillController.document.toDelta().toJson());
+    var needImage = await Kmp.findMatches(text: originContent, patterns: state.imagePathList);
+    var needVideo = await Kmp.findMatches(text: originContent, patterns: state.videoPathList);
+    var needAudio = await Kmp.findMatches(text: originContent, patterns: state.audioNameList);
+    state.imageFileList.removeWhere((file) => !needImage.contains(file.path));
+    state.videoFileList.removeWhere((file) => !needVideo.contains(file.path));
+    state.audioNameList.removeWhere((name) => !needAudio.contains(name));
+    // 保存图片
+    var imageNameMap = await Utils().mediaUtil.saveImages(imageFileList: state.imageFileList);
+    // 保存视频
+    var videoNameMap = await Utils().mediaUtil.saveVideo(videoFileList: state.videoFileList);
     //保存录音
-    await Utils().mediaUtil.saveAudio(state.audioNameList);
+    var audioNameMap = await Utils().mediaUtil.saveAudio(state.audioNameList);
+    var content = await Kmp.replaceWithKmp(
+        text: originContent, replacements: {...imageNameMap, ...videoNameMap, ...audioNameMap});
     state.currentDiary
       ..title = titleTextEditingController.text
-      ..content = jsonEncode(quillController.document.toDelta().toJson())
-      ..contentText = quillController.document.toPlainText().trim()
+      ..content = content
+      ..type = state.type.value
+      ..contentText = _toPlainText()
       ..audioName = state.audioNameList
-      ..imageName = imageNameList
-      ..videoName = videoNameList
+      ..imageName = imageNameMap.values.toList()
+      ..videoName = videoNameMap.values.toList()
       ..imageColor = await getCoverColor()
       ..aspect = await getCoverAspect();
+
     await Utils().isarUtil.updateADiary(state.currentDiary);
     state.isNew ? Get.backLegacy(result: state.currentDiary.categoryId ?? '') : Get.backLegacy(result: 'changed');
     Utils().noticeUtil.showToast(state.isNew ? '保存成功' : '修改成功');
   }
 
-  // void handleBack() {
-  //   DateTime currentTime = DateTime.now();
-  //   if (state.oldTime != null && currentTime.difference(state.oldTime!) < const Duration(seconds: 3)) {
-  //     Get.backLegacy();
-  //   } else {
-  //     state.oldTime = currentTime;
-  //     Utils().noticeUtil.showToast('再滑一次退出');
-  //   }
-  // }
+  DateTime? oldTime;
+
+  void handleBack() {
+    DateTime currentTime = DateTime.now();
+    if (oldTime != null && currentTime.difference(oldTime!) < const Duration(seconds: 3)) {
+      Get.backLegacy();
+    } else {
+      oldTime = currentTime;
+      Utils().noticeUtil.showToast('再滑一次退出');
+    }
+  }
 
   Future<void> changeDate() async {
     var nowDateTime = await showDatePicker(
@@ -365,7 +422,6 @@ class EditLogic extends GetxController with WidgetsBindingObserver {
 
   //去画画
   void toDrawPage() {
-    Get.backLegacy();
     Get.toNamed(AppRoutes.drawPage);
   }
 
@@ -416,6 +472,11 @@ class EditLogic extends GetxController with WidgetsBindingObserver {
   //获取音频名称
   void setAudioName(String name) {
     state.audioNameList.add(name);
+    final audioBlock = AudioBlockEmbed.fromName(name);
+    final index = quillController.selection.baseOffset;
+    final length = quillController.selection.extentOffset - index;
+    // 插入音频 Embed
+    quillController.replaceText(index, length, audioBlock, TextSelection.collapsed(offset: index + 1));
     update(['Audio']);
   }
 
diff --git a/lib/pages/edit/edit_state.dart b/lib/pages/edit/edit_state.dart
index c65108f..ff93cb9 100644
--- a/lib/pages/edit/edit_state.dart
+++ b/lib/pages/edit/edit_state.dart
@@ -1,18 +1,29 @@
 import 'package:cross_file/cross_file.dart';
+import 'package:get/get_rx/src/rx_types/rx_types.dart';
 import 'package:mood_diary/common/models/isar/diary.dart';
+import 'package:mood_diary/common/values/diary_type.dart';
 import 'package:mood_diary/common/values/keyboard_state.dart';
 
+import '../../utils/utils.dart';
+
 class EditState {
   // 当前编辑的日记对象
   late Diary currentDiary;
 
   List<XFile> imageFileList = [];
+
+  List<String> get imagePathList => imageFileList.map((e) => e.path).toList();
   List<XFile> videoFileList = [];
+
+  List<String> get videoPathList => videoFileList.map((e) => e.path).toList();
   List<XFile> audioFileList = [];
-  List<XFile> videoThumbnailFileList = [];
+
+  List<String> get audioPathList => audioFileList.map((e) => e.path).toList();
 
   List<String> audioNameList = [];
 
+  String currentAudioName = '';
+
   // 分类名称
   String categoryName = '';
 
@@ -25,10 +36,37 @@ class EditState {
 
   KeyboardState keyboardState = KeyboardState.closed;
 
-  int totalCount = 0;
+  // 总字数
+  RxInt totalCount = 0.obs;
+
+  // 已写作时长
+  Duration duration = Duration.zero;
+
+  RxString durationString = ''.obs;
 
   // 是否展示保存动画
   bool isSaving = false;
 
+  // 是否完成初始化
+  bool isInit = false;
+
+  // 日记的类型
+  late DiaryType type;
+
+  // 自动获取天气
+  bool get autoWeather => Utils().prefUtil.getValue<bool>('autoWeather')!;
+
+  // 首行缩进
+  bool get firstLineIndent => (Utils().prefUtil.getValue<bool>('firstLineIndent')!) && type == DiaryType.text;
+
+  // 自动分类
+  bool get autoCategory => Utils().prefUtil.getValue<bool>('autoCategory')!;
+
+  // 展示写作时长
+  bool get showWriteTime => Utils().prefUtil.getValue<bool>('showWritingTime')!;
+
+  // 展示字数统计
+  bool get showWordCount => Utils().prefUtil.getValue<bool>('showWordCount')!;
+
   EditState();
 }
diff --git a/lib/pages/edit/edit_view.dart b/lib/pages/edit/edit_view.dart
index 416d478..8e56ed6 100644
--- a/lib/pages/edit/edit_view.dart
+++ b/lib/pages/edit/edit_view.dart
@@ -1,21 +1,25 @@
-import 'dart:io';
-
+import 'package:auto_size_text_field/auto_size_text_field.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_quill/flutter_quill.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:flutter_quill_extensions/flutter_quill_extensions.dart';
 import 'package:get/get.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:mood_diary/common/values/border.dart';
 import 'package:mood_diary/common/values/colors.dart';
 import 'package:mood_diary/components/audio_player/audio_player_view.dart';
 import 'package:mood_diary/components/category_add/category_add_view.dart';
-import 'package:mood_diary/components/keepalive/keepalive.dart';
 import 'package:mood_diary/components/lottie_modal/lottie_modal.dart';
 import 'package:mood_diary/components/mood_icon/mood_icon_view.dart';
+import 'package:mood_diary/components/quill_embed/image_embed.dart';
+import 'package:mood_diary/components/quill_embed/text_indent.dart';
+import 'package:mood_diary/components/quill_embed/video_embed.dart';
 import 'package:mood_diary/components/record_sheet/record_sheet_view.dart';
 import 'package:mood_diary/utils/utils.dart';
 
+import '../../common/values/diary_type.dart';
+import '../../components/quill_embed/audio_embed.dart';
 import 'edit_logic.dart';
 
 class EditPage extends StatelessWidget {
@@ -28,6 +32,7 @@ class EditPage extends StatelessWidget {
     final colorScheme = Theme.of(context).colorScheme;
     final size = MediaQuery.sizeOf(context);
     final i18n = AppLocalizations.of(context)!;
+    final textStyle = Theme.of(context).textTheme;
 
     Widget buildAddContainer(Widget icon) {
       return Container(
@@ -67,10 +72,7 @@ class EditPage extends StatelessWidget {
       return Wrap(
         children: [
           ...List.generate(state.audioNameList.length, (index) {
-            return AudioPlayerComponent(
-              path: Utils().fileUtil.getCachePath(state.audioNameList[index]),
-              isEdit: true,
-            );
+            return AudioPlayerComponent(path: Utils().fileUtil.getCachePath(state.audioNameList[index]));
           }),
           ActionChip(
             label: const Text('添加'),
@@ -90,280 +92,280 @@ class EditPage extends StatelessWidget {
       );
     }
 
-    Widget buildImage() {
-      return Padding(
-        padding: const EdgeInsets.only(top: 8.0),
-        child: Wrap(
-          spacing: 8.0,
-          runSpacing: 8.0,
-          children: [
-            ...List.generate(state.imageFileList.length, (index) {
-              return InkWell(
-                borderRadius: AppBorderRadius.smallBorderRadius,
-                onLongPress: () {
-                  logic.setCover(index);
-                },
-                onTap: () {
-                  logic.toPhotoView(
-                      List.generate(state.imageFileList.length, (index) {
-                        return state.imageFileList[index].path;
-                      }),
-                      index);
-                },
-                child: Container(
-                  constraints: const BoxConstraints(maxWidth: 150, maxHeight: 150),
-                  width: ((size.width - 56.0) / 3).truncateToDouble(),
-                  height: ((size.width - 56.0) / 3).truncateToDouble(),
-                  padding: const EdgeInsets.all(2.0),
-                  decoration: BoxDecoration(
-                    borderRadius: AppBorderRadius.smallBorderRadius,
-                    border: Border.all(color: colorScheme.outline.withAlpha((255 * 0.5).toInt())),
-                    image: DecorationImage(
-                      image: FileImage(File(state.imageFileList[index].path)),
-                      fit: BoxFit.cover,
-                    ),
-                  ),
-                  child: Row(
-                    mainAxisSize: MainAxisSize.min,
-                    mainAxisAlignment: MainAxisAlignment.end,
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      Container(
-                        decoration: BoxDecoration(
-                          color: colorScheme.surface.withAlpha((255 * 0.5).toInt()),
-                          borderRadius: AppBorderRadius.smallBorderRadius,
-                        ),
-                        child: IconButton(
-                          onPressed: () {
-                            showDialog(
-                                context: context,
-                                builder: (context) {
-                                  return AlertDialog(
-                                    title: const Text('提示'),
-                                    content: const Text('确认删除这张照片吗'),
-                                    actions: [
-                                      TextButton(
-                                          onPressed: () {
-                                            Get.backLegacy();
-                                          },
-                                          child: const Text('取消')),
-                                      TextButton(
-                                          onPressed: () {
-                                            logic.deleteImage(index);
-                                          },
-                                          child: const Text('确认'))
-                                    ],
-                                  );
-                                });
-                          },
-                          constraints: const BoxConstraints(),
-                          icon: Icon(
-                            Icons.remove_circle_outlined,
-                            color: colorScheme.tertiary,
-                          ),
-                          style: IconButton.styleFrom(
-                            tapTargetSize: MaterialTapTargetSize.shrinkWrap,
-                            padding: const EdgeInsets.all(4.0),
-                          ),
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-              );
-            }),
-            ...[
-              InkWell(
-                borderRadius: AppBorderRadius.smallBorderRadius,
-                onTap: () {
-                  showDialog(
-                      context: context,
-                      builder: (context) {
-                        return SimpleDialog(
-                          title: const Text('选择来源'),
-                          children: [
-                            SimpleDialogOption(
-                              child: const Row(
-                                spacing: 8.0,
-                                children: [
-                                  Icon(Icons.photo_library_outlined),
-                                  Text('相册'),
-                                ],
-                              ),
-                              onPressed: () {
-                                logic.pickMultiPhoto();
-                              },
-                            ),
-                            SimpleDialogOption(
-                              child: const Row(
-                                spacing: 8.0,
-                                children: [
-                                  Icon(Icons.camera_alt_outlined),
-                                  Text('相机'),
-                                ],
-                              ),
-                              onPressed: () {
-                                logic.pickPhoto(ImageSource.camera);
-                              },
-                            ),
-                            SimpleDialogOption(
-                              child: const Row(
-                                spacing: 8.0,
-                                children: [
-                                  Icon(Icons.image_search_outlined),
-                                  Text('网络'),
-                                ],
-                              ),
-                              onPressed: () {
-                                logic.networkImage();
-                              },
-                            ),
-                            SimpleDialogOption(
-                              child: const Row(
-                                spacing: 8.0,
-                                children: [
-                                  Icon(Icons.draw_outlined),
-                                  Text('画画'),
-                                ],
-                              ),
-                              onPressed: () {
-                                logic.toDrawPage();
-                              },
-                            ),
-                          ],
-                        );
-                      });
-                },
-                child: buildAddContainer(const FaIcon(FontAwesomeIcons.image)),
-              )
-            ],
-          ],
-        ),
-      );
-    }
+    // Widget buildImage() {
+    //   return Padding(
+    //     padding: const EdgeInsets.only(top: 8.0),
+    //     child: Wrap(
+    //       spacing: 8.0,
+    //       runSpacing: 8.0,
+    //       children: [
+    //         ...List.generate(state.imageFileList.length, (index) {
+    //           return InkWell(
+    //             borderRadius: AppBorderRadius.smallBorderRadius,
+    //             onLongPress: () {
+    //               logic.setCover(index);
+    //             },
+    //             onTap: () {
+    //               logic.toPhotoView(
+    //                   List.generate(state.imageFileList.length, (index) {
+    //                     return state.imageFileList[index].path;
+    //                   }),
+    //                   index);
+    //             },
+    //             child: Container(
+    //               constraints: const BoxConstraints(maxWidth: 150, maxHeight: 150),
+    //               width: ((size.width - 56.0) / 3).truncateToDouble(),
+    //               height: ((size.width - 56.0) / 3).truncateToDouble(),
+    //               padding: const EdgeInsets.all(2.0),
+    //               decoration: BoxDecoration(
+    //                 borderRadius: AppBorderRadius.smallBorderRadius,
+    //                 border: Border.all(color: colorScheme.outline.withAlpha((255 * 0.5).toInt())),
+    //                 image: DecorationImage(
+    //                   image: FileImage(File(state.imageFileList[index].path)),
+    //                   fit: BoxFit.cover,
+    //                 ),
+    //               ),
+    //               child: Row(
+    //                 mainAxisSize: MainAxisSize.min,
+    //                 mainAxisAlignment: MainAxisAlignment.end,
+    //                 crossAxisAlignment: CrossAxisAlignment.start,
+    //                 children: [
+    //                   Container(
+    //                     decoration: BoxDecoration(
+    //                       color: colorScheme.surface.withAlpha((255 * 0.5).toInt()),
+    //                       borderRadius: AppBorderRadius.smallBorderRadius,
+    //                     ),
+    //                     child: IconButton(
+    //                       onPressed: () {
+    //                         showDialog(
+    //                             context: context,
+    //                             builder: (context) {
+    //                               return AlertDialog(
+    //                                 title: const Text('提示'),
+    //                                 content: const Text('确认删除这张照片吗'),
+    //                                 actions: [
+    //                                   TextButton(
+    //                                       onPressed: () {
+    //                                         Get.backLegacy();
+    //                                       },
+    //                                       child: const Text('取消')),
+    //                                   TextButton(
+    //                                       onPressed: () {
+    //                                         logic.deleteImage(index);
+    //                                       },
+    //                                       child: const Text('确认'))
+    //                                 ],
+    //                               );
+    //                             });
+    //                       },
+    //                       constraints: const BoxConstraints(),
+    //                       icon: Icon(
+    //                         Icons.remove_circle_outlined,
+    //                         color: colorScheme.tertiary,
+    //                       ),
+    //                       style: IconButton.styleFrom(
+    //                         tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+    //                         padding: const EdgeInsets.all(4.0),
+    //                       ),
+    //                     ),
+    //                   ),
+    //                 ],
+    //               ),
+    //             ),
+    //           );
+    //         }),
+    //         ...[
+    //           InkWell(
+    //             borderRadius: AppBorderRadius.smallBorderRadius,
+    //             onTap: () {
+    //               showDialog(
+    //                   context: context,
+    //                   builder: (context) {
+    //                     return SimpleDialog(
+    //                       title: const Text('选择来源'),
+    //                       children: [
+    //                         SimpleDialogOption(
+    //                           child: const Row(
+    //                             spacing: 8.0,
+    //                             children: [
+    //                               Icon(Icons.photo_library_outlined),
+    //                               Text('相册'),
+    //                             ],
+    //                           ),
+    //                           onPressed: () {
+    //                             logic.pickMultiPhoto();
+    //                           },
+    //                         ),
+    //                         SimpleDialogOption(
+    //                           child: const Row(
+    //                             spacing: 8.0,
+    //                             children: [
+    //                               Icon(Icons.camera_alt_outlined),
+    //                               Text('相机'),
+    //                             ],
+    //                           ),
+    //                           onPressed: () {
+    //                             logic.pickPhoto(ImageSource.camera);
+    //                           },
+    //                         ),
+    //                         SimpleDialogOption(
+    //                           child: const Row(
+    //                             spacing: 8.0,
+    //                             children: [
+    //                               Icon(Icons.image_search_outlined),
+    //                               Text('网络'),
+    //                             ],
+    //                           ),
+    //                           onPressed: () {
+    //                             logic.networkImage();
+    //                           },
+    //                         ),
+    //                         SimpleDialogOption(
+    //                           child: const Row(
+    //                             spacing: 8.0,
+    //                             children: [
+    //                               Icon(Icons.draw_outlined),
+    //                               Text('画画'),
+    //                             ],
+    //                           ),
+    //                           onPressed: () {
+    //                             logic.toDrawPage();
+    //                           },
+    //                         ),
+    //                       ],
+    //                     );
+    //                   });
+    //             },
+    //             child: buildAddContainer(const FaIcon(FontAwesomeIcons.image)),
+    //           )
+    //         ],
+    //       ],
+    //     ),
+    //   );
+    // }
 
-    Widget buildVideo() {
-      return Padding(
-        padding: const EdgeInsets.only(top: 8.0),
-        child: Wrap(
-          spacing: 8.0,
-          runSpacing: 8.0,
-          children: [
-            ...List.generate(state.videoFileList.length, (index) {
-              return InkWell(
-                onTap: () {
-                  logic.toVideoView(
-                      List.generate(state.videoFileList.length, (index) {
-                        return state.videoFileList[index].path;
-                      }),
-                      index);
-                },
-                child: Container(
-                  constraints: const BoxConstraints(maxWidth: 150, maxHeight: 150),
-                  width: ((size.width - 56.0) / 3).truncateToDouble(),
-                  height: ((size.width - 56.0) / 3).truncateToDouble(),
-                  padding: const EdgeInsets.all(2.0),
-                  decoration: BoxDecoration(
-                      borderRadius: AppBorderRadius.smallBorderRadius,
-                      border: Border.all(color: colorScheme.outline.withAlpha((255 * 0.5).toInt())),
-                      image: DecorationImage(
-                        image: FileImage(File(state.videoThumbnailFileList[index].path)),
-                        fit: BoxFit.cover,
-                      )),
-                  child: Row(
-                    mainAxisSize: MainAxisSize.min,
-                    mainAxisAlignment: MainAxisAlignment.end,
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      Container(
-                        decoration: BoxDecoration(
-                          color: colorScheme.surface.withAlpha((255 * 0.5).toInt()),
-                          borderRadius: AppBorderRadius.smallBorderRadius,
-                        ),
-                        child: IconButton(
-                          onPressed: () {
-                            showDialog(
-                                context: context,
-                                builder: (context) {
-                                  return AlertDialog(
-                                    title: const Text('提示'),
-                                    content: const Text('确认删除这个视频吗'),
-                                    actions: [
-                                      TextButton(
-                                          onPressed: () {
-                                            Get.backLegacy();
-                                          },
-                                          child: const Text('取消')),
-                                      TextButton(
-                                          onPressed: () {
-                                            logic.deleteVideo(index);
-                                          },
-                                          child: const Text('确认'))
-                                    ],
-                                  );
-                                });
-                          },
-                          constraints: const BoxConstraints(),
-                          icon: Icon(
-                            Icons.remove_circle_outlined,
-                            color: colorScheme.tertiary,
-                          ),
-                          style: IconButton.styleFrom(
-                            tapTargetSize: MaterialTapTargetSize.shrinkWrap,
-                            padding: const EdgeInsets.all(4.0),
-                          ),
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-              );
-            }),
-            if (state.videoFileList.length < 9) ...[
-              InkWell(
-                borderRadius: AppBorderRadius.smallBorderRadius,
-                onTap: () {
-                  showDialog(
-                      context: context,
-                      builder: (context) {
-                        return SimpleDialog(
-                          title: const Text('选择来源'),
-                          children: [
-                            SimpleDialogOption(
-                              child: const Row(
-                                spacing: 8.0,
-                                children: [
-                                  Icon(Icons.photo_library_outlined),
-                                  Text('相册'),
-                                ],
-                              ),
-                              onPressed: () {
-                                logic.pickVideo(ImageSource.gallery);
-                              },
-                            ),
-                            SimpleDialogOption(
-                              child: const Row(
-                                spacing: 8.0,
-                                children: [
-                                  Icon(Icons.camera_alt_outlined),
-                                  Text('拍摄'),
-                                ],
-                              ),
-                              onPressed: () {
-                                logic.pickVideo(ImageSource.camera);
-                              },
-                            ),
-                          ],
-                        );
-                      });
-                },
-                child: buildAddContainer(const FaIcon(FontAwesomeIcons.video)),
-              )
-            ],
-          ],
-        ),
-      );
-    }
+    // Widget buildVideo() {
+    //   return Padding(
+    //     padding: const EdgeInsets.only(top: 8.0),
+    //     child: Wrap(
+    //       spacing: 8.0,
+    //       runSpacing: 8.0,
+    //       children: [
+    //         ...List.generate(state.videoFileList.length, (index) {
+    //           return InkWell(
+    //             onTap: () {
+    //               logic.toVideoView(
+    //                   List.generate(state.videoFileList.length, (index) {
+    //                     return state.videoFileList[index].path;
+    //                   }),
+    //                   index);
+    //             },
+    //             child: Container(
+    //               constraints: const BoxConstraints(maxWidth: 150, maxHeight: 150),
+    //               width: ((size.width - 56.0) / 3).truncateToDouble(),
+    //               height: ((size.width - 56.0) / 3).truncateToDouble(),
+    //               padding: const EdgeInsets.all(2.0),
+    //               decoration: BoxDecoration(
+    //                   borderRadius: AppBorderRadius.smallBorderRadius,
+    //                   border: Border.all(color: colorScheme.outline.withAlpha((255 * 0.5).toInt())),
+    //                   image: DecorationImage(
+    //                     image: FileImage(File(state.videoThumbnailFileList[index].path)),
+    //                     fit: BoxFit.cover,
+    //                   )),
+    //               child: Row(
+    //                 mainAxisSize: MainAxisSize.min,
+    //                 mainAxisAlignment: MainAxisAlignment.end,
+    //                 crossAxisAlignment: CrossAxisAlignment.start,
+    //                 children: [
+    //                   Container(
+    //                     decoration: BoxDecoration(
+    //                       color: colorScheme.surface.withAlpha((255 * 0.5).toInt()),
+    //                       borderRadius: AppBorderRadius.smallBorderRadius,
+    //                     ),
+    //                     child: IconButton(
+    //                       onPressed: () {
+    //                         showDialog(
+    //                             context: context,
+    //                             builder: (context) {
+    //                               return AlertDialog(
+    //                                 title: const Text('提示'),
+    //                                 content: const Text('确认删除这个视频吗'),
+    //                                 actions: [
+    //                                   TextButton(
+    //                                       onPressed: () {
+    //                                         Get.backLegacy();
+    //                                       },
+    //                                       child: const Text('取消')),
+    //                                   TextButton(
+    //                                       onPressed: () {
+    //                                         logic.deleteVideo(index);
+    //                                       },
+    //                                       child: const Text('确认'))
+    //                                 ],
+    //                               );
+    //                             });
+    //                       },
+    //                       constraints: const BoxConstraints(),
+    //                       icon: Icon(
+    //                         Icons.remove_circle_outlined,
+    //                         color: colorScheme.tertiary,
+    //                       ),
+    //                       style: IconButton.styleFrom(
+    //                         tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+    //                         padding: const EdgeInsets.all(4.0),
+    //                       ),
+    //                     ),
+    //                   ),
+    //                 ],
+    //               ),
+    //             ),
+    //           );
+    //         }),
+    //         if (state.videoFileList.length < 9) ...[
+    //           InkWell(
+    //             borderRadius: AppBorderRadius.smallBorderRadius,
+    //             onTap: () {
+    //               showDialog(
+    //                   context: context,
+    //                   builder: (context) {
+    //                     return SimpleDialog(
+    //                       title: const Text('选择来源'),
+    //                       children: [
+    //                         SimpleDialogOption(
+    //                           child: const Row(
+    //                             spacing: 8.0,
+    //                             children: [
+    //                               Icon(Icons.photo_library_outlined),
+    //                               Text('相册'),
+    //                             ],
+    //                           ),
+    //                           onPressed: () {
+    //                             logic.pickVideo(ImageSource.gallery);
+    //                           },
+    //                         ),
+    //                         SimpleDialogOption(
+    //                           child: const Row(
+    //                             spacing: 8.0,
+    //                             children: [
+    //                               Icon(Icons.camera_alt_outlined),
+    //                               Text('拍摄'),
+    //                             ],
+    //                           ),
+    //                           onPressed: () {
+    //                             logic.pickVideo(ImageSource.camera);
+    //                           },
+    //                         ),
+    //                       ],
+    //                     );
+    //                   });
+    //             },
+    //             child: buildAddContainer(const FaIcon(FontAwesomeIcons.video)),
+    //           )
+    //         ],
+    //       ],
+    //     ),
+    //   );
+    // }
 
     Widget buildMoodSlider() {
       return Container(
@@ -389,6 +391,94 @@ class EditPage extends StatelessWidget {
       );
     }
 
+    Widget buildPickImage() {
+      return SimpleDialog(
+        title: const Text('选择来源'),
+        children: [
+          SimpleDialogOption(
+            child: const Row(
+              spacing: 8.0,
+              children: [
+                Icon(Icons.photo_library_outlined),
+                Text('相册'),
+              ],
+            ),
+            onPressed: () async {
+              await logic.pickPhoto(ImageSource.gallery);
+            },
+          ),
+          SimpleDialogOption(
+            child: const Row(
+              spacing: 8.0,
+              children: [
+                Icon(Icons.camera_alt_outlined),
+                Text('相机'),
+              ],
+            ),
+            onPressed: () async {
+              await logic.pickPhoto(ImageSource.camera);
+            },
+          ),
+          SimpleDialogOption(
+            child: const Row(
+              spacing: 8.0,
+              children: [
+                Icon(Icons.image_search_outlined),
+                Text('网络'),
+              ],
+            ),
+            onPressed: () async {
+              await logic.networkImage();
+            },
+          ),
+          SimpleDialogOption(
+            child: const Row(
+              spacing: 8.0,
+              children: [
+                Icon(Icons.draw_outlined),
+                Text('画画'),
+              ],
+            ),
+            onPressed: () {
+              logic.toDrawPage();
+            },
+          ),
+        ],
+      );
+    }
+
+    Widget buildPickVideo() {
+      return SimpleDialog(
+        title: const Text('选择来源'),
+        children: [
+          SimpleDialogOption(
+            child: const Row(
+              spacing: 8.0,
+              children: [
+                Icon(Icons.photo_library_outlined),
+                Text('相册'),
+              ],
+            ),
+            onPressed: () async {
+              await logic.pickVideo(ImageSource.gallery);
+            },
+          ),
+          SimpleDialogOption(
+            child: const Row(
+              spacing: 8.0,
+              children: [
+                Icon(Icons.camera_alt_outlined),
+                Text('拍摄'),
+              ],
+            ),
+            onPressed: () async {
+              await logic.pickVideo(ImageSource.camera);
+            },
+          ),
+        ],
+      );
+    }
+
     Widget buildDetail() {
       return ListView(
         children: [
@@ -508,158 +598,295 @@ class EditPage extends StatelessWidget {
                   return buildMoodSlider();
                 }),
           ),
-          ListTile(
-            title: const Text('图片'),
-            subtitle: GetBuilder<EditLogic>(
-                id: 'Image',
-                builder: (_) {
-                  return buildImage();
-                }),
-          ),
-          ListTile(
-            title: const Text('视频'),
-            subtitle: GetBuilder<EditLogic>(
-                id: 'Video',
-                builder: (_) {
-                  return buildVideo();
-                }),
-          ),
-          ListTile(
-            title: const Text('音频'),
-            subtitle: GetBuilder<EditLogic>(
-                id: 'Audio',
-                builder: (_) {
-                  return buildAudioPlayer();
-                }),
-          ),
+          // ListTile(
+          //   title: const Text('图片'),
+          //   subtitle: GetBuilder<EditLogic>(
+          //       id: 'Image',
+          //       builder: (_) {
+          //         return buildImage();
+          //       }),
+          // ),
+          // ListTile(
+          //   title: const Text('视频'),
+          //   subtitle: GetBuilder<EditLogic>(
+          //       id: 'Video',
+          //       builder: (_) {
+          //         return buildVideo();
+          //       }),
+          // ),
+          // ListTile(
+          //   title: const Text('音频'),
+          //   subtitle: GetBuilder<EditLogic>(
+          //       id: 'Audio',
+          //       builder: (_) {
+          //         return buildAudioPlayer();
+          //       }),
+          // ),
         ],
       );
     }
 
+    Widget buildTimer() {
+      return Container(
+        decoration: BoxDecoration(
+          color: colorScheme.surfaceContainer.withAlpha(240),
+          borderRadius: AppBorderRadius.smallBorderRadius,
+        ),
+        padding: const EdgeInsets.symmetric(horizontal: 8.0),
+        child: Obx(() {
+          return RichText(
+            text: TextSpan(
+              text: '时间 ',
+              style: textStyle.labelSmall,
+              children: [
+                TextSpan(
+                  text: state.durationString.value.toString(),
+                  style: textStyle.labelSmall
+                      ?.copyWith(color: colorScheme.primary, fontFeatures: [const FontFeature.tabularFigures()]),
+                ),
+              ],
+            ),
+          );
+        }),
+      );
+    }
+
+    Widget buildCount() {
+      return Container(
+        decoration: BoxDecoration(
+          color: colorScheme.surfaceContainer.withAlpha(240),
+          borderRadius: AppBorderRadius.smallBorderRadius,
+        ),
+        padding: const EdgeInsets.symmetric(horizontal: 8.0),
+        child: Obx(() {
+          return RichText(
+            text: TextSpan(
+              text: '字数 ',
+              style: textStyle.labelSmall,
+              children: [
+                TextSpan(
+                  text: state.totalCount.value.toString(),
+                  style: textStyle.labelSmall
+                      ?.copyWith(color: colorScheme.primary, fontFeatures: [const FontFeature.tabularFigures()]),
+                ),
+              ],
+            ),
+          );
+        }),
+      );
+    }
+
+    Widget buildTitle() {
+      return AutoSizeTextField(
+        controller: logic.titleTextEditingController,
+        focusNode: logic.titleFocusNode,
+        textAlign: TextAlign.center,
+        maxLines: 1,
+        style: textStyle.titleLarge!.copyWith(fontWeight: FontWeight.bold),
+        textInputAction: TextInputAction.done,
+        decoration: const InputDecoration(
+          border: UnderlineInputBorder(borderSide: BorderSide.none),
+          hintText: '标题',
+          contentPadding: EdgeInsets.symmetric(horizontal: 16.0),
+        ),
+      );
+    }
+
+    Widget buildToolBar() {
+      return TooltipTheme(
+        data: const TooltipThemeData(preferBelow: false),
+        child: QuillSimpleToolbar(
+          controller: logic.quillController,
+          config: QuillSimpleToolbarConfig(
+            showFontFamily: false,
+            showFontSize: false,
+            showColorButton: false,
+            showBackgroundColorButton: false,
+            showAlignmentButtons: true,
+            showClipboardPaste: false,
+            showClipboardCut: false,
+            showClipboardCopy: false,
+            showIndent: false,
+            showDividers: false,
+            headerStyleType: HeaderStyleType.buttons,
+            multiRowsDisplay: false,
+            showLink: false,
+            embedButtons: [
+              if (state.type == DiaryType.richText)
+                ...FlutterQuillEmbeds.toolbarButtons(
+                  imageButtonOptions: QuillToolbarImageButtonOptions(
+                    imageButtonConfig: QuillToolbarImageConfig(
+                      onRequestPickImage: (_) async {
+                        var imagePath = await Get.dialog(buildPickImage());
+                        return imagePath as String?;
+                      },
+                    ),
+                  ),
+                  videoButtonOptions: QuillToolbarVideoButtonOptions(
+                    videoConfig: QuillToolbarVideoConfig(
+                      onRequestPickVideo: (_) async {
+                        var videoPath = await Get.dialog(buildPickVideo());
+                        return videoPath as String?;
+                      },
+                    ),
+                  ),
+                ),
+              if (state.type == DiaryType.richText)
+                (
+                  BuildContext context,
+                  EmbedButtonContext embedContext,
+                ) {
+                  return IconButton(
+                    icon: const Icon(
+                      Icons.audiotrack,
+                      size: 24,
+                    ),
+                    tooltip: 'Insert Audio',
+                    onPressed: () async {
+                      await showModalBottomSheet(
+                          context: context,
+                          showDragHandle: true,
+                          useSafeArea: true,
+                          isScrollControlled: true,
+                          builder: (context) {
+                            return const RecordSheetComponent();
+                          });
+                    },
+                  );
+                },
+              (
+                BuildContext context,
+                EmbedButtonContext embedContext,
+              ) {
+                return IconButton(
+                  icon: const Icon(
+                    Icons.format_indent_increase,
+                    size: 24,
+                  ),
+                  tooltip: 'Insert Newline',
+                  onPressed: () async {
+                    logic.insertNewLine();
+                  },
+                );
+              },
+            ],
+          ),
+        ),
+      );
+    }
+
+    Widget buildMoreButton() {
+      return IconButton.filled(
+        icon: const Icon(Icons.keyboard_command_key),
+        style: const ButtonStyle(tapTargetSize: MaterialTapTargetSize.shrinkWrap),
+        onPressed: () {
+          showModalBottomSheet(
+            context: context,
+            builder: (context) {
+              return buildDetail();
+            },
+            showDragHandle: true,
+            useSafeArea: true,
+          );
+        },
+      );
+    }
+
     Widget buildWriting() {
       return Column(
         children: [
-          TextField(
-            maxLines: 1,
-            controller: logic.titleTextEditingController,
-            focusNode: logic.titleFocusNode,
-            decoration: const InputDecoration(
-                border: UnderlineInputBorder(), contentPadding: EdgeInsets.all(12.0), hintText: '标题'),
-          ),
-          Expanded(
-            child: QuillEditor.basic(
-              focusNode: logic.contentFocusNode,
-              controller: logic.quillController,
-              configurations: const QuillEditorConfigurations(
-                padding: EdgeInsets.all(12.0),
-                placeholder: '正文',
-                sharedConfigurations: QuillSharedConfigurations(),
-                expands: true,
-              ),
-            ),
-          ),
-          Padding(
-            padding: const EdgeInsets.all(12.0),
-            child: Row(
+          Flexible(
+            child: Stack(
+              alignment: Alignment.center,
               children: [
-                GetBuilder<EditLogic>(
-                    id: 'Count',
-                    builder: (_) {
-                      return Text('字数：${state.totalCount.toString()}');
-                    })
+                QuillEditor.basic(
+                  focusNode: logic.contentFocusNode,
+                  controller: logic.quillController,
+                  config: QuillEditorConfig(
+                    padding: const EdgeInsets.fromLTRB(16, 20, 16, 20),
+                    placeholder: '正文',
+                    expands: true,
+                    paintCursorAboveText: true,
+                    keyboardAppearance: CupertinoTheme.maybeBrightnessOf(context) ?? Theme.of(context).brightness,
+                    customStyles: Utils().themeUtil.getInstance(context),
+                    embedBuilders: [
+                      if (state.type == DiaryType.richText) ...[
+                        ImageEmbedBuilder(isEdit: true),
+                        VideoEmbedBuilder(isEdit: true),
+                        AudioEmbedBuilder(isEdit: true),
+                      ],
+                      TextIndentEmbedBuilder(isEdit: true),
+                    ],
+                  ),
+                ),
+                Positioned(
+                    top: 2,
+                    left: 16,
+                    right: 16,
+                    child: Row(
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      spacing: 8.0,
+                      children: [
+                        if (state.showWriteTime) buildTimer(),
+                        if (state.showWordCount) buildCount(),
+                      ],
+                    )),
               ],
             ),
           ),
-          SingleChildScrollView(
-            scrollDirection: Axis.horizontal,
-            child: TooltipTheme(
-              data: const TooltipThemeData(preferBelow: false),
-              child: QuillSimpleToolbar(
-                controller: logic.quillController,
-                configurations: const QuillSimpleToolbarConfigurations(
-                  showFontFamily: false,
-                  showFontSize: false,
-                  showColorButton: false,
-                  showBackgroundColorButton: false,
-                  showAlignmentButtons: true,
-                  showClipboardPaste: false,
-                  showClipboardCut: false,
-                  showClipboardCopy: false,
-                  headerStyleType: HeaderStyleType.buttons,
-                  sharedConfigurations: QuillSharedConfigurations(),
-                ),
-              ),
+          Padding(
+            padding: const EdgeInsets.all(8.0),
+            child: Row(
+              spacing: 8.0,
+              children: [
+                buildMoreButton(),
+                Expanded(child: buildToolBar()),
+              ],
             ),
-          ),
+          )
         ],
       );
     }
 
-    return GetBuilder<EditLogic>(
-      id: 'All',
-      builder: (_) {
-        return Stack(
-          alignment: Alignment.center,
-          children: [
-            Scaffold(
-              appBar: AppBar(
-                title: state.isNew ? const Text('新增日记') : const Text('编辑日记'),
-                actions: [
-                  IconButton(
-                    icon: const Icon(Icons.check),
-                    onPressed: () {
-                      logic.unFocus();
-                      logic.saveDiary();
-                    },
-                    tooltip: '保存',
-                  ),
-                ],
-              ),
-              body: size.aspectRatio < 1.0
-                  ? PageView(
-                      controller: logic.pageController,
-                      physics: const NeverScrollableScrollPhysics(),
-                      children: [KeepAliveWrapper(child: buildWriting()), KeepAliveWrapper(child: buildDetail())],
-                    )
-                  : Row(
-                      children: [
-                        Flexible(flex: 4, child: SafeArea(child: buildWriting())),
-                        Flexible(flex: 3, child: buildDetail())
-                      ],
-                    ),
-              bottomNavigationBar: size.aspectRatio < 1.0
-                  ? GetBuilder<EditLogic>(
-                      id: 'NavigationBar',
-                      builder: (_) {
-                        return NavigationBar(
-                          destinations: const [
-                            NavigationDestination(
-                              icon: Icon(Icons.edit_outlined),
-                              label: '撰写',
-                              selectedIcon: Icon(Icons.edit),
-                            ),
-                            NavigationDestination(
-                              icon: Icon(Icons.more_outlined),
-                              label: '更多',
-                              selectedIcon: Icon(Icons.more),
-                            )
-                          ],
-                          selectedIndex: state.tabIndex,
-                          onDestinationSelected: (index) {
-                            logic.selectTabView(index);
-                          },
-                        );
-                      })
-                  : null,
-            ),
-            GetBuilder<EditLogic>(
-                id: 'modal',
-                builder: (_) {
-                  return state.isSaving ? const LottieModal(type: LoadingType.cat) : const SizedBox.shrink();
-                }),
-          ],
-        );
+    return PopScope(
+      canPop: false,
+      onPopInvokedWithResult: (canPop, _) {
+        if (canPop) return;
+        logic.handleBack();
       },
+      child: Stack(
+        alignment: Alignment.center,
+        children: [
+          GetBuilder<EditLogic>(
+              id: 'body',
+              builder: (_) {
+                return Scaffold(
+                  appBar: AppBar(
+                    title: buildTitle(),
+                    titleSpacing: .0,
+                    centerTitle: true,
+                    actions: [
+                      IconButton(
+                        icon: const Icon(Icons.check),
+                        onPressed: () {
+                          logic.unFocus();
+                          logic.saveDiary();
+                        },
+                        tooltip: '保存',
+                      ),
+                    ],
+                  ),
+                  body:
+                      SafeArea(child: state.isInit ? buildWriting() : const Center(child: CircularProgressIndicator())),
+                );
+              }),
+          GetBuilder<EditLogic>(
+              id: 'modal',
+              builder: (_) {
+                return state.isSaving ? const LottieModal(type: LoadingType.cat) : const SizedBox.shrink();
+              }),
+        ],
+      ),
     );
   }
 }
diff --git a/lib/pages/home/diary/diary_logic.dart b/lib/pages/home/diary/diary_logic.dart
index dfc3b66..b5f0d5a 100644
--- a/lib/pages/home/diary/diary_logic.dart
+++ b/lib/pages/home/diary/diary_logic.dart
@@ -128,9 +128,9 @@ class DiaryLogic extends GetxController with GetTickerProviderStateMixin {
     }
     //如果控制器已经存在，重新获取，如果不存在，不需要任何操作
     if (tabViewIndex != 0 && Bind.isRegistered<DiaryTabViewLogic>(tag: categoryId)) {
-      await Bind.find<DiaryTabViewLogic>(tag: categoryId).getDiary();
+      await Bind.find<DiaryTabViewLogic>(tag: categoryId).updateDiary();
     }
-    await Bind.find<DiaryTabViewLogic>(tag: 'default').getDiary();
+    await Bind.find<DiaryTabViewLogic>(tag: 'default').updateDiary();
   }
 
   /// 分类刷新函数
diff --git a/lib/pages/home/diary/diary_view.dart b/lib/pages/home/diary/diary_view.dart
index f4f0c5a..153834b 100644
--- a/lib/pages/home/diary/diary_view.dart
+++ b/lib/pages/home/diary/diary_view.dart
@@ -7,6 +7,7 @@ import 'package:mood_diary/components/diary_tab_view/diary_tab_view_view.dart';
 import 'package:mood_diary/components/keepalive/keepalive.dart';
 import 'package:mood_diary/components/scroll/fix_scroll.dart';
 import 'package:mood_diary/components/search_sheet/search_sheet_view.dart';
+import 'package:mood_diary/components/web_dav_dashboard/web_dav_dashboard_view.dart';
 
 import 'diary_logic.dart';
 
@@ -121,6 +122,18 @@ class DiaryPage extends StatelessWidget {
                         icon: const Icon(Icons.search),
                         tooltip: i18n.diaryPageSearchButton,
                       ),
+                      IconButton(
+                        onPressed: () {
+                          showModalBottomSheet(
+                              context: context,
+                              builder: (context) {
+                                return const WebDavDashboardComponent();
+                              },
+                              showDragHandle: true,
+                              useSafeArea: true);
+                        },
+                        icon: const Icon(Icons.cloud_sync_outlined),
+                      ),
                       PopupMenuButton(
                         offset: const Offset(0, 46),
                         tooltip: i18n.diaryPageViewModeButton,
diff --git a/lib/pages/home/home_logic.dart b/lib/pages/home/home_logic.dart
index acb65e3..5ee10cb 100644
--- a/lib/pages/home/home_logic.dart
+++ b/lib/pages/home/home_logic.dart
@@ -7,6 +7,7 @@ import 'package:mood_diary/pages/home/diary/diary_logic.dart';
 import 'package:mood_diary/router/app_routes.dart';
 import 'package:mood_diary/utils/utils.dart';
 
+import '../../common/values/diary_type.dart';
 import 'home_state.dart';
 
 class HomeLogic extends GetxController with GetTickerProviderStateMixin {
@@ -81,16 +82,15 @@ class HomeLogic extends GetxController with GetTickerProviderStateMixin {
   }
 
   //新增一篇日记
-  Future<void> toEditPage() async {
+  Future<void> toEditPage({required DiaryType type}) async {
     //同时关闭fab
-    await HapticFeedback.selectionClick();
+    HapticFeedback.selectionClick();
+
+    /// 需要注意，返回值为 '' 时才是没有选择分类，而返回值为 null 时，是没有进行操作直接返回
+    var res = await Get.toNamed(AppRoutes.editPage, arguments: type);
     fabAnimationController.reset();
     state.isFabExpanded = false;
     update(['Fab']);
-
-    /// 需要注意，返回值为 '' 时才是没有选择分类，而返回值为 null 时，是没有进行操作直接返回
-    var res = await Get.toNamed(AppRoutes.editPage, arguments: 'new');
-
     if (res != null) {
       if (res == '') {
         await diaryLogic.updateDiary(null);
@@ -100,8 +100,6 @@ class HomeLogic extends GetxController with GetTickerProviderStateMixin {
     }
   }
 
-
-
   Future<void> hideNavigatorBar() async {
     await barAnimationController.forward();
   }
diff --git a/lib/pages/home/home_state.dart b/lib/pages/home/home_state.dart
index ba0d440..13feb7e 100644
--- a/lib/pages/home/home_state.dart
+++ b/lib/pages/home/home_state.dart
@@ -8,7 +8,7 @@ class HomeState {
   //导航栏index
   int navigatorIndex = 0;
 
-  double navigatorBarHeight = 80.0;
+  double navigatorBarHeight = 56.0;
 
   HomeState();
 }
diff --git a/lib/pages/home/home_view.dart b/lib/pages/home/home_view.dart
index e9770ad..5f40409 100644
--- a/lib/pages/home/home_view.dart
+++ b/lib/pages/home/home_view.dart
@@ -6,6 +6,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:get/get.dart';
 import 'package:mood_diary/common/values/border.dart';
+import 'package:mood_diary/common/values/diary_type.dart';
 import 'package:mood_diary/pages/home/calendar/calendar_view.dart';
 import 'package:mood_diary/pages/home/diary/diary_view.dart';
 import 'package:mood_diary/pages/home/media/media_view.dart';
@@ -24,6 +25,8 @@ class HomePage extends StatelessWidget {
     final colorScheme = Theme.of(context).colorScheme;
     final i18n = AppLocalizations.of(context)!;
     final size = MediaQuery.sizeOf(context);
+    final padding = MediaQuery.paddingOf(context);
+    final textStyle = Theme.of(context).textTheme;
 
     Widget buildModal() {
       return AnimatedBuilder(
@@ -31,7 +34,7 @@ class HomePage extends StatelessWidget {
           builder: (context, child) {
             return state.isFabExpanded
                 ? ModalBarrier(
-                    color: colorScheme.surface.withAlpha((255 * 0.6 * logic.fabAnimation.value).toInt()),
+                    color: colorScheme.surfaceContainer.withAlpha((255 * 0.6 * logic.fabAnimation.value).toInt()),
                     onDismiss: () async {
                       await logic.closeFab();
                     },
@@ -73,150 +76,91 @@ class HomePage extends StatelessWidget {
           : const SizedBox.shrink();
     }
 
-    Widget buildAddDiaryButton() {
-      return AnimatedBuilder(
-        animation: logic.fabAnimation,
-        child: GestureDetector(
-          onTap: () async {
-            await logic.toEditPage();
+    Widget buildAnimatedActionButton({
+      required String label,
+      required Function() onTap,
+      required IconData iconData,
+      required int index,
+    }) {
+      const double mainButtonHeight = 56.0;
+      const double mainButtonSpacing = 8.0;
+      const double secondaryButtonHeight = 46.0;
+
+      double calculateVerticalTranslation(int index, double animationValue) {
+        const double baseOffset = mainButtonHeight + mainButtonSpacing;
+        return index == 1
+            ? baseOffset * index * animationValue
+            : (baseOffset + (secondaryButtonHeight + mainButtonSpacing) * (index - 1)) * animationValue;
+      }
+
+      return Visibility(
+        visible: state.isFabExpanded,
+        child: AnimatedBuilder(
+          animation: logic.fabAnimation,
+          builder: (context, child) {
+            final verticalTranslation = calculateVerticalTranslation(index, logic.fabAnimation.value);
+            return Positioned(
+              left: 0,
+              right: 0,
+              bottom: verticalTranslation,
+              child: Opacity(
+                opacity: logic.fabAnimation.value,
+                child: child!,
+              ),
+            );
           },
-          child: Container(
-            decoration: ShapeDecoration(
-                shape: const RoundedRectangleBorder(borderRadius: AppBorderRadius.largeBorderRadius),
-                color: colorScheme.primaryContainer,
-                shadows: [
-                  BoxShadow(
-                      color: colorScheme.shadow.withAlpha((255 * 0.1).toInt()),
-                      offset: const Offset(0, 2),
-                      blurRadius: 2,
-                      spreadRadius: 2)
-                ]),
-            height: 56.0,
-            alignment: Alignment.center,
+          child: GestureDetector(
+            onTap: onTap,
             child: Row(
-              mainAxisSize: MainAxisSize.min,
-              spacing: 16.0,
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: [
-                FaIcon(
-                  FontAwesomeIcons.feather,
-                  color: colorScheme.onPrimaryContainer,
+                Container(
+                  decoration: ShapeDecoration(
+                    shape: const RoundedRectangleBorder(borderRadius: AppBorderRadius.smallBorderRadius),
+                    color: colorScheme.secondaryContainer,
+                    shadows: [
+                      BoxShadow(
+                        color: colorScheme.shadow.withAlpha((255 * 0.1).toInt()),
+                        offset: const Offset(0, 2),
+                        blurRadius: 2,
+                        spreadRadius: 2,
+                      ),
+                    ],
+                  ),
+                  padding: const EdgeInsets.fromLTRB(8.0, 4.0, 8.0, 4.0),
+                  child: Text(
+                    label,
+                    style: textStyle.labelMedium!.copyWith(color: colorScheme.onSecondaryContainer),
+                  ),
                 ),
-                Text(
-                  i18n.homePageAddDiaryButton,
-                  style: TextStyle(color: colorScheme.onPrimaryContainer),
+                Container(
+                  decoration: ShapeDecoration(
+                    shape: const RoundedRectangleBorder(borderRadius: AppBorderRadius.largeBorderRadius),
+                    color: colorScheme.primaryContainer,
+                    shadows: [
+                      BoxShadow(
+                        color: colorScheme.shadow.withAlpha((255 * 0.1).toInt()),
+                        offset: const Offset(0, 2),
+                        blurRadius: 2,
+                        spreadRadius: 2,
+                      ),
+                    ],
+                  ),
+                  width: 56.0,
+                  height: 46.0,
+                  alignment: Alignment.center,
+                  child: FaIcon(
+                    iconData,
+                    color: colorScheme.onPrimaryContainer,
+                  ),
                 ),
               ],
             ),
           ),
         ),
-        builder: (context, child) {
-          return Transform(
-            transform: Matrix4.identity()
-              ..scale(pow(logic.fabAnimation.value, 2).toDouble(), logic.fabAnimation.value)
-              ..translate(.0, -((56.0 + 8.0)) * logic.fabAnimation.value),
-            alignment: FractionalOffset.centerRight,
-            child: child,
-          );
-        },
       );
     }
 
-    // Widget buildToAiButton() {
-    //   return AnimatedBuilder(
-    //     animation: logic.fabAnimation,
-    //     child: GestureDetector(
-    //       onTap: () async {
-    //         await logic.toAi();
-    //       },
-    //       child: Container(
-    //         decoration: ShapeDecoration(
-    //             shape: const RoundedRectangleBorder(borderRadius: AppBorderRadius.largeBorderRadius),
-    //             color: colorScheme.primaryContainer,
-    //             shadows: [
-    //               BoxShadow(
-    //                   color: colorScheme.shadow.withAlpha((255 * 0.1).toInt()),
-    //                   offset: const Offset(0, 2),
-    //                   blurRadius: 2,
-    //                   spreadRadius: 2)
-    //             ]),
-    //         height: 56.0,
-    //         alignment: Alignment.center,
-    //         child: Row(
-    //           mainAxisSize: MainAxisSize.min,
-    //           spacing: 16.0,
-    //           children: [
-    //             FaIcon(
-    //               FontAwesomeIcons.solidCommentDots,
-    //               color: colorScheme.onPrimaryContainer,
-    //             ),
-    //             Text(
-    //               '智能助手',
-    //               style: TextStyle(color: colorScheme.onPrimaryContainer),
-    //             ),
-    //           ],
-    //         ),
-    //       ),
-    //     ),
-    //     builder: (context, child) {
-    //       return Transform(
-    //         transform: Matrix4.identity()
-    //           ..scale(pow(logic.fabAnimation.value, 2).toDouble(), logic.fabAnimation.value)
-    //           ..translate(.0, -((56.0 + 8.0) * 3) * logic.fabAnimation.value),
-    //         alignment: FractionalOffset.centerRight,
-    //         child: child,
-    //       );
-    //     },
-    //   );
-    // }
-
-    // Widget buildToMapButton() {
-    //   return AnimatedBuilder(
-    //     animation: logic.fabAnimation,
-    //     child: GestureDetector(
-    //       onTap: () async {
-    //         await logic.toMap();
-    //       },
-    //       child: Container(
-    //         decoration: ShapeDecoration(
-    //             shape: const RoundedRectangleBorder(borderRadius: AppBorderRadius.largeBorderRadius),
-    //             color: colorScheme.primaryContainer,
-    //             shadows: [
-    //               BoxShadow(
-    //                   color: colorScheme.shadow.withAlpha((255 * 0.1).toInt()),
-    //                   offset: const Offset(0, 2),
-    //                   blurRadius: 2,
-    //                   spreadRadius: 2)
-    //             ]),
-    //         height: 56.0,
-    //         alignment: Alignment.center,
-    //         child: Row(
-    //           mainAxisSize: MainAxisSize.min,
-    //           spacing: 16.0,
-    //           children: [
-    //             FaIcon(
-    //               FontAwesomeIcons.solidMap,
-    //               color: colorScheme.onPrimaryContainer,
-    //             ),
-    //             Text(
-    //               '查看足迹',
-    //               style: TextStyle(color: colorScheme.onPrimaryContainer),
-    //             ),
-    //           ],
-    //         ),
-    //       ),
-    //     ),
-    //     builder: (context, child) {
-    //       return Transform(
-    //         transform: Matrix4.identity()
-    //           ..scale(pow(logic.fabAnimation.value, 2).toDouble(), logic.fabAnimation.value)
-    //           ..translate(.0, -((56.0 + 8.0) * 2) * logic.fabAnimation.value),
-    //         alignment: FractionalOffset.centerRight,
-    //         child: child,
-    //       );
-    //     },
-    //   );
-    // }
-
     Widget buildFabButton() {
       return AnimatedBuilder(
           animation: logic.fabAnimation,
@@ -231,20 +175,21 @@ class HomePage extends StatelessWidget {
                 decoration: ShapeDecoration(
                     shape: const RoundedRectangleBorder(borderRadius: AppBorderRadius.largeBorderRadius),
                     color: Color.lerp(
-                        colorScheme.primaryContainer, colorScheme.tertiaryContainer, logic.fabAnimation.value),
+                        colorScheme.primaryContainer, colorScheme.surfaceContainerHighest, logic.fabAnimation.value),
                     shadows: [
                       BoxShadow(
-                          color: colorScheme.shadow.withAlpha((255 * 0.1).toInt()),
-                          offset: const Offset(0, 2),
-                          blurRadius: 2,
-                          spreadRadius: 2)
+                        color: colorScheme.shadow.withAlpha((255 * 0.1).toInt()),
+                        offset: const Offset(0, 2),
+                        blurRadius: 2,
+                        spreadRadius: 2,
+                      ),
                     ]),
                 child: Transform.rotate(
                     angle: 3 * pi / 4 * logic.fabAnimation.value,
                     child: Icon(
                       FontAwesomeIcons.plus,
-                      color: Color.lerp(
-                          colorScheme.onPrimaryContainer, colorScheme.onTertiaryContainer, logic.fabAnimation.value),
+                      color:
+                          Color.lerp(colorScheme.onPrimaryContainer, colorScheme.onSurface, logic.fabAnimation.value),
                     )),
               ),
             );
@@ -254,15 +199,26 @@ class HomePage extends StatelessWidget {
     Widget buildFab() {
       return state.navigatorIndex == 0
           ? SizedBox(
-              height: state.isFabExpanded || state.isToTopShow ? 56 + (56 + 8) * 1 : 56,
-              width: state.isFabExpanded ? 156 : 56,
+              height: 56 + 46 + 46 + 16,
+              width: 56 + 32 + textStyle.labelMedium!.fontSize! * 3,
               child: Stack(
                 alignment: Alignment.bottomRight,
                 children: [
                   buildToTopButton(),
-                  // buildToAiButton(),
-                  // buildToMapButton(),
-                  buildAddDiaryButton(),
+                  buildAnimatedActionButton(
+                      label: '纯文字',
+                      onTap: () async {
+                        await logic.toEditPage(type: DiaryType.text);
+                      },
+                      iconData: FontAwesomeIcons.font,
+                      index: 2),
+                  buildAnimatedActionButton(
+                      label: '富文本',
+                      onTap: () async {
+                        await logic.toEditPage(type: DiaryType.richText);
+                      },
+                      iconData: FontAwesomeIcons.feather,
+                      index: 1),
                   buildFabButton(),
                 ],
               ),
@@ -360,31 +316,35 @@ class HomePage extends StatelessWidget {
     // }
 
     Widget buildNavigatorBar() {
+      var navigatorBarHeight = state.navigatorBarHeight + padding.bottom;
       return size.width < 600
           ? AnimatedBuilder(
               animation: logic.barAnimation,
               builder: (context, child) {
                 return SizedBox(
-                  height: state.navigatorBarHeight * logic.barAnimation.value,
+                  height: (navigatorBarHeight) * logic.barAnimation.value,
                   child: child,
                 );
               },
-              child: Container(
-                height: state.navigatorBarHeight * logic.barAnimation.value,
-                decoration: BoxDecoration(border: Border(top: BorderSide(color: colorScheme.outline, width: 0.2))),
-                child: Stack(
-                  children: [
-                    NavigationBar(
-                      destinations: destinations,
-                      selectedIndex: state.navigatorIndex,
-                      height: state.navigatorBarHeight,
-                      onDestinationSelected: (index) {
-                        logic.changeNavigator(index);
-                      },
-                      labelBehavior: NavigationDestinationLabelBehavior.alwaysHide,
-                    ),
-                    buildModal()
-                  ],
+              child: OverflowBox(
+                maxHeight: navigatorBarHeight,
+                alignment: Alignment.topCenter,
+                child: Container(
+                  decoration: BoxDecoration(
+                    border: Border(top: BorderSide(color: colorScheme.outline.withAlpha(150), width: 0.5)),
+                  ),
+                  child: Stack(
+                    children: [
+                      NavigationBar(
+                        destinations: destinations,
+                        selectedIndex: state.navigatorIndex,
+                        height: navigatorBarHeight,
+                        onDestinationSelected: logic.changeNavigator,
+                        labelBehavior: NavigationDestinationLabelBehavior.alwaysHide,
+                      ),
+                      buildModal()
+                    ],
+                  ),
                 ),
               ),
             )
diff --git a/lib/pages/home/media/media_view.dart b/lib/pages/home/media/media_view.dart
index 0c400fa..169e7f2 100644
--- a/lib/pages/home/media/media_view.dart
+++ b/lib/pages/home/media/media_view.dart
@@ -21,6 +21,8 @@ class MediaPage extends StatelessWidget {
     final state = Bind.find<MediaLogic>().state;
     final i18n = AppLocalizations.of(context)!;
     final colorScheme = Theme.of(context).colorScheme;
+    final pixelRatio = MediaQuery.devicePixelRatioOf(context);
+    final size = MediaQuery.sizeOf(context);
 
     final iconMap = {
       MediaType.image: FontAwesomeIcons.image,
@@ -52,6 +54,7 @@ class MediaPage extends StatelessWidget {
                 child: Image.file(
                   File(state.filePath[index]),
                   fit: BoxFit.cover,
+                  cacheWidth: 120 * pixelRatio.toInt(),
                 ),
               ),
             );
@@ -63,10 +66,7 @@ class MediaPage extends StatelessWidget {
       return SliverList.builder(
           key: UniqueKey(),
           itemBuilder: (context, index) {
-            return AudioPlayerComponent(
-              path: state.filePath[index],
-              isEdit: false,
-            );
+            return AudioPlayerComponent(path: state.filePath[index]);
           },
           itemCount: state.filePath.length);
     }
@@ -94,6 +94,7 @@ class MediaPage extends StatelessWidget {
               child: Image.file(
                 File(thumbnailList[index]), // 使用缩略图文件路径显示图像
                 fit: BoxFit.cover, // 让图像完全覆盖卡片
+                cacheWidth: 120 * pixelRatio.toInt(), // 缓存宽度
               ),
             ),
           );
@@ -109,6 +110,7 @@ class MediaPage extends StatelessWidget {
           alignment: Alignment.center,
           children: [
             CustomScrollView(
+              cacheExtent: size.height * 2,
               slivers: [
                 SliverAppBar(
                   title: Text(i18n.homeNavigatorMedia),
diff --git a/lib/pages/home/setting/setting_logic.dart b/lib/pages/home/setting/setting_logic.dart
index f929c9d..79f8faa 100644
--- a/lib/pages/home/setting/setting_logic.dart
+++ b/lib/pages/home/setting/setting_logic.dart
@@ -139,14 +139,14 @@ class SettingLogic extends GetxController {
     }
   }
 
-  // //更改字体
-  // Future<void> changeFontTheme(int value) async {
-  //   Get.backLegacy();
-  //   await Utils().prefUtil.setValue<int>('fontTheme', value);
-  //   state.fontTheme.value = value;
-  //   Get.changeTheme(await Utils().themeUtil.buildTheme(Brightness.light));
-  //   Get.changeTheme(await Utils().themeUtil.buildTheme(Brightness.dark));
-  // }
+  //更改字体
+  Future<void> changeFontTheme(int value) async {
+    Get.backLegacy();
+    await Utils().prefUtil.setValue<int>('fontTheme', value);
+    state.fontTheme.value = value;
+    Get.changeTheme(Utils().themeUtil.buildTheme(Brightness.light));
+    Get.changeTheme(Utils().themeUtil.buildTheme(Brightness.dark));
+  }
 
   Future<void> exportFile() async {
     Get.backLegacy();
diff --git a/lib/pages/home/setting/setting_state.dart b/lib/pages/home/setting/setting_state.dart
index de66d8f..00fe622 100644
--- a/lib/pages/home/setting/setting_state.dart
+++ b/lib/pages/home/setting/setting_state.dart
@@ -1,3 +1,4 @@
+import 'package:get/get_rx/src/rx_types/rx_types.dart';
 import 'package:mood_diary/utils/utils.dart';
 
 class SettingState {
@@ -8,7 +9,7 @@ class SettingState {
 
   int color = Utils().prefUtil.getValue<int>('color')!;
 
-  // late RxInt fontTheme;
+  late RxInt fontTheme;
 
   bool lock = Utils().prefUtil.getValue<bool>('lock')!;
 
@@ -19,6 +20,6 @@ class SettingState {
   String customTitle = Utils().prefUtil.getValue<String>('customTitleName')!;
 
   SettingState() {
-    // fontTheme = Utils().prefUtil.getValue<int>('fontTheme')!.obs;
+    fontTheme = Utils().prefUtil.getValue<int>('fontTheme')!.obs;
   }
 }
diff --git a/lib/pages/home/setting/setting_view.dart b/lib/pages/home/setting/setting_view.dart
index 9b8ded8..37a05f8 100644
--- a/lib/pages/home/setting/setting_view.dart
+++ b/lib/pages/home/setting/setting_view.dart
@@ -8,6 +8,7 @@ import 'package:mood_diary/components/dashboard/dashboard_view.dart';
 import 'package:mood_diary/components/remove_password/remove_password_view.dart';
 import 'package:mood_diary/components/set_password/set_password_view.dart';
 import 'package:mood_diary/components/theme_mode_dialog/theme_mode_dialog_view.dart';
+import 'package:mood_diary/components/tile/setting_tile.dart';
 
 import 'setting_logic.dart';
 
@@ -21,6 +22,7 @@ class SettingPage extends StatelessWidget {
     final textStyle = Theme.of(context).textTheme;
     final colorScheme = Theme.of(context).colorScheme;
     final i18n = AppLocalizations.of(context)!;
+    final size = MediaQuery.sizeOf(context);
 
     Widget buildDashboard() {
       return const DashboardComponent();
@@ -50,12 +52,7 @@ class SettingPage extends StatelessWidget {
       return Column(
         crossAxisAlignment: CrossAxisAlignment.stretch,
         children: [
-          ListTile(
-            title: Text(
-              '功能',
-              style: textStyle.titleLarge!.copyWith(color: colorScheme.primary, fontWeight: FontWeight.bold),
-            ),
-          ),
+          const SettingTitleTile(title: '功能'),
           GridView(
             gridDelegate:
                 const SliverGridDelegateWithMaxCrossAxisExtent(maxCrossAxisExtent: 100, childAspectRatio: 1.0),
@@ -100,12 +97,7 @@ class SettingPage extends StatelessWidget {
     Widget buildData() {
       return Column(
         children: [
-          ListTile(
-            title: Text(
-              i18n.settingData,
-              style: textStyle.titleLarge!.copyWith(color: colorScheme.primary, fontWeight: FontWeight.bold),
-            ),
-          ),
+          SettingTitleTile(title: i18n.settingData),
           Card.filled(
             color: colorScheme.surfaceContainerLow,
             child: Column(
@@ -208,19 +200,14 @@ class SettingPage extends StatelessWidget {
     Widget buildDisplay() {
       return Column(
         children: [
-          ListTile(
-            title: Text(
-              i18n.settingDisplay,
-              style: textStyle.titleLarge!.copyWith(color: colorScheme.primary, fontWeight: FontWeight.bold),
-            ),
-          ),
+          SettingTitleTile(title: i18n.settingDisplay),
           Card.filled(
             color: colorScheme.surfaceContainerLow,
             child: Column(
               children: [
                 ListTile(
                   title: Text(i18n.settingDiary),
-                  leading: const Icon(Icons.article),
+                  leading: const Icon(Icons.article_outlined),
                   trailing: const Icon(Icons.chevron_right),
                   onTap: () {
                     logic.toDiarySettingPage();
@@ -272,7 +259,6 @@ class SettingPage extends StatelessWidget {
                         });
                   },
                 ),
-
                 ListTile(
                   title: Text(i18n.settingFontSize),
                   leading: const Icon(Icons.format_size_outlined),
@@ -281,85 +267,75 @@ class SettingPage extends StatelessWidget {
                     logic.toFontSizePage();
                   },
                 ),
-                // ListTile(
-                //   title: Text(i18n.settingFontStyle),
-                //   leading: const Icon(Icons.text_format_outlined),
-                //   trailing: Obx(() {
-                //     return Text(
-                //       switch (state.fontTheme.value) {
-                //         0 => '思源黑体',
-                //         1 => '思源宋体',
-                //         int() => throw UnimplementedError(),
-                //       },
-                //       style: textStyle.bodySmall!.copyWith(
-                //         color: colorScheme.primary,
-                //       ),
-                //     );
-                //   }),
-                //   onTap: () {
-                //     showDialog(
-                //         context: context,
-                //         builder: (context) {
-                //           return Obx(() {
-                //             return SimpleDialog(
-                //               title: Text(i18n.settingFontStyle),
-                //               children: [
-                //                 SimpleDialogOption(
-                //                   child: Row(
-                //                     children: [
-                //                       const Text(
-                //                         '思源黑体',
-                //                         style: TextStyle(
-                //                             fontFamily: 'NotoSans SC', fontFamilyFallback: ['NotoSans SC']),
-                //                       ),
-                //                       const SizedBox(
-                //                         width: 10,
-                //                       ),
-                //                       if (state.fontTheme.value == 0) ...[
-                //                         const Icon(Icons.check),
-                //                       ]
-                //                     ],
-                //                   ),
-                //                   onPressed: () {
-                //                     logic.changeFontTheme(0);
-                //                   },
-                //                 ),
-                //                 SimpleDialogOption(
-                //                   child: Row(
-                //                     children: [
-                //                       const Text(
-                //                         '思源宋体',
-                //                         style: TextStyle(
-                //                             fontFamily: 'NotoSerif SC', fontFamilyFallback: ['NotoSerif SC']),
-                //                       ),
-                //                       const SizedBox(
-                //                         width: 10,
-                //                       ),
-                //                       if (state.fontTheme.value == 1) ...[
-                //                         const Icon(Icons.check),
-                //                       ]
-                //                     ],
-                //                   ),
-                //                   onPressed: () {
-                //                     logic.changeFontTheme(1);
-                //                   },
-                //                 ),
-                //               ],
-                //             );
-                //           });
-                //         });
-                //   },
-                // ),
-                // Obx(() {
-                //   return SwitchListTile(
-                //     value: state.getWeather.value,
-                //     onChanged: (value) {
-                //       logic.weather(value);
-                //     },
-                //     title: Text(i18n.settingWeather),
-                //     secondary: const Icon(Icons.sunny),
-                //   );
-                // }),
+                ListTile(
+                  title: Text(i18n.settingFontStyle),
+                  leading: const Icon(Icons.text_format_outlined),
+                  trailing: Obx(() {
+                    return Text(
+                      switch (state.fontTheme.value) {
+                        0 => '思源黑体',
+                        1 => '思源宋体',
+                        int() => throw UnimplementedError(),
+                      },
+                      style: textStyle.bodySmall!.copyWith(
+                        color: colorScheme.primary,
+                      ),
+                    );
+                  }),
+                  onTap: () {
+                    showDialog(
+                        context: context,
+                        builder: (context) {
+                          return Obx(() {
+                            return SimpleDialog(
+                              title: Text(i18n.settingFontStyle),
+                              children: [
+                                SimpleDialogOption(
+                                  child: Row(
+                                    children: [
+                                      const Text(
+                                        '思源黑体',
+                                        style:
+                                            TextStyle(fontFamily: 'NotoSans SC', fontFamilyFallback: ['NotoSans SC']),
+                                      ),
+                                      const SizedBox(
+                                        width: 10,
+                                      ),
+                                      if (state.fontTheme.value == 0) ...[
+                                        const Icon(Icons.check),
+                                      ]
+                                    ],
+                                  ),
+                                  onPressed: () {
+                                    logic.changeFontTheme(0);
+                                  },
+                                ),
+                                SimpleDialogOption(
+                                  child: Row(
+                                    children: [
+                                      const Text(
+                                        '思源宋体',
+                                        style:
+                                            TextStyle(fontFamily: 'NotoSerif SC', fontFamilyFallback: ['NotoSerif SC']),
+                                      ),
+                                      const SizedBox(
+                                        width: 10,
+                                      ),
+                                      if (state.fontTheme.value == 1) ...[
+                                        const Icon(Icons.check),
+                                      ]
+                                    ],
+                                  ),
+                                  onPressed: () {
+                                    logic.changeFontTheme(1);
+                                  },
+                                ),
+                              ],
+                            );
+                          });
+                        });
+                  },
+                ),
                 ListTile(
                   title: const Text('自定义首页名称'),
                   leading: const Icon(Icons.drive_file_rename_outline),
@@ -417,12 +393,7 @@ class SettingPage extends StatelessWidget {
     Widget buildPrivacy() {
       return Column(
         children: [
-          ListTile(
-            title: Text(
-              i18n.settingPrivacy,
-              style: textStyle.titleLarge!.copyWith(color: colorScheme.primary, fontWeight: FontWeight.bold),
-            ),
-          ),
+          SettingTitleTile(title: i18n.settingPrivacy),
           Card.filled(
             color: colorScheme.surfaceContainerLow,
             child: Column(
@@ -505,12 +476,7 @@ class SettingPage extends StatelessWidget {
     Widget buildMore() {
       return Column(
         children: [
-          ListTile(
-            title: Text(
-              i18n.settingMore,
-              style: textStyle.titleLarge!.copyWith(color: colorScheme.primary, fontWeight: FontWeight.bold),
-            ),
-          ),
+          SettingTitleTile(title: i18n.settingMore),
           Card.filled(
             color: colorScheme.surfaceContainerLow,
             child: Column(
@@ -542,34 +508,28 @@ class SettingPage extends StatelessWidget {
       assignId: true,
       builder: (_) {
         return CustomScrollView(
+          cacheExtent: size.height * 2,
           slivers: [
             SliverAppBar(
               title: Text(i18n.homeNavigatorSetting),
               pinned: true,
             ),
-            SliverPadding(
-              padding: const EdgeInsets.all(4.0),
-              sliver: SliverToBoxAdapter(child: buildDashboard()),
-            ),
-            SliverPadding(
-              padding: const EdgeInsets.all(4.0),
-              sliver: SliverToBoxAdapter(child: buildFeature()),
-            ),
-            SliverPadding(
-              padding: const EdgeInsets.all(4.0),
-              sliver: SliverToBoxAdapter(child: buildData()),
-            ),
-            SliverPadding(
-              padding: const EdgeInsets.all(4.0),
-              sliver: SliverToBoxAdapter(child: buildDisplay()),
-            ),
-            SliverPadding(
-              padding: const EdgeInsets.all(4.0),
-              sliver: SliverToBoxAdapter(child: buildPrivacy()),
-            ),
-            SliverPadding(
-              padding: const EdgeInsets.all(4.0),
-              sliver: SliverToBoxAdapter(child: buildMore()),
+            SliverToBoxAdapter(
+              child: Padding(
+                padding: const EdgeInsets.all(4.0),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.stretch,
+                  spacing: 4.0,
+                  children: [
+                    buildDashboard(),
+                    buildFeature(),
+                    buildData(),
+                    buildDisplay(),
+                    buildPrivacy(),
+                    buildMore(),
+                  ],
+                ),
+              ),
             ),
           ],
         );
diff --git a/lib/router/app_pages.dart b/lib/router/app_pages.dart
index e90e9b8..041ccc5 100644
--- a/lib/router/app_pages.dart
+++ b/lib/router/app_pages.dart
@@ -51,6 +51,7 @@ class AppPages {
     //启动页
     GetPage(
       name: AppRoutes.startPage,
+      transition: Transition.fadeIn,
       page: () => const StartPage(),
       binds: [Bind.lazyPut(() => StartLogic())],
     ),
@@ -58,6 +59,7 @@ class AppPages {
     GetPage(
       name: AppRoutes.homePage,
       page: () => const HomePage(),
+      transition: Transition.fadeIn,
       binds: [
         Bind.lazyPut(() => HomeLogic()),
       ],
@@ -71,12 +73,14 @@ class AppPages {
     //日记页路由
     GetPage(
       name: AppRoutes.diaryPage,
+      transition: Transition.fadeIn,
       page: () => DiaryDetailsPage(),
     ),
     //图片路由
     GetPage(
       name: AppRoutes.photoPage,
       page: () => const ImagePage(),
+      popGesture: false,
       binds: [Bind.lazyPut(() => ImageLogic())],
     ),
     //回收站
@@ -95,6 +99,8 @@ class AppPages {
     GetPage(
       name: AppRoutes.editPage,
       page: () => const EditPage(),
+      popGesture: false,
+      transition: Transition.fadeIn,
       binds: [Bind.lazyPut(() => EditLogic())],
     ),
     //分享页路由
@@ -135,6 +141,7 @@ class AppPages {
     //锁
     GetPage(
       name: AppRoutes.lockPage,
+      transition: Transition.fadeIn,
       page: () => const LockPage(),
       binds: [Bind.lazyPut(() => LockLogic())],
     ),
diff --git a/lib/src/rust/api/compress.dart b/lib/src/rust/api/compress.dart
index 789f1a4..52c1d3c 100644
--- a/lib/src/rust/api/compress.dart
+++ b/lib/src/rust/api/compress.dart
@@ -3,10 +3,9 @@
 
 // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import
 
-import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart';
-
 import '../frb_generated.dart';
 import 'constants.dart';
+import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart';
 
 // These functions are ignored because they are not marked as `pub`: `calculate_target_dimensions`, `load_image`
 
diff --git a/lib/src/rust/api/constants.dart b/lib/src/rust/api/constants.dart
index 8082d4c..f9134e4 100644
--- a/lib/src/rust/api/constants.dart
+++ b/lib/src/rust/api/constants.dart
@@ -3,9 +3,8 @@
 
 // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import
 
-import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart';
-
 import '../frb_generated.dart';
+import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart';
 
 // These function are ignored because they are on traits that is not defined in current crate (put an empty `#[frb]` on it to unignore): `assert_receiver_is_total_eq`, `eq`
 
diff --git a/lib/src/rust/api/kmp.dart b/lib/src/rust/api/kmp.dart
new file mode 100644
index 0000000..c5a907b
--- /dev/null
+++ b/lib/src/rust/api/kmp.dart
@@ -0,0 +1,22 @@
+// This file is automatically generated, so please do not edit it.
+// @generated by `flutter_rust_bridge`@ 2.6.0.
+
+// ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import
+
+import '../frb_generated.dart';
+import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart';
+
+Future<Uint64List> buildPrefixTable({required List<String> pattern}) =>
+    RustLib.instance.api.crateApiKmpBuildPrefixTable(pattern: pattern);
+
+Future<Uint64List> kmpSearch({required String text, required String pattern}) =>
+    RustLib.instance.api.crateApiKmpKmpSearch(text: text, pattern: pattern);
+
+// Rust type: RustOpaqueMoi<flutter_rust_bridge::for_generated::RustAutoOpaqueInner<Kmp>>
+abstract class Kmp implements RustOpaqueInterface {
+  static Future<List<String>> findMatches({required String text, required List<String> patterns}) =>
+      RustLib.instance.api.crateApiKmpKmpFindMatches(text: text, patterns: patterns);
+
+  static Future<String> replaceWithKmp({required String text, required Map<String, String> replacements}) =>
+      RustLib.instance.api.crateApiKmpKmpReplaceWithKmp(text: text, replacements: replacements);
+}
diff --git a/lib/src/rust/frb_generated.dart b/lib/src/rust/frb_generated.dart
index 087667b..467a993 100644
--- a/lib/src/rust/frb_generated.dart
+++ b/lib/src/rust/frb_generated.dart
@@ -3,15 +3,14 @@
 
 // ignore_for_file: unused_import, unused_element, unnecessary_import, duplicate_ignore, invalid_use_of_internal_member, annotate_overrides, non_constant_identifier_names, curly_braces_in_flow_control_structures, prefer_const_literals_to_create_immutables, unused_field
 
-import 'dart:async';
-import 'dart:convert';
-
-import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart';
-
 import 'api/compress.dart';
 import 'api/constants.dart';
+import 'api/kmp.dart';
+import 'dart:async';
+import 'dart:convert';
 import 'frb_generated.dart';
 import 'frb_generated.io.dart' if (dart.library.js_interop) 'frb_generated.web.dart';
+import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart';
 
 /// Main entrypoint of the Rust API
 class RustLib extends BaseEntrypoint<RustLibApi, RustLibApiImpl, RustLibWire> {
@@ -65,7 +64,7 @@ class RustLib extends BaseEntrypoint<RustLibApi, RustLibApiImpl, RustLibWire> {
   String get codegenVersion => '2.6.0';
 
   @override
-  int get rustContentHash => 1782633232;
+  int get rustContentHash => 444186734;
 
   static const kDefaultExternalLibraryLoaderConfig = ExternalLibraryLoaderConfig(
     stem: 'rust_lib_mood_diary',
@@ -78,6 +77,12 @@ abstract class RustLibApi extends BaseApi {
   Future<Uint8List> crateApiCompressImageCompressContain(
       {required String filePath, CompressFormat? compressFormat, int? maxWidth, int? maxHeight, int? quality});
 
+  Future<List<String>> crateApiKmpKmpFindMatches({required String text, required List<String> patterns});
+
+  Future<String> crateApiKmpKmpReplaceWithKmp({required String text, required Map<String, String> replacements});
+
+  Future<Uint64List> crateApiKmpBuildPrefixTable({required List<String> pattern});
+
   Future<Uint8List> crateApiCompressCompress(
       {required DynamicImage img,
       required int dstHeight,
@@ -85,6 +90,8 @@ abstract class RustLibApi extends BaseApi {
       required CompressFormat compressFormat,
       required int quality});
 
+  Future<Uint64List> crateApiKmpKmpSearch({required String text, required String pattern});
+
   RustArcIncrementStrongCountFnType get rust_arc_increment_strong_count_DynamicImage;
 
   RustArcDecrementStrongCountFnType get rust_arc_decrement_strong_count_DynamicImage;
@@ -96,6 +103,12 @@ abstract class RustLibApi extends BaseApi {
   RustArcDecrementStrongCountFnType get rust_arc_decrement_strong_count_ImageCompress;
 
   CrossPlatformFinalizerArg get rust_arc_decrement_strong_count_ImageCompressPtr;
+
+  RustArcIncrementStrongCountFnType get rust_arc_increment_strong_count_Kmp;
+
+  RustArcDecrementStrongCountFnType get rust_arc_decrement_strong_count_Kmp;
+
+  CrossPlatformFinalizerArg get rust_arc_decrement_strong_count_KmpPtr;
 }
 
 class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
@@ -134,6 +147,77 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
         argNames: ["filePath", "compressFormat", "maxWidth", "maxHeight", "quality"],
       );
 
+  @override
+  Future<List<String>> crateApiKmpKmpFindMatches({required String text, required List<String> patterns}) {
+    return handler.executeNormal(NormalTask(
+      callFfi: (port_) {
+        final serializer = SseSerializer(generalizedFrbRustBinding);
+        sse_encode_String(text, serializer);
+        sse_encode_list_String(patterns, serializer);
+        pdeCallFfi(generalizedFrbRustBinding, serializer, funcId: 2, port: port_);
+      },
+      codec: SseCodec(
+        decodeSuccessData: sse_decode_list_String,
+        decodeErrorData: null,
+      ),
+      constMeta: kCrateApiKmpKmpFindMatchesConstMeta,
+      argValues: [text, patterns],
+      apiImpl: this,
+    ));
+  }
+
+  TaskConstMeta get kCrateApiKmpKmpFindMatchesConstMeta => const TaskConstMeta(
+        debugName: "Kmp_find_matches",
+        argNames: ["text", "patterns"],
+      );
+
+  @override
+  Future<String> crateApiKmpKmpReplaceWithKmp({required String text, required Map<String, String> replacements}) {
+    return handler.executeNormal(NormalTask(
+      callFfi: (port_) {
+        final serializer = SseSerializer(generalizedFrbRustBinding);
+        sse_encode_String(text, serializer);
+        sse_encode_Map_String_String(replacements, serializer);
+        pdeCallFfi(generalizedFrbRustBinding, serializer, funcId: 3, port: port_);
+      },
+      codec: SseCodec(
+        decodeSuccessData: sse_decode_String,
+        decodeErrorData: null,
+      ),
+      constMeta: kCrateApiKmpKmpReplaceWithKmpConstMeta,
+      argValues: [text, replacements],
+      apiImpl: this,
+    ));
+  }
+
+  TaskConstMeta get kCrateApiKmpKmpReplaceWithKmpConstMeta => const TaskConstMeta(
+        debugName: "Kmp_replace_with_kmp",
+        argNames: ["text", "replacements"],
+      );
+
+  @override
+  Future<Uint64List> crateApiKmpBuildPrefixTable({required List<String> pattern}) {
+    return handler.executeNormal(NormalTask(
+      callFfi: (port_) {
+        final serializer = SseSerializer(generalizedFrbRustBinding);
+        sse_encode_list_Char(pattern, serializer);
+        pdeCallFfi(generalizedFrbRustBinding, serializer, funcId: 4, port: port_);
+      },
+      codec: SseCodec(
+        decodeSuccessData: sse_decode_list_prim_usize_strict,
+        decodeErrorData: null,
+      ),
+      constMeta: kCrateApiKmpBuildPrefixTableConstMeta,
+      argValues: [pattern],
+      apiImpl: this,
+    ));
+  }
+
+  TaskConstMeta get kCrateApiKmpBuildPrefixTableConstMeta => const TaskConstMeta(
+        debugName: "build_prefix_table",
+        argNames: ["pattern"],
+      );
+
   @override
   Future<Uint8List> crateApiCompressCompress(
       {required DynamicImage img,
@@ -149,7 +233,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
         sse_encode_u_32(dstWidth, serializer);
         sse_encode_compress_format(compressFormat, serializer);
         sse_encode_u_8(quality, serializer);
-        pdeCallFfi(generalizedFrbRustBinding, serializer, funcId: 2, port: port_);
+        pdeCallFfi(generalizedFrbRustBinding, serializer, funcId: 5, port: port_);
       },
       codec: SseCodec(
         decodeSuccessData: sse_decode_list_prim_u_8_strict,
@@ -166,6 +250,30 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
         argNames: ["img", "dstHeight", "dstWidth", "compressFormat", "quality"],
       );
 
+  @override
+  Future<Uint64List> crateApiKmpKmpSearch({required String text, required String pattern}) {
+    return handler.executeNormal(NormalTask(
+      callFfi: (port_) {
+        final serializer = SseSerializer(generalizedFrbRustBinding);
+        sse_encode_String(text, serializer);
+        sse_encode_String(pattern, serializer);
+        pdeCallFfi(generalizedFrbRustBinding, serializer, funcId: 6, port: port_);
+      },
+      codec: SseCodec(
+        decodeSuccessData: sse_decode_list_prim_usize_strict,
+        decodeErrorData: null,
+      ),
+      constMeta: kCrateApiKmpKmpSearchConstMeta,
+      argValues: [text, pattern],
+      apiImpl: this,
+    ));
+  }
+
+  TaskConstMeta get kCrateApiKmpKmpSearchConstMeta => const TaskConstMeta(
+        debugName: "kmp_search",
+        argNames: ["text", "pattern"],
+      );
+
   RustArcIncrementStrongCountFnType get rust_arc_increment_strong_count_DynamicImage =>
       wire.rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerDynamicImage;
 
@@ -178,6 +286,12 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
   RustArcDecrementStrongCountFnType get rust_arc_decrement_strong_count_ImageCompress =>
       wire.rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerImageCompress;
 
+  RustArcIncrementStrongCountFnType get rust_arc_increment_strong_count_Kmp =>
+      wire.rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmp;
+
+  RustArcDecrementStrongCountFnType get rust_arc_decrement_strong_count_Kmp =>
+      wire.rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmp;
+
   @protected
   AnyhowException dco_decode_AnyhowException(dynamic raw) {
     // Codec=Dco (DartCObject based), see doc to use other codecs
@@ -191,6 +305,12 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
     return ImageCompressImpl.frbInternalDcoDecode(raw as List<dynamic>);
   }
 
+  @protected
+  Kmp dco_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmp(dynamic raw) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    return KmpImpl.frbInternalDcoDecode(raw as List<dynamic>);
+  }
+
   @protected
   DynamicImage dco_decode_Auto_Ref_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerDynamicImage(
       dynamic raw) {
@@ -198,6 +318,18 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
     return DynamicImageImpl.frbInternalDcoDecode(raw as List<dynamic>);
   }
 
+  @protected
+  String dco_decode_Char(dynamic raw) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    return String.fromCharCode(raw);
+  }
+
+  @protected
+  Map<String, String> dco_decode_Map_String_String(dynamic raw) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    return Map.fromEntries(dco_decode_list_record_string_string(raw).map((e) => MapEntry(e.$1, e.$2)));
+  }
+
   @protected
   DynamicImage dco_decode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerDynamicImage(dynamic raw) {
     // Codec=Dco (DartCObject based), see doc to use other codecs
@@ -210,6 +342,12 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
     return ImageCompressImpl.frbInternalDcoDecode(raw as List<dynamic>);
   }
 
+  @protected
+  Kmp dco_decode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmp(dynamic raw) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    return KmpImpl.frbInternalDcoDecode(raw as List<dynamic>);
+  }
+
   @protected
   String dco_decode_String(dynamic raw) {
     // Codec=Dco (DartCObject based), see doc to use other codecs
@@ -246,12 +384,36 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
     return raw as int;
   }
 
+  @protected
+  List<String> dco_decode_list_Char(dynamic raw) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    return (raw as List<dynamic>).map(dco_decode_Char).toList();
+  }
+
+  @protected
+  List<String> dco_decode_list_String(dynamic raw) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    return (raw as List<dynamic>).map(dco_decode_String).toList();
+  }
+
   @protected
   Uint8List dco_decode_list_prim_u_8_strict(dynamic raw) {
     // Codec=Dco (DartCObject based), see doc to use other codecs
     return raw as Uint8List;
   }
 
+  @protected
+  Uint64List dco_decode_list_prim_usize_strict(dynamic raw) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    return raw as Uint64List;
+  }
+
+  @protected
+  List<(String, String)> dco_decode_list_record_string_string(dynamic raw) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    return (raw as List<dynamic>).map(dco_decode_record_string_string).toList();
+  }
+
   @protected
   CompressFormat? dco_decode_opt_box_autoadd_compress_format(dynamic raw) {
     // Codec=Dco (DartCObject based), see doc to use other codecs
@@ -270,6 +432,19 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
     return raw == null ? null : dco_decode_box_autoadd_u_8(raw);
   }
 
+  @protected
+  (String, String) dco_decode_record_string_string(dynamic raw) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    final arr = raw as List<dynamic>;
+    if (arr.length != 2) {
+      throw Exception('Expected 2 elements, got ${arr.length}');
+    }
+    return (
+      dco_decode_String(arr[0]),
+      dco_decode_String(arr[1]),
+    );
+  }
+
   @protected
   int dco_decode_u_32(dynamic raw) {
     // Codec=Dco (DartCObject based), see doc to use other codecs
@@ -282,6 +457,12 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
     return raw as int;
   }
 
+  @protected
+  void dco_decode_unit(dynamic raw) {
+    // Codec=Dco (DartCObject based), see doc to use other codecs
+    return;
+  }
+
   @protected
   BigInt dco_decode_usize(dynamic raw) {
     // Codec=Dco (DartCObject based), see doc to use other codecs
@@ -302,6 +483,13 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
     return ImageCompressImpl.frbInternalSseDecode(sse_decode_usize(deserializer), sse_decode_i_32(deserializer));
   }
 
+  @protected
+  Kmp sse_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmp(
+      SseDeserializer deserializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    return KmpImpl.frbInternalSseDecode(sse_decode_usize(deserializer), sse_decode_i_32(deserializer));
+  }
+
   @protected
   DynamicImage sse_decode_Auto_Ref_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerDynamicImage(
       SseDeserializer deserializer) {
@@ -309,6 +497,20 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
     return DynamicImageImpl.frbInternalSseDecode(sse_decode_usize(deserializer), sse_decode_i_32(deserializer));
   }
 
+  @protected
+  String sse_decode_Char(SseDeserializer deserializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    var inner = sse_decode_String(deserializer);
+    return inner;
+  }
+
+  @protected
+  Map<String, String> sse_decode_Map_String_String(SseDeserializer deserializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    var inner = sse_decode_list_record_string_string(deserializer);
+    return Map.fromEntries(inner.map((e) => MapEntry(e.$1, e.$2)));
+  }
+
   @protected
   DynamicImage sse_decode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerDynamicImage(
       SseDeserializer deserializer) {
@@ -323,6 +525,12 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
     return ImageCompressImpl.frbInternalSseDecode(sse_decode_usize(deserializer), sse_decode_i_32(deserializer));
   }
 
+  @protected
+  Kmp sse_decode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmp(SseDeserializer deserializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    return KmpImpl.frbInternalSseDecode(sse_decode_usize(deserializer), sse_decode_i_32(deserializer));
+  }
+
   @protected
   String sse_decode_String(SseDeserializer deserializer) {
     // Codec=Sse (Serialization based), see doc to use other codecs
@@ -361,6 +569,30 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
     return deserializer.buffer.getInt32();
   }
 
+  @protected
+  List<String> sse_decode_list_Char(SseDeserializer deserializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+
+    var len_ = sse_decode_i_32(deserializer);
+    var ans_ = <String>[];
+    for (var idx_ = 0; idx_ < len_; ++idx_) {
+      ans_.add(sse_decode_Char(deserializer));
+    }
+    return ans_;
+  }
+
+  @protected
+  List<String> sse_decode_list_String(SseDeserializer deserializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+
+    var len_ = sse_decode_i_32(deserializer);
+    var ans_ = <String>[];
+    for (var idx_ = 0; idx_ < len_; ++idx_) {
+      ans_.add(sse_decode_String(deserializer));
+    }
+    return ans_;
+  }
+
   @protected
   Uint8List sse_decode_list_prim_u_8_strict(SseDeserializer deserializer) {
     // Codec=Sse (Serialization based), see doc to use other codecs
@@ -368,6 +600,25 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
     return deserializer.buffer.getUint8List(len_);
   }
 
+  @protected
+  Uint64List sse_decode_list_prim_usize_strict(SseDeserializer deserializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    var len_ = sse_decode_i_32(deserializer);
+    return deserializer.buffer.getUint64List(len_);
+  }
+
+  @protected
+  List<(String, String)> sse_decode_list_record_string_string(SseDeserializer deserializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+
+    var len_ = sse_decode_i_32(deserializer);
+    var ans_ = <(String, String)>[];
+    for (var idx_ = 0; idx_ < len_; ++idx_) {
+      ans_.add(sse_decode_record_string_string(deserializer));
+    }
+    return ans_;
+  }
+
   @protected
   CompressFormat? sse_decode_opt_box_autoadd_compress_format(SseDeserializer deserializer) {
     // Codec=Sse (Serialization based), see doc to use other codecs
@@ -401,6 +652,14 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
     }
   }
 
+  @protected
+  (String, String) sse_decode_record_string_string(SseDeserializer deserializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    var var_field0 = sse_decode_String(deserializer);
+    var var_field1 = sse_decode_String(deserializer);
+    return (var_field0, var_field1);
+  }
+
   @protected
   int sse_decode_u_32(SseDeserializer deserializer) {
     // Codec=Sse (Serialization based), see doc to use other codecs
@@ -413,6 +672,11 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
     return deserializer.buffer.getUint8();
   }
 
+  @protected
+  void sse_decode_unit(SseDeserializer deserializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+  }
+
   @protected
   BigInt sse_decode_usize(SseDeserializer deserializer) {
     // Codec=Sse (Serialization based), see doc to use other codecs
@@ -438,6 +702,13 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
     sse_encode_usize((self as ImageCompressImpl).frbInternalSseEncode(move: true), serializer);
   }
 
+  @protected
+  void sse_encode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmp(
+      Kmp self, SseSerializer serializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    sse_encode_usize((self as KmpImpl).frbInternalSseEncode(move: true), serializer);
+  }
+
   @protected
   void sse_encode_Auto_Ref_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerDynamicImage(
       DynamicImage self, SseSerializer serializer) {
@@ -445,6 +716,18 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
     sse_encode_usize((self as DynamicImageImpl).frbInternalSseEncode(move: false), serializer);
   }
 
+  @protected
+  void sse_encode_Char(String self, SseSerializer serializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    sse_encode_String(self, serializer);
+  }
+
+  @protected
+  void sse_encode_Map_String_String(Map<String, String> self, SseSerializer serializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    sse_encode_list_record_string_string(self.entries.map((e) => (e.key, e.value)).toList(), serializer);
+  }
+
   @protected
   void sse_encode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerDynamicImage(
       DynamicImage self, SseSerializer serializer) {
@@ -459,6 +742,13 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
     sse_encode_usize((self as ImageCompressImpl).frbInternalSseEncode(move: null), serializer);
   }
 
+  @protected
+  void sse_encode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmp(
+      Kmp self, SseSerializer serializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    sse_encode_usize((self as KmpImpl).frbInternalSseEncode(move: null), serializer);
+  }
+
   @protected
   void sse_encode_String(String self, SseSerializer serializer) {
     // Codec=Sse (Serialization based), see doc to use other codecs
@@ -495,6 +785,24 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
     serializer.buffer.putInt32(self);
   }
 
+  @protected
+  void sse_encode_list_Char(List<String> self, SseSerializer serializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    sse_encode_i_32(self.length, serializer);
+    for (final item in self) {
+      sse_encode_Char(item, serializer);
+    }
+  }
+
+  @protected
+  void sse_encode_list_String(List<String> self, SseSerializer serializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    sse_encode_i_32(self.length, serializer);
+    for (final item in self) {
+      sse_encode_String(item, serializer);
+    }
+  }
+
   @protected
   void sse_encode_list_prim_u_8_strict(Uint8List self, SseSerializer serializer) {
     // Codec=Sse (Serialization based), see doc to use other codecs
@@ -502,6 +810,22 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
     serializer.buffer.putUint8List(self);
   }
 
+  @protected
+  void sse_encode_list_prim_usize_strict(Uint64List self, SseSerializer serializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    sse_encode_i_32(self.length, serializer);
+    serializer.buffer.putUint64List(self);
+  }
+
+  @protected
+  void sse_encode_list_record_string_string(List<(String, String)> self, SseSerializer serializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    sse_encode_i_32(self.length, serializer);
+    for (final item in self) {
+      sse_encode_record_string_string(item, serializer);
+    }
+  }
+
   @protected
   void sse_encode_opt_box_autoadd_compress_format(CompressFormat? self, SseSerializer serializer) {
     // Codec=Sse (Serialization based), see doc to use other codecs
@@ -532,6 +856,13 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
     }
   }
 
+  @protected
+  void sse_encode_record_string_string((String, String) self, SseSerializer serializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    sse_encode_String(self.$1, serializer);
+    sse_encode_String(self.$2, serializer);
+  }
+
   @protected
   void sse_encode_u_32(int self, SseSerializer serializer) {
     // Codec=Sse (Serialization based), see doc to use other codecs
@@ -544,6 +875,11 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
     serializer.buffer.putUint8(self);
   }
 
+  @protected
+  void sse_encode_unit(void self, SseSerializer serializer) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+  }
+
   @protected
   void sse_encode_usize(BigInt self, SseSerializer serializer) {
     // Codec=Sse (Serialization based), see doc to use other codecs
@@ -588,3 +924,19 @@ class ImageCompressImpl extends RustOpaque implements ImageCompress {
     rustArcDecrementStrongCountPtr: RustLib.instance.api.rust_arc_decrement_strong_count_ImageCompressPtr,
   );
 }
+
+@sealed
+class KmpImpl extends RustOpaque implements Kmp {
+  // Not to be used by end users
+  KmpImpl.frbInternalDcoDecode(List<dynamic> wire) : super.frbInternalDcoDecode(wire, _kStaticData);
+
+  // Not to be used by end users
+  KmpImpl.frbInternalSseDecode(BigInt ptr, int externalSizeOnNative)
+      : super.frbInternalSseDecode(ptr, externalSizeOnNative, _kStaticData);
+
+  static final _kStaticData = RustArcStaticData(
+    rustArcIncrementStrongCount: RustLib.instance.api.rust_arc_increment_strong_count_Kmp,
+    rustArcDecrementStrongCount: RustLib.instance.api.rust_arc_decrement_strong_count_Kmp,
+    rustArcDecrementStrongCountPtr: RustLib.instance.api.rust_arc_decrement_strong_count_KmpPtr,
+  );
+}
diff --git a/lib/src/rust/frb_generated.io.dart b/lib/src/rust/frb_generated.io.dart
index 649d2f6..e4c2bbe 100644
--- a/lib/src/rust/frb_generated.io.dart
+++ b/lib/src/rust/frb_generated.io.dart
@@ -3,15 +3,14 @@
 
 // ignore_for_file: unused_import, unused_element, unnecessary_import, duplicate_ignore, invalid_use_of_internal_member, annotate_overrides, non_constant_identifier_names, curly_braces_in_flow_control_structures, prefer_const_literals_to_create_immutables, unused_field
 
+import 'api/compress.dart';
+import 'api/constants.dart';
+import 'api/kmp.dart';
 import 'dart:async';
 import 'dart:convert';
 import 'dart:ffi' as ffi;
-
-import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated_io.dart';
-
-import 'api/compress.dart';
-import 'api/constants.dart';
 import 'frb_generated.dart';
+import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated_io.dart';
 
 abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   RustLibApiImplPlatform({
@@ -27,6 +26,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   CrossPlatformFinalizerArg get rust_arc_decrement_strong_count_ImageCompressPtr => wire
       ._rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerImageCompressPtr;
 
+  CrossPlatformFinalizerArg get rust_arc_decrement_strong_count_KmpPtr =>
+      wire._rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmpPtr;
+
   @protected
   AnyhowException dco_decode_AnyhowException(dynamic raw);
 
@@ -34,16 +36,28 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   ImageCompress dco_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerImageCompress(
       dynamic raw);
 
+  @protected
+  Kmp dco_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmp(dynamic raw);
+
   @protected
   DynamicImage dco_decode_Auto_Ref_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerDynamicImage(
       dynamic raw);
 
+  @protected
+  String dco_decode_Char(dynamic raw);
+
+  @protected
+  Map<String, String> dco_decode_Map_String_String(dynamic raw);
+
   @protected
   DynamicImage dco_decode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerDynamicImage(dynamic raw);
 
   @protected
   ImageCompress dco_decode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerImageCompress(dynamic raw);
 
+  @protected
+  Kmp dco_decode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmp(dynamic raw);
+
   @protected
   String dco_decode_String(dynamic raw);
 
@@ -62,9 +76,21 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   int dco_decode_i_32(dynamic raw);
 
+  @protected
+  List<String> dco_decode_list_Char(dynamic raw);
+
+  @protected
+  List<String> dco_decode_list_String(dynamic raw);
+
   @protected
   Uint8List dco_decode_list_prim_u_8_strict(dynamic raw);
 
+  @protected
+  Uint64List dco_decode_list_prim_usize_strict(dynamic raw);
+
+  @protected
+  List<(String, String)> dco_decode_list_record_string_string(dynamic raw);
+
   @protected
   CompressFormat? dco_decode_opt_box_autoadd_compress_format(dynamic raw);
 
@@ -74,12 +100,18 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   int? dco_decode_opt_box_autoadd_u_8(dynamic raw);
 
+  @protected
+  (String, String) dco_decode_record_string_string(dynamic raw);
+
   @protected
   int dco_decode_u_32(dynamic raw);
 
   @protected
   int dco_decode_u_8(dynamic raw);
 
+  @protected
+  void dco_decode_unit(dynamic raw);
+
   @protected
   BigInt dco_decode_usize(dynamic raw);
 
@@ -90,10 +122,20 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   ImageCompress sse_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerImageCompress(
       SseDeserializer deserializer);
 
+  @protected
+  Kmp sse_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmp(
+      SseDeserializer deserializer);
+
   @protected
   DynamicImage sse_decode_Auto_Ref_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerDynamicImage(
       SseDeserializer deserializer);
 
+  @protected
+  String sse_decode_Char(SseDeserializer deserializer);
+
+  @protected
+  Map<String, String> sse_decode_Map_String_String(SseDeserializer deserializer);
+
   @protected
   DynamicImage sse_decode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerDynamicImage(
       SseDeserializer deserializer);
@@ -102,6 +144,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   ImageCompress sse_decode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerImageCompress(
       SseDeserializer deserializer);
 
+  @protected
+  Kmp sse_decode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmp(SseDeserializer deserializer);
+
   @protected
   String sse_decode_String(SseDeserializer deserializer);
 
@@ -120,9 +165,21 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   int sse_decode_i_32(SseDeserializer deserializer);
 
+  @protected
+  List<String> sse_decode_list_Char(SseDeserializer deserializer);
+
+  @protected
+  List<String> sse_decode_list_String(SseDeserializer deserializer);
+
   @protected
   Uint8List sse_decode_list_prim_u_8_strict(SseDeserializer deserializer);
 
+  @protected
+  Uint64List sse_decode_list_prim_usize_strict(SseDeserializer deserializer);
+
+  @protected
+  List<(String, String)> sse_decode_list_record_string_string(SseDeserializer deserializer);
+
   @protected
   CompressFormat? sse_decode_opt_box_autoadd_compress_format(SseDeserializer deserializer);
 
@@ -132,12 +189,18 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   int? sse_decode_opt_box_autoadd_u_8(SseDeserializer deserializer);
 
+  @protected
+  (String, String) sse_decode_record_string_string(SseDeserializer deserializer);
+
   @protected
   int sse_decode_u_32(SseDeserializer deserializer);
 
   @protected
   int sse_decode_u_8(SseDeserializer deserializer);
 
+  @protected
+  void sse_decode_unit(SseDeserializer deserializer);
+
   @protected
   BigInt sse_decode_usize(SseDeserializer deserializer);
 
@@ -151,10 +214,20 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   void sse_encode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerImageCompress(
       ImageCompress self, SseSerializer serializer);
 
+  @protected
+  void sse_encode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmp(
+      Kmp self, SseSerializer serializer);
+
   @protected
   void sse_encode_Auto_Ref_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerDynamicImage(
       DynamicImage self, SseSerializer serializer);
 
+  @protected
+  void sse_encode_Char(String self, SseSerializer serializer);
+
+  @protected
+  void sse_encode_Map_String_String(Map<String, String> self, SseSerializer serializer);
+
   @protected
   void sse_encode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerDynamicImage(
       DynamicImage self, SseSerializer serializer);
@@ -163,6 +236,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   void sse_encode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerImageCompress(
       ImageCompress self, SseSerializer serializer);
 
+  @protected
+  void sse_encode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmp(Kmp self, SseSerializer serializer);
+
   @protected
   void sse_encode_String(String self, SseSerializer serializer);
 
@@ -181,9 +257,21 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   void sse_encode_i_32(int self, SseSerializer serializer);
 
+  @protected
+  void sse_encode_list_Char(List<String> self, SseSerializer serializer);
+
+  @protected
+  void sse_encode_list_String(List<String> self, SseSerializer serializer);
+
   @protected
   void sse_encode_list_prim_u_8_strict(Uint8List self, SseSerializer serializer);
 
+  @protected
+  void sse_encode_list_prim_usize_strict(Uint64List self, SseSerializer serializer);
+
+  @protected
+  void sse_encode_list_record_string_string(List<(String, String)> self, SseSerializer serializer);
+
   @protected
   void sse_encode_opt_box_autoadd_compress_format(CompressFormat? self, SseSerializer serializer);
 
@@ -193,12 +281,18 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   void sse_encode_opt_box_autoadd_u_8(int? self, SseSerializer serializer);
 
+  @protected
+  void sse_encode_record_string_string((String, String) self, SseSerializer serializer);
+
   @protected
   void sse_encode_u_32(int self, SseSerializer serializer);
 
   @protected
   void sse_encode_u_8(int self, SseSerializer serializer);
 
+  @protected
+  void sse_encode_unit(void self, SseSerializer serializer);
+
   @protected
   void sse_encode_usize(BigInt self, SseSerializer serializer);
 
@@ -276,4 +370,34 @@ class RustLibWire implements BaseWire {
   late final _rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerImageCompress =
       _rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerImageCompressPtr
           .asFunction<void Function(ffi.Pointer<ffi.Void>)>();
+
+  void rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmp(
+    ffi.Pointer<ffi.Void> ptr,
+  ) {
+    return _rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmp(
+      ptr,
+    );
+  }
+
+  late final _rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmpPtr =
+      _lookup<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void>)>>(
+          'frbgen_mood_diary_rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmp');
+  late final _rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmp =
+      _rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmpPtr
+          .asFunction<void Function(ffi.Pointer<ffi.Void>)>();
+
+  void rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmp(
+    ffi.Pointer<ffi.Void> ptr,
+  ) {
+    return _rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmp(
+      ptr,
+    );
+  }
+
+  late final _rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmpPtr =
+      _lookup<ffi.NativeFunction<ffi.Void Function(ffi.Pointer<ffi.Void>)>>(
+          'frbgen_mood_diary_rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmp');
+  late final _rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmp =
+      _rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmpPtr
+          .asFunction<void Function(ffi.Pointer<ffi.Void>)>();
 }
diff --git a/lib/src/rust/frb_generated.web.dart b/lib/src/rust/frb_generated.web.dart
index 2cfda93..9d8451b 100644
--- a/lib/src/rust/frb_generated.web.dart
+++ b/lib/src/rust/frb_generated.web.dart
@@ -6,14 +6,13 @@
 // Static analysis wrongly picks the IO variant, thus ignore this
 // ignore_for_file: argument_type_not_assignable
 
-import 'dart:async';
-import 'dart:convert';
-
-import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated_web.dart';
-
 import 'api/compress.dart';
 import 'api/constants.dart';
+import 'api/kmp.dart';
+import 'dart:async';
+import 'dart:convert';
 import 'frb_generated.dart';
+import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated_web.dart';
 
 abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   RustLibApiImplPlatform({
@@ -29,6 +28,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   CrossPlatformFinalizerArg get rust_arc_decrement_strong_count_ImageCompressPtr =>
       wire.rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerImageCompress;
 
+  CrossPlatformFinalizerArg get rust_arc_decrement_strong_count_KmpPtr =>
+      wire.rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmp;
+
   @protected
   AnyhowException dco_decode_AnyhowException(dynamic raw);
 
@@ -36,16 +38,28 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   ImageCompress dco_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerImageCompress(
       dynamic raw);
 
+  @protected
+  Kmp dco_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmp(dynamic raw);
+
   @protected
   DynamicImage dco_decode_Auto_Ref_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerDynamicImage(
       dynamic raw);
 
+  @protected
+  String dco_decode_Char(dynamic raw);
+
+  @protected
+  Map<String, String> dco_decode_Map_String_String(dynamic raw);
+
   @protected
   DynamicImage dco_decode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerDynamicImage(dynamic raw);
 
   @protected
   ImageCompress dco_decode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerImageCompress(dynamic raw);
 
+  @protected
+  Kmp dco_decode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmp(dynamic raw);
+
   @protected
   String dco_decode_String(dynamic raw);
 
@@ -64,9 +78,21 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   int dco_decode_i_32(dynamic raw);
 
+  @protected
+  List<String> dco_decode_list_Char(dynamic raw);
+
+  @protected
+  List<String> dco_decode_list_String(dynamic raw);
+
   @protected
   Uint8List dco_decode_list_prim_u_8_strict(dynamic raw);
 
+  @protected
+  Uint64List dco_decode_list_prim_usize_strict(dynamic raw);
+
+  @protected
+  List<(String, String)> dco_decode_list_record_string_string(dynamic raw);
+
   @protected
   CompressFormat? dco_decode_opt_box_autoadd_compress_format(dynamic raw);
 
@@ -76,12 +102,18 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   int? dco_decode_opt_box_autoadd_u_8(dynamic raw);
 
+  @protected
+  (String, String) dco_decode_record_string_string(dynamic raw);
+
   @protected
   int dco_decode_u_32(dynamic raw);
 
   @protected
   int dco_decode_u_8(dynamic raw);
 
+  @protected
+  void dco_decode_unit(dynamic raw);
+
   @protected
   BigInt dco_decode_usize(dynamic raw);
 
@@ -92,10 +124,20 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   ImageCompress sse_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerImageCompress(
       SseDeserializer deserializer);
 
+  @protected
+  Kmp sse_decode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmp(
+      SseDeserializer deserializer);
+
   @protected
   DynamicImage sse_decode_Auto_Ref_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerDynamicImage(
       SseDeserializer deserializer);
 
+  @protected
+  String sse_decode_Char(SseDeserializer deserializer);
+
+  @protected
+  Map<String, String> sse_decode_Map_String_String(SseDeserializer deserializer);
+
   @protected
   DynamicImage sse_decode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerDynamicImage(
       SseDeserializer deserializer);
@@ -104,6 +146,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   ImageCompress sse_decode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerImageCompress(
       SseDeserializer deserializer);
 
+  @protected
+  Kmp sse_decode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmp(SseDeserializer deserializer);
+
   @protected
   String sse_decode_String(SseDeserializer deserializer);
 
@@ -122,9 +167,21 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   int sse_decode_i_32(SseDeserializer deserializer);
 
+  @protected
+  List<String> sse_decode_list_Char(SseDeserializer deserializer);
+
+  @protected
+  List<String> sse_decode_list_String(SseDeserializer deserializer);
+
   @protected
   Uint8List sse_decode_list_prim_u_8_strict(SseDeserializer deserializer);
 
+  @protected
+  Uint64List sse_decode_list_prim_usize_strict(SseDeserializer deserializer);
+
+  @protected
+  List<(String, String)> sse_decode_list_record_string_string(SseDeserializer deserializer);
+
   @protected
   CompressFormat? sse_decode_opt_box_autoadd_compress_format(SseDeserializer deserializer);
 
@@ -134,12 +191,18 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   int? sse_decode_opt_box_autoadd_u_8(SseDeserializer deserializer);
 
+  @protected
+  (String, String) sse_decode_record_string_string(SseDeserializer deserializer);
+
   @protected
   int sse_decode_u_32(SseDeserializer deserializer);
 
   @protected
   int sse_decode_u_8(SseDeserializer deserializer);
 
+  @protected
+  void sse_decode_unit(SseDeserializer deserializer);
+
   @protected
   BigInt sse_decode_usize(SseDeserializer deserializer);
 
@@ -153,10 +216,20 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   void sse_encode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerImageCompress(
       ImageCompress self, SseSerializer serializer);
 
+  @protected
+  void sse_encode_Auto_Owned_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmp(
+      Kmp self, SseSerializer serializer);
+
   @protected
   void sse_encode_Auto_Ref_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerDynamicImage(
       DynamicImage self, SseSerializer serializer);
 
+  @protected
+  void sse_encode_Char(String self, SseSerializer serializer);
+
+  @protected
+  void sse_encode_Map_String_String(Map<String, String> self, SseSerializer serializer);
+
   @protected
   void sse_encode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerDynamicImage(
       DynamicImage self, SseSerializer serializer);
@@ -165,6 +238,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   void sse_encode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerImageCompress(
       ImageCompress self, SseSerializer serializer);
 
+  @protected
+  void sse_encode_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmp(Kmp self, SseSerializer serializer);
+
   @protected
   void sse_encode_String(String self, SseSerializer serializer);
 
@@ -183,9 +259,21 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   void sse_encode_i_32(int self, SseSerializer serializer);
 
+  @protected
+  void sse_encode_list_Char(List<String> self, SseSerializer serializer);
+
+  @protected
+  void sse_encode_list_String(List<String> self, SseSerializer serializer);
+
   @protected
   void sse_encode_list_prim_u_8_strict(Uint8List self, SseSerializer serializer);
 
+  @protected
+  void sse_encode_list_prim_usize_strict(Uint64List self, SseSerializer serializer);
+
+  @protected
+  void sse_encode_list_record_string_string(List<(String, String)> self, SseSerializer serializer);
+
   @protected
   void sse_encode_opt_box_autoadd_compress_format(CompressFormat? self, SseSerializer serializer);
 
@@ -195,12 +283,18 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   @protected
   void sse_encode_opt_box_autoadd_u_8(int? self, SseSerializer serializer);
 
+  @protected
+  void sse_encode_record_string_string((String, String) self, SseSerializer serializer);
+
   @protected
   void sse_encode_u_32(int self, SseSerializer serializer);
 
   @protected
   void sse_encode_u_8(int self, SseSerializer serializer);
 
+  @protected
+  void sse_encode_unit(void self, SseSerializer serializer);
+
   @protected
   void sse_encode_usize(BigInt self, SseSerializer serializer);
 
@@ -236,6 +330,12 @@ class RustLibWire implements BaseWire {
       wasmModule
           .rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerImageCompress(
               ptr);
+
+  void rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmp(int ptr) =>
+      wasmModule.rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmp(ptr);
+
+  void rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmp(int ptr) =>
+      wasmModule.rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmp(ptr);
 }
 
 @JS('wasm_bindgen')
@@ -259,4 +359,10 @@ extension type RustLibWasmModule._(JSObject _) implements JSObject {
   external void
       rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerImageCompress(
           int ptr);
+
+  external void rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmp(
+      int ptr);
+
+  external void rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmp(
+      int ptr);
 }
diff --git a/lib/utils/data/isar.dart b/lib/utils/data/isar.dart
index 0faa7c6..3fc3027 100644
--- a/lib/utils/data/isar.dart
+++ b/lib/utils/data/isar.dart
@@ -3,6 +3,7 @@ import 'package:latlong2/latlong.dart';
 import 'package:mood_diary/common/models/isar/category.dart';
 import 'package:mood_diary/common/models/isar/diary.dart';
 import 'package:mood_diary/common/models/map.dart';
+import 'package:mood_diary/common/values/diary_type.dart';
 import 'package:mood_diary/utils/utils.dart';
 import 'package:path/path.dart';
 import 'package:uuid/uuid.dart';
@@ -234,12 +235,14 @@ class IsarUtil {
     return await _isar.diarys.where().findAllAsync(offset: offset, limit: limit);
   }
 
+  /// 2.4.8 版本变更
+  /// 新增字段
+  /// 1.position 用于记录位置
   void mergeToV2_4_8(String dir) {
     var isar = Isar.open(
       schemas: [DiarySchema, CategorySchema],
       directory: dir,
     );
-    // 如果当前数据库版本小雨
     final countDiary = isar.diarys.where().count();
     for (var i = 0; i < countDiary; i += 50) {
       var diaries = isar.diarys.where().findAll(offset: i, limit: 50);
@@ -250,6 +253,32 @@ class IsarUtil {
     isar.close();
   }
 
+  /// 2.6.0 版本变更
+  /// 新增字段
+  /// 1.type 类型字段，用于表示是纯文本还是富文本
+  /// 变更
+  void mergeToV2_6_0(String dir) {
+    var isar = Isar.open(
+      schemas: [DiarySchema, CategorySchema],
+      directory: dir,
+    );
+    final countDiary = isar.diarys.where().count();
+    for (var i = 0; i < countDiary; i += 50) {
+      var diaries = isar.diarys.where().findAll(offset: i, limit: 50);
+      isar.write((isar) {
+        for (var diary in diaries) {
+          if (diary.type == null) {
+            diary.type = DiaryType.richText.value;
+            isar.diarys.put(diary);
+          }
+          diary.lastModified = diary.time;
+          isar.diarys.put(diary);
+        }
+      });
+    }
+    isar.close();
+  }
+
   // 获取用于地图显示的对象
   Future<List<DiaryMapItem>> getAllMapItem() async {
     List<DiaryMapItem> res = [];
diff --git a/lib/utils/data/pref.dart b/lib/utils/data/pref.dart
index 99fd62a..ee1a30a 100644
--- a/lib/utils/data/pref.dart
+++ b/lib/utils/data/pref.dart
@@ -66,7 +66,19 @@ class PrefUtil {
     //首页视图模式
     'homeViewMode',
     //自动获取天气
-    'autoWeather'
+    'autoWeather',
+    //webdav配置
+    'webDavOption',
+    // 日记展示头图
+    'diaryHeader',
+    // 首行缩进
+    'firstLineIndent',
+    // 自动设置分类
+    'autoCategory',
+    // 展示写作时长
+    'showWritingTime',
+    // 展示字数统计
+    'showWordCount',
   };
 
   Future<void> initPref() async {
@@ -86,6 +98,11 @@ class PrefUtil {
     if (appVersion != null && appVersion.split('+')[0].compareTo('2.4.8') < 0) {
       await compute(Utils().isarUtil.mergeToV2_4_8, Utils().fileUtil.getRealPath('database', ''));
     }
+
+    /// v2.6.0
+    if (appVersion != null && appVersion.split('+')[0].compareTo('2.6.0') < 0) {
+      await compute(Utils().isarUtil.mergeToV2_6_0, Utils().fileUtil.getRealPath('database', ''));
+    }
     // 如果是首次启动或版本不一致
     if (kDebugMode || firstStart || appVersion == null || appVersion != currentVersion) {
       await _prefs.setString('appVersion', currentVersion);
@@ -134,6 +151,12 @@ class PrefUtil {
     await _prefs.setString('customTitleName', _prefs.getString('customTitleName') ?? '');
     await _prefs.setInt('homeViewMode', _prefs.getInt('homeViewMode') ?? ViewModeType.list.number);
     await _prefs.setBool('autoWeather', _prefs.getBool('autoWeather') ?? false);
+    await _prefs.setStringList('webDavOption', _prefs.getStringList('webDavOption') ?? []);
+    await _prefs.setBool('diaryHeader', _prefs.getBool('diaryHeader') ?? true);
+    await _prefs.setBool('firstLineIndent', _prefs.getBool('firstLineIndent') ?? false);
+    await _prefs.setBool('autoCategory', _prefs.getBool('autoCategory') ?? false);
+    await _prefs.setBool('showWritingTime', _prefs.getBool('showWritingTime') ?? true);
+    await _prefs.setBool('showWordCount', _prefs.getBool('showWordCount') ?? true);
   }
 
   Future<void> setValue<T>(String key, T value) async {
diff --git a/lib/utils/file_util.dart b/lib/utils/file_util.dart
index 23f6279..41d76b7 100644
--- a/lib/utils/file_util.dart
+++ b/lib/utils/file_util.dart
@@ -184,7 +184,6 @@ class FileUtil {
   }
 
   String getCachePath(String fileName) {
-    Utils().logUtil.printInfo(join(_cachePath, fileName));
     return join(_cachePath, fileName);
   }
 
diff --git a/lib/utils/media_util.dart b/lib/utils/media_util.dart
index f220870..f25d8ea 100644
--- a/lib/utils/media_util.dart
+++ b/lib/utils/media_util.dart
@@ -3,7 +3,11 @@ import 'dart:io';
 
 import 'package:fc_native_video_thumbnail/fc_native_video_thumbnail.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_image_compress/flutter_image_compress.dart';
 import 'package:image_picker/image_picker.dart';
+import 'package:image_picker_android/image_picker_android.dart';
+import 'package:image_picker_platform_interface/image_picker_platform_interface.dart';
+import 'package:mime/mime.dart';
 import 'package:mood_diary/src/rust/api/compress.dart';
 import 'package:mood_diary/utils/utils.dart';
 import 'package:uuid/uuid.dart';
@@ -15,43 +19,85 @@ class MediaUtil {
 
   late final _thumbnail = FcNativeVideoThumbnail();
 
-  // 保存图片
-  Future<List<String>> saveImages({required List<XFile> imageFileList}) async {
-    List<String> nameList = [];
-    for (var imageFile in imageFileList) {
-      //生成新的名字
-      var imageName = 'image-${const Uuid().v7()}.png';
-      nameList.add(imageName);
-      await _compressRust(imageFile, Utils().fileUtil.getRealPath('image', imageName), r_type.CompressFormat.png);
-      //await _compressAndSaveImage(imageFile, Utils().fileUtil.getRealPath('image', imageName), CompressFormat.png);
+  MediaUtil() {
+    final ImagePickerPlatform imagePickerImplementation = ImagePickerPlatform.instance;
+    if (imagePickerImplementation is ImagePickerAndroid) {
+      imagePickerImplementation.useAndroidPhotoPicker = true;
     }
-    return nameList;
   }
 
-  // 保存录音
-  Future<void> saveAudio(List<String> audioName) async {
-    for (var name in audioName) {
+  // 定义 MIME 类型到扩展名和压缩格式的映射
+  final _compressConfig = {
+    'image/jpeg': ['.jpg', r_type.CompressFormat.jpeg],
+    'image/png': ['.png', r_type.CompressFormat.png],
+    'image/heic': ['.heic', CompressFormat.heic],
+    'image/webp': ['.webp', r_type.CompressFormat.webP],
+  };
+
+  /// 保存图片
+  /// 返回值：
+  /// key：XFile 文件的临时目录
+  /// value：实际的文件名
+  Future<Map<String, String>> saveImages({required List<XFile> imageFileList}) async {
+    final imageNameMap = <String, String>{};
+    await Future.wait(imageFileList.map((imageFile) async {
+      final mimeType = lookupMimeType(imageFile.path) ?? 'image/png'; // 默认使用 PNG
+      final config = _compressConfig[mimeType] ?? ['.png', r_type.CompressFormat.png];
+      final extension = config[0] as String;
+      final format = config[1];
+      final imageName = 'image-${const Uuid().v7()}$extension';
+      final outputPath = Utils().fileUtil.getRealPath('image', imageName);
+      await _compressImage(imageFile, outputPath, format);
+      imageNameMap[imageFile.path] = imageName;
+    }));
+
+    return imageNameMap;
+  }
+
+  /// 保存音频
+  /// 返回值：
+  /// key：缓存目录的路径
+  /// value：实际的文件名
+  Future<Map<String, String>> saveAudio(List<String> audioNames) async {
+    final audioNameMap = <String, String>{};
+    await Future.wait(audioNames.map((name) async {
       final file = File(Utils().fileUtil.getCachePath(name));
-      await file.copy(Utils().fileUtil.getRealPath('audio', name));
-    }
+      final targetPath = Utils().fileUtil.getRealPath('audio', name);
+      audioNameMap[file.path] = name;
+      await file.copy(targetPath);
+    }));
+    return audioNameMap;
   }
 
-  // 保存视频
-  Future<List<String>> saveVideo(
-      {required List<XFile> videoFileList, required List<XFile> videoThumbnailFileList}) async {
-    List<String> nameList = [];
-    for (var i = 0; i < videoFileList.length; ++i) {
+  /// 保存视频
+  /// 返回值：
+  /// key：XFile 文件的临时目录
+  /// value：实际的文件名
+  Future<Map<String, String>> saveVideo({required List<XFile> videoFileList}) async {
+    Map<String, String> videoNameMap = {};
+
+    await Future.wait(videoFileList.map((videoFile) async {
       // 生成文件名
       final uuid = const Uuid().v7();
       var videoName = 'video-$uuid.mp4';
-      nameList.add(videoName);
-      await videoFileList[i].saveTo(Utils().fileUtil.getRealPath('video', videoName));
+      videoNameMap[videoFile.path] = videoName;
+      // 保存视频文件
+      await videoFile.saveTo(Utils().fileUtil.getRealPath('video', videoName));
+      // 获取缩略图
+      var tempThumbnailPath = Utils().fileUtil.getCachePath('${const Uuid().v7()}.jpeg');
+      await Utils().mediaUtil.getVideoThumbnail(videoFile, tempThumbnailPath);
+      // 压缩缩略图并保存
+      var compressedPath = Utils().fileUtil.getRealPath('thumbnail', videoName);
       await _compressRust(
-          videoThumbnailFileList[i], Utils().fileUtil.getRealPath('thumbnail', videoName), r_type.CompressFormat.jpeg);
-      // await _compressAndSaveImage(
-      //     videoThumbnailFileList[i], Utils().fileUtil.getRealPath('thumbnail', videoName), CompressFormat.jpeg);
-    }
-    return nameList;
+        XFile(tempThumbnailPath),
+        compressedPath,
+        r_type.CompressFormat.jpeg,
+      );
+      // 清理临时文件
+      await File(tempThumbnailPath).delete();
+    }));
+
+    return videoNameMap;
   }
 
   //获取图片宽高
@@ -111,6 +157,19 @@ class MediaUtil {
     return await _picker.pickMultiImage(limit: limit);
   }
 
+  // 通用压缩逻辑
+  Future<void> _compressImage(
+    XFile imageFile,
+    String outputPath,
+    dynamic format,
+  ) async {
+    if (format == CompressFormat.heic) {
+      await _compressNative(imageFile, outputPath, format);
+    } else {
+      await _compressRust(imageFile, outputPath, format);
+    }
+  }
+
   Future<void> _compressRust(XFile oldImage, String targetPath, r_type.CompressFormat format) async {
     var quality = switch (Utils().prefUtil.getValue<int>('quality')) {
       0 => 720,
@@ -118,37 +177,37 @@ class MediaUtil {
       2 => 1440,
       _ => 1080,
     };
-    var newImage = await ImageCompress.contain(
-        filePath: oldImage.path, maxWidth: quality, maxHeight: quality, compressFormat: format);
+    var oldPath = oldImage.path;
+    var newImage =
+        await ImageCompress.contain(filePath: oldPath, maxWidth: quality, maxHeight: quality, compressFormat: format);
     await File(targetPath).writeAsBytes(newImage);
   }
 
-  // //图片压缩
-  // Future<XFile?> _compressAndSaveImage(XFile oldImage, String targetPath, CompressFormat format) async {
-  //   // 如果是已经压缩过的
-  //   if (oldImage.path == targetPath) {
-  //     return oldImage;
-  //   }
-  //   if (Platform.isWindows) {
-  //     oldImage.saveTo(targetPath);
-  //     return oldImage;
-  //   }
-  //   var quality = Utils().prefUtil.getValue<int>('quality');
-  //   var height = switch (quality) {
-  //     0 => 720,
-  //     1 => 1080,
-  //     2 => 1440,
-  //     _ => 1080,
-  //   };
-  //
-  //   return await FlutterImageCompress.compressAndGetFile(
-  //     oldImage.path,
-  //     targetPath,
-  //     minHeight: height,
-  //     minWidth: height,
-  //     format: format,
-  //   );
-  // }
+  //图片压缩
+  Future<void> _compressNative(XFile oldImage, String targetPath, CompressFormat format) async {
+    if (Platform.isWindows) {
+      oldImage.saveTo(targetPath);
+      return;
+    }
+    var quality = Utils().prefUtil.getValue<int>('quality');
+    var height = switch (quality) {
+      0 => 720,
+      1 => 1080,
+      2 => 1440,
+      _ => 1080,
+    };
+    var newImage = await FlutterImageCompress.compressWithFile(
+      oldImage.path,
+      minHeight: height,
+      minWidth: height,
+      format: format,
+    );
+    if (newImage == null) {
+      oldImage.saveTo(targetPath);
+      return;
+    }
+    await File(targetPath).writeAsBytes(newImage);
+  }
 
   //获取视频缩略图
   Future<bool> getVideoThumbnail(XFile xFile, destPath) async {
diff --git a/lib/utils/notice_util.dart b/lib/utils/notice_util.dart
index ee23c7d..ff6a910 100644
--- a/lib/utils/notice_util.dart
+++ b/lib/utils/notice_util.dart
@@ -15,19 +15,19 @@ class NoticeUtil {
       late final colorScheme = Theme.of(Get.context!).colorScheme;
       _fToast.removeCustomToast();
       _fToast.showToast(
-          child: Container(
-            padding: const EdgeInsets.symmetric(horizontal: 24.0, vertical: 12.0),
-            decoration: BoxDecoration(
-              borderRadius: BorderRadius.circular(16.0),
-              color: colorScheme.primaryContainer.withAlpha(240),
-            ),
-            child: Text(
-              message,
-              style: TextStyle(fontSize: 16.0, color: colorScheme.onPrimaryContainer),
-            ),
+        child: Container(
+          padding: const EdgeInsets.symmetric(horizontal: 24.0, vertical: 12.0),
+          decoration: BoxDecoration(
+            borderRadius: BorderRadius.circular(16.0),
+            color: colorScheme.primaryContainer.withAlpha(240),
           ),
-          gravity: ToastGravity.CENTER,
-          isDismissable: true);
+          child: Text(
+            message,
+            style: TextStyle(fontSize: 16.0, color: colorScheme.onPrimaryContainer),
+          ),
+        ),
+        gravity: ToastGravity.CENTER,
+      );
     });
   }
 
@@ -43,7 +43,7 @@ class NoticeUtil {
           ),
           child: Text(
             message,
-            style: TextStyle(fontSize: 16.0, color: Colors.white),
+            style: const TextStyle(fontSize: 16.0, color: Colors.white),
           ),
         ),
         gravity: ToastGravity.CENTER,
diff --git a/lib/utils/theme_util.dart b/lib/utils/theme_util.dart
index fdb9dac..fdf2c94 100644
--- a/lib/utils/theme_util.dart
+++ b/lib/utils/theme_util.dart
@@ -1,7 +1,8 @@
-import 'dart:io';
-
+import 'package:chinese_font_library/chinese_font_library.dart';
 import 'package:dynamic_color/dynamic_color.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_quill/flutter_quill.dart';
+import 'package:flutter_quill/internal.dart';
 import 'package:mood_diary/common/values/colors.dart';
 import 'package:mood_diary/utils/utils.dart';
 
@@ -22,19 +23,316 @@ class ThemeUtil {
       2 => AppColor.themeColorList[2],
       3 => AppColor.themeColorList[3],
       4 => AppColor.themeColorList[4],
-      //-1为系统配色，如果选了-1，肯定有
+      // -1为系统配色，如果选了-1，肯定有
       _ => Color(Utils().prefUtil.getValue<int>('systemColor')!)
     };
 
+    // 添加 fontVariations 的函数
+    TextTheme addFontVariationsToTextTheme(TextTheme baseTheme) {
+      return baseTheme.copyWith(
+        displayLarge: baseTheme.displayLarge?.copyWith(
+          fontVariations: [const FontVariation('wght', 400)],
+        ),
+        displayMedium: baseTheme.displayMedium?.copyWith(
+          fontVariations: [const FontVariation('wght', 400)],
+        ),
+        displaySmall: baseTheme.displaySmall?.copyWith(
+          fontVariations: [const FontVariation('wght', 400)],
+        ),
+        headlineLarge: baseTheme.headlineLarge?.copyWith(
+          fontVariations: [const FontVariation('wght', 500)],
+        ),
+        headlineMedium: baseTheme.headlineMedium?.copyWith(
+          fontVariations: [const FontVariation('wght', 500)],
+        ),
+        headlineSmall: baseTheme.headlineSmall?.copyWith(
+          fontVariations: [const FontVariation('wght', 500)],
+        ),
+        titleLarge: baseTheme.titleLarge?.copyWith(
+          fontVariations: [const FontVariation('wght', 600)],
+        ),
+        titleMedium: baseTheme.titleMedium?.copyWith(
+          fontVariations: [const FontVariation('wght', 500)],
+        ),
+        titleSmall: baseTheme.titleSmall?.copyWith(
+          fontVariations: [const FontVariation('wght', 400)],
+        ),
+        bodyLarge: baseTheme.bodyLarge?.copyWith(
+          fontVariations: [const FontVariation('wght', 400)],
+        ),
+        bodyMedium: baseTheme.bodyMedium?.copyWith(
+          fontVariations: [const FontVariation('wght', 400)],
+        ),
+        bodySmall: baseTheme.bodySmall?.copyWith(
+          fontVariations: [const FontVariation('wght', 300)],
+        ),
+        labelLarge: baseTheme.labelLarge?.copyWith(
+          fontVariations: [const FontVariation('wght', 500)],
+        ),
+        labelMedium: baseTheme.labelMedium?.copyWith(
+          fontVariations: [const FontVariation('wght', 400)],
+        ),
+        labelSmall: baseTheme.labelSmall?.copyWith(
+          fontVariations: [const FontVariation('wght', 300)],
+        ),
+      );
+    }
+
+    // 创建基础的 ThemeData
     var themeData = ThemeData(
       colorScheme: ColorScheme.fromSeed(
         seedColor: seedColor,
         brightness: brightness,
-        dynamicSchemeVariant: color == 4 ? DynamicSchemeVariant.fidelity : DynamicSchemeVariant.tonalSpot,
+        dynamicSchemeVariant: color == 4 ? DynamicSchemeVariant.monochrome : DynamicSchemeVariant.tonalSpot,
       ),
-      fontFamily: Platform.isWindows ? '微软雅黑' : null,
+      brightness: brightness,
     );
 
-    return themeData;
+    // 使用系统中文字体的扩展
+    return themeData.useSystemChineseFont(brightness);
+  }
+
+  DefaultStyles getInstance(BuildContext context) {
+    final themeData = Theme.of(context);
+    final textStyle = Theme.of(context).textTheme;
+    final baseStyle = textStyle.bodyMedium!.copyWith(
+      fontSize: 16,
+      height: 1.5,
+      decoration: TextDecoration.none,
+    );
+    const baseHorizontalSpacing = HorizontalSpacing(0, 0);
+    const baseVerticalSpacing = VerticalSpacing(6, 0);
+    final fontFamily = themeData.isCupertino ? 'Menlo' : 'Roboto Mono';
+
+    final inlineCodeStyle = TextStyle(
+      fontSize: 14,
+      color: themeData.colorScheme.primary.withAlpha(200),
+      fontFamily: fontFamily,
+    );
+
+    return DefaultStyles(
+      h1: DefaultTextBlockStyle(
+          textStyle.titleLarge!.copyWith(
+            fontSize: 34,
+            color: textStyle.titleLarge!.color,
+            letterSpacing: -0.5,
+            height: 1.083,
+            fontWeight: FontWeight.bold,
+            decoration: TextDecoration.none,
+          ),
+          baseHorizontalSpacing,
+          const VerticalSpacing(16, 0),
+          VerticalSpacing.zero,
+          null),
+      h2: DefaultTextBlockStyle(
+          textStyle.titleMedium!.copyWith(
+            fontSize: 30,
+            color: textStyle.titleMedium!.color,
+            letterSpacing: -0.8,
+            height: 1.067,
+            fontWeight: FontWeight.bold,
+            decoration: TextDecoration.none,
+          ),
+          baseHorizontalSpacing,
+          const VerticalSpacing(8, 0),
+          VerticalSpacing.zero,
+          null),
+      h3: DefaultTextBlockStyle(
+        textStyle.titleSmall!.copyWith(
+          fontSize: 24,
+          color: textStyle.titleSmall!.color,
+          letterSpacing: -0.5,
+          height: 1.083,
+          fontWeight: FontWeight.bold,
+          decoration: TextDecoration.none,
+        ),
+        baseHorizontalSpacing,
+        const VerticalSpacing(8, 0),
+        VerticalSpacing.zero,
+        null,
+      ),
+      h4: DefaultTextBlockStyle(
+        textStyle.titleSmall!.copyWith(
+          fontSize: 20,
+          color: textStyle.titleSmall!.color,
+          letterSpacing: -0.4,
+          height: 1.1,
+          fontWeight: FontWeight.bold,
+          decoration: TextDecoration.none,
+        ),
+        baseHorizontalSpacing,
+        const VerticalSpacing(6, 0),
+        VerticalSpacing.zero,
+        null,
+      ),
+      h5: DefaultTextBlockStyle(
+        textStyle.titleSmall!.copyWith(
+          fontSize: 18,
+          color: textStyle.titleSmall!.color,
+          letterSpacing: -0.2,
+          height: 1.11,
+          fontWeight: FontWeight.bold,
+          decoration: TextDecoration.none,
+        ),
+        baseHorizontalSpacing,
+        const VerticalSpacing(6, 0),
+        VerticalSpacing.zero,
+        null,
+      ),
+      h6: DefaultTextBlockStyle(
+        textStyle.titleSmall!.copyWith(
+          fontSize: 16,
+          color: textStyle.titleSmall!.color,
+          letterSpacing: -0.1,
+          height: 1.125,
+          fontWeight: FontWeight.bold,
+          decoration: TextDecoration.none,
+        ),
+        baseHorizontalSpacing,
+        const VerticalSpacing(4, 0),
+        VerticalSpacing.zero,
+        null,
+      ),
+      lineHeightNormal: DefaultTextBlockStyle(
+        baseStyle.copyWith(height: 1.15),
+        baseHorizontalSpacing,
+        VerticalSpacing.zero,
+        VerticalSpacing.zero,
+        null,
+      ),
+      lineHeightTight: DefaultTextBlockStyle(
+        baseStyle.copyWith(height: 1.30),
+        baseHorizontalSpacing,
+        VerticalSpacing.zero,
+        VerticalSpacing.zero,
+        null,
+      ),
+      lineHeightOneAndHalf: DefaultTextBlockStyle(
+        baseStyle.copyWith(height: 1.55),
+        baseHorizontalSpacing,
+        VerticalSpacing.zero,
+        VerticalSpacing.zero,
+        null,
+      ),
+      lineHeightDouble: DefaultTextBlockStyle(
+        baseStyle.copyWith(height: 2),
+        baseHorizontalSpacing,
+        VerticalSpacing.zero,
+        VerticalSpacing.zero,
+        null,
+      ),
+      paragraph: DefaultTextBlockStyle(
+        baseStyle,
+        baseHorizontalSpacing,
+        VerticalSpacing.zero,
+        VerticalSpacing.zero,
+        null,
+      ),
+      bold: const TextStyle(fontWeight: FontWeight.bold),
+      subscript: const TextStyle(
+        fontFeatures: [
+          FontFeature.liningFigures(),
+          FontFeature.subscripts(),
+        ],
+      ),
+      superscript: const TextStyle(
+        fontFeatures: [
+          FontFeature.liningFigures(),
+          FontFeature.superscripts(),
+        ],
+      ),
+      italic: const TextStyle(fontStyle: FontStyle.italic),
+      small: const TextStyle(fontSize: 12),
+      underline: const TextStyle(decoration: TextDecoration.underline),
+      strikeThrough: const TextStyle(decoration: TextDecoration.lineThrough),
+      inlineCode: InlineCodeStyle(
+        backgroundColor: Colors.grey.shade100,
+        radius: const Radius.circular(3),
+        style: inlineCodeStyle,
+        header1: inlineCodeStyle.copyWith(
+          fontSize: 32,
+          fontWeight: FontWeight.w500,
+        ),
+        header2: inlineCodeStyle.copyWith(
+          fontSize: 22,
+          fontWeight: FontWeight.w500,
+        ),
+        header3: inlineCodeStyle.copyWith(
+          fontSize: 18,
+          fontWeight: FontWeight.w500,
+        ),
+      ),
+      link: TextStyle(
+        color: themeData.colorScheme.secondary,
+        decoration: TextDecoration.underline,
+      ),
+      placeHolder: DefaultTextBlockStyle(
+          baseStyle.copyWith(
+            fontSize: 20,
+            height: 1.5,
+            color: Colors.grey.withOpacity(0.6),
+          ),
+          baseHorizontalSpacing,
+          VerticalSpacing.zero,
+          VerticalSpacing.zero,
+          null),
+      lists: DefaultListBlockStyle(
+        baseStyle,
+        baseHorizontalSpacing,
+        baseVerticalSpacing,
+        const VerticalSpacing(0, 6),
+        null,
+        null,
+      ),
+      quote: DefaultTextBlockStyle(
+        TextStyle(color: baseStyle.color!.withOpacity(0.6)),
+        baseHorizontalSpacing,
+        baseVerticalSpacing,
+        const VerticalSpacing(6, 2),
+        BoxDecoration(
+          border: Border(
+            left: BorderSide(width: 4, color: Colors.grey.shade300),
+          ),
+        ),
+      ),
+      code: DefaultTextBlockStyle(
+          TextStyle(
+            color: Colors.blue.shade900.withOpacity(0.9),
+            fontFamily: fontFamily,
+            fontSize: 13,
+            height: 1.15,
+          ),
+          baseHorizontalSpacing,
+          baseVerticalSpacing,
+          VerticalSpacing.zero,
+          BoxDecoration(
+            color: Colors.grey.shade50,
+            borderRadius: BorderRadius.circular(2),
+          )),
+      indent: DefaultTextBlockStyle(
+        baseStyle,
+        baseHorizontalSpacing,
+        baseVerticalSpacing,
+        const VerticalSpacing(0, 6),
+        null,
+      ),
+      align: DefaultTextBlockStyle(
+        baseStyle,
+        baseHorizontalSpacing,
+        VerticalSpacing.zero,
+        VerticalSpacing.zero,
+        null,
+      ),
+      leading: DefaultTextBlockStyle(
+        baseStyle,
+        baseHorizontalSpacing,
+        VerticalSpacing.zero,
+        VerticalSpacing.zero,
+        null,
+      ),
+      sizeSmall: const TextStyle(fontSize: 10),
+      sizeLarge: const TextStyle(fontSize: 18),
+      sizeHuge: const TextStyle(fontSize: 22),
+    );
   }
 }
diff --git a/lib/utils/utils.dart b/lib/utils/utils.dart
index da39ace..9a1c876 100644
--- a/lib/utils/utils.dart
+++ b/lib/utils/utils.dart
@@ -14,6 +14,7 @@ import 'package:mood_diary/utils/permission_util.dart';
 import 'package:mood_diary/utils/signature_util.dart';
 import 'package:mood_diary/utils/theme_util.dart';
 import 'package:mood_diary/utils/update_util.dart';
+import 'package:mood_diary/utils/webdav_util.dart';
 
 import 'array_util.dart';
 
@@ -57,4 +58,6 @@ class Utils {
   late final PrefUtil prefUtil = PrefUtil();
 
   late final SupabaseUtil supabaseUtil = SupabaseUtil();
+
+  late final WebDavUtil webDavUtil = WebDavUtil();
 }
diff --git a/lib/utils/webdav_util.dart b/lib/utils/webdav_util.dart
new file mode 100644
index 0000000..b1b0183
--- /dev/null
+++ b/lib/utils/webdav_util.dart
@@ -0,0 +1,289 @@
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:flutter/foundation.dart' as flutter;
+import 'package:mood_diary/common/models/isar/category.dart';
+import 'package:mood_diary/common/values/webdav.dart';
+import 'package:mood_diary/utils/utils.dart';
+import 'package:webdav_client/webdav_client.dart' as webdav;
+
+import '../common/models/isar/diary.dart';
+
+class WebDavUtil {
+  Set<String> syncingDiaries = {};
+
+  webdav.Client? _client;
+
+  List<String> get options => Utils().prefUtil.getValue<List<String>>('webDavOption')!;
+
+  bool get hasOption => Utils().prefUtil.getValue<List<String>>('webDavOption')!.isNotEmpty;
+
+  Future<void> initWebDav() async {
+    final webDavOption = options;
+    if (webDavOption.isEmpty) {
+      _client = null;
+      return;
+    }
+    if (_client != null) {
+      _client = null;
+    }
+    _client =
+        webdav.newClient(webDavOption[0], user: webDavOption[1], password: webDavOption[2], debug: flutter.kDebugMode);
+    _client?.setHeaders({
+      'accept-charset': 'utf-8',
+      'Content-Type': 'application/json',
+    });
+    await initDir();
+  }
+
+  Future<bool> checkConnectivity() async {
+    try {
+      await _client?.ping();
+      return true;
+    } catch (e) {
+      return false;
+    }
+  }
+
+  Future<void> initDir() async {
+    await _client!.mkdirAll(WebDavOptions.imagePath);
+    await _client!.mkdirAll(WebDavOptions.videoPath);
+    await _client!.mkdirAll(WebDavOptions.audioPath);
+    await _client!.mkdirAll(WebDavOptions.diaryPath);
+    await _client!.mkdirAll(WebDavOptions.categoryPath);
+    await checkSyncFlag();
+  }
+
+  Future<void> checkSyncFlag() async {
+    try {
+      await _client!.read(WebDavOptions.syncFlagPath);
+    } catch (e) {
+      await _client!.write(WebDavOptions.syncFlagPath, utf8.encode(jsonEncode({})));
+    }
+  }
+
+  Future<void> updateWebDav({required String baseUrl, required String username, required String password}) async {
+    await Utils().prefUtil.setValue('webDavOption', [baseUrl, username, password]);
+    initWebDav();
+  }
+
+  Future<void> removeWebDavOption() async {
+    _client = null;
+    await Utils().prefUtil.setValue<List<String>>('webDavOption', []);
+  }
+
+  Future<Map<String, String>> fetchServerSyncData() async {
+    if (_client != null) {
+      final response = await _client!.read(WebDavOptions.syncFlagPath);
+      if (response.isNotEmpty) {
+        return Map<String, String>.from(jsonDecode(utf8.decode(response)));
+      }
+    }
+    return {};
+  }
+
+  Future<void> updateServerSyncData(Map<String, String> syncData) async {
+    if (_client != null) {
+      await _client!.write(WebDavOptions.syncFlagPath, utf8.encode(jsonEncode(syncData)));
+    }
+  }
+
+  Future<void> syncDiary(
+    List<Diary> localDiaries, {
+    flutter.VoidCallback? onUpload,
+    flutter.VoidCallback? onDownload,
+    flutter.VoidCallback? onComplete,
+  }) async {
+    final serverSyncData = await fetchServerSyncData();
+    final Map<String, String> updatedSyncData = {...serverSyncData};
+
+    // 本地日记的 ID -> 修改时间映射
+    final Map<String, String> localDiaryMap = {
+      for (final diary in localDiaries) diary.id: diary.lastModified.toIso8601String()
+    };
+
+    for (final entry in serverSyncData.entries) {
+      final diaryId = entry.key;
+      final serverLastModified = entry.value;
+
+      if (syncingDiaries.contains(diaryId)) {
+        continue; // 正在同步中，跳过
+      }
+
+      final localLastModified = localDiaryMap[diaryId];
+
+      if (localLastModified == null || serverLastModified.compareTo(localLastModified) > 0) {
+        // 本地不存在该日记，下载
+        syncingDiaries.add(diaryId);
+        final updatedDiary = await downloadDiary(diaryId); // 下载日记的实现
+        await saveLocalDiary(updatedDiary); // 保存到本地的实现
+        onDownload?.call();
+        syncingDiaries.remove(diaryId);
+      }
+    }
+
+    for (final diary in localDiaries) {
+      if (syncingDiaries.contains(diary.id)) {
+        continue; // 正在同步中，跳过
+      }
+
+      final serverLastModified = serverSyncData[diary.id];
+      final localLastModified = diary.lastModified.toIso8601String();
+
+      if (serverLastModified == null || serverLastModified.compareTo(localLastModified) < 0) {
+        // 服务器不存在该日记，或服务器版本较旧
+        syncingDiaries.add(diary.id);
+        await uploadDiary(diary); // 上传日记的实现
+        onUpload?.call();
+        updatedSyncData[diary.id] = localLastModified;
+        syncingDiaries.remove(diary.id);
+      }
+    }
+
+    // 更新服务器的同步 JSON 文件
+    await updateServerSyncData(updatedSyncData);
+    onComplete?.call();
+  }
+
+  Future<void> uploadDiary(Diary diary) async {
+    // 检查并上传分类
+    if (diary.categoryId != null) {
+      final categoryName = Utils().isarUtil.getCategoryName(diary.categoryId!)?.categoryName;
+      if (categoryName != null) {
+        await uploadCategory(diary.categoryId!, categoryName);
+      }
+    }
+
+    // 上传日记 JSON 数据
+    final diaryPath = '${WebDavOptions.diaryPath}/${diary.id}.json';
+    final diaryData = jsonEncode(diary.toJson());
+
+    try {
+      _client!.setHeaders({
+        'accept-charset': 'utf-8',
+        'Content-Type': 'application/json',
+      });
+      await _client!.write(diaryPath, utf8.encode(diaryData));
+      Utils().logUtil.printInfo('Diary JSON uploaded: $diaryPath');
+    } catch (e) {
+      Utils().logUtil.printInfo('Failed to upload diary JSON: $e');
+      rethrow;
+    }
+
+    // 上传资源文件
+    await _uploadFiles(diary.imageName, WebDavOptions.imagePath, 'image');
+    await _uploadFiles(diary.audioName, WebDavOptions.audioPath, 'audio');
+    await _uploadFiles(diary.videoName, WebDavOptions.videoPath, 'video');
+  }
+
+  Future<void> _uploadFiles(List<String> fileNames, String resourcePath, String type) async {
+    for (final fileName in fileNames) {
+      final filePath = Utils().fileUtil.getRealPath(type, fileName);
+
+      try {
+        final fileBytes = await File(filePath).readAsBytes();
+        _client!.setHeaders({
+          'accept-charset': 'utf-8',
+          'Content-Type': 'application/octet-stream',
+        });
+        await _client!.write('$resourcePath/$fileName', fileBytes);
+        Utils().logUtil.printInfo('$type file uploaded: $fileName');
+      } catch (e) {
+        Utils().logUtil.printInfo('Failed to upload $type file: $fileName, Error: $e');
+        rethrow;
+      }
+    }
+  }
+
+  Future<Diary> downloadDiary(String diaryId) async {
+    // 下载日记 JSON 数据
+    final diaryPath = '${WebDavOptions.diaryPath}/$diaryId.json';
+    late Diary diary;
+
+    try {
+      final diaryData = await _client!.read(diaryPath);
+      diary = Diary.fromJson(jsonDecode(utf8.decode(diaryData)));
+      Utils().logUtil.printInfo('Diary JSON downloaded: $diaryPath');
+    } catch (e) {
+      Utils().logUtil.printInfo('Failed to download diary JSON: $e');
+      rethrow;
+    }
+
+    // 同步分类
+    if (diary.categoryId != null) {
+      try {
+        final category = await downloadCategory(diary.categoryId!);
+        Utils().isarUtil.insertACategory(Category()
+          ..id = category['id']!
+          ..categoryName = category['name']!);
+      } catch (e) {
+        Utils().logUtil.printInfo('Failed to sync category for diary: $diaryId, Error: $e');
+      }
+    }
+
+    // 下载资源文件
+    diary.imageName = await _downloadFiles(diary.imageName, WebDavOptions.imagePath, 'image');
+    diary.audioName = await _downloadFiles(diary.audioName, WebDavOptions.audioPath, 'audio');
+    diary.videoName = await _downloadFiles(diary.videoName, WebDavOptions.videoPath, 'video');
+
+    return diary;
+  }
+
+  Future<List<String>> _downloadFiles(List<String> fileNames, String resourcePath, String type) async {
+    final localFileNames = <String>[];
+
+    for (final fileName in fileNames) {
+      final serverFilePath = '$resourcePath/$fileName';
+      final localFilePath = Utils().fileUtil.getRealPath(type, fileName);
+
+      try {
+        final fileBytes = await _client!.read(serverFilePath);
+        final file = File(localFilePath);
+        await file.writeAsBytes(fileBytes);
+        localFileNames.add(fileName);
+        Utils().logUtil.printInfo('$type file downloaded: $fileName');
+      } catch (e) {
+        Utils().logUtil.printInfo('Failed to download $type file: $fileName, Error: $e');
+      }
+    }
+
+    return localFileNames;
+  }
+
+  Future<void> saveLocalDiary(Diary diary) async {
+    // 使用 Isar 或文件存储
+    await Utils().isarUtil.insertADiary(diary);
+  }
+
+  Future<void> uploadCategory(String categoryId, String categoryName) async {
+    final categoryPath = '${WebDavOptions.categoryPath}/$categoryId.json';
+    final categoryData = jsonEncode({'id': categoryId, 'name': categoryName});
+
+    try {
+      _client!.setHeaders({
+        'accept-charset': 'utf-8',
+        'Content-Type': 'application/json',
+      });
+      await _client!.write(categoryPath, utf8.encode(categoryData));
+      Utils().logUtil.printInfo('Category uploaded: $categoryPath');
+    } catch (e) {
+      Utils().logUtil.printInfo('Failed to upload category: $e');
+      rethrow;
+    }
+  }
+
+  Future<Map<String, String>> downloadCategory(String categoryId) async {
+    final categoryPath = '${WebDavOptions.categoryPath}/$categoryId.json';
+
+    try {
+      final categoryData = await _client!.read(categoryPath);
+      final categoryMap = jsonDecode(utf8.decode(categoryData)) as Map<String, dynamic>;
+      final categoryName = categoryMap['name'] as String;
+      Utils().logUtil.printInfo('Category downloaded: $categoryPath');
+      return {'id': categoryId, 'name': categoryName};
+    } catch (e) {
+      Utils().logUtil.printInfo('Failed to download category: $e');
+      throw Exception('Category not found: $categoryId');
+    }
+  }
+}
diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
index b82fab2..215b243 100644
--- a/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -8,11 +8,14 @@ import Foundation
 import app_links
 import audioplayers_darwin
 import bitsdojo_window_macos
+import connectivity_plus
 import device_info_plus
 import dynamic_color
 import fc_native_video_thumbnail
 import file_selector_macos
+import flutter_image_compress_macos
 import flutter_inappwebview_macos
+import gal
 import geolocator_apple
 import isar_flutter_libs
 import local_auth_darwin
@@ -29,17 +32,21 @@ import share_plus
 import shared_preferences_foundation
 import sqflite_darwin
 import url_launcher_macos
+import video_player_avfoundation
 import wakelock_plus
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   AppLinksMacosPlugin.register(with: registry.registrar(forPlugin: "AppLinksMacosPlugin"))
   AudioplayersDarwinPlugin.register(with: registry.registrar(forPlugin: "AudioplayersDarwinPlugin"))
   BitsdojoWindowPlugin.register(with: registry.registrar(forPlugin: "BitsdojoWindowPlugin"))
+  ConnectivityPlusPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlusPlugin"))
   DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
   DynamicColorPlugin.register(with: registry.registrar(forPlugin: "DynamicColorPlugin"))
   FcNativeVideoThumbnailPlugin.register(with: registry.registrar(forPlugin: "FcNativeVideoThumbnailPlugin"))
   FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
+  FlutterImageCompressMacosPlugin.register(with: registry.registrar(forPlugin: "FlutterImageCompressMacosPlugin"))
   InAppWebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "InAppWebViewFlutterPlugin"))
+  GalPlugin.register(with: registry.registrar(forPlugin: "GalPlugin"))
   GeolocatorPlugin.register(with: registry.registrar(forPlugin: "GeolocatorPlugin"))
   IsarFlutterLibsPlugin.register(with: registry.registrar(forPlugin: "IsarFlutterLibsPlugin"))
   FLALocalAuthPlugin.register(with: registry.registrar(forPlugin: "FLALocalAuthPlugin"))
@@ -56,5 +63,6 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
   SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))
   UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
+  FVPVideoPlayerPlugin.register(with: registry.registrar(forPlugin: "FVPVideoPlayerPlugin"))
   WakelockPlusMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockPlusMacosPlugin"))
 }
diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
index a2ec33f..2081acf 100644
--- a/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,68 +1,68 @@
 {
-  "images" : [
+  "info": {
+    "version": 1,
+    "author": "xcode"
+  },
+  "images": [
     {
-      "size" : "16x16",
-      "idiom" : "mac",
-      "filename" : "app_icon_16.png",
-      "scale" : "1x"
+      "size": "16x16",
+      "idiom": "mac",
+      "filename": "app_icon_16.png",
+      "scale": "1x"
     },
     {
-      "size" : "16x16",
-      "idiom" : "mac",
-      "filename" : "app_icon_32.png",
-      "scale" : "2x"
+      "size": "16x16",
+      "idiom": "mac",
+      "filename": "app_icon_32.png",
+      "scale": "2x"
     },
     {
-      "size" : "32x32",
-      "idiom" : "mac",
-      "filename" : "app_icon_32.png",
-      "scale" : "1x"
+      "size": "32x32",
+      "idiom": "mac",
+      "filename": "app_icon_32.png",
+      "scale": "1x"
     },
     {
-      "size" : "32x32",
-      "idiom" : "mac",
-      "filename" : "app_icon_64.png",
-      "scale" : "2x"
+      "size": "32x32",
+      "idiom": "mac",
+      "filename": "app_icon_64.png",
+      "scale": "2x"
     },
     {
-      "size" : "128x128",
-      "idiom" : "mac",
-      "filename" : "app_icon_128.png",
-      "scale" : "1x"
+      "size": "128x128",
+      "idiom": "mac",
+      "filename": "app_icon_128.png",
+      "scale": "1x"
     },
     {
-      "size" : "128x128",
-      "idiom" : "mac",
-      "filename" : "app_icon_256.png",
-      "scale" : "2x"
+      "size": "128x128",
+      "idiom": "mac",
+      "filename": "app_icon_256.png",
+      "scale": "2x"
     },
     {
-      "size" : "256x256",
-      "idiom" : "mac",
-      "filename" : "app_icon_256.png",
-      "scale" : "1x"
+      "size": "256x256",
+      "idiom": "mac",
+      "filename": "app_icon_256.png",
+      "scale": "1x"
     },
     {
-      "size" : "256x256",
-      "idiom" : "mac",
-      "filename" : "app_icon_512.png",
-      "scale" : "2x"
+      "size": "256x256",
+      "idiom": "mac",
+      "filename": "app_icon_512.png",
+      "scale": "2x"
     },
     {
-      "size" : "512x512",
-      "idiom" : "mac",
-      "filename" : "app_icon_512.png",
-      "scale" : "1x"
+      "size": "512x512",
+      "idiom": "mac",
+      "filename": "app_icon_512.png",
+      "scale": "1x"
     },
     {
-      "size" : "512x512",
-      "idiom" : "mac",
-      "filename" : "app_icon_1024.png",
-      "scale" : "2x"
+      "size": "512x512",
+      "idiom": "mac",
+      "filename": "app_icon_1024.png",
+      "scale": "2x"
     }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
+  ]
+}
\ No newline at end of file
diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png
index 82b6f9d..5f26ca3 100644
Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png differ
diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png
index 13b35eb..d48c005 100644
Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png differ
diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png
index 0a3f5fa..4d1ea22 100644
Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png differ
diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png
index bdb5722..5a20391 100644
Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png differ
diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png
index f083318..43b1a67 100644
Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png differ
diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png
index 326c0e7..e2e0c63 100644
Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png differ
diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png
index 2f1632c..4d3d2b6 100644
Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png differ
diff --git a/pubspec.lock b/pubspec.lock
index 873cc41..584131a 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -30,6 +30,14 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.0.4"
+  ansicolor:
+    dependency: transitive
+    description:
+      name: ansicolor
+      sha256: "50e982d500bc863e1d703448afdbf9e5a72eb48840a4f766fa361ffd6877055f"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.0.3"
   app_links:
     dependency: transitive
     description:
@@ -150,6 +158,14 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.0.0"
+  auto_size_text_field:
+    dependency: "direct main"
+    description:
+      name: auto_size_text_field
+      sha256: "41c90b2270e38edc6ce5c02e5a17737a863e65e246bdfc94565a38f3ec399144"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.2.4"
   bitsdojo_window:
     dependency: "direct main"
     description:
@@ -326,6 +342,22 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.3"
+  chewie:
+    dependency: "direct main"
+    description:
+      name: chewie
+      sha256: "335df378c025588aef400c704bd71f0daea479d4cd57c471c88c056c1144e7cd"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.8.5"
+  chinese_font_library:
+    dependency: "direct main"
+    description:
+      name: chinese_font_library
+      sha256: f6c18eb58c1514a95e4ed9a7e2f6702be1333b67e4226976b333e5918021c1df
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.2.0"
   cli_util:
     dependency: transitive
     description:
@@ -358,6 +390,30 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.19.0"
+  confetti:
+    dependency: "direct main"
+    description:
+      name: confetti
+      sha256: "79376a99648efbc3f23582f5784ced0fe239922bd1a0fb41f582051eba750751"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.8.0"
+  connectivity_plus:
+    dependency: "direct main"
+    description:
+      name: connectivity_plus
+      sha256: "876849631b0c7dc20f8b471a2a03142841b482438e3b707955464f5ffca3e4c3"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "6.1.0"
+  connectivity_plus_platform_interface:
+    dependency: transitive
+    description:
+      name: connectivity_plus_platform_interface
+      sha256: "42657c1715d48b167930d5f34d00222ac100475f73d10162ddf43e714932f204"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.0.1"
   console:
     dependency: transitive
     description:
@@ -506,10 +562,10 @@ packages:
     dependency: transitive
     description:
       name: equatable
-      sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2
+      sha256: "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.5"
+    version: "2.0.7"
   extended_list_library:
     dependency: transitive
     description:
@@ -570,10 +626,10 @@ packages:
     dependency: transitive
     description:
       name: file_selector_linux
-      sha256: b2b91daf8a68ecfa4a01b778a6f52edef9b14ecd506e771488ea0f2e0784198b
+      sha256: "54cbbd957e1156d29548c7d9b9ec0c0ebb6de0a90452198683a7d23aed617a33"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.9.3+1"
+    version: "0.9.3+2"
   file_selector_macos:
     dependency: transitive
     description:
@@ -610,10 +666,10 @@ packages:
     dependency: "direct main"
     description:
       name: fl_chart
-      sha256: "94307bef3a324a0d329d3ab77b2f0c6e5ed739185ffc029ed28c0f9b019ea7ef"
+      sha256: "74959b99b92b9eebeed1a4049426fd67c4abc3c5a0f4d12e2877097d6a11ae08"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.69.0"
+    version: "0.69.2"
   flat_buffers:
     dependency: transitive
     description:
@@ -675,6 +731,54 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.7.0"
+  flutter_image_compress:
+    dependency: "direct main"
+    description:
+      name: flutter_image_compress
+      sha256: "45a3071868092a61b11044c70422b04d39d4d9f2ef536f3c5b11fb65a1e7dd90"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.3.0"
+  flutter_image_compress_common:
+    dependency: transitive
+    description:
+      name: flutter_image_compress_common
+      sha256: "7f79bc6c8a363063620b4e372fa86bc691e1cb28e58048cd38e030692fbd99ee"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.0.5"
+  flutter_image_compress_macos:
+    dependency: transitive
+    description:
+      name: flutter_image_compress_macos
+      sha256: "26df6385512e92b3789dc76b613b54b55c457a7f1532e59078b04bf189782d47"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.0.2"
+  flutter_image_compress_ohos:
+    dependency: transitive
+    description:
+      name: flutter_image_compress_ohos
+      sha256: e76b92bbc830ee08f5b05962fc78a532011fcd2041f620b5400a593e96da3f51
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.0.3"
+  flutter_image_compress_platform_interface:
+    dependency: transitive
+    description:
+      name: flutter_image_compress_platform_interface
+      sha256: "579cb3947fd4309103afe6442a01ca01e1e6f93dc53bb4cbd090e8ce34a41889"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.0.5"
+  flutter_image_compress_web:
+    dependency: transitive
+    description:
+      name: flutter_image_compress_web
+      sha256: f02fe352b17f82b72f481de45add240db062a2585850bea1667e82cc4cd6c311
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.1.4+1"
   flutter_inappwebview:
     dependency: "direct main"
     description:
@@ -695,10 +799,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_inappwebview_internal_annotations
-      sha256: "5f80fd30e208ddded7dbbcd0d569e7995f9f63d45ea3f548d8dd4c0b473fb4c8"
+      sha256: "787171d43f8af67864740b6f04166c13190aa74a1468a1f1f1e9ee5b90c359cd"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.1"
+    version: "1.2.0"
   flutter_inappwebview_ios:
     dependency: transitive
     description:
@@ -767,10 +871,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_keyboard_visibility_temp_fork
-      sha256: "2d94acecfc170d244157821cc67e784f60972677aac94a6672626a5d6b2dc537"
+      sha256: cecc44a350a8a369efbc960bb2126386af53cb0597ca6789607cbfb88081b9f4
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.1.3"
+    version: "0.1.4"
   flutter_keyboard_visibility_windows:
     dependency: transitive
     description:
@@ -779,6 +883,14 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.0"
+  flutter_launcher_icons:
+    dependency: "direct dev"
+    description:
+      name: flutter_launcher_icons
+      sha256: "31cd0885738e87c72d6f055564d37fabcdacee743b396b78c7636c169cac64f5"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.14.2"
   flutter_lints:
     dependency: "direct dev"
     description:
@@ -820,10 +932,26 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_map_tile_caching
-      sha256: "8f37d72546d8f0ad716142c4f44bf5a1cca3bbe8b1dbfa83cd5d49c9b97b8ae7"
+      sha256: "19b35c39a1958c0613a165b5f93df36d3446b023cd6e781145d29d18d5367402"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "9.1.3"
+    version: "9.1.4"
+  flutter_markdown:
+    dependency: "direct main"
+    description:
+      name: flutter_markdown
+      sha256: "255b00afa1a7bad19727da6a7780cf3db6c3c12e68d302d85e0ff1fdf173db9e"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.7.4+3"
+  flutter_native_splash:
+    dependency: "direct main"
+    description:
+      name: flutter_native_splash
+      sha256: "1152ab0067ca5a2ebeb862fe0a762057202cceb22b7e62692dcbabf6483891bb"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.4.3"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
@@ -836,18 +964,26 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_quill
-      sha256: "6274834823e61291c0cedee9dd7f73fc7836ea07a12596de8f5fa08598b5eb74"
+      sha256: "43ca068c81fcdad3771c027fdd0bdd49c9d3e518ca1ed1f210ce6f5923684bb9"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "10.8.5"
+    version: "11.0.0-dev.14"
   flutter_quill_delta_from_html:
     dependency: transitive
     description:
       name: flutter_quill_delta_from_html
-      sha256: "288f879bd11f9b6857868e7b198e69918530bd63d196ead6d8a9ee780b4b44d2"
+      sha256: "63873b5391b56daa999ce8fa7dd23dfd7d0417a70e00a647ba450f4a8988afd0"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.4.2"
+    version: "1.4.3"
+  flutter_quill_extensions:
+    dependency: "direct main"
+    description:
+      name: flutter_quill_extensions
+      sha256: "69f2dc335628b87d674e813bdcc9c58616874e2b48f13b6680150a34a2573906"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "11.0.0-dev.4"
   flutter_rust_bridge:
     dependency: "direct main"
     description:
@@ -898,6 +1034,22 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.4.0"
+  gal:
+    dependency: transitive
+    description:
+      name: gal
+      sha256: "54c9b72528efce7c66234f3b6dd01cb0304fd8af8196de15571d7bdddb940977"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.3.0"
+  gal_linux:
+    dependency: transitive
+    description:
+      name: gal_linux
+      sha256: "0040d61843134cc5a93e4597080a86f2ba073217957e28b2a684b4d8b050873c"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.1.2"
   geolocator:
     dependency: "direct main"
     description:
@@ -970,6 +1122,14 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.2"
+  google_fonts:
+    dependency: "direct main"
+    description:
+      name: google_fonts
+      sha256: b1ac0fe2832c9cc95e5e88b57d627c5e68c223b9657f4b96e1487aa9098c7b82
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "6.2.1"
   gotrue:
     dependency: transitive
     description:
@@ -1034,6 +1194,14 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.1.1"
+  http_status_code:
+    dependency: "direct main"
+    description:
+      name: http_status_code
+      sha256: "052b42add019380f060cbf9cc9669b6831ca7e0244c925c520de8c1867dd139d"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.0.2"
   image:
     dependency: transitive
     description:
@@ -1051,13 +1219,13 @@ packages:
     source: hosted
     version: "1.1.2"
   image_picker_android:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: image_picker_android
-      sha256: "8faba09ba361d4b246dc0a17cb4289b3324c2b9f6db7b3d457ee69106a86bd32"
+      sha256: fa8141602fde3f7e2f81dbf043613eb44dfa325fa0bcf93c0f142c9f7a2c193e
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.8.12+17"
+    version: "0.8.12+18"
   image_picker_for_web:
     dependency: transitive
     description:
@@ -1091,7 +1259,7 @@ packages:
     source: hosted
     version: "0.2.1+1"
   image_picker_platform_interface:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: image_picker_platform_interface
       sha256: "9ec26d410ff46f483c5519c29c02ef0e02e13a543f882b152d4bfd2f06802f80"
@@ -1270,10 +1438,10 @@ packages:
     dependency: "direct main"
     description:
       name: lottie
-      sha256: "7afc60865a2429d994144f7d66ced2ae4305fe35d82890b8766e3359872d872c"
+      sha256: fa39707f36786707b01eca7626d2c16c32aa603b3f3a146518518458847dc127
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.1.3"
+    version: "3.2.0"
   macros:
     dependency: transitive
     description:
@@ -1403,7 +1571,7 @@ packages:
     source: hosted
     version: "2.0.0"
   mime:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: mime
       sha256: "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a"
@@ -1518,18 +1686,18 @@ packages:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: c464428172cb986b758c6d1724c603097febb8fb855aa265aeecc9280c294d4a
+      sha256: "8c4967f8b7cb46dc914e178daa29813d83ae502e0529d7b0478330616a691ef7"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.2.12"
+    version: "2.2.14"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16
+      sha256: "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.4.0"
+    version: "2.4.1"
   path_provider_linux:
     dependency: transitive
     description:
@@ -1582,10 +1750,10 @@ packages:
     dependency: transitive
     description:
       name: permission_handler_html
-      sha256: "6b9cb54b7135073841a35513fba39e598b421702d5f4d92319992fd6eb5532a9"
+      sha256: "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.1.3+4"
+    version: "0.1.3+5"
   permission_handler_platform_interface:
     dependency: transitive
     description:
@@ -1618,6 +1786,14 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.15.0"
+  pinput:
+    dependency: "direct main"
+    description:
+      name: pinput
+      sha256: "7bf9aa7d0eeb3da9f7d49d2087c7bc7d36cd277d2e94cc31c6da52e1ebb048d0"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "5.0.0"
   platform:
     dependency: transitive
     description:
@@ -1702,66 +1878,66 @@ packages:
     dependency: transitive
     description:
       name: quill_native_bridge
-      sha256: "5ccf1930fe52db91846754bd56391d251071524ec594eb4c8509b3095f7f9e28"
+      sha256: "0b3200c57bb4f1f12d6c764648d42482891f20f12024c75fe3479cafc1e132c9"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "10.7.9"
+    version: "10.7.11"
   quill_native_bridge_android:
     dependency: transitive
     description:
       name: quill_native_bridge_android
-      sha256: "4e787041ad4ab99421dfed0199cb5a6f136b5f6a9e68d20b199064d85d4161d8"
+      sha256: b75c7e6ede362a7007f545118e756b1f19053994144ec9eda932ce5e54a57569
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.0.1-dev.4"
+    version: "0.0.1+2"
   quill_native_bridge_ios:
     dependency: transitive
     description:
       name: quill_native_bridge_ios
-      sha256: "16dd18a56bdc60f396eb873a0786141d8e3281cc0cb6ad7af24c2286abec43d8"
+      sha256: d23de3cd7724d482fe2b514617f8eedc8f296e120fb297368917ac3b59d8099f
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.0.1-dev.4"
+    version: "0.0.1"
   quill_native_bridge_linux:
     dependency: transitive
     description:
       name: quill_native_bridge_linux
-      sha256: a0d8aa775b36a7b8ac7ace5bd6ba05b21fed6c9b04a9f328f95489254ae0f7a3
+      sha256: "5fcc60cab2ab9079e0746941f05c5ca5fec85cc050b738c8c8b9da7c09da17eb"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.0.1-dev.3"
+    version: "0.0.1"
   quill_native_bridge_macos:
     dependency: transitive
     description:
       name: quill_native_bridge_macos
-      sha256: "76d441a905181af04c51b9cf71a13e04c3dd51ed482dcb543a01e14d78ad3fc0"
+      sha256: "1c0631bd1e2eee765a8b06017c5286a4e829778f4585736e048eb67c97af8a77"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.0.1-dev.2"
+    version: "0.0.1"
   quill_native_bridge_platform_interface:
     dependency: transitive
     description:
       name: quill_native_bridge_platform_interface
-      sha256: "5ad4a9cdb6fadd6575bca29c277f83daa324539c97f58cf45cff6195135defb9"
+      sha256: "2d71b6c5106db0a4b1d788640d1b949ccdd0e570b5a5e0384f7b28be9630a94a"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.0.1-dev.4"
+    version: "0.0.1"
   quill_native_bridge_web:
     dependency: transitive
     description:
       name: quill_native_bridge_web
-      sha256: bb3ab017fdb9b60a29cac0bce3acfd48396d13c1bd0499c97af112c84937b4d1
+      sha256: e7e55047d68f1a88574c26dbe3f12988f49d07740590d8fc6280028bbde5b908
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.0.1-dev.5"
+    version: "0.0.1"
   quill_native_bridge_windows:
     dependency: transitive
     description:
       name: quill_native_bridge_windows
-      sha256: "78bc40cc4a23387ed79a309fc04f7a95a0b6da9ebce67f739dd08b0fd0523641"
+      sha256: "60e50d74238f22ceb43113d9a42b6627451dab9fc27f527b979a32051cf1da45"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.0.1-dev.3"
+    version: "0.0.1"
   quiver:
     dependency: transitive
     description:
@@ -1949,10 +2125,10 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: "3b9febd815c9ca29c9e3520d50ec32f49157711e143b7a4ca039eb87e8ade5ab"
+      sha256: "7f172d1b06de5da47b6264c2692ee2ead20bbbc246690427cdb4fc301cd0c549"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.3.3"
+    version: "2.3.4"
   shared_preferences_foundation:
     dependency: transitive
     description:
@@ -2013,10 +2189,10 @@ packages:
     dependency: transitive
     description:
       name: shelf_web_socket
-      sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611"
+      sha256: cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.1"
   simple_gesture_detector:
     dependency: transitive
     description:
@@ -2090,10 +2266,10 @@ packages:
     dependency: transitive
     description:
       name: sqflite_common
-      sha256: "4468b24876d673418a7b7147e5a08a715b4998a7ae69227acafaab762e0e5490"
+      sha256: "761b9740ecbd4d3e66b8916d784e581861fd3c3553eda85e167bc49fdb68f709"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.5.4+5"
+    version: "2.5.4+6"
   sqflite_darwin:
     dependency: transitive
     description:
@@ -2170,18 +2346,18 @@ packages:
     dependency: transitive
     description:
       name: syncfusion_flutter_core
-      sha256: "225b1cc135549bb4eef096d63b7323c30ee61c4b095c7e8a14bf9333e243d84b"
+      sha256: "325f519ce4ad8edd81811c21b853d72018529e353584490824da0555156ba076"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "27.2.2"
+    version: "27.2.5"
   syncfusion_flutter_sliders:
     dependency: "direct main"
     description:
       name: syncfusion_flutter_sliders
-      sha256: af68a903ed78cd1c168df62aaeb3dca1a0f25e46058a89dd086b3538348cd2d0
+      sha256: "2ffde5c9ad7f50fbfef85dfb8cae4a50f0aa4729038e42c33253831e1b435800"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "27.2.2"
+    version: "27.2.5"
   synchronized:
     dependency: transitive
     description:
@@ -2254,6 +2430,22 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.0.0"
+  universal_html:
+    dependency: transitive
+    description:
+      name: universal_html
+      sha256: "56536254004e24d9d8cfdb7dbbf09b74cf8df96729f38a2f5c238163e3d58971"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.2.4"
+  universal_io:
+    dependency: transitive
+    description:
+      name: universal_io
+      sha256: "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.2.2"
   universal_platform:
     dependency: transitive
     description:
@@ -2290,10 +2482,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e
+      sha256: "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "6.3.1"
+    version: "6.3.2"
   url_launcher_linux:
     dependency: transitive
     description:
@@ -2306,10 +2498,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_macos
-      sha256: "769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672"
+      sha256: "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.2.1"
+    version: "3.2.2"
   url_launcher_platform_interface:
     dependency: transitive
     description:
@@ -2350,6 +2542,54 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.4"
+  video_player:
+    dependency: "direct main"
+    description:
+      name: video_player
+      sha256: "4a8c3492d734f7c39c2588a3206707a05ee80cef52e8c7f3b2078d430c84bc17"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.9.2"
+  video_player_android:
+    dependency: transitive
+    description:
+      name: video_player_android
+      sha256: "391e092ba4abe2f93b3e625bd6b6a6ec7d7414279462c1c0ee42b5ab8d0a0898"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.7.16"
+  video_player_avfoundation:
+    dependency: transitive
+    description:
+      name: video_player_avfoundation
+      sha256: f498e44a547a3572a928fa30ac8760e127d5e5fc86b81b10b0d56300866322f3
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.6.4"
+  video_player_media_kit:
+    dependency: "direct main"
+    description:
+      name: video_player_media_kit
+      sha256: eadf78b85d0ecc6f65bb5ca84c5ad9546a8609c6c0ee207e81673f7969461f3b
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.0.5"
+  video_player_platform_interface:
+    dependency: transitive
+    description:
+      name: video_player_platform_interface
+      sha256: "229d7642ccd9f3dc4aba169609dd6b5f3f443bb4cc15b82f7785fcada5af9bbb"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "6.2.3"
+  video_player_web:
+    dependency: transitive
+    description:
+      name: video_player_web
+      sha256: "881b375a934d8ebf868c7fb1423b2bfaa393a0a265fa3f733079a86536064a10"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.3.3"
   visibility_detector:
     dependency: transitive
     description:
@@ -2430,14 +2670,22 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.0.1"
+  webdav_client:
+    dependency: "direct main"
+    description:
+      name: webdav_client
+      sha256: "682fffc50b61dc0e8f46717171db03bf9caaa17347be41c0c91e297553bf86b2"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.2.2"
   win32:
     dependency: transitive
     description:
       name: win32
-      sha256: "84ba388638ed7a8cb3445a320c8273136ab2631cd5f2c57888335504ddab1bc2"
+      sha256: "8b338d4486ab3fbc0ba0db9f9b4f5239b6697fcee427939a40e720cbb9ee0a69"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "5.8.0"
+    version: "5.9.0"
   win32_registry:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index d4f25cb..6bb86d8 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,32 +1,11 @@
 name: mood_diary
 description: "A new Flutter project."
-# The following line prevents the package from being accidentally published to
-# pub.dev using `flutter pub publish`. This is preferred for private packages.
-publish_to: 'none' # Remove this line if you wish to publish to pub.dev
-
-# The following defines the version and build number for your application.
-# A version number is three numbers separated by dots, like 1.2.43
-# followed by an optional build number separated by a +.
-# Both the version and the builder number may be overridden in flutter
-# build by specifying --build-name and --build-number, respectively.
-# In Android, build-name is used as versionName while build-number used as versionCode.
-# Read more about Android versioning at https://developer.android.com/studio/publish/versioning
-# In iOS, build-name is used as CFBundleShortVersionString while build-number is used as CFBundleVersion.
-# Read more about iOS versioning at
-# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-# In Windows, build-name is used as the major, minor, and patch parts
-# of the product and file versions while build-number is used as the build suffix.
-version: 2.4.9+49
+publish_to: 'none'
+version: 2.6.0+60
 
 environment:
   sdk: '>=3.4.0 <4.0.0'
 
-# Dependencies specify other packages that your package needs in order to work.
-# To automatically upgrade your package dependencies to the latest versions
-# consider running `flutter pub upgrade --major-versions`. Alternatively,
-# dependencies can be manually updated by changing the version numbers below to
-# the latest version available on pub.dev. To see which dependencies have newer
-# versions available, run `flutter pub outdated`.
 dependencies:
   flutter:
     sdk: flutter
@@ -38,7 +17,7 @@ dependencies:
   logger: 2.5.0
   flutter_drawing_board: 0.9.5
   flutter_displaymode: 0.6.0
-  fl_chart: 0.69.0
+  fl_chart: 0.69.2
   file_picker: 8.1.4
   local_auth: 2.3.0
   local_auth_android: 1.0.46
@@ -48,7 +27,7 @@ dependencies:
   photo_view: 0.15.0
   package_info_plus: 8.1.1
   uuid: 4.5.1
-  flutter_quill: 10.8.5
+  flutter_quill: 11.0.0-dev.14
   share_plus: 10.1.2
   url_launcher: 6.3.1
   archive: 3.6.1
@@ -73,7 +52,7 @@ dependencies:
   font_awesome_flutter: 10.8.0
   tflite_flutter: 0.11.0
   sliver_tools: 0.2.12
-  lottie: 3.1.3
+  lottie: 3.2.0
   media_kit: 1.1.11
   media_kit_video: 1.2.5
   media_kit_libs_video: 1.0.5
@@ -81,7 +60,7 @@ dependencies:
   cross_file: 0.3.4+2
   fc_native_video_thumbnail: 0.16.1
   flutter_map: 7.0.2
-  flutter_map_tile_caching: 9.1.3
+  flutter_map_tile_caching: 9.1.4
   flutter_map_marker_cluster: 1.4.0
   latlong2: 0.9.1
   shelf: 1.4.2
@@ -96,9 +75,25 @@ dependencies:
   faker: 2.2.0
   flutter_inappwebview: 6.1.5
   flutter_rust_bridge: 2.6.0
-  syncfusion_flutter_sliders: 27.2.2
-
-
+  syncfusion_flutter_sliders: 27.2.5
+  flutter_quill_extensions: 11.0.0-dev.4
+  connectivity_plus: 6.1.0
+  image_picker_android: 0.8.12+18
+  video_player_media_kit: 1.0.5
+  video_player: 2.9.2
+  chewie: 1.8.5
+  http_status_code: 0.0.2
+  pinput: 5.0.0
+  flutter_markdown: 0.7.4+3
+  google_fonts: 6.2.1
+  image_picker_platform_interface: 2.10.0
+  chinese_font_library: 1.2.0
+  flutter_image_compress: 2.3.0
+  mime: 1.0.6
+  auto_size_text_field: 2.2.4
+  webdav_client: 1.2.2
+  confetti: 0.8.0
+  flutter_native_splash: 2.4.3
   flutter_localizations:
     sdk: flutter
   rust_lib_mood_diary:
@@ -108,20 +103,44 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   build_runner: 2.4.13
+  flutter_launcher_icons: 0.14.2
   msix: 3.16.8
-
-  # The "flutter_lints" package below contains a set of recommended lints to
-  # encourage good coding practices. The lint set provided by the package is
-  # activated in the `analysis_options.yaml` file located at the root of your
-  # package. See that file for information about deactivating specific lint
-  # rules and activating additional ones.
   flutter_lints: 5.0.0
 
+flutter_launcher_icons:
+  android: "launcher_icon"
+  ios: true
+  adaptive_icon_background: "#ffffff"
+  adaptive_icon_foreground: "assets/icon/light/light_foreground.png"
+  adaptive_icon_monochrome: "assets/icon/light/light_foreground.png"
+  image_path_ios_dark_transparent: "assets/icon/dark/dark_foreground.png"
+  image_path_ios_tinted_grayscale: "assets/icon/light/light_foreground.png"
+  desaturate_tinted_to_grayscale_ios: true
+  image_path: "assets/icon/light/light_icon.png"
+  remove_alpha_ios: true
+  min_sdk_android: 26
+  windows:
+    generate: true
+    image_path: "assets/icon/light/light_icon.png"
+    icon_size: 48
+  macos:
+    generate: true
+    image_path: "assets/icon/light/light_icon.png"
 
-# For information on the generic Dart part of this file, see the
-# following page: https://dart.dev/tools/pub/pubspec
+flutter_native_splash:
+  color: "#ffffff"
+  image: assets/icon/light/light_splash_icon.png
+  color_dark: "#000000"
+  image_dark: assets/icon/dark/dark_splash_icon.png
+
+  android_12:
+    image: assets/icon/light/light_splash_icon.png
+    color: "#ffffff"
+    image_dark: assets/icon/dark/dark_splash_icon.png
+    color_dark: "#000000"
+
+  web: false
 
-# The following section is specific to Flutter packages.
 flutter:
   generate: true
   fonts:
@@ -130,7 +149,8 @@ flutter:
         - asset: assets/fonts/qweather-icons.ttf
 
   assets:
-    - assets/icon/
+    - assets/icon/dark/
+    - assets/icon/light/
     - assets/lottie/
 
   uses-material-design: true
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
index 335448b..247b0cd 100644
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -977,9 +977,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.70"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
 dependencies = [
  "unicode-ident",
 ]
@@ -1020,9 +1020,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -1240,9 +1240,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.39"
+version = "2.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
index 4918728..afcabff 100644
--- a/rust/Cargo.toml
+++ b/rust/Cargo.toml
@@ -8,7 +8,7 @@ crate-type = ["cdylib", "staticlib"]
 
 [dependencies]
 flutter_rust_bridge = "=2.6.0"
-image = "0.25.2"
+image = "0.25.5"
 fast_image_resize = { version = "5.0.0", features = ["image"] }
 anyhow = "1.0.93"
-bytemuck = "1.16.3"
\ No newline at end of file
+bytemuck = "1.16.3"
diff --git a/rust/src/api/compress.rs b/rust/src/api/compress.rs
index 54794a5..8acc5ae 100644
--- a/rust/src/api/compress.rs
+++ b/rust/src/api/compress.rs
@@ -3,6 +3,7 @@ use std::io::BufWriter;
 use anyhow::Result;
 use fast_image_resize::images::Image;
 use fast_image_resize::{IntoImageView, Resizer};
+
 use flutter_rust_bridge::frb;
 use image::{
     codecs::{
diff --git a/rust/src/api/kmp.rs b/rust/src/api/kmp.rs
new file mode 100644
index 0000000..bfa52f2
--- /dev/null
+++ b/rust/src/api/kmp.rs
@@ -0,0 +1,103 @@
+use flutter_rust_bridge::frb;
+use std::collections::HashMap;
+
+pub fn build_prefix_table(pattern: &[char]) -> Vec<usize> {
+    let m = pattern.len();
+    let mut prefix_table = vec![0; m];
+    let mut j = 0;
+
+    for i in 1..m {
+        while j > 0 && pattern[i] != pattern[j] {
+            j = prefix_table[j - 1];
+        }
+        if pattern[i] == pattern[j] {
+            j += 1;
+        }
+        prefix_table[i] = j;
+    }
+
+    prefix_table
+}
+
+pub fn kmp_search(text: &str, pattern: &str) -> Vec<usize> {
+    let text_chars: Vec<char> = text.chars().collect();
+    let pattern_chars: Vec<char> = pattern.chars().collect();
+    let m = pattern_chars.len();
+    let prefix_table = build_prefix_table(&pattern_chars);
+    let mut matches = Vec::new();
+    let mut j = 0;
+
+    for (i, &c) in text_chars.iter().enumerate() {
+        while j > 0 && c != pattern_chars[j] {
+            j = prefix_table[j - 1];
+        }
+        if c == pattern_chars[j] {
+            j += 1;
+        }
+        if j == m {
+            matches.push(i + 1 - m);
+            j = prefix_table[j - 1];
+        }
+    }
+
+    matches
+}
+
+#[frb(opaque)]
+pub struct Kmp;
+
+impl Kmp {
+    pub fn replace_with_kmp(text: String, replacements: HashMap<String, String>) -> String {
+        if replacements.is_empty() {
+            return text;
+        }
+
+        let mut match_entries: HashMap<usize, (&str, &str)> = HashMap::new();
+
+        for (pattern, replacement) in &replacements {
+            let matches = kmp_search(&text, pattern);
+            for &index in &matches {
+                if !match_entries.contains_key(&index)
+                    || match_entries[&index].0.len() < pattern.len()
+                {
+                    match_entries.insert(index, (pattern, replacement));
+                }
+            }
+        }
+
+        let mut result = String::new();
+        let mut last_index = 0;
+        let mut match_entries: Vec<_> = match_entries.into_iter().collect();
+        match_entries.sort_by_key(|&(index, _)| index);
+
+        let text_chars: Vec<char> = text.chars().collect();
+        for (index, (pattern, replacement)) in match_entries {
+            let start_byte_index = text_chars[..index]
+                .iter()
+                .map(|c| c.len_utf8())
+                .sum::<usize>();
+            let end_byte_index = start_byte_index + pattern.len();
+
+            if start_byte_index >= last_index {
+                result.push_str(&text[last_index..start_byte_index]);
+                result.push_str(replacement);
+                last_index = end_byte_index;
+            }
+        }
+
+        result.push_str(&text[last_index..]);
+        result
+    }
+
+    pub fn find_matches(text: &str, patterns: Vec<String>) -> Vec<String> {
+        let mut matched_patterns = Vec::new();
+
+        for pattern in &patterns {
+            if !kmp_search(text, pattern).is_empty() {
+                matched_patterns.push(pattern.clone());
+            }
+        }
+
+        matched_patterns
+    }
+}
diff --git a/rust/src/api/mod.rs b/rust/src/api/mod.rs
index 93b4567..883b255 100644
--- a/rust/src/api/mod.rs
+++ b/rust/src/api/mod.rs
@@ -1,2 +1,3 @@
 pub mod compress;
-pub mod constants;
\ No newline at end of file
+pub mod constants;
+pub mod kmp;
\ No newline at end of file
diff --git a/rust/src/frb_generated.rs b/rust/src/frb_generated.rs
index e16dfb4..73ddfb5 100644
--- a/rust/src/frb_generated.rs
+++ b/rust/src/frb_generated.rs
@@ -26,6 +26,7 @@
 // Section: imports
 
 use crate::api::compress::*;
+use crate::api::kmp::*;
 use flutter_rust_bridge::for_generated::byteorder::{NativeEndian, ReadBytesExt, WriteBytesExt};
 use flutter_rust_bridge::for_generated::{transform_result_dco, Lifetimeable, Lockable};
 use flutter_rust_bridge::{Handler, IntoIntoDart};
@@ -38,7 +39,7 @@ flutter_rust_bridge::frb_generated_boilerplate!(
     default_rust_auto_opaque = RustAutoOpaqueMoi,
 );
 pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.6.0";
-pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_CONTENT_HASH: i32 = 1782633232;
+pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_CONTENT_HASH: i32 = 444186734;
 
 // Section: executor
 
@@ -92,6 +93,115 @@ fn wire__crate__api__compress__ImageCompress_contain_impl(
         },
     )
 }
+fn wire__crate__api__kmp__Kmp_find_matches_impl(
+    port_: flutter_rust_bridge::for_generated::MessagePort,
+    ptr_: flutter_rust_bridge::for_generated::PlatformGeneralizedUint8ListPtr,
+    rust_vec_len_: i32,
+    data_len_: i32,
+) {
+    FLUTTER_RUST_BRIDGE_HANDLER.wrap_normal::<flutter_rust_bridge::for_generated::SseCodec, _, _>(
+        flutter_rust_bridge::for_generated::TaskInfo {
+            debug_name: "Kmp_find_matches",
+            port: Some(port_),
+            mode: flutter_rust_bridge::for_generated::FfiCallMode::Normal,
+        },
+        move || {
+            let message = unsafe {
+                flutter_rust_bridge::for_generated::Dart2RustMessageSse::from_wire(
+                    ptr_,
+                    rust_vec_len_,
+                    data_len_,
+                )
+            };
+            let mut deserializer =
+                flutter_rust_bridge::for_generated::SseDeserializer::new(message);
+            let api_text = <String>::sse_decode(&mut deserializer);
+            let api_patterns = <Vec<String>>::sse_decode(&mut deserializer);
+            deserializer.end();
+            move |context| {
+                transform_result_sse::<_, ()>((move || {
+                    let output_ok = Result::<_, ()>::Ok(crate::api::kmp::Kmp::find_matches(
+                        &api_text,
+                        api_patterns,
+                    ))?;
+                    Ok(output_ok)
+                })())
+            }
+        },
+    )
+}
+fn wire__crate__api__kmp__Kmp_replace_with_kmp_impl(
+    port_: flutter_rust_bridge::for_generated::MessagePort,
+    ptr_: flutter_rust_bridge::for_generated::PlatformGeneralizedUint8ListPtr,
+    rust_vec_len_: i32,
+    data_len_: i32,
+) {
+    FLUTTER_RUST_BRIDGE_HANDLER.wrap_normal::<flutter_rust_bridge::for_generated::SseCodec, _, _>(
+        flutter_rust_bridge::for_generated::TaskInfo {
+            debug_name: "Kmp_replace_with_kmp",
+            port: Some(port_),
+            mode: flutter_rust_bridge::for_generated::FfiCallMode::Normal,
+        },
+        move || {
+            let message = unsafe {
+                flutter_rust_bridge::for_generated::Dart2RustMessageSse::from_wire(
+                    ptr_,
+                    rust_vec_len_,
+                    data_len_,
+                )
+            };
+            let mut deserializer =
+                flutter_rust_bridge::for_generated::SseDeserializer::new(message);
+            let api_text = <String>::sse_decode(&mut deserializer);
+            let api_replacements =
+                <std::collections::HashMap<String, String>>::sse_decode(&mut deserializer);
+            deserializer.end();
+            move |context| {
+                transform_result_sse::<_, ()>((move || {
+                    let output_ok = Result::<_, ()>::Ok(crate::api::kmp::Kmp::replace_with_kmp(
+                        api_text,
+                        api_replacements,
+                    ))?;
+                    Ok(output_ok)
+                })())
+            }
+        },
+    )
+}
+fn wire__crate__api__kmp__build_prefix_table_impl(
+    port_: flutter_rust_bridge::for_generated::MessagePort,
+    ptr_: flutter_rust_bridge::for_generated::PlatformGeneralizedUint8ListPtr,
+    rust_vec_len_: i32,
+    data_len_: i32,
+) {
+    FLUTTER_RUST_BRIDGE_HANDLER.wrap_normal::<flutter_rust_bridge::for_generated::SseCodec, _, _>(
+        flutter_rust_bridge::for_generated::TaskInfo {
+            debug_name: "build_prefix_table",
+            port: Some(port_),
+            mode: flutter_rust_bridge::for_generated::FfiCallMode::Normal,
+        },
+        move || {
+            let message = unsafe {
+                flutter_rust_bridge::for_generated::Dart2RustMessageSse::from_wire(
+                    ptr_,
+                    rust_vec_len_,
+                    data_len_,
+                )
+            };
+            let mut deserializer =
+                flutter_rust_bridge::for_generated::SseDeserializer::new(message);
+            let api_pattern = <Vec<char>>::sse_decode(&mut deserializer);
+            deserializer.end();
+            move |context| {
+                transform_result_sse::<_, ()>((move || {
+                    let output_ok =
+                        Result::<_, ()>::Ok(crate::api::kmp::build_prefix_table(&api_pattern))?;
+                    Ok(output_ok)
+                })())
+            }
+        },
+    )
+}
 fn wire__crate__api__compress__compress_impl(
     port_: flutter_rust_bridge::for_generated::MessagePort,
     ptr_: flutter_rust_bridge::for_generated::PlatformGeneralizedUint8ListPtr,
@@ -154,6 +264,41 @@ fn wire__crate__api__compress__compress_impl(
         },
     )
 }
+fn wire__crate__api__kmp__kmp_search_impl(
+    port_: flutter_rust_bridge::for_generated::MessagePort,
+    ptr_: flutter_rust_bridge::for_generated::PlatformGeneralizedUint8ListPtr,
+    rust_vec_len_: i32,
+    data_len_: i32,
+) {
+    FLUTTER_RUST_BRIDGE_HANDLER.wrap_normal::<flutter_rust_bridge::for_generated::SseCodec, _, _>(
+        flutter_rust_bridge::for_generated::TaskInfo {
+            debug_name: "kmp_search",
+            port: Some(port_),
+            mode: flutter_rust_bridge::for_generated::FfiCallMode::Normal,
+        },
+        move || {
+            let message = unsafe {
+                flutter_rust_bridge::for_generated::Dart2RustMessageSse::from_wire(
+                    ptr_,
+                    rust_vec_len_,
+                    data_len_,
+                )
+            };
+            let mut deserializer =
+                flutter_rust_bridge::for_generated::SseDeserializer::new(message);
+            let api_text = <String>::sse_decode(&mut deserializer);
+            let api_pattern = <String>::sse_decode(&mut deserializer);
+            deserializer.end();
+            move |context| {
+                transform_result_sse::<_, ()>((move || {
+                    let output_ok =
+                        Result::<_, ()>::Ok(crate::api::kmp::kmp_search(&api_text, &api_pattern))?;
+                    Ok(output_ok)
+                })())
+            }
+        },
+    )
+}
 
 // Section: related_funcs
 
@@ -163,6 +308,9 @@ flutter_rust_bridge::frb_generated_moi_arc_impl_value!(
 flutter_rust_bridge::frb_generated_moi_arc_impl_value!(
     flutter_rust_bridge::for_generated::RustAutoOpaqueInner<ImageCompress>
 );
+flutter_rust_bridge::frb_generated_moi_arc_impl_value!(
+    flutter_rust_bridge::for_generated::RustAutoOpaqueInner<Kmp>
+);
 
 // Section: dart2rust
 
@@ -184,6 +332,30 @@ impl SseDecode for ImageCompress {
     }
 }
 
+impl SseDecode for Kmp {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
+        let mut inner = <RustOpaqueMoi<flutter_rust_bridge::for_generated::RustAutoOpaqueInner<Kmp>>>::sse_decode(deserializer);
+        return flutter_rust_bridge::for_generated::rust_auto_opaque_decode_owned(inner);
+    }
+}
+
+impl SseDecode for char {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
+        let mut inner = <String>::sse_decode(deserializer);
+        return inner.chars().next().unwrap();
+    }
+}
+
+impl SseDecode for std::collections::HashMap<String, String> {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
+        let mut inner = <Vec<(String, String)>>::sse_decode(deserializer);
+        return inner.into_iter().collect();
+    }
+}
+
 impl SseDecode
     for RustOpaqueMoi<flutter_rust_bridge::for_generated::RustAutoOpaqueInner<DynamicImage>>
 {
@@ -204,6 +376,14 @@ impl SseDecode
     }
 }
 
+impl SseDecode for RustOpaqueMoi<flutter_rust_bridge::for_generated::RustAutoOpaqueInner<Kmp>> {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
+        let mut inner = <usize>::sse_decode(deserializer);
+        return decode_rust_opaque_moi(inner);
+    }
+}
+
 impl SseDecode for String {
     // Codec=Sse (Serialization based), see doc to use other codecs
     fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
@@ -232,6 +412,30 @@ impl SseDecode for i32 {
     }
 }
 
+impl SseDecode for Vec<char> {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
+        let mut len_ = <i32>::sse_decode(deserializer);
+        let mut ans_ = vec![];
+        for idx_ in 0..len_ {
+            ans_.push(<char>::sse_decode(deserializer));
+        }
+        return ans_;
+    }
+}
+
+impl SseDecode for Vec<String> {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
+        let mut len_ = <i32>::sse_decode(deserializer);
+        let mut ans_ = vec![];
+        for idx_ in 0..len_ {
+            ans_.push(<String>::sse_decode(deserializer));
+        }
+        return ans_;
+    }
+}
+
 impl SseDecode for Vec<u8> {
     // Codec=Sse (Serialization based), see doc to use other codecs
     fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
@@ -244,6 +448,30 @@ impl SseDecode for Vec<u8> {
     }
 }
 
+impl SseDecode for Vec<usize> {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
+        let mut len_ = <i32>::sse_decode(deserializer);
+        let mut ans_ = vec![];
+        for idx_ in 0..len_ {
+            ans_.push(<usize>::sse_decode(deserializer));
+        }
+        return ans_;
+    }
+}
+
+impl SseDecode for Vec<(String, String)> {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
+        let mut len_ = <i32>::sse_decode(deserializer);
+        let mut ans_ = vec![];
+        for idx_ in 0..len_ {
+            ans_.push(<(String, String)>::sse_decode(deserializer));
+        }
+        return ans_;
+    }
+}
+
 impl SseDecode for Option<crate::api::constants::CompressFormat> {
     // Codec=Sse (Serialization based), see doc to use other codecs
     fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
@@ -279,6 +507,15 @@ impl SseDecode for Option<u8> {
     }
 }
 
+impl SseDecode for (String, String) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
+        let mut var_field0 = <String>::sse_decode(deserializer);
+        let mut var_field1 = <String>::sse_decode(deserializer);
+        return (var_field0, var_field1);
+    }
+}
+
 impl SseDecode for u32 {
     // Codec=Sse (Serialization based), see doc to use other codecs
     fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
@@ -293,6 +530,11 @@ impl SseDecode for u8 {
     }
 }
 
+impl SseDecode for () {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {}
+}
+
 impl SseDecode for usize {
     // Codec=Sse (Serialization based), see doc to use other codecs
     fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
@@ -322,7 +564,11 @@ fn pde_ffi_dispatcher_primary_impl(
             rust_vec_len,
             data_len,
         ),
-        2 => wire__crate__api__compress__compress_impl(port, ptr, rust_vec_len, data_len),
+        2 => wire__crate__api__kmp__Kmp_find_matches_impl(port, ptr, rust_vec_len, data_len),
+        3 => wire__crate__api__kmp__Kmp_replace_with_kmp_impl(port, ptr, rust_vec_len, data_len),
+        4 => wire__crate__api__kmp__build_prefix_table_impl(port, ptr, rust_vec_len, data_len),
+        5 => wire__crate__api__compress__compress_impl(port, ptr, rust_vec_len, data_len),
+        6 => wire__crate__api__kmp__kmp_search_impl(port, ptr, rust_vec_len, data_len),
         _ => unreachable!(),
     }
 }
@@ -356,6 +602,21 @@ impl flutter_rust_bridge::IntoIntoDart<FrbWrapper<ImageCompress>> for ImageCompr
     }
 }
 
+// Codec=Dco (DartCObject based), see doc to use other codecs
+impl flutter_rust_bridge::IntoDart for FrbWrapper<Kmp> {
+    fn into_dart(self) -> flutter_rust_bridge::for_generated::DartAbi {
+        flutter_rust_bridge::for_generated::rust_auto_opaque_encode::<_, MoiArc<_>>(self.0)
+            .into_dart()
+    }
+}
+impl flutter_rust_bridge::for_generated::IntoDartExceptPrimitive for FrbWrapper<Kmp> {}
+
+impl flutter_rust_bridge::IntoIntoDart<FrbWrapper<Kmp>> for Kmp {
+    fn into_into_dart(self) -> FrbWrapper<Kmp> {
+        self.into()
+    }
+}
+
 // Codec=Dco (DartCObject based), see doc to use other codecs
 impl flutter_rust_bridge::IntoDart for crate::api::constants::CompressFormat {
     fn into_dart(self) -> flutter_rust_bridge::for_generated::DartAbi {
@@ -393,6 +654,30 @@ impl SseEncode for ImageCompress {
     }
 }
 
+impl SseEncode for Kmp {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
+        <RustOpaqueMoi<flutter_rust_bridge::for_generated::RustAutoOpaqueInner<Kmp>>>::sse_encode(
+            flutter_rust_bridge::for_generated::rust_auto_opaque_encode::<_, MoiArc<_>>(self),
+            serializer,
+        );
+    }
+}
+
+impl SseEncode for char {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
+        <String>::sse_encode(self.to_string(), serializer);
+    }
+}
+
+impl SseEncode for std::collections::HashMap<String, String> {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
+        <Vec<(String, String)>>::sse_encode(self.into_iter().collect(), serializer);
+    }
+}
+
 impl SseEncode
     for RustOpaqueMoi<flutter_rust_bridge::for_generated::RustAutoOpaqueInner<DynamicImage>>
 {
@@ -415,6 +700,15 @@ impl SseEncode
     }
 }
 
+impl SseEncode for RustOpaqueMoi<flutter_rust_bridge::for_generated::RustAutoOpaqueInner<Kmp>> {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
+        let (ptr, size) = self.sse_encode_raw();
+        <usize>::sse_encode(ptr, serializer);
+        <i32>::sse_encode(size, serializer);
+    }
+}
+
 impl SseEncode for String {
     // Codec=Sse (Serialization based), see doc to use other codecs
     fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
@@ -446,6 +740,26 @@ impl SseEncode for i32 {
     }
 }
 
+impl SseEncode for Vec<char> {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
+        <i32>::sse_encode(self.len() as _, serializer);
+        for item in self {
+            <char>::sse_encode(item, serializer);
+        }
+    }
+}
+
+impl SseEncode for Vec<String> {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
+        <i32>::sse_encode(self.len() as _, serializer);
+        for item in self {
+            <String>::sse_encode(item, serializer);
+        }
+    }
+}
+
 impl SseEncode for Vec<u8> {
     // Codec=Sse (Serialization based), see doc to use other codecs
     fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
@@ -456,6 +770,26 @@ impl SseEncode for Vec<u8> {
     }
 }
 
+impl SseEncode for Vec<usize> {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
+        <i32>::sse_encode(self.len() as _, serializer);
+        for item in self {
+            <usize>::sse_encode(item, serializer);
+        }
+    }
+}
+
+impl SseEncode for Vec<(String, String)> {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
+        <i32>::sse_encode(self.len() as _, serializer);
+        for item in self {
+            <(String, String)>::sse_encode(item, serializer);
+        }
+    }
+}
+
 impl SseEncode for Option<crate::api::constants::CompressFormat> {
     // Codec=Sse (Serialization based), see doc to use other codecs
     fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
@@ -486,6 +820,14 @@ impl SseEncode for Option<u8> {
     }
 }
 
+impl SseEncode for (String, String) {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
+        <String>::sse_encode(self.0, serializer);
+        <String>::sse_encode(self.1, serializer);
+    }
+}
+
 impl SseEncode for u32 {
     // Codec=Sse (Serialization based), see doc to use other codecs
     fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
@@ -500,6 +842,11 @@ impl SseEncode for u8 {
     }
 }
 
+impl SseEncode for () {
+    // Codec=Sse (Serialization based), see doc to use other codecs
+    fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {}
+}
+
 impl SseEncode for usize {
     // Codec=Sse (Serialization based), see doc to use other codecs
     fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
@@ -526,6 +873,7 @@ mod io {
 
     use super::*;
     use crate::api::compress::*;
+    use crate::api::kmp::*;
     use flutter_rust_bridge::for_generated::byteorder::{
         NativeEndian, ReadBytesExt, WriteBytesExt,
     };
@@ -563,6 +911,20 @@ mod io {
     ) {
         MoiArc::<flutter_rust_bridge::for_generated::RustAutoOpaqueInner<ImageCompress>>::decrement_strong_count(ptr as _);
     }
+
+    #[no_mangle]
+    pub extern "C" fn frbgen_mood_diary_rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmp(
+        ptr: *const std::ffi::c_void,
+    ) {
+        MoiArc::<flutter_rust_bridge::for_generated::RustAutoOpaqueInner<Kmp>>::increment_strong_count(ptr as _);
+    }
+
+    #[no_mangle]
+    pub extern "C" fn frbgen_mood_diary_rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmp(
+        ptr: *const std::ffi::c_void,
+    ) {
+        MoiArc::<flutter_rust_bridge::for_generated::RustAutoOpaqueInner<Kmp>>::decrement_strong_count(ptr as _);
+    }
 }
 use image::DynamicImage;
 #[cfg(not(target_family = "wasm"))]
@@ -578,6 +940,7 @@ mod web {
 
     use super::*;
     use crate::api::compress::*;
+    use crate::api::kmp::*;
     use flutter_rust_bridge::for_generated::byteorder::{
         NativeEndian, ReadBytesExt, WriteBytesExt,
     };
@@ -617,6 +980,20 @@ mod web {
     ) {
         MoiArc::<flutter_rust_bridge::for_generated::RustAutoOpaqueInner<ImageCompress>>::decrement_strong_count(ptr as _);
     }
+
+    #[wasm_bindgen]
+    pub fn rust_arc_increment_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmp(
+        ptr: *const std::ffi::c_void,
+    ) {
+        MoiArc::<flutter_rust_bridge::for_generated::RustAutoOpaqueInner<Kmp>>::increment_strong_count(ptr as _);
+    }
+
+    #[wasm_bindgen]
+    pub fn rust_arc_decrement_strong_count_RustOpaque_flutter_rust_bridgefor_generatedRustAutoOpaqueInnerKmp(
+        ptr: *const std::ffi::c_void,
+    ) {
+        MoiArc::<flutter_rust_bridge::for_generated::RustAutoOpaqueInner<Kmp>>::decrement_strong_count(ptr as _);
+    }
 }
 #[cfg(target_family = "wasm")]
 pub use web::*;
diff --git a/server/build.gradle.kts b/server/build.gradle.kts
index 8603523..0036cf5 100644
--- a/server/build.gradle.kts
+++ b/server/build.gradle.kts
@@ -1,6 +1,7 @@
 val koin_version: String by project
 val kotlin_version: String by project
 val logback_version: String by project
+val mongodb_version: String by project
 
 plugins {
     kotlin("jvm") version "2.0.21"
@@ -34,6 +35,8 @@ dependencies {
     implementation("io.ktor:ktor-server-netty-jvm")
     implementation("ch.qos.logback:logback-classic:$logback_version")
     implementation("io.ktor:ktor-server-config-yaml-jvm")
+    implementation("org.mongodb:mongodb-driver-kotlin-coroutine:$mongodb_version")
     testImplementation("io.ktor:ktor-server-test-host-jvm")
     testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
+
 }
diff --git a/server/gradle.properties b/server/gradle.properties
index dd47831..0b46d18 100644
--- a/server/gradle.properties
+++ b/server/gradle.properties
@@ -3,3 +3,4 @@ koin_version=3.5.6
 kotlin_version=2.0.21
 ktor_version=3.0.1
 logback_version=1.4.14
+mongodb_version=5.2.0
\ No newline at end of file
diff --git a/server/src/main/kotlin/cn/yooss/Frameworks.kt b/server/src/main/kotlin/cn/yooss/Frameworks.kt
index ec59b4d..6146308 100644
--- a/server/src/main/kotlin/cn/yooss/Frameworks.kt
+++ b/server/src/main/kotlin/cn/yooss/Frameworks.kt
@@ -9,11 +9,7 @@ fun Application.configureFrameworks() {
     install(Koin) {
         slf4jLogger()
         modules(module {
-            single<HelloService> {
-                HelloService {
-                    println(environment.log.info("Hello, World!"))
-                }
-            }
+
         })
     }
 }
diff --git a/server/src/main/kotlin/cn/yooss/HelloService.kt b/server/src/main/kotlin/cn/yooss/HelloService.kt
deleted file mode 100644
index 772c01d..0000000
--- a/server/src/main/kotlin/cn/yooss/HelloService.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package cn.yooss
-
-fun interface HelloService {
-    fun sayHello()
-}
diff --git a/server/src/main/kotlin/cn/yooss/util/DatabaseUtil.kt b/server/src/main/kotlin/cn/yooss/util/DatabaseUtil.kt
new file mode 100644
index 0000000..2e9e65d
--- /dev/null
+++ b/server/src/main/kotlin/cn/yooss/util/DatabaseUtil.kt
@@ -0,0 +1,44 @@
+package cn.yooss.util
+
+/*
+ * Author: ZhuJHua
+ * Date: 2024/11/25 22:08
+ * Description: Database
+ */
+
+import com.mongodb.ConnectionString
+import com.mongodb.MongoClientSettings
+import com.mongodb.ServerApi
+import com.mongodb.ServerApiVersion
+import com.mongodb.kotlin.client.coroutine.MongoClient
+import kotlinx.coroutines.runBlocking
+import org.bson.Document
+
+
+object MongoClientConnectionExample {
+
+    fun main() {
+        // Replace the placeholders with your credentials and hostname
+        val connectionString =
+            ""
+
+        val serverApi = ServerApi.builder()
+            .version(ServerApiVersion.V1)
+            .build()
+
+        val mongoClientSettings = MongoClientSettings.builder()
+            .applyConnectionString(ConnectionString(connectionString))
+            .serverApi(serverApi)
+            .build()
+
+        // Create a new client and connect to the server
+        MongoClient.create(mongoClientSettings).use { mongoClient ->
+            val database = mongoClient.getDatabase("admin")
+            runBlocking {
+                database.runCommand(Document("ping", 1))
+            }
+            println("Pinged your deployment. You successfully connected to MongoDB!")
+        }
+    }
+
+}
diff --git a/server/src/test/kotlin/cn/yooss/ApplicationTest.kt b/server/src/test/kotlin/cn/yooss/ApplicationTest.kt
index 45f80ab..98ae731 100644
--- a/server/src/test/kotlin/cn/yooss/ApplicationTest.kt
+++ b/server/src/test/kotlin/cn/yooss/ApplicationTest.kt
@@ -1,10 +1,7 @@
 package cn.yooss
 
-import io.ktor.client.request.*
-import io.ktor.client.statement.*
-import io.ktor.http.*
 import io.ktor.server.testing.*
-import kotlin.test.*
+import kotlin.test.Test
 
 class ApplicationTest {
     @Test
@@ -12,9 +9,6 @@ class ApplicationTest {
         application {
             configureRouting()
         }
-        client.get("/").apply {
-            assertEquals(HttpStatusCode.OK, status)
-            assertEquals("Hello World!", bodyAsText())
-        }
+
     }
 }
diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc
index 7f5b874..e13a1cc 100644
--- a/windows/flutter/generated_plugin_registrant.cc
+++ b/windows/flutter/generated_plugin_registrant.cc
@@ -9,10 +9,12 @@
 #include <app_links/app_links_plugin_c_api.h>
 #include <audioplayers_windows/audioplayers_windows_plugin.h>
 #include <bitsdojo_window_windows/bitsdojo_window_plugin.h>
+#include <connectivity_plus/connectivity_plus_windows_plugin.h>
 #include <dynamic_color/dynamic_color_plugin_c_api.h>
 #include <fc_native_video_thumbnail/fc_native_video_thumbnail_plugin_c_api.h>
 #include <file_selector_windows/file_selector_windows.h>
 #include <flutter_inappwebview_windows/flutter_inappwebview_windows_plugin_c_api.h>
+#include <gal/gal_plugin_c_api.h>
 #include <geolocator_windows/geolocator_windows.h>
 #include <isar_flutter_libs/isar_flutter_libs_plugin.h>
 #include <local_auth_windows/local_auth_plugin.h>
@@ -32,6 +34,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
       registry->GetRegistrarForPlugin("AudioplayersWindowsPlugin"));
   BitsdojoWindowPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("BitsdojoWindowPlugin"));
+    ConnectivityPlusWindowsPluginRegisterWithRegistrar(
+            registry->GetRegistrarForPlugin("ConnectivityPlusWindowsPlugin"));
   DynamicColorPluginCApiRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("DynamicColorPluginCApi"));
   FcNativeVideoThumbnailPluginCApiRegisterWithRegistrar(
@@ -40,6 +44,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
       registry->GetRegistrarForPlugin("FileSelectorWindows"));
   FlutterInappwebviewWindowsPluginCApiRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("FlutterInappwebviewWindowsPluginCApi"));
+    GalPluginCApiRegisterWithRegistrar(
+            registry->GetRegistrarForPlugin("GalPluginCApi"));
   GeolocatorWindowsRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("GeolocatorWindows"));
   IsarFlutterLibsPluginRegisterWithRegistrar(
diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake
index 428b6a4..09b872d 100644
--- a/windows/flutter/generated_plugins.cmake
+++ b/windows/flutter/generated_plugins.cmake
@@ -6,10 +6,12 @@ list(APPEND FLUTTER_PLUGIN_LIST
   app_links
   audioplayers_windows
   bitsdojo_window_windows
+        connectivity_plus
   dynamic_color
   fc_native_video_thumbnail
   file_selector_windows
   flutter_inappwebview_windows
+        gal
   geolocator_windows
   isar_flutter_libs
   local_auth_windows
diff --git a/windows/runner/resources/app_icon.ico b/windows/runner/resources/app_icon.ico
index b7e9486..e2108eb 100644
Binary files a/windows/runner/resources/app_icon.ico and b/windows/runner/resources/app_icon.ico differ