[PR #7778] [MERGED] feat: merge develop branch #8106

Closed
opened 2026-03-23 23:22:38 +00:00 by mirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/AppFlowy-IO/AppFlowy/pull/7778
Author: @richardshiue
Created: 4/18/2025
Status: Merged
Merged: 4/18/2025
Merged by: @richardshiue

Base: mainHead: feat/custom-prompt


📝 Commits (7)

📊 Changes

84 files changed (+5335 additions, -1633 deletions)

View changed files

📝 frontend/appflowy_flutter/lib/ai/widgets/prompt_input/select_model_menu.dart (+42 -36)
📝 frontend/appflowy_flutter/lib/plugins/document/presentation/editor_page.dart (+1 -1)
📝 frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/ai/ai_writer_toolbar_item.dart (+2 -2)
📝 frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/desktop_toolbar/link/link_create_menu.dart (+1 -1)
📝 frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/link_embed/link_embed_menu.dart (+3 -3)
📝 frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/link_preview/custom_link_preview.dart (+1 -1)
📝 frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/link_preview/paste_as/paste_as_menu.dart (+1 -1)
📝 frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/toolbar_item/custom_format_toolbar_items.dart (+1 -1)
📝 frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/toolbar_item/custom_hightlight_color_toolbar_item.dart (+1 -1)
📝 frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/toolbar_item/custom_link_toolbar_item.dart (+1 -1)
📝 frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/toolbar_item/custom_text_align_toolbar_item.dart (+1 -1)
📝 frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/toolbar_item/custom_text_color_toolbar_item.dart (+1 -1)
📝 frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/toolbar_item/text_heading_toolbar_item.dart (+1 -1)
📝 frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/toolbar_item/text_suggestions_toolbar_item.dart (+1 -1)
📝 frontend/appflowy_flutter/lib/startup/tasks/app_widget.dart (+27 -20)
📝 frontend/appflowy_flutter/lib/user/presentation/screens/sign_in_screen/widgets/continue_with/continue_with_email_and_password.dart (+0 -1)
📝 frontend/appflowy_flutter/lib/user/presentation/screens/sign_in_screen/widgets/continue_with/continue_with_magic_link_or_passcode_page.dart (+0 -1)
📝 frontend/appflowy_flutter/lib/workspace/application/settings/appearance/mobile_appearance.dart (+6 -11)
frontend/appflowy_flutter/lib/workspace/presentation/widgets/dialog_v2.dart (+109 -0)
📝 frontend/appflowy_flutter/packages/appflowy_ui/example/lib/main.dart (+17 -9)

...and 64 more files

📄 Description

NOTE: The commits might not match the original PRs due to merge conflicts. Please refer to each commit, one by one.

Feature Preview


PR Checklist

  • My code adheres to AppFlowy's Conventions
  • 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.

Summary by Sourcery

Refactor and enhance the AppFlowy UI theme system with improved theming infrastructure, new modal components, and expanded design system support

New Features:

  • Introduce a new modal component with configurable dimensions and flexible layout
  • Add support for animated theme transitions
  • Create a new dialog utility with customizable actions

Enhancements:

  • Restructure theme system to support more granular color and style definitions
  • Improve base button component with focus and hover state handling
  • Enhance text field component with size variants
  • Implement a more robust theme interpolation mechanism

Chores:

  • Reorganize theme-related files and directories
  • Remove deprecated theme-related code
  • Add script for generating theme tokens

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/AppFlowy-IO/AppFlowy/pull/7778 **Author:** [@richardshiue](https://github.com/richardshiue) **Created:** 4/18/2025 **Status:** ✅ Merged **Merged:** 4/18/2025 **Merged by:** [@richardshiue](https://github.com/richardshiue) **Base:** `main` ← **Head:** `feat/custom-prompt` --- ### 📝 Commits (7) - [`d8401e0`](https://github.com/AppFlowy-IO/AppFlowy/commit/d8401e09c9c48468cb9c61b0c77809dc74c19a0c) feat: implement keyboard triggering on buttons and add focus state (#7724) - [`068f93c`](https://github.com/AppFlowy-IO/AppFlowy/commit/068f93c258eaad91d9a4025598d673fd1e1cacf5) feat: add shadow tokens (#7726) - [`e1bfb70`](https://github.com/AppFlowy-IO/AppFlowy/commit/e1bfb7095b7d296350ef3a9d0bcb6232960a4f43) feat: improve select modal button (#7736) - [`b12bd8e`](https://github.com/AppFlowy-IO/AppFlowy/commit/b12bd8ee8562bfffcea0778f296ff2f5eac7c7fd) feat: add medium sized text field (#7737) - [`54b5e24`](https://github.com/AppFlowy-IO/AppFlowy/commit/54b5e248e3aa7eccfdcff79b1de2abdea1a83b39) feat: implement modal (#7750) - [`889756e`](https://github.com/AppFlowy-IO/AppFlowy/commit/889756ebb09272447aec8e00b7a7d4b29435d288) refactor: use script to generate design tokens (#7751) - [`28e89be`](https://github.com/AppFlowy-IO/AppFlowy/commit/28e89beb432605d01c46db9829c866c056bf32a7) feat: appflowy theme lerp (#7771) ### 📊 Changes **84 files changed** (+5335 additions, -1633 deletions) <details> <summary>View changed files</summary> 📝 `frontend/appflowy_flutter/lib/ai/widgets/prompt_input/select_model_menu.dart` (+42 -36) 📝 `frontend/appflowy_flutter/lib/plugins/document/presentation/editor_page.dart` (+1 -1) 📝 `frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/ai/ai_writer_toolbar_item.dart` (+2 -2) 📝 `frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/desktop_toolbar/link/link_create_menu.dart` (+1 -1) 📝 `frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/link_embed/link_embed_menu.dart` (+3 -3) 📝 `frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/link_preview/custom_link_preview.dart` (+1 -1) 📝 `frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/link_preview/paste_as/paste_as_menu.dart` (+1 -1) 📝 `frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/toolbar_item/custom_format_toolbar_items.dart` (+1 -1) 📝 `frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/toolbar_item/custom_hightlight_color_toolbar_item.dart` (+1 -1) 📝 `frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/toolbar_item/custom_link_toolbar_item.dart` (+1 -1) 📝 `frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/toolbar_item/custom_text_align_toolbar_item.dart` (+1 -1) 📝 `frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/toolbar_item/custom_text_color_toolbar_item.dart` (+1 -1) 📝 `frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/toolbar_item/text_heading_toolbar_item.dart` (+1 -1) 📝 `frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/toolbar_item/text_suggestions_toolbar_item.dart` (+1 -1) 📝 `frontend/appflowy_flutter/lib/startup/tasks/app_widget.dart` (+27 -20) 📝 `frontend/appflowy_flutter/lib/user/presentation/screens/sign_in_screen/widgets/continue_with/continue_with_email_and_password.dart` (+0 -1) 📝 `frontend/appflowy_flutter/lib/user/presentation/screens/sign_in_screen/widgets/continue_with/continue_with_magic_link_or_passcode_page.dart` (+0 -1) 📝 `frontend/appflowy_flutter/lib/workspace/application/settings/appearance/mobile_appearance.dart` (+6 -11) ➕ `frontend/appflowy_flutter/lib/workspace/presentation/widgets/dialog_v2.dart` (+109 -0) 📝 `frontend/appflowy_flutter/packages/appflowy_ui/example/lib/main.dart` (+17 -9) _...and 64 more files_ </details> ### 📄 Description NOTE: The commits might not match the original PRs due to merge conflicts. Please refer to each commit, one by one. ### 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 - [x] My code adheres to [AppFlowy's Conventions](https://docs.appflowy.io/docs/documentation/software-contributions/conventions) - [x] I've listed at least one issue that this PR fixes in the description above. - [x] I've added a test(s) to validate changes in this PR, or this PR only contains semantic changes. - [x] All existing tests are passing. ## Summary by Sourcery Refactor and enhance the AppFlowy UI theme system with improved theming infrastructure, new modal components, and expanded design system support New Features: - Introduce a new modal component with configurable dimensions and flexible layout - Add support for animated theme transitions - Create a new dialog utility with customizable actions Enhancements: - Restructure theme system to support more granular color and style definitions - Improve base button component with focus and hover state handling - Enhance text field component with size variants - Implement a more robust theme interpolation mechanism Chores: - Reorganize theme-related files and directories - Remove deprecated theme-related code - Add script for generating theme tokens --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
mirror 2026-03-23 23:22:38 +00:00
Sign in to join this conversation.
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
AppFlowy-IO/AppFlowy#8106
No description provided.