AppFlowy-IO · richardshiue · Apr 21, 2025
diff --git a/frontend/appflowy_flutter/lib/ai/widgets/ai_prompt_modal/ai_prompt_category_list.dart b/frontend/appflowy_flutter/lib/ai/widgets/ai_prompt_modal/ai_prompt_category_list.dart
@@ -121,9 +121,9 @@ class AiPromptCategoryList extends StatelessWidget {
           return theme.fillColorScheme.themeSelect;
         }
         if (isHovering) {
-          return theme.fillColorScheme.primaryAlpha5;
+          return theme.fillColorScheme.contentHover;
         }
-        return Colors.transparent;
+        return theme.fillColorScheme.content;
       },
     );
   }
@@ -175,9 +175,9 @@ class AiPromptCategoryItem extends StatelessWidget {
           return theme.fillColorScheme.themeSelect;
         }
         if (isHovering) {
-          return theme.fillColorScheme.primaryAlpha5;
+          return theme.fillColorScheme.contentHover;
         }
-        return Colors.transparent;
+        return theme.fillColorScheme.content;
       },
     );
   }

diff --git a/frontend/appflowy_flutter/lib/ai/widgets/ai_prompt_modal/ai_prompt_preview.dart b/frontend/appflowy_flutter/lib/ai/widgets/ai_prompt_modal/ai_prompt_preview.dart
@@ -120,7 +120,7 @@ class _PromptContent extends StatelessWidget {
         spans.add(
           TextSpan(
             text: part,
-            style: TextStyle(color: theme.textColorScheme.purple),
+            style: TextStyle(color: theme.textColorScheme.featured),
           ),
         );
       } else {

diff --git a/frontend/appflowy_flutter/lib/ai/widgets/ai_prompt_modal/ai_prompt_visible_list.dart b/frontend/appflowy_flutter/lib/ai/widgets/ai_prompt_modal/ai_prompt_visible_list.dart
@@ -201,8 +201,8 @@ class _AiPromptListItemState extends State<_AiPromptListItem> {
                           ? theme.borderColorScheme.themeThickHover
                           : theme.borderColorScheme.themeThick
                       : isHovering
-                          ? theme.borderColorScheme.greyTertiaryHover
-                          : theme.borderColorScheme.greyTertiary,
+                          ? theme.borderColorScheme.primaryHover
+                          : theme.borderColorScheme.primary,
                 ),
                 color: theme.surfaceColorScheme.primary,
               ),

diff --git a/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/prompt_input_text_controller.dart b/frontend/appflowy_flutter/lib/ai/widgets/prompt_input/prompt_input_text_controller.dart
@@ -56,8 +56,8 @@ class AiPromptInputTextEditingController extends TextEditingController {
           TextSpan(
             text: restore(string),
             style: theme.textStyle.body.standard().copyWith(
-                  color: theme.textColorScheme.purple,
-                  backgroundColor: theme.fillColorScheme.purpleLight,
+                  color: theme.textColorScheme.featured,
+                  backgroundColor: theme.fillColorScheme.featuredLight,
                 ),
           ),
         );

