chore: prerelease 0.1.2 (#2134 )

chore: release 0.1.2 (#2129 )
fix: update calendar selected range (#2123 )
2023-03-29 15:14:28 +08:00 · 2023-03-28 18:37:08 +08:00 · 2023-03-28 14:34:00 +08:00 · 2023-03-28 13:00:20 +08:00 · 2023-03-22 13:12:16 +08:00 · 2023-03-21 20:22:16 +08:00
974 changed files with 42953 additions and 14132 deletions
@@ -1 +1,4 @@
-.git
+frontend/appflowy_flutter/
+frontend/scripts/
+frontend/rust-lib/target
+shared-lib/target/
@@ -1,27 +0,0 @@
-<!---
-Thank you for submitting a pull request to AppFlowy. The team will dedicate their best efforts to reviewing and approving your pull request. If you have any questions about the project or feedback for us, please join our [Discord](https://discord.gg/wdjWUXXhtw).
-->
-
-<!---
-If your pull request adds a new feature, please drag and drop a video into this section to showcase what you've done! If not, you may delete this section.
-->
-
-### Feature Preview
-
-<!---
-List at least one issue here that this PR addresses. If it fixes the issue, please use the [fixes](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests) keyword to close the issue. For example:
-fixes https://github.com/AppFlowy-IO/AppFlowy/pull/2106
-->
-
---
-
-<!---
-Before you mark this PR ready for review, run through this checklist!
-->
-
-#### PR Checklist
-
- [ ] My code adheres to the [AppFlowy Style Guide](https://appflowy.gitbook.io/docs/essential-documentation/contribute-to-appflowy/software-contributions/submitting-code/style-guides)
- [ ] I've listed at least one issue that this PR fixes in the description above.
- [ ] I've added a test(s) to validate changes in this PR, or this PR only contains semantic changes.
- [ ] All existing tests are passing.
@@ -0,0 +1,52 @@
+name: AppFlowyEditor test
+
+on:
+  push:
+    branches:
+      - "main"
+      - "release/*"
+
+  pull_request:
+    branches:
+      - "main"
+      - "release/*"
+    paths:
+      - "frontend/appflowy_flutter/packages/appflowy_editor/**"
+
+env:
+  CARGO_TERM_COLOR: always
+  FLUTTER_VERSION: "3.3.9"
+
+jobs:
+  tests:
+    strategy:
+      matrix:
+        os: [macos-latest, ubuntu-latest, windows-latest]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: subosito/flutter-action@v2
+        with:
+          channel: "stable"
+          flutter-version: ${{ env.FLUTTER_VERSION }}
+          cache: true
+
+      - name: Run FlowyEditor tests
+        working-directory: frontend/appflowy_flutter/packages/appflowy_editor
+        run: |
+          flutter pub get
+          flutter format --set-exit-if-changed .
+          flutter analyze .
+          flutter test --coverage
+
+      - uses: codecov/codecov-action@v3
+        with: 
+          name: appflowy_editor
+          flags: appflowy_editor
+          env_vars: ${{ matrix.os }}
+          fail_ci_if_error: true
+          verbose: true
+
@@ -1,47 +0,0 @@
-name: Docker-CI
-
-on:
-  push:
-    branches:
-      - main
-      - release/*
-    paths:
-      - frontend/**
-
-  pull_request:
-    branches:
-      - main
-      - release/*
-    paths:
-      - frontend/**
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - unlocked
-      - ready_for_review
-
-jobs:
-  build-app:
-    if: github.event.pull_request.draft != true
-    concurrency: 
-      group: docker_ci-${{ github.event.pull_request.number || github.ref }}
-      cancel-in-progress: true
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout source code
-        uses: actions/checkout@v3
-
-      - name: Build the app
-        shell: bash
-        run: |
-          set -eu -o pipefail
-          cd frontend/scripts/docker-buildfiles
-          docker-compose build --no-cache --progress=plain \
-          | while read line; do \
-              if [[ "$line" =~ ^Step[[:space:]] ]]; then \
-                echo "$(date -u '+%H:%M:%S') | $line"; \
-              else \
-                echo "$line"; \
-              fi; \
-            done \
@@ -16,7 +16,7 @@ on:
      - "frontend/**"

 env:
-  FLUTTER_VERSION: "3.7.5"
+  FLUTTER_VERSION: "3.3.9"
  RUST_TOOLCHAIN: "1.65"

 jobs:
@@ -99,8 +99,7 @@ jobs:

      - name: Flutter Analyzer
        working-directory: frontend/appflowy_flutter
-        run: |
-          flutter analyze .
+        run: flutter analyze

      - name: Run Flutter unit tests
        working-directory: frontend
@@ -22,7 +22,7 @@ jobs:
  tests:
    strategy:
      matrix:
-        os: [ubuntu-latest]
+        os: [macos-latest]

    runs-on: ${{ matrix.os }}

@@ -35,7 +35,7 @@ jobs:
      - uses: subosito/flutter-action@v2
        with:
          channel: "stable"
-          flutter-version: "3.7.5"
+          flutter-version: "3.3.9"
          cache: true

      - name: Cache Cargo
@@ -56,16 +56,15 @@ jobs:

      - name: Setup Environment
        run: |
-          cargo install --force cargo-make
-          cargo install --force duckscript_cli
          if [ "$RUNNER_OS" == "Linux" ]; then
            sudo wget -qO /etc/apt/trusted.gpg.d/dart_linux_signing_key.asc https://dl-ssl.google.com/linux/linux_signing_key.pub
            sudo wget -qO /etc/apt/sources.list.d/dart_stable.list https://storage.googleapis.com/download.dartlang.org/linux/debian/dart_stable.list
            sudo apt-get update
-            sudo apt-get install -y dart curl build-essential libssl-dev clang cmake ninja-build pkg-config libgtk-3-dev
+            sudo apt-get install -y dart curl build-essential libsqlite3-dev libssl-dev clang cmake ninja-build pkg-config libgtk-3-dev
            sudo apt-get install keybinder-3.0
          elif [ "$RUNNER_OS" == "Windows" ]; then
            vcpkg integrate install
+            cargo install --force duckscript_cli
          elif [ "$RUNNER_OS" == "macOS" ]; then
            echo 'do nothing'
          fi
@@ -78,6 +77,17 @@ jobs:
          cargo install cargo-make
          cargo make appflowy-flutter-deps-tools

+      - name: Build Test lib
+        working-directory: frontend
+        run: |
+          if [ "$RUNNER_OS" == "Linux" ]; then
+            cargo make --profile production-linux-x86_64 appflowy
+          elif [ "$RUNNER_OS" == "macOS" ]; then
+            cargo make --profile production-mac-x86_64 appflowy
+          elif [ "$RUNNER_OS" == "Windows" ]; then
+            cargo make --profile production-windows-x86 appflowy
+          fi
+
      - name: Config Flutter
        run: |
          if [ "$RUNNER_OS" == "Linux" ]; then
@@ -89,37 +99,30 @@ jobs:
          fi
        shell: bash

-      - name: Build Test lib
-        working-directory: frontend
+      - name: Flutter Code Generation
+        working-directory: frontend/appflowy_flutter
        run: |
-          if [ "$RUNNER_OS" == "Linux" ]; then
-            cargo make --profile development-linux-x86_64 appflowy-dev
-          elif [ "$RUNNER_OS" == "macOS" ]; then
-            cargo make --profile development-mac-x86_64 appflowy-dev
-          elif [ "$RUNNER_OS" == "Windows" ]; then
-            cargo make --profile development-windows-x86 appflowy-dev
-          fi
-        shell: bash
+          flutter packages pub get
+          flutter packages pub run easy_localization:generate -f keys -o locale_keys.g.dart -S assets/translations -s en.json
+          flutter packages pub run build_runner build --delete-conflicting-outputs

      - name: Run AppFlowy tests
        working-directory: frontend/appflowy_flutter
        run: |
          if [ "$RUNNER_OS" == "Linux" ]; then
-            export DISPLAY=:99
-            sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
-            sudo apt-get install network-manager
-            flutter test integration_test/runner.dart -d Linux --coverage --verbose
+            flutter test integration_test -d Linux --coverage
          elif [ "$RUNNER_OS" == "macOS" ]; then
-            flutter test integration_test/runner.dart -d macOS --coverage --verbose
+            flutter test integration_test -d macOS --coverage
          elif [ "$RUNNER_OS" == "Windows" ]; then
-            flutter test integration_test/runner.dart -d Windows --coverage --verbose
+            flutter test integration_test -d Windows --coverage
          fi
        shell: bash

-      # - uses: codecov/codecov-action@v3
-      #   with:
-      #     name: appflowy
-      #     flags: appflowy
-      #     env_vars: ${{ matrix.os }}
-      #     fail_ci_if_error: true
-      #     verbose: true
+      - uses: codecov/codecov-action@v3
+        with: 
+          name: appflowy
+          flags: appflowy
+          env_vars: ${{ matrix.os }}
+          fail_ci_if_error: true
+          verbose: true
+
@@ -3,10 +3,10 @@ name: release
 on:
  push:
    tags:
-      - "*"
+      - '*'

 env:
-  FLUTTER_VERSION: "3.7.5"
+  FLUTTER_VERSION: "3.3.9"
  RUST_TOOLCHAIN: "1.65"

 jobs:
@@ -136,11 +136,7 @@ jobs:
      fail-fast: false
      matrix:
        job:
-          - {
-              target: x86_64-apple-darwin,
-              os: macos-10.15,
-              extra-build-args: "",
-            }
+          - { target: x86_64-apple-darwin, os: macos-10.15, extra-build-args: "" }
    steps:
      - name: Checkout source code
        uses: actions/checkout@v3
@@ -176,7 +172,7 @@ jobs:
        working-directory: frontend
        run: |
          flutter config --enable-macos-desktop
-          dart ./scripts/flutter_release_build/build_flowy.dart . ${{ github.ref_name }}
+          cargo make --env APP_VERSION=${{ github.ref_name }} --profile production-mac-x86_64 appflowy

      - name: Create macOS dmg
        run: |
@@ -229,21 +225,9 @@ jobs:
      fail-fast: false
      matrix:
        job:
-          - {
-              arch: x86_64,
-              target: x86_64-unknown-linux-gnu,
-              os: ubuntu-20.04,
-              extra-build-args: "",
-              flutter_profile: production-linux-x86_64,
-            }
+          - { arch: x86_64, target: x86_64-unknown-linux-gnu, os: ubuntu-20.04, extra-build-args: "", flutter_profile: production-linux-x86_64 }
          # - { arch: aarch64, target: aarch64-unknown-linux-gnu, os: ubuntu-20.04, extra-build-args: "", flutter_profile: production-linux-aarch64 }
-          - {
-              arch: x86_64,
-              target: x86_64-unknown-linux-gnu,
-              os: ubuntu-18.04,
-              extra-build-args: "",
-              flutter_profile: production-linux-x86_64,
-            }
+          - { arch: x86_64, target: x86_64-unknown-linux-gnu, os: ubuntu-18.04, extra-build-args: "", flutter_profile: production-linux-x86_64}
    steps:
      - name: Checkout source code
        uses: actions/checkout@v3
@@ -291,7 +275,7 @@ jobs:
        working-directory: frontend
        run: |
          flutter config --enable-linux-desktop
-          dart ./scripts/flutter_release_build/build_flowy.dart . ${{ github.ref_name }}
+          cargo make --env APP_VERSION=${{ github.ref_name }} --profile ${{ matrix.job.flutter_profile}} appflowy

      - name: Archive Assert
        working-directory: ${{ env.LINUX_APP_RELEASE_PATH }}
@@ -376,5 +360,5 @@ jobs:
    steps:
      - name: Notify Discord
        run: |
-          curl -H "Content-Type: application/json" -d '{"username": "release@appflowy", "content": "🎉 AppFlowy ${{ github.ref_name }} is available. https://github.com/AppFlowy-IO/AppFlowy/releases/tag/'${{ github.ref_name }}'"}' "https://discord.com/api/webhooks/${{ secrets.DISCORD }}"
-        shell: bash
+          curl -H "Content-Type: application/json" -d '{"username": "release@appflowy", "content": "🎉 AppFlowy ${{ github.ref_name }} is available. https://github.com/LucasXu0/AppFlowy/releases/tag/'${{ github.ref_name }}'"}' "https://discord.com/api/webhooks/${{ secrets.DISCORD }}"
+        shell: bash
@@ -20,7 +20,7 @@ on:
 env:
  CARGO_TERM_COLOR: always
  RUST_TOOLCHAIN: "1.65"
-  FLUTTER_VERSION: "3.7.5"
+  FLUTTER_VERSION: "3.3.9"

 jobs:
  test-on-ubuntu:
@@ -11,7 +11,7 @@ on:

 env:
  CARGO_TERM_COLOR: always
-  FLUTTER_VERSION: "3.7.5"
+  FLUTTER_VERSION: "3.3.9"
  RUST_TOOLCHAIN: "1.65"

 jobs:
@@ -1,15 +1,5 @@
 # Release Notes

-## Version 0.1.3 - 24/04/2023
-
-### New features
- Launch the official Dark Mode.
- Customize the font color and highlight color by setting a hex color value and an opacity level.
-
-### Bug Fixes
- Fix: the slash menu can be triggered by all other keyboards than English.
- Fix: convert the single asterisk to italic text and the double asterisks to bold text.
-
 ## Version 0.1.2 - 03/28/2023

 ### Bug Fixes
@@ -44,16 +44,16 @@ You are in charge of your data and customizations.
 <p align="center"><img src="https://github.com/AppFlowy-IO/appflowy/blob/main/doc/imgs/howtostar.gif" alt="AppFlowy Github - how to star the repo" width="100%" /></p>

 ## Getting Started with development
-
 Please view the [documentation](https://appflowy.gitbook.io/docs/essential-documentation/contribute-to-appflowy) for OS specific development instructions

 ## Roadmap

-* [AppFlowy Roadmap ReadMe](https://appflowy.gitbook.io/docs/essential-documentation/roadmap)
-* [AppFlowy Public Roadmap](https://github.com/orgs/AppFlowy-IO/projects/5/views/12)
+- [AppFlowy Roadmap ReadMe](https://appflowy.gitbook.io/docs/essential-documentation/roadmap)
+- [AppFlowy Public Roadmap](https://github.com/orgs/AppFlowy-IO/projects/5/views/12)
+

 If you'd like to propose a feature, submit a feature request [here](https://github.com/AppFlowy-IO/AppFlowy/issues/new?assignees=&labels=&template=feature_request.yaml&title=%5BFR%5D+) <br/>
-If you'd like to report a bug, submit a bug report [here](https://github.com/AppFlowy-IO/AppFlowy/issues/new?assignees=&labels=&template=bug_report.yaml&title=%5BBug%5D+)
+If you'd like to report a bug, submit bug report [here](https://github.com/AppFlowy-IO/AppFlowy/issues/new?assignees=&labels=&template=bug_report.yaml&title=%5BBug%5D+)

 ## **Releases**

@@ -61,37 +61,37 @@ Please see the [changelog](https://www.appflowy.io/whatsnew) for more details ab

 ## Contributing

-Contributions make the open-source community a fantastic place to learn, inspire, and create. Any contributions you make are **greatly appreciated**. Please look at [Contributing to AppFlowy](https://appflowy.gitbook.io/docs/essential-documentation/contribute-to-appflowy/contributing-to-appflowy) for details.
+Contributions are what make the open source community such an amazing place to be learn, inspire, and create. Any contributions you make are **greatly appreciated**. Please look at [Contributing to AppFlowy](https://appflowy.gitbook.io/docs/essential-documentation/contribute-to-appflowy/contributing-to-appflowy) for details.

-If your Pull Request is accepted as it fixes a bug, adds functionality, or makes AppFlowy's codebase significantly easier to use or understand, **Congratulations!** If your administrative and managerial work behind the scenes sustains the community, **Congratulations!** You are now an official contributor to AppFlowy. Get in touch with us ([link](https://tally.so/r/mKP5z3)) to receive the very special Contributor T-shirt!
+If your Pull Request is accepted as it fixes a bug, adds functionality, or makes AppFlowy's codebase significantly easier to use or understand, congratulations! If your administrative and managerial work behind the scenes that sustains the community as a whole, congratulations! You are now an official contributor to AppFlowy. Get in touch with us ([link](https://tally.so/r/mKP5z3)) to receive the very special Contributor T-shirt!
 Proudly wear your T-shirt and show it to us by tagging [@appflowy](https://twitter.com/appflowy) on Twitter.

-## Join the community to build AppFlowy together

+## Join the community to build AppFlowy together!
 <a href="https://github.com/AppFlowy-IO/AppFlowy/graphs/contributors">
  <img src="https://contrib.rocks/image?repo=AppFlowy-IO/AppFlowy" />
 </a>

 ## Why Are We Building This?

-Notion has been our favourite project and knowledge management tool in recent years because of its aesthetic appeal and functionality. Our team uses it daily, and we are on its paid plan. However, as we all know, Notion has its limitations. These include weak data security and poor compatibility with mobile devices. Likewise, alternative collaborative workplace management tools also have their constraints.
+Notion has been our favorite project and knowledge management tool in recent years because of its aesthetic appeal and functionality. Our team uses it daily, and we are on its paid plan. However, as we all know Notion has its limitations. These include weak data security and poor compatibility with mobile devices. Likewise, alternative collaborative workplace management tools also have their constraints.

-The limitations we encountered using these tools and our past work experience with collaborative productivity tools have led to our firm belief that there is a glass ceiling on what's possible for these tools in the future. This emanates from the fact that these tools will probably struggle to scale horizontally at some point and be forced to prioritize a proportion of customers whose needs differ from the rest. While decision-makers want a workplace OS, it is impossible to come up with a one-size fits all solution in such a fragmented market.
+The limitations we encountered using these tools rooted in our past work experience with collaborative productivity tools lead to our firm belief that there is, and will be a glass ceiling on what's possible in the future for tools like Notion. This emanates from these tools probable struggles to scale horizontally at some point. It implies that they will likely be forced to prioritize for a proportion of customers whose needs can be quite different from the rest. While decision-makers want a workplace OS, the truth is that it is not very possible to come up with a one-size fits all solution in such a fragmented market.

 When a customer's evolving core needs are not satisfied, they either switch to another or build one from the ground up, in-house. Consequently, they either go under another ceiling or buy an expensive ticket to learn a hard lesson. This is a requirement for many resources and expertise, building a reliable and easy-to-use collaborative tool, not to mention the speed and native experience. The same may apply to individual users as well.

 All these restrictions necessitate our mission - to make it possible for anyone to create apps that suit their needs well.

-* To individuals, we would like to offer Notion's functionality, data security, and cross-platform native experience.
-* To enterprises and hackers, AppFlowy is dedicated to offering building blocks and collaboration infra services to enable you to make apps on your own. Moreover, you have 100% control of your data. You can design and modify AppFlowy your way, with a single codebase written in Flutter and Rust supporting multiple platforms armed with long-term maintainability.
+- To individuals, we would like to offer Notion's functionality along with data security and cross-platform native experience.
+- To enterprises and hackers, AppFlowy is dedicated to offering building blocks, that is, collaboration infra services to enable you to make apps on your own. Moreover, you have 100% control of your data. You can design and modify AppFlowy your way, with a single codebase written in Flutter and Rust supporting multiple platforms armed with long-term maintainability.

 We decided to achieve this mission by upholding the three most fundamental values:

-* Data privacy first
-* Reliable native experience
-* Community-driven extensibility
+- Data privacy first
+- Reliable native experience
+- Community-driven extensibility

-We do not claim to outperform Notion in terms of functionality and design, at least for now. Besides, our priority doesn't lie in more functionality at the moment. Instead, we would like to cultivate a community to democratize the knowledge and wheels of making complex workplace management tools while enabling people and businesses to create beautiful things on their own by equipping them with a versatile toolbox of building blocks.
+To be honest, we do not claim to outperform Notion in terms of functionality and design, at least for now. Besides, our priority doesn't lie in more functionality at the moment. Instead, we would like to cultivate a community to democratize the knowledge and wheels of making complex workplace management tools, while enabling people and businesses to create beautiful things on their own by equipping them with a versatile toolbox of building blocks.

 ## License

@@ -101,6 +101,6 @@ Distributed under the AGPLv3 License. See [`LICENSE.md`](https://github.com/AppF

 Special thanks to these amazing projects which help power AppFlowy.IO:

-* [flutter-quill](https://github.com/singerdmx/flutter-quill)
-* [cargo-make](https://github.com/sagiegurari/cargo-make)
-* [contrib.rocks](https://contrib.rocks)
+- [flutter-quill](https://github.com/singerdmx/flutter-quill)
+- [cargo-make](https://github.com/sagiegurari/cargo-make)
+- [contrib.rocks](https://contrib.rocks)
@@ -1,225 +1,223 @@
 {
-  "version": "2.0.0",
-  // https://code.visualstudio.com/docs/editor/tasks
-  // https://gist.github.com/deadalusai/9e13e36d61ec7fb72148
-  // ${workspaceRoot}: the root folder of the team
-  // ${file}: the current opened file
-  // ${fileBasename}: the current opened file's basename
-  // ${fileDirname}: the current opened file's dirname
-  // ${fileExtname}: the current opened file's extension
-  // ${cwd}: the current working directory of the spawned process
-  "tasks": [
-    {
-      "label": "AF: Clean + Rebuild All",
-      "type": "shell",
-      "dependsOrder": "sequence",
-      "dependsOn": [
-        "AF: Dart Clean",
-        "AF: Flutter Clean",
-        "AF: Build Appflowy Core",
-        "AF: Flutter Pub Get",
-        "AF: Flutter Package Get",
-        "AF: Generate Language Files",
-        "AF: Generate Freezed Files"
-      ],
-      "presentation": {
-        "reveal": "always",
-        "panel": "new"
-      }
-    },
-    {
-      "label": "AF: Clean + Rebuild All (Android)",
-      "type": "shell",
-      "dependsOrder": "sequence",
-      "dependsOn": [
-        "AF: Dart Clean",
-        "AF: Flutter Clean",
-        "AF: Build Appflowy Core_for_android",
-        "AF: Flutter Pub Get",
-        "AF: Flutter Package Get",
-        "AF: Generate Language Files",
-        "AF: Generate Freezed Files"
-      ],
-      "presentation": {
-        "reveal": "always",
-        "panel": "new"
-      }
-    },
-    {
-      "label": "AF: Build Appflowy Core_for_android",
-      "type": "shell",
-      "command": "cargo make --profile development-android appflowy-core-dev-android",
-      "group": "build",
-      "options": {
-        "cwd": "${workspaceFolder}"
-      }
-    },
-    {
-      "label": "AF: Build Appflowy Core",
-      "type": "shell",
-      "windows": {
-        "command": "cargo make --profile development-windows-x86 appflowy-core-dev"
-      },
-      "linux": {
-        "command": "cargo make --profile \"development-linux-$(uname -m)\" appflowy-core-dev"
-      },
-      "osx": {
-        "command": "cargo make --profile \"development-mac-$(uname -m)\" appflowy-core-dev"
-      },
-      "group": "build",
-      "options": {
-        "cwd": "${workspaceFolder}"
-      }
-    },
-    {
-      "label": "AF: Code Gen",
-      "type": "shell",
-      "dependsOrder": "sequence",
-      "dependsOn": [
-        "AF: Flutter Clean",
-        "AF: Flutter Pub Get",
-        "AF: Flutter Package Get",
-        "AF: Generate Language Files",
-        "AF: Generate Freezed Files"
-      ],
-      "group": {
-        "kind": "build",
-        "isDefault": true
-      },
-      "presentation": {
-        "reveal": "always",
-        "panel": "new"
-      }
-    },
-    {
-      "label": "AF: Flutter Clean",
-      "type": "shell",
-      "command": "flutter clean",
-      "options": {
-        "cwd": "${workspaceFolder}/appflowy_flutter"
-      }
-    },
-    {
-      "label": "AF: Flutter Pub Get",
-      "type": "shell",
-      "command": "flutter pub get",
-      "options": {
-        "cwd": "${workspaceFolder}/appflowy_flutter"
-      }
-    },
-    {
-      "label": "AF: Flutter Package Get",
-      "type": "shell",
-      "command": "flutter packages pub get",
-      "options": {
-        "cwd": "${workspaceFolder}/appflowy_flutter"
-      }
-    },
-    {
-      "label": "AF: Generate Freezed Files",
-      "type": "shell",
-      "command": "flutter pub run build_runner build --delete-conflicting-outputs",
-      "options": {
-        "cwd": "${workspaceFolder}/appflowy_flutter"
-      }
-    },
-    {
-      "label": "AF: Generate Language Files",
-      "type": "shell",
-      "command": "sh ./scripts/generate_language_files.sh",
-      "windows": {
-        "options": {
-          "shell": {
-            "executable": "cmd.exe",
-            "args": [
-              "/d",
-              "/c",
-              ".\\scripts\\generate_language_files.cmd"
-            ]
-          }
-        }
-      },
-      "group": "build",
-      "options": {
-        "cwd": "${workspaceFolder}"
-      }
-    },
-    {
-      "label": "AF: Flutter Clean",
-      "type": "shell",
-      "command": "cargo make flutter_clean",
-      "group": "build",
-      "options": {
-        "cwd": "${workspaceFolder}"
-      }
-    },
-    {
-      "label": "AF: flutter build aar",
-      "type": "flutter",
-      "command": "flutter",
-      "args": [
-        "build",
-        "aar"
-      ],
-      "group": "build",
-      "problemMatcher": [],
-      "detail": "appflowy_flutter"
-    },
-    {
-      "label": "AF: Tauri UI Dev",
-      "type": "shell",
-      "isBackground": true,
-      "command": "yarn",
-      "args": [
-        "dev"
-      ],
-      "options": {
-        "cwd": "${workspaceFolder}/appflowy_tauri"
-      }
-    },
-    {
-      "label": "AF: Tauri UI Build",
-      "type": "shell",
-      "command": "npm run build",
-      "options": {
-        "cwd": "${workspaceFolder}/appflowy_tauri"
-      }
-    },
-    {
-      "label": "AF: Tauri Dev",
-      "type": "shell",
-      "command": "npm run tauri:dev",
-      "options": {
-        "cwd": "${workspaceFolder}/appflowy_tauri"
-      }
-    },
-    {
-      "label": "AF: Tauri Clean",
-      "type": "shell",
-      "command": "cargo make tauri_clean",
-      "options": {
-        "cwd": "${workspaceFolder}"
-      }
-    },
-    {
-      "label": "AF: Tauri Clean + Dev",
-      "type": "shell",
-      "dependsOrder": "sequence",
-      "dependsOn": [
-        "AF: Tauri Clean",
-        "AF: Tauri UI Dev"
-      ],
-      "options": {
-        "cwd": "${workspaceFolder}"
-      }
-    },
-    {
-      "label": "AF: Tauri ESLint",
-      "type": "shell",
-      "command": "npx eslint --fix src",
-      "options": {
-        "cwd": "${workspaceFolder}/appflowy_tauri"
-      }
-    },
-  ]
-}
+	"version": "2.0.0",
+	// https://code.visualstudio.com/docs/editor/tasks
+	// https://gist.github.com/deadalusai/9e13e36d61ec7fb72148
+	// ${workspaceRoot}: the root folder of the team
+	// ${file}: the current opened file
+	// ${fileBasename}: the current opened file's basename
+	// ${fileDirname}: the current opened file's dirname
+	// ${fileExtname}: the current opened file's extension
+	// ${cwd}: the current working directory of the spawned process
+	"tasks": [
+		{
+			"label": "AF: Clean + Rebuild All",
+			"type": "shell",
+			"dependsOrder": "sequence",
+			"dependsOn": [
+				"AF: Dart Clean",
+				"AF: Flutter Clean",
+				"AF: Build Appflowy Core",
+				"AF: Flutter Pub Get",
+				"AF: Flutter Package Get",
+				"AF: Generate Language Files",
+				"AF: Generate Freezed Files"
+			],
+			"presentation": {
+				"reveal": "always",
+				"panel": "new"
+			}
+		},
+		{
+			"label": "AF: Clean + Rebuild All (Android)",
+			"type": "shell",
+			"dependsOrder": "sequence",
+			"dependsOn": [
+				"AF: Dart Clean",
+				"AF: Flutter Clean",
+				"AF: Build Appflowy Core_for_android",
+				"AF: Flutter Pub Get",
+				"AF: Flutter Package Get",
+				"AF: Generate Language Files",
+				"AF: Generate Freezed Files"
+			],
+			"presentation": {
+				"reveal": "always",
+				"panel": "new"
+			}
+		},
+		{
+			"label": "AF: Build Appflowy Core_for_android",
+			"type": "shell",
+			"command": "cargo make --profile development-android appflowy-core-dev-android",
+			"group": "build",
+			"options": {
+				"cwd": "${workspaceFolder}"
+			}
+		},
+		{
+			"label": "AF: Build Appflowy Core",
+			"type": "shell",
+			"windows": {
+				"command": "cargo make --profile development-windows-x86 appflowy-core-dev"
+			},
+			"linux": {
+				"command": "cargo make --profile \"development-linux-$(uname -m)\" appflowy-core-dev"
+			},
+			"osx": {
+				"command": "cargo make --profile \"development-mac-$(uname -m)\" appflowy-core-dev"
+			},
+			"group": "build",
+			"options": {
+				"cwd": "${workspaceFolder}"
+			}
+		},
+		{
+			"label": "AF: Code Gen",
+			"type": "shell",
+			"dependsOrder": "sequence",
+			"dependsOn": [
+				"AF: Flutter Clean",
+				"AF: Flutter Pub Get",
+				"AF: Flutter Package Get",
+				"AF: Generate Language Files",
+				"AF: Generate Freezed Files"
+			],
+			"group": {
+				"kind": "build",
+				"isDefault": true
+			},
+			"presentation": {
+				"reveal": "always",
+				"panel": "new"
+			}
+		},
+		{
+			"label": "AF: Flutter Clean",
+			"type": "shell",
+			"command": "flutter clean",
+			"options": {
+				"cwd": "${workspaceFolder}/appflowy_flutter"
+			}
+		},
+		{
+			"label": "AF: Flutter Pub Get",
+			"type": "shell",
+			"command": "flutter pub get",
+			"options": {
+				"cwd": "${workspaceFolder}/appflowy_flutter"
+			}
+		},
+		{
+			"label": "AF: Flutter Package Get",
+			"type": "shell",
+			"command": "flutter packages pub get",
+			"options": {
+				"cwd": "${workspaceFolder}/appflowy_flutter"
+			}
+		},
+		{
+			"label": "AF: Generate Freezed Files",
+			"type": "shell",
+			"command": "flutter pub run build_runner build --delete-conflicting-outputs",
+			"options": {
+				"cwd": "${workspaceFolder}/appflowy_flutter"
+			}
+		},
+		{
+			"label": "AF: Generate Language Files",
+			"type": "shell",
+			"command": "sh ./scripts/generate_language_files.sh",
+			"windows": {
+				"options": {
+					"shell": {
+						"executable": "cmd.exe",
+						"args": [
+							"/d",
+							"/c",
+							".\\scripts\\generate_language_files.cmd"
+						]
+					}
+				}
+			},
+			"group": "build",
+			"options": {
+				"cwd": "${workspaceFolder}"
+			}
+		},
+		{
+			"label": "AF: Flutter Clean",
+			"type": "shell",
+			"command": "cargo make flutter_clean",
+			"group": "build",
+			"options": {
+				"cwd": "${workspaceFolder}"
+			}
+		},
+		{
+			"label": "AF: flutter build aar",
+			"type": "flutter",
+			"command": "flutter",
+			"args": [
+				"build",
+				"aar"
+			],
+			"group": "build",
+			"problemMatcher": [],
+			"detail": "appflowy_flutter"
+		},
+		{
+			"label": "AF: Tauri UI Dev",
+			"type": "shell",
+			"isBackground": true,
+			"command": "yarn",
+			"args": ["dev"],
+			"options": {
+				"cwd": "${workspaceFolder}/appflowy_tauri"
+			}
+		},
+		{
+			"label": "AF: Tauri UI Build",
+			"type": "shell",
+			"command": "npm run build",
+			"options": {
+				"cwd": "${workspaceFolder}/appflowy_tauri"
+			}
+		},
+		{
+			"label": "AF: Tauri Dev",
+			"type": "shell",
+			"command": "npm run tauri:dev",
+			"options": {
+				"cwd": "${workspaceFolder}/appflowy_tauri"
+			}
+		},
+		{
+			"label": "AF: Tauri Clean",
+			"type": "shell",
+			"command": "cargo make tauri_clean",
+			"options": {
+				"cwd": "${workspaceFolder}"
+			}
+		},
+		{
+			"label": "AF: Tauri Clean + Dev",
+			"type": "shell",
+			"dependsOrder": "sequence",
+			"dependsOn": [
+				"AF: Tauri Clean",
+				"AF: Tauri UI Dev"
+			],
+			"options": {
+				"cwd": "${workspaceFolder}"
+			}
+		},
+		{
+			"label": "AF: Tauri ESLint",
+			"type": "shell",
+			"command": "npx eslint --fix src",
+			"options": {
+				"cwd": "${workspaceFolder}/appflowy_tauri"
+			}
+		},	
+	]
+}
@@ -23,7 +23,7 @@ CARGO_MAKE_EXTEND_WORKSPACE_MAKEFILE = true
 CARGO_MAKE_CRATE_FS_NAME = "dart_ffi"
 CARGO_MAKE_CRATE_NAME = "dart-ffi"
 LIB_NAME = "dart_ffi"
-CURRENT_APP_VERSION = "0.1.3"
+CURRENT_APP_VERSION = "0.1.2"
 FLUTTER_DESKTOP_FEATURES = "dart,rev-sqlite"
 PRODUCT_NAME = "AppFlowy"
 # CRATE_TYPE: https://doc.rust-lang.org/reference/linkage.html
@@ -205,17 +205,12 @@ script = [
 ]
 script_runner = "@duckscript"

-[env.test-macos-x86_64]
+[env.test-macos]
 TEST_CRATE_TYPE = "cdylib"
 TEST_LIB_EXT = "dylib"
 # For the moment, the DynamicLibrary only supports open x86_64 architectures binary.
 TEST_COMPILE_TARGET = "x86_64-apple-darwin"

-[env.test-macos-arm64]
-TEST_CRATE_TYPE = "cdylib"
-TEST_LIB_EXT = "dylib"
-TEST_COMPILE_TARGET = "aarch64-apple-darwin"
-
 [env.test-linux]
 TEST_CRATE_TYPE = "cdylib"
 TEST_LIB_EXT = "so"
@@ -40,7 +40,7 @@ lib/generated_plugin_registrant.dart
 lib/generated/

 # Freezed generated files
-*.g.dart
+*.g.dart 
 *.freezed.dart

 # Symbolication related
@@ -67,4 +67,4 @@ windows/flutter/dart_ffi/
 **/**/*.so
 **/**/Brewfile.lock.json
 **/.sandbox
-**/.vscode/
+**/.vscode/
@@ -1,6 +1,6 @@
 <h1 align="center" style="margin:0"> AppFlowy_Flutter</h1>
 <div align="center">
-  <img src="https://img.shields.io/badge/Flutter-v3.7.5-blue"/>
+  <img src="https://img.shields.io/badge/Flutter-v3.3.10-blue"/>
  <img src="https://img.shields.io/badge/Rust-v1.65-orange"/>
 </div>

@@ -9,16 +9,13 @@
 This Repository contains the codebase for the frontend of the application, currently we use Flutter as our frontend framework.

 ### Platforms Supported Using Flutter 💻
-
 - Linux
 - macOS
 - Windows
-  > We later expect to extend support to Android and iOS devices using Flutter.
+> We later expect to extend support to Android and iOS devices using Flutter.

 ### Am I Eligible to Contribute?
-
 Yes! You are eligible to contribute, check out the ways in which you can [contribute to AppFlowy](https://appflowy.gitbook.io/docs/essential-documentation/contribute-to-appflowy/contributing-to-appflowy). Some of the ways in which you can contribute are:
-
 - Non-Coding Contributions
  - Documentation
  - Feature Requests and Feedbacks
@@ -26,27 +23,26 @@ Yes! You are eligible to contribute, check out the ways in which you can [contri
  - Improve Translations
 - Coding Contributions

+
 To contribute to `AppFlowy_Flutter` codebase specifically (coding contribution) we suggest you to have basic knowledge of Flutter. In case you are new to Flutter, we may suggest you to learn the basics and then try to contribute, get started with Flutter [here](https://flutter.dev/docs/get-started/codelab).

 ### What OS Should I Use for Development?
-
 We support all OS for Development i.e Linux, macOS and Windows. However, most of us promote macOS and Linux over Windows. We have detailed [docs](https://appflowy.gitbook.io/docs/essential-documentation/contribute-to-appflowy/software-contributions/environment-setup) on How to Setup `AppFlowy_Flutter` in your local system in each OS.

+
 ### Getting Started ❇
-
 We have a detailed documentation, on how to [get started](https://appflowy.gitbook.io/docs/essential-documentation/contribute-to-appflowy/contributing-to-appflowy) with the project, and make your first contribution. However, we do have some specific picks for you.
-
 - [Code Architecture](https://appflowy.gitbook.io/docs/essential-documentation/contribute-to-appflowy/architecture/frontend/frontend/codemap)
 - [Making Your First PR](https://appflowy.gitbook.io/docs/essential-documentation/contribute-to-appflowy/software-contributions/submitting-code/submitting-your-first-pull-request)
 - [The Style Guide](https://appflowy.gitbook.io/docs/essential-documentation/contribute-to-appflowy/software-contributions/submitting-code/style-guides)
 - [How to run/debug the application](https://appflowy.gitbook.io/docs/essential-documentation/contribute-to-appflowy/software-contributions/launcher-and-tasks)

-### Need Help?

+### Need Help?
 - New to GitHub? Follow [these](https://appflowy.gitbook.io/docs/essential-documentation/contribute-to-appflowy/software-contributions/submitting-code/setting-up-your-repositories) steps to get started
 - Stuck Somewhere? Join the [Discord](https://discord.gg/9Q2xaN37tV) Group and we are there to help you!

-<!--
+<!-- 
 ## release check
 1. [entitlements](https://flutter.dev/desktop#setting-up-entitlements)
 2. [symbols stripped](https://flutter.dev/docs/development/platform-integration/c-interop) -->
@@ -14,7 +14,9 @@ analyzer:
  exclude:
    - "**/*.g.dart"
    - "**/*.freezed.dart"
-
+    - "packages/appflowy_editor/**"
+    - "packages/editor/**"
+    # - "packages/flowy_infra_ui/**"
 linter:
  # The lint rules applied to this project can be customized in the
  # section below to disable rules from the `package:flutter_lints/flutter.yaml`
@@ -28,7 +30,8 @@ linter:
  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
  # producing the lint.
  rules:
-    - require_trailing_commas
+    # avoid_print: false  # Uncomment to disable the `avoid_print` rule
+    # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule

 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options
@@ -1 +1,112 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 761.68 143.1"><title>Asset 16</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><path d="M271,40.73h18v6.7c4.37-4.68,12.64-8.42,21.69-8.42C330,39,342.5,54,342.5,74.74c0,21.38-14.67,37.92-37.14,37.92-6.24,0-12.32-1.09-16.38-3.44v32.93H271Zm18,22.78v28.4c4.84,3.12,8.89,4,14.82,4,12.48,0,19.66-9,19.66-20.75,0-11.24-6.55-19.35-18.41-19.35C299,55.86,293.35,58.67,289,63.51Z" style="fill:#fff"/><path d="M226.66,39.4c-22.48,0-37.14,16.54-37.14,37.91,0,20.76,12.47,35.74,31.83,35.74,9,0,17.31-3.75,21.68-8.43v6.72h18V52.42C247.68,42.36,232.89,39.4,226.66,39.4ZM243,88.55c-4.37,4.83-10,7.64-16.07,7.64-11.85,0-18.41-8.11-18.41-19.34,0-11.7,7.18-20.76,19.66-20.76,5.93,0,10,.94,14.82,4.07Z" style="fill:#fff"/><path d="M350.16,40.73h17.95v6.7c4.36-4.68,12.63-8.42,21.68-8.42,19.35,0,31.84,15,31.84,35.73,0,21.38-14.67,37.92-37.14,37.92-6.24,0-12.33-1.09-16.38-3.44v32.93H350.16Zm17.95,22.78v28.4c4.83,3.12,8.89,4,14.82,4,12.48,0,19.66-9,19.66-20.75,0-11.24-6.55-19.35-18.41-19.35C378.09,55.86,372.47,58.67,368.11,63.51Z" style="fill:#fff"/><path d="M473.63,20.6a20.34,20.34,0,0,0-11.08-3.75c-8.11,0-12.32,4.22-12.32,13.89v10h12.64V57.58H450.23v53.36h-18V29.34c0-19.51,9.36-29.34,25-29.34,7.18,0,13.73,1.72,18.41,4.68h15.92V84.26c0,8,2,11.39,6.08,11.39a12.6,12.6,0,0,0,7.49-2.81l3.75,13.73c-4.06,3.28-10.15,5.93-18.57,5.93-10.77,0-16.7-6.55-16.7-20.91Z" style="fill:#fff"/><path d="M547.12,39c23.25,0,38.23,15.76,38.23,36.82s-15,36.83-38.23,36.83S508.9,96.9,508.9,75.83,523.87,39,547.12,39Zm0,57c11.08,0,19.2-8,19.2-20.13,0-11.86-8.27-20-19.2-20-10.61,0-19,7.8-19,20C528.09,87.54,536.2,96,547.12,96Z" style="fill:#fff"/><path d="M674.14,111.25H658.07l-15-39c-1.1-2.65-1.56-5.61-2.34-8.27a50.32,50.32,0,0,1-2.5,8.59l-14.82,38.69h-15.3L585.35,40.73h19.2L615.78,79a73.76,73.76,0,0,1,2,9.37A91.46,91.46,0,0,1,620.46,79l13.11-38.22h15.91L663.06,78.8a98.26,98.26,0,0,1,2.65,9.67c.63-3.28,1.41-6.71,2.18-10.14l10.3-37.6h18.1Z" style="fill:#fff"/><path d="M734.06,110.94c-10.3,25.12-16.85,31.21-27.15,31.21-6.4,0-11.08-2.5-15.14-5.46l5.78-13.58c1.87,1.09,4.52,2.5,7.33,2.5,4.53,0,7.8-3.59,10.77-10.92l1.56-3.75L684.75,40.73h21.54l16.38,38.38c1.4,3.43,2.34,6.71,3.43,10.14A71.08,71.08,0,0,1,728.6,79l12.64-38.22h20.44Z" style="fill:#fff"/><path d="M140.91,87.45c-4,21.87-21.71,41-42.18,51.75-2.57,1.35-3.58,2.12-6.47,2.3h41.49a7,7,0,0,0,7.2-7V87.45Z" style="fill:#f7931e"/><path d="M95.68,140.24a15.15,15.15,0,0,1-2.52,0Z" style="fill:#ffce00"/><path d="M54.36,45.23c-.63.51-1.25,1-1.89,1.44C42,54.06,9.9,78,2.65,67.71-4.46,57.58,3,28.86,21.49,15c.35-.28.71-.53,1.06-.78,20-14.09,35-12.13,42.28-1.81C71.63,22.13,64,37.31,54.36,45.23Z" style="fill:#8427e0"/><path d="M132.72,67.41c-9.91,7-25.55-1.17-33.32-11.14-.31-.4-.61-.81-.91-1.22-7.38-10.51-31.34-42.57-21-49.82s39.94.67,53.45,19.9c.3.43.59.85.87,1.27C144.91,45.8,142.81,60.31,132.72,67.41Z" style="fill:#00b5ff"/><path d="M119.45,130.66c-.34.26-.69.52-1,.76-20,14.09-35,12.12-42.28,1.82-6.79-9.68.8-24.85,10.46-32.78.62-.52,1.26-1,1.9-1.45C99,91.62,131.06,67.67,138.31,78,145.42,88.1,137.93,116.83,119.45,130.66Z" style="fill:#ffbd00"/><path d="M63.51,140.45c-10.32,7.24-39.94-.67-53.45-19.91-.28-.38-.54-.77-.8-1.16a0,0,0,0,0,0,0c-13.19-19.44-11.1-34-1-41.08,9.9-7,25.55,1.15,33.31,11.12.31.4.62.82.91,1.23C49.86,101.14,73.82,133.2,63.51,140.45Z" style="fill:#e3006d"/><path d="M54.36,45.23C40,51.53,9.65,64.64,5.08,54.12,1.25,45.3,8.34,27.25,21.49,15c.35-.28.71-.53,1.06-.78,20-14.09,35-12.13,42.28-1.81C71.63,22.13,64,37.31,54.36,45.23Z" style="fill:#9327ff"/><path d="M132.72,67.41c-9.91,7-25.55-1.17-33.32-11.14C93,41.57,80.68,12.49,91,8c9.26-4,28.65,4,40.83,18.37C144.91,45.8,142.81,60.31,132.72,67.41Z" style="fill:#00c8ff"/><path d="M119.45,130.66c-.34.26-.69.52-1,.76-20,14.09-35,12.12-42.28,1.82-6.79-9.68.8-24.85,10.46-32.78,14.32-6.3,44.72-19.42,49.29-8.91C139.71,100.38,132.62,118.44,119.45,130.66Z" style="fill:#ffce00"/><path d="M50,137.65c-9.23,4-28.57-3.94-40.75-18.27a0,0,0,0,0,0,0c-13.19-19.44-11.1-34-1-41.08,9.9-7,25.55,1.15,33.31,11.12C48,104.11,60.28,133.2,50,137.65Z" style="fill:#fb006d"/></g></g></svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg873"
+   version="1.1"
+   fill="none"
+   viewBox="0 0 92 17"
+   height="17"
+   width="92">
+  <metadata
+     id="metadata877">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="g866"
+     clip-path="url(#clip0)">
+    <path
+       style="fill:#ffffff"
+       id="path834"
+       fill="black"
+       d="M32.7324 4.84144H34.892V5.63601C35.4179 5.08166 36.4132 4.63818 37.5212 4.63818C39.8498 4.63818 41.3709 6.4121 41.3709 8.88818C41.3709 11.4197 39.6057 13.3969 36.8827 13.3969C36.1315 13.3969 35.3991 13.2675 34.9108 12.9904V16.9078H32.7512V4.84144H32.7324ZM34.9108 7.53927V10.9208C35.493 11.2904 35.9812 11.4012 36.6949 11.4012C38.1972 11.4012 39.0611 10.3295 39.0611 8.94362C39.0611 7.61318 38.2723 6.65231 36.8451 6.65231C36.1127 6.63384 35.4366 6.96644 34.9108 7.53927Z" />
+    <path
+       style="fill:#ffffff"
+       id="path836"
+       fill="black"
+       d="M27.3804 4.6748C24.6573 4.6748 22.8921 6.6335 22.8921 9.1835C22.8921 11.6596 24.3944 13.4335 26.7419 13.4335C27.8311 13.4335 28.8264 12.99 29.371 12.4357V13.2302H31.5306V6.22698C29.9156 5.02589 28.1315 4.6748 27.3804 4.6748ZM29.3522 10.5324C28.8264 11.1052 28.1503 11.4378 27.4179 11.4378C25.9907 11.4378 25.2019 10.477 25.2019 9.14654C25.2019 7.76067 26.0658 6.67046 27.5681 6.67046C28.2818 6.67046 28.77 6.78133 29.3522 7.15089V10.5324Z" />
+    <path
+       style="fill:#ffffff"
+       id="path838"
+       fill="black"
+       d="M42.291 4.84144H44.4506V5.63601C44.9765 5.08166 45.9718 4.63818 47.0797 4.63818C49.4084 4.63818 50.9295 6.4121 50.9295 8.88818C50.9295 11.4197 49.1642 13.3969 46.4412 13.3969C45.6901 13.3969 44.9577 13.2675 44.4694 12.9904V16.9078H42.3098V4.84144H42.291ZM44.4694 7.53927V10.9208C45.0516 11.2904 45.5398 11.4012 46.2535 11.4012C47.7558 11.4012 48.6196 10.3295 48.6196 8.94362C48.6196 7.61318 47.8309 6.65231 46.4037 6.65231C45.6713 6.63384 44.9952 6.96644 44.4694 7.53927Z" />
+    <path
+       style="fill:#ffffff"
+       id="path840"
+       fill="black"
+       d="M57.2019 2.43913C56.8826 2.21739 56.3756 1.99565 55.8685 1.99565C54.892 1.99565 54.3849 2.49457 54.3849 3.64022V4.82283H55.9061V6.83696H54.3849V13.175H52.2065V3.49239C52.2065 1.18261 53.3333 0 55.23 0C56.0939 0 56.8826 0.203261 57.446 0.554348H59.3615V10.0152C59.3615 10.9576 59.6056 11.3641 60.0939 11.3641C60.4507 11.3641 60.7324 11.2163 60.9953 11.0315L61.446 12.6576C60.9577 13.0457 60.2253 13.3598 59.2112 13.3598C57.9155 13.3598 57.2019 12.5837 57.2019 10.8837V2.43913Z" />
+    <path
+       style="fill:#ffffff"
+       id="path842"
+       fill="black"
+       d="M66.0846 4.63818C68.9015 4.63818 70.7043 6.50449 70.7043 9.01753C70.7043 11.5121 68.9015 13.3969 66.0846 13.3969C63.2677 13.3969 61.4648 11.5306 61.4648 9.01753C61.4648 6.50449 63.2864 4.63818 66.0846 4.63818ZM66.0846 11.4012C67.4179 11.4012 68.3944 10.4588 68.3944 9.01753C68.3944 7.61318 67.3991 6.65231 66.0846 6.65231C64.8076 6.65231 63.7935 7.57623 63.7935 9.01753C63.7935 10.4034 64.77 11.4012 66.0846 11.4012Z" />
+    <path
+       style="fill:#ffffff"
+       id="path844"
+       fill="black"
+       d="M81.4271 13.2307H79.4928L77.69 8.59264C77.5586 8.27851 77.5022 7.92742 77.4083 7.61329C77.3332 7.98286 77.2393 8.29699 77.1079 8.6296L75.305 13.2307H73.4647L70.7041 4.84155H73.014L74.3661 9.38721C74.4975 9.79373 74.5351 10.1079 74.6102 10.4959C74.7041 10.1448 74.7604 9.84916 74.9295 9.38721L76.5069 4.84155H78.4224L80.0562 9.36873C80.1877 9.73829 80.2816 10.1263 80.3755 10.5144C80.4506 10.1263 80.5445 9.71981 80.6384 9.31329L81.8778 4.84155H84.0562L81.4271 13.2307Z" />
+    <path
+       style="fill:#ffffff"
+       id="path846"
+       fill="black"
+       d="M88.6574 13.1936C87.4179 16.187 86.6292 16.9077 85.371 16.9077C84.601 16.9077 84.0377 16.612 83.5494 16.2609L84.2442 14.6533C84.4696 14.7827 84.7888 14.949 85.1269 14.949C85.6715 14.949 86.0658 14.524 86.4226 13.6555L86.6104 13.212L82.6855 4.85986H85.2959L87.2677 9.42399C87.4367 9.83052 87.5494 10.2186 87.6808 10.6251C87.756 10.237 87.8311 9.83052 87.9813 9.40552L89.5024 4.85986H91.9625L88.6574 13.1936Z" />
+    <path
+       id="path848"
+       fill="#F7931E"
+       d="M17.0142 10.4033C16.5259 13.0088 14.3851 15.2816 11.925 16.5566C11.6245 16.7229 11.2677 16.8153 10.9297 16.8338H16.1503C16.6574 16.8338 17.0142 16.4642 17.0142 16.0022V10.4033Z" />
+    <path
+       id="path850"
+       fill="#8427E0"
+       d="M6.57258 5.37743C6.49746 5.43286 6.42235 5.4883 6.34723 5.54373C5.07023 6.43069 1.20169 9.27634 0.319059 8.0383C-0.544791 6.83721 0.375397 3.43721 2.59136 1.79264C2.62892 1.75569 2.68526 1.73721 2.72281 1.70025C5.14535 0.0187313 6.94817 0.258949 7.8308 1.47851C8.65709 2.62417 7.7369 4.43504 6.57258 5.37743Z" />
+    <path
+       id="path852"
+       fill="#00B5FF"
+       d="M16.0373 8.02043C14.8354 8.85195 12.9575 7.89108 12.0185 6.69C11.981 6.63456 11.9434 6.59761 11.9059 6.54217C11.0045 5.28565 8.11244 1.47913 9.35188 0.629126C10.5913 -0.239352 14.1782 0.703039 15.812 2.99434C15.8495 3.04978 15.8871 3.08674 15.9246 3.14217C17.5021 5.45195 17.258 7.17043 16.0373 8.02043Z" />
+    <path
+       id="path854"
+       fill="#FFBD00"
+       d="M14.4226 15.5219C14.385 15.5589 14.3475 15.5773 14.2911 15.6143C11.8686 17.2958 10.0658 17.0556 9.18315 15.836C8.35686 14.6904 9.27705 12.8795 10.4414 11.9371C10.5165 11.8817 10.5916 11.8263 10.6667 11.7708C11.9437 10.9023 15.8123 8.03821 16.6761 9.27625C17.5587 10.4773 16.6573 13.8773 14.4226 15.5219Z" />
+    <path
+       id="path856"
+       fill="#E3006D"
+       d="M7.66182 16.6859C6.42238 17.5544 2.85431 16.612 1.22051 14.3207C1.18295 14.2838 1.14539 14.2283 1.12661 14.1914C-0.469635 11.8816 -0.206725 10.1446 1.01393 9.31311C2.21581 8.48159 4.09374 9.44246 5.03271 10.6435C5.07027 10.699 5.10783 10.7359 5.14539 10.7914C6.02802 12.0294 8.92004 15.8359 7.66182 16.6859Z" />
+    <path
+       id="path858"
+       fill="#9327FF"
+       d="M6.57283 5.37743C4.84513 6.13504 1.16438 7.68721 0.619779 6.43069C0.150295 5.37743 1.01415 3.23395 2.59161 1.79264C2.62917 1.75569 2.68551 1.73721 2.72307 1.70025C5.1456 0.0187312 6.94842 0.258949 7.83105 1.47851C8.65734 2.62417 7.73715 4.43504 6.57283 5.37743Z" />
+    <path
+       id="path860"
+       fill="#00C8FF"
+       d="M16.0374 8.01967C14.8355 8.8512 12.9576 7.89033 12.0186 6.68924C11.2487 4.9338 9.76511 1.47837 11.0045 0.960978C12.1313 0.480543 14.4599 1.44141 15.9435 3.14141C17.5022 5.4512 17.2581 7.16967 16.0374 8.01967Z" />
+    <path
+       id="path862"
+       fill="#FFCE00"
+       d="M14.4226 15.5217C14.385 15.5586 14.3475 15.5771 14.2911 15.6141C11.8686 17.2956 10.0658 17.0554 9.18315 15.8358C8.35686 14.6901 9.27705 12.8793 10.4414 11.9369C12.1691 11.1793 15.8498 9.6271 16.3944 10.8836C16.8827 11.9369 16.0188 14.0804 14.4226 15.5217Z" />
+    <path
+       id="path864"
+       fill="#FB006D"
+       d="M6.0468 16.3533C4.92004 16.8338 2.5914 15.8914 1.12661 14.1914C-0.469635 11.8816 -0.206725 10.1446 1.01393 9.31311C2.21581 8.48159 4.09374 9.44246 5.03271 10.6435C5.80266 12.3805 7.28623 15.8359 6.0468 16.3533Z" />
+  </g>
+  <defs
+     id="defs871">
+    <clipPath
+       id="clip0">
+      <rect
+         id="rect868"
+         fill="white"
+         height="17"
+         width="92" />
+    </clipPath>
+  </defs>
+</svg>
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg width="800px" height="800px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.5 15V6.9C3.5 6.05992 3.5 5.63988 3.66349 5.31901C3.8073 5.03677 4.03677 4.8073 4.31901 4.66349C4.63988 4.5 5.05992 4.5 5.9 4.5H8.47237C8.84808 4.5 9.03594 4.5 9.20646 4.55179C9.35741 4.59763 9.49785 4.6728 9.61972 4.77298C9.75739 4.88614 9.86159 5.04245 10.07 5.35507L10.93 6.64533C11.1384 6.95795 11.2426 7.11426 11.3803 7.22742C11.5022 7.3276 11.6426 7.40277 11.7935 7.44861C11.9641 7.5004 12.1519 7.5004 12.5276 7.5004H16.5004C16.965 7.5004 17.1973 7.5004 17.3879 7.55143C17.9058 7.69008 18.3103 8.09459 18.449 8.61248C18.5 8.80308 18.5 9.03539 18.5 9.5V9.5M10.5 13.5H16.5" stroke="#222222" stroke-linecap="round"/>
-<path d="M4.5 18.5L16.7701 18.5004C17.3922 18.5004 17.7032 18.5004 17.9679 18.3963C18.2016 18.3044 18.4084 18.1553 18.5695 17.9626C18.752 17.7445 18.8503 17.4494 19.047 16.8593L20.4471 12.6592C20.8026 11.5927 20.9803 11.0595 20.8737 10.635C20.7804 10.2635 20.5485 9.94171 20.2255 9.7357C19.8566 9.50035 19.2945 9.50033 18.1703 9.5003L10.2299 9.50005C9.60784 9.50003 9.29681 9.50002 9.03216 9.60411C8.79846 9.69601 8.59157 9.84513 8.43047 10.0378C8.24804 10.2559 8.14968 10.551 7.95298 11.1411L5.7649 17.7057C5.60671 18.1803 5.16255 18.5004 4.66227 18.5004V18.5004C4.02037 18.5004 3.5 17.98 3.5 17.3381V14.5" stroke="#222222"/>
-</svg>
@@ -1,17 +1,5 @@
-<svg
-   width="16"
-   height="16"
-   viewBox="0 0 16 16"
-   fill="none"
-   version="1.1"
-   id="svg808"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-   <defs
-      id="defs812" />
-   <path
-      id="path930"
-      style="fill:#00bcf0;fill-opacity:1"
-      transform="rotate(-90)"
-      d="M 0,7.9238281 A 8,8 0 0 0 -8.0585938,0 8,8 0 0 0 -16,8.0390625 8,8 0 0 0 -7.9804688,16 8,8 0 0 0 0,8 Z M -4,8 c 0,0.2769988 -0.2230012,0.5 -0.5,0.5 h -3 v 3 c 0,0.277 -0.2230012,0.5 -0.5,0.5 -0.2769988,0 -0.5,-0.223 -0.5,-0.5 v -3 h -3 C -11.777,8.5 -12,8.2769988 -12,8 c 0,-0.2769988 0.223,-0.5 0.5,-0.5 h 3 v -3 C -8.5,4.2230012 -8.2769988,4 -8,4 c 0.2769988,0 0.5,0.2230012 0.5,0.5 v 3 h 3 C -4.2230012,7.5 -4,7.7230012 -4,8 Z" />
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="16" height="16" rx="8" fill="#00BCF0"/>
+<rect x="7.5" y="4" width="1" height="8" rx="0.5" fill="white"/>
+<rect x="12" y="7.5" width="1" height="8" rx="0.5" transform="rotate(90 12 7.5)" fill="white"/>
 </svg>
@@ -1,159 +1,150 @@
 {
-  "appName": "AppFlowy",
-  "defaultUsername": "Ich",
-  "welcomeText": "Willkommen bei @:appName",
-  "githubStarText": "GitHub Star vergeben",
-  "subscribeNewsletterText": "Abonniere den Newsletter",
-  "letsGoButtonText": "Los geht's",
-  "title": "Titel",
-  "signUp": {
-    "buttonText": "Registrieren",
-    "title": "Registriere dich bei @:appName",
-    "getStartedText": "Erste Schritte",
-    "emptyPasswordError": "Passwort darf nicht leer sein",
-    "repeatPasswordEmptyError": "Passwortwiederholung darf nicht leer sein",
-    "unmatchedPasswordError": "Passwörter stimmen nicht überein",
-    "alreadyHaveAnAccount": "Bereits registriert?",
-    "emailHint": "E-Mail",
-    "passwordHint": "Passwort",
-    "repeatPasswordHint": "Wiederhole Passwort"
-  },
-  "signIn": {
-    "loginTitle": "Bei @:appName einloggen",
-    "loginButtonText": "Anmelden",
-    "buttonText": "Anmelden",
-    "forgotPassword": "Passwort vergessen?",
-    "emailHint": "E-Mail",
-    "passwordHint": "Passwort",
-    "dontHaveAnAccount": "Du besitzt noch kein Konto?",
-    "repeatPasswordEmptyError": "Passwortwiederholung darf nicht leer sein",
-    "unmatchedPasswordError": "Passwörter stimmen nicht überein"
-  },
-  "workspace": {
-    "create": "Arbeitsbereich erstellen",
-    "hint": "Arbeitsbereich",
-    "notFoundError": "Arbeitsbereich nicht gefunden"
-  },
-  "shareAction": {
-    "buttonText": "Teilen",
-    "workInProgress": "Demnächst verfügbar",
-    "markdown": "Markdown",
-    "copyLink": "Link kopieren"
-  },
-  "disclosureAction": {
-    "rename": "Umbenennen",
-    "delete": "Löschen",
-    "duplicate": "Duplizieren"
-  },
-  "blankPageTitle": "Leere Seite",
-  "newPageText": "Neue Seite",
-  "trash": {
-    "text": "Papierkorb",
-    "restoreAll": "Alles wiederherstellen",
-    "deleteAll": "Alles löschen",
-    "pageHeader": {
-      "fileName": "Dateiname",
-      "lastModified": "Letzte Änderung",
-      "created": "Erstellt"
-    }
-  },
-  "deletePagePrompt": {
-    "text": "Diese Seite ist im Papierkorb",
-    "restore": "Seite wiederherstellen",
-    "deletePermanent": "Dauerhaft löschen"
-  },
-  "dialogCreatePageNameHint": "Seitenname",
-  "questionBubble": {
-    "whatsNew": "Was gibt es Neues?",
-    "help": "Hilfe & Support",
-    "debug": {
-      "name": "Debug-Informationen",
-      "success": "Debug-Informationen in die Zwischenablage kopiert!",
-      "fail": "Debug-Informationen können nicht in die Zwischenablage kopiert werden"
+    "appName": "AppFlowy",
+    "defaultUsername": "Ich",
+    "welcomeText": "Willkommen bei @:appName",
+    "githubStarText": "GitHub Star vergeben",
+    "subscribeNewsletterText": "Abonniere den Newsletter",
+    "letsGoButtonText": "Los geht's",
+    "title": "Titel",
+    "signUp": {
+      "buttonText": "Registrieren",
+      "title": "Registriere dich bei @:appName",
+      "getStartedText": "Erste Schritte",
+      "emptyPasswordError": "Passwort darf nicht leer sein",
+      "repeatPasswordEmptyError": "Passwortwiederholung darf nicht leer sein",
+      "unmatchedPasswordError": "Passwörter stimmen nicht überein",
+      "alreadyHaveAnAccount": "Bereits registriert?",
+      "emailHint": "E-Mail",
+      "passwordHint": "Passwort",
+      "repeatPasswordHint": "Wiederhole Passwort"
    },
-    "shortcuts": "Abkürzungen"
-  },
-  "menuAppHeader": {
-    "addPageTooltip": "Schnell eine Seite innerhalb hinzufügen",
-    "defaultNewPageName": "Unbenannt",
-    "renameDialog": "Umbenennen"
-  },
-  "toolbar": {
-    "undo": "Rückgängig",
-    "redo": "Wiederherstellen",
-    "bold": "Fett",
-    "italic": "Kursiv",
-    "underline": "Unterstreichen",
-    "strike": "Durchstreichen",
-    "numList": "Nummerierte Liste",
-    "bulletList": "Aufzählung",
-    "checkList": "Checkliste",
-    "inlineCode": "Inline-Code",
-    "quote": "Zitat",
-    "header": "Überschrift",
-    "highlight": "Hervorhebung",
-    "color": "Farbe"
-  },
-  "tooltip": {
-    "lightMode": "In den hellen Modus wechseln",
-    "darkMode": "In den dunklen Modus wechseln",
-    "openAsPage": "Als Seite öffnen"
-  },
-  "contactsPage": {
-    "title": "Kontakte",
-    "whatsHappening": "Was geschieht diese Woche?",
-    "addContact": "Kontakt hinzufügen",
-    "editContact": "Kontakt bearbeiten"
-  },
-  "button": {
-    "OK": "OK",
-    "Cancel": "Abbrechen",
-    "signIn": "Anmelden",
-    "signOut": "Abmelden",
-    "complete": "Fertig",
-    "save": "Speichern"
-  },
-  "label": {
-    "welcome": "Willkommen!",
-    "firstName": "Vorname",
-    "middleName": "Zweiter Vorname",
-    "lastName": "Nachname",
-    "stepX": "Schritt {X}"
-  },
-  "oAuth": {
-    "err": {
-      "failedTitle": "Keine Verbindung zu Ihrem Konto möglich.",
-      "failedMsg": "Bitte vergewissern Sie sich, dass Sie den Anmeldevorgang in Ihrem Browser abgeschlossen haben."
+    "signIn": {
+      "loginTitle": "Bei @:appName einloggen",
+      "loginButtonText": "Anmelden",
+      "buttonText": "Anmelden",
+      "forgotPassword": "Passwort vergessen?",
+      "emailHint": "E-Mail",
+      "passwordHint": "Passwort",
+      "dontHaveAnAccount": "Du besitzt noch kein Konto?",
+      "repeatPasswordEmptyError": "Passwortwiederholung darf nicht leer sein",
+      "unmatchedPasswordError": "Passwörter stimmen nicht überein"
    },
-    "google": {
-      "title": "GOOGLE ANMELDUNG",
-      "instruction1": "Um Ihre Google-Kontakte zu importieren, müssen Sie diese Anwendung über Ihren Webbrowser autorisieren.",
-      "instruction2": "Kopieren Sie diesen Code in Ihre Zwischenablage, indem Sie auf das Symbol klicken oder den Text auswählen:",
-      "instruction3": "Rufen Sie den folgenden Link in Ihrem Webbrowser auf, und geben Sie den obigen Code ein:",
-      "instruction4": "Klicken Sie unten auf die Schaltfläche, wenn Sie die Anmeldung abgeschlossen haben:"
-    }
-  },
-  "settings": {
-    "title": "Einstellungen",
-    "menu": {
-      "appearance": "Aussehen",
-      "language": "Sprache",
-      "open": "Einstellungen öffnen"
+    "workspace": {
+      "create": "Arbeitsbereich erstellen",
+      "hint": "Arbeitsbereich",
+      "notFoundError": "Arbeitsbereich nicht gefunden"
    },
-    "appearance": {
-      "lightLabel": "Heller Modus",
-      "darkLabel": "Dunkler Modus"
+    "shareAction": {
+      "buttonText": "Teilen",
+      "workInProgress": "Demnächst verfügbar",
+      "markdown": "Markdown",
+      "copyLink": "Link kopieren"
+    },
+    "disclosureAction": {
+      "rename": "Umbenennen",
+      "delete": "Löschen",
+      "duplicate": "Duplizieren"
+    },
+    "blankPageTitle": "Leere Seite",
+    "newPageText": "Neue Seite",
+    "trash": {
+      "text": "Papierkorb",
+      "restoreAll": "Alles wiederherstellen",
+      "deleteAll": "Alles löschen",
+      "pageHeader": {
+        "fileName": "Dateiname",
+        "lastModified": "Letzte Änderung",
+        "created": "Erstellt"
+      }
+    },
+    "deletePagePrompt": {
+      "text": "Diese Seite ist im Papierkorb",
+      "restore": "Seite wiederherstellen",
+      "deletePermanent": "Dauerhaft löschen"
+    },
+    "dialogCreatePageNameHint": "Seitenname",
+    "questionBubble": {
+      "whatsNew": "Was gibt es Neues?",
+      "help": "Hilfe & Support",
+      "debug": {
+        "name": "Debug-Informationen",
+        "success": "Debug-Informationen in die Zwischenablage kopiert!",
+        "fail": "Debug-Informationen können nicht in die Zwischenablage kopiert werden"
+      }
+    },
+    "menuAppHeader": {
+      "addPageTooltip": "Schnell eine Seite innerhalb hinzufügen",
+      "defaultNewPageName": "Unbenannt",
+      "renameDialog": "Umbenennen"
+    },
+    "toolbar": {
+      "undo": "Rückgängig",
+      "redo": "Wiederherstellen",
+      "bold": "Fett",
+      "italic": "Kursiv",
+      "underline": "Unterstreichen",
+      "strike": "Durchstreichen",
+      "numList": "Nummerierte Liste",
+      "bulletList": "Aufzählung",
+      "checkList": "Checkliste",
+      "inlineCode": "Inline-Code",
+      "quote": "Zitat",
+      "header": "Überschrift",
+      "highlight": "Hervorhebung"
+    },
+    "tooltip": {
+      "lightMode": "In den hellen Modus wechseln",
+      "darkMode": "In den dunklen Modus wechseln"
+    },
+    "contactsPage": {
+      "title": "Kontakte",
+      "whatsHappening": "Was geschieht diese Woche?",
+      "addContact": "Kontakt hinzufügen",
+      "editContact": "Kontakt bearbeiten"
+    },
+    "button": {
+      "OK": "OK",
+      "Cancel": "Abbrechen",
+      "signIn": "Anmelden",
+      "signOut": "Abmelden",
+      "complete": "Fertig",
+      "save": "Speichern"
+    },
+    "label": {
+      "welcome": "Willkommen!",
+      "firstName": "Vorname",
+      "middleName": "Zweiter Vorname",
+      "lastName": "Nachname",
+      "stepX": "Schritt {X}"
+    },
+    "oAuth": {
+      "err": {
+        "failedTitle": "Keine Verbindung zu Ihrem Konto möglich.",
+        "failedMsg": "Bitte vergewissern Sie sich, dass Sie den Anmeldevorgang in Ihrem Browser abgeschlossen haben."
+      },
+      "google": {
+        "title": "GOOGLE ANMELDUNG",
+        "instruction1": "Um Ihre Google-Kontakte zu importieren, müssen Sie diese Anwendung über Ihren Webbrowser autorisieren.",
+        "instruction2": "Kopieren Sie diesen Code in Ihre Zwischenablage, indem Sie auf das Symbol klicken oder den Text auswählen:",
+        "instruction3": "Rufen Sie den folgenden Link in Ihrem Webbrowser auf, und geben Sie den obigen Code ein:",
+        "instruction4": "Klicken Sie unten auf die Schaltfläche, wenn Sie die Anmeldung abgeschlossen haben:"
+      }
+    },
+    "settings": {
+      "title": "Einstellungen",
+      "menu": {
+        "appearance": "Aussehen",
+        "language": "Sprache",
+        "open": "Einstellungen öffnen"
+      },
+      "appearance": {
+        "lightLabel": "Heller Modus",
+        "darkLabel": "Dunkler Modus"
+      }
+    },
+    "sideBar": {
+      "openSidebar": "Open sidebar",
+      "closeSidebar": "Close sidebar"
    }
-  },
-  "sideBar": {
-    "openSidebar": "Open sidebar",
-    "closeSidebar": "Close sidebar"
-  },
-  "moreAction": {
-    "small": "klein",
-    "medium": "mittel",
-    "large": "groß",
-    "fontSize": "Schriftgröße",
-    "import": "Importieren"
  }
-}
+  
@@ -74,7 +74,6 @@
    "shortcuts": "Shortcuts",
    "whatsNew": "What's new?",
    "help": "Help & Support",
-    "markdown": "Markdown",
    "debug": {
      "name": "Debug Info",
      "success": "Copied debug info to clipboard!",
@@ -129,7 +128,6 @@
  },
  "button": {
    "OK": "OK",
-    "Done": "Done",
    "Cancel": "Cancel",
    "signIn": "Sign In",
    "signOut": "Sign Out",
@@ -190,18 +188,17 @@
      "exportDatabase": "Export database",
      "selectFiles": "Select the files that need to be export",
      "createNewFolder": "Create a new folder",
-      "createNewFolderDesc": "Tell us where you want to store your data",
+      "createNewFolderDesc": "Tell us where you want to store your data ...",
      "open": "Open",
      "openFolder": "Open an existing folder",
-      "openFolderDesc": "Read and write it to your existing AppFlowy folder",
+      "openFolderDesc": "Read and write it to your existing AppFlowy folder ...",
      "folderHintText": "folder name",
      "location": "Creating a new folder",
      "locationDesc": "Pick a name for your AppFlowy data folder",
      "browser": "Browse",
      "create": "Create",
      "folderPath": "Path to store your folder",
-      "locationCannotBeEmpty": "Path cannot be empty",
-      "pathCopiedSnackbar": "File storage path copied to clipboard!"
+      "locationCannotBeEmpty": "Path cannot be empty"
    },
    "user": {
      "name": "Name",
@@ -220,8 +217,7 @@
      "addFilter": "Add Filter",
      "deleteFilter": "Delete filter",
      "filterBy": "Filter by...",
-      "typeAValue": "Type a value...",
-      "layout": "Layout"
+      "typeAValue": "Type a value..."
    },
    "textFilter": {
      "contains": "Contains",
@@ -284,7 +280,6 @@
      "dateFormatISO": "Year-Month-Day",
      "dateFormatLocal": "Month/Day/Year",
      "dateFormatUS": "Year/Month/Day",
-      "dateFormatDayMonthYear": "Day/Month/Year",
      "timeFormat": "Time format",
      "invalidTimeFormat": "Invalid format",
      "timeFormatTwelveHour": "12 hour",
@@ -293,7 +288,7 @@
      "optionTitle": "Options",
      "addOption": "Add option",
      "editProperty": "Edit property",
-      "newProperty": "New property",
+      "newColumn": "New column",
      "deleteFieldPromptMessage": "Are you sure? This property will be deleted"
    },
    "sort": {
@@ -329,8 +324,7 @@
    "checklist": {
      "panelTitle": "Add an item"
    },
-    "menuName": "Grid",
-    "referencedGridPrefix": "View of"
+    "menuName": "Grid"
  },
  "document": {
    "menuName": "Document",
@@ -340,12 +334,10 @@
    },
    "slashMenu": {
      "board": {
-        "selectABoardToLinkTo": "Select a Board to link to",
-        "createANewBoard": "Create a new Board"
+        "selectABoardToLinkTo": "Select a Board to link to"
      },
      "grid": {
-        "selectAGridToLinkTo": "Select a Grid to link to",
-        "createANewGrid": "Create a new Grid"
+        "selectAGridToLinkTo": "Select a Grid to link to"
      }
    },
    "plugins": {
@@ -365,43 +357,22 @@
      "smartEditCouldNotFetchResult": "Could not fetch result from OpenAI",
      "smartEditCouldNotFetchKey": "Could not fetch OpenAI key",
      "smartEditDisabled": "Connect OpenAI in Settings",
-      "discardResponse": "Do you want to discard the AI responses?",
      "cover": {
        "changeCover": "Change Cover",
        "colors": "Colors",
        "images": "Images",
-        "clearAll": "Clear All",
        "abstract": "Abstract",
        "addCover": "Add Cover",
-        "addLocalImage": "Add local image",
-        "invalidImageUrl": "Invalid image URL",
-        "failedToAddImageToGallery": "Failed to add image to gallery",
-        "enterImageUrl": "Enter image URL",
-        "add": "Add",
-        "back": "Back",
-        "saveToGallery": "Save to gallery",
-        "removeIcon": "Remove Icon",
-        "pasteImageUrl": "Paste image URL",
-        "or": "OR",
-        "pickFromFiles": "Pick from files",
-        "couldNotFetchImage": "Could not fetch image",
-        "imageSavingFailed": "Image Saving Failed",
-        "addIcon": "Add Icon",
-        "coverRemoveAlert": "It will be removed from cover after it is deleted.",
-        "alertDialogConfirmation": "Are you sure, you want to continue?"
+        "addLocalImage": "Add local image"
      },
-      "mathEquation": {
-        "addMathEquation": "Add Math Equation",
-        "editMathEquation": "Edit Math Equation"
-      }
+      "discardResponse": "Do you want to discard the AI responses?"
    }
  },
  "board": {
    "column": {
      "create_new_card": "New"
    },
-    "menuName": "Board",
-    "referencedBoardPrefix": "View of"
+    "menuName": "Board"
  },
  "calendar": {
    "menuName": "Calendar",
@@ -411,12 +382,6 @@
      "jumpToday": "Jump to Today",
      "previousMonth": "Previous Month",
      "nextMonth": "Next Month"
-    },
-    "settings": {
-      "showWeekNumbers": "Show week numbers",
-      "showWeekends": "Show weekends",
-      "firstDayOfWeek": "First day of week",
-      "layoutDateField": "Layout calendar by"
    }
  }
 }
@@ -271,7 +271,7 @@
      "optionTitle": "Aukerak",
      "addOption": "Gehitu aukera",
      "editProperty": "Editatu propietatea",
-      "newProperty": "Zutabe berria",
+      "newColumn": "Zutabe berria",
      "deleteFieldPromptMessage": "Ziur al zaude? Propietate hau ezabatu egingo da"
    },
    "sort": {
@@ -330,4 +330,4 @@
      "nextMonth": "Hurrengo hilabetea"
    }
  }
-}
+}
@@ -195,7 +195,7 @@
      "optionTitle": "Options",
      "addOption": "Ajouter une option",
      "editProperty": "Modifier la propriété",
-      "newProperty": "Nouvelle colonne",
+      "newColumn": "Nouvelle colonne",
      "deleteFieldPromptMessage": "Vous voulez supprimer cette propriété ?"
    },
    "row": {
@@ -191,7 +191,7 @@
      "optionTitle": "옵션",
      "addOption": "옵션 추가",
      "editProperty": "속성 편집",
-      "newProperty": "열 추가",
+      "newColumn": "열 추가",
      "deleteFieldPromptMessage": "해당 속성을 삭제 하시겠습니까?"
    },
    "row": {
@@ -39,7 +39,7 @@
    "workInProgress": "Em breve",
    "markdown": "Marcador",
    "copyLink": "Copiar link"
-  },
+    },
  "moreAction": {
    "small": "pequeno",
    "medium": "médio",
@@ -177,7 +177,7 @@
        "system": "Adaptar-se ao sistema"
      },
      "theme": "Tema"
-    },
+  },
    "files": {
      "defaultLocation": "Onde os seus dados ficam armazenados",
      "doubleTapToCopy": "Clique duas vezes para copiar o caminho",
@@ -287,7 +287,7 @@
      "optionTitle": "Opções",
      "addOption": "Adicioar opção",
      "editProperty": "Editar propriedade",
-      "newProperty": "Nova coluna",
+      "newColumn": "Nova coluna",
      "deleteFieldPromptMessage": "Tem certeza? Esta propriedade será excluída"
    },
    "sort": {
@@ -320,7 +320,7 @@
      "pannelTitle": "Escolha uma opção ou crie uma",
      "searchOption": "Procurar uma opção"
    },
-    "checklist": {
+        "checklist": {
      "panelTitle": "Adicionar um item"
    },
    "menuName": "Grade"
@@ -1,149 +1,150 @@
 {
-  "appName": "AppFlowy",
-  "defaultUsername": "Me",
-  "welcomeText": "Bem vindo ao @:appName",
-  "githubStarText": "Star on GitHub",
-  "subscribeNewsletterText": "Inscreve-te ao Newsletter",
-  "letsGoButtonText": "Bora",
-  "title": "Título",
-  "signUp": {
-    "buttonText": "Inscreve-te",
-    "title": "Inscreve-te ao @:appName",
-    "getStartedText": "Começar",
-    "emptyPasswordError": "A palavra-passe não pode estar em branco.",
-    "repeatPasswordEmptyError": "Confirmar a palavra-passe não pode estar em branco.",
-    "unmatchedPasswordError": "As palavras-passes não coincidem.",
-    "alreadyHaveAnAccount": "Já possuis uma conta?",
-    "emailHint": "Email",
-    "passwordHint": "Password",
-    "repeatPasswordHint": "Confirma a tua password"
-  },
-  "signIn": {
-    "loginTitle": "Entre no @:appName",
-    "loginButtonText": "Login",
-    "buttonText": "Entre",
-    "forgotPassword": "Esqueceste-te da tua palavra-passe?",
-    "emailHint": "Email",
-    "passwordHint": "Palavra-passe",
-    "dontHaveAnAccount": "Não possuis uma conta?",
-    "repeatPasswordEmptyError": "Confirmar a palavra-passe não pode estar em branco.",
-    "unmatchedPasswordError": "As palavras-passes não conferem."
-  },
-  "workspace": {
-    "create": "Cria um ambiente de trabalho",
-    "hint": "ambiente de trabalho",
-    "notFoundError": "Ambiente de trabalho não encontrada"
-  },
-  "shareAction": {
-    "buttonText": "Partilhar",
-    "workInProgress": "Em breve",
-    "markdown": "Markdown",
-    "copyLink": "Copiar o link"
-  },
-  "disclosureAction": {
-    "rename": "Renomear",
-    "delete": "Apagar",
-    "duplicate": "Duplicar"
-  },
-  "blankPageTitle": "Página em branco",
-  "newPageText": "Nova página",
-  "trash": {
-    "text": "Lixo",
-    "restoreAll": "Restaurar todos",
-    "deleteAll": "Apagar todos",
-    "pageHeader": {
-      "fileName": "Nome do ficheiro",
-      "lastModified": "Última modificação",
-      "created": "Criado"
-    }
-  },
-  "deletePagePrompt": {
-    "text": "Esta página está no lixo",
-    "restore": "Restaurar a página",
-    "deletePermanent": "Apagar permanentemente"
-  },
-  "dialogCreatePageNameHint": "Nome da página",
-  "questionBubble": {
-    "whatsNew": "O que há de novo?",
-    "help": "Ajuda & Suporte",
-    "debug": {
-      "name": "Informação de depuração",
-      "success": "Copiar informação de depuração para o clipboard!",
-      "fail": "Falha em copiar a informação de depuração para o clipboard"
-    }
-  },
-  "menuAppHeader": {
-    "addPageTooltip": "Adiciona uma nova página.",
-    "defaultNewPageName": "Sem título",
-    "renameDialog": "Renomear"
-  },
-  "toolbar": {
-    "undo": "Desfazer",
-    "redo": "Refazer",
-    "bold": "Negrito",
-    "italic": "Itálico",
-    "underline": "Sublinhado",
-    "strike": "Riscado",
-    "numList": "Lista numerada",
-    "bulletList": "Lista com marcadores",
-    "checkList": "Lista de verificação",
-    "inlineCode": "Embutir código",
-    "quote": "Citação em bloco",
-    "header": "Cabeçalho",
-    "highlight": "Realçar"
-  },
-  "tooltip": {
-    "lightMode": "Mudar para o modo Claro.",
-    "darkMode": "Mudar para o modo Escuro."
-  },
-  "contactsPage": {
-    "title": "Conctatos",
-    "whatsHappening": "O que está a acontecer nesta semana?",
-    "addContact": "Adicionar um conctato",
-    "editContact": "Editar um conctato"
-  },
-  "button": {
-    "OK": "OK",
-    "Cancel": "Cancelar",
-    "signIn": "Entrar",
-    "signOut": "Sair",
-    "complete": "Completar",
-    "save": "Guardar"
-  },
-  "label": {
-    "welcome": "Bem vindo!",
-    "firstName": "Nome",
-    "middleName": "Nome do Meio",
-    "lastName": "Apelido",
-    "stepX": "Passo {X}"
-  },
-  "oAuth": {
-    "err": {
-      "failedTitle": "Erro ao conectar à sua conta.",
-      "failedMsg": "Verifica se concluiste o processo de login no teu navegador."
+    "appName": "AppFlowy",
+    "defaultUsername": "Me",
+    "welcomeText": "Bem vindo ao @:appName",
+    "githubStarText": "Star on GitHub",
+    "subscribeNewsletterText": "Inscreve-te ao Newsletter",
+    "letsGoButtonText": "Bora",
+    "title": "Título",
+    "signUp": {
+      "buttonText": "Inscreve-te",
+      "title": "Inscreve-te ao @:appName",
+      "getStartedText": "Começar",
+      "emptyPasswordError": "A palavra-passe não pode estar em branco.",
+      "repeatPasswordEmptyError": "Confirmar a palavra-passe não pode estar em branco.",
+      "unmatchedPasswordError": "As palavras-passes não coincidem.",
+      "alreadyHaveAnAccount": "Já possuis uma conta?",
+      "emailHint": "Email",
+      "passwordHint": "Password",
+      "repeatPasswordHint": "Confirma a tua password"
    },
-    "google": {
-      "title": "GOOGLE SIGN-IN",
-      "instruction1": "Para importar os teus Conctatos do Google, tens de autorizar esta aplicação usando o teu navegador web.",
-      "instruction2": "Copia este código para a tua área de transferências clicando no ícone ou selecionando o texto:",
-      "instruction3": "Navega até o link a seguir no seu navegador e digite o código acima:",
-      "instruction4": "Clica no botão abaixo ao concluir a inscrição:"
-    }
-  },
-  "settings": {
-    "title": "Definições",
-    "menu": {
-      "appearance": "Aparência",
-      "language": "Idioma",
-      "open": "Abrir as Definições"
+    "signIn": {
+      "loginTitle": "Entre no @:appName",
+      "loginButtonText": "Login",
+      "buttonText": "Entre",
+      "forgotPassword": "Esqueceste-te da tua palavra-passe?",
+      "emailHint": "Email",
+      "passwordHint": "Palavra-passe",
+      "dontHaveAnAccount": "Não possuis uma conta?",
+      "repeatPasswordEmptyError": "Confirmar a palavra-passe não pode estar em branco.",
+      "unmatchedPasswordError": "As palavras-passes não conferem."
    },
-    "appearance": {
-      "lightLabel": "Modo Claro",
-      "darkLabel": "Modo Escuro"
+    "workspace": {
+      "create": "Cria um ambiente de trabalho",
+      "hint": "ambiente de trabalho",
+      "notFoundError": "Ambiente de trabalho não encontrada"
+    },
+    "shareAction": {
+      "buttonText": "Partilhar",
+      "workInProgress": "Em breve",
+      "markdown": "Markdown",
+      "copyLink": "Copiar o link"
+    },
+    "disclosureAction": {
+      "rename": "Renomear",
+      "delete": "Apagar",
+      "duplicate": "Duplicar"
+    },
+    "blankPageTitle": "Página em branco",
+    "newPageText": "Nova página",
+    "trash": {
+      "text": "Lixo",
+      "restoreAll": "Restaurar todos",
+      "deleteAll": "Apagar todos",
+      "pageHeader": {
+        "fileName": "Nome do ficheiro",
+        "lastModified": "Última modificação",
+        "created": "Criado"
+      }
+    },
+    "deletePagePrompt": {
+      "text": "Esta página está no lixo",
+      "restore": "Restaurar a página",
+      "deletePermanent": "Apagar permanentemente"
+    },
+    "dialogCreatePageNameHint": "Nome da página",
+    "questionBubble": {
+      "whatsNew": "O que há de novo?",
+      "help": "Ajuda & Suporte",
+      "debug": {
+        "name": "Informação de depuração",
+        "success": "Copiar informação de depuração para o clipboard!",
+        "fail": "Falha em copiar a informação de depuração para o clipboard"
+      }
+    },
+    "menuAppHeader": {
+      "addPageTooltip": "Adiciona uma nova página.",
+      "defaultNewPageName": "Sem título",
+      "renameDialog": "Renomear"
+    },
+    "toolbar": {
+      "undo": "Desfazer",
+      "redo": "Refazer",
+      "bold": "Negrito",
+      "italic": "Itálico",
+      "underline": "Sublinhado",
+      "strike": "Riscado",
+      "numList": "Lista numerada",
+      "bulletList": "Lista com marcadores",
+      "checkList": "Lista de verificação",
+      "inlineCode": "Embutir código",
+      "quote": "Citação em bloco",
+      "header": "Cabeçalho",
+      "highlight": "Realçar"
+    },
+    "tooltip": {
+      "lightMode": "Mudar para o modo Claro.",
+      "darkMode": "Mudar para o modo Escuro."
+    },
+    "contactsPage": {
+      "title": "Conctatos",
+      "whatsHappening": "O que está a acontecer nesta semana?",
+      "addContact": "Adicionar um conctato",
+      "editContact": "Editar um conctato"
+    },
+    "button": {
+      "OK": "OK",
+      "Cancel": "Cancelar",
+      "signIn": "Entrar",
+      "signOut": "Sair",
+      "complete": "Completar",
+      "save": "Guardar"
+    },
+    "label": {
+      "welcome": "Bem vindo!",
+      "firstName": "Nome",
+      "middleName": "Nome do Meio",
+      "lastName": "Apelido",
+      "stepX": "Passo {X}"
+    },
+    "oAuth": {
+      "err": {
+        "failedTitle": "Erro ao conectar à sua conta.",
+        "failedMsg": "Verifica se concluiste o processo de login no teu navegador."
+      },
+      "google": {
+        "title": "GOOGLE SIGN-IN",
+        "instruction1": "Para importar os teus Conctatos do Google, tens de autorizar esta aplicação usando o teu navegador web.",
+        "instruction2": "Copia este código para a tua área de transferências clicando no ícone ou selecionando o texto:",
+        "instruction3": "Navega até o link a seguir no seu navegador e digite o código acima:",
+        "instruction4": "Clica no botão abaixo ao concluir a inscrição:"
+      }
+    },
+    "settings": {
+      "title": "Definições",
+      "menu": {
+        "appearance": "Aparência",
+        "language": "Idioma",
+        "open": "Abrir as Definições"
+      },
+      "appearance": {
+        "lightLabel": "Modo Claro",
+        "darkLabel": "Modo Escuro"
+      }
+    },
+    "sideBar": {
+      "openSidebar": "Open sidebar",
+      "closeSidebar": "Close sidebar"
    }
-  },
-  "sideBar": {
-    "openSidebar": "Open sidebar",
-    "closeSidebar": "Close sidebar"
  }
-}
+
@@ -1,413 +1,348 @@
-{
-  "appName": "AppFlowy",
-  "defaultUsername": "Я",
-  "welcomeText": "Добро пожаловать в @:appName",
-  "githubStarText": "Поставить звезду на GitHub",
-  "subscribeNewsletterText": "Подписаться на рассылку",
-  "letsGoButtonText": "Начнём",
-  "title": "Заголовок",
-  "signUp": {
-    "buttonText": "Зарегистрироваться",
-    "title": "Регистрация в @:appName",
-    "getStartedText": "Начать",
-    "emptyPasswordError": "Пароль не может быть пустым",
-    "repeatPasswordEmptyError": "Повтор пароля не может быть пустым",
-    "unmatchedPasswordError": "Пароли не совпадают",
-    "alreadyHaveAnAccount": "Уже есть аккаунт?",
-    "emailHint": "Электронная почта",
-    "passwordHint": "Пароль",
-    "repeatPasswordHint": "Повторите пароль"
-  },
-  "signIn": {
-    "loginTitle": "Войти в @:appName",
-    "loginButtonText": "Войти",
-    "buttonText": "Авторизация",
-    "forgotPassword": "Забыли пароль?",
-    "emailHint": "Электронная почта",
-    "passwordHint": "Пароль",
-    "dontHaveAnAccount": "Нет аккаунта?",
-    "repeatPasswordEmptyError": "Повтор пароля не может быть пустым",
-    "unmatchedPasswordError": "Пароли не совпадают"
-  },
-  "workspace": {
-    "create": "Создать рабочее пространство",
-    "hint": "рабочее пространство",
-    "notFoundError": "Нет такого рабочего пространства"
-  },
-  "shareAction": {
-    "buttonText": "Поделиться",
-    "workInProgress": "В разработке",
-    "markdown": "Markdown",
-    "copyLink": "Скопировать ссылку"
-  },
-  "moreAction": {
-    "small": "маленький",
-    "medium": "средний",
-    "large": "большой",
-    "fontSize": "Размер шрифта"
-  },
-  "disclosureAction": {
-    "rename": "Переименовать",
-    "delete": "Удалить",
-    "duplicate": "Дублировать"
-  },
-  "blankPageTitle": "Пустая страница",
-  "newPageText": "Новая страница",
-  "trash": {
-    "text": "Корзина",
-    "restoreAll": "Восстановить всё",
-    "deleteAll": "Очистить",
-    "pageHeader": {
-      "fileName": "Имя",
-      "lastModified": "Последнее изменение",
-      "created": "Создан"
-    }
-  },
-  "deletePagePrompt": {
-    "text": "Эта страница в Корзине",
-    "restore": "Восстановить страницу",
-    "deletePermanent": "Удалить навсегда"
-  },
-  "dialogCreatePageNameHint": "Имя страницы",
-  "questionBubble": {
-    "whatsNew": "Что нового?",
-    "help": "Помощь",
-    "debug": {
-      "name": "Отладочная информация",
-      "success": "Скопировано в буфер обмена!",
-      "fail": "Не получилось скопировать"
-    }
-  },
-  "menuAppHeader": {
-    "addPageTooltip": "Быстро добавить новую страницу",
-    "defaultNewPageName": "Без заголовка",
-    "renameDialog": "Переименовать"
-  },
-  "toolbar": {
-    "undo": "Отменить",
-    "redo": "Повторить",
-    "bold": "Жирный",
-    "italic": "Курсив",
-    "underline": "Подчёркнутый",
-    "strike": "Зачёркнутый",
-    "numList": "Нумерованный список",
-    "bulletList": "Маркированный список",
-    "checkList": "Список To-Do",
-    "inlineCode": "Код",
-    "quote": "Цитата",
-    "header": "Заголовок",
-    "highlight": "Выделение",
-    "color": "Цвет"
-  },
-  "tooltip": {
-    "lightMode": "Переключить на светлую тему",
-    "darkMode": "Переключить на тёмную тему",
-    "openAsPage": "Открыть как страницу",
-    "addNewRow": "Добавить новую строку",
-    "openMenu": "Открыть меню",
-    "viewDataBase": "Просмотр базы данных",
-    "referencePage": "Ссылаются на {name}"
-  },
-  "sideBar": {
-    "closeSidebar": "Закрыть боковое меню",
-    "openSidebar": "Открыть боковое меню"
-  },
-  "notifications": {
-    "export": {
-      "markdown": "Заметка экспортирована в Markdown",
-      "path": "Документы/flowy"
-    }
-  },
-  "contactsPage": {
-    "title": "Контакты",
-    "whatsHappening": "Какие события на этой неделе?",
-    "addContact": "Добавить контакт",
-    "editContact": "Редактировать контакт"
-  },
-  "button": {
-    "OK": "OK",
-    "Cancel": "Отмена",
-    "signIn": "Войти",
-    "signOut": "Выйти",
-    "complete": "Завершить",
-    "save": "Сохранить",
-    "generate": "Сгенерировать",
-    "esc": "ESC",
-    "keep": "Оставить",
-    "tryAgain": "Повторить",
-    "discard": "Отменить",
-    "replace": "Заменить",
-    "insertBelow": "Вставить ниже"
-  },
-  "label": {
-    "welcome": "Добро пожаловать!",
-    "firstName": "Имя",
-    "middleName": "Отчество",
-    "lastName": "Фамилия",
-    "stepX": "Этап {X}"
-  },
-  "oAuth": {
-    "err": {
-      "failedTitle": "Не удалось подключиться к вашей учетной записи.",
-      "failedMsg": "Убедитесь, что вы завершили вход в своём браузере."
-    },
-    "google": {
-      "title": "Вход через Google",
-      "instruction1": "Чтобы импортировать ваши Google Контакты, вам нужно будет авторизовать приложение через браузер.",
-      "instruction2": "Скопируйте этот код в буфер обмена (нажав кнопку или выделив текст):",
-      "instruction3": "Пройдите по ссылке и введите этот код:",
-      "instruction4": "Нажмите на кнопку ниже, когда завершите вход:"
-    }
-  },
-  "settings": {
-    "title": "Настройки",
-    "menu": {
-      "appearance": "Внешний вид",
-      "language": "Язык",
-      "user": "Пользователь",
-      "files": "Файлы",
-      "open": "Открыть настройки"
-    },
-    "appearance": {
-      "themeMode": {
-        "label": "Режим темы",
-        "light": "Светлая",
-        "dark": "Тёмная",
-        "system": "Системная"
-      },
-      "theme": "Тема"
-    },
-    "files": {
-      "defaultLocation": "Где сейчас хранятся ваши данные",
-      "doubleTapToCopy": "Нажмите дважды, чтобы скопировать путь",
-      "restoreLocation": "Восстановить путь AppFlowy по умолчанию",
-      "customizeLocation": "Открыть другую папку",
-      "restartApp": "Пожалуйста, перезапустите приложение, чтобы изменения вступили в силу.",
-      "exportDatabase": "Экспорт базы данных",
-      "selectFiles": "Выбрать файлы, которые необходимо экспортировать",
-      "createNewFolder": "Создать новую папку",
-      "createNewFolderDesc": "Указать, где хранить свои данные ...",
-      "open": "Открыть",
-      "openFolder": "Открыть существующую папку",
-      "openFolderDesc": "Чтение и запись в существующую папку AppFlowy ...",
-      "folderHintText": "имя папки",
-      "location": "Создание новой папки",
-      "locationDesc": "Выбрать имя папки данных AppFlowy",
-      "browser": "Обзор",
-      "create": "Создать",
-      "folderPath": "Путь к вашей папке",
-      "locationCannotBeEmpty": "Путь не может быть пустым",
-      "pathCopiedSnackbar": "File storage path copied to clipboard!"
-    },
-    "user": {
-      "name": "Имя",
-      "icon": "Иконка",
-      "selectAnIcon": "Выбрать иконку",
-      "pleaseInputYourOpenAIKey": "Введите токен OpenAI"
-    }
-  },
-  "grid": {
-    "settings": {
-      "filter": "Фильтр",
-      "sort": "Сортировать",
-      "sortBy": "Сортировать по",
-      "Properties": "Свойства",
-      "group": "Группировать",
-      "addFilter": "Добавить фильтр",
-      "deleteFilter": "Удалить фильтр",
-      "filterBy": "Фильтровать по...",
-      "typeAValue": "Введите значение..."
-    },
-    "textFilter": {
-      "contains": "Содержит",
-      "doesNotContain": "Не содержит",
-      "endsWith": "Заканчивается на",
-      "startWith": "Начинается с",
-      "is": "Является",
-      "isNot": "Не является",
-      "isEmpty": "Пусто",
-      "isNotEmpty": "Не пусто",
-      "choicechipPrefix": {
-        "isNot": "Не является",
-        "startWith": "Начинается с",
-        "endWith": "Заканчивается на",
-        "isEmpty": "пусто",
-        "isNotEmpty": "не пусто"
-      }
-    },
-    "checkboxFilter": {
-      "isChecked": "Отмечено",
-      "isUnchecked": "Не отмечено",
-      "choicechipPrefix": {
-        "is": "является"
-      }
-    },
-    "checklistFilter": {
-      "isComplete": "завершено",
-      "isIncomplted": "не завершено"
-    },
-    "singleSelectOptionFilter": {
-      "is": "Является",
-      "isNot": "Не является",
-      "isEmpty": "Пусто",
-      "isNotEmpty": "Не пусто"
-    },
-    "multiSelectOptionFilter": {
-      "contains": "Содержит",
-      "doesNotContain": "Не содержит",
-      "isEmpty": "Пусто",
-      "isNotEmpty": "Не пусто"
-    },
-    "field": {
-      "hide": "Скрыть",
-      "insertLeft": "Вставить слева",
-      "insertRight": "Вставить справа",
-      "duplicate": "Дублировать",
-      "delete": "Удалить",
-      "textFieldName": "Текст",
-      "checkboxFieldName": "Чекбокс",
-      "dateFieldName": "Дата",
-      "numberFieldName": "Число",
-      "singleSelectFieldName": "Выбор",
-      "multiSelectFieldName": "Выбор нескольких",
-      "urlFieldName": "URL",
-      "checklistFieldName": "Контрольный список",
-      "numberFormat": "Формат числа",
-      "dateFormat": "Формат даты",
-      "includeTime": "Время",
-      "dateFormatFriendly": "День Месяц, Год",
-      "dateFormatISO": "Год-Месяц-День",
-      "dateFormatLocal": "Месяц/День/Год",
-      "dateFormatUS": "Год/Месяц/День",
-      "dateFormatDayMonthYear": "День/Mесяц/Год",
-      "timeFormat": "Формат времени",
-      "invalidTimeFormat": "Неверный формат",
-      "timeFormatTwelveHour": "12 часов",
-      "timeFormatTwentyFourHour": "24 часа",
-      "addSelectOption": "Добавить вариант",
-      "optionTitle": "Варианты",
-      "addOption": "Добавить",
-      "editProperty": "Редактировать свойство",
-      "newProperty": "Добавить колонку",
-      "deleteFieldPromptMessage": "Вы уверены? Свойство будет удалено"
-    },
-    "sort": {
-      "ascending": "По возрастанию",
-      "descending": "По убыванию",
-      "deleteSort": "Удалить сортировку",
-      "addSort": "Добавить сортировку"
-    },
-    "row": {
-      "duplicate": "Дублировать",
-      "delete": "Удалить",
-      "textPlaceholder": "Пусто",
-      "copyProperty": "Свойство скопировано",
-      "count": "Количество",
-      "newRow": "Новая строка"
-    },
-    "selectOption": {
-      "create": "Создать",
-      "purpleColor": "Фиолетовый",
-      "pinkColor": "Розовый",
-      "lightPinkColor": "Светло-розовый",
-      "orangeColor": "Оранжевый",
-      "yellowColor": "Желтый",
-      "limeColor": "Ярко-зелёный",
-      "greenColor": "Зелёный",
-      "aquaColor": "Бирюзовый",
-      "blueColor": "Синий",
-      "deleteTag": "Удалить вариант",
-      "colorPanelTitle": "Цвета",
-      "panelTitle": "Выберите или создайте вариант",
-      "searchOption": "Поиск"
-    },
-    "checklist": {
-      "panelTitle": "Добавить элемент"
-    },
-    "menuName": "Сетка",
-    "referencedGridPrefix": "Просмотр"
-  },
-  "document": {
-    "menuName": "Документ",
-    "date": {
-      "timeHintTextInTwelveHour": "01:00 PM",
-      "timeHintTextInTwentyFourHour": "13:00"
-    },
-    "slashMenu": {
-      "board": {
-        "selectABoardToLinkTo": "Выбрать доску для связи с",
-        "createANewBoard": "Создать доску"
-      },
-      "grid": {
-        "selectAGridToLinkTo": "Выберите сетку для связи с",
-        "createANewGrid": "Создать сетку"
-      }
-    },
-    "plugins": {
-      "referencedBoard": "Связанные доски",
-      "referencedGrid": "Связанные сетки",
-      "autoGeneratorMenuItemName": "Генератор OpenAI",
-      "autoGeneratorTitleName": "OpenAI: попросить ИИ написать что угодно...",
-      "autoGeneratorLearnMore": "Узнать больше",
-      "autoGeneratorGenerate": "Генерировать",
-      "autoGeneratorHintText": "Спросить OpenAI ...",
-      "autoGeneratorCantGetOpenAIKey": "Не могу получить токен OpenAI",
-      "smartEdit": "ИИ ассистенты",
-      "openAI": "OpenAI",
-      "smartEditFixSpelling": "Исправить правописание",
-      "warning": "⚠️ Ответы ИИ могут быть неправильными или неточными.",
-      "smartEditSummarize": "Выделить суть",
-      "smartEditCouldNotFetchResult": "Не могу получить ответ от OpenAI",
-      "smartEditCouldNotFetchKey": "Не могу получить токен OpenAI",
-      "smartEditDisabled": "Подключить OpenAI",
-      "discardResponse": "Хотите убрать ответы ИИ?",
-      "cover": {
-        "changeCover": "Сменить обложку",
-        "colors": "Цвета",
-        "images": "Изображения",
-        "clearAll": "Очистить",
-        "abstract": "Абстракные",
-        "addCover": "Добавить обложку",
-        "addLocalImage": "Добавить изображение с диска",
-        "invalidImageUrl": "Некорректная ссылка на изображение",
-        "failedToAddImageToGallery": "Ошибка добавления изображения в галерею",
-        "enterImageUrl": "Введите ссылку на изображение",
-        "add": "Добавить",
-        "back": "Назад",
-        "saveToGallery": "Сохранить в галерею",
-        "removeIcon": "Удалить иконку",
-        "pasteImageUrl": "Вставить ссылку на изображение",
-        "or": "ИЛИ",
-        "pickFromFiles": "Выбрать с диска",
-        "couldNotFetchImage": "Не удалось получить изображение",
-        "imageSavingFailed": "Не удалось сохранить изображение",
-        "addIcon": "Добавить иконку",
-        "coverRemoveAlert": "Изображение будет удалено с обложки",
-        "alertDialogConfirmation": "Вы хотите продолжить?"
-      }
-    }
-  },
-  "board": {
-    "column": {
-      "create_new_card": "Создать"
-    },
-    "menuName": "Доска",
-    "referencedBoardPrefix": "Просмотр"
-  },
-  "calendar": {
-    "menuName": "Календарь",
-    "defaultNewCalendarTitle": "Безымянный",
-    "navigation": {
-      "today": "Сегодня",
-      "jumpToday": "Перейти к сегодняшнему дню",
-      "previousMonth": "Предыдущий месяц",
-      "nextMonth": "Следующий месяц"
-    },
-    "settings": {
-      "showWeekNumbers": "Показывать номера недель",
-      "showWeekends": "Показывать выходные",
-      "firstDayOfWeek": "Первый день недели",
-      "layoutDateField": "Вид календаря"
-    }
-  }
-}
+{
+    "appName": "AppFlowy",
+    "defaultUsername": "Я",
+    "welcomeText": "Добро пожаловать в @:appName",
+    "githubStarText": "Поставить звезду на GitHub",
+    "subscribeNewsletterText": "Подписаться на рассылку",
+    "letsGoButtonText": "Начнём",
+    "title": "Заголовок",
+    "signUp": {
+        "buttonText": "Зарегистрироваться",
+        "title": "Регистрация в @:appName",
+        "getStartedText": "Начать",
+        "emptyPasswordError": "Пароль не может быть пустым",
+        "repeatPasswordEmptyError": "Повтор пароля не может быть пустым",
+        "unmatchedPasswordError": "Пароли не совпадают",
+        "alreadyHaveAnAccount": "Уже есть аккаунт?",
+        "emailHint": "Электронная почта",
+        "passwordHint": "Пароль",
+        "repeatPasswordHint": "Повторите пароль"
+    },
+    "signIn": {
+        "loginTitle": "Войти в @:appName",
+        "loginButtonText": "Войти",
+        "buttonText": "Авторизация",
+        "forgotPassword": "Забыли пароль?",
+        "emailHint": "Электронная почта",
+        "passwordHint": "Пароль",
+        "dontHaveAnAccount": "Нет аккаунта?",
+        "repeatPasswordEmptyError": "Повтор пароля не может быть пустым",
+        "unmatchedPasswordError": "Пароли не совпадают"
+    },
+    "workspace": {
+        "create": "Создать рабочее пространство",
+        "hint": "рабочее пространство",
+        "notFoundError": "Нет такого рабочего пространства"
+    },
+    "shareAction": {
+        "buttonText": "Поделиться",
+        "workInProgress": "В разработке",
+        "markdown": "Markdown",
+        "copyLink": "Скопировать ссылку"
+    },
+    "moreAction": {
+        "small": "маленький",
+        "medium": "средний",
+        "large": "большой",
+        "fontSize": "Размер шрифта"
+    },
+    "disclosureAction": {
+        "rename": "Переименовать",
+        "delete": "Удалить",
+        "duplicate": "Дублировать"
+    },
+    "blankPageTitle": "Пустая страница",
+    "newPageText": "Новая страница",
+    "trash": {
+        "text": "Корзина",
+        "restoreAll": "Восстановить всё",
+        "deleteAll": "Очистить",
+        "pageHeader": {
+            "fileName": "Имя",
+            "lastModified": "Последнее изменение",
+            "created": "Создан"
+        }
+    },
+    "deletePagePrompt": {
+        "text": "Эта страница в Корзине",
+        "restore": "Восстановить страницу",
+        "deletePermanent": "Удалить навсегда"
+    },
+    "dialogCreatePageNameHint": "Имя страницы",
+    "questionBubble": {
+        "whatsNew": "Что нового?",
+        "help": "Помощь",
+        "debug": {
+            "name": "Отладочная информация",
+            "success": "Скопировано в буфер обмена!",
+            "fail": "Не получилось скопировать"
+        }
+    },
+    "menuAppHeader": {
+        "addPageTooltip": "Быстро добавить новую страницу",
+        "defaultNewPageName": "Без заголовка",
+        "renameDialog": "Переименовать"
+    },
+    "toolbar": {
+        "undo": "Отменить",
+        "redo": "Повторить",
+        "bold": "Жирный",
+        "italic": "Курсив",
+        "underline": "Подчёркнутый",
+        "strike": "Зачёркнутый",
+        "numList": "Нумерованный список",
+        "bulletList": "Маркированный список",
+        "checkList": "Список To-Do",
+        "inlineCode": "Код",
+        "quote": "Цитата",
+        "header": "Заголовок",
+        "highlight": "Выделение",
+        "color": "Цвет"
+    },
+    "tooltip": {
+        "lightMode": "Переключить на светлую тему",
+        "darkMode": "Переключить на тёмную тему",
+        "openAsPage": "Открыть как страницу",
+        "addNewRow": "Добавить новую строку",
+        "openMenu": "Открыть меню",
+        "viewDataBase": "Просмотр базы данных",
+        "referencePage": "Ссылаются на {name}"
+    },
+    "sideBar": {
+        "closeSidebar": "Закрыть боковое меню",
+        "openSidebar": "Открыть боковое меню"
+    },
+    "notifications": {
+        "export": {
+            "markdown": "Заметка экспортирована в Markdown",
+            "path": "Документы/flowy"
+        }
+    },
+    "contactsPage": {
+        "title": "Контакты",
+        "whatsHappening": "Какие события на этой неделе?",
+        "addContact": "Добавить контакт",
+        "editContact": "Редактировать контакт"
+    },
+    "button": {
+        "OK": "OK",
+        "Cancel": "Отмена",
+        "signIn": "Войти",
+        "signOut": "Выйти",
+        "complete": "Завершить",
+        "save": "Сохранить"
+    },
+    "label": {
+        "welcome": "Добро пожаловать!",
+        "firstName": "Имя",
+        "middleName": "Отчество",
+        "lastName": "Фамилия",
+        "stepX": "Этап {X}"
+    },
+    "oAuth": {
+        "err": {
+            "failedTitle": "Не удалось подключиться к вашей учетной записи.",
+            "failedMsg": "Убедитесь, что вы завершили вход в своём браузере."
+        },
+        "google": {
+            "title": "Вход через Google",
+            "instruction1": "Чтобы импортировать ваши Google Контакты, вам нужно будет авторизовать приложение через браузер.",
+            "instruction2": "Скопируйте этот код в буфер обмена (нажав кнопку или выделив текст):",
+            "instruction3": "Пройдите по ссылке и введите этот код:",
+            "instruction4": "Нажмите на кнопку ниже, когда завершите вход:"
+        }
+    },
+    "settings": {
+        "title": "Настройки",
+        "menu": {
+            "appearance": "Внешний вид",
+            "language": "Язык",
+            "user": "Пользователь",
+            "files": "Файлы",
+            "open": "Открыть настройки"
+        },
+        "appearance": {
+            "themeMode": {
+                "label": "Режим темы",
+                "light": "Светлая",
+                "dark": "Тёмная",
+                "system": "Системная"
+            },
+            "theme": "Тема"
+        },
+        "files": {
+            "defaultLocation": "Где сейчас хранятся ваши данные",
+            "doubleTapToCopy": "Нажмите дважды, чтобы скопировать путь",
+            "restoreLocation": "Восстановить путь AppFlowy по умолчанию",
+            "customizeLocation": "Открыть другую папку",
+            "restartApp": "Пожалуйста, перезапустите приложение, чтобы изменения вступили в силу.",
+            "exportDatabase": "Экспорт базы данных",
+            "selectFiles": "Выбрать файлы, которые необходимо экспортировать",
+            "createNewFolder": "Создать новую папку",
+            "createNewFolderDesc": "Указать, где хранить свои данные ...",
+            "open": "Открыть",
+            "openFolder": "Открыть существующую папку",
+            "openFolderDesc": "Чтение и запись в существующую папку AppFlowy ...",
+            "folderHintText": "имя папки",
+            "location": "Создание новой папки",
+            "locationDesc": "Выбрать имя папки данных AppFlowy",
+            "browser": "Обзор",
+            "create": "Создать",
+            "folderPath": "Путь к вашей папке",
+            "locationCannotBeEmpty": "Путь не может быть пустым"
+        }
+    },
+    "grid": {
+        "settings": {
+            "filter": "Фильтр",
+            "sort": "Сортировать",
+            "sortBy": "Сортировать по",
+            "Properties": "Свойства",
+            "group": "Группировать",
+            "addFilter": "Добавить фильтр",
+            "deleteFilter": "Удалить фильтр",
+            "filterBy": "Фильтровать по...",
+            "typeAValue": "Введите значение..."
+        },
+        "textFilter": {
+            "contains": "Содержит",
+            "doesNotContain": "Не содержит",
+            "endsWith": "Заканчивается на",
+            "startWith": "Начинается с",
+            "is": "Является",
+            "isNot": "Не является",
+            "isEmpty": "Пусто",
+            "isNotEmpty": "Не пусто",
+            "choicechipPrefix": {
+                "isNot": "Не является",
+                "startWith": "Начинается с",
+                "endWith": "Заканчивается на",
+                "isEmpty": "пусто",
+                "isNotEmpty": "не пусто"
+            }
+        },
+        "checkboxFilter": {
+            "isChecked": "Отмечено",
+            "isUnchecked": "Не отмечено",
+            "choicechipPrefix": {
+                "is": "является"
+            }
+        },
+        "checklistFilter": {
+            "isComplete": "завершено",
+            "isIncomplted": "не завершено"
+        },
+        "singleSelectOptionFilter": {
+            "is": "Является",
+            "isNot": "Не является",
+            "isEmpty": "Пусто",
+            "isNotEmpty": "Не пусто"
+        },
+        "multiSelectOptionFilter": {
+            "contains": "Содержит",
+            "doesNotContain": "Не содержит",
+            "isEmpty": "Пусто",
+            "isNotEmpty": "Не пусто"
+        },
+        "field": {
+            "hide": "Скрыть",
+            "insertLeft": "Вставить слева",
+            "insertRight": "Вставить справа",
+            "duplicate": "Дублировать",
+            "delete": "Удалить",
+            "textFieldName": "Текст",
+            "checkboxFieldName": "Чекбокс",
+            "dateFieldName": "Дата",
+            "numberFieldName": "Число",
+            "singleSelectFieldName": "Выбор",
+            "multiSelectFieldName": "Выбор нескольких",
+            "urlFieldName": "URL",
+            "checklistFieldName": "Контрольный список",
+            "numberFormat": "Формат числа",
+            "dateFormat": "Формат даты",
+            "includeTime": "Время",
+            "dateFormatFriendly": "День Месяц, Год",
+            "dateFormatISO": "Год-Месяц-День",
+            "dateFormatLocal": "Месяц/День/Год",
+            "dateFormatUS": "Год/Месяц/День",
+            "timeFormat": "Форматировать время",
+            "invalidTimeFormat": "Неверный формат",
+            "timeFormatTwelveHour": "12 часов",
+            "timeFormatTwentyFourHour": "24 часа",
+            "addSelectOption": "Добавить вариант",
+            "optionTitle": "Варианты",
+            "addOption": "Добавить",
+            "editProperty": "Редактировать свойство",
+            "newColumn": "Добавить колонку",
+            "deleteFieldPromptMessage": "Вы уверены? Свойство будет удалено"
+        },
+        "sort": {
+            "ascending": "По возрастанию",
+            "descending": "По убыванию",
+            "deleteSort": "Удалить сортировку",
+            "addSort": "Добавить сортировку"
+        },
+        "row": {
+            "duplicate": "Дублировать",
+            "delete": "Удалить",
+            "textPlaceholder": "Пусто",
+            "copyProperty": "Свойство скопировано",
+            "count": "Количество",
+            "newRow": "Новая строка"
+        },
+        "selectOption": {
+            "create": "Создать",
+            "purpleColor": "Фиолетовый",
+            "pinkColor": "Розовый",
+            "lightPinkColor": "Светло-розовый",
+            "orangeColor": "Оранжевый",
+            "yellowColor": "Желтый",
+            "limeColor": "Ярко-зелёный",
+            "greenColor": "Зелёный",
+            "aquaColor": "Бирюзовый",
+            "blueColor": "Синий",
+            "deleteTag": "Удалить вариант",
+            "colorPanelTitle": "Цвета",
+            "panelTitle": "Выберите или создайте вариант",
+            "searchOption": "Поиск"
+        },
+        "checklist": {
+            "panelTitle": "Добавить элемент"
+        },
+        "menuName": "Сетка"
+    },
+    "document": {
+        "menuName": "Документ",
+        "date": {
+            "timeHintTextInTwelveHour": "01:00 PM",
+            "timeHintTextInTwentyFourHour": "13:00"
+        },
+        "slashMenu": {
+            "board": {
+                "selectABoardToLinkTo": "Выбрать доску для связи с"
+            },
+            "grid": {
+                "selectAGridToLinkTo": "Выберите сетку для связи с"
+            }
+        },
+        "plugins": {
+            "referencedBoard": "Связанные доски",
+            "referencedGrid": "Связанные сетки"
+        }
+    },
+    "board": {
+        "column": {
+            "create_new_card": "Создать"
+        },
+        "menuName": "Доска"
+    },
+    "calendar": {
+        "menuName": "Календарь",
+        "navigation": {
+            "today": "Сегодня",
+            "jumpToday": "Перейти к сегодняшнему дню",
+            "previousMonth": "Предыдущий месяц",
+            "nextMonth": "Следующий месяц"
+        }
+    }
+}
@@ -195,7 +195,7 @@
      "optionTitle": "Alternativ",
      "addOption": "Lägg till alternativ",
      "editProperty": "Redigera egenskap",
-      "newProperty": "Ny kolumn",
+      "newColumn": "Ny kolumn",
      "deleteFieldPromptMessage": "Är du säker? Denna egenskap kommer att raderas."
    },
    "row": {
@@ -195,7 +195,7 @@
      "optionTitle": "标签",
      "addOption": "添加标签",
      "editProperty": "编辑列属性",
-      "newProperty": "增加一列",
+      "newColumn": "增加一列",
      "deleteFieldPromptMessage": "确定要删除这个属性吗? "
    },
    "row": {
@@ -40,13 +40,6 @@
    "markdown": "Markdown",
    "copyLink": "複製連結"
  },
-  "moreAction": {
-    "small": "小",
-    "medium": "中",
-    "large": "大",
-    "fontSize": "字體大小",
-    "import": "匯入"
-  },
  "disclosureAction": {
    "rename": "重新命名",
    "delete": "刪除",
@@ -71,7 +64,6 @@
  },
  "dialogCreatePageNameHint": "頁面名稱",
  "questionBubble": {
-    "shortcuts": "快捷鍵",
    "whatsNew": "新功能",
    "help": "幫助 & 支援",
    "debug": {
@@ -98,21 +90,11 @@
    "inlineCode": "程式碼",
    "quote": "區塊引言",
    "header": "標題",
-    "highlight": "反白",
-    "color": "顏色"
+    "highlight": "反白"
  },
  "tooltip": {
    "lightMode": "切換至亮色模式",
-    "darkMode": "切換至暗色模式",
-    "openAsPage": "以頁面開啓",
-    "addNewRow": "新增列表",
-    "openMenu": "點擊開啓選單",
-    "viewDataBase": "查看資料庫",
-    "referencePage": "這個 {name} 已參照"
-  },
-  "sideBar": {
-    "closeSidebar": "關閉側邊欄",
-    "openSidebar": "開啓側邊欄"
+    "darkMode": "切換至暗色模式"
  },
  "notifications": {
    "export": {
@@ -132,14 +114,7 @@
    "signIn": "登入",
    "signOut": "登出",
    "complete": "完成",
-    "save": "儲存",
-    "generate": "產生",
-    "esc": "離開",
-    "keep": "保存",
-    "tryAgain": "再試一次",
-    "discard": "放棄變更",
-    "replace": "取代",
-    "insertBelow": "在下面插入"
+    "save": "儲存"
  },
  "label": {
    "welcome": "歡迎！",
@@ -167,99 +142,22 @@
      "appearance": "外觀",
      "language": "語言",
      "user": "使用者",
-      "files": "檔案",
      "open": "開啟設定"
    },
    "appearance": {
      "themeMode": {
-        "label": "主題模式",
+        "label": "Theme Mode",
        "light": "亮色模式",
        "dark": "暗色模式",
-        "system": "系統設定"
-      },
-      "theme": "主題"
-    },
-    "files": {
-      "defaultLocation": "Appflowy 資料儲存位置",
-      "doubleTapToCopy": "雙擊以複製路徑",
-      "restoreLocation": "回復 Appflowy 預設路徑",
-      "customizeLocation": "開啓其他資料夾",
-      "restartApp": "請重新啓動以讓更動生效",
-      "exportDatabase": "匯出資料庫",
-      "selectFiles": "選擇需要匯出的檔案",
-      "createNewFolder": "建立新檔案",
-      "createNewFolderDesc": "選擇你想儲存資料的位置",
-      "open": "打開",
-      "openFolder": "開啓一個已經存在的資料夾",
-      "openFolderDesc": "讀寫已存在的 AppFlowy 資料夾",
-      "folderHintText": "資料夾名稱",
-      "location": "建立新資料夾",
-      "locationDesc": "命名 Appflowy 資料夾",
-      "browser": "瀏覽",
-      "create": "建立",
-      "folderPath": "儲存資料夾的路徑",
-      "locationCannotBeEmpty": "路徑不能爲空",
-      "pathCopiedSnackbar": "檔案儲存空間的路徑已被複製到剪貼簿！"
-    },
-    "user": {
-      "name": "名稱",
-      "icon": "圖標",
-      "selectAnIcon": "選擇圖標",
-      "pleaseInputYourOpenAIKey": "請輸入你的 OpenAI 密鑰"
+        "system": "Adapt to System"
+      }
    }
  },
  "grid": {
    "settings": {
      "filter": "篩選",
-      "sort": "排序",
      "sortBy": "排序方式",
-      "Properties": "內容",
-      "group": "群組",
-      "addFilter": "增加",
-      "deleteFilter": "刪除篩選器",
-      "filterBy": "以...篩選",
-      "typeAValue": "輸入一個值...",
-      "layout": "佈局"
-    },
-    "textFilter": {
-      "contains": "包含",
-      "doesNotContain": "不包含",
-      "endsWith": "以...結尾",
-      "startWith": "以...開頭",
-      "is": "是",
-      "isNot": "不是",
-      "isEmpty": "爲空",
-      "isNotEmpty": "不爲空",
-      "choicechipPrefix": {
-        "isNot": "不是",
-        "startWith": "以...開頭",
-        "endWith": "以...結尾",
-        "isEmpty": "爲空",
-        "isNotEmpty": "不爲空"
-      }
-    },
-    "checkboxFilter": {
-      "isChecked": "已核取",
-      "isUnchecked": "未核取",
-      "choicechipPrefix": {
-        "is": "是"
-      }
-    },
-    "checklistFilter": {
-      "isComplete": "已完成",
-      "isIncomplted": "未完成"
-    },
-    "singleSelectOptionFilter": {
-      "is": "是",
-      "isNot": "不是",
-      "isEmpty": "爲空",
-      "isNotEmpty": "不爲空"
-    },
-    "multiSelectOptionFilter": {
-      "contains": "包含",
-      "doesNotContain": "不包含",
-      "isEmpty": "爲空",
-      "isNotEmpty": "不爲空"
+      "Properties": "內容"
    },
    "field": {
      "hide": "隱藏",
@@ -274,7 +172,6 @@
      "singleSelectFieldName": "單選",
      "multiSelectFieldName": "多選",
      "urlFieldName": "網址",
-      "checklistFieldName": "核取列表",
      "numberFormat": "數字格式",
      "dateFormat": "日期格式",
      "includeTime": "包含時間",
@@ -289,23 +186,13 @@
      "addSelectOption": "新增選項",
      "optionTitle": "選項",
      "addOption": "新增選項",
-      "editProperty": "編輯內容",
-      "newProperty": "新欄位",
-      "deleteFieldPromptMessage": "你確定嗎？這個內容將被刪除"
-    },
-    "sort": {
-      "ascending": "升冪排序",
-      "descending": "降冪排序",
-      "deleteSort": "刪除排序",
-      "addSort": "新增排序"
+      "editProperty": "編輯內容"
    },
    "row": {
      "duplicate": "複製",
      "delete": "刪除",
      "textPlaceholder": "空",
-      "copyProperty": "已將內容複製至剪貼簿",
-      "count": "Count",
-      "newRow": "新列表"
+      "copyProperty": "已將內容複製至剪貼簿"
    },
    "selectOption": {
      "create": "建立",
@@ -323,9 +210,6 @@
      "panelTitle": "搜尋或建立選項",
      "searchOption": "搜尋選項"
    },
-    "checklist": {
-      "panelTitle": "新增物件"
-    },
    "menuName": "網格"
  },
  "document": {
@@ -333,78 +217,10 @@
    "date": {
      "timeHintTextInTwelveHour": "01:00 PM",
      "timeHintTextInTwentyFourHour": "13:00"
-    },
-    "slashMenu": {
-      "board": {
-        "selectABoardToLinkTo": "選擇要連結的看板",
-        "createANewBoard": "建立新的看板"
-      },
-      "grid": {
-        "selectAGridToLinkTo": "選擇要連結的網格",
-        "createANewGrid": "建立新網格"
-      }
-    },
-    "plugins": {
-      "referencedBoard": "已參照的看板",
-      "referencedGrid": "已參照的網格",
-      "autoGeneratorMenuItemName": "OpenAI 寫手",
-      "autoGeneratorTitleName": "OpenAI: 叫人工智慧寫下任何事情...",
-      "autoGeneratorLearnMore": "Learn more",
-      "autoGeneratorGenerate": "產生",
-      "autoGeneratorHintText": "問 OpenAI ...",
-      "autoGeneratorCantGetOpenAIKey": "無法取得 OpenAI 密鑰",
-      "smartEdit": "人工智慧助理",
-      "openAI": "OpenAI",
-      "smartEditFixSpelling": "修正拼寫",
-      "warning": "⚠️ AI 的回答可能不精確或是存在誤導",
-      "smartEditSummarize": "總結",
-      "smartEditCouldNotFetchResult": "無法取得 OpenAI 的結果",
-      "smartEditCouldNotFetchKey": "無法取得 OpenAI 密鑰",
-      "smartEditDisabled": "在設定連結 OpenAI ",
-      "discardResponse": "你確定放棄人工智慧的回覆？",
-      "cover": {
-        "changeCover": "更換封面",
-        "colors": "顏色",
-        "images": "圖片",
-        "abstract": "摘要",
-        "addCover": "新增封面",
-        "addLocalImage": "新增本機圖片",
-        "invalidImageUrl": "無效的圖片網址",
-        "failedToAddImageToGallery": "新增圖片到圖庫失敗",
-        "enterImageUrl": "輸入圖片網址",
-        "add": "Add",
-        "back": "Back",
-        "saveToGallery": "儲存到",
-        "removeIcon": "移除圖標",
-        "pasteImageUrl": "複製圖片網址",
-        "or": "或",
-        "pickFromFiles": "挑選檔案",
-        "couldNotFetchImage": "無法截取圖片",
-        "imageSavingFailed": "圖片儲存失敗",
-        "addIcon": "新增圖標"
-      }
    }
  },
-  "board": {
-    "column": {
-      "create_new_card": "建立"
-    },
-    "menuName": "看板"
-  },
-  "calendar": {
-    "menuName": "日曆",
-    "defaultNewCalendarTitle": "未命名的",
-    "navigation": {
-      "today": "今天",
-      "jumpToday": "跳至今天",
-      "previousMonth": "上個月",
-      "nextMonth": "下個月"
-    },
-    "settings": {
-      "showWeekNumbers": "顯示星期",
-      "showWeekends": "顯示週末",
-      "firstDayOfWeek": "一週的第一天",
-      "layoutDateField": "排列方式"
-    }
+  "sideBar": {
+    "openSidebar": "Open sidebar",
+    "closeSidebar": "Close sidebar"
  }
 }
@@ -1,45 +0,0 @@
-import 'package:appflowy_board/appflowy_board.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:integration_test/integration_test.dart';
-import 'util/util.dart';
-
-/// Integration tests for an empty board. The [TestWorkspaceService] will load
-/// a workspace from an empty board `assets/test/workspaces/board.zip` for all
-/// tests.
-///
-/// To create another integration test with a preconfigured workspace.
-/// Use the following steps.
-/// 1. Create a new workspace from the AppFlowy launch screen.
-/// 2. Modify the workspace until it is suitable as the starting point for
-///    the integration test you need to land.
-/// 3. Use a zip utility program to zip the workspace folder that you created.
-/// 4. Add the zip file under `assets/test/workspaces/`
-/// 5. Add a new enumeration to [TestWorkspace] in `integration_test/utils/data.dart`.
-///    For example, if you added a workspace called `empty_calendar.zip`,
-///    then [TestWorkspace] should have the following value:
-/// ```dart
-/// enum TestWorkspace {
-///   board('board'),
-///   empty_calendar('empty_calendar');
-///
-///   /* code */
-/// }
-/// ```
-/// 6. Double check that the .zip file that you added is included as an asset in
-///    the pubspec.yaml file under appflowy_flutter.
-void main() {
-  IntegrationTestWidgetsFlutterBinding.ensureInitialized();
-  const service = TestWorkspaceService(TestWorkspace.board);
-
-  group('board', () {
-    setUpAll(() async => await service.setUpAll());
-    setUp(() async => await service.setUp());
-
-    testWidgets(
-        'integration test unzips the proper workspace and loads it correctly.',
-        (tester) async {
-      await tester.initializeAppFlowy();
-      expect(find.byType(AppFlowyBoard), findsOneWidget);
-    });
-  });
-}
@@ -1,131 +0,0 @@
-import 'package:appflowy/plugins/document/presentation/plugins/base/built_in_page_widget.dart';
-import 'package:appflowy_editor/appflowy_editor.dart';
-import 'package:flutter/services.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:integration_test/integration_test.dart';
-import 'util/keyboard.dart';
-import 'util/util.dart';
-
-/// Integration tests for an empty document. The [TestWorkspaceService] will load a workspace from an empty document `assets/test/workspaces/empty_document.zip` for all tests.
-///
-/// To create another integration test with a preconfigured workspace. Use the following steps:
-/// 1. Create a new workspace from the AppFlowy launch screen.
-/// 2. Modify the workspace until it is suitable as the starting point for the integration test you need to land.
-/// 3. Use a zip utility program to zip the workspace folder that you created.
-/// 4. Add the zip file under `assets/test/workspaces/`
-/// 5. Add a new enumeration to [TestWorkspace] in `integration_test/utils/data.dart`. For example, if you added a workspace called `empty_calendar.zip`, then [TestWorkspace] should have the following value:
-/// ```dart
-/// enum TestWorkspace {
-///   board('board'),
-///   empty_calendar('empty_calendar');
-///
-///   /* code */
-/// }
-/// ```
-/// 6. Double check that the .zip file that you added is included as an asset in the pubspec.yaml file under appflowy_flutter.
-void main() {
-  IntegrationTestWidgetsFlutterBinding.ensureInitialized();
-  const service = TestWorkspaceService(TestWorkspace.emptyDocument);
-
-  group('Tests on a workspace with only an empty document', () {
-    setUpAll(() async => await service.setUpAll());
-    setUp(() async => await service.setUp());
-
-    testWidgets('/board shortcut creates a new board and view of the board',
-        (tester) async {
-      await tester.initializeAppFlowy();
-
-      // Needs tab to obtain focus for the app flowy editor.
-      // by default the tap appears at the center of the widget.
-      final Finder editor = find.byType(AppFlowyEditor);
-      await tester.tap(editor);
-      await tester.pumpAndSettle();
-
-      // tester.sendText() cannot be used since the editor
-      // does not contain any EditableText widgets.
-      // to interact with the app during an integration test,
-      // simulate physical keyboard events.
-      await FlowyTestKeyboard.simulateKeyDownEvent(
-        [
-          LogicalKeyboardKey.slash,
-          LogicalKeyboardKey.keyB,
-          LogicalKeyboardKey.keyO,
-          LogicalKeyboardKey.keyA,
-          LogicalKeyboardKey.keyR,
-          LogicalKeyboardKey.keyD,
-          LogicalKeyboardKey.arrowDown,
-        ],
-        tester: tester,
-      );
-
-      // Checks whether the options in the selection menu
-      // for /board exist.
-      expect(find.byType(SelectionMenuItemWidget), findsAtLeastNWidgets(2));
-
-      // Finalizes the slash command that creates the board.
-      await FlowyTestKeyboard.simulateKeyDownEvent(
-        [
-          LogicalKeyboardKey.enter,
-        ],
-        tester: tester,
-      );
-
-      // Checks whether new board is referenced and properly on the page.
-      expect(find.byType(BuiltInPageWidget), findsOneWidget);
-
-      // Checks whether the new database was created
-      const newBoardLabel = "Untitled";
-      expect(find.text(newBoardLabel), findsOneWidget);
-
-      // Checks whether a view of the database was created
-      const viewOfBoardLabel = "View of Untitled";
-      expect(find.text(viewOfBoardLabel), findsNWidgets(2));
-    });
-
-    testWidgets('/grid shortcut creates a new grid and view of the grid',
-        (tester) async {
-      await tester.initializeAppFlowy();
-
-      // Needs tab to obtain focus for the app flowy editor.
-      // by default the tap appears at the center of the widget.
-      final Finder editor = find.byType(AppFlowyEditor);
-      await tester.tap(editor);
-      await tester.pumpAndSettle();
-
-      // tester.sendText() cannot be used since the editor
-      // does not contain any EditableText widgets.
-      // to interact with the app during an integration test,
-      // simulate physical keyboard events.
-      await FlowyTestKeyboard.simulateKeyDownEvent(
-        [
-          LogicalKeyboardKey.slash,
-          LogicalKeyboardKey.keyG,
-          LogicalKeyboardKey.keyR,
-          LogicalKeyboardKey.keyI,
-          LogicalKeyboardKey.keyD,
-          LogicalKeyboardKey.arrowDown,
-        ],
-        tester: tester,
-      );
-
-      // Checks whether the options in the selection menu
-      // for /grid exist.
-      expect(find.byType(SelectionMenuItemWidget), findsAtLeastNWidgets(2));
-
-      // Finalizes the slash command that creates the board.
-      await simulateKeyDownEvent(LogicalKeyboardKey.enter);
-      await tester.pumpAndSettle();
-
-      // Checks whether new board is referenced and properly on the page.
-      expect(find.byType(BuiltInPageWidget), findsOneWidget);
-
-      // Checks whether the new database was created
-      const newTableLabel = "Untitled";
-      expect(find.text(newTableLabel), findsOneWidget);
-
-      // Checks whether a view of the database was created
-      const viewOfTableLabel = "View of Untitled";
-      expect(find.text(viewOfTableLabel), findsNWidgets(2));
-    });
-  });
-}
@@ -1,19 +0,0 @@
-import 'package:integration_test/integration_test.dart';
-
-import 'board_test.dart' as board_test;
-import 'switch_folder_test.dart' as switch_folder_test;
-import 'empty_document_test.dart' as empty_document_test;
-
-/// The main task runner for all integration tests in AppFlowy.
-///
-/// Having a single entrypoint for integration tests is necessary due to an
-/// [issue caused by switching files with integration testing](https://github.com/flutter/flutter/issues/101031).
-/// If flutter/flutter#101031 is resolved, this file can be removed completely.
-/// Once removed, the integration_test.yaml must be updated to exclude this as
-/// as the test target.
-void main() {
-  IntegrationTestWidgetsFlutterBinding.ensureInitialized();
-  switch_folder_test.main();
-  board_test.main();
-  empty_document_test.main();
-}
@@ -86,7 +86,7 @@ void main() {
      await tester.tapGoButton();
      await tester.expectToSeeWelcomePage();

-      // switch to user B
+      // swith to user B
      {
        await tester.openSettings();
        await tester.openSettingsPage(SettingsPage.user);
@@ -120,7 +120,7 @@ void main() {
        expect(find.textContaining(userA), findsOneWidget);
      }

-      // switch to the userB again
+      // swith to the userB again
      {
        await tester.openSettings();
        await tester.openSettingsPage(SettingsPage.files);
@@ -1,68 +0,0 @@
-import 'dart:io';
-
-import 'package:appflowy/workspace/application/settings/settings_location_cubit.dart';
-import 'package:archive/archive_io.dart';
-import 'package:flutter/services.dart';
-import 'package:path/path.dart' as p;
-import 'package:path_provider/path_provider.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-
-enum TestWorkspace {
-  board("board"),
-  emptyDocument("empty_document");
-
-  const TestWorkspace(this._name);
-
-  final String _name;
-
-  Future<File> get zip async {
-    final Directory parent = await TestWorkspace._parent;
-    final File out = File(p.join(parent.path, '$_name.zip'));
-    if (await out.exists()) return out;
-    await out.create();
-    final ByteData data = await rootBundle.load(_asset);
-    await out.writeAsBytes(data.buffer.asUint8List());
-    return out;
-  }
-
-  Future<Directory> get root async {
-    final Directory parent = await TestWorkspace._parent;
-    return Directory(p.join(parent.path, _name));
-  }
-
-  static Future<Directory> get _parent async {
-    final Directory root = await getTemporaryDirectory();
-    if (await root.exists()) return root;
-    await root.create();
-    return root;
-  }
-
-  String get _asset => 'assets/test/workspaces/$_name.zip';
-}
-
-class TestWorkspaceService {
-  const TestWorkspaceService(this.workspace);
-
-  final TestWorkspace workspace;
-
-  /// Instructs the application to read workspace data from the workspace found under this [TestWorkspace]'s path.
-  Future<void> setUpAll() async {
-    SharedPreferences.setMockInitialValues(
-      {
-        kSettingsLocationDefaultLocation:
-            await workspace.root.then((value) => value.path),
-      },
-    );
-  }
-
-  /// Workspaces that are checked into source are compressed. [TestWorkspaceService.setUp()] decompresses the file into an ephemeral directory that will be ignored by source control.
-  Future<void> setUp() async {
-    final inputStream =
-        InputFileStream(await workspace.zip.then((value) => value.path));
-    final archive = ZipDecoder().decodeBuffer(inputStream);
-    extractArchiveToDisk(
-      archive,
-      await TestWorkspace._parent.then((value) => value.path),
-    );
-  }
-}
@@ -1,14 +0,0 @@
-import 'package:flutter/services.dart';
-import 'package:flutter_test/flutter_test.dart' as flutter_test;
-
-class FlowyTestKeyboard {
-  static Future<void> simulateKeyDownEvent(
-    List<LogicalKeyboardKey> keys, {
-    required flutter_test.WidgetTester tester,
-  }) async {
-    for (final LogicalKeyboardKey key in keys) {
-      await flutter_test.simulateKeyDownEvent(key);
-      await tester.pumpAndSettle();
-    }
-  }
-}
@@ -39,7 +39,7 @@ extension AppFlowySettings on WidgetTester {
    return;
  }

-  /// Open the page that insides the settings page
+  /// Open the page taht insides the settings page
  Future<void> openSettingsPage(SettingsPage page) async {
    final button = find.text(page.name, findRichText: true);
    expect(button, findsOneWidget);
@@ -49,25 +49,25 @@ extension AppFlowySettings on WidgetTester {

  /// Restore the AppFlowy data storage location
  Future<void> restoreLocation() async {
-    final button =
+    final buton =
        find.byTooltip(LocaleKeys.settings_files_restoreLocation.tr());
-    expect(button, findsOneWidget);
-    await tapButton(button);
+    expect(buton, findsOneWidget);
+    await tapButton(buton);
    return;
  }

  Future<void> tapOpenFolderButton() async {
-    final button = find.text(LocaleKeys.settings_files_open.tr());
-    expect(button, findsOneWidget);
-    await tapButton(button);
+    final buton = find.text(LocaleKeys.settings_files_open.tr());
+    expect(buton, findsOneWidget);
+    await tapButton(buton);
    return;
  }

  Future<void> tapCustomLocationButton() async {
-    final button =
+    final buton =
        find.byTooltip(LocaleKeys.settings_files_customizeLocation.tr());
-    expect(button, findsOneWidget);
-    await tapButton(button);
+    expect(buton, findsOneWidget);
+    await tapButton(buton);
    return;
  }

@@ -1,4 +1,3 @@
 export 'base.dart';
 export 'launch.dart';
 export 'settings.dart';
-export 'data.dart';
@@ -16,10 +16,9 @@ typedef FolderNotificationCallback = void Function(

 class FolderNotificationParser
    extends NotificationParser<FolderNotification, FlowyError> {
-  FolderNotificationParser({
-    String? id,
-    required FolderNotificationCallback callback,
-  }) : super(
+  FolderNotificationParser(
+      {String? id, required FolderNotificationCallback callback})
+      : super(
          id: id,
          callback: callback,
          tyParser: (ty) => FolderNotification.valueOf(ty),
@@ -16,10 +16,9 @@ typedef DatabaseNotificationCallback = void Function(

 class DatabaseNotificationParser
    extends NotificationParser<DatabaseNotification, FlowyError> {
-  DatabaseNotificationParser({
-    String? id,
-    required DatabaseNotificationCallback callback,
-  }) : super(
+  DatabaseNotificationParser(
+      {String? id, required DatabaseNotificationCallback callback})
+      : super(
          id: id,
          callback: callback,
          tyParser: (ty) => DatabaseNotification.valueOf(ty),
@@ -28,9 +27,7 @@ class DatabaseNotificationParser
 }

 typedef DatabaseNotificationHandler = Function(
-  DatabaseNotification ty,
-  Either<Uint8List, FlowyError> result,
-);
+    DatabaseNotification ty, Either<Uint8List, FlowyError> result);

 class DatabaseNotificationListener {
  StreamSubscription<SubscribeObject>? _subscription;
@@ -9,12 +9,11 @@ class NotificationParser<T, E> {
  T? Function(int) tyParser;
  E Function(Uint8List) errorParser;

-  NotificationParser({
-    this.id,
-    required this.callback,
-    required this.errorParser,
-    required this.tyParser,
-  });
+  NotificationParser(
+      {this.id,
+      required this.callback,
+      required this.errorParser,
+      required this.tyParser});
  void parse(SubscribeObject subject) {
    if (id != null) {
      if (subject.id != id) {
@@ -16,10 +16,9 @@ typedef UserNotificationCallback = void Function(

 class UserNotificationParser
    extends NotificationParser<UserNotification, FlowyError> {
-  UserNotificationParser({
-    required String id,
-    required UserNotificationCallback callback,
-  }) : super(
+  UserNotificationParser(
+      {required String id, required UserNotificationCallback callback})
+      : super(
          id: id,
          callback: callback,
          tyParser: (ty) => UserNotification.valueOf(ty),
@@ -28,9 +27,7 @@ class UserNotificationParser
 }

 typedef UserNotificationHandler = Function(
-  UserNotification ty,
-  Either<Uint8List, FlowyError> result,
-);
+    UserNotification ty, Either<Uint8List, FlowyError> result);

 class UserNotificationListener {
  StreamSubscription<SubscribeObject>? _subscription;
@@ -73,35 +73,28 @@ class CellController<T, D> extends Equatable {
    /// For example:
    ///  user input: 12
    ///  cell display: $12
-    _cellListener?.start(
-      onCellChanged: (result) {
-        result.fold(
-          (_) {
-            _cellCache.remove(_cacheKey);
-            _loadData();
-          },
-          (err) => Log.error(err),
-        );
-      },
-    );
+    _cellListener?.start(onCellChanged: (result) {
+      result.fold(
+        (_) {
+          _cellCache.remove(_cacheKey);
+          _loadData();
+        },
+        (err) => Log.error(err),
+      );
+    });

    /// 2.Listen on the field event and load the cell data if needed.
-    _fieldListener.start(
-      onFieldChanged: (result) {
-        result.fold(
-          (fieldPB) {
-            /// reloadOnFieldChanged should be true if you need to load the data when the corresponding field is changed
-            /// For example:
-            ///   ￥12 -> $12
-            if (_cellDataLoader.reloadOnFieldChanged) {
-              _loadData();
-            }
-            _onCellFieldChanged?.call();
-          },
-          (err) => Log.error(err),
-        );
-      },
-    );
+    _fieldListener.start(onFieldChanged: (result) {
+      result.fold((fieldPB) {
+        /// reloadOnFieldChanged should be true if you need to load the data when the corresponding field is changed
+        /// For example:
+        ///   ￥12 -> $12
+        if (_cellDataLoader.reloadOnFieldChanged) {
+          _loadData();
+        }
+        _onCellFieldChanged?.call();
+      }, (err) => Log.error(err));
+    });
  }

  /// Listen on the cell content or field changes
@@ -137,8 +130,7 @@ class CellController<T, D> extends Equatable {
  /// Return the TypeOptionPB that can be parsed into corresponding class using the [parser].
  /// [PD] is the type that the parser return.
  Future<Either<PD, FlowyError>> getTypeOption<PD, P extends TypeOptionParser>(
-    P parser,
-  ) {
+      P parser) {
    return _fieldBackendSvc
        .getFieldTypeOptionData(fieldType: fieldType)
        .then((result) {
@@ -173,8 +165,8 @@ class CellController<T, D> extends Equatable {

  void _loadData() {
    _saveDataOperation?.cancel();
-    _loadDataOperation?.cancel();

+    _loadDataOperation?.cancel();
    _loadDataOperation = Timer(const Duration(milliseconds: 10), () {
      _cellDataLoader.loadData().then((data) {
        if (data != null) {
@@ -182,6 +174,7 @@ class CellController<T, D> extends Equatable {
        } else {
          _cellCache.remove(_cacheKey);
        }
+
        _cellDataNotifier?.value = data;
      });
    });
@@ -55,7 +55,7 @@ class CellControllerBuilder {
      case FieldType.Number:
        final cellDataLoader = CellDataLoader(
          cellId: _cellId,
-          parser: NumberCellDataParser(),
+          parser: StringCellDataParser(),
          reloadOnFieldChanged: true,
        );
        return NumberCellController(
@@ -27,12 +27,7 @@ class CellDataLoader<T> {
      (result) => result.fold(
        (CellPB cell) {
          try {
-            // Return null the data of the cell is empty.
-            if (cell.data.isEmpty) {
-              return null;
-            } else {
-              return parser.parserData(cell.data);
-            }
+            return parser.parserData(cell.data);
          } catch (e, s) {
            Log.error('$parser parser cellData failed, $e');
            Log.error('Stack trace \n $s');
@@ -56,13 +51,6 @@ class StringCellDataParser implements CellDataParser<String> {
  }
 }

-class NumberCellDataParser implements CellDataParser<String> {
-  @override
-  String? parserData(List<int> data) {
-    return utf8.decode(data);
-  }
-}
-
 class DateCellDataParser implements CellDataParser<DateCellDataPB> {
  @override
  DateCellDataPB? parserData(List<int> data) {
@@ -19,9 +19,7 @@ class CellListener {
  void start({required void Function(UpdateFieldNotifiedValue) onCellChanged}) {
    _updateCellNotifier?.addPublishListener(onCellChanged);
    _listener = DatabaseNotificationListener(
-      objectId: "$rowId:$fieldId",
-      handler: _handler,
-    );
+        objectId: "$rowId:$fieldId", handler: _handler);
  }

  void _handler(DatabaseNotification ty, Either<Uint8List, FlowyError> result) {
@@ -1,5 +1,4 @@
 import 'package:appflowy/plugins/database_view/application/field/field_controller.dart';
-import 'package:appflowy/plugins/database_view/application/layout/calendar_setting_listener.dart';
 import 'package:appflowy/plugins/database_view/application/view/view_cache.dart';
 import 'package:appflowy_backend/log.dart';
 import 'package:appflowy_backend/protobuf/flowy-database/calendar_entities.pb.dart';
@@ -13,12 +12,17 @@ import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
 import 'package:collection/collection.dart';
 import 'dart:async';
 import 'package:dartz/dartz.dart';
-import 'database_view_service.dart';
+import 'database_service.dart';
 import 'defines.dart';
 import 'layout/layout_setting_listener.dart';
 import 'row/row_cache.dart';
 import 'group/group_listener.dart';

+typedef OnRowsChanged = void Function(
+  List<RowInfo> rowInfos,
+  RowsChangedReason,
+);
+
 typedef OnGroupByField = void Function(List<GroupPB>);
 typedef OnUpdateGroup = void Function(List<GroupPB>);
 typedef OnDeleteGroup = void Function(List<String>);
@@ -48,35 +52,22 @@ class LayoutCallbacks {
  });
 }

-class CalendarLayoutCallbacks {
-  final void Function(LayoutSettingPB) onCalendarLayoutChanged;
-
-  CalendarLayoutCallbacks({required this.onCalendarLayoutChanged});
-}
-
 class DatabaseCallbacks {
  OnDatabaseChanged? onDatabaseChanged;
+  OnRowsChanged? onRowsChanged;
  OnFieldsChanged? onFieldsChanged;
  OnFiltersChanged? onFiltersChanged;
-  OnRowsChanged? onRowsChanged;
-  OnRowsDeleted? onRowsDeleted;
-  OnRowsUpdated? onRowsUpdated;
-  OnRowsCreated? onRowsCreated;
-
  DatabaseCallbacks({
    this.onDatabaseChanged,
    this.onRowsChanged,
    this.onFieldsChanged,
    this.onFiltersChanged,
-    this.onRowsUpdated,
-    this.onRowsDeleted,
-    this.onRowsCreated,
  });
 }

 class DatabaseController {
  final String viewId;
-  final DatabaseViewBackendService _databaseViewBackendSvc;
+  final DatabaseBackendService _databaseBackendSvc;
  final FieldController fieldController;
  late DatabaseViewCache _viewCache;
  final LayoutTypePB layoutType;
@@ -85,23 +76,21 @@ class DatabaseController {
  DatabaseCallbacks? _databaseCallbacks;
  GroupCallbacks? _groupCallbacks;
  LayoutCallbacks? _layoutCallbacks;
-  CalendarLayoutCallbacks? _calendarLayoutCallbacks;

  // Getters
+  List<RowInfo> get rowInfos => _viewCache.rowInfos;
  RowCache get rowCache => _viewCache.rowCache;

  // Listener
  final DatabaseGroupListener groupListener;
  final DatabaseLayoutListener layoutListener;
-  final DatabaseCalendarLayoutListener calendarLayoutListener;

  DatabaseController({required ViewPB view, required this.layoutType})
      : viewId = view.id,
-        _databaseViewBackendSvc = DatabaseViewBackendService(viewId: view.id),
+        _databaseBackendSvc = DatabaseBackendService(viewId: view.id),
        fieldController = FieldController(viewId: view.id),
        groupListener = DatabaseGroupListener(view.id),
-        layoutListener = DatabaseLayoutListener(view.id),
-        calendarLayoutListener = DatabaseCalendarLayoutListener(view.id) {
+        layoutListener = DatabaseLayoutListener(view.id) {
    _viewCache = DatabaseViewCache(
      viewId: viewId,
      fieldController: fieldController,
@@ -110,25 +99,20 @@ class DatabaseController {
    _listenOnFieldsChanged();
    _listenOnGroupChanged();
    _listenOnLayoutChanged();
-    if (layoutType == LayoutTypePB.Calendar) {
-      _listenOnCalendarLayoutChanged();
-    }
  }

  void addListener({
    DatabaseCallbacks? onDatabaseChanged,
    LayoutCallbacks? onLayoutChanged,
    GroupCallbacks? onGroupChanged,
-    CalendarLayoutCallbacks? onCalendarLayoutChanged,
  }) {
    _layoutCallbacks = onLayoutChanged;
    _databaseCallbacks = onDatabaseChanged;
    _groupCallbacks = onGroupChanged;
-    _calendarLayoutCallbacks = onCalendarLayoutChanged;
  }

  Future<Either<Unit, FlowyError>> open() async {
-    return _databaseViewBackendSvc.openGrid().then((result) {
+    return _databaseBackendSvc.openGrid().then((result) {
      return result.fold(
        (database) async {
          _databaseCallbacks?.onDatabaseChanged?.call(database);
@@ -168,39 +152,33 @@ class DatabaseController {
      cellDataByFieldId = rowBuilder.build();
    }

-    return _databaseViewBackendSvc.createRow(
+    return _databaseBackendSvc.createRow(
      startRowId: startRowId,
      groupId: groupId,
      cellDataByFieldId: cellDataByFieldId,
    );
  }

-  Future<Either<Unit, FlowyError>> moveRow({
-    required RowPB fromRow,
-    required String groupId,
-    RowPB? toRow,
-  }) {
-    return _databaseViewBackendSvc.moveRow(
+  Future<Either<Unit, FlowyError>> moveRow(RowPB fromRow,
+      {RowPB? toRow, String? groupId}) {
+    return _databaseBackendSvc.moveRow(
      fromRowId: fromRow.id,
      toGroupId: groupId,
      toRowId: toRow?.id,
    );
  }

-  Future<Either<Unit, FlowyError>> moveGroup({
-    required String fromGroupId,
-    required String toGroupId,
-  }) {
-    return _databaseViewBackendSvc.moveGroup(
+  Future<Either<Unit, FlowyError>> moveGroup(
+      {required String fromGroupId, required String toGroupId}) {
+    return _databaseBackendSvc.moveGroup(
      fromGroupId: fromGroupId,
      toGroupId: toGroupId,
    );
  }

  Future<void> updateCalenderLayoutSetting(
-    CalendarLayoutSettingsPB layoutSetting,
-  ) async {
-    await _databaseViewBackendSvc
+      CalendarLayoutSettingsPB layoutSetting) async {
+    await _databaseBackendSvc
        .updateLayoutSetting(calendarLayoutSetting: layoutSetting)
        .then((result) {
      result.fold((l) => null, (r) => Log.error(r));
@@ -208,13 +186,13 @@ class DatabaseController {
  }

  Future<void> dispose() async {
-    await _databaseViewBackendSvc.closeView();
+    await _databaseBackendSvc.closeView();
    await fieldController.dispose();
    await groupListener.stop();
  }

  Future<void> _loadGroups() async {
-    final result = await _databaseViewBackendSvc.loadGroups();
+    final result = await _databaseBackendSvc.loadGroups();
    return Future(
      () => result.fold(
        (groups) {
@@ -226,7 +204,7 @@ class DatabaseController {
  }

  Future<void> _loadLayoutSetting() async {
-    _databaseViewBackendSvc.getLayoutSetting(layoutType).then((result) {
+    _databaseBackendSvc.getLayoutSetting(layoutType).then((result) {
      result.fold(
        (l) {
          _layoutCallbacks?.onLoadLayout(l);
@@ -237,21 +215,9 @@ class DatabaseController {
  }

  void _listenOnRowsChanged() {
-    final callbacks = DatabaseViewCallbacks(
-      onRowsChanged: (rows, rowByRowId, reason) {
-        _databaseCallbacks?.onRowsChanged?.call(rows, rowByRowId, reason);
-      },
-      onRowsDeleted: (ids) {
-        _databaseCallbacks?.onRowsDeleted?.call(ids);
-      },
-      onRowsUpdated: (ids) {
-        _databaseCallbacks?.onRowsUpdated?.call(ids);
-      },
-      onRowsCreated: (ids) {
-        _databaseCallbacks?.onRowsCreated?.call(ids);
-      },
-    );
-    _viewCache.addListener(callbacks);
+    _viewCache.addListener(onRowsChanged: (reason) {
+      _databaseCallbacks?.onRowsChanged?.call(rowInfos, reason);
+    });
  }

  void _listenOnFieldsChanged() {
@@ -268,58 +234,34 @@ class DatabaseController {
  void _listenOnGroupChanged() {
    groupListener.start(
      onNumOfGroupsChanged: (result) {
-        result.fold(
-          (changeset) {
-            if (changeset.updateGroups.isNotEmpty) {
-              _groupCallbacks?.onUpdateGroup?.call(changeset.updateGroups);
-            }
+        result.fold((changeset) {
+          if (changeset.updateGroups.isNotEmpty) {
+            _groupCallbacks?.onUpdateGroup?.call(changeset.updateGroups);
+          }

-            if (changeset.deletedGroups.isNotEmpty) {
-              _groupCallbacks?.onDeleteGroup?.call(changeset.deletedGroups);
-            }
+          if (changeset.deletedGroups.isNotEmpty) {
+            _groupCallbacks?.onDeleteGroup?.call(changeset.deletedGroups);
+          }

-            for (final insertedGroup in changeset.insertedGroups) {
-              _groupCallbacks?.onInsertGroup?.call(insertedGroup);
-            }
-          },
-          (r) => Log.error(r),
-        );
+          for (final insertedGroup in changeset.insertedGroups) {
+            _groupCallbacks?.onInsertGroup?.call(insertedGroup);
+          }
+        }, (r) => Log.error(r));
      },
      onGroupByNewField: (result) {
-        result.fold(
-          (groups) {
-            _groupCallbacks?.onGroupByField?.call(groups);
-          },
-          (r) => Log.error(r),
-        );
+        result.fold((groups) {
+          _groupCallbacks?.onGroupByField?.call(groups);
+        }, (r) => Log.error(r));
      },
    );
  }

  void _listenOnLayoutChanged() {
-    layoutListener.start(
-      onLayoutChanged: (result) {
-        result.fold(
-          (l) {
-            _layoutCallbacks?.onLayoutChanged(l);
-          },
-          (r) => Log.error(r),
-        );
-      },
-    );
-  }
-
-  void _listenOnCalendarLayoutChanged() {
-    calendarLayoutListener.start(
-      onCalendarLayoutChanged: (result) {
-        result.fold(
-          (l) {
-            _calendarLayoutCallbacks?.onCalendarLayoutChanged(l);
-          },
-          (r) => Log.error(r),
-        );
-      },
-    );
+    layoutListener.start(onLayoutChanged: (result) {
+      result.fold((l) {
+        _layoutCallbacks?.onLayoutChanged(l);
+      }, (r) => Log.error(r));
+    });
  }
 }

@@ -1,13 +1,121 @@
-import 'package:appflowy_backend/dispatch/dispatch.dart';
+import 'package:appflowy_backend/protobuf/flowy-database/calendar_entities.pb.dart';
 import 'package:appflowy_backend/protobuf/flowy-database/database_entities.pb.dart';
-import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';
+import 'package:appflowy_backend/protobuf/flowy-database/group_changeset.pb.dart';
+import 'package:appflowy_backend/protobuf/flowy-database/setting_entities.pb.dart';
 import 'package:dartz/dartz.dart';
+import 'package:appflowy_backend/dispatch/dispatch.dart';
+import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';
+import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
+import 'package:appflowy_backend/protobuf/flowy-database/field_entities.pb.dart';
+import 'package:appflowy_backend/protobuf/flowy-database/group.pb.dart';
+import 'package:appflowy_backend/protobuf/flowy-database/row_entities.pb.dart';

 class DatabaseBackendService {
-  static Future<Either<List<DatabaseDescriptionPB>, FlowyError>>
-      getAllDatabases() {
-    return DatabaseEventGetDatabases().send().then((result) {
+  final String viewId;
+  DatabaseBackendService({
+    required this.viewId,
+  });
+
+  Future<Either<DatabasePB, FlowyError>> openGrid() async {
+    await FolderEventSetLatestView(ViewIdPB(value: viewId)).send();
+
+    final payload = DatabaseViewIdPB(value: viewId);
+    return DatabaseEventGetDatabase(payload).send();
+  }
+
+  Future<Either<RowPB, FlowyError>> createRow({
+    String? startRowId,
+    String? groupId,
+    Map<String, String>? cellDataByFieldId,
+  }) {
+    var payload = CreateRowPayloadPB.create()..viewId = viewId;
+    if (startRowId != null) {
+      payload.startRowId = startRowId;
+    }
+
+    if (groupId != null) {
+      payload.groupId = groupId;
+    }
+
+    if (cellDataByFieldId != null && cellDataByFieldId.isNotEmpty) {
+      payload.data = RowDataPB(cellDataByFieldId: cellDataByFieldId);
+    }
+
+    return DatabaseEventCreateRow(payload).send();
+  }
+
+  Future<Either<Unit, FlowyError>> moveRow({
+    required String fromRowId,
+    required String? toGroupId,
+    required String? toRowId,
+  }) {
+    var payload = MoveGroupRowPayloadPB.create()
+      ..viewId = viewId
+      ..fromRowId = fromRowId;
+    if (toGroupId != null) {
+      payload.toGroupId = toGroupId;
+    }
+
+    if (toRowId != null) {
+      payload.toRowId = toRowId;
+    }
+
+    return DatabaseEventMoveGroupRow(payload).send();
+  }
+
+  Future<Either<Unit, FlowyError>> moveGroup({
+    required String fromGroupId,
+    required String toGroupId,
+  }) {
+    final payload = MoveGroupPayloadPB.create()
+      ..viewId = viewId
+      ..fromGroupId = fromGroupId
+      ..toGroupId = toGroupId;
+
+    return DatabaseEventMoveGroup(payload).send();
+  }
+
+  Future<Either<List<FieldPB>, FlowyError>> getFields(
+      {List<FieldIdPB>? fieldIds}) {
+    var payload = GetFieldPayloadPB.create()..viewId = viewId;
+
+    if (fieldIds != null) {
+      payload.fieldIds = RepeatedFieldIdPB(items: fieldIds);
+    }
+    return DatabaseEventGetFields(payload).send().then((result) {
      return result.fold((l) => left(l.items), (r) => right(r));
    });
  }
+
+  Future<Either<LayoutSettingPB, FlowyError>> getLayoutSetting(
+      LayoutTypePB layoutType) {
+    final payload = DatabaseLayoutIdPB.create()
+      ..viewId = viewId
+      ..layout = layoutType;
+    return DatabaseEventGetLayoutSetting(payload).send();
+  }
+
+  Future<Either<Unit, FlowyError>> updateLayoutSetting(
+      {CalendarLayoutSettingsPB? calendarLayoutSetting}) {
+    final layoutSetting = LayoutSettingPB.create();
+    if (calendarLayoutSetting != null) {
+      layoutSetting.calendar = calendarLayoutSetting;
+    }
+
+    final payload = UpdateLayoutSettingPB.create()
+      ..viewId = viewId
+      ..layoutSetting = layoutSetting;
+
+    return DatabaseEventSetLayoutSetting(payload).send();
+  }
+
+  Future<Either<Unit, FlowyError>> closeView() {
+    final request = ViewIdPB(value: viewId);
+    return FolderEventCloseView(request).send();
+  }
+
+  Future<Either<RepeatedGroupPB, FlowyError>> loadGroups() {
+    final payload = DatabaseViewIdPB(value: viewId);
+    return DatabaseEventGetGroups(payload).send();
+  }
 }
@@ -1,122 +0,0 @@
-import 'package:appflowy_backend/protobuf/flowy-database/calendar_entities.pb.dart';
-import 'package:appflowy_backend/protobuf/flowy-database/database_entities.pb.dart';
-import 'package:appflowy_backend/protobuf/flowy-database/group_changeset.pb.dart';
-import 'package:appflowy_backend/protobuf/flowy-database/setting_entities.pb.dart';
-import 'package:dartz/dartz.dart';
-import 'package:appflowy_backend/dispatch/dispatch.dart';
-import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';
-import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
-import 'package:appflowy_backend/protobuf/flowy-database/field_entities.pb.dart';
-import 'package:appflowy_backend/protobuf/flowy-database/group.pb.dart';
-import 'package:appflowy_backend/protobuf/flowy-database/row_entities.pb.dart';
-
-class DatabaseViewBackendService {
-  final String viewId;
-  DatabaseViewBackendService({
-    required this.viewId,
-  });
-
-  Future<Either<DatabasePB, FlowyError>> openGrid() async {
-    await FolderEventSetLatestView(ViewIdPB(value: viewId)).send();
-
-    final payload = DatabaseViewIdPB(value: viewId);
-    return DatabaseEventGetDatabase(payload).send();
-  }
-
-  Future<Either<RowPB, FlowyError>> createRow({
-    String? startRowId,
-    String? groupId,
-    Map<String, String>? cellDataByFieldId,
-  }) {
-    var payload = CreateRowPayloadPB.create()..viewId = viewId;
-    if (startRowId != null) {
-      payload.startRowId = startRowId;
-    }
-
-    if (groupId != null) {
-      payload.groupId = groupId;
-    }
-
-    if (cellDataByFieldId != null && cellDataByFieldId.isNotEmpty) {
-      payload.data = RowDataPB(cellDataByFieldId: cellDataByFieldId);
-    }
-
-    return DatabaseEventCreateRow(payload).send();
-  }
-
-  Future<Either<Unit, FlowyError>> moveRow({
-    required String fromRowId,
-    required String toGroupId,
-    String? toRowId,
-  }) {
-    var payload = MoveGroupRowPayloadPB.create()
-      ..viewId = viewId
-      ..fromRowId = fromRowId
-      ..toGroupId = toGroupId;
-
-    if (toRowId != null) {
-      payload.toRowId = toRowId;
-    }
-
-    return DatabaseEventMoveGroupRow(payload).send();
-  }
-
-  Future<Either<Unit, FlowyError>> moveGroup({
-    required String fromGroupId,
-    required String toGroupId,
-  }) {
-    final payload = MoveGroupPayloadPB.create()
-      ..viewId = viewId
-      ..fromGroupId = fromGroupId
-      ..toGroupId = toGroupId;
-
-    return DatabaseEventMoveGroup(payload).send();
-  }
-
-  Future<Either<List<FieldPB>, FlowyError>> getFields({
-    List<FieldIdPB>? fieldIds,
-  }) {
-    var payload = GetFieldPayloadPB.create()..viewId = viewId;
-
-    if (fieldIds != null) {
-      payload.fieldIds = RepeatedFieldIdPB(items: fieldIds);
-    }
-    return DatabaseEventGetFields(payload).send().then((result) {
-      return result.fold((l) => left(l.items), (r) => right(r));
-    });
-  }
-
-  Future<Either<LayoutSettingPB, FlowyError>> getLayoutSetting(
-    LayoutTypePB layoutType,
-  ) {
-    final payload = DatabaseLayoutIdPB.create()
-      ..viewId = viewId
-      ..layout = layoutType;
-    return DatabaseEventGetLayoutSetting(payload).send();
-  }
-
-  Future<Either<Unit, FlowyError>> updateLayoutSetting({
-    CalendarLayoutSettingsPB? calendarLayoutSetting,
-  }) {
-    final layoutSetting = LayoutSettingPB.create();
-    if (calendarLayoutSetting != null) {
-      layoutSetting.calendar = calendarLayoutSetting;
-    }
-
-    final payload = UpdateLayoutSettingPB.create()
-      ..viewId = viewId
-      ..layoutSetting = layoutSetting;
-
-    return DatabaseEventSetLayoutSetting(payload).send();
-  }
-
-  Future<Either<Unit, FlowyError>> closeView() {
-    final request = ViewIdPB(value: viewId);
-    return FolderEventCloseView(request).send();
-  }
-
-  Future<Either<RepeatedGroupPB, FlowyError>> loadGroups() {
-    final payload = DatabaseViewIdPB(value: viewId);
-    return DatabaseEventGetGroups(payload).send();
-  }
-}
@@ -10,14 +10,9 @@ import 'row/row_cache.dart';
 typedef OnFieldsChanged = void Function(UnmodifiableListView<FieldInfo>);
 typedef OnFiltersChanged = void Function(List<FilterInfo>);
 typedef OnDatabaseChanged = void Function(DatabasePB);
-
-typedef OnRowsCreated = void Function(List<String> ids);
-typedef OnRowsUpdated = void Function(List<String> ids);
-typedef OnRowsDeleted = void Function(List<String> ids);
 typedef OnRowsChanged = void Function(
-  UnmodifiableListView<RowInfo> rows,
-  UnmodifiableMapView<String, RowInfo> rowByRowId,
-  RowsChangedReason reason,
+  List<RowInfo>,
+  RowsChangedReason,
 );

 typedef OnError = void Function(FlowyError);
@@ -2,6 +2,7 @@ import 'package:appflowy_backend/log.dart';
 import 'package:appflowy_backend/protobuf/flowy-database/field_entities.pb.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
+import 'dart:async';
 import 'field_service.dart';

 part 'field_action_sheet_bloc.freezed.dart';
@@ -63,6 +64,11 @@ class FieldActionSheetBloc
      },
    );
  }
+
+  @override
+  Future<void> close() async {
+    return super.close();
+  }
 }

@freezed
@@ -17,9 +17,7 @@ class FieldCellBloc extends Bloc<FieldCellEvent, FieldCellState> {
    required FieldCellContext cellContext,
  })  : _fieldListener = SingleFieldListener(fieldId: cellContext.field.id),
        _fieldBackendSvc = FieldBackendService(
-          viewId: cellContext.viewId,
-          fieldId: cellContext.field.id,
-        ),
+            viewId: cellContext.viewId, fieldId: cellContext.field.id),
        super(FieldCellState.initial(cellContext)) {
    on<FieldCellEvent>(
      (event, emit) async {
@@ -51,17 +49,15 @@ class FieldCellBloc extends Bloc<FieldCellEvent, FieldCellState> {
  }

  void _startListening() {
-    _fieldListener.start(
-      onFieldChanged: (result) {
-        if (isClosed) {
-          return;
-        }
-        result.fold(
-          (field) => add(FieldCellEvent.didReceiveFieldUpdate(field)),
-          (err) => Log.error(err),
-        );
-      },
-    );
+    _fieldListener.start(onFieldChanged: (result) {
+      if (isClosed) {
+        return;
+      }
+      result.fold(
+        (field) => add(FieldCellEvent.didReceiveFieldUpdate(field)),
+        (err) => Log.error(err),
+      );
+    });
  }
 }

@@ -11,7 +11,7 @@ import 'package:appflowy_backend/protobuf/flowy-database/util.pb.dart';
 import 'package:flutter/foundation.dart';
 import '../../grid/presentation/widgets/filter/filter_info.dart';
 import '../../grid/presentation/widgets/sort/sort_info.dart';
-import '../database_view_service.dart';
+import '../database_service.dart';
 import '../filter/filter_listener.dart';
 import '../filter/filter_service.dart';
 import '../row/row_cache.dart';
@@ -80,7 +80,7 @@ class FieldController {
  final SortsListener _sortsListener;

  // FFI services
-  final DatabaseViewBackendService _databaseViewBackendSvc;
+  final DatabaseBackendService _databaseBackendSvc;
  final SettingBackendService _settingBackendSvc;
  final FilterBackendService _filterBackendSvc;
  final SortBackendService _sortBackendSvc;
@@ -152,7 +152,7 @@ class FieldController {
        _settingListener = DatabaseSettingListener(viewId: viewId),
        _filterBackendSvc = FilterBackendService(viewId: viewId),
        _filtersListener = FiltersListener(viewId: viewId),
-        _databaseViewBackendSvc = DatabaseViewBackendService(viewId: viewId),
+        _databaseBackendSvc = DatabaseBackendService(viewId: viewId),
        _sortBackendSvc = SortBackendService(viewId: viewId),
        _sortsListener = SortsListener(viewId: viewId),
        _settingBackendSvc = SettingBackendService(viewId: viewId) {
@@ -162,7 +162,7 @@ class FieldController {
    //Listen on setting changes
    _listenOnSettingChanges();

-    //Listen on the filter changes
+    //Listen on the fitler changes
    _listenOnFilterChanges();

    //Listen on the sort changes
@@ -177,7 +177,7 @@ class FieldController {
  }

  void _listenOnFilterChanges() {
-    //Listen on the filter changes
+    //Listen on the fitler changes

    deleteFilterFromChangeset(
      List<FilterInfo> filters,
@@ -230,7 +230,7 @@ class FieldController {
              .removeWhere((key, value) => value.id == updatedFilter.filterId);
        }

-        // Insert the filter if there is a filter and its field info is
+        // Insert the filter if there is a fitler and its field info is
        // not null
        if (updatedFilter.hasFilter()) {
          final fieldInfo = _findFieldInfo(
@@ -255,26 +255,24 @@ class FieldController {
      }
    }

-    _filtersListener.start(
-      onFilterChanged: (result) {
-        result.fold(
-          (FilterChangesetNotificationPB changeset) {
-            final List<FilterInfo> filters = filterInfos;
-            // Deletes the filters
-            deleteFilterFromChangeset(filters, changeset);
+    _filtersListener.start(onFilterChanged: (result) {
+      result.fold(
+        (FilterChangesetNotificationPB changeset) {
+          final List<FilterInfo> filters = filterInfos;
+          // Deletes the filters
+          deleteFilterFromChangeset(filters, changeset);

-            // Inserts the new filter if it's not exist
-            insertFilterFromChangeset(filters, changeset);
+          // Inserts the new filter if it's not exist
+          insertFilterFromChangeset(filters, changeset);

-            updateFilterFromChangeset(filters, changeset);
+          updateFilterFromChangeset(filters, changeset);

-            _updateFieldInfos();
-            _filterNotifier?.filters = filters;
-          },
-          (err) => Log.error(err),
-        );
-      },
-    );
+          _updateFieldInfos();
+          _filterNotifier?.filters = filters;
+        },
+        (err) => Log.error(err),
+      );
+    });
  }

  void _listenOnSortChanged() {
@@ -349,54 +347,48 @@ class FieldController {
      }
    }

-    _sortsListener.start(
-      onSortChanged: (result) {
-        result.fold(
-          (SortChangesetNotificationPB changeset) {
-            final List<SortInfo> newSortInfos = sortInfos;
-            deleteSortFromChangeset(newSortInfos, changeset);
-            insertSortFromChangeset(newSortInfos, changeset);
-            updateSortFromChangeset(newSortInfos, changeset);
+    _sortsListener.start(onSortChanged: (result) {
+      result.fold(
+        (SortChangesetNotificationPB changeset) {
+          final List<SortInfo> newSortInfos = sortInfos;
+          deleteSortFromChangeset(newSortInfos, changeset);
+          insertSortFromChangeset(newSortInfos, changeset);
+          updateSortFromChangeset(newSortInfos, changeset);

-            _updateFieldInfos();
-            _sortNotifier?.sorts = newSortInfos;
-          },
-          (err) => Log.error(err),
-        );
-      },
-    );
+          _updateFieldInfos();
+          _sortNotifier?.sorts = newSortInfos;
+        },
+        (err) => Log.error(err),
+      );
+    });
  }

  void _listenOnSettingChanges() {
    //Listen on setting changes
-    _settingListener.start(
-      onSettingUpdated: (result) {
-        result.fold(
-          (setting) => _updateSetting(setting),
-          (r) => Log.error(r),
-        );
-      },
-    );
+    _settingListener.start(onSettingUpdated: (result) {
+      result.fold(
+        (setting) => _updateSetting(setting),
+        (r) => Log.error(r),
+      );
+    });
  }

  void _listenOnFieldChanges() {
    //Listen on field's changes
-    _fieldListener.start(
-      onFieldsChanged: (result) {
-        result.fold(
-          (changeset) {
-            _deleteFields(changeset.deletedFields);
-            _insertFields(changeset.insertedFields);
+    _fieldListener.start(onFieldsChanged: (result) {
+      result.fold(
+        (changeset) {
+          _deleteFields(changeset.deletedFields);
+          _insertFields(changeset.insertedFields);

-            final updatedFields = _updateFields(changeset.updatedFields);
-            for (final listener in _updatedFieldCallbacks.values) {
-              listener(updatedFields);
-            }
-          },
-          (err) => Log.error(err),
-        );
-      },
-    );
+          final updatedFields = _updateFields(changeset.updatedFields);
+          for (final listener in _updatedFieldCallbacks.values) {
+            listener(updatedFields);
+          }
+        },
+        (err) => Log.error(err),
+      );
+    });
  }

  void _updateSetting(DatabaseViewSettingPB setting) {
@@ -456,7 +448,7 @@ class FieldController {
  Future<Either<Unit, FlowyError>> loadFields({
    required List<FieldIdPB> fieldIds,
  }) async {
-    final result = await _databaseViewBackendSvc.getFields(fieldIds: fieldIds);
+    final result = await _databaseBackendSvc.getFields(fieldIds: fieldIds);
    return Future(
      () => result.fold(
        (newFields) {
@@ -1,5 +1,6 @@
 import 'package:appflowy_backend/protobuf/flowy-database/field_entities.pb.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'dart:async';
 import 'package:dartz/dartz.dart';
 import 'field_service.dart';
 import 'type_option/type_option_context.dart';
@@ -16,7 +17,8 @@ class FieldEditorBloc extends Bloc<FieldEditorEvent, FieldEditorState> {
    required String fieldName,
    required bool isGroupField,
    required IFieldTypeOptionLoader loader,
-  })  : dataController = TypeOptionController(viewId: viewId, loader: loader),
+  })  : dataController =
+            TypeOptionController(viewId: viewId, loader: loader),
        super(FieldEditorState.initial(viewId, fieldName, isGroupField)) {
    on<FieldEditorEvent>(
      (event, emit) async {
@@ -36,13 +38,11 @@ class FieldEditorBloc extends Bloc<FieldEditorEvent, FieldEditorState> {
            }
          },
          didReceiveFieldChanged: (FieldPB field) {
-            emit(
-              state.copyWith(
-                field: Some(field),
-                name: field.name,
-                canDelete: field.isPrimary,
-              ),
-            );
+            emit(state.copyWith(
+              field: Some(field),
+              name: field.name,
+              canDelete: field.isPrimary,
+            ));
          },
          deleteField: () {
            state.field.fold(
@@ -63,6 +63,11 @@ class FieldEditorBloc extends Bloc<FieldEditorEvent, FieldEditorState> {
      },
    );
  }
+
+  @override
+  Future<void> close() async {
+    return super.close();
+  }
 }

@freezed
@@ -17,9 +17,8 @@ class SingleFieldListener {

  SingleFieldListener({required this.fieldId});

-  void start({
-    required void Function(UpdateFieldNotifiedValue) onFieldChanged,
-  }) {
+  void start(
+      {required void Function(UpdateFieldNotifiedValue) onFieldChanged}) {
    _updateFieldNotifier?.addPublishListener(onFieldChanged);
    _listener = DatabaseNotificationListener(
      objectId: fieldId,
@@ -61,9 +60,8 @@ class FieldsListener {
  DatabaseNotificationListener? _listener;
  FieldsListener({required this.viewId});

-  void start({
-    required void Function(UpdateFieldsNotifiedValue) onFieldsChanged,
-  }) {
+  void start(
+      {required void Function(UpdateFieldsNotifiedValue) onFieldsChanged}) {
    updateFieldsNotifier?.addPublishListener(onFieldsChanged);
    _listener = DatabaseNotificationListener(
      objectId: viewId,
@@ -2,6 +2,7 @@ import 'package:appflowy_backend/protobuf/flowy-database/date_type_option.pb.dar
 import 'package:appflowy_backend/protobuf/flowy-database/date_type_option_entities.pb.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
+import 'dart:async';
 import 'package:protobuf/protobuf.dart';

 import 'type_option_context.dart';
@@ -15,25 +16,16 @@ class DateTypeOptionBloc
      (event, emit) async {
        event.map(
          didSelectDateFormat: (_DidSelectDateFormat value) {
-            emit(
-              state.copyWith(
-                typeOption: _updateTypeOption(dateFormat: value.format),
-              ),
-            );
+            emit(state.copyWith(
+                typeOption: _updateTypeOption(dateFormat: value.format)));
          },
          didSelectTimeFormat: (_DidSelectTimeFormat value) {
-            emit(
-              state.copyWith(
-                typeOption: _updateTypeOption(timeFormat: value.format),
-              ),
-            );
+            emit(state.copyWith(
+                typeOption: _updateTypeOption(timeFormat: value.format)));
          },
          includeTime: (_IncludeTime value) {
-            emit(
-              state.copyWith(
-                typeOption: _updateTypeOption(includeTime: value.includeTime),
-              ),
-            );
+            emit(state.copyWith(
+                typeOption: _updateTypeOption(includeTime: value.includeTime)));
          },
        );
      },
@@ -60,6 +52,11 @@ class DateTypeOptionBloc
      }
    });
  }
+
+  @override
+  Future<void> close() async {
+    return super.close();
+  }
 }

@freezed
@@ -1,6 +1,7 @@
 import 'package:appflowy_backend/protobuf/flowy-database/select_type_option.pb.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
+import 'dart:async';
 import 'package:protobuf/protobuf.dart';
 import 'package:dartz/dartz.dart';
 part 'edit_select_option_bloc.freezed.dart';
@@ -26,6 +27,11 @@ class EditSelectOptionBloc
    );
  }

+  @override
+  Future<void> close() async {
+    return super.close();
+  }
+
  SelectOptionPB _updateColor(SelectOptionColorPB color) {
    state.option.freeze();
    return state.option.rebuild((option) {
@@ -2,6 +2,7 @@ import 'package:appflowy_backend/protobuf/flowy-database/format.pbenum.dart';
 import 'package:appflowy_backend/protobuf/flowy-database/number_type_option.pb.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
+import 'dart:async';
 import 'package:protobuf/protobuf.dart';
 import 'type_option_context.dart';

@@ -28,6 +29,11 @@ class NumberTypeOptionBloc
      typeOption.format = format;
    });
  }
+
+  @override
+  Future<void> close() async {
+    return super.close();
+  }
 }

@freezed
@@ -1,29 +1,31 @@
 import 'package:appflowy_backend/protobuf/flowy-database/format.pbenum.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
+import 'dart:async';
 part 'number_format_bloc.freezed.dart';

 class NumberFormatBloc extends Bloc<NumberFormatEvent, NumberFormatState> {
  NumberFormatBloc() : super(NumberFormatState.initial()) {
    on<NumberFormatEvent>(
      (event, emit) async {
-        event.map(
-          setFilter: (_SetFilter value) {
-            final List<NumberFormat> formats = List.from(NumberFormat.values);
-            if (value.filter.isNotEmpty) {
-              formats.retainWhere(
-                (element) => element
-                    .title()
-                    .toLowerCase()
-                    .contains(value.filter.toLowerCase()),
-              );
-            }
-            emit(state.copyWith(formats: formats, filter: value.filter));
-          },
-        );
+        event.map(setFilter: (_SetFilter value) {
+          final List<NumberFormat> formats = List.from(NumberFormat.values);
+          if (value.filter.isNotEmpty) {
+            formats.retainWhere((element) => element
+                .title()
+                .toLowerCase()
+                .contains(value.filter.toLowerCase()));
+          }
+          emit(state.copyWith(formats: formats, filter: value.filter));
+        });
      },
    );
  }
+
+  @override
+  Future<void> close() async {
+    return super.close();
+  }
 }

@freezed
@@ -49,6 +49,11 @@ class SelectOptionTypeOptionBloc
      },
    );
  }
+
+  @override
+  Future<void> close() async {
+    return super.close();
+  }
 }

@freezed
@@ -59,11 +64,9 @@ class SelectOptionTypeOptionEvent with _$SelectOptionTypeOptionEvent {
  const factory SelectOptionTypeOptionEvent.endAddingOption() =
      _EndAddingOption;
  const factory SelectOptionTypeOptionEvent.updateOption(
-    SelectOptionPB option,
-  ) = _UpdateOption;
+      SelectOptionPB option) = _UpdateOption;
  const factory SelectOptionTypeOptionEvent.deleteOption(
-    SelectOptionPB option,
-  ) = _DeleteOption;
+      SelectOptionPB option) = _DeleteOption;
 }

@freezed
@@ -158,9 +158,7 @@ abstract class IFieldTypeOptionLoader {
  Future<Either<TypeOptionPB, FlowyError>> load();

  Future<Either<Unit, FlowyError>> switchToField(
-    String fieldId,
-    FieldType fieldType,
-  ) {
+      String fieldId, FieldType fieldType) {
    final payload = UpdateFieldTypePayloadPB.create()
      ..viewId = viewId
      ..fieldId = fieldId
@@ -107,8 +107,7 @@ class FilterListener {
      case DatabaseNotification.DidUpdateFilter:
        result.fold(
          (payload) => handleChangeset(
-            FilterChangesetNotificationPB.fromBuffer(payload),
-          ),
+              FilterChangesetNotificationPB.fromBuffer(payload)),
          (error) {},
        );
        break;
@@ -97,8 +97,7 @@ class FilterBackendService {
        filter.end = $fixnum.Int64(end);
      } else {
        throw Exception(
-          "Start and end should not be null if the timestamp is null",
-        );
+            "Start and end should not be null if the timestamp is null");
      }
    }

@@ -1,50 +0,0 @@
-import 'dart:typed_data';
-
-import 'package:appflowy/core/grid_notification.dart';
-import 'package:flowy_infra/notifier.dart';
-import 'package:appflowy_backend/protobuf/flowy-error/protobuf.dart';
-import 'package:appflowy_backend/protobuf/flowy-database/protobuf.dart';
-import 'package:dartz/dartz.dart';
-
-typedef NewLayoutFieldValue = Either<LayoutSettingPB, FlowyError>;
-
-class DatabaseCalendarLayoutListener {
-  final String viewId;
-  PublishNotifier<NewLayoutFieldValue>? _newLayoutFieldNotifier =
-      PublishNotifier();
-  DatabaseNotificationListener? _listener;
-  DatabaseCalendarLayoutListener(this.viewId);
-
-  void start({
-    required void Function(NewLayoutFieldValue) onCalendarLayoutChanged,
-  }) {
-    _newLayoutFieldNotifier?.addPublishListener(onCalendarLayoutChanged);
-    _listener = DatabaseNotificationListener(
-      objectId: viewId,
-      handler: _handler,
-    );
-  }
-
-  void _handler(
-    DatabaseNotification ty,
-    Either<Uint8List, FlowyError> result,
-  ) {
-    switch (ty) {
-      case DatabaseNotification.DidSetNewLayoutField:
-        result.fold(
-          (payload) => _newLayoutFieldNotifier?.value =
-              left(LayoutSettingPB.fromBuffer(payload)),
-          (error) => _newLayoutFieldNotifier?.value = right(error),
-        );
-        break;
-      default:
-        break;
-    }
-  }
-
-  Future<void> stop() async {
-    await _listener?.stop();
-    _newLayoutFieldNotifier?.dispose();
-    _newLayoutFieldNotifier = null;
-  }
-}
@@ -37,15 +37,11 @@ class RowCache {
  final RowCacheDelegate _delegate;
  final RowChangesetNotifier _rowChangeReasonNotifier;

-  UnmodifiableListView<RowInfo> get rowInfos {
+  UnmodifiableListView<RowInfo> get visibleRows {
    var visibleRows = [..._rowList.rows];
    return UnmodifiableListView(visibleRows);
  }

-  UnmodifiableMapView<String, RowInfo> get rowByRowId {
-    return UnmodifiableMapView(_rowList.rowInfoByRowId);
-  }
-
  CellCache get cellCache => _cellCache;

  RowCache({
@@ -65,10 +61,6 @@ class RowCache {
    });
  }

-  RowInfo? getRow(String rowId) {
-    return _rowList.get(rowId);
-  }
-
  void setInitialRows(List<RowPB> rows) {
    for (final row in rows) {
      final rowInfo = buildGridRow(row);
@@ -102,16 +94,11 @@ class RowCache {
    final rowInfo = _rowList.get(reorderRow.rowId);
    if (rowInfo != null) {
      _rowList.moveRow(
-        reorderRow.rowId,
-        reorderRow.oldIndex,
-        reorderRow.newIndex,
-      );
-      _rowChangeReasonNotifier.receive(
-        RowsChangedReason.reorderSingleRow(
-          reorderRow,
-          rowInfo,
-        ),
-      );
+          reorderRow.rowId, reorderRow.oldIndex, reorderRow.newIndex);
+      _rowChangeReasonNotifier.receive(RowsChangedReason.reorderSingleRow(
+        reorderRow,
+        rowInfo,
+      ));
    }
  }

@@ -330,9 +317,7 @@ class RowsChangedReason with _$RowsChangedReason {
  const factory RowsChangedReason.initial() = InitialListState;
  const factory RowsChangedReason.reorderRows() = _ReorderRows;
  const factory RowsChangedReason.reorderSingleRow(
-    ReorderSingleRowPB reorderRow,
-    RowInfo rowInfo,
-  ) = _ReorderSingleRow;
+      ReorderSingleRowPB reorderRow, RowInfo rowInfo) = _ReorderSingleRow;
 }

 class InsertedIndex {
@@ -23,12 +23,10 @@ class RowController {
  }

  void addListener({OnRowChanged? onRowChanged}) {
-    _onRowChangedListeners.add(
-      _rowCache.addListener(
-        rowId: rowId,
-        onCellUpdated: onRowChanged,
-      ),
-    );
+    _onRowChangedListeners.add(_rowCache.addListener(
+      rowId: rowId,
+      onCellUpdated: onRowChanged,
+    ));
  }

  void dispose() {
@@ -9,14 +9,14 @@ class RowList {
  List<RowInfo> get rows => List.from(_rowInfos);

  /// Use Map for faster access the raw row data.
-  final HashMap<String, RowInfo> rowInfoByRowId = HashMap();
+  final HashMap<String, RowInfo> _rowInfoByRowId = HashMap();

  RowInfo? get(String rowId) {
-    return rowInfoByRowId[rowId];
+    return _rowInfoByRowId[rowId];
  }

  int? indexOfRow(String rowId) {
-    final rowInfo = rowInfoByRowId[rowId];
+    final rowInfo = _rowInfoByRowId[rowId];
    if (rowInfo != null) {
      return _rowInfos.indexOf(rowInfo);
    }
@@ -33,7 +33,7 @@ class RowList {
    } else {
      _rowInfos.add(rowInfo);
    }
-    rowInfoByRowId[rowId] = rowInfo;
+    _rowInfoByRowId[rowId] = rowInfo;
  }

  InsertedIndex? insert(int index, RowInfo rowInfo) {
@@ -47,21 +47,21 @@ class RowList {
    if (oldRowInfo != null) {
      _rowInfos.insert(insertedIndex, rowInfo);
      _rowInfos.remove(oldRowInfo);
-      rowInfoByRowId[rowId] = rowInfo;
+      _rowInfoByRowId[rowId] = rowInfo;
      return null;
    } else {
      _rowInfos.insert(insertedIndex, rowInfo);
-      rowInfoByRowId[rowId] = rowInfo;
+      _rowInfoByRowId[rowId] = rowInfo;
      return InsertedIndex(index: insertedIndex, rowId: rowId);
    }
  }

  DeletedIndex? remove(String rowId) {
-    final rowInfo = rowInfoByRowId[rowId];
+    final rowInfo = _rowInfoByRowId[rowId];
    if (rowInfo != null) {
      final index = _rowInfos.indexOf(rowInfo);
      if (index != -1) {
-        rowInfoByRowId.remove(rowInfo.rowPB.id);
+        _rowInfoByRowId.remove(rowInfo.rowPB.id);
        _rowInfos.remove(rowInfo);
      }
      return DeletedIndex(index: index, rowInfo: rowInfo);
@@ -85,12 +85,10 @@ class RowList {
      insert(index, builder(insertRow.row));

      if (!isContains) {
-        insertIndexs.add(
-          InsertedIndex(
-            index: index,
-            rowId: insertRow.row.id,
-          ),
-        );
+        insertIndexs.add(InsertedIndex(
+          index: index,
+          rowId: insertRow.row.id,
+        ));
      }
    }
    return insertIndexs;
@@ -107,7 +105,7 @@ class RowList {
      if (deletedRowByRowId[rowInfo.rowPB.id] == null) {
        newRows.add(rowInfo);
      } else {
-        rowInfoByRowId.remove(rowInfo.rowPB.id);
+        _rowInfoByRowId.remove(rowInfo.rowPB.id);
        deletedIndex.add(DeletedIndex(index: index, rowInfo: rowInfo));
      }
    });
@@ -138,7 +136,7 @@ class RowList {
    _rowInfos.clear();

    for (final rowId in rowIds) {
-      final rowInfo = rowInfoByRowId[rowId];
+      final rowInfo = _rowInfoByRowId[rowId];
      if (rowInfo != null) {
        _rowInfos.add(rowInfo);
      }
@@ -157,6 +155,6 @@ class RowList {
  }

  bool contains(String rowId) {
-    return rowInfoByRowId[rowId] != null;
+    return _rowInfoByRowId[rowId] != null;
  }
 }
@@ -67,8 +67,7 @@ class DatabaseGroupEvent with _$DatabaseGroupEvent {
    FieldType fieldType,
  ) = _DatabaseGroupEvent;
  const factory DatabaseGroupEvent.didReceiveFieldUpdate(
-    List<FieldInfo> fields,
-  ) = _DidReceiveFieldUpdate;
+      List<FieldInfo> fields) = _DidReceiveFieldUpdate;
 }

@freezed
@@ -79,9 +78,7 @@ class DatabaseGroupState with _$DatabaseGroupState {
  }) = _DatabaseGroupState;

  factory DatabaseGroupState.initial(
-    String viewId,
-    List<FieldInfo> fieldContexts,
-  ) =>
+          String viewId, List<FieldInfo> fieldContexts) =>
      DatabaseGroupState(
        viewId: viewId,
        fieldContexts: fieldContexts,
@@ -13,13 +13,11 @@ class DatabasePropertyBloc
  final FieldController _fieldController;
  Function(List<FieldInfo>)? _onFieldsFn;

-  DatabasePropertyBloc({
-    required String viewId,
-    required FieldController fieldController,
-  })  : _fieldController = fieldController,
+  DatabasePropertyBloc(
+      {required String viewId, required FieldController fieldController})
+      : _fieldController = fieldController,
        super(
-          DatabasePropertyState.initial(viewId, fieldController.fieldInfos),
-        ) {
+            DatabasePropertyState.initial(viewId, fieldController.fieldInfos)) {
    on<DatabasePropertyEvent>(
      (event, emit) async {
        await event.map(
@@ -70,12 +68,9 @@ class DatabasePropertyBloc
 class DatabasePropertyEvent with _$DatabasePropertyEvent {
  const factory DatabasePropertyEvent.initial() = _Initial;
  const factory DatabasePropertyEvent.setFieldVisibility(
-    String fieldId,
-    bool visibility,
-  ) = _SetFieldVisibility;
+      String fieldId, bool visibility) = _SetFieldVisibility;
  const factory DatabasePropertyEvent.didReceiveFieldUpdate(
-    List<FieldInfo> fields,
-  ) = _DidReceiveFieldUpdate;
+      List<FieldInfo> fields) = _DidReceiveFieldUpdate;
  const factory DatabasePropertyEvent.moveField(int fromIndex, int toIndex) =
      _MoveField;
 }
@@ -1,5 +1,6 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
+import 'dart:async';
 import 'package:dartz/dartz.dart';

 part 'setting_bloc.freezed.dart';
@@ -11,21 +12,23 @@ class DatabaseSettingBloc
      : super(DatabaseSettingState.initial()) {
    on<DatabaseSettingEvent>(
      (event, emit) async {
-        event.map(
-          performAction: (_PerformAction value) {
-            emit(state.copyWith(selectedAction: Some(value.action)));
-          },
-        );
+        event.map(performAction: (_PerformAction value) {
+          emit(state.copyWith(selectedAction: Some(value.action)));
+        });
      },
    );
  }
+
+  @override
+  Future<void> close() async {
+    return super.close();
+  }
 }

@freezed
 class DatabaseSettingEvent with _$DatabaseSettingEvent {
  const factory DatabaseSettingEvent.performAction(
-    DatabaseSettingAction action,
-  ) = _PerformAction;
+      DatabaseSettingAction action) = _PerformAction;
 }

@freezed
@@ -27,18 +27,16 @@ class SettingController {
      );
    });

-    // Listen on the setting changes
-    _listener.start(
-      onSettingUpdated: (result) {
-        result.fold(
-          (newSetting) => updateSetting(newSetting),
-          (err) => _onError?.call(err),
-        );
-      },
-    );
+    // Listen on the seting changes
+    _listener.start(onSettingUpdated: (result) {
+      result.fold(
+        (newSetting) => updateSetting(newSetting),
+        (err) => _onError?.call(err),
+      );
+    });
  }

-  void startListening({
+  void startListeing({
    required OnSettingUpdated onSettingUpdated,
    required OnError onError,
  }) {
@@ -1,50 +1,22 @@
 import 'dart:async';
-import 'dart:collection';
 import 'package:appflowy_backend/log.dart';
-import '../defines.dart';
 import '../field/field_controller.dart';
 import '../row/row_cache.dart';
 import 'view_listener.dart';

-class DatabaseViewCallbacks {
-  /// Will get called when number of rows were changed that includes
-  /// update/delete/insert rows. The [onRowsChanged] will return all
-  /// the rows of the current database
-  final OnRowsChanged? onRowsChanged;
-
-  // Will get called when creating new rows
-  final OnRowsCreated? onRowsCreated;
-
-  /// Will get called when number of rows were updated
-  final OnRowsUpdated? onRowsUpdated;
-
-  /// Will get called when number of rows were deleted
-  final OnRowsDeleted? onRowsDeleted;
-
-  const DatabaseViewCallbacks({
-    this.onRowsChanged,
-    this.onRowsCreated,
-    this.onRowsUpdated,
-    this.onRowsDeleted,
-  });
-}
-
 /// Read https://appflowy.gitbook.io/docs/essential-documentation/contribute-to-appflowy/architecture/frontend/grid for more information
 class DatabaseViewCache {
  final String viewId;
  late RowCache _rowCache;
-  final DatabaseViewListener _databaseViewListener;
-  DatabaseViewCallbacks? _callbacks;
+  final DatabaseViewListener _gridViewListener;

-  UnmodifiableListView<RowInfo> get rowInfos => _rowCache.rowInfos;
+  List<RowInfo> get rowInfos => _rowCache.visibleRows;
  RowCache get rowCache => _rowCache;

-  RowInfo? getRow(String rowId) => _rowCache.getRow(rowId);
-
  DatabaseViewCache({
    required this.viewId,
    required FieldController fieldController,
-  }) : _databaseViewListener = DatabaseViewListener(viewId: viewId) {
+  }) : _gridViewListener = DatabaseViewListener(viewId: viewId) {
    final delegate = RowDelegatesImpl(fieldController);
    _rowCache = RowCache(
      viewId: viewId,
@@ -52,30 +24,10 @@ class DatabaseViewCache {
      cacheDelegate: delegate,
    );

-    _databaseViewListener.start(
+    _gridViewListener.start(
      onRowsChanged: (result) {
        result.fold(
-          (changeset) {
-            // Update the cache
-            _rowCache.applyRowsChanged(changeset);
-
-            if (changeset.deletedRows.isNotEmpty) {
-              _callbacks?.onRowsDeleted?.call(changeset.deletedRows);
-            }
-
-            if (changeset.updatedRows.isNotEmpty) {
-              _callbacks?.onRowsUpdated
-                  ?.call(changeset.updatedRows.map((e) => e.row.id).toList());
-            }
-
-            if (changeset.insertedRows.isNotEmpty) {
-              _callbacks?.onRowsCreated?.call(
-                changeset.insertedRows
-                    .map((insertedRow) => insertedRow.row.id)
-                    .toList(),
-              );
-            }
-          },
+          (changeset) => _rowCache.applyRowsChanged(changeset),
          (err) => Log.error(err),
        );
      },
@@ -98,22 +50,23 @@ class DatabaseViewCache {
        );
      },
    );
-
-    _rowCache.onRowsChanged(
-      (reason) => _callbacks?.onRowsChanged?.call(
-        rowInfos,
-        _rowCache.rowByRowId,
-        reason,
-      ),
-    );
  }

  Future<void> dispose() async {
-    await _databaseViewListener.stop();
+    await _gridViewListener.stop();
    await _rowCache.dispose();
  }

-  void addListener(DatabaseViewCallbacks callbacks) {
-    _callbacks = callbacks;
+  void addListener({
+    required void Function(RowsChangedReason) onRowsChanged,
+    bool Function()? listenWhen,
+  }) {
+    _rowCache.onRowsChanged((reason) {
+      if (listenWhen != null && listenWhen() == false) {
+        return;
+      }
+
+      onRowsChanged(reason);
+    });
  }
 }
@@ -54,7 +54,7 @@ class BoardBloc extends Bloc<BoardEvent, BoardState> {
        final toRow = groupControllers[groupId]?.rowAtIndex(toIndex);
        if (fromRow != null) {
          _databaseController.moveRow(
-            fromRow: fromRow,
+            fromRow,
            toRow: toRow,
            groupId: groupId,
          );
@@ -70,7 +70,7 @@ class BoardBloc extends Bloc<BoardEvent, BoardState> {
        final toRow = groupControllers[toGroupId]?.rowAtIndex(toIndex);
        if (fromRow != null) {
          _databaseController.moveRow(
-            fromRow: fromRow,
+            fromRow,
            toRow: toRow,
            groupId: toGroupId,
          );
@@ -105,31 +105,23 @@ class BoardBloc extends Bloc<BoardEvent, BoardState> {
            );
          },
          didCreateRow: (group, row, int? index) {
-            emit(
-              state.copyWith(
-                editingRow: Some(
-                  BoardEditingRow(
-                    group: group,
-                    row: row,
-                    index: index,
-                  ),
-                ),
-              ),
-            );
+            emit(state.copyWith(
+              editingRow: Some(BoardEditingRow(
+                group: group,
+                row: row,
+                index: index,
+              )),
+            ));
            _groupItemStartEditing(group, row, true);
          },
          startEditingRow: (group, row) {
-            emit(
-              state.copyWith(
-                editingRow: Some(
-                  BoardEditingRow(
-                    group: group,
-                    row: row,
-                    index: null,
-                  ),
-                ),
-              ),
-            );
+            emit(state.copyWith(
+              editingRow: Some(BoardEditingRow(
+                group: group,
+                row: row,
+                index: null,
+              )),
+            ));
            _groupItemStartEditing(group, row, true);
          },
          endEditingRow: (rowId) {
@@ -183,12 +175,10 @@ class BoardBloc extends Bloc<BoardEvent, BoardState> {
    groupControllers.clear();
    boardController.clear();

-    boardController.addGroups(
-      groups
-          .where((group) => fieldController.getField(group.fieldId) != null)
-          .map((group) => initializeGroupData(group))
-          .toList(),
-    );
+    boardController.addGroups(groups
+        .where((group) => fieldController.getField(group.fieldId) != null)
+        .map((group) => initializeGroupData(group))
+        .toList());

    for (final group in groups) {
      final controller = initializeGroupController(group);
@@ -344,8 +334,7 @@ class BoardState with _$BoardState {
 class GridLoadingState with _$GridLoadingState {
  const factory GridLoadingState.loading() = _Loading;
  const factory GridLoadingState.finish(
-    Either<Unit, FlowyError> successOrFail,
-  ) = _Finish;
+      Either<Unit, FlowyError> successOrFail) = _Finish;
 }

 class GridFieldEquatable extends Equatable {
@@ -41,46 +41,44 @@ class GroupController {
  }

  void startListening() {
-    _listener.start(
-      onGroupChanged: (result) {
-        result.fold(
-          (GroupRowsNotificationPB changeset) {
-            for (final deletedRow in changeset.deletedRows) {
-              group.rows.removeWhere((rowPB) => rowPB.id == deletedRow);
-              delegate.removeRow(group, deletedRow);
+    _listener.start(onGroupChanged: (result) {
+      result.fold(
+        (GroupRowsNotificationPB changeset) {
+          for (final deletedRow in changeset.deletedRows) {
+            group.rows.removeWhere((rowPB) => rowPB.id == deletedRow);
+            delegate.removeRow(group, deletedRow);
+          }
+
+          for (final insertedRow in changeset.insertedRows) {
+            final index = insertedRow.hasIndex() ? insertedRow.index : null;
+            if (insertedRow.hasIndex() &&
+                group.rows.length > insertedRow.index) {
+              group.rows.insert(insertedRow.index, insertedRow.row);
+            } else {
+              group.rows.add(insertedRow.row);
            }

-            for (final insertedRow in changeset.insertedRows) {
-              final index = insertedRow.hasIndex() ? insertedRow.index : null;
-              if (insertedRow.hasIndex() &&
-                  group.rows.length > insertedRow.index) {
-                group.rows.insert(insertedRow.index, insertedRow.row);
-              } else {
-                group.rows.add(insertedRow.row);
-              }
-
-              if (insertedRow.isNew) {
-                delegate.addNewRow(group, insertedRow.row, index);
-              } else {
-                delegate.insertRow(group, insertedRow.row, index);
-              }
+            if (insertedRow.isNew) {
+              delegate.addNewRow(group, insertedRow.row, index);
+            } else {
+              delegate.insertRow(group, insertedRow.row, index);
            }
+          }

-            for (final updatedRow in changeset.updatedRows) {
-              final index = group.rows.indexWhere(
-                (rowPB) => rowPB.id == updatedRow.id,
-              );
+          for (final updatedRow in changeset.updatedRows) {
+            final index = group.rows.indexWhere(
+              (rowPB) => rowPB.id == updatedRow.id,
+            );

-              if (index != -1) {
-                group.rows[index] = updatedRow;
-                delegate.updateRow(group, updatedRow);
-              }
+            if (index != -1) {
+              group.rows[index] = updatedRow;
+              delegate.updateRow(group, updatedRow);
            }
-          },
-          (err) => Log.error(err),
-        );
-      },
-    );
+          }
+        },
+        (err) => Log.error(err),
+      );
+    });
  }

  Future<void> dispose() async {
@@ -1,5 +1,6 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
+import 'dart:async';
 import 'package:dartz/dartz.dart';

 part 'board_setting_bloc.freezed.dart';
@@ -10,14 +11,17 @@ class BoardSettingBloc extends Bloc<BoardSettingEvent, BoardSettingState> {
      : super(BoardSettingState.initial()) {
    on<BoardSettingEvent>(
      (event, emit) async {
-        event.when(
-          performAction: (action) {
-            emit(state.copyWith(selectedAction: Some(action)));
-          },
-        );
+        event.when(performAction: (action) {
+          emit(state.copyWith(selectedAction: Some(action)));
+        });
      },
    );
  }
+
+  @override
+  Future<void> close() async {
+    return super.close();
+  }
 }

@freezed
@@ -80,8 +80,8 @@ class _BoardContentState extends State<BoardContent> {
  late AppFlowyBoardScrollController scrollManager;
  final cardConfiguration = CardConfiguration<String>();

-  final config = const AppFlowyBoardConfig(
-    groupBackgroundColor: Color(0xffF7F8FC),
+  final config = AppFlowyBoardConfig(
+    groupBackgroundColor: HexColor.fromHex('#F7F8FC'),
  );

  @override
@@ -184,7 +184,7 @@ class _BoardContentState extends State<BoardContent> {
        width: 20,
        child: svgWidget(
          "home/add",
-          color: Theme.of(context).iconTheme.color,
+          color: Theme.of(context).colorScheme.onSurface,
        ),
      ),
      onAddButtonClick: () {
@@ -207,7 +207,7 @@ class _BoardContentState extends State<BoardContent> {
        width: 20,
        child: svgWidget(
          "home/add",
-          color: Theme.of(context).iconTheme.color,
+          color: Theme.of(context).colorScheme.onSurface,
        ),
      ),
      title: FlowyText.medium(
@@ -292,10 +292,9 @@ class _BoardContentState extends State<BoardContent> {
      color: Theme.of(context).dividerColor,
      width: 1.0,
    );
-    final isLightMode = Theme.of(context).brightness == Brightness.light;
    return BoxDecoration(
      color: Theme.of(context).colorScheme.surface,
-      border: isLightMode ? Border.fromBorderSide(borderSide) : null,
+      border: Border.fromBorderSide(borderSide),
      borderRadius: const BorderRadius.all(Radius.circular(6)),
    );
  }
@@ -350,6 +349,15 @@ class _ToolbarBlocAdaptor extends StatelessWidget {
  }
 }

+extension HexColor on Color {
+  static Color fromHex(String hexString) {
+    final buffer = StringBuffer();
+    if (hexString.length == 6 || hexString.length == 7) buffer.write('ff');
+    buffer.write(hexString.replaceFirst('#', ''));
+    return Color(int.parse(buffer.toString(), radix: 16));
+  }
+}
+
 Widget? _buildHeaderIcon(GroupData customData) {
  Widget? widget;
  switch (customData.fieldType) {
@@ -7,7 +7,6 @@ import 'package:appflowy/plugins/database_view/grid/presentation/widgets/toolbar
 import 'package:appflowy_popover/appflowy_popover.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flowy_infra/image.dart';
-import 'package:flowy_infra/theme_extension.dart';
 import 'package:flowy_infra_ui/style_widget/button.dart';
 import 'package:flowy_infra_ui/style_widget/scrolling/styled_list.dart';
 import 'package:flowy_infra_ui/style_widget/text.dart';
@@ -105,12 +104,8 @@ class _SettingItem extends StatelessWidget {
    return SizedBox(
      height: 30,
      child: FlowyButton(
-        hoverColor: AFThemeExtension.of(context).lightGreyHover,
        isSelected: isSelected,
-        text: FlowyText.medium(
-          action.title(),
-          color: AFThemeExtension.of(context).textColor,
-        ),
+        text: FlowyText.medium(action.title()),
        onTap: () {
          context
              .read<BoardSettingBloc>()
@@ -118,7 +113,7 @@ class _SettingItem extends StatelessWidget {
        },
        leftIcon: svgWidget(
          action.iconName(),
-          color: Theme.of(context).iconTheme.color,
+          color: Theme.of(context).colorScheme.onSurface,
        ),
      ),
    );
@@ -65,13 +65,11 @@ class _SettingButtonState extends State<_SettingButton> {
    return AppFlowyPopover(
      controller: popoverController,
      direction: PopoverDirection.leftWithTopAligned,
-      offset: const Offset(-8, 0),
      triggerActions: PopoverTriggerFlags.none,
      constraints: BoxConstraints.loose(const Size(260, 400)),
      margin: EdgeInsets.zero,
      child: FlowyTextButton(
        LocaleKeys.settings_title.tr(),
-        fontColor: AFThemeExtension.of(context).textColor,
        fillColor: Colors.transparent,
        hoverColor: AFThemeExtension.of(context).lightGreyHover,
        padding: GridSize.typeOptionContentInsets,
@@ -17,11 +17,9 @@ part 'calendar_bloc.freezed.dart';

 class CalendarBloc extends Bloc<CalendarEvent, CalendarState> {
  final DatabaseController _databaseController;
-  Map<String, FieldInfo> fieldInfoByFieldId = {};

  // Getters
  String get viewId => _databaseController.viewId;
-  FieldController get fieldController => _databaseController.fieldController;
  CellCache get cellCache => _databaseController.rowCache.cellCache;
  RowCache get rowCache => _databaseController.rowCache;

@@ -30,7 +28,7 @@ class CalendarBloc extends Bloc<CalendarEvent, CalendarState> {
          view: view,
          layoutType: LayoutTypePB.Calendar,
        ),
-        super(CalendarState.initial()) {
+        super(CalendarState.initial(view.id)) {
    on<CalendarEvent>(
      (event, emit) async {
        await event.when(
@@ -46,53 +44,16 @@ class CalendarBloc extends Bloc<CalendarEvent, CalendarState> {
            emit(state.copyWith(database: Some(database)));
          },
          didLoadAllEvents: (events) {
-            emit(state.copyWith(initialEvents: events, allEvents: events));
-          },
-          didReceiveNewLayoutField: (CalendarLayoutSettingsPB layoutSettings) {
-            _loadAllEvents();
-            emit(state.copyWith(settings: Some(layoutSettings)));
+            emit(state.copyWith(events: events));
          },
          createEvent: (DateTime date, String title) async {
            await _createEvent(date, title);
          },
-          updateCalendarLayoutSetting:
-              (CalendarLayoutSettingsPB layoutSetting) async {
-            await _updateCalendarLayoutSetting(layoutSetting);
+          didReceiveEvent: (CalendarEventData<CalendarCardData> newEvent) {
+            emit(state.copyWith(events: [...state.events, newEvent]));
          },
-          didUpdateEvent: (CalendarEventData<CalendarDayEvent> eventData) {
-            var allEvents = [...state.allEvents];
-            final index = allEvents.indexWhere(
-              (element) => element.event!.cellId == eventData.event!.cellId,
-            );
-            if (index != -1) {
-              allEvents[index] = eventData;
-            }
-            emit(
-              state.copyWith(
-                allEvents: allEvents,
-                updateEvent: eventData,
-              ),
-            );
-          },
-          didReceiveNewEvent: (CalendarEventData<CalendarDayEvent> event) {
-            emit(
-              state.copyWith(
-                allEvents: [...state.allEvents, event],
-                newEvent: event,
-              ),
-            );
-          },
-          didDeleteEvents: (List<String> deletedRowIds) {
-            var events = [...state.allEvents];
-            events.retainWhere(
-              (element) => !deletedRowIds.contains(element.event!.cellId.rowId),
-            );
-            emit(
-              state.copyWith(
-                allEvents: events,
-                deleteEventIds: deletedRowIds,
-              ),
-            );
+          didUpdateFieldInfos: (Map<String, FieldInfo> fieldInfoByFieldId) {
+            emit(state.copyWith(fieldInfoByFieldId: fieldInfoByFieldId));
          },
        );
      },
@@ -136,7 +97,7 @@ class CalendarBloc extends Bloc<CalendarEvent, CalendarState> {
  }

  Future<void> _createEvent(DateTime date, String title) async {
-    return state.settings.fold(
+    state.settings.fold(
      () => null,
      (settings) async {
        final dateField = _getCalendarFieldInfo(settings.layoutFieldId);
@@ -149,8 +110,8 @@ class CalendarBloc extends Bloc<CalendarEvent, CalendarState> {
            },
          );

-          return result.fold(
-            (newRow) {},
+          result.fold(
+            (newRow) => _loadEvent(newRow.id),
            (err) => Log.error(err),
          );
        }
@@ -158,24 +119,17 @@ class CalendarBloc extends Bloc<CalendarEvent, CalendarState> {
    );
  }

-  Future<void> _updateCalendarLayoutSetting(
-    CalendarLayoutSettingsPB layoutSetting,
-  ) async {
-    return _databaseController.updateCalenderLayoutSetting(layoutSetting);
-  }
-
-  Future<CalendarEventData<CalendarDayEvent>?> _loadEvent(String rowId) async {
+  Future<void> _loadEvent(String rowId) async {
    final payload = RowIdPB(viewId: viewId, rowId: rowId);
-    return DatabaseEventGetCalendarEvent(payload).send().then((result) {
-      return result.fold(
+    DatabaseEventGetCalendarEvent(payload).send().then((result) {
+      result.fold(
        (eventPB) {
          final calendarEvent = _calendarEventDataFromEventPB(eventPB);
-          return calendarEvent;
-        },
-        (r) {
-          Log.error(r);
-          return null;
+          if (calendarEvent != null) {
+            add(CalendarEvent.didReceiveEvent(calendarEvent));
+          }
        },
+        (r) => Log.error(r),
      );
    });
  }
@@ -186,7 +140,7 @@ class CalendarBloc extends Bloc<CalendarEvent, CalendarState> {
      result.fold(
        (events) {
          if (!isClosed) {
-            final calendarEvents = <CalendarEventData<CalendarDayEvent>>[];
+            final calendarEvents = <CalendarEventData<CalendarCardData>>[];
            for (final eventPB in events.items) {
              final calendarEvent = _calendarEventDataFromEventPB(eventPB);
              if (calendarEvent != null) {
@@ -202,10 +156,9 @@ class CalendarBloc extends Bloc<CalendarEvent, CalendarState> {
    });
  }

-  CalendarEventData<CalendarDayEvent>? _calendarEventDataFromEventPB(
-    CalendarEventPB eventPB,
-  ) {
-    final fieldInfo = fieldInfoByFieldId[eventPB.titleFieldId];
+  CalendarEventData<CalendarCardData>? _calendarEventDataFromEventPB(
+      CalendarEventPB eventPB) {
+    final fieldInfo = state.fieldInfoByFieldId[eventPB.titleFieldId];
    if (fieldInfo != null) {
      final cellId = CellIdentifier(
        viewId: viewId,
@@ -213,13 +166,14 @@ class CalendarBloc extends Bloc<CalendarEvent, CalendarState> {
        fieldInfo: fieldInfo,
      );

-      final eventData = CalendarDayEvent(
+      final eventData = CalendarCardData(
        event: eventPB,
        cellId: cellId,
      );

      final date = DateTime.fromMillisecondsSinceEpoch(
        eventPB.timestamp.toInt() * 1000,
+        isUtc: true,
      );
      return CalendarEventData(
        title: eventPB.title,
@@ -238,31 +192,10 @@ class CalendarBloc extends Bloc<CalendarEvent, CalendarState> {
      },
      onFieldsChanged: (fieldInfos) {
        if (isClosed) return;
-        fieldInfoByFieldId = {
+        final fieldInfoByFieldId = {
          for (var fieldInfo in fieldInfos) fieldInfo.field.id: fieldInfo
        };
-      },
-      onRowsChanged: ((onRowsChanged, rowByRowId, reason) {}),
-      onRowsCreated: ((ids) async {
-        for (final id in ids) {
-          final event = await _loadEvent(id);
-          if (event != null && !isClosed) {
-            add(CalendarEvent.didReceiveNewEvent(event));
-          }
-        }
-      }),
-      onRowsDeleted: (ids) {
-        if (isClosed) return;
-        add(CalendarEvent.didDeleteEvents(ids));
-      },
-      onRowsUpdated: (ids) async {
-        if (isClosed) return;
-        for (final id in ids) {
-          final event = await _loadEvent(id);
-          if (event != null) {
-            add(CalendarEvent.didUpdateEvent(event));
-          }
-        }
+        add(CalendarEvent.didUpdateFieldInfos(fieldInfoByFieldId));
      },
    );

@@ -271,14 +204,9 @@ class CalendarBloc extends Bloc<CalendarEvent, CalendarState> {
      onLoadLayout: _didReceiveLayoutSetting,
    );

-    final onCalendarLayoutFieldChanged = CalendarLayoutCallbacks(
-      onCalendarLayoutChanged: _didReceiveNewLayoutField,
-    );
-
    _databaseController.addListener(
      onDatabaseChanged: onDatabaseChanged,
      onLayoutChanged: onLayoutChanged,
-      onCalendarLayoutChanged: onCalendarLayoutFieldChanged,
    );
  }

@@ -288,80 +216,44 @@ class CalendarBloc extends Bloc<CalendarEvent, CalendarState> {
      add(CalendarEvent.didReceiveCalendarSettings(layoutSetting.calendar));
    }
  }
-
-  void _didReceiveNewLayoutField(LayoutSettingPB layoutSetting) {
-    if (layoutSetting.hasCalendar()) {
-      if (isClosed) return;
-      add(CalendarEvent.didReceiveNewLayoutField(layoutSetting.calendar));
-    }
-  }
 }

-typedef Events = List<CalendarEventData<CalendarDayEvent>>;
+typedef Events = List<CalendarEventData<CalendarCardData>>;

@freezed
 class CalendarEvent with _$CalendarEvent {
  const factory CalendarEvent.initial() = _InitialCalendar;
-
-  // Called after loading the calendar layout setting from the backend
  const factory CalendarEvent.didReceiveCalendarSettings(
-    CalendarLayoutSettingsPB settings,
-  ) = _ReceiveCalendarSettings;
-
-  // Called after loading all the current evnets
+      CalendarLayoutSettingsPB settings) = _ReceiveCalendarSettings;
  const factory CalendarEvent.didLoadAllEvents(Events events) =
      _ReceiveCalendarEvents;
-
-  // Called when specific event was updated
-  const factory CalendarEvent.didUpdateEvent(
-    CalendarEventData<CalendarDayEvent> event,
-  ) = _DidUpdateEvent;
-
-  // Called after creating a new event
-  const factory CalendarEvent.didReceiveNewEvent(
-    CalendarEventData<CalendarDayEvent> event,
-  ) = _DidReceiveNewEvent;
-
-  // Called when deleting events
-  const factory CalendarEvent.didDeleteEvents(List<String> rowIds) =
-      _DidDeleteEvents;
-
-  // Called when creating a new event
+  const factory CalendarEvent.didReceiveEvent(
+      CalendarEventData<CalendarCardData> event) = _ReceiveEvent;
+  const factory CalendarEvent.didUpdateFieldInfos(
+      Map<String, FieldInfo> fieldInfoByFieldId) = _DidUpdateFieldInfos;
  const factory CalendarEvent.createEvent(DateTime date, String title) =
      _CreateEvent;
-
-  // Called when updating the calendar's layout settings
-  const factory CalendarEvent.updateCalendarLayoutSetting(
-    CalendarLayoutSettingsPB layoutSetting,
-  ) = _UpdateCalendarLayoutSetting;
-
  const factory CalendarEvent.didReceiveDatabaseUpdate(DatabasePB database) =
      _ReceiveDatabaseUpdate;
-
-  const factory CalendarEvent.didReceiveNewLayoutField(
-    CalendarLayoutSettingsPB layoutSettings,
-  ) = _DidReceiveNewLayoutField;
 }

@freezed
 class CalendarState with _$CalendarState {
  const factory CalendarState({
+    required String databaseId,
    required Option<DatabasePB> database,
-    required Events allEvents,
-    required Events initialEvents,
-    CalendarEventData<CalendarDayEvent>? newEvent,
-    required List<String> deleteEventIds,
-    CalendarEventData<CalendarDayEvent>? updateEvent,
+    required Events events,
+    required Map<String, FieldInfo> fieldInfoByFieldId,
    required Option<CalendarLayoutSettingsPB> settings,
    required DatabaseLoadingState loadingState,
    required Option<FlowyError> noneOrError,
  }) = _CalendarState;

-  factory CalendarState.initial() => CalendarState(
+  factory CalendarState.initial(String databaseId) => CalendarState(
        database: none(),
-        allEvents: [],
-        initialEvents: [],
-        deleteEventIds: [],
+        databaseId: databaseId,
+        fieldInfoByFieldId: {},
+        events: [],
        settings: none(),
        noneOrError: none(),
        loadingState: const _Loading(),
@@ -372,8 +264,7 @@ class CalendarState with _$CalendarState {
 class DatabaseLoadingState with _$DatabaseLoadingState {
  const factory DatabaseLoadingState.loading() = _Loading;
  const factory DatabaseLoadingState.finish(
-    Either<Unit, FlowyError> successOrFail,
-  ) = _Finish;
+      Either<Unit, FlowyError> successOrFail) = _Finish;
 }

 class CalendarEditingRow {
@@ -386,10 +277,8 @@ class CalendarEditingRow {
  });
 }

-class CalendarDayEvent {
+class CalendarCardData {
  final CalendarEventPB event;
  final CellIdentifier cellId;
-
-  String get eventId => cellId.rowId;
-  CalendarDayEvent({required this.cellId, required this.event});
+  CalendarCardData({required this.cellId, required this.event});
 }
@@ -1,55 +0,0 @@
-import 'package:appflowy_backend/protobuf/flowy-database/protobuf.dart';
-import 'package:bloc/bloc.dart';
-import 'package:dartz/dartz.dart';
-import 'package:freezed_annotation/freezed_annotation.dart';
-
-part 'calendar_setting_bloc.freezed.dart';
-
-typedef DayOfWeek = int;
-
-class CalendarSettingBloc
-    extends Bloc<CalendarSettingEvent, CalendarSettingState> {
-  CalendarSettingBloc({required CalendarLayoutSettingsPB? layoutSettings})
-      : super(CalendarSettingState.initial(layoutSettings)) {
-    on<CalendarSettingEvent>((event, emit) {
-      event.when(
-        performAction: (action) {
-          emit(state.copyWith(selectedAction: Some(action)));
-        },
-        updateLayoutSetting: (setting) {
-          emit(state.copyWith(layoutSetting: Some(setting)));
-        },
-      );
-    });
-  }
-}
-
-@freezed
-class CalendarSettingState with _$CalendarSettingState {
-  const factory CalendarSettingState({
-    required Option<CalendarSettingAction> selectedAction,
-    required Option<CalendarLayoutSettingsPB> layoutSetting,
-  }) = _CalendarSettingState;
-
-  factory CalendarSettingState.initial(
-    CalendarLayoutSettingsPB? layoutSettings,
-  ) =>
-      CalendarSettingState(
-        selectedAction: none(),
-        layoutSetting: layoutSettings == null ? none() : Some(layoutSettings),
-      );
-}
-
-@freezed
-class CalendarSettingEvent with _$CalendarSettingEvent {
-  const factory CalendarSettingEvent.performAction(
-    CalendarSettingAction action,
-  ) = _PerformAction;
-  const factory CalendarSettingEvent.updateLayoutSetting(
-    CalendarLayoutSettingsPB setting,
-  ) = _UpdateLayoutSetting;
-}
-
-enum CalendarSettingAction {
-  layout,
-}
@@ -1,281 +0,0 @@
-import 'package:appflowy/plugins/database_view/application/row/row_cache.dart';
-import 'package:appflowy/plugins/database_view/application/row/row_data_controller.dart';
-import 'package:appflowy/plugins/database_view/widgets/card/card_cell_builder.dart';
-import 'package:appflowy/plugins/database_view/widgets/card/cells/text_card_cell.dart';
-import 'package:appflowy/plugins/database_view/widgets/row/cell_builder.dart';
-import 'package:appflowy/plugins/database_view/widgets/row/row_detail.dart';
-import 'package:appflowy_backend/protobuf/flowy-database/field_entities.pbenum.dart';
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flowy_infra/image.dart';
-import 'package:flowy_infra/size.dart';
-import 'package:flowy_infra/theme_extension.dart';
-import 'package:flowy_infra_ui/flowy_infra_ui.dart';
-import 'package:flowy_infra_ui/style_widget/hover.dart';
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-
-import '../../grid/presentation/layout/sizes.dart';
-import '../application/calendar_bloc.dart';
-
-class CalendarDayCard extends StatelessWidget {
-  final String viewId;
-  final bool isToday;
-  final bool isInMonth;
-  final DateTime date;
-  final RowCache _rowCache;
-  final CardCellBuilder _cellBuilder;
-  final List<CalendarDayEvent> events;
-  final void Function(DateTime) onCreateEvent;
-
-  CalendarDayCard({
-    required this.viewId,
-    required this.isToday,
-    required this.isInMonth,
-    required this.date,
-    required this.onCreateEvent,
-    required RowCache rowCache,
-    required this.events,
-    Key? key,
-  })  : _rowCache = rowCache,
-        _cellBuilder = CardCellBuilder(rowCache.cellCache),
-        super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    Color backgroundColor = Theme.of(context).colorScheme.surface;
-    if (!isInMonth) {
-      backgroundColor = AFThemeExtension.of(context).lightGreyHover;
-    }
-
-    return ChangeNotifierProvider(
-      create: (_) => _CardEnterNotifier(),
-      builder: ((context, child) {
-        final children = events.map((event) {
-          return _DayEventCell(
-            event: event,
-            viewId: viewId,
-            onClick: () => _showRowDetailPage(event, context),
-            child: _cellBuilder.buildCell(
-              cellId: event.cellId,
-              styles: {FieldType.RichText: TextCardCellStyle(10)},
-            ),
-          );
-        }).toList();
-
-        final child = Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            Padding(
-              padding: const EdgeInsets.all(8.0),
-              child: _Header(
-                date: date,
-                isInMonth: isInMonth,
-                isToday: isToday,
-                onCreate: () => onCreateEvent(date),
-              ),
-            ),
-            VSpace(GridSize.typeOptionSeparatorHeight),
-            Flexible(
-              child: ListView.separated(
-                itemBuilder: (BuildContext context, int index) {
-                  return children[index];
-                },
-                itemCount: children.length,
-                padding: const EdgeInsets.symmetric(horizontal: 8.0),
-                separatorBuilder: (BuildContext context, int index) =>
-                    VSpace(GridSize.typeOptionSeparatorHeight),
-              ),
-            ),
-          ],
-        );
-
-        return Container(
-          color: backgroundColor,
-          child: MouseRegion(
-            cursor: SystemMouseCursors.click,
-            onEnter: (p) => notifyEnter(context, true),
-            onExit: (p) => notifyEnter(context, false),
-            child: Padding(
-              padding: const EdgeInsets.symmetric(vertical: 8.0),
-              child: child,
-            ),
-          ),
-        );
-      }),
-    );
-  }
-
-  void _showRowDetailPage(CalendarDayEvent event, BuildContext context) {
-    final dataController = RowController(
-      rowId: event.cellId.rowId,
-      viewId: viewId,
-      rowCache: _rowCache,
-    );
-
-    FlowyOverlay.show(
-      context: context,
-      builder: (BuildContext context) {
-        return RowDetailPage(
-          cellBuilder: GridCellBuilder(
-            cellCache: _rowCache.cellCache,
-          ),
-          dataController: dataController,
-        );
-      },
-    );
-  }
-
-  notifyEnter(BuildContext context, bool isEnter) {
-    Provider.of<_CardEnterNotifier>(
-      context,
-      listen: false,
-    ).onEnter = isEnter;
-  }
-}
-
-class _DayEventCell extends StatelessWidget {
-  final String viewId;
-  final CalendarDayEvent event;
-  final VoidCallback onClick;
-  final Widget child;
-  const _DayEventCell({
-    required this.viewId,
-    required this.event,
-    required this.onClick,
-    required this.child,
-    Key? key,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return FlowyHover(
-      child: GestureDetector(
-        onTap: onClick,
-        child: Container(
-          padding: const EdgeInsets.symmetric(horizontal: 8),
-          decoration: BoxDecoration(
-            border: Border.fromBorderSide(
-              BorderSide(
-                color: Theme.of(context).dividerColor,
-                width: 1.0,
-              ),
-            ),
-            borderRadius: Corners.s6Border,
-          ),
-          child: child,
-        ),
-      ),
-    );
-  }
-}
-
-class _Header extends StatelessWidget {
-  final bool isToday;
-  final bool isInMonth;
-  final DateTime date;
-  final VoidCallback onCreate;
-  const _Header({
-    required this.isToday,
-    required this.isInMonth,
-    required this.date,
-    required this.onCreate,
-    Key? key,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return Consumer<_CardEnterNotifier>(
-      builder: (context, notifier, _) {
-        final badge = _DayBadge(
-          isToday: isToday,
-          isInMonth: isInMonth,
-          date: date,
-        );
-        return Row(
-          children: [
-            if (notifier.onEnter) _NewEventButton(onClick: onCreate),
-            const Spacer(),
-            badge,
-          ],
-        );
-      },
-    );
-  }
-}
-
-class _NewEventButton extends StatelessWidget {
-  final VoidCallback onClick;
-  const _NewEventButton({
-    required this.onClick,
-    Key? key,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return FlowyIconButton(
-      onPressed: onClick,
-      iconPadding: EdgeInsets.zero,
-      icon: svgWidget(
-        "home/add",
-        color: Theme.of(context).iconTheme.color,
-      ),
-      width: 22,
-    );
-  }
-}
-
-class _DayBadge extends StatelessWidget {
-  final bool isToday;
-  final bool isInMonth;
-  final DateTime date;
-  const _DayBadge({
-    required this.isToday,
-    required this.isInMonth,
-    required this.date,
-    Key? key,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    Color dayTextColor = Theme.of(context).colorScheme.onSurface;
-    String dayString = date.day == 1
-        ? DateFormat('MMM d', context.locale.toLanguageTag()).format(date)
-        : date.day.toString();
-
-    if (isToday) {
-      dayTextColor = Theme.of(context).colorScheme.onPrimary;
-    }
-    if (!isInMonth) {
-      dayTextColor = Theme.of(context).disabledColor;
-    }
-
-    Widget day = Container(
-      decoration: BoxDecoration(
-        color: isToday ? Theme.of(context).colorScheme.primary : null,
-        borderRadius: Corners.s6Border,
-      ),
-      padding: GridSize.typeOptionContentInsets,
-      child: FlowyText.medium(
-        dayString,
-        color: dayTextColor,
-      ),
-    );
-
-    return day;
-  }
-}
-
-class _CardEnterNotifier extends ChangeNotifier {
-  bool _onEnter = false;
-
-  _CardEnterNotifier();
-
-  set onEnter(bool value) {
-    if (_onEnter != value) {
-      _onEnter = value;
-      notifyListeners();
-    }
-  }
-
-  bool get onEnter => _onEnter;
-}
@@ -1,15 +1,22 @@
 import 'package:appflowy/generated/locale_keys.g.dart';
+import 'package:appflowy/plugins/database_view/application/row/row_data_controller.dart';
 import 'package:appflowy/plugins/database_view/calendar/application/calendar_bloc.dart';
+import 'package:appflowy/plugins/database_view/widgets/card/card_cell_builder.dart';
 import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
 import 'package:calendar_view/calendar_view.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flowy_infra/image.dart';
+import 'package:flowy_infra/size.dart';
 import 'package:flowy_infra/theme_extension.dart';
 import 'package:flowy_infra_ui/flowy_infra_ui.dart';
+import 'package:flowy_infra_ui/style_widget/hover.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:provider/provider.dart';

-import 'calendar_day.dart';
+import '../../grid/presentation/layout/sizes.dart';
+import '../../widgets/row/cell_builder.dart';
+import '../../widgets/row/row_detail.dart';
 import 'layout/sizes.dart';
 import 'toolbar/calendar_toolbar.dart';

@@ -22,7 +29,7 @@ class CalendarPage extends StatefulWidget {
 }

 class _CalendarPageState extends State<CalendarPage> {
-  final _eventController = EventController<CalendarDayEvent>();
+  final _eventController = EventController<CalendarCardData>();
  GlobalKey<MonthViewState>? _calendarState;
  late CalendarBloc _calendarBloc;

@@ -51,57 +58,21 @@ class _CalendarPageState extends State<CalendarPage> {
            value: _calendarBloc,
          )
        ],
-        child: MultiBlocListener(
-          listeners: [
-            BlocListener<CalendarBloc, CalendarState>(
-              listenWhen: (p, c) => p.initialEvents != c.initialEvents,
-              listener: (context, state) {
-                _eventController.removeWhere((_) => true);
-                _eventController.addAll(state.initialEvents);
-              },
-            ),
-            BlocListener<CalendarBloc, CalendarState>(
-              listenWhen: (p, c) => p.deleteEventIds != c.deleteEventIds,
-              listener: (context, state) {
-                _eventController.removeWhere(
-                  (element) =>
-                      state.deleteEventIds.contains(element.event!.eventId),
-                );
-              },
-            ),
-            BlocListener<CalendarBloc, CalendarState>(
-              listenWhen: (p, c) => p.updateEvent != c.updateEvent,
-              listener: (context, state) {
-                if (state.updateEvent != null) {
-                  _eventController.removeWhere(
-                    (element) =>
-                        state.updateEvent!.event!.eventId ==
-                        element.event!.eventId,
-                  );
-                  _eventController.add(state.updateEvent!);
-                }
-              },
-            ),
-            BlocListener<CalendarBloc, CalendarState>(
-              listenWhen: (p, c) => p.newEvent != c.newEvent,
-              listener: (context, state) {
-                if (state.newEvent != null) {
-                  _eventController.add(state.newEvent!);
-                }
-              },
-            ),
-          ],
+        child: BlocListener<CalendarBloc, CalendarState>(
+          listenWhen: (previous, current) => previous.events != current.events,
+          listener: (context, state) {
+            if (state.events.isNotEmpty) {
+              _eventController.removeWhere((element) => true);
+              _eventController.addAll(state.events);
+            }
+          },
          child: BlocBuilder<CalendarBloc, CalendarState>(
            builder: (context, state) {
              return Column(
                children: [
                  // const _ToolbarBlocAdaptor(),
-                  const CalendarToolbar(),
-                  _buildCalendar(
-                    _eventController,
-                    state.settings
-                        .foldLeft(0, (previous, a) => a.firstDayOfWeek),
-                  ),
+                  _toolbar(),
+                  _buildCalendar(_eventController),
                ],
              );
            },
@@ -111,13 +82,16 @@ class _CalendarPageState extends State<CalendarPage> {
    );
  }

-  Widget _buildCalendar(EventController eventController, int firstDayOfWeek) {
+  Widget _toolbar() {
+    return const CalendarToolbar();
+  }
+
+  Widget _buildCalendar(EventController eventController) {
    return Expanded(
      child: MonthView(
        key: _calendarState,
        controller: _eventController,
-        cellAspectRatio: .9,
-        startDay: _weekdayFromInt(firstDayOfWeek),
+        cellAspectRatio: 1.75,
        borderColor: Theme.of(context).dividerColor,
        headerBuilder: _headerNavigatorBuilder,
        weekDayBuilder: _headerWeekDayBuilder,
@@ -180,19 +154,47 @@ class _CalendarPageState extends State<CalendarPage> {

  Widget _calendarDayBuilder(
    DateTime date,
-    List<CalendarEventData<CalendarDayEvent>> calenderEvents,
+    List<CalendarEventData<CalendarCardData>> calenderEvents,
    isToday,
    isInMonth,
  ) {
-    final events = calenderEvents.map((value) => value.event!).toList();
+    final builder = CardCellBuilder(_calendarBloc.cellCache);
+    final cells = calenderEvents.map((value) => value.event!).map((event) {
+      final child = builder.buildCell(cellId: event.cellId);

-    return CalendarDayCard(
-      viewId: widget.view.id,
+      return FlowyHover(
+        child: GestureDetector(
+          onTap: () {
+            final dataController = RowController(
+              rowId: event.cellId.rowId,
+              viewId: widget.view.id,
+              rowCache: _calendarBloc.rowCache,
+            );
+
+            FlowyOverlay.show(
+              context: context,
+              builder: (BuildContext context) {
+                return RowDetailPage(
+                  cellBuilder:
+                      GridCellBuilder(cellCache: _calendarBloc.cellCache),
+                  dataController: dataController,
+                );
+              },
+            );
+          },
+          child: Container(
+            padding: const EdgeInsets.symmetric(horizontal: 8),
+            child: child,
+          ),
+        ),
+      );
+    }).toList();
+
+    return _CalendarCard(
      isToday: isToday,
      isInMonth: isInMonth,
-      events: events,
      date: date,
-      rowCache: _calendarBloc.rowCache,
+      children: cells,
      onCreateEvent: (date) {
        _calendarBloc.add(
          CalendarEvent.createEvent(
@@ -203,9 +205,175 @@ class _CalendarPageState extends State<CalendarPage> {
      },
    );
  }
+}

-  WeekDays _weekdayFromInt(int dayOfWeek) {
-    // MonthView places the first day of week on the second column for some reason.
-    return WeekDays.values[(dayOfWeek + 1) % 7];
+class _CalendarCard extends StatelessWidget {
+  final bool isToday;
+  final bool isInMonth;
+  final DateTime date;
+  final List<Widget> children;
+  final void Function(DateTime) onCreateEvent;
+
+  const _CalendarCard({
+    required this.isToday,
+    required this.isInMonth,
+    required this.date,
+    required this.children,
+    required this.onCreateEvent,
+    Key? key,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    Color backgroundColor = Theme.of(context).colorScheme.surface;
+    if (!isInMonth) {
+      backgroundColor = AFThemeExtension.of(context).lightGreyHover;
+    }
+
+    return ChangeNotifierProvider(
+      create: (_) => _CardEnterNotifier(),
+      builder: ((context, child) {
+        return Container(
+          color: backgroundColor,
+          child: MouseRegion(
+            cursor: SystemMouseCursors.click,
+            onEnter: (p) => notifyEnter(context, true),
+            onExit: (p) => notifyEnter(context, false),
+            child: Padding(
+              padding: const EdgeInsets.all(8.0),
+              child: Column(
+                children: [
+                  _Header(
+                    date: date,
+                    isInMonth: isInMonth,
+                    isToday: isToday,
+                    onCreate: () => onCreateEvent(date),
+                  ),
+                  ...children
+                ],
+              ),
+            ),
+          ),
+        );
+      }),
+    );
+  }
+
+  notifyEnter(BuildContext context, bool isEnter) {
+    Provider.of<_CardEnterNotifier>(
+      context,
+      listen: false,
+    ).onEnter = isEnter;
  }
 }
+
+class _Header extends StatelessWidget {
+  final bool isToday;
+  final bool isInMonth;
+  final DateTime date;
+  final VoidCallback onCreate;
+  const _Header({
+    required this.isToday,
+    required this.isInMonth,
+    required this.date,
+    required this.onCreate,
+    Key? key,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Consumer<_CardEnterNotifier>(
+      builder: (context, notifier, _) {
+        final badge = _DayBadge(
+          isToday: isToday,
+          isInMonth: isInMonth,
+          date: date,
+        );
+        return Row(
+          children: [
+            if (notifier.onEnter) _NewEventButton(onClick: onCreate),
+            const Spacer(),
+            badge,
+          ],
+        );
+      },
+    );
+  }
+}
+
+class _NewEventButton extends StatelessWidget {
+  final VoidCallback onClick;
+  const _NewEventButton({
+    required this.onClick,
+    Key? key,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return FlowyIconButton(
+      onPressed: onClick,
+      iconPadding: EdgeInsets.zero,
+      icon: svgWidget(
+        "home/add",
+        color: Theme.of(context).colorScheme.onSurface,
+      ),
+      width: 22,
+    );
+  }
+}
+
+class _DayBadge extends StatelessWidget {
+  final bool isToday;
+  final bool isInMonth;
+  final DateTime date;
+  const _DayBadge({
+    required this.isToday,
+    required this.isInMonth,
+    required this.date,
+    Key? key,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    Color dayTextColor = Theme.of(context).colorScheme.onSurface;
+    String dayString = date.day == 1
+        ? DateFormat('MMM d', context.locale.toLanguageTag()).format(date)
+        : date.day.toString();
+
+    if (isToday) {
+      dayTextColor = Theme.of(context).colorScheme.onPrimary;
+    }
+    if (!isInMonth) {
+      dayTextColor = Theme.of(context).disabledColor;
+    }
+
+    Widget day = Container(
+      decoration: BoxDecoration(
+        color: isToday ? Theme.of(context).colorScheme.primary : null,
+        borderRadius: Corners.s6Border,
+      ),
+      padding: GridSize.typeOptionContentInsets,
+      child: FlowyText.medium(
+        dayString,
+        color: dayTextColor,
+      ),
+    );
+
+    return day;
+  }
+}
+
+class _CardEnterNotifier extends ChangeNotifier {
+  bool _onEnter = false;
+
+  _CardEnterNotifier();
+
+  set onEnter(bool value) {
+    if (_onEnter != value) {
+      _onEnter = value;
+      notifyListeners();
+    }
+  }
+
+  bool get onEnter => _onEnter;
+}
@@ -1,413 +0,0 @@
-import 'package:appflowy/generated/locale_keys.g.dart';
-import 'package:appflowy/plugins/database_view/application/field/field_controller.dart';
-import 'package:appflowy/plugins/database_view/application/setting/property_bloc.dart';
-import 'package:appflowy/plugins/database_view/calendar/application/calendar_setting_bloc.dart';
-import 'package:appflowy/plugins/database_view/grid/presentation/layout/sizes.dart';
-import 'package:appflowy/startup/startup.dart';
-import 'package:appflowy/workspace/presentation/widgets/toggle/toggle.dart';
-import 'package:appflowy/workspace/presentation/widgets/toggle/toggle_style.dart';
-import 'package:appflowy_backend/protobuf/flowy-database/protobuf.dart'
-    hide DateFormat;
-import 'package:appflowy_popover/appflowy_popover.dart';
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flowy_infra/image.dart';
-import 'package:flowy_infra_ui/flowy_infra_ui.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:protobuf/protobuf.dart';
-
-import 'calendar_setting.dart';
-
-/// Widget that displays a list of settings that alters the appearance of the
-/// calendar
-class CalendarLayoutSetting extends StatefulWidget {
-  final CalendarSettingContext settingContext;
-  final Function(CalendarLayoutSettingsPB? layoutSettings) onUpdated;
-
-  const CalendarLayoutSetting({
-    required this.onUpdated,
-    required this.settingContext,
-    super.key,
-  });
-
-  @override
-  State<CalendarLayoutSetting> createState() => _CalendarLayoutSettingState();
-}
-
-class _CalendarLayoutSettingState extends State<CalendarLayoutSetting> {
-  late final PopoverMutex popoverMutex;
-
-  @override
-  void initState() {
-    popoverMutex = PopoverMutex();
-    super.initState();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocBuilder<CalendarSettingBloc, CalendarSettingState>(
-      builder: (context, state) {
-        final CalendarLayoutSettingsPB? settings = state.layoutSetting
-            .foldLeft(null, (previous, settings) => settings);
-
-        if (settings == null) {
-          return const CircularProgressIndicator();
-        }
-        final availableSettings = _availableCalendarSettings(settings);
-
-        final items = availableSettings.map((setting) {
-          switch (setting) {
-            case CalendarLayoutSettingAction.showWeekNumber:
-              return ShowWeekNumber(
-                showWeekNumbers: settings.showWeekNumbers,
-                onUpdated: (showWeekNumbers) {
-                  _updateLayoutSettings(
-                    context,
-                    showWeekNumbers: showWeekNumbers,
-                    onUpdated: widget.onUpdated,
-                  );
-                },
-              );
-            case CalendarLayoutSettingAction.showWeekends:
-              return ShowWeekends(
-                showWeekends: settings.showWeekends,
-                onUpdated: (showWeekends) {
-                  _updateLayoutSettings(
-                    context,
-                    showWeekends: showWeekends,
-                    onUpdated: widget.onUpdated,
-                  );
-                },
-              );
-            case CalendarLayoutSettingAction.firstDayOfWeek:
-              return FirstDayOfWeek(
-                firstDayOfWeek: settings.firstDayOfWeek,
-                popoverMutex: popoverMutex,
-                onUpdated: (firstDayOfWeek) {
-                  _updateLayoutSettings(
-                    context,
-                    onUpdated: widget.onUpdated,
-                    firstDayOfWeek: firstDayOfWeek,
-                  );
-                },
-              );
-            case CalendarLayoutSettingAction.layoutField:
-              return LayoutDateField(
-                fieldController: widget.settingContext.fieldController,
-                viewId: widget.settingContext.viewId,
-                fieldId: settings.layoutFieldId,
-                popoverMutex: popoverMutex,
-                onUpdated: (fieldId) {
-                  _updateLayoutSettings(
-                    context,
-                    onUpdated: widget.onUpdated,
-                    layoutFieldId: fieldId,
-                  );
-                },
-              );
-            default:
-              return const SizedBox();
-          }
-        }).toList();
-
-        return SizedBox(
-          width: 200,
-          child: ListView.separated(
-            shrinkWrap: true,
-            controller: ScrollController(),
-            itemCount: items.length,
-            separatorBuilder: (context, index) =>
-                VSpace(GridSize.typeOptionSeparatorHeight),
-            physics: StyledScrollPhysics(),
-            itemBuilder: (BuildContext context, int index) => items[index],
-            padding: const EdgeInsets.all(6.0),
-          ),
-        );
-      },
-    );
-  }
-
-  List<CalendarLayoutSettingAction> _availableCalendarSettings(
-    CalendarLayoutSettingsPB layoutSettings,
-  ) {
-    List<CalendarLayoutSettingAction> settings = [
-      CalendarLayoutSettingAction.layoutField,
-      // CalendarLayoutSettingAction.layoutType,
-      // CalendarLayoutSettingAction.showWeekNumber,
-    ];
-
-    switch (layoutSettings.layoutTy) {
-      case CalendarLayoutPB.DayLayout:
-        // settings.add(CalendarLayoutSettingAction.showTimeLine);
-        break;
-      case CalendarLayoutPB.MonthLayout:
-        settings.addAll([
-          // CalendarLayoutSettingAction.showWeekends,
-          // if (layoutSettings.showWeekends)
-          CalendarLayoutSettingAction.firstDayOfWeek,
-        ]);
-        break;
-      case CalendarLayoutPB.WeekLayout:
-        settings.addAll([
-          // CalendarLayoutSettingAction.showWeekends,
-          // if (layoutSettings.showWeekends)
-          CalendarLayoutSettingAction.firstDayOfWeek,
-          // CalendarLayoutSettingAction.showTimeLine,
-        ]);
-        break;
-    }
-
-    return settings;
-  }
-
-  void _updateLayoutSettings(
-    BuildContext context, {
-    required Function(CalendarLayoutSettingsPB? layoutSettings) onUpdated,
-    bool? showWeekends,
-    bool? showWeekNumbers,
-    int? firstDayOfWeek,
-    String? layoutFieldId,
-  }) {
-    CalendarLayoutSettingsPB setting = context
-        .read<CalendarSettingBloc>()
-        .state
-        .layoutSetting
-        .foldLeft(null, (previous, settings) => settings)!;
-    setting.freeze();
-    setting = setting.rebuild((setting) {
-      if (showWeekends != null) {
-        setting.showWeekends = !showWeekends;
-      }
-      if (showWeekNumbers != null) {
-        setting.showWeekNumbers = !showWeekNumbers;
-      }
-      if (firstDayOfWeek != null) {
-        setting.firstDayOfWeek = firstDayOfWeek;
-      }
-      if (layoutFieldId != null) {
-        setting.layoutFieldId = layoutFieldId;
-      }
-    });
-    context
-        .read<CalendarSettingBloc>()
-        .add(CalendarSettingEvent.updateLayoutSetting(setting));
-    onUpdated(setting);
-  }
-}
-
-class LayoutDateField extends StatelessWidget {
-  final String fieldId;
-  final String viewId;
-  final FieldController fieldController;
-  final PopoverMutex popoverMutex;
-  final Function(String fieldId) onUpdated;
-
-  const LayoutDateField({
-    required this.fieldId,
-    required this.fieldController,
-    required this.viewId,
-    required this.popoverMutex,
-    required this.onUpdated,
-    super.key,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return AppFlowyPopover(
-      direction: PopoverDirection.leftWithTopAligned,
-      constraints: BoxConstraints.loose(const Size(300, 400)),
-      mutex: popoverMutex,
-      popupBuilder: (context) {
-        return BlocProvider(
-          create: (context) => getIt<DatabasePropertyBloc>(
-            param1: viewId,
-            param2: fieldController,
-          )..add(const DatabasePropertyEvent.initial()),
-          child: BlocBuilder<DatabasePropertyBloc, DatabasePropertyState>(
-            builder: (context, state) {
-              final items = state.fieldContexts
-                  .where((field) => field.fieldType == FieldType.DateTime)
-                  .map(
-                (fieldInfo) {
-                  return SizedBox(
-                    height: GridSize.popoverItemHeight,
-                    child: FlowyButton(
-                      text: FlowyText.medium(fieldInfo.name),
-                      onTap: () {
-                        onUpdated(fieldInfo.id);
-                        popoverMutex.close();
-                      },
-                      leftIcon: svgWidget('grid/field/date'),
-                      rightIcon: fieldInfo.id == fieldId
-                          ? svgWidget('grid/checkmark')
-                          : null,
-                    ),
-                  );
-                },
-              ).toList();
-
-              return SizedBox(
-                width: 200,
-                child: ListView.separated(
-                  shrinkWrap: true,
-                  itemBuilder: (context, index) => items[index],
-                  separatorBuilder: (context, index) =>
-                      VSpace(GridSize.typeOptionSeparatorHeight),
-                  itemCount: items.length,
-                ),
-              );
-            },
-          ),
-        );
-      },
-      child: SizedBox(
-        height: GridSize.popoverItemHeight,
-        child: FlowyButton(
-          margin: const EdgeInsets.symmetric(vertical: 2.0, horizontal: 10.0),
-          text: FlowyText.medium(
-            LocaleKeys.calendar_settings_layoutDateField.tr(),
-          ),
-        ),
-      ),
-    );
-  }
-}
-
-class ShowWeekNumber extends StatelessWidget {
-  final bool showWeekNumbers;
-  final Function(bool showWeekNumbers) onUpdated;
-
-  const ShowWeekNumber({
-    required this.showWeekNumbers,
-    required this.onUpdated,
-    super.key,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return _toggleItem(
-      onToggle: (showWeekNumbers) {
-        onUpdated(!showWeekNumbers);
-      },
-      value: showWeekNumbers,
-      text: LocaleKeys.calendar_settings_showWeekNumbers.tr(),
-    );
-  }
-}
-
-class ShowWeekends extends StatelessWidget {
-  final bool showWeekends;
-  final Function(bool showWeekends) onUpdated;
-  const ShowWeekends({
-    super.key,
-    required this.showWeekends,
-    required this.onUpdated,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return _toggleItem(
-      onToggle: (showWeekends) {
-        onUpdated(!showWeekends);
-      },
-      value: showWeekends,
-      text: LocaleKeys.calendar_settings_showWeekends.tr(),
-    );
-  }
-}
-
-class FirstDayOfWeek extends StatelessWidget {
-  final int firstDayOfWeek;
-  final PopoverMutex popoverMutex;
-  final Function(int firstDayOfWeek) onUpdated;
-  const FirstDayOfWeek({
-    super.key,
-    required this.firstDayOfWeek,
-    required this.onUpdated,
-    required this.popoverMutex,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return AppFlowyPopover(
-      direction: PopoverDirection.leftWithTopAligned,
-      constraints: BoxConstraints.loose(const Size(300, 400)),
-      mutex: popoverMutex,
-      popupBuilder: (context) {
-        final symbols =
-            DateFormat.EEEE(context.locale.toLanguageTag()).dateSymbols;
-        // starts from sunday
-        final items = symbols.WEEKDAYS.asMap().entries.map((entry) {
-          final index = (entry.key - 1) % 7;
-          final string = entry.value;
-          return SizedBox(
-            height: GridSize.popoverItemHeight,
-            child: FlowyButton(
-              text: FlowyText.medium(string),
-              onTap: () {
-                onUpdated(index);
-                popoverMutex.close();
-              },
-              rightIcon:
-                  firstDayOfWeek == index ? svgWidget('grid/checkmark') : null,
-            ),
-          );
-        }).toList();
-
-        return SizedBox(
-          width: 100,
-          child: ListView.separated(
-            shrinkWrap: true,
-            itemBuilder: (context, index) => items[index],
-            separatorBuilder: (context, index) =>
-                VSpace(GridSize.typeOptionSeparatorHeight),
-            itemCount: 2,
-          ),
-        );
-      },
-      child: SizedBox(
-        height: GridSize.popoverItemHeight,
-        child: FlowyButton(
-          margin: const EdgeInsets.symmetric(vertical: 2.0, horizontal: 10.0),
-          text: FlowyText.medium(
-            LocaleKeys.calendar_settings_firstDayOfWeek.tr(),
-          ),
-        ),
-      ),
-    );
-  }
-}
-
-Widget _toggleItem({
-  required String text,
-  required bool value,
-  required void Function(bool) onToggle,
-}) {
-  return SizedBox(
-    height: GridSize.popoverItemHeight,
-    child: Padding(
-      padding: const EdgeInsets.symmetric(vertical: 2.0, horizontal: 10.0),
-      child: Row(
-        children: [
-          FlowyText.medium(text),
-          const Spacer(),
-          Toggle(
-            value: value,
-            onChanged: (value) => onToggle(!value),
-            style: ToggleStyle.big,
-            padding: EdgeInsets.zero,
-          ),
-        ],
-      ),
-    ),
-  );
-}
-
-enum CalendarLayoutSettingAction {
-  layoutField,
-  layoutType,
-  showWeekends,
-  firstDayOfWeek,
-  showWeekNumber,
-  showTimeLine,
-}
@@ -1,112 +0,0 @@
-import 'package:appflowy/generated/locale_keys.g.dart';
-import 'package:appflowy/plugins/database_view/application/field/field_controller.dart';
-import 'package:appflowy/plugins/database_view/calendar/application/calendar_setting_bloc.dart';
-import 'package:appflowy/plugins/database_view/grid/presentation/layout/sizes.dart';
-import 'package:appflowy_backend/protobuf/flowy-database/protobuf.dart';
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flowy_infra_ui/style_widget/button.dart';
-import 'package:flowy_infra_ui/style_widget/scrolling/styled_list.dart';
-import 'package:flowy_infra_ui/style_widget/text.dart';
-import 'package:flowy_infra_ui/widget/spacing.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:styled_widget/styled_widget.dart';
-
-import 'calendar_layout_setting.dart';
-
-/// The highest-level widget shown in the popover triggered by clicking the
-/// "Settings" button. Shows [AllCalendarSettings] by default, but replaces its
-/// contents with the submenu when a category is selected.
-class CalendarSetting extends StatelessWidget {
-  final CalendarSettingContext settingContext;
-  final CalendarLayoutSettingsPB? layoutSettings;
-  final Function(CalendarLayoutSettingsPB? layoutSettings) onUpdated;
-
-  const CalendarSetting({
-    required this.onUpdated,
-    required this.layoutSettings,
-    required this.settingContext,
-    super.key,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocProvider<CalendarSettingBloc>(
-      create: (context) => CalendarSettingBloc(layoutSettings: layoutSettings),
-      child: BlocBuilder<CalendarSettingBloc, CalendarSettingState>(
-        builder: (context, state) {
-          final CalendarSettingAction? action =
-              state.selectedAction.foldLeft(null, (previous, action) => action);
-          switch (action) {
-            case CalendarSettingAction.layout:
-              return CalendarLayoutSetting(
-                onUpdated: onUpdated,
-                settingContext: settingContext,
-              );
-            default:
-              return const AllCalendarSettings().padding(all: 6.0);
-          }
-        },
-      ),
-    );
-  }
-}
-
-/// Shows all of the available categories of settings that can be set here.
-/// For now, this only includes the Layout category.
-class AllCalendarSettings extends StatelessWidget {
-  const AllCalendarSettings({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    final items = CalendarSettingAction.values
-        .map((e) => _settingItem(context, e))
-        .toList();
-
-    return SizedBox(
-      width: 140,
-      child: ListView.separated(
-        shrinkWrap: true,
-        controller: ScrollController(),
-        itemCount: items.length,
-        separatorBuilder: (context, index) =>
-            VSpace(GridSize.typeOptionSeparatorHeight),
-        physics: StyledScrollPhysics(),
-        itemBuilder: (BuildContext context, int index) => items[index],
-      ),
-    );
-  }
-
-  Widget _settingItem(BuildContext context, CalendarSettingAction action) {
-    return SizedBox(
-      height: GridSize.popoverItemHeight,
-      child: FlowyButton(
-        text: FlowyText.medium(action.title()),
-        onTap: () {
-          context
-              .read<CalendarSettingBloc>()
-              .add(CalendarSettingEvent.performAction(action));
-        },
-      ),
-    );
-  }
-}
-
-extension _SettingExtension on CalendarSettingAction {
-  String title() {
-    switch (this) {
-      case CalendarSettingAction.layout:
-        return LocaleKeys.grid_settings_layout.tr();
-    }
-  }
-}
-
-class CalendarSettingContext {
-  final String viewId;
-  final FieldController fieldController;
-
-  CalendarSettingContext({
-    required this.viewId,
-    required this.fieldController,
-  });
-}
@@ -1,14 +1,5 @@
-import 'package:appflowy/generated/locale_keys.g.dart';
-import 'package:appflowy/plugins/database_view/grid/presentation/layout/sizes.dart';
-import 'package:appflowy_popover/appflowy_popover.dart';
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flowy_infra/theme_extension.dart';
-import 'package:flowy_infra_ui/flowy_infra_ui.dart';
+import 'package:flowy_infra_ui/style_widget/button.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-
-import '../../application/calendar_bloc.dart';
-import 'calendar_setting.dart';

 class CalendarToolbar extends StatelessWidget {
  const CalendarToolbar({super.key});
@@ -19,65 +10,14 @@ class CalendarToolbar extends StatelessWidget {
      height: 40,
      child: Row(
        mainAxisAlignment: MainAxisAlignment.end,
-        children: [
-          _SettingButton(),
+        children: const [
+          FlowyTextButton(
+            "Settings",
+            fillColor: Colors.transparent,
+            padding: EdgeInsets.symmetric(horizontal: 6, vertical: 2),
+          ),
        ],
      ),
    );
  }
 }
-
-class _SettingButton extends StatefulWidget {
-  @override
-  State<StatefulWidget> createState() => _SettingButtonState();
-}
-
-class _SettingButtonState extends State<_SettingButton> {
-  late PopoverController popoverController;
-
-  @override
-  void initState() {
-    popoverController = PopoverController();
-    super.initState();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return AppFlowyPopover(
-      controller: popoverController,
-      direction: PopoverDirection.bottomWithRightAligned,
-      triggerActions: PopoverTriggerFlags.none,
-      constraints: BoxConstraints.loose(const Size(300, 400)),
-      margin: EdgeInsets.zero,
-      child: FlowyTextButton(
-        LocaleKeys.settings_title.tr(),
-        fillColor: Colors.transparent,
-        hoverColor: AFThemeExtension.of(context).lightGreyHover,
-        padding: GridSize.typeOptionContentInsets,
-        onPressed: () => popoverController.show(),
-      ),
-      popupBuilder: (BuildContext popoverContext) {
-        final bloc = context.watch<CalendarBloc>();
-        final settingContext = CalendarSettingContext(
-          viewId: bloc.viewId,
-          fieldController: bloc.fieldController,
-        );
-        return CalendarSetting(
-          settingContext: settingContext,
-          layoutSettings: bloc.state.settings.fold(
-            () => null,
-            (settings) => settings,
-          ),
-          onUpdated: (layoutSettings) {
-            if (layoutSettings == null) {
-              return;
-            }
-            context
-                .read<CalendarBloc>()
-                .add(CalendarEvent.updateCalendarLayoutSetting(layoutSettings));
-          },
-        );
-      }, // use blocbuilder
-    );
-  }
-}
@@ -45,12 +45,10 @@ class CheckboxFilterEditorBloc
          didReceiveFilter: (FilterPB filter) {
            final filterInfo = state.filterInfo.copyWith(filter: filter);
            final checkboxFilter = filterInfo.checkboxFilter()!;
-            emit(
-              state.copyWith(
-                filterInfo: filterInfo,
-                filter: checkboxFilter,
-              ),
-            );
+            emit(state.copyWith(
+              filterInfo: filterInfo,
+              filter: checkboxFilter,
+            ));
          },
        );
      },
@@ -81,8 +79,7 @@ class CheckboxFilterEditorEvent with _$CheckboxFilterEditorEvent {
  const factory CheckboxFilterEditorEvent.didReceiveFilter(FilterPB filter) =
      _DidReceiveFilter;
  const factory CheckboxFilterEditorEvent.updateCondition(
-    CheckboxFilterConditionPB condition,
-  ) = _UpdateCondition;
+      CheckboxFilterConditionPB condition) = _UpdateCondition;
  const factory CheckboxFilterEditorEvent.delete() = _Delete;
 }

@@ -46,12 +46,10 @@ class ChecklistFilterEditorBloc
          didReceiveFilter: (FilterPB filter) {
            final filterInfo = state.filterInfo.copyWith(filter: filter);
            final checklistFilter = filterInfo.checklistFilter()!;
-            emit(
-              state.copyWith(
-                filterInfo: filterInfo,
-                filter: checklistFilter,
-              ),
-            );
+            emit(state.copyWith(
+              filterInfo: filterInfo,
+              filter: checklistFilter,
+            ));
          },
        );
      },
@@ -84,8 +82,7 @@ class ChecklistFilterEditorEvent with _$ChecklistFilterEditorEvent {
  const factory ChecklistFilterEditorEvent.didReceiveFilter(FilterPB filter) =
      _DidReceiveFilter;
  const factory ChecklistFilterEditorEvent.updateCondition(
-    ChecklistFilterConditionPB condition,
-  ) = _UpdateCondition;
+      ChecklistFilterConditionPB condition) = _UpdateCondition;
  const factory ChecklistFilterEditorEvent.delete() = _Delete;
 }

@@ -14,13 +14,11 @@ class GridFilterMenuBloc
  void Function(List<FieldInfo>)? _onFieldFn;

  GridFilterMenuBloc({required this.viewId, required this.fieldController})
-      : super(
-          GridFilterMenuState.initial(
-            viewId,
-            fieldController.filterInfos,
-            fieldController.fieldInfos,
-          ),
-        ) {
+      : super(GridFilterMenuState.initial(
+          viewId,
+          fieldController.filterInfos,
+          fieldController.fieldInfos,
+        )) {
    on<GridFilterMenuEvent>(
      (event, emit) async {
        event.when(
@@ -84,8 +82,7 @@ class GridFilterMenuBloc
 class GridFilterMenuEvent with _$GridFilterMenuEvent {
  const factory GridFilterMenuEvent.initial() = _Initial;
  const factory GridFilterMenuEvent.didReceiveFilters(
-    List<FilterInfo> filters,
-  ) = _DidReceiveFilters;
+      List<FilterInfo> filters) = _DidReceiveFilters;
  const factory GridFilterMenuEvent.didReceiveFields(List<FieldInfo> fields) =
      _DidReceiveFields;
  const factory GridFilterMenuEvent.toggleMenu() = _SetMenuVisibility;
@@ -61,12 +61,10 @@ class SelectOptionFilterEditorBloc
          didReceiveFilter: (FilterPB filter) {
            final filterInfo = state.filterInfo.copyWith(filter: filter);
            final selectOptionFilter = filterInfo.selectOptionFilter()!;
-            emit(
-              state.copyWith(
-                filterInfo: filterInfo,
-                filter: selectOptionFilter,
-              ),
-            );
+            emit(state.copyWith(
+              filterInfo: filterInfo,
+              filter: selectOptionFilter,
+            ));
          },
          updateFilterDescription: (String desc) {
            emit(state.copyWith(filterDesc: desc));
@@ -114,17 +112,13 @@ class SelectOptionFilterEditorBloc
 class SelectOptionFilterEditorEvent with _$SelectOptionFilterEditorEvent {
  const factory SelectOptionFilterEditorEvent.initial() = _Initial;
  const factory SelectOptionFilterEditorEvent.didReceiveFilter(
-    FilterPB filter,
-  ) = _DidReceiveFilter;
+      FilterPB filter) = _DidReceiveFilter;
  const factory SelectOptionFilterEditorEvent.updateCondition(
-    SelectOptionConditionPB condition,
-  ) = _UpdateCondition;
+      SelectOptionConditionPB condition) = _UpdateCondition;
  const factory SelectOptionFilterEditorEvent.updateContent(
-    List<String> optionIds,
-  ) = _UpdateContent;
+      List<String> optionIds) = _UpdateContent;
  const factory SelectOptionFilterEditorEvent.updateFilterDescription(
-    String desc,
-  ) = _UpdateDesc;
+      String desc) = _UpdateDesc;
  const factory SelectOptionFilterEditorEvent.delete() = _Delete;
 }

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:appflowy/plugins/database_view/grid/presentation/widgets/filter/choicechip/select_option/select_option_loader.dart';
 import 'package:appflowy_backend/protobuf/flowy-database/field_entities.pb.dart';
 import 'package:appflowy_backend/protobuf/flowy-database/select_type_option.pb.dart';
@@ -43,22 +45,15 @@ class SelectOptionFilterListBloc<T>
          didReceiveOptions: (newOptions) {
            List<SelectOptionPB> options = List.from(newOptions);
            options.retainWhere(
-              (element) => element.name.contains(state.predicate),
-            );
+                (element) => element.name.contains(state.predicate));

            final visibleOptions = options.map((option) {
              return VisibleSelectOption(
-                option,
-                state.selectedOptionIds.contains(option.id),
-              );
+                  option, state.selectedOptionIds.contains(option.id));
            }).toList();

-            emit(
-              state.copyWith(
-                options: options,
-                visibleOptions: visibleOptions,
-              ),
-            );
+            emit(state.copyWith(
+                options: options, visibleOptions: visibleOptions));
          },
          filterOption: (optionName) {
            _updateSelectOptions(predicate: optionName, emit: emit);
@@ -68,6 +63,11 @@ class SelectOptionFilterListBloc<T>
    );
  }

+  @override
+  Future<void> close() async {
+    return super.close();
+  }
+
  void _updateSelectOptions({
    String? predicate,
    Set<String>? selectedOptionIds,
@@ -78,13 +78,11 @@ class SelectOptionFilterListBloc<T>
      selectedOptionIds ?? state.selectedOptionIds,
    );

-    emit(
-      state.copyWith(
-        predicate: predicate ?? state.predicate,
-        visibleOptions: visibleOptions,
-        selectedOptionIds: selectedOptionIds ?? state.selectedOptionIds,
-      ),
-    );
+    emit(state.copyWith(
+      predicate: predicate ?? state.predicate,
+      visibleOptions: visibleOptions,
+      selectedOptionIds: selectedOptionIds ?? state.selectedOptionIds,
+    ));
  }

  List<VisibleSelectOption> _makeVisibleOptions(
@@ -114,14 +112,11 @@ class SelectOptionFilterListBloc<T>
 class SelectOptionFilterListEvent with _$SelectOptionFilterListEvent {
  const factory SelectOptionFilterListEvent.initial() = _Initial;
  const factory SelectOptionFilterListEvent.selectOption(
-    SelectOptionPB option,
-  ) = _SelectOption;
+      SelectOptionPB option) = _SelectOption;
  const factory SelectOptionFilterListEvent.unselectOption(
-    SelectOptionPB option,
-  ) = _UnSelectOption;
+      SelectOptionPB option) = _UnSelectOption;
  const factory SelectOptionFilterListEvent.didReceiveOptions(
-    List<SelectOptionPB> options,
-  ) = _DidReceiveOptions;
+      List<SelectOptionPB> options) = _DidReceiveOptions;
  const factory SelectOptionFilterListEvent.filterOption(String optionName) =
      _SelectOptionFilter;
 }
@@ -54,12 +54,10 @@ class TextFilterEditorBloc
          didReceiveFilter: (FilterPB filter) {
            final filterInfo = state.filterInfo.copyWith(filter: filter);
            final textFilter = filterInfo.textFilter()!;
-            emit(
-              state.copyWith(
-                filterInfo: filterInfo,
-                filter: textFilter,
-              ),
-            );
+            emit(state.copyWith(
+              filterInfo: filterInfo,
+              filter: textFilter,
+            ));
          },
        );
      },
@@ -90,8 +88,7 @@ class TextFilterEditorEvent with _$TextFilterEditorEvent {
  const factory TextFilterEditorEvent.didReceiveFilter(FilterPB filter) =
      _DidReceiveFilter;
  const factory TextFilterEditorEvent.updateCondition(
-    TextFilterConditionPB condition,
-  ) = _UpdateCondition;
+      TextFilterConditionPB condition) = _UpdateCondition;
  const factory TextFilterEditorEvent.updateContent(String content) =
      _UpdateContent;
  const factory TextFilterEditorEvent.delete() = _Delete;
@@ -8,11 +8,9 @@ class GridAccessoryMenuBloc
  final String viewId;

  GridAccessoryMenuBloc({required this.viewId})
-      : super(
-          GridAccessoryMenuState.initial(
-            viewId,
-          ),
-        ) {
+      : super(GridAccessoryMenuState.initial(
+          viewId,
+        )) {
    on<GridAccessoryMenuEvent>(
      (event, emit) async {
        event.when(
@@ -39,20 +39,16 @@ class GridBloc extends Bloc<GridEvent, GridState> {
            emit(state.copyWith(grid: Some(grid)));
          },
          didReceiveFieldUpdate: (fields) {
-            emit(
-              state.copyWith(
-                fields: GridFieldEquatable(fields),
-              ),
-            );
+            emit(state.copyWith(
+              fields: GridFieldEquatable(fields),
+            ));
          },
          didReceiveRowUpdate: (newRowInfos, reason) {
-            emit(
-              state.copyWith(
-                rowInfos: newRowInfos,
-                rowCount: newRowInfos.length,
-                reason: reason,
-              ),
-            );
+            emit(state.copyWith(
+              rowInfos: newRowInfos,
+              rowCount: newRowInfos.length,
+              reason: reason,
+            ));
          },
        );
      },
@@ -76,7 +72,7 @@ class GridBloc extends Bloc<GridEvent, GridState> {
          add(GridEvent.didReceiveGridUpdate(database));
        }
      },
-      onRowsChanged: (rowInfos, _, reason) {
+      onRowsChanged: (rowInfos, reason) {
        if (!isClosed) {
          add(GridEvent.didReceiveRowUpdate(rowInfos, reason));
        }
@@ -150,8 +146,7 @@ class GridState with _$GridState {
 class GridLoadingState with _$GridLoadingState {
  const factory GridLoadingState.loading() = _Loading;
  const factory GridLoadingState.finish(
-    Either<Unit, FlowyError> successOrFail,
-  ) = _Finish;
+      Either<Unit, FlowyError> successOrFail) = _Finish;
 }

 class GridFieldEquatable extends Equatable {
@@ -40,9 +40,7 @@ class GridHeaderBloc extends Bloc<GridHeaderEvent, GridHeaderState> {
  }

  Future<void> _moveField(
-    _MoveField value,
-    Emitter<GridHeaderState> emit,
-  ) async {
+      _MoveField value, Emitter<GridHeaderState> emit) async {
    final fields = List<FieldInfo>.from(state.fields);
    fields.insert(value.toIndex, fields.removeAt(value.fromIndex));
    emit(state.copyWith(fields: fields));
@@ -63,6 +61,11 @@ class GridHeaderBloc extends Bloc<GridHeaderEvent, GridHeaderState> {
      listenWhen: () => !isClosed,
    );
  }
+
+  @override
+  Future<void> close() async {
+    return super.close();
+  }
 }

@freezed
@@ -71,10 +74,7 @@ class GridHeaderEvent with _$GridHeaderEvent {
  const factory GridHeaderEvent.didReceiveFieldUpdate(List<FieldInfo> fields) =
      _DidReceiveFieldUpdate;
  const factory GridHeaderEvent.moveField(
-    FieldPB field,
-    int fromIndex,
-    int toIndex,
-  ) = _MoveField;
+      FieldPB field, int fromIndex, int toIndex) = _MoveField;
 }

@freezed
@@ -2,6 +2,7 @@ import 'package:appflowy_backend/log.dart';
 import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
+import 'dart:async';
 import 'package:dartz/dartz.dart';

 import '../../../application/row/row_cache.dart';
@@ -33,6 +34,11 @@ class RowActionSheetBloc
    );
  }

+  @override
+  Future<void> close() async {
+    return super.close();
+  }
+
  void logResult(Either<Unit, FlowyError> result) {
    result.fold((l) => null, (err) => Log.error(err));
  }
@@ -35,13 +35,11 @@ class RowBloc extends Bloc<RowEvent, RowState> {
            final cells = cellByFieldId.values
                .map((e) => GridCellEquatable(e.fieldInfo))
                .toList();
-            emit(
-              state.copyWith(
-                cellByFieldId: cellByFieldId,
-                cells: UnmodifiableListView(cells),
-                changeReason: reason,
-              ),
-            );
+            emit(state.copyWith(
+              cellByFieldId: cellByFieldId,
+              cells: UnmodifiableListView(cells),
+              changeReason: reason,
+            ));
          },
        );
      },
@@ -70,9 +68,8 @@ class RowEvent with _$RowEvent {
  const factory RowEvent.initial() = _InitialRow;
  const factory RowEvent.createRow() = _CreateRow;
  const factory RowEvent.didReceiveCells(
-    CellByFieldId cellsByFieldId,
-    RowsChangedReason reason,
-  ) = _DidReceiveCells;
+          CellByFieldId cellsByFieldId, RowsChangedReason reason) =
+      _DidReceiveCells;
 }

@freezed
@@ -59,8 +59,7 @@ class RowDetailEvent with _$RowDetailEvent {
  const factory RowDetailEvent.initial() = _Initial;
  const factory RowDetailEvent.deleteField(String fieldId) = _DeleteField;
  const factory RowDetailEvent.didReceiveCellDatas(
-    List<CellIdentifier> gridCells,
-  ) = _DidReceiveCellDatas;
+      List<CellIdentifier> gridCells) = _DidReceiveCellDatas;
 }

@freezed
Author	SHA1	Message	Date
Lucas.Xu	565485265b	chore: prerelease 0.1.2 (#2134 )	2023-03-29 15:14:28 +08:00
Lucas.Xu	f6f615a54c	chore: release 0.1.2 (#2129 )	2023-03-28 18:37:08 +08:00
Nathan.fooo	17d88f2ad3	fix: update calendar selected range (#2123 )	2023-03-28 14:34:00 +08:00
Nathan.fooo	8f66246e25	fix: modify same database by duplicate view (#2121 )	2023-03-28 13:00:20 +08:00
Lucas.Xuandvedon	063ec186bb	Rename project and upgrade windows project (#2072 ) * chore: rename product name * chore: upgrade windows project to latest template --------- Co-authored-by: vedon <vedon.fu@gmail.com>	2023-03-22 13:12:16 +08:00
Annie	ec444d4a00	chore: add release changes	2023-03-21 20:22:16 +08:00
Lucas.Xu	95475cb870	Fix some known issue for release/0.1.1 (#2061 ) * fix: only show discard dialog when prompt text is not empty * fix: auto completion node widget text overflow * chore: update bundle name and copyright	2023-03-21 15:33:19 +08:00
Lucas.Xu	0520855925	chore: update languages file (#2034 )	2023-03-20 18:43:31 +08:00
Lucas.Xu	61704f6d4a	Fix release v0.1.1 known issues. (#2025 ) * feat: optimize the smart edit user-experience * chore: update language files * feat: show discard dialog when users tap blank are that out of ai plugins * fix: toolbar_service test fail	2023-03-20 13:49:20 +08:00
Nathan.fooo	b85990e453	feat: migration database (#2009 ) * feat: migration database * ci: fix tauri ci * feat: migrate database view * ci: fix ci	2023-03-18 07:21:28 +08:00
Lucas.Xu	b0d525a48f	Merge pull request #2004 from AppFlowy-IO/chore/0.1.1 release 0.1.1	2023-03-17 13:54:56 +08:00
Nathan.fooo	bf048ffc0d	fix: paser workspce pb (#2005 )	2023-03-17 13:47:27 +08:00
Lucas.Xu	1f44d4de33	fix(test): test replaceTexts, textNodes.length > texts.length	2023-03-16 21:14:45 +08:00
Lucas.Xu	653f88033e	feat: improve the smart edit user-experience	2023-03-16 18:40:20 +08:00
Lucas.Xu	0c88c7ce2f	fix: windows package build error	2023-03-16 15:24:45 +08:00
Lucas.Xu	f38688b17e	chore: update release version to 0.1.1	2023-03-16 14:26:22 +08:00
Lucas.Xu	1a3701feaf	feat: #2003 Entering an OpenAI key should auto-save	2023-03-16 14:26:05 +08:00
Lucas.Xu	1b86587875	chore: update language files	2023-03-16 14:25:39 +08:00
Lucas.Xu	120db6805f	feat: open gitbook openAI link when tapping learn more button (#2002 )	2023-03-16 12:35:20 +08:00
Lucas.Xu	6b14983f2b	fix: #1997 Exception trhown after inserting '/' slash in middle of text (#1998 )	2023-03-15 17:48:56 +08:00
Lucas.Xu	9a4cde07b6	Merge pull request #1991 from AppFlowy-IO/fix_0_1_1 Fix release/0.1.1 known issues.	2023-03-14 17:17:47 +08:00
Lucas.Xu	d6d591f359	fix: select all shouldn't include the cover plugin	2023-03-14 16:41:37 +08:00
Lucas.Xu	0570615414	fix: #1975 Set a height limit for the AI prompt window where it displays the results	2023-03-14 15:57:26 +08:00
Lucas.Xu	609bf2a4ce	fix: #1968 UI inconsistency	2023-03-14 11:44:02 +08:00
Lucas.Xu	75231e606c	fix: flutter analyze	2023-03-13 22:28:56 +08:00
Lucas.Xu	dd9c3dd2a3	fix: #1967 the summarize feature generates duplicate answers	2023-03-13 21:35:36 +08:00
Lucas.Xu	4821d7ea65	fix: #1966 the loading icon too close to the edge	2023-03-13 17:53:22 +08:00
Lucas.Xu	874d1e86c2	fix: #1964 Text on the UI	2023-03-13 17:44:59 +08:00
Lucas.Xu	b7ec7ce32e	fix: #1962 Disable but still show the AI assistants icon in the toolbar menu when an OpenAI key is not provided	2023-03-13 17:28:10 +08:00
Lucas.Xu	0141538be8	fix: #1973 Using the mouse to highlight text very easy to miss the first letter	2023-03-13 14:35:11 +08:00
Lucas.Xu	dcf48ceb50	fix: #1976 Adding a cover image via upload doesn't work	2023-03-13 14:30:52 +08:00