diff --git a/.../appflowy_flutter/lib/mobile/presentation/bottom_sheet/bottom_sheet_edit_link_widget.dart b/.../appflowy_flutter/lib/mobile/presentation/bottom_sheet/bottom_sheet_edit_link_widget.dart
@@ -400,7 +400,7 @@ class _MobileBottomSheetEditLinkWidgetState
   BoxDecoration buildBorderDecoration() {
     return BoxDecoration(
       borderRadius: BorderRadius.circular(theme.borderRadius.l),
-      border: Border.all(color: theme.borderColorScheme.greyPrimary),
+      border: Border.all(color: theme.borderColorScheme.primary),
     );
   }
 }
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/search/mobile_search_textfield.dart b/frontend/appflowy_flutter/lib/mobile/presentation/search/mobile_search_textfield.dart
@@ -108,7 +108,7 @@ class _MobileSearchTextfieldState extends State<MobileSearchTextfield> {
     final showCancelIcon = controller.text.isNotEmpty;
     final border = OutlineInputBorder(
       borderRadius: BorderRadius.all(Radius.circular(10.0)),
-      borderSide: BorderSide(color: theme.borderColorScheme.greyTertiary),
+      borderSide: BorderSide(color: theme.borderColorScheme.primary),
     );
     final enableBorder = border.copyWith(
       borderSide: BorderSide(color: theme.borderColorScheme.themeThick),

diff --git a/...b/plugins/document/presentation/editor_plugins/link_embed/link_embed_block_component.dart b/...b/plugins/document/presentation/editor_plugins/link_embed/link_embed_block_component.dart
@@ -138,7 +138,7 @@ class LinkEmbedBlockComponentState
       decoration: BoxDecoration(
         color: isIdle ? Theme.of(context).cardColor : fillSceme.tertiaryHover,
         borderRadius: BorderRadius.all(Radius.circular(16)),
-        border: Border.all(color: borderScheme.greyTertiary),
+        border: Border.all(color: borderScheme.primary),
       ),
       child: Stack(
         children: [

diff --git a/...er/lib/plugins/document/presentation/editor_plugins/link_preview/custom_link_preview.dart b/...er/lib/plugins/document/presentation/editor_plugins/link_preview/custom_link_preview.dart
@@ -60,8 +60,8 @@ class CustomLinkPreviewWidget extends StatelessWidget {
       decoration: BoxDecoration(
         border: Border.all(
           color: isHovering || isInDarkCallout
-              ? borderScheme.greyTertiaryHover
-              : borderScheme.greyTertiary,
+              ? borderScheme.primaryHover
+              : borderScheme.primary,
         ),
         borderRadius: BorderRadius.circular(16.0),
       ),

diff --git a/...appflowy_flutter/lib/user/presentation/screens/sign_in_screen/desktop_sign_in_screen.dart b/...appflowy_flutter/lib/user/presentation/screens/sign_in_screen/desktop_sign_in_screen.dart
@@ -144,7 +144,7 @@ class _OrDivider extends StatelessWidget {
         Flexible(
           child: Divider(
             thickness: 1,
-            color: theme.borderColorScheme.greyTertiary,
+            color: theme.borderColorScheme.primary,
           ),
         ),
         Padding(
@@ -159,7 +159,7 @@ class _OrDivider extends StatelessWidget {
         Flexible(
           child: Divider(
             thickness: 1,
-            color: theme.borderColorScheme.greyTertiary,
+            color: theme.borderColorScheme.primary,
           ),
         ),
       ],

diff --git a/...reens/sign_in_screen/widgets/continue_with/continue_with_magic_link_or_passcode_page.dart b/...reens/sign_in_screen/widgets/continue_with/continue_with_magic_link_or_passcode_page.dart
@@ -190,9 +190,9 @@ class _ContinueWithMagicLinkOrPasscodePageState
         textColor: (context, isHovering, disabled) {
           final theme = AppFlowyTheme.of(context);
           if (isHovering) {
-            return theme.fillColorScheme.themeThickHover;
+            return theme.textColorScheme.actionHover;
           }
-          return theme.textColorScheme.theme;
+          return theme.textColorScheme.action;
         },
       ),
     ];

diff --git a/...resentation/screens/sign_in_screen/widgets/continue_with/continue_with_password_page.dart b/...resentation/screens/sign_in_screen/widgets/continue_with/continue_with_password_page.dart
@@ -157,9 +157,9 @@ class _ContinueWithPasswordPageState extends State<ContinueWithPasswordPage> {
           textColor: (context, isHovering, disabled) {
             final theme = AppFlowyTheme.of(context);
             if (isHovering) {
-              return theme.fillColorScheme.themeThickHover;
+              return theme.textColorScheme.actionHover;
             }
-            return theme.textColorScheme.theme;
+            return theme.textColorScheme.action;
           },
         ),
       ),
@@ -186,9 +186,9 @@ class _ContinueWithPasswordPageState extends State<ContinueWithPasswordPage> {
         textColor: (context, isHovering, disabled) {
           final theme = AppFlowyTheme.of(context);
           if (isHovering) {
-            return theme.fillColorScheme.themeThickHover;
+            return theme.textColorScheme.actionHover;
           }
-          return theme.textColorScheme.theme;
+          return theme.textColorScheme.action;
         },
       ),
     ];

diff --git a/...creens/sign_in_screen/widgets/third_party_sign_in_button/third_party_sign_in_buttons.dart b/...creens/sign_in_screen/widgets/third_party_sign_in_button/third_party_sign_in_buttons.dart
@@ -104,9 +104,9 @@ class _DesktopThirdPartySignInState extends State<_DesktopThirdPartySignIn> {
         padding: EdgeInsets.zero,
         textColor: (context, isHovering, disabled) {
           if (isHovering) {
-            return theme.fillColorScheme.themeThickHover;
+            return theme.textColorScheme.actionHover;
           }
-          return theme.textColorScheme.theme;
+          return theme.textColorScheme.action;
         },
         onTap: () {
           setState(() {
@@ -189,9 +189,9 @@ class _MobileThirdPartySignInState extends State<_MobileThirdPartySignIn> {
         text: 'More options',
         textColor: (context, isHovering, disabled) {
           if (isHovering) {
-            return theme.fillColorScheme.themeThickHover;
+            return theme.textColorScheme.actionHover;
           }
-          return theme.textColorScheme.theme;
+          return theme.textColorScheme.action;
         },
         onTap: () {
           setState(() {

diff --git a/...d/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_menu_element.dart b/...d/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_menu_element.dart
@@ -26,14 +26,14 @@ class SettingsMenuElement extends StatelessWidget {
       onTap: () => changeSelectedPage(page),
       padding: EdgeInsets.all(theme.spacing.m),
       borderRadius: theme.borderRadius.m,
-      borderColor: (_, __, ___, ____) => theme.fillColorScheme.transparent,
+      borderColor: (_, __, ___, ____) => Colors.transparent,
       backgroundColor: (_, isHovering, __) {
         if (isHovering) {
-          return theme.fillColorScheme.primaryAlpha5;
+          return theme.fillColorScheme.contentHover;
         } else if (page == selectedPage) {
           return theme.fillColorScheme.themeSelect;
         }
-        return theme.fillColorScheme.transparent;
+        return theme.fillColorScheme.content;
       },
       builder: (_, __, ___) {
         return Row(

diff --git a/frontend/appflowy_flutter/packages/appflowy_ui/example/lib/src/modal/modal_page.dart b/frontend/appflowy_flutter/packages/appflowy_ui/example/lib/src/modal/modal_page.dart
@@ -34,7 +34,7 @@ class _ModalPageState extends State<ModalPage> {
                       'S',
                       style: TextStyle(
                         color: width == AFModalDimension.S
-                            ? theme.textColorScheme.theme
+                            ? theme.textColorScheme.action
                             : theme.textColorScheme.primary,
                       ),
                     );
@@ -47,7 +47,7 @@ class _ModalPageState extends State<ModalPage> {
                       'M',
                       style: TextStyle(
                         color: width == AFModalDimension.M
-                            ? theme.textColorScheme.theme
+                            ? theme.textColorScheme.action
                             : theme.textColorScheme.primary,
                       ),
                     );
@@ -60,7 +60,7 @@ class _ModalPageState extends State<ModalPage> {
                       'L',
                       style: TextStyle(
                         color: width == AFModalDimension.L
-                            ? theme.textColorScheme.theme
+                            ? theme.textColorScheme.action
                             : theme.textColorScheme.primary,
                       ),
                     );

diff --git a/...pflowy_flutter/packages/appflowy_ui/lib/src/component/button/base_button/base_button.dart b/...pflowy_flutter/packages/appflowy_ui/lib/src/component/button/base_button/base_button.dart
@@ -126,13 +126,13 @@ class _AFBaseButtonState extends State<AFBaseButton> {
     final theme = AppFlowyTheme.of(context);
     return widget.borderColor
             ?.call(context, isHovering, widget.disabled, isFocused) ??
-        theme.borderColorScheme.greyTertiary;
+        theme.borderColorScheme.primary;
   }
 
   Color _buildBackgroundColor(BuildContext context) {
     final theme = AppFlowyTheme.of(context);
     return widget.backgroundColor?.call(context, isHovering, widget.disabled) ??
-        theme.fillColorScheme.transparent;
+        theme.fillColorScheme.content;
   }
 
   Color _buildRingColor(BuildContext context) {
@@ -147,6 +147,6 @@ class _AFBaseButtonState extends State<AFBaseButton> {
       return theme.borderColorScheme.themeThick.withAlpha(128);
     }
 
-    return theme.borderColorScheme.transparent;
+    return Colors.transparent;
   }
 }
diff --git a/...wy_flutter/packages/appflowy_ui/lib/src/component/button/filled_button/filled_button.dart b/...wy_flutter/packages/appflowy_ui/lib/src/component/button/filled_button/filled_button.dart
@@ -40,7 +40,7 @@ class AFFilledButton extends StatelessWidget {
       disabled: disabled,
       backgroundColor: (context, isHovering, disabled) {
         if (disabled) {
-          return AppFlowyTheme.of(context).fillColorScheme.primaryAlpha5;
+          return AppFlowyTheme.of(context).fillColorScheme.contentHover;
         }
         if (isHovering) {
           return AppFlowyTheme.of(context).fillColorScheme.themeThickHover;
@@ -70,7 +70,7 @@ class AFFilledButton extends StatelessWidget {
       disabled: disabled,
       backgroundColor: (context, isHovering, disabled) {
         if (disabled) {
-          return AppFlowyTheme.of(context).fillColorScheme.primaryAlpha5;
+          return AppFlowyTheme.of(context).fillColorScheme.contentHover;
         }
         if (isHovering) {
           return AppFlowyTheme.of(context).fillColorScheme.errorThickHover;
@@ -97,7 +97,7 @@ class AFFilledButton extends StatelessWidget {
       padding: padding,
       borderRadius: borderRadius,
       backgroundColor: (context, isHovering, disabled) =>
-          AppFlowyTheme.of(context).fillColorScheme.primaryAlpha5,
+          AppFlowyTheme.of(context).fillColorScheme.contentHover,
     );
   }
 

diff --git a/.../packages/appflowy_ui/lib/src/component/button/filled_button/filled_icon_text_button.dart b/.../packages/appflowy_ui/lib/src/component/button/filled_button/filled_icon_text_button.dart
@@ -42,7 +42,7 @@ class AFFilledIconTextButton extends StatelessWidget {
       backgroundColor: (context, isHovering, disabled) {
         final theme = AppFlowyTheme.of(context);
         if (disabled) {
-          return theme.fillColorScheme.tertiary;
+          return theme.fillColorScheme.contentHover;
         }
         if (isHovering) {
           return theme.fillColorScheme.themeThickHover;
@@ -51,6 +51,9 @@ class AFFilledIconTextButton extends StatelessWidget {
       },
       textColor: (context, isHovering, disabled) {
         final theme = AppFlowyTheme.of(context);
+        if (disabled) {
+          return theme.textColorScheme.tertiary;
+        }
         return theme.textColorScheme.onFill;
       },
     );
@@ -77,7 +80,7 @@ class AFFilledIconTextButton extends StatelessWidget {
       backgroundColor: (context, isHovering, disabled) {
         final theme = AppFlowyTheme.of(context);
         if (disabled) {
-          return theme.fillColorScheme.tertiary;
+          return theme.fillColorScheme.contentHover;
         }
         if (isHovering) {
           return theme.fillColorScheme.errorThickHover;
@@ -110,7 +113,7 @@ class AFFilledIconTextButton extends StatelessWidget {
       borderRadius: borderRadius,
       backgroundColor: (context, isHovering, disabled) {
         final theme = AppFlowyTheme.of(context);
-        return theme.fillColorScheme.tertiary;
+        return theme.fillColorScheme.contentHover;
       },
       textColor: (context, isHovering, disabled) {
         final theme = AppFlowyTheme.of(context);

diff --git a/...utter/packages/appflowy_ui/lib/src/component/button/filled_button/filled_text_button.dart b/...utter/packages/appflowy_ui/lib/src/component/button/filled_button/filled_text_button.dart
@@ -43,7 +43,7 @@ class AFFilledTextButton extends AFBaseTextButton {
           AppFlowyTheme.of(context).textColorScheme.onFill,
       backgroundColor: (context, isHovering, disabled) {
         if (disabled) {
-          return AppFlowyTheme.of(context).fillColorScheme.primaryAlpha5;
+          return AppFlowyTheme.of(context).fillColorScheme.contentHover;
         }
         if (isHovering) {
           return AppFlowyTheme.of(context).fillColorScheme.themeThickHover;
@@ -79,7 +79,7 @@ class AFFilledTextButton extends AFBaseTextButton {
           AppFlowyTheme.of(context).textColorScheme.onFill,
       backgroundColor: (context, isHovering, disabled) {
         if (disabled) {
-          return AppFlowyTheme.of(context).fillColorScheme.primaryAlpha5;
+          return AppFlowyTheme.of(context).fillColorScheme.contentHover;
         }
         if (isHovering) {
           return AppFlowyTheme.of(context).fillColorScheme.errorThickHover;
@@ -112,7 +112,7 @@ class AFFilledTextButton extends AFBaseTextButton {
       textColor: (context, isHovering, disabled) =>
           AppFlowyTheme.of(context).textColorScheme.tertiary,
       backgroundColor: (context, isHovering, disabled) =>
-          AppFlowyTheme.of(context).fillColorScheme.primaryAlpha5,
+          AppFlowyTheme.of(context).fillColorScheme.contentHover,
     );
   }
 

diff --git a/...lowy_flutter/packages/appflowy_ui/lib/src/component/button/ghost_button/ghost_button.dart b/...lowy_flutter/packages/appflowy_ui/lib/src/component/button/ghost_button/ghost_button.dart
@@ -41,12 +41,12 @@ class AFGhostButton extends StatelessWidget {
       backgroundColor: (context, isHovering, disabled) {
         final theme = AppFlowyTheme.of(context);
         if (disabled) {
-          return theme.fillColorScheme.transparent;
+          return theme.fillColorScheme.content;
         }
         if (isHovering) {
-          return theme.fillColorScheme.primaryAlpha5;
+          return theme.fillColorScheme.contentHover;
         }
-        return theme.fillColorScheme.transparent;
+        return theme.fillColorScheme.content;
       },
     );
   }
@@ -68,7 +68,7 @@ class AFGhostButton extends StatelessWidget {
       borderRadius: borderRadius,
       disabled: true,
       backgroundColor: (context, isHovering, disabled) =>
-          AppFlowyTheme.of(context).fillColorScheme.transparent,
+          AppFlowyTheme.of(context).fillColorScheme.content,
     );
   }
 

diff --git a/...er/packages/appflowy_ui/lib/src/component/button/ghost_button/ghost_icon_text_button.dart b/...er/packages/appflowy_ui/lib/src/component/button/ghost_button/ghost_icon_text_button.dart
@@ -48,9 +48,9 @@ class AFGhostIconTextButton extends StatelessWidget {
           return Colors.transparent;
         }
         if (isHovering) {
-          return theme.fillColorScheme.primaryAlpha5;
+          return theme.fillColorScheme.contentHover;
         }
-        return Colors.transparent;
+        return theme.fillColorScheme.content;
       },
       textColor: (context, isHovering, disabled) {
         final theme = AppFlowyTheme.of(context);

diff --git a/...flutter/packages/appflowy_ui/lib/src/component/button/ghost_button/ghost_text_button.dart b/...flutter/packages/appflowy_ui/lib/src/component/button/ghost_button/ghost_text_button.dart
@@ -39,9 +39,9 @@ class AFGhostTextButton extends AFBaseTextButton {
       backgroundColor: (context, isHovering, disabled) {
         final theme = AppFlowyTheme.of(context);
         if (isHovering) {
-          return theme.fillColorScheme.primaryAlpha5;
+          return theme.fillColorScheme.contentHover;
         }
-        return theme.fillColorScheme.transparent;
+        return theme.fillColorScheme.content;
       },
       textColor: (context, isHovering, disabled) {
         final theme = AppFlowyTheme.of(context);
@@ -77,7 +77,7 @@ class AFGhostTextButton extends AFBaseTextButton {
       textColor: (context, isHovering, disabled) =>
           AppFlowyTheme.of(context).textColorScheme.tertiary,
       backgroundColor: (context, isHovering, disabled) =>
-          AppFlowyTheme.of(context).fillColorScheme.transparent,
+          AppFlowyTheme.of(context).fillColorScheme.content,
     );
   